luametalatex-back-pdf.lua

@@ -58,8 +58,7 @@ callback.register("stop_run", function()
     pfile:indirect(id, require'luametalatex-pdf-font'(pfile, f, sorted))
   end
   pfile.root = pfile:getobj()
-  pfile.version = string.format("%i.%i", pdf.variable.majorversion, pdf.variable.minorversion)
+  pfile:indirect(pfile.root, string.format([[<</Type/Catalog/Version/1.7/Pages %i 0 R>>]], pfile:writepages()))
-  pfile:indirect(pfile.root, string.format([[<</Type/Catalog/Version/%s/Pages %i 0 R>>]], pfile.version, pfile:writepages()))
   pfile.info = write_infodir(pfile)
   pfile:close()
 end, "Finish PDF file")

luametalatex-baseregisters.tex

@@ -8,7 +8,6 @@
     return token.new(t.mode, t.command)
   end
   local dimen_cmd = token.command_id'assign_dimen'
-  local count_cmd = token.command_id'assign_int'
   local tex_params = {}
   local texmeta = getmetatable(tex)
   local texmetaoldindex = texmeta.__index
@@ -16,9 +15,7 @@
   function texmeta.__index(t, k)
     local v = tex_params[k]
     if v then
-      if v.command == count_cmd then
+      if v.command == dimen_cmd then
-        return tex.count[v.index]
-      elseif v.command == dimen_cmd then
         return tex.dimen[v.index]
       end
     else
@@ -28,9 +25,7 @@
   function texmeta.__newindex(t, k, v)
     local p = tex_params[k]
     if p then
-      if p.command == count_cmd then
+      if p.command == dimen_cmd then
-        tex.count[p.index] = v
-      elseif p.command == dimen_cmd then
         tex.dimen[p.index] = v
       end
     else
@@ -43,9 +38,7 @@
     __index = function(t, k)
       local v = pdf_params[k]
       if v then
-        if v.command == count_cmd then
+        if v.command == dimen_cmd then
-          return tex.count[v.index]
-        elseif v.command == dimen_cmd then
           return tex.dimen[v.index]
         end
       else
@@ -55,9 +48,7 @@
     __newindex = function(t, k, v)
       local p = pdf_params[k]
       if p then
-        if p.command == count_cmd then
+        if p.command == dimen_cmd then
-          tex.count[p.index] = v
-        elseif p.command == dimen_cmd then
           tex.dimen[p.index] = v
         end
       else
@@ -80,15 +71,12 @@
 \def\pdfAlloc{%
   \internalAlloc{pdf}%
 }
-\texAlloc{count}{suppressfontnotfounderror}{0}
 \texAlloc{count}{outputmode}{1} % The "traditional" default would be 0,
                                 % but we do not actually support that.
 \texAlloc{dimen}{pageheight}{210mm}
 \texAlloc{dimen}{pagewidth}{297mm}
 \pdfAlloc{dimen}{horigin}{1in}
 \pdfAlloc{dimen}{vorigin}{1in}
-\pdfAlloc{count}{majorversion}{1}
-\pdfAlloc{count}{minorversion}{7}
 \directlua{
   lua.prepared_code[\csstring#lua.prepared_code+1] = tex.toks[0] .. "end"
   \the\toks0

luametalatex-firstcode.lua

@@ -13,7 +13,6 @@ function token.luacmd(name, func, ...)
   local idx = new_luafunction(name)
   set_lua(name, idx, ...)
   functions[idx] = func
-  return idx
 end
 local properties = node.get_properties_table()
 -- setmetatable(node.direct.get_properties_table(), {
@@ -29,7 +28,7 @@ local whatsits = {
   [0] = "open",
         "write",
         "close",
-        "special",
+        nil,
         nil,
         nil,
         "save_pos",