From de21b156c8c1dd4757f4093cb19de669aac19564 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sat, 24 Mar 2012 17:04:00 +0100 Subject: beta 2012.03.24 17:04 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4075 -> 4073 bytes tex/context/base/context-version.png | Bin 105867 -> 104854 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/spac-ver.mkiv | 6 ++- tex/context/base/status-files.pdf | Bin 24331 -> 24348 bytes tex/context/base/status-lua.pdf | Bin 172398 -> 172375 bytes tex/context/base/strc-con.mkvi | 2 +- tex/context/base/strc-not.mkvi | 9 +++- tex/context/base/strc-ref.lua | 6 ++- tex/context/base/supp-box.mkiv | 4 +- tex/context/base/syst-aux.mkiv | 59 +++++++++++++++++++++ tex/context/base/tabl-tab.mkiv | 20 ++++--- tex/context/base/type-imp-lucida-opentype.mkiv | 10 ++-- tex/context/base/x-mathml.mkiv | 2 +- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 18 files changed, 101 insertions(+), 27 deletions(-) (limited to 'tex') diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index c4d6fe725..140af8054 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.03.13 21:26} +\newcontextversion{2012.03.24 17:04} %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 c6058851d..434f3742b 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.03.13 21:26} +\newcontextversion{2012.03.24 17:04} %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 14ce6560d..42d1600b1 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png index 8dfdcbfd8..8a31235a8 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 57c839be7..05f562d7a 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.03.13 21:26} +\edef\contextversion{2012.03.24 17:04} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 189a9e1aa..f07a65e33 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.03.13 21:26} +\edef\contextversion{2012.03.24 17:04} %D For those who want to use this: diff --git a/tex/context/base/spac-ver.mkiv b/tex/context/base/spac-ver.mkiv index 8df213520..0be61d70f 100644 --- a/tex/context/base/spac-ver.mkiv +++ b/tex/context/base/spac-ver.mkiv @@ -1630,12 +1630,12 @@ } \def\setupvspacing_nop - {\ifx\empty\currentvspacing\else + {\ifx\empty\currentvspacing % mistakenly had an \else \let\currentvspacing\s!default \fi \spac_whitespace_setup_nop} -\unexpanded\def\restorestandardblank +\unexpanded\def\restorestandardblank % or default ? {\let\currentvspacing\v!standard} \let\synchronizevspacing\setupvspacing_nop @@ -1667,6 +1667,8 @@ \definevspacingamount[-\v!line] [-\openlineheight] [-\bodyfontlineheight] \definevspacingamount[-\v!halfline][-.5\openlineheight][-.5\bodyfontlineheight] +\definevspacingamount[\v!standard] [.75\openlineheight][.75\openlineheight] % mkii compatible + \def\bodyfontwhitespace {\dimexpr \ifdim\parskip=\zeropoint diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 51a11cf22..e61f49cbd 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 70dc87d79..f2577cc22 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/strc-con.mkvi b/tex/context/base/strc-con.mkvi index 63b8d393f..72ca50189 100644 --- a/tex/context/base/strc-con.mkvi +++ b/tex/context/base/strc-con.mkvi @@ -196,7 +196,7 @@ \setvalue{\??constructionmainhandler\v!construction}#1% {\iftrialtypesetting \else \begingroup - \currentconstructionsynchronize + \currentconstructionsynchronize % reinstated \attribute\destinationattribute\currentconstructionattribute\relax % todo, whole text \signalcharacter \endgroup diff --git a/tex/context/base/strc-not.mkvi b/tex/context/base/strc-not.mkvi index 8002f7002..f1b502cb5 100644 --- a/tex/context/base/strc-not.mkvi +++ b/tex/context/base/strc-not.mkvi @@ -241,6 +241,7 @@ \unexpanded\def\strc_notations_command_nop#1% {\strc_constructions_register[\c!label={\descriptionparameter\c!text},\c!reference=,\c!title={#1},\c!bookmark=,\c!list=][]% \csname\??constructionnotehandler\currentconstructionhandler\endcsname + \strc_constructions_finalize \endgroup} \unexpanded\def\strc_notations_command_yes[#1]% @@ -249,11 +250,13 @@ \unexpanded\def\strc_notations_command_assignment[#1]% {\strc_constructions_register[\c!label={\descriptionparameter\c!text},\c!reference=,\c!title=,\c!bookmark=,\c!list=,#1][]% \csname\??constructionnotehandler\currentconstructionhandler\endcsname + \strc_constructions_finalize \endgroup} \unexpanded\def\strc_notations_command_argument[#1]#2% {\strc_constructions_register[\c!label={\descriptionparameter\c!text},\c!reference={#1},\c!title={#2},\c!bookmark=,\c!list=][]% \csname\??constructionnotehandler\currentconstructionhandler\endcsname + \strc_constructions_finalize \endgroup} \unexpanded\def\strc_notations_start#1#2% @@ -268,11 +271,13 @@ \unexpanded\def\strc_notations_start_yes[#1]#2% {\strc_constructions_register[\c!label={\descriptionparameter\c!text},\c!reference={#1},\c!title={#2},\c!bookmark=,\c!list=][]% \csname\??constructionnotehandler\currentconstructionhandler\endcsname + \strc_constructions_finalize \endgroup} \unexpanded\def\strc_notations_start_nop#1% {\strc_constructions_register[\c!label={\descriptionparameter\c!text},\c!reference=,\c!title={#1},\c!bookmark=,\c!list=][]% \csname\??constructionnotehandler\currentconstructionhandler\endcsname + \strc_constructions_finalize \endgroup} \unexpanded\def\strc_notations_stop @@ -607,8 +612,8 @@ \fi \nobreak \begingroup - % \currentconstructionsynchronize - \strc_notes_register_note_page % thsi registers the symbol page number (late) + \currentconstructionsynchronize % this flushes the data to the list + \strc_notes_register_note_page % this registers the symbol page number (late) \strc_notes_interaction_check_inline \strc_notes_set_style_color_inline\c!textstyle\c!textcolor \hbox \strc_notes_get_reference_attribute_symbol \bgroup diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua index 989bf5c23..413e245bd 100644 --- a/tex/context/base/strc-ref.lua +++ b/tex/context/base/strc-ref.lua @@ -1072,7 +1072,11 @@ local function identify_inner(set,var,prefix,collected,derived,tobesaved) -- foo:bar -> foo == prefix (first we try the global one) -- -:bar -> ignore prefix local p, i = prefix, nil - local splitprefix, splitinner = lpegmatch(prefixsplitter,inner) + local splitprefix, splitinner + -- the next test is a safeguard when references are auto loaded from outer + if inner then + splitprefix, splitinner = lpegmatch(prefixsplitter,inner) + end -- these are taken from other anonymous references if splitprefix and splitinner then if splitprefix == "-" then diff --git a/tex/context/base/supp-box.mkiv b/tex/context/base/supp-box.mkiv index f5433133a..de1da677a 100644 --- a/tex/context/base/supp-box.mkiv +++ b/tex/context/base/supp-box.mkiv @@ -2460,14 +2460,14 @@ \def\syst_boxes_raise_indeed{\dowithnextboxcs\syst_boxes_raise_finish} \def\syst_boxes_lower_indeed{\dowithnextboxcs\syst_boxes_lower_finish} -\def\syst_boxes_raise_finish#1% +\def\syst_boxes_raise_finish {\setbox\nextbox\hbox{\raise\scratchdimen\box\nextbox}% \ht\nextbox\strutht \dp\nextbox\strutdp \box\nextbox \egroup} -\def\syst_boxes_lower_finish#1% +\def\syst_boxes_lower_finish {\setbox\nextbox\hbox{\lower\scratchdimen\box\nextbox}% \ht\nextbox\strutht \dp\nextbox\strutdp diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv index 1fbf98296..d607f0f20 100644 --- a/tex/context/base/syst-aux.mkiv +++ b/tex/context/base/syst-aux.mkiv @@ -7112,3 +7112,62 @@ %D as we do with tabulates. \protect \endinput + +% \edef\choicetokenyes{+} +% \edef\choicetokennop{-} +% +% \unexpanded\def\startchoice#1% +% {\pushmacro\currentchoicevalue +% \edef\currentchoicevalue{#1}% +% \checkchoicetoken} +% +% \unexpanded\def\checkchoicetoken#1% +% {\edef\choicetoken{#1}% +% \ifx\choicetoken\choicetokenyes +% \singleexpandafter\checkchoiceyes +% \else\ifx\choicetoken\choicetokennop +% \doubleexpandafter\checkchoicenop +% \else +% \doubleexpandafter\choicequit +% \fi\fi} +% +% \def\checkchoiceyes#1% +% {\edef\choicevalue{#1}% +% \ifx\currentchoicevalue\choicevalue +% \expandafter\choiceindeed +% \else +% \expandafter\choiceignore +% \fi} +% +% \def\checkchoicenop +% {\choiceindeed} +% +% \def\choiceabort#1\stopchoice +% {\popmacro\currentchoicevalue} +% +% \def\choicequit +% {\popmacro\currentchoicevalue} +% +% \def\choiceindeed#1#2\stopchoice +% {\popmacro\currentchoicevalue +% #1} +% +% \def\choiceignore#1% +% {\checkchoicetoken} +% +% \let\stopchoice\relax +% +% \def\xxx{3} +% \def\xxx{x} +% +% \startchoice {\xxx} +% + {1} { +% first +% } + {2} { +% second +% } + {3} { +% third +% } - { +% nothing +% } +% \stopchoice diff --git a/tex/context/base/tabl-tab.mkiv b/tex/context/base/tabl-tab.mkiv index c71198f05..b50be8531 100644 --- a/tex/context/base/tabl-tab.mkiv +++ b/tex/context/base/tabl-tab.mkiv @@ -1212,7 +1212,8 @@ %D %D \typebuffer \getbuffer -\def\s!TaBlE{TaBlE} +\installcorenamespace{tabletemplate} + \def\m!TABLE{TABLE} %D We already saw that the table macros report errors and @@ -1399,6 +1400,9 @@ %D The implementation of the definition macro is not that %D complicated: +\installcorenamespace{tablehead} +\installcorenamespace{tabletail} + \unexpanded\def\definetabletemplate % to be redone {\bgroup \catcode\barasciicode\othercatcode @@ -1406,13 +1410,13 @@ \def\dodefinetabletemplate[#1][#2][#3][#4]% {\ifsecondargument - \setgvalue{\s!TaBlE#1}{\dousetabletemplate{#2}{#3}{#4}}% + \setgvalue{\??tabletemplate#1}{\dousetabletemplate{#2}{#3}{#4}}% \fi \egroup} \def\dousetabletemplate#1#2#3% - {\gdef\dotablehead{\getvalue{@@tablehead#2}}% - \gdef\dotabletail{\getvalue{@@tabletail#3}}% + {\gdef\dotablehead{\executeifdefined{\??tablehead#2}\empty}% + \gdef\dotabletail{\executeifdefined{\??tabletail#3}\empty}% \secondstagestarttable[#1]} %D The optional third and fourth arguments define which table @@ -1492,8 +1496,8 @@ \global\setfalse\hassometabletail \expanded{\doifinstringelse{|}{#1}} {\xdef\restarttable{\noexpand\dorestarttable{\noexpand\thirdstagestarttable{#1}}}} - {\doifdefinedelse{\s!TaBlE#1} - {\gdef\restarttable{\getvalue{\s!TaBlE#1}}} + {\doifdefinedelse{\??tabletemplate#1} + {\gdef\restarttable{\getvalue{\??tabletemplate#1}}} {\gdef\restarttable{\dorestarttable{\getvalue{#1}}}}}% \egroup \restarttable} @@ -1654,8 +1658,8 @@ \def\settablehead{\dodoubleempty\dosettablehead} \def\settabletail{\dodoubleempty\dosettabletail} -\long\def\dosettablehead[#1][#2]#3\end{\setvalue{@@tablehead#1}{\tablenoalign{\global\settrue\hassometablehead}#3}} -\long\def\dosettabletail[#1][#2]#3\end{\setvalue{@@tabletail#1}{\tablenoalign{\global\settrue\hassometabletail}#3}} +\long\def\dosettablehead[#1][#2]#3\end{\setvalue{\??tablehead#1}{\tablenoalign{\global\settrue\hassometablehead}#3}} +\long\def\dosettabletail[#1][#2]#3\end{\setvalue{\??tabletail#1}{\tablenoalign{\global\settrue\hassometabletail}#3}} %D Redundant \type{\HL}'s are removed automatically, so %D mid||lines can be used without problems. diff --git a/tex/context/base/type-imp-lucida-opentype.mkiv b/tex/context/base/type-imp-lucida-opentype.mkiv index b6277b37c..37853b740 100644 --- a/tex/context/base/type-imp-lucida-opentype.mkiv +++ b/tex/context/base/type-imp-lucida-opentype.mkiv @@ -37,11 +37,11 @@ \starttypescript [\s!sans] [lucidanova,lucidaot,otlucida] \definefontsynonym [\s!Sans] [\s!file:LucidaSansOT.otf] - \definefontsynonym [\s!SansBold] [\s!file:LucidaSansOT-Bold.otf] - \definefontsynonym [\s!SansItalic] [\s!file:LucidaSansOT-Oblique.otf] - \definefontsynonym [\s!SansBoldItalic] [\s!file:LucidaSansOT-BoldOblique.otf] - \definefontsynonym [\s!SansSlanted] [\s!MonoItalic] - \definefontsynonym [\s!SansBoldSlanted] [\s!MonoBoldItalic] + \definefontsynonym [\s!SansBold] [\s!file:LucidaSansOT-Demi.otf] + \definefontsynonym [\s!SansItalic] [\s!file:LucidaSansOT-Italic.otf] + \definefontsynonym [\s!SansBoldItalic] [\s!file:LucidaSansOT-DemiItalic.otf] + \definefontsynonym [\s!SansSlanted] [\s!SansItalic] + \definefontsynonym [\s!SansBoldSlanted] [\s!SansBoldItalic] \stoptypescript \starttypescript [\s!mono] [lucidanova,lucidaot,otlucida] diff --git a/tex/context/base/x-mathml.mkiv b/tex/context/base/x-mathml.mkiv index f2dbda5e4..f64fdbc74 100644 --- a/tex/context/base/x-mathml.mkiv +++ b/tex/context/base/x-mathml.mkiv @@ -2034,7 +2034,7 @@ \setupMMLappearance[text][\c!alternative=\v!b] % a=normal, b=keep spaces \startxmlsetups mml:mtext - \domathtext { + \text { \applymmlsometext{#1}{ \doifelse \MMLtextalternative \v!a { %\ctxmodulemathml{stripped(\!!bs\xmlflush{#1}\!!es)} diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 34443c8bc..4228b54bb 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 : 03/13/12 21:26:51 +-- merge date : 03/24/12 17:04:28 do -- begin closure to overcome local limits and interference -- cgit v1.2.3