beta 2012.02.21 14:02

15 files changed, 31 insertions, 44 deletions

diff --git a/tex/context/base/anch-tab.mkiv b/tex/context/base/anch-tab.mkiv
index 08105ab53..4bdaa2ef9 100644
--- a/tex/context/base/anch-tab.mkiv
+++ b/tex/context/base/anch-tab.mkiv
@@ -358,34 +358,18 @@
 \def\dodefinepositionframed[#1][#2]%
   {\dosetpositionaction{b:#1}{\dopositionframed[#1][#2]}}
 
-\def\positionframed
-  {\dodoubleempty\dopositionframed}
+\unexpanded\def\positionframed
+  {\bgroup
+   \dodoubleempty\dopositionframed}
 
 \def\dopositionframed[#1][#2]%
-  {\bgroup
-   \setbox\scratchbox\hbox
-     {\dimen0=\MPx{e:#1}%
-      \advance\dimen0 -\MPx{b:#1}%
-      \dimen2=\MPy{b:#1}%
-      \advance\dimen2 -\MPy{e:#1}%
-      \advance\dimen2 \MPd{e:#1}%
-      \lower\dimen2\hbox
-        {\advance\dimen2 \MPh{b:#1}%
-         \framed
-           [\c!width=\dimen0,\c!height=\dimen2,
-            \c!offset=\v!overlay,#2]{}}}%
+  {\setbox\scratchbox\hbox
+     {\scratchwidth \dimexpr\MPx{e:#1}-\MPx{b:#1}\relax
+      \scratchdepth \dimexpr\MPy{b:#1}-\MPy{e:#1}+\MPd{e:#1}\relax
+      \scratchheight\dimexpr\scratchdepth+\MPh{b:#1}\relax
+      \lower\scratchdepth\hbox
+        {\framed[\c!width=\scratchwidth,\c!height=\scratchheight,\c!offset=\v!overlay,#2]{}}}%
    \smashedbox\scratchbox
    \egroup}
 
-% \def\sethdistances#1%
-%   {\hbox{\lpos{ml:#1}\hpos{mh:#1}{\strut}\rpos{mr:#1}}}
-%
-% \def\gethdistances#1%
-%   {\scratchdimen\MPx{mh:#1}%
-%    \advance\scratchdimen -\MPx{ml#1}%
-%    \edef\lefthdistance{\the\scratchdimen}%
-%    \scratchdimen\MPx{mr:#1}%
-%    \advance\scratchdimen -\MPx{mh:#1}%
-%    \edef\righthdistance{\the\scratchdimen}}
-
 \protect \endinput
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 7836fb9ec..aaac7b00f 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.21 00:51}
+\newcontextversion{2012.02.21 14:02}
 
 %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 882aad72b..29538af06 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.21 00:51}
+\newcontextversion{2012.02.21 14:02}
 
 %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 4f4878b29..64e210c6f 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index fcb7b8d83..c7185da94 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.css b/tex/context/base/context.css
index 8b27046bf..be1dad796 100644
--- a/tex/context/base/context.css
+++ b/tex/context/base/context.css
@@ -255,7 +255,7 @@ p, li {
 	text-align: center ;
 }
 #right-safari {
-	display: table ;
+	_display: table ;
 	width: 100% ;
 	height: 100% ;
 }
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index ecdb224c5..5f56e911a 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.21 00:51}
+\edef\contextversion{2012.02.21 14:02}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 803d6e7be..8e06a9497 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.21 00:51}
+\edef\contextversion{2012.02.21 14:02}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/pack-rul.mkiv b/tex/context/base/pack-rul.mkiv
index 71e621b30..c84205eac 100644
--- a/tex/context/base/pack-rul.mkiv
+++ b/tex/context/base/pack-rul.mkiv
@@ -2597,7 +2597,7 @@
 
 % actually, this can be another command handler .. todo
 
-\def\defineframed
+\unexpanded\def\defineframed
   {\dotripleempty\pack_framed_define}
 
 \def\pack_framed_define[#1][#2][#3]%
diff --git a/tex/context/base/spac-ali.mkiv b/tex/context/base/spac-ali.mkiv
index 614852d92..7a75002ea 100644
--- a/tex/context/base/spac-ali.mkiv
+++ b/tex/context/base/spac-ali.mkiv
@@ -414,7 +414,7 @@
      \ifdoublesided
        \signalouterrealign
      \fi
-     \rightorleftpageaction\c_spac_align_state_horizontal_left\spac_align_set_horizontal_right
+     \rightorleftpageaction\spac_align_set_horizontal_left\spac_align_set_horizontal_right
    \or
      % 6 oneliner
      \ifcase\c_spac_align_state_broad
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 19a033e53..b32a31aff 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index a7dd888ae..ae40d3333 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/status-mkiv.tex b/tex/context/base/status-mkiv.tex
index 85e02eca5..0d22d51a1 100644
--- a/tex/context/base/status-mkiv.tex
+++ b/tex/context/base/status-mkiv.tex
@@ -21,6 +21,9 @@
 
 \starttext
 
+% anch attr back buff colo font grph java lang luat lxml math meta mlib mult node
+% pack page phys scrn spac strc supp symb syst tabl toks typo
+
 \startsubject[title=Todo]
 
 \startitemize[packed]
diff --git a/tex/context/base/type-imp-texgyre.mkiv b/tex/context/base/type-imp-texgyre.mkiv
index c2e06ae29..e133cd2d4 100644
--- a/tex/context/base/type-imp-texgyre.mkiv
+++ b/tex/context/base/type-imp-texgyre.mkiv
@@ -25,7 +25,16 @@
     \definetypescriptprefix [f:cursor]  [cursor]    \definetypescriptprefix [f:courier]    [cursor]
     \definetypescriptprefix [f:chorus]  [chorus]    \definetypescriptprefix [f:chancery]   [chorus]
 
-    \starttypescript [\s!serif,\s!sans] [adventor,bonum,bookman,heros,helvetica,pagella,palatino,schola,schoolbook,termes,times]
+    \definetypescriptprefix [n:pagella]  [TeXGyrePagella]   \definetypescriptprefix [n:palatino]   [TeXGyrePagella]
+    \definetypescriptprefix [n:termes]   [TeXGyreTermes]    \definetypescriptprefix [n:times]      [TeXGyreTermes]
+    \definetypescriptprefix [n:heros]    [TeXGyreHeros]     \definetypescriptprefix [n:helvetica]  [TeXGyreHeros]
+    \definetypescriptprefix [n:bonum]    [TeXGyreBonum]     \definetypescriptprefix [n:bookman]    [TeXGyreBonum]
+    \definetypescriptprefix [n:schola]   [TeXGyreSchola]    \definetypescriptprefix [n:schoolbook] [TeXGyreSchola]
+    \definetypescriptprefix [n:adventor] [TeXGyreAdventor]% \definetypescriptprefix [n:adventor]   [TeXGyreAdventor]
+    \definetypescriptprefix [n:cursor]   [TeXGyreCursor]    \definetypescriptprefix [n:courier]    [TeXGyreCursor]
+    \definetypescriptprefix [n:chorus]   [TeXGyreChorus]    \definetypescriptprefix [n:chancery]   [TeXGyreChorus] % not the full set
+
+    \starttypescript [\s!serif,\s!sans] [adventor,bonum,bookman,heros,helvetica,pagella,palatino,bonum,bookman,schola,schoolbook,termes,times]
         \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular]        [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-regular]    [\s!features=\s!default]
         \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic]         [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-italic]     [\s!features=\s!default]
         \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold]           [\s!file:texgyre\typescriptprefix{f:\typescripttwo}-bold]       [\s!features=\s!default]
@@ -47,15 +56,6 @@
         \definefontsynonym [TeXGyreChorus-MediumItalic] [\s!file:texgyrechorus-mediumitalic] [\s!features=\s!default]
     \stoptypescript
 
-    \definetypescriptprefix [n:pagella]  [TeXGyrePagella]   \definetypescriptprefix [n:palatino]   [TeXGyrePagella]
-    \definetypescriptprefix [n:termes]   [TeXGyreTermes]    \definetypescriptprefix [n:times]      [TeXGyreTermes]
-    \definetypescriptprefix [n:heros]    [TeXGyreHeros]     \definetypescriptprefix [n:helvetica]  [TeXGyreHeros]
-    \definetypescriptprefix [n:bonum]    [TeXGyreBonum]     \definetypescriptprefix [n:bookman]    [TeXGyreBonum]
-    \definetypescriptprefix [n:schola]   [TeXGyreSchola]    \definetypescriptprefix [n:schoolbook] [TeXGyreSchola]
-    \definetypescriptprefix [n:adventor] [TeXGyreAdventor]% \definetypescriptprefix [n:adventor]   [TeXGyreAdventor]
-    \definetypescriptprefix [n:cursor]   [TeXGyreCursor]    \definetypescriptprefix [n:courier]    [TeXGyreCursor]
-    \definetypescriptprefix [n:chorus]   [TeXGyreChorus]    \definetypescriptprefix [n:chancery]   [TeXGyreChorus] % not the full set
-
     \starttypescript [\s!serif] [pagella,palatino,termes,times,bonum,bookman,schola,schoolbook] [\s!name]
         \definefontsynonym [\s!Serif]             [\typescriptprefix{n:\typescripttwo}-Regular]
         \definefontsynonym [\s!SerifItalic]       [\typescriptprefix{n:\typescripttwo}-Italic]
@@ -66,7 +66,7 @@
         \definefontsynonym [\s!SerifCaps]         [\typescriptprefix{n:\typescripttwo}-Caps]
     \stoptypescript
 
-    \starttypescript [\s!serif] [pagella-caps,palatino-caps,terme-capss,times-caps,bonum-caps,bookman-caps,schola-caps,schoolbook-caps] [\s!name]
+    \starttypescript [\s!serif] [pagella-caps,palatino-caps,termes-caps,times-caps,bonum-caps,bookman-caps,schola-caps,schoolbook-caps] [\s!name]
         \definefontsynonym [\s!Serif]             [\typescriptprefix{n:\typescripttwo}-Caps]
         \definefontsynonym [\s!SerifItalic]       [\typescriptprefix{n:\typescripttwo}-ItalicCaps]
         \definefontsynonym [\s!SerifBold]         [\typescriptprefix{n:\typescripttwo}-BoldCaps]
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 09cff0c18..ec7cdb8ff 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/21/12 00:51:07
+-- merge date  : 02/21/12 14:02:23
 
 do -- begin closure to overcome local limits and interference