summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2012-02-16 14:20:26 +0200
committerMarius <mariausol@gmail.com>2012-02-16 14:20:26 +0200
commit8dae72dee3042c7e5fe3c6ef44a1f21effd70d41 (patch)
treecf5beaf983939cbd877bf6f9f4ef2ef866148abb
parente0e3ed2de96caf76d1065b834ddd4f9ba62a1e55 (diff)
downloadcontext-8dae72dee3042c7e5fe3c6ef44a1f21effd70d41.tar.gz
beta 2012.02.16 13:05
-rw-r--r--tex/context/base/anch-pos.lua1
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4074 -> 4071 bytes
-rw-r--r--tex/context/base/context-version.pngbin105204 -> 104595 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/status-files.pdfbin24310 -> 24306 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin172240 -> 172240 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
10 files changed, 6 insertions, 5 deletions
diff --git a/tex/context/base/anch-pos.lua b/tex/context/base/anch-pos.lua
index 184da3b9c..b43cd3781 100644
--- a/tex/context/base/anch-pos.lua
+++ b/tex/context/base/anch-pos.lua
@@ -60,6 +60,7 @@ local default = {
h = 0, -- height
d = 0, -- depth
p = 0, -- page
+ n = 0, -- paragraph
ls = 0, -- leftskip
rs = 0, -- rightskip
hi = 0, -- hangindent
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 889bcd918..d482be0d9 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2012.02.16 09:55}
+\newcontextversion{2012.02.16 13:05}
%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/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 7c7f46cc1..ac25a1fb7 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2012.02.16 09:55}
+\newcontextversion{2012.02.16 13:05}
%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-version.pdf b/tex/context/base/context-version.pdf
index 0f6482af5..02941227e 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 7d1d1c52f..49194ad86 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 9e68e36f0..c6703f445 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.02.16 09:55}
+\edef\contextversion{2012.02.16 13:05}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 769744932..d548d9410 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -23,7 +23,7 @@
%D up and the dependencies are more consistent.
\edef\contextformat {\jobname}
-\edef\contextversion{2012.02.16 09:55}
+\edef\contextversion{2012.02.16 13:05}
%D For those who want to use this:
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index e4c854d1d..53b9869fd 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 21a63fa67..0c838976e 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index db5941f2f..edf868611 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 02/16/12 09:55:05
+-- merge date : 02/16/12 13:05:00
do -- begin closure to overcome local limits and interference