summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2010-12-12 18:20:12 +0200
committerMarius <mariausol@gmail.com>2010-12-12 18:20:12 +0200
commit0146de7d78f6f4a964d77530c01a517566e12234 (patch)
treeaf6730b11e447ad8b62dd615ff6934ac4fcc36e4
parent3fd940c1c264d6077ace70220b27fe475cda88dc (diff)
downloadcontext-0146de7d78f6f4a964d77530c01a517566e12234.tar.gz
beta 2010.12.12 17:06
-rw-r--r--tex/context/base/anch-pos.lua2
-rw-r--r--tex/context/base/cont-new.tex2
-rw-r--r--tex/context/base/context.tex2
-rw-r--r--tex/context/base/strc-ref.lua3
-rw-r--r--tex/generic/context/luatex-fonts-merged.lua2
5 files changed, 6 insertions, 5 deletions
diff --git a/tex/context/base/anch-pos.lua b/tex/context/base/anch-pos.lua
index f31880278..1e40bbc7b 100644
--- a/tex/context/base/anch-pos.lua
+++ b/tex/context/base/anch-pos.lua
@@ -188,6 +188,6 @@ commands.MPpos = jobpositions.position
commands.MPplus = jobpositions.pardata
commands.MPrest = jobpositions.extradata
-function commands.doifelse(name)
+function commands.doifpositionelse(name)
commands.testcase(collected[name] or tobesaved[name])
end
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 3be1fa545..1248d1568 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2010.12.12 14:33}
+\newcontextversion{2010.12.12 17:06}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 1f10fc0e6..12939fa64 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2010.12.12 14:33}
+\edef\contextversion{2010.12.12 17:06}
%D For those who want to use this:
diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua
index 39b0d9f0c..ff773e9a0 100644
--- a/tex/context/base/strc-ref.lua
+++ b/tex/context/base/strc-ref.lua
@@ -1096,7 +1096,7 @@ set.n = n
set[i] = var
end
references.currentset = set
---~ print(bug,table.serialize(set))
+--~ table.print(set,tostring(bug))
return set, bug
end
@@ -1123,6 +1123,7 @@ function references.doifelse(prefix,reference,highlight,newwindow,layer)
currentreference = set[1]
end
-- we can do the expansion here which saves a call
+--~ print("!!!!!!",not unknown)
commands.doifelse(not unknown)
end
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 2f23f84ec..1c692e810 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 12/12/10 14:33:12
+-- merge date : 12/12/10 17:06:51
do -- begin closure to overcome local limits and interference