summaryrefslogtreecommitdiff
path: root/Master/texmf
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2010-02-14 14:24:05 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2010-02-14 14:24:05 +0000
commit78a6f86717e6842d93f706d6abfdab59386dceb6 (patch)
tree2522c078906615ab032e067362d179584dc4ad46 /Master/texmf
parent9f6d562076285029ab523101e266a38e4f5c065b (diff)
Lua tlpdb reading: accept 'relocated' and 'postaction'.
git-svn-id: svn://tug.org/texlive/trunk@17011 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf')
-rw-r--r--Master/texmf/scripts/texlive/lua/texlive/tlpdb.tlu10
-rwxr-xr-xMaster/texmf/scripts/texlive/test-tlpdb.tlu6
2 files changed, 12 insertions, 4 deletions
diff --git a/Master/texmf/scripts/texlive/lua/texlive/tlpdb.tlu b/Master/texmf/scripts/texlive/lua/texlive/tlpdb.tlu
index ee0c4547dd8..d83f02ceccf 100644
--- a/Master/texmf/scripts/texlive/lua/texlive/tlpdb.tlu
+++ b/Master/texmf/scripts/texlive/lua/texlive/tlpdb.tlu
@@ -35,7 +35,9 @@
-- tlpobj.runfiles = table indexed by numbers
-- tlpobj.runsize string
-- tlpobj.depend = table indexed by numbers
--- tlpobj.execute = table indexed by numbers
+-- tlpobj.execute = table of strings indexed by numbers
+-- tlpobj.postaction = table of strings indexed by numbers
+-- tlpobj.relocated = boolean
--
--*-Lua-*-
@@ -228,6 +230,12 @@ function read_tlpdb(root)
tlpobj.execute = {}
end
table.insert(tlpobj.execute,rest)
+ elseif first == 'postaction' then
+ tlpobj.postaction = tlpobj.postaction or {}
+ table.insert(tlpobj.postaction, rest)
+ elseif first == 'relocated' then
+ -- don't even try to validate the value
+ tlpobj.relocated = (rest == '1')
else
die('Unknown directive')
end
diff --git a/Master/texmf/scripts/texlive/test-tlpdb.tlu b/Master/texmf/scripts/texlive/test-tlpdb.tlu
index c147120740e..2004e958fb1 100755
--- a/Master/texmf/scripts/texlive/test-tlpdb.tlu
+++ b/Master/texmf/scripts/texlive/test-tlpdb.tlu
@@ -6,7 +6,7 @@
-- test the functionality of tlpdb.tlu
-kpse.set_program_name( "mktexlsr" )
+kpse.set_program_name(arg[-1])
texmfmain = kpse.var_value('TEXMFMAIN')
package.path = texmfmain.."/scripts/texlive/lua/?.tlu"
require("texlive.tlpdb")
@@ -33,7 +33,7 @@ for a,b in pairs(tlpdb) do
end
end
else
- print (" "..c.." = "..d)
+ print (" "..c.." = "..tostring(d))
end
end
end
@@ -42,4 +42,4 @@ end
-- tab-width: 2
-- indent-tabs-mode: nil
-- End:
--- vim:set tabstop=2 expandtab: #
+-- vim:set tabstop=2 shiftwidth=2 expandtab: #