From dfbbcbbdb6e3a3681b7c853ac5e213c1933b385c Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 20 Mar 2006 10:19:00 +0100 Subject: stable 2006.03.20 10:19 --- tex/context/base/cont-log.tex | 2 +- tex/context/base/cont-new.tex | 9 +- tex/context/base/context.tex | 2 +- tex/context/base/core-fig.tex | 110 ++++++++++----- tex/context/base/core-fld.tex | 34 +++-- tex/context/base/core-mis.tex | 18 ++- tex/context/base/core-nav.tex | 75 +++++----- tex/context/base/core-sec.tex | 45 +++--- tex/context/base/core-spa.tex | 2 +- tex/context/base/core-sys.tex | 2 +- tex/context/base/core-ver.tex | 21 ++- tex/context/base/enco-037.tex | 276 +++++++++++++++++++++++++++++++++++++ tex/context/base/m-cweb.tex | 4 +- tex/context/base/mult-con.tex | 4 + tex/context/base/page-bck.tex | 2 +- tex/context/base/page-flt.tex | 8 +- tex/context/base/page-lin.tex | 40 +++++- tex/context/base/page-lyr.tex | 2 +- tex/context/base/page-mul.tex | 147 +++++++++++++------- tex/context/base/page-set.tex | 3 + tex/context/base/page-sid.tex | 18 +++ tex/context/base/prop-lay.tex | 8 +- tex/context/base/regi-utf.tex | 12 ++ tex/context/base/spec-dpx.tex | 20 +-- tex/context/base/spec-tpd.tex | 2 +- tex/context/base/supp-mis.tex | 4 +- tex/context/base/supp-mpe.tex | 3 +- tex/context/base/supp-vis.tex | 4 +- tex/context/base/unic-037.tex | 278 ++++++++++++++++++++++++++++++++++++++ tex/context/base/verb-ini.tex | 36 ++++- tex/context/interface/cont-cz.xml | 23 +++- tex/context/interface/cont-de.xml | 23 +++- tex/context/interface/cont-en.xml | 17 +++ tex/context/interface/cont-fr.xml | 23 +++- tex/context/interface/cont-it.xml | 23 +++- tex/context/interface/cont-nl.xml | 23 +++- tex/context/interface/cont-ro.xml | 23 +++- tex/context/interface/keys-cz.xml | 3 +- tex/context/interface/keys-de.xml | 3 +- tex/context/interface/keys-en.xml | 3 +- tex/context/interface/keys-fr.xml | 3 +- tex/context/interface/keys-it.xml | 3 +- tex/context/interface/keys-nl.xml | 3 +- tex/context/interface/keys-ro.xml | 3 +- 44 files changed, 1148 insertions(+), 219 deletions(-) create mode 100644 tex/context/base/enco-037.tex create mode 100644 tex/context/base/unic-037.tex (limited to 'tex') diff --git a/tex/context/base/cont-log.tex b/tex/context/base/cont-log.tex index aa1e1ce72..dae135a1c 100644 --- a/tex/context/base/cont-log.tex +++ b/tex/context/base/cont-log.tex @@ -89,7 +89,7 @@ \kern-.11em\TeX} \def\AMSswitch#1% - {$\fam2\ifdim\korpsgrootte>1.1em\scriptstyle\fi#1$} + {$\fam2\ifdim\bodyfontsize>1.1em\scriptstyle\fi#1$} \def\AmSTeX {\AMSswitch A% diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 6a0ce0dee..c9f5a26d9 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -24,7 +24,7 @@ \normalend}} \fi -\newcontextversion{2006.02.15 17:41} +\newcontextversion{2006.03.20 10:19} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new @@ -670,8 +670,13 @@ % temp hack, else no proper default fall back (like \textmultiply); todo: sync encoding +\def\dealwithmathtextencoding + {\expanded{\everyhbox{\the\everyhbox\noexpand\fastenableencoding{\currentencoding}}}% + \def\dealwithmathtextencoding{\let\characterencoding\nocharacterencoding}% + \dealwithmathtextencoding} + \appendtoks - \let\characterencoding\nocharacterencoding + \dealwithmathtextencoding \to \everymathematics % \separatestring123 456\to\test [\test] diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 093652d18..0d9810695 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -31,7 +31,7 @@ %D 2004.8.30 the low level interface is english. Watch out and adapt %D your styles an modules. -\def\contextversion{2006.02.15 17:41} +\def\contextversion{2006.03.20 10:19} %D For those who want to use this: diff --git a/tex/context/base/core-fig.tex b/tex/context/base/core-fig.tex index ddbb4bb66..f9367d735 100644 --- a/tex/context/base/core-fig.tex +++ b/tex/context/base/core-fig.tex @@ -617,7 +617,11 @@ {\global\fighei\@@efheight}% \doifsomething\@@efscale {\figxsca\@@efscale - \figysca\@@efscale}} + \figysca\@@efscale}% + \doifsomething\@@efxscale + {\figxsca\@@efxscale}% + \doifsomething\@@efyscale + {\figxsca\@@efyscale}} \def\setfactorfiguresize {\doifinsetelse\@@effactor{\v!max,\v!fit,\v!broad} @@ -655,9 +659,9 @@ \fi} \def\setscalefiguresize - {\doifsomething\@@efscale - {\doapplyfigurescale\figwid\@@epw\figxsca - \doapplyfigurescale\fighei\@@eph\figysca + {\doifsomething{\@@efscale\@@efxscale\@@efxscale} + {\doapplyfigurescale\figwid\@@epw\figxsca\@@efxscale + \doapplyfigurescale\fighei\@@eph\figysca\@@efyscale \global\figwid\zeropoint \global\fighei\zeropoint \doifelsenothing\@@efmaxwidth @@ -700,8 +704,8 @@ {\docalculatefigurescales\fighei\@@eph\figwid\@@epw}% \else \dosetdimensionfiguresize - {\doapplyfigurescale\figwid\@@epw\figxsca - \doapplyfigurescale\fighei\@@eph\figysca}% + {\doapplyfigurescale\figwid\@@epw\figxsca\@@efxscale + \doapplyfigurescale\fighei\@@eph\figysca\@@efyscale}% {\docalculatefigurescales\figwid\@@epw\fighei\@@eph}% {\docalculatefigurescales\fighei\@@eph\figwid\@@epw}% \fi @@ -821,13 +825,29 @@ \divide\dimen0 \dimen2 #3=\dimen0 } % #3 = schaal - \def\doapplyfigurescale#1#2#3% +% \def\doapplyfigurescale#1#2#3% +% {\global#1=#2\relax +% \ifcase0\@@efscale\relax % beter: doifnum... +% #3=\plusthousand +% \else +% #3=\@@efscale +% \fi\relax % important ! +% \ifnum#3=\plusthousand\else +% \global\divide #1 \plusthousand +% \global\multiply#1 #3\relax +% \fi} + + \def\doapplyfigurescale#1#2#3#4% {\global#1=#2\relax - \ifcase0\@@efscale\relax % beter: doifnum... - #3=\plusthousand + \ifcase0#4\relax % @@ef.scale kan empty zijn + \ifcase0\@@efscale\relax % @@efscale kan empty zijn + #3=\plusthousand + \else + #3=\@@efscale + \fi \else - #3=\@@efscale - \fi\relax % important ! + #3=#4% + \fi \ifnum#3=\plusthousand\else \global\divide #1 \plusthousand \global\multiply#1 #3\relax @@ -839,6 +859,8 @@ \beginETEX \dimexpr + % todo: use \relax instead of () + \def\docalculatefigurescales#1#2#3#4% {\scratchdimen\dimexpr(#1/\dimexpr(#2/\plusthousand))% \figxsca\scratchdimen @@ -848,14 +870,28 @@ \def\docalculatefigurescale#1#2#3% {#3\dimexpr(#1/\dimexpr(#2/\plusthousand))} - \def\doapplyfigurescale#1#2#3% - {% #3=\ifnum0\number\@@efscale=\zerocount\plusthousand\else\@@efscale\fi - \ifcase0\@@efscale\relax % @@efschaal kan empty zijn - #3=\plusthousand +% \def\doapplyfigurescale#1#2#3% +% {% #3=\ifnum0\number\@@efscale=\zerocount\plusthousand\else\@@efscale\fi +% \ifcase0\@@efscale\relax % @@efscale kan empty zijn +% #3=\plusthousand +% \else +% #3=\@@efscale +% \fi\relax % important ! +% \global#1\ifnum#3=\plusthousand#2\else\dimexpr(#3\dimexpr(#2/\plusthousand))\fi +% \relax} + + \def\doapplyfigurescale#1#2#3#4% todo: also #5 being sx/sy (\ifdim0#5=0pt ...) + {\ifcase0#4\relax % @@ef.scale kan empty zijn + \ifcase0\@@efscale\relax % @@efscale kan empty zijn + #3=\plusthousand + \else + #3=\@@efscale + \fi \else - #3=\@@efscale - \fi\relax % important ! - \global#1\ifnum#3=\plusthousand#2\else\dimexpr(#3\dimexpr(#2/\plusthousand))\fi + #3=#4% + \fi + \relax % important ! + \global#1\ifnum#3=\plusthousand#2\else\dimexpr#3\dimexpr#2/\plusthousand\relax\relax\fi \relax} \endETEX @@ -1031,7 +1067,7 @@ \getparameters [\??ep] [\c!e=\s!unknown, - %\c!w=15\korpsgrootte,\c!h=10\korpsgrootte, + %\c!w=15\bodyfontsize,\c!h=10\bodyfontsize, \c!w=8\lineheight,\c!h=6\lineheight, \c!x=\!!zeropoint,\c!y=\!!zeropoint, \c!t=,\c!s=,\c!a=,\c!f=\@@effilename]% @@ -1041,7 +1077,7 @@ \c!object=\@@exobject,\c!preset=\v!yes,\c!split=,\c!size=, \c!page=0,\c!controls=\v!no,\c!preview=\v!no,\c!repeat=\v!no, \c!maxwidth=\@@exmaxwidth,\c!maxheight=\@@exmaxheight, - \c!scale=,\c!width=,\c!height=,\c!display=,\c!lines=,\c!grid=, + \c!scale=,\c!xscale=,\c!yscale=,\c!width=,\c!height=,\c!display=,\c!lines=,\c!grid=, %\c!foregroundcolor=, \c!color=,\c!conversion=\@@exconversion,\c!prefix=\@@exprefix,\c!cache=\@@excache, \c!factor=,\c!hfactor=,\c!wfactor=]% @@ -1105,8 +1141,8 @@ {\let\@@eftype\c!mps} {\processaction [\@@effiletype] - [ \c!tex=>\let\@@eftype\c!tex, - \c!tmp=>\let\@@eftype\c!tex + [ \c!tex=>\let\@@eftype\c!tex, % check + \c!tmp=>\let\@@eftype\c!tex % check \edef\@@effilepref{\bufferprefix}% \edef\@@effilename{\@@effilepref\@@effilename}, % todo: nop when conversion @@ -1167,19 +1203,19 @@ \edef\@@effullname{\@@effilename.\@@effiletype}% \def\figureextension##1{\@@effiletype}% \fi}% -% begin prelocate to be converted image -\let\@@efconversionpath\empty -\let\@@efconversionfile\@@effilename -\let\@@efconversiontype\@@effiletype -\doifmodeelse{\systemmodeprefix\v!first} - {\doifelsenothing\@@efconversion\donefalse\donetrue}% - {\donefalse}% -\ifdone - \chardef\figurestatus\zerocount - \locatefigureconversionfile - \chardef\figurestatus\zerocount -\fi -% end + % begin prelocate to be converted image + \let\@@efconversionpath\empty + \let\@@efconversionfile\@@effilename + \let\@@efconversiontype\@@effiletype + \doifmodeelse{\systemmodeprefix\v!first} + {\doifelsenothing\@@efconversion\donefalse\donetrue}% + {\donefalse}% + \ifdone + \chardef\figurestatus\zerocount + \locatefigureconversionfile + \chardef\figurestatus\zerocount + \fi + % end \doifelse\@@efpreset\v!no {\doifelse\@@eftype\s!unknown {\chardef\figurestatus\zerocount @@ -2252,10 +2288,10 @@ \c!reset=\v!no, \c!maxwidth=\@@efwidth, \c!maxheight=\@@efheight, - \c!bodyfont=\korpsgrootte, + \c!bodyfont=\bodyfontsize, \c!directory=, \c!file=\f!utilityfilename.\f!figureextension, - \c!radius=.5\korpsgrootte, + \c!radius=.5\bodyfontsize, \c!corner=\v!rectangular, \c!frame=\v!off, \c!background=, % new diff --git a/tex/context/base/core-fld.tex b/tex/context/base/core-fld.tex index 5f03d699e..4262bbdd2 100644 --- a/tex/context/base/core-fld.tex +++ b/tex/context/base/core-fld.tex @@ -28,6 +28,19 @@ \unprotect +%D First we hook fields into the (viewer based) layering mechanism +%D (implemented as properties). + +\ifx\currentlayerproperty\undefined\else \let\currentlayerproperty\empty\fi + +\appendtoks + \doif\@@iafieldlayer\v!auto + {\def\@@iafieldlayer{\currentlayerproperty}}% +\to \everysetupinteraction + +\setupinteraction + [\c!fieldlayer=\v!auto] % auto by default + %D Internal command, linked to \type{\definesymbol}. \def\dogetfieldsymbol#1% @@ -93,7 +106,6 @@ \@@DriverFieldAfterKey,\@@DriverFieldFormat,\@@DriverFieldValidate,\@@DriverFieldCalculate,% \@@DriverFieldFocusIn,\@@DriverFieldFocusOut}} - \def\presettextfield {\preparefieldvariables \dopresettextfield @@ -771,7 +783,7 @@ {\setvalue{\strippedcsname\setupfield##1}{\dosetupfield[##1][#1,##2][#2,##3][#3,##4][#4,##5]}}}% \else\iffirstargument \doifelse{#1}\v!reset - {\let\dodosetupfield\normaldodosetupfield} + {\resetfields} {\setupfields[][][][#1]}% checken \else \writestatus\m!fields{provide either 1 or 4 arguments}% @@ -780,6 +792,11 @@ \def\setupfields {\doquadrupleempty\dosetupfields} +\def\resetfields + {\let\dodosetupfield\normaldodosetupfield} + +% \setupfields[\v!reset] + % opties: veld, label, kader, vertikaal/horizontaal \newif\ifShowFieldLabel @@ -798,8 +815,8 @@ \HorizontalFieldfalse\VerticalFieldfalse, \v!label=>\ShowFieldLabeltrue, \v!frame=>\ShowFieldFrametrue, - \v!horizontal=>\HorizontalFieldtrue, - \v!vertical=>\VerticalFieldtrue]% + \v!horizontal=>\HorizontalFieldtrue, + \v!vertical=>\VerticalFieldtrue]% \ifVerticalField \getparameters[\??fd] [\c!distance=\!!zeropoint,\c!inbetween=\vskip\@@localoffset, @@ -846,7 +863,7 @@ \c!afterkey=,\c!format=,\c!validate=,\c!calculate=, \c!focusin=,\c!focusout=, \c!fieldoffset=\!!zeropoint,\c!fieldbackgroundcolor=, - \c!fieldframecolor=,\c!fieldlayer=,#5]% + \c!fieldframecolor=,\c!fieldlayer=\@@iafieldlayer,#5]% \scratchdimen\framedwidth \edef\@@DriverFieldWidth {\the\scratchdimen}% \scratchdimen\framedheight\edef\@@DriverFieldHeight{\the\scratchdimen}% \vfill @@ -887,7 +904,7 @@ \c!focusin=,\c!focusout=, \c!afterkey=,\c!format=,\c!validate=,\c!calculate=, \c!fieldoffset=\!!zeropoint,\c!fieldbackgroundcolor=, - \c!fieldframecolor=,\c!fieldlayer=,#5,\c!align=] + \c!fieldframecolor=,\c!fieldlayer=\@@iafieldlayer,#5,\c!align=] {\dogetcommacommandelement1\from\@@DriverFieldValues\to\@@DriverFieldValue \ifx\@@DriverFieldValue\empty \let\@@DriverFieldValue\@@DriverFieldDefault @@ -995,7 +1012,8 @@ [\c!frame=\v!off, \c!option=, \c!regionin=JS(Vide_Field{\currentsystemfield:txt}), - \c!regionout=JS(Hide_Field{\currentsystemfield:txt})]% + \c!regionout=JS(Hide_Field{\currentsystemfield:txt}), + \c!fieldlayer=\@@iafieldlayer]% \lower2ex\hbox to \zeropoint {\fitfield[\currentsystemfield:but]}% #2}% @@ -1004,7 +1022,7 @@ %D And one more: -\def\definefieldstack% +\def\definefieldstack {\dotripleargument\dodefinefieldstack} \def\dodefinefieldstack[#1][#2][#3]% name, symbols, settings diff --git a/tex/context/base/core-mis.tex b/tex/context/base/core-mis.tex index 2a08f6ee3..7de9e1fdb 100644 --- a/tex/context/base/core-mis.tex +++ b/tex/context/base/core-mis.tex @@ -89,7 +89,8 @@ \appendtoks \def\MetaPost{MetaPost}\to\simplifiedcommands \appendtoks \def\MetaFont{MetaFont}\to\simplifiedcommands \appendtoks \def\MetaFun{MetaFun}\to\simplifiedcommands -\appendtoks \def||{-}\to\simplifiedcommands +%appendtoks \def||{-}\to\simplifiedcommands +\appendtoks \def|#1|{\ifx#1\empty\empty-\else#1\fi}\to\simplifiedcommands \appendtoks\let\buildtextaccent\secondoftwoarguments\to\simplifiedcommands @@ -2455,15 +2456,18 @@ % scale \def\doscalelikeafigure % quite dirty and potential interference possible - {\doifsomething{\@@xyfactor\@@xyhfactor\@@xywfactor\@@xyscale + {\doifsomething{\@@xyscale\@@xyxscale\@@xyyscale + \@@xyfactor\@@xyhfactor\@@xywfactor \@@xywidth\@@xyheight\@@xylines} - {\let \@@efscale \@@xyscale + {\let \@@efscale \@@xyscale + \let \@@efxscale \@@xyxscale + \let \@@efyscale \@@xyyscale \let \@@effactor \@@xyfactor \let \@@efwfactor\@@xywfactor \let \@@efhfactor\@@xyhfactor - \let \@@efwidth\@@xywidth + \let \@@efwidth \@@xywidth \let \@@efheight \@@xyheight - \let \@@eflines \@@xylines + \let \@@eflines \@@xylines \let \@@efgrid \@@xygrid \let \@@epx \!!zeropoint \let \@@epy \!!zeropoint @@ -2482,12 +2486,12 @@ \scratchdimen\scay\points \divide\scratchdimen \plushundred \edef\@@xysy{\withoutpt\the\scratchdimen}}} -\def\doscale[#1]% +\def\doscale[#1]% todo: xscale/yscale {\bgroup \forgetall \getparameters [\??xy] - [\c!scale=,\c!width=,\c!height=,\c!lines=, + [\c!scale=,\c!xscale=,\c!yscale=,\c!width=,\c!height=,\c!lines=, \c!factor=,\c!hfactor=,\c!wfactor=,\c!grid=, \c!sx=1,\c!sy=1,#1]% \dowithnextbox diff --git a/tex/context/base/core-nav.tex b/tex/context/base/core-nav.tex index 2f06b70a2..a55022d77 100644 --- a/tex/context/base/core-nav.tex +++ b/tex/context/base/core-nav.tex @@ -52,43 +52,54 @@ \def\resetinteractionparameter#1% use with case, no checking done {\letvalue{\??ia#1}\empty} +% \def\interactionparameter#1% +% {\csname\??ia#1\endcsname} + +\newtoks\everysetupinteraction + \def\setupinteraction {\dosingleargument\dodosetupinteraction} \def\dodosetupinteraction[#1]% % \dosetupinteraction == special {\getparameters[\??ia][#1]% - \doifelse\@@iastate\v!start - {\iflocation\else - \showmessage\m!interactions2{\ifusepagedestinations\space(PAGE)\fi}% - \global\locationtrue - \fi} - {\iflocation - \showmessage\m!interactions3{\ifusepagedestinations\space(PAGE)\fi}% - \global\locationfalse - \fi}% - \iflocation - \setsystemmode \v!interaction - \else - \resetsystemmode\v!interaction - \fi - \dosetuppageview\@@iafocus - \doifsomething\@@iacalculate - {\doregistercalculationset\@@iacalculate}% - \doifelse\@@iastrut\v!yes - \locationstruttrue - \locationstrutfalse - \doifelse\@@iaclick\v!yes - \highlighthyperlinkstrue - \highlighthyperlinksfalse - \doifelse\@@iasplit\v!yes - \locationsplittrue - \locationsplitfalse - \doifelse\@@iadisplay\v!new - \gotonewwindowtrue - \gotonewwindowfalse - \doifelse\@@iapage\v!yes - {\global\usepagedestinationstrue} - {\global\usepagedestinationsfalse}} + \the\everysetupinteraction} + +% todo, move partial append to where the action happens + +\appendtoks + \doifelse\@@iastate\v!start + {\iflocation\else + \showmessage\m!interactions2{\ifusepagedestinations\space(PAGE)\fi}% + \global\locationtrue + \fi} + {\iflocation + \showmessage\m!interactions3{\ifusepagedestinations\space(PAGE)\fi}% + \global\locationfalse + \fi}% + \iflocation + \setsystemmode \v!interaction + \else + \resetsystemmode\v!interaction + \fi + \dosetuppageview\@@iafocus + \doifsomething\@@iacalculate + {\doregistercalculationset\@@iacalculate}% + \doifelse\@@iastrut\v!yes + \locationstruttrue + \locationstrutfalse + \doifelse\@@iaclick\v!yes + \highlighthyperlinkstrue + \highlighthyperlinksfalse + \doifelse\@@iasplit\v!yes + \locationsplittrue + \locationsplitfalse + \doifelse\@@iadisplay\v!new + \gotonewwindowtrue + \gotonewwindowfalse + \doifelse\@@iapage\v!yes + {\global\usepagedestinationstrue} + {\global\usepagedestinationsfalse}% +\to \everysetupinteraction %D We have to make sure of some settings: diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex index 2c4db940b..bf60a2ae6 100644 --- a/tex/context/base/core-sec.tex +++ b/tex/context/base/core-sec.tex @@ -1078,10 +1078,14 @@ \global\paginageblokkeerdtrue \fi} +% \setuphead[section][aligntitle=float] % permits title next to sidefloat +% +% \placefigure[left]{}{} \section{\dorecurse{10}{bagger }} \input tufte + \def\dohandlepagebreakAB#1% will be replaced by a more clever (signaling) mechanism (in beta) - {\flushsidefloats + {\doifnotvalue{\??ko#1\c!aligntitle}\v!float\flushsidefloats \getvalue{\??ko#1\c!before}% - %\whitespace vervangen door \noindent elders + % \whitespace vervangen door \noindent elders \relax \ifpaginageblokkeerd \global\paginageblokkeerdfalse @@ -1096,6 +1100,7 @@ \dosomebreak\allowbreak \fi \fi + \doifvalue{\??ko#1\c!aligntitle}\v!float\indent \xdef\@@kolevel{\getvalue{\??se\@@sectie\c!level}}} \def\dohandlepagebreakBB#1#2#3% @@ -1861,7 +1866,7 @@ \everypar\emptytoks % needed indeed \noindent % ipv \whitespace elders, na \forgetall ! \bgroup - \doifelsevalue{\??ko#1\c!aligntitle}\v!yes % new + \doifinsetelse{\getvalue{\??ko#1\c!aligntitle}}{\v!yes,\v!float}% new {\skip0 1\leftskip \skip2 1\rightskip \xdef\localheadskip{\the\skip0}% @@ -1989,18 +1994,18 @@ {\doifvaluenothing{\??ko#1\c!file}{\autocrossdocumentfalse}} {\autocrossdocumentfalse}% % no message needed here, should be a proper switch -\noflines\zerocount + \noflines\zerocount \ifdisplaysectionhead -% new -\processaction - [\getvalue{\??ko#1\c!hang}] - [ \v!line=>\hangheadplacement\noflines\zerocount, - \v!broad=>\hangheadplacement\getnoflines\scratchdimen, - \v!fit=>\hangheadplacement\getrawnoflines\scratchdimen, - \v!none=>\noflines\zerocount, - \v!default=>\noflines\zerocount, - \v!unknown=>\hangheadplacement\noflines0\commalistelement\advance\noflines\minusone]% -% so far + % new + \processaction + [\getvalue{\??ko#1\c!hang}] + [ \v!line=>\hangheadplacement\noflines\zerocount, + \v!broad=>\hangheadplacement\getnoflines\scratchdimen, + \v!fit=>\hangheadplacement\getrawnoflines\scratchdimen, + \v!none=>\noflines\zerocount, + \v!default=>\noflines\zerocount, + \v!unknown=>\hangheadplacement\noflines0\commalistelement\advance\noflines\minusone]% + % so far \let\headlastlinewidth\!!zeropoint \snaptogrid[\getvalue{\??ko#1\c!grid}]\hbox {\hskip\localheadskip @@ -2019,11 +2024,13 @@ \fi}% \doflushnotes % new, not really needed \endgraf -\ifnum\noflines>\zerocount - \dorecurse\noflines{\nointerlineskip\dosomebreak\nobreak\strut\endgraf}% -\fi - \nointerlineskip - \dosomebreak\nobreak + \ifvmode + \ifnum\noflines>\zerocount + \dorecurse\noflines{\nointerlineskip\dosomebreak\nobreak\strut\endgraf}% + \fi + \nointerlineskip + \dosomebreak\nobreak + \fi #2% \else \strut diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex index 29651ae71..229f47598 100644 --- a/tex/context/base/core-spa.tex +++ b/tex/context/base/core-spa.tex @@ -3653,7 +3653,7 @@ % \hyphenpenalty = ( 2.5 * \hsize ) / \raggedness % \tolerance >= 1500 % was 200 -% \raggedness = 2 .. 6\korpsgrootte +% \raggedness = 2 .. 6\bodyfontsize \chardef\raggedstatus=0 % normal left center right diff --git a/tex/context/base/core-sys.tex b/tex/context/base/core-sys.tex index f606b1ad7..cd2908b9c 100644 --- a/tex/context/base/core-sys.tex +++ b/tex/context/base/core-sys.tex @@ -76,7 +76,7 @@ \or \setsystemmode\v!first % 3 : first and only run \or - \setsystemmode\v!last % 4 : extra last run + \setsystemmode\v!last % 4 : (extra) last run \fi \processaction [\@@svtype] diff --git a/tex/context/base/core-ver.tex b/tex/context/base/core-ver.tex index 7cd0d6100..a488a3329 100644 --- a/tex/context/base/core-ver.tex +++ b/tex/context/base/core-ver.tex @@ -771,12 +771,12 @@ {\edef\!!stringa{\csname\??tp#1\c!blank\endcsname}}% \processaction [\!!stringa] - [\v!standard=>\scratchskip\ctxparskip, + [ \v!standard=>\scratchskip\ctxparskip, \v!small=>\scratchskip\blankokleinmaat, \v!medium=>\scratchskip\blankomiddelmaat, - \v!big=>\scratchskip\blankogrootmaat, - \v!halfline=>\scratchskip.5\baselineskip, - \v!line=>\scratchskip\baselineskip, + \v!big=>\scratchskip\blankogrootmaat, + \v!halfline=>\scratchskip.5\baselineskip, + \v!line=>\scratchskip\baselineskip, \v!none=>\scratchskip\zeropoint, \s!unknown=>\scratchskip\commalistelement]% \ifgridsnapping @@ -794,9 +794,17 @@ %D indirect way. As we will see, they are a specific case of a %D more general mechanism. +% \def\dostarttyping#1% +% {\getvalue{\??tp#1\c!before}% +% \startpacked % includes \bgroup +% \initializetyping{#1}% +% \startverbatimcolor +% \expandafter\processdisplayverbatim\expandafter{\s!stop#1}} + \def\dostarttyping#1% {\getvalue{\??tp#1\c!before}% \startpacked % includes \bgroup + \dosetuptypelinenumbering{#1}{}% \initializetyping{#1}% \startverbatimcolor \expandafter\processdisplayverbatim\expandafter{\s!stop#1}} @@ -1165,7 +1173,7 @@ \dodotypefile[\v!file][]{#3}% \fi\fi} -\unprotected \def\dosetuptypelinenumbering#1#2% +\def\dosetuptypelinenumbering#1#2% {\doifundefined{\??tp#1\c!start}{\setuptyping[#1][\c!start=1,\c!stop=,\c!step=1,\c!nlines=,#2]}% \doifelsevalue{\??tp#1\c!numbering}\v!file {\setuplinenumbering[\c!method=\v!file]% @@ -1176,11 +1184,14 @@ \doifvaluenothing{\??tp#1\c!step }{\setvalue{\??tp#1\c!step }{1}}% \setuplinenumbering [\c!method=\v!type, + \c!continue=\getvalue{\??tp#1\c!continue}, \c!start=\getvalue{\??tp#1\c!start}, \c!step=\getvalue{\??tp#1\c!step}]% \donetrue} {\donefalse}}% \ifdone + \ifx\startlinenumbering\undefined \let\startlinenumbering\relax \fi + \ifx\stoplinenumbering \undefined \let\stoplinenumbering \relax \fi \def\beginofverbatimlines{\startlinenumbering}% \def\endofverbatimlines {\stoplinenumbering }% \fi} diff --git a/tex/context/base/enco-037.tex b/tex/context/base/enco-037.tex new file mode 100644 index 000000000..d9fc653b2 --- /dev/null +++ b/tex/context/base/enco-037.tex @@ -0,0 +1,276 @@ +%D \module +%D [ file=enco-037, +%D version=2006.02.13, +%D title=\CONTEXT\ \UNICODE\ Macros, +%D subtitle=Encoding for vector 37, +%D author=Luigi Scarso, +%D date=\currentdate, +%D copyright={PRAGMA}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\startencoding[default] + +\definecharacter UnicodeLightHorizontal {\uchar{37}{000}} %%BOX DRAWINGS LIGHT HORIZONTAL +\definecharacter UnicodeHeavyHorizontal {\uchar{37}{001}} %%BOX DRAWINGS HEAVY HORIZONTAL +\definecharacter UnicodeLightVertical {\uchar{37}{002}} %%BOX DRAWINGS LIGHT VERTICAL +\definecharacter UnicodeHeavyVertical {\uchar{37}{003}} %%BOX DRAWINGS HEAVY VERTICAL +\definecharacter UnicodeLightTripleDashHorizontal {\uchar{37}{004}} %%BOX DRAWINGS LIGHT TRIPLE DASH HORIZONTAL +\definecharacter UnicodeHeavyTripleDashHorizontal {\uchar{37}{005}} %%BOX DRAWINGS HEAVY TRIPLE DASH HORIZONTAL +\definecharacter UnicodeLightTripleDashVertical {\uchar{37}{006}} %%BOX DRAWINGS LIGHT TRIPLE DASH VERTICAL +\definecharacter UnicodeHeavyTripleDashVertical {\uchar{37}{007}} %%BOX DRAWINGS HEAVY TRIPLE DASH VERTICAL +\definecharacter UnicodeLightQuadrupleDashHorizontal {\uchar{37}{008}} %%BOX DRAWINGS LIGHT QUADRUPLE DASH HORIZONTAL +\definecharacter UnicodeHeavyQuadrupleDashHorizontal {\uchar{37}{009}} %%BOX DRAWINGS HEAVY QUADRUPLE DASH HORIZONTAL +\definecharacter UnicodeLightQuadrupleDashVertical {\uchar{37}{010}} %%BOX DRAWINGS LIGHT QUADRUPLE DASH VERTICAL +\definecharacter UnicodeHeavyQuadrupleDashVertical {\uchar{37}{011}} %%BOX DRAWINGS HEAVY QUADRUPLE DASH VERTICAL +\definecharacter UnicodeLightDownAndRight {\uchar{37}{012}} %%BOX DRAWINGS LIGHT DOWN AND RIGHT +\definecharacter UnicodeDownLightAndRightHeavy {\uchar{37}{013}} %%BOX DRAWINGS DOWN LIGHT AND RIGHT HEAVY +\definecharacter UnicodeDownHeavyAndRightLight {\uchar{37}{014}} %%BOX DRAWINGS DOWN HEAVY AND RIGHT LIGHT +\definecharacter UnicodeHeavyDownAndRight {\uchar{37}{015}} %%BOX DRAWINGS HEAVY DOWN AND RIGHT +\definecharacter UnicodeLightDownAndLeft {\uchar{37}{016}} %%BOX DRAWINGS LIGHT DOWN AND LEFT +\definecharacter UnicodeDownLightAndLeftHeavy {\uchar{37}{017}} %%BOX DRAWINGS DOWN LIGHT AND LEFT HEAVY +\definecharacter UnicodeDownHeavyAndLeftLight {\uchar{37}{018}} %%BOX DRAWINGS DOWN HEAVY AND LEFT LIGHT +\definecharacter UnicodeHeavyDownAndLeft {\uchar{37}{019}} %%BOX DRAWINGS HEAVY DOWN AND LEFT +\definecharacter UnicodeLightUpAndRight {\uchar{37}{020}} %%BOX DRAWINGS LIGHT UP AND RIGHT +\definecharacter UnicodeUpLightAndRightHeavy {\uchar{37}{021}} %%BOX DRAWINGS UP LIGHT AND RIGHT HEAVY +\definecharacter UnicodeUpHeavyAndRightLight {\uchar{37}{022}} %%BOX DRAWINGS UP HEAVY AND RIGHT LIGHT +\definecharacter UnicodeHeavyUpAndRight {\uchar{37}{023}} %%BOX DRAWINGS HEAVY UP AND RIGHT +\definecharacter UnicodeLightUpAndLeft {\uchar{37}{024}} %%BOX DRAWINGS LIGHT UP AND LEFT +\definecharacter UnicodeUpLightAndLeftHeavy {\uchar{37}{025}} %%BOX DRAWINGS UP LIGHT AND LEFT HEAVY +\definecharacter UnicodeUpHeavyAndLeftLight {\uchar{37}{026}} %%BOX DRAWINGS UP HEAVY AND LEFT LIGHT +\definecharacter UnicodeHeavyUpAndLeft {\uchar{37}{027}} %%BOX DRAWINGS HEAVY UP AND LEFT +\definecharacter UnicodeLightVerticalAndRight {\uchar{37}{028}} %%BOX DRAWINGS LIGHT VERTICAL AND RIGHT +\definecharacter UnicodeVerticalLightAndRightHeavy {\uchar{37}{029}} %%BOX DRAWINGS VERTICAL LIGHT AND RIGHT HEAVY +\definecharacter UnicodeUpHeavyAndRightDownLight {\uchar{37}{030}} %%BOX DRAWINGS UP HEAVY AND RIGHT DOWN LIGHT +\definecharacter UnicodeDownHeavyAndRightUpLight {\uchar{37}{031}} %%BOX DRAWINGS DOWN HEAVY AND RIGHT UP LIGHT +\definecharacter UnicodeVerticalHeavyAndRightLight {\uchar{37}{032}} %%BOX DRAWINGS VERTICAL HEAVY AND RIGHT LIGHT +\definecharacter UnicodeDownLightAndRightUpHeavy {\uchar{37}{033}} %%BOX DRAWINGS DOWN LIGHT AND RIGHT UP HEAVY +\definecharacter UnicodeUpLightAndRightDownHeavy {\uchar{37}{034}} %%BOX DRAWINGS UP LIGHT AND RIGHT DOWN HEAVY +\definecharacter UnicodeHeavyVerticalAndRight {\uchar{37}{035}} %%BOX DRAWINGS HEAVY VERTICAL AND RIGHT +\definecharacter UnicodeLightVerticalAndLeft {\uchar{37}{036}} %%BOX DRAWINGS LIGHT VERTICAL AND LEFT +\definecharacter UnicodeVerticalLightAndLeftHeavy {\uchar{37}{037}} %%BOX DRAWINGS VERTICAL LIGHT AND LEFT HEAVY +\definecharacter UnicodeUpHeavyAndLeftDownLight {\uchar{37}{038}} %%BOX DRAWINGS UP HEAVY AND LEFT DOWN LIGHT +\definecharacter UnicodeDownHeavyAndLeftUpLight {\uchar{37}{039}} %%BOX DRAWINGS DOWN HEAVY AND LEFT UP LIGHT +\definecharacter UnicodeVerticalHeavyAndLeftLight {\uchar{37}{040}} %%BOX DRAWINGS VERTICAL HEAVY AND LEFT LIGHT +\definecharacter UnicodeDownLightAndLeftUpHeavy {\uchar{37}{041}} %%BOX DRAWINGS DOWN LIGHT AND LEFT UP HEAVY +\definecharacter UnicodeUpLightAndLeftDownHeavy {\uchar{37}{042}} %%BOX DRAWINGS UP LIGHT AND LEFT DOWN HEAVY +\definecharacter UnicodeHeavyVerticalAndLeft {\uchar{37}{043}} %%BOX DRAWINGS HEAVY VERTICAL AND LEFT +\definecharacter UnicodeLightDownAndHorizontal {\uchar{37}{044}} %%BOX DRAWINGS LIGHT DOWN AND HORIZONTAL +\definecharacter UnicodeLeftHeavyAndRightDownLight {\uchar{37}{045}} %%BOX DRAWINGS LEFT HEAVY AND RIGHT DOWN LIGHT +\definecharacter UnicodeRightHeavyAndLeftDownLight {\uchar{37}{046}} %%BOX DRAWINGS RIGHT HEAVY AND LEFT DOWN LIGHT +\definecharacter UnicodeDownLightAndHorizontalHeavy {\uchar{37}{047}} %%BOX DRAWINGS DOWN LIGHT AND HORIZONTAL HEAVY +\definecharacter UnicodeDownHeavyAndHorizontalLight {\uchar{37}{048}} %%BOX DRAWINGS DOWN HEAVY AND HORIZONTAL LIGHT +\definecharacter UnicodeRightLightAndLeftDownHeavy {\uchar{37}{049}} %%BOX DRAWINGS RIGHT LIGHT AND LEFT DOWN HEAVY +\definecharacter UnicodeLeftLightAndRightDownHeavy {\uchar{37}{050}} %%BOX DRAWINGS LEFT LIGHT AND RIGHT DOWN HEAVY +\definecharacter UnicodeHeavyDownAndHorizontal {\uchar{37}{051}} %%BOX DRAWINGS HEAVY DOWN AND HORIZONTAL +\definecharacter UnicodeLightUpAndHorizontal {\uchar{37}{052}} %%BOX DRAWINGS LIGHT UP AND HORIZONTAL +\definecharacter UnicodeLeftHeavyAndRightUpLight {\uchar{37}{053}} %%BOX DRAWINGS LEFT HEAVY AND RIGHT UP LIGHT +\definecharacter UnicodeRightHeavyAndLeftUpLight {\uchar{37}{054}} %%BOX DRAWINGS RIGHT HEAVY AND LEFT UP LIGHT +\definecharacter UnicodeUpLightAndHorizontalHeavy {\uchar{37}{055}} %%BOX DRAWINGS UP LIGHT AND HORIZONTAL HEAVY +\definecharacter UnicodeUpHeavyAndHorizontalLight {\uchar{37}{056}} %%BOX DRAWINGS UP HEAVY AND HORIZONTAL LIGHT +\definecharacter UnicodeRightLightAndLeftUpHeavy {\uchar{37}{057}} %%BOX DRAWINGS RIGHT LIGHT AND LEFT UP HEAVY +\definecharacter UnicodeLeftLightAndRightUpHeavy {\uchar{37}{058}} %%BOX DRAWINGS LEFT LIGHT AND RIGHT UP HEAVY +\definecharacter UnicodeHeavyUpAndHorizontal {\uchar{37}{059}} %%BOX DRAWINGS HEAVY UP AND HORIZONTAL +\definecharacter UnicodeLightVerticalAndHorizontal {\uchar{37}{060}} %%BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL +\definecharacter UnicodeLeftHeavyAndRightVerticalLight {\uchar{37}{061}} %%BOX DRAWINGS LEFT HEAVY AND RIGHT VERTICAL LIGHT +\definecharacter UnicodeRightHeavyAndLeftVerticalLight {\uchar{37}{062}} %%BOX DRAWINGS RIGHT HEAVY AND LEFT VERTICAL LIGHT +\definecharacter UnicodeVerticalLightAndHorizontalHeavy {\uchar{37}{063}} %%BOX DRAWINGS VERTICAL LIGHT AND HORIZONTAL HEAVY +\definecharacter UnicodeUpHeavyAndDownHorizontalLight {\uchar{37}{064}} %%BOX DRAWINGS UP HEAVY AND DOWN HORIZONTAL LIGHT +\definecharacter UnicodeDownHeavyAndUpHorizontalLight {\uchar{37}{065}} %%BOX DRAWINGS DOWN HEAVY AND UP HORIZONTAL LIGHT +\definecharacter UnicodeVerticalHeavyAndHorizontalLight {\uchar{37}{066}} %%BOX DRAWINGS VERTICAL HEAVY AND HORIZONTAL LIGHT +\definecharacter UnicodeLeftUpHeavyAndRightDownLight {\uchar{37}{067}} %%BOX DRAWINGS LEFT UP HEAVY AND RIGHT DOWN LIGHT +\definecharacter UnicodeRightUpHeavyAndLeftDownLight {\uchar{37}{068}} %%BOX DRAWINGS RIGHT UP HEAVY AND LEFT DOWN LIGHT +\definecharacter UnicodeLeftDownHeavyAndRightUpLight {\uchar{37}{069}} %%BOX DRAWINGS LEFT DOWN HEAVY AND RIGHT UP LIGHT +\definecharacter UnicodeRightDownHeavyAndLeftUpLight {\uchar{37}{070}} %%BOX DRAWINGS RIGHT DOWN HEAVY AND LEFT UP LIGHT +\definecharacter UnicodeDownLightAndUpHorizontalHeavy {\uchar{37}{071}} %%BOX DRAWINGS DOWN LIGHT AND UP HORIZONTAL HEAVY +\definecharacter UnicodeUpLightAndDownHorizontalHeavy {\uchar{37}{072}} %%BOX DRAWINGS UP LIGHT AND DOWN HORIZONTAL HEAVY +\definecharacter UnicodeRightLightAndLeftVerticalHeavy {\uchar{37}{073}} %%BOX DRAWINGS RIGHT LIGHT AND LEFT VERTICAL HEAVY +\definecharacter UnicodeLeftLightAndRightVerticalHeavy {\uchar{37}{074}} %%BOX DRAWINGS LEFT LIGHT AND RIGHT VERTICAL HEAVY +\definecharacter UnicodeHeavyVerticalAndHorizontal {\uchar{37}{075}} %%BOX DRAWINGS HEAVY VERTICAL AND HORIZONTAL +\definecharacter UnicodeLightDoubleDashHorizontal {\uchar{37}{076}} %%BOX DRAWINGS LIGHT DOUBLE DASH HORIZONTAL +\definecharacter UnicodeHeavyDoubleDashHorizontal {\uchar{37}{077}} %%BOX DRAWINGS HEAVY DOUBLE DASH HORIZONTAL +\definecharacter UnicodeLightDoubleDashVertical {\uchar{37}{078}} %%BOX DRAWINGS LIGHT DOUBLE DASH VERTICAL +\definecharacter UnicodeHeavyDoubleDashVertical {\uchar{37}{079}} %%BOX DRAWINGS HEAVY DOUBLE DASH VERTICAL +\definecharacter UnicodeDoubleHorizontal {\uchar{37}{080}} %%BOX DRAWINGS DOUBLE HORIZONTAL +\definecharacter UnicodeDoubleVertical {\uchar{37}{081}} %%BOX DRAWINGS DOUBLE VERTICAL +\definecharacter UnicodeDownSingleAndRightDouble {\uchar{37}{082}} %%BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE +\definecharacter UnicodeDownDoubleAndRightSingle {\uchar{37}{083}} %%BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE +\definecharacter UnicodeDoubleDownAndRight {\uchar{37}{084}} %%BOX DRAWINGS DOUBLE DOWN AND RIGHT +\definecharacter UnicodeDownSingleAndLeftDouble {\uchar{37}{085}} %%BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE +\definecharacter UnicodeDownDoubleAndLeftSingle {\uchar{37}{086}} %%BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE +\definecharacter UnicodeDoubleDownAndLeft {\uchar{37}{087}} %%BOX DRAWINGS DOUBLE DOWN AND LEFT +\definecharacter UnicodeUpSingleAndRightDouble {\uchar{37}{088}} %%BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE +\definecharacter UnicodeUpDoubleAndRightSingle {\uchar{37}{089}} %%BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE +\definecharacter UnicodeDoubleUpAndRight {\uchar{37}{090}} %%BOX DRAWINGS DOUBLE UP AND RIGHT +\definecharacter UnicodeUpSingleAndLeftDouble {\uchar{37}{091}} %%BOX DRAWINGS UP SINGLE AND LEFT DOUBLE +\definecharacter UnicodeUpDoubleAndLeftSingle {\uchar{37}{092}} %%BOX DRAWINGS UP DOUBLE AND LEFT SINGLE +\definecharacter UnicodeDoubleUpAndLeft {\uchar{37}{093}} %%BOX DRAWINGS DOUBLE UP AND LEFT +\definecharacter UnicodeVerticalSingleAndRightDouble {\uchar{37}{094}} %%BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE +\definecharacter UnicodeVerticalDoubleAndRightSingle {\uchar{37}{095}} %%BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE +\definecharacter UnicodeDoubleVerticalAndRight {\uchar{37}{096}} %%BOX DRAWINGS DOUBLE VERTICAL AND RIGHT +\definecharacter UnicodeVerticalSingleAndLeftDouble {\uchar{37}{097}} %%BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE +\definecharacter UnicodeVerticalDoubleAndLeftSingle {\uchar{37}{098}} %%BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE +\definecharacter UnicodeDoubleVerticalAndLeft {\uchar{37}{099}} %%BOX DRAWINGS DOUBLE VERTICAL AND LEFT +\definecharacter UnicodeDownSingleAndHorizontalDouble {\uchar{37}{100}} %%BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE +\definecharacter UnicodeDownDoubleAndHorizontalSingle {\uchar{37}{101}} %%BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE +\definecharacter UnicodeDoubleDownAndHorizontal {\uchar{37}{102}} %%BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL +\definecharacter UnicodeUpSingleAndHorizontalDouble {\uchar{37}{103}} %%BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE +\definecharacter UnicodeUpDoubleAndHorizontalSingle {\uchar{37}{104}} %%BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE +\definecharacter UnicodeDoubleUpAndHorizontal {\uchar{37}{105}} %%BOX DRAWINGS DOUBLE UP AND HORIZONTAL +\definecharacter UnicodeVerticalSingleAndHorizontalDouble {\uchar{37}{106}} %%BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE +\definecharacter UnicodeVerticalDoubleAndHorizontalSingle {\uchar{37}{107}} %%BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE +\definecharacter UnicodeDoubleVerticalAndHorizontal {\uchar{37}{108}} %%BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL +\definecharacter UnicodeLightArcDownAndRight {\uchar{37}{109}} %%BOX DRAWINGS LIGHT ARC DOWN AND RIGHT +\definecharacter UnicodeLightArcDownAndLeft {\uchar{37}{110}} %%BOX DRAWINGS LIGHT ARC DOWN AND LEFT +\definecharacter UnicodeLightArcUpAndLeft {\uchar{37}{111}} %%BOX DRAWINGS LIGHT ARC UP AND LEFT +\definecharacter UnicodeLightArcUpAndRight {\uchar{37}{112}} %%BOX DRAWINGS LIGHT ARC UP AND RIGHT +\definecharacter UnicodeLightDiagonalUpperRightToLowerLeft {\uchar{37}{113}} %%BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT +\definecharacter UnicodeLightDiagonalUpperLeftToLowerRight {\uchar{37}{114}} %%BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT +\definecharacter UnicodeLightDiagonalCross {\uchar{37}{115}} %%BOX DRAWINGS LIGHT DIAGONAL CROSS +\definecharacter UnicodeLightLeft {\uchar{37}{116}} %%BOX DRAWINGS LIGHT LEFT +\definecharacter UnicodeLightUp {\uchar{37}{117}} %%BOX DRAWINGS LIGHT UP +\definecharacter UnicodeLightRight {\uchar{37}{118}} %%BOX DRAWINGS LIGHT RIGHT +\definecharacter UnicodeLightDown {\uchar{37}{119}} %%BOX DRAWINGS LIGHT DOWN +\definecharacter UnicodeHeavyLeft {\uchar{37}{120}} %%BOX DRAWINGS HEAVY LEFT +\definecharacter UnicodeHeavyUp {\uchar{37}{121}} %%BOX DRAWINGS HEAVY UP +\definecharacter UnicodeHeavyRight {\uchar{37}{122}} %%BOX DRAWINGS HEAVY RIGHT +\definecharacter UnicodeHeavyDown {\uchar{37}{123}} %%BOX DRAWINGS HEAVY DOWN +\definecharacter UnicodeLightLeftAndHeavyRight {\uchar{37}{124}} %%BOX DRAWINGS LIGHT LEFT AND HEAVY RIGHT +\definecharacter UnicodeLightUpAndHeavyDown {\uchar{37}{125}} %%BOX DRAWINGS LIGHT UP AND HEAVY DOWN +\definecharacter UnicodeHeavyLeftAndLightRight {\uchar{37}{126}} %%BOX DRAWINGS HEAVY LEFT AND LIGHT RIGHT +\definecharacter UnicodeHeavyUpAndLightDown {\uchar{37}{127}} %%BOX DRAWINGS HEAVY UP AND LIGHT DOWN +\definecharacter UnicodeUpperHalfBlock {\uchar{37}{128}} %%UPPER HALF BLOCK +\definecharacter UnicodeLowerOneEighthBlock {\uchar{37}{129}} %%LOWER ONE EIGHTH BLOCK +\definecharacter UnicodeLowerOneQuarterBlock {\uchar{37}{130}} %%LOWER ONE QUARTER BLOCK +\definecharacter UnicodeLowerThreeEighthsBlock {\uchar{37}{131}} %%LOWER THREE EIGHTHS BLOCK +\definecharacter UnicodeLowerHalfBlock {\uchar{37}{132}} %%LOWER HALF BLOCK +\definecharacter UnicodeLowerFiveEighthsBlock {\uchar{37}{133}} %%LOWER FIVE EIGHTHS BLOCK +\definecharacter UnicodeLowerThreeQuartersBlock {\uchar{37}{134}} %%LOWER THREE QUARTERS BLOCK +\definecharacter UnicodeLowerSevenEighthsBlock {\uchar{37}{135}} %%LOWER SEVEN EIGHTHS BLOCK +\definecharacter UnicodeFullBlock {\uchar{37}{136}} %%FULL BLOCK +\definecharacter UnicodeLeftSevenEighthsBlock {\uchar{37}{137}} %%LEFT SEVEN EIGHTHS BLOCK +\definecharacter UnicodeLeftThreeQuartersBlock {\uchar{37}{138}} %%LEFT THREE QUARTERS BLOCK +\definecharacter UnicodeLeftFiveEighthsBlock {\uchar{37}{139}} %%LEFT FIVE EIGHTHS BLOCK +\definecharacter UnicodeLeftHalfBlock {\uchar{37}{140}} %%LEFT HALF BLOCK +\definecharacter UnicodeLeftThreeEighthsBlock {\uchar{37}{141}} %%LEFT THREE EIGHTHS BLOCK +\definecharacter UnicodeLeftOneQuarterBlock {\uchar{37}{142}} %%LEFT ONE QUARTER BLOCK +\definecharacter UnicodeLeftOneEighthBlock {\uchar{37}{143}} %%LEFT ONE EIGHTH BLOCK +\definecharacter UnicodeRightHalfBlock {\uchar{37}{144}} %%RIGHT HALF BLOCK +\definecharacter UnicodeLightShade {\uchar{37}{145}} %%LIGHT SHADE +\definecharacter UnicodeMediumShade {\uchar{37}{146}} %%MEDIUM SHADE +\definecharacter UnicodeDarkShade {\uchar{37}{147}} %%DARK SHADE +\definecharacter UnicodeUpperOneEighthBlock {\uchar{37}{148}} %%UPPER ONE EIGHTH BLOCK +\definecharacter UnicodeRightOneEighthBlock {\uchar{37}{149}} %%RIGHT ONE EIGHTH BLOCK +\definecharacter UnicodeQuadrantLowerLeft {\uchar{37}{150}} %%[Unassigned U+2596] +\definecharacter UnicodeQuadrantLowerRight {\uchar{37}{151}} %%[Unassigned U+2597] +\definecharacter UnicodeQuadrantUpperLeft {\uchar{37}{152}} %%[Unassigned U+2598] +\definecharacter UnicodeQuadrantUpperLeftAndLowerLeftAndLowerRight {\uchar{37}{153}} %%[Unassigned U+2599] +\definecharacter UnicodeQuadrantUpperLeftAndLowerRight {\uchar{37}{154}} %%[Unassigned U+259A] +\definecharacter UnicodeQuadrantUpperLeftAndUpperRightandLowerLeft {\uchar{37}{155}} %%[Unassigned U+259B] +\definecharacter UnicodeQuadrantUpperLeftAndUpperRightAndLowerRight {\uchar{37}{156}} %%[Unassigned U+259C] +\definecharacter UnicodeQuadrantUpperRight {\uchar{37}{157}} %%[Unassigned U+259D] +\definecharacter UnicodeQuadrantUpperRightAndLowerLeft {\uchar{37}{158}} %%[Unassigned U+259E] +\definecharacter UnicodeQuadrantUpperRightAndLowerLeftAndLowerRight {\uchar{37}{159}} %%[Unassigned U+259F] +\definecharacter UnicodeBlackSquare {\uchar{37}{160}} %%BLACK SQUARE +\definecharacter UnicodeWhiteSquare {\uchar{37}{161}} %%WHITE SQUARE +\definecharacter UnicodeWhiteSquareWithRoundedCorners {\uchar{37}{162}} %%WHITE SQUARE WITH ROUNDED CORNERS +\definecharacter UnicodeWhiteSquareContainingBlackSmallSquare {\uchar{37}{163}} %%WHITE SQUARE CONTAINING BLACK SMALL SQUARE +\definecharacter UnicodeSquareWithHorizontalFill {\uchar{37}{164}} %%SQUARE WITH HORIZONTAL FILL +\definecharacter UnicodeSquareWithVerticalFill {\uchar{37}{165}} %%SQUARE WITH VERTICAL FILL +\definecharacter UnicodeSquareWithOrthogonalCrosshatchFill {\uchar{37}{166}} %%SQUARE WITH ORTHOGONAL CROSSHATCH FILL +\definecharacter UnicodeSquareWithUpperLeftToLowerRightFill {\uchar{37}{167}} %%SQUARE WITH UPPER LEFT TO LOWER RIGHT FILL +\definecharacter UnicodeSquareWithUpperRightToLowerLeftFill {\uchar{37}{168}} %%SQUARE WITH UPPER RIGHT TO LOWER LEFT FILL +\definecharacter UnicodeSquareWithDiagonalCrosshatchFill {\uchar{37}{169}} %%SQUARE WITH DIAGONAL CROSSHATCH FILL +\definecharacter UnicodeBlackSmallSquare {\uchar{37}{170}} %%BLACK SMALL SQUARE +\definecharacter UnicodeWhiteSmallSquare {\uchar{37}{171}} %%WHITE SMALL SQUARE +\definecharacter UnicodeBlackRectangle {\uchar{37}{172}} %%BLACK RECTANGLE +\definecharacter UnicodeWhiteRectangle {\uchar{37}{173}} %%WHITE RECTANGLE +\definecharacter UnicodeBlackVerticalRectangle {\uchar{37}{174}} %%BLACK VERTICAL RECTANGLE +\definecharacter UnicodeWhiteVerticalRectangle {\uchar{37}{175}} %%WHITE VERTICAL RECTANGLE +\definecharacter UnicodeBlackParallelogram {\uchar{37}{176}} %%BLACK PARALLELOGRAM +\definecharacter UnicodeWhiteParallelogram {\uchar{37}{177}} %%WHITE PARALLELOGRAM +\definecharacter UnicodeBlackUpPointingTriangle {\uchar{37}{178}} %%BLACK UP-POINTING TRIANGLE +\definecharacter UnicodeWhiteUpPointingTriangle {\uchar{37}{179}} %%WHITE UP-POINTING TRIANGLE +\definecharacter UnicodeBlackUpPointingSmallTriangle {\uchar{37}{180}} %%BLACK UP-POINTING SMALL TRIANGLE +\definecharacter UnicodeWhiteUpPointingSmallTriangle {\uchar{37}{181}} %%WHITE UP-POINTING SMALL TRIANGLE +\definecharacter UnicodeBlackRightPointingTriangle {\uchar{37}{182}} %%BLACK RIGHT-POINTING TRIANGLE +\definecharacter UnicodeWhiteRightPointingTriangle {\uchar{37}{183}} %%WHITE RIGHT-POINTING TRIANGLE +\definecharacter UnicodeBlackRightPointingSmallTriangle {\uchar{37}{184}} %%BLACK RIGHT-POINTING SMALL TRIANGLE +\definecharacter UnicodeWhiteRightPointingSmallTriangle {\uchar{37}{185}} %%WHITE RIGHT-POINTING SMALL TRIANGLE +\definecharacter UnicodeBlackRightPointingPointer {\uchar{37}{186}} %%BLACK RIGHT-POINTING POINTER +\definecharacter UnicodeWhiteRightPointingPointer {\uchar{37}{187}} %%WHITE RIGHT-POINTING POINTER +\definecharacter UnicodeBlackDownPointingTriangle {\uchar{37}{188}} %%BLACK DOWN-POINTING TRIANGLE +\definecharacter UnicodeWhiteDownPointingTriangle {\uchar{37}{189}} %%WHITE DOWN-POINTING TRIANGLE +\definecharacter UnicodeBlackDownPointingSmallTriangle {\uchar{37}{190}} %%BLACK DOWN-POINTING SMALL TRIANGLE +\definecharacter UnicodeWhiteDownPointingSmallTriangle {\uchar{37}{191}} %%WHITE DOWN-POINTING SMALL TRIANGLE +\definecharacter UnicodeBlackLeftPointingTriangle {\uchar{37}{192}} %%BLACK LEFT-POINTING TRIANGLE +\definecharacter UnicodeWhiteLeftPointingTriangle {\uchar{37}{193}} %%WHITE LEFT-POINTING TRIANGLE +\definecharacter UnicodeBlackLeftPointingSmallTriangle {\uchar{37}{194}} %%BLACK LEFT-POINTING SMALL TRIANGLE +\definecharacter UnicodeWhiteLeftPointingSmallTriangle {\uchar{37}{195}} %%WHITE LEFT-POINTING SMALL TRIANGLE +\definecharacter UnicodeBlackLeftPointingPointer {\uchar{37}{196}} %%BLACK LEFT-POINTING POINTER +\definecharacter UnicodeWhiteLeftPointingPointer {\uchar{37}{197}} %%WHITE LEFT-POINTING POINTER +\definecharacter UnicodeBlackDiamond {\uchar{37}{198}} %%BLACK DIAMOND +\definecharacter UnicodeWhiteDiamond {\uchar{37}{199}} %%WHITE DIAMOND +\definecharacter UnicodeWhiteDiamondContainingBlackSmallDiamond {\uchar{37}{200}} %%WHITE DIAMOND CONTAINING BLACK SMALL DIAMOND +\definecharacter UnicodeFisheye {\uchar{37}{201}} %%FISHEYE +\definecharacter UnicodeLozenge {\uchar{37}{202}} %%LOZENGE +\definecharacter UnicodeWhiteCircle {\uchar{37}{203}} %%WHITE CIRCLE +\definecharacter UnicodeDottedCircle {\uchar{37}{204}} %%DOTTED CIRCLE +\definecharacter UnicodeCircleWithVerticalFill {\uchar{37}{205}} %%CIRCLE WITH VERTICAL FILL +\definecharacter UnicodeBullseye {\uchar{37}{206}} %%BULLSEYE +\definecharacter UnicodeBlackCircle {\uchar{37}{207}} %%BLACK CIRCLE +\definecharacter UnicodeCircleWithLeftHalfBlack {\uchar{37}{208}} %%CIRCLE WITH LEFT HALF BLACK +\definecharacter UnicodeCircleWithRightHalfBlack {\uchar{37}{209}} %%CIRCLE WITH RIGHT HALF BLACK +\definecharacter UnicodeCircleWithLowerHalfBlack {\uchar{37}{210}} %%CIRCLE WITH LOWER HALF BLACK +\definecharacter UnicodeCircleWithUpperHalfBlack {\uchar{37}{211}} %%CIRCLE WITH UPPER HALF BLACK +\definecharacter UnicodeCircleWithUpperRightQuadrantBlack {\uchar{37}{212}} %%CIRCLE WITH UPPER RIGHT QUADRANT BLACK +\definecharacter UnicodeCircleWithAllButUpperLeftQuadrantBlack {\uchar{37}{213}} %%CIRCLE WITH ALL BUT UPPER LEFT QUADRANT BLACK +\definecharacter UnicodeLeftHalfBlackCircle {\uchar{37}{214}} %%LEFT HALF BLACK CIRCLE +\definecharacter UnicodeRightHalfBlackCircle {\uchar{37}{215}} %%RIGHT HALF BLACK CIRCLE +\definecharacter UnicodeInverseBullet {\uchar{37}{216}} %%INVERSE BULLET +\definecharacter UnicodeInverseWhiteCircle {\uchar{37}{217}} %%INVERSE WHITE CIRCLE +\definecharacter UnicodeUpperHalfInverseWhiteCircle {\uchar{37}{218}} %%UPPER HALF INVERSE WHITE CIRCLE +\definecharacter UnicodeLowerHalfInverseWhiteCircle {\uchar{37}{219}} %%LOWER HALF INVERSE WHITE CIRCLE +\definecharacter UnicodeUpperLeftQuadrantCircularArc {\uchar{37}{220}} %%UPPER LEFT QUADRANT CIRCULAR ARC +\definecharacter UnicodeUpperRightQuadrantCircularArc {\uchar{37}{221}} %%UPPER RIGHT QUADRANT CIRCULAR ARC +\definecharacter UnicodeLowerRightQuadrantCircularArc {\uchar{37}{222}} %%LOWER RIGHT QUADRANT CIRCULAR ARC +\definecharacter UnicodeLowerLeftQuadrantCircularArc {\uchar{37}{223}} %%LOWER LEFT QUADRANT CIRCULAR ARC +\definecharacter UnicodeUpperHalfCircle {\uchar{37}{224}} %%UPPER HALF CIRCLE +\definecharacter UnicodeLowerHalfCircle {\uchar{37}{225}} %%LOWER HALF CIRCLE +\definecharacter UnicodeBlackLowerRightTriangle {\uchar{37}{226}} %%BLACK LOWER RIGHT TRIANGLE +\definecharacter UnicodeBlackLowerLeftTriangle {\uchar{37}{227}} %%BLACK LOWER LEFT TRIANGLE +\definecharacter UnicodeBlackUpperLeftTriangle {\uchar{37}{228}} %%BLACK UPPER LEFT TRIANGLE +\definecharacter UnicodeBlackUpperRightTriangle {\uchar{37}{229}} %%BLACK UPPER RIGHT TRIANGLE +\definecharacter UnicodeWhiteBullet {\uchar{37}{230}} %%WHITE BULLET +\definecharacter UnicodeSquareWithLeftHalfBlack {\uchar{37}{231}} %%SQUARE WITH LEFT HALF BLACK +\definecharacter UnicodeSquareWithRightHalfBlack {\uchar{37}{232}} %%SQUARE WITH RIGHT HALF BLACK +\definecharacter UnicodeSquareWithUpperLeftDiagonalHalfBlack {\uchar{37}{233}} %%SQUARE WITH UPPER LEFT DIAGONAL HALF BLACK +\definecharacter UnicodeSquareWithLowerRightDiagonalHalfBlack {\uchar{37}{234}} %%SQUARE WITH LOWER RIGHT DIAGONAL HALF BLACK +\definecharacter UnicodeWhiteSquareWithVerticalBisectingLine {\uchar{37}{235}} %%WHITE SQUARE WITH VERTICAL BISECTING LINE +\definecharacter UnicodeWhiteUpPointingTriangleWithDot {\uchar{37}{236}} %%WHITE UP-POINTING TRIANGLE WITH DOT +\definecharacter UnicodeUpPointingTriangleWithLeftHalfBlack {\uchar{37}{237}} %%UP-POINTING TRIANGLE WITH LEFT HALF BLACK +\definecharacter UnicodeUpPointingTriangleWithRightHalfBlack {\uchar{37}{238}} %%UP-POINTING TRIANGLE WITH RIGHT HALF BLACK +\definecharacter UnicodeLargeCircle {\uchar{37}{239}} %%LARGE CIRCLE +\definecharacter UnicodeWhiteSquareWithUpperLeftQuadrant {\uchar{37}{240}} %%WHITE SQUARE WITH UPPER LEFT QUADRANT +\definecharacter UnicodeWhiteSquareWithLowerLeftQuadrant {\uchar{37}{241}} %%WHITE SQUARE WITH LOWER LEFT QUADRANT +\definecharacter UnicodeWhiteSquareWithLowerRightQuadrant {\uchar{37}{242}} %%WHITE SQUARE WITH LOWER RIGHT QUADRANT +\definecharacter UnicodeWhiteSquareWithUpperRightQuadrant {\uchar{37}{243}} %%WHITE SQUARE WITH UPPER RIGHT QUADRANT +\definecharacter UnicodeWhiteCircleWithUpperLeftQuadrant {\uchar{37}{244}} %%WHITE CIRCLE WITH UPPER LEFT QUADRANT +\definecharacter UnicodeWhiteCircleWithLowerLeftQuadrant {\uchar{37}{245}} %%WHITE CIRCLE WITH LOWER LEFT QUADRANT +\definecharacter UnicodeWhiteCircleWithLowerRightQuadrant {\uchar{37}{246}} %%WHITE CIRCLE WITH LOWER RIGHT QUADRANT +\definecharacter UnicodeWhiteCircleWithUpperRightQuadrant {\uchar{37}{247}} %%WHITE CIRCLE WITH UPPER RIGHT QUADRANT +\definecharacter UnicodeUpperLeftTriangle {\uchar{37}{248}} %%[Unassigned U+25F8] +\definecharacter UnicodeUpperRightTriangle {\uchar{37}{249}} %%[Unassigned U+25F9] +\definecharacter UnicodeLowerLeftTriangle {\uchar{37}{250}} %%[Unassigned U+25FA] +\definecharacter UnicodeWhiteMediumSquare {\uchar{37}{251}} %%[Unassigned U+25FB] +\definecharacter UnicodeBlackMediumSquare {\uchar{37}{252}} %%[Unassigned U+25FC] +\definecharacter UnicodeWhiteMediumSmallSquare {\uchar{37}{253}} %%[Unassigned U+25FD] +\definecharacter UnicodeBlackMediumSmallSquare {\uchar{37}{254}} %%[Unassigned U+25FE] +\definecharacter UnicodeLowerRightTriangle {\uchar{37}{255}} %%[Unassigned U+25FF] + +\stopencoding + +\endinput + diff --git a/tex/context/base/m-cweb.tex b/tex/context/base/m-cweb.tex index 65184ddae..1d3455acf 100644 --- a/tex/context/base/m-cweb.tex +++ b/tex/context/base/m-cweb.tex @@ -224,9 +224,9 @@ %D The original macros are based on a 10~point bodyfont size. We %D therefore have to specify dimension in points a bit %D different. Specifications like .6pt are changed to -%D \type{.06} times \type{\korpsgrootte}. +%D \type{.06} times \type{\bodyfontsize}. -\defCWEBmacro\CWEBpt {\korpsgrootte} % still dutch +\defCWEBmacro\CWEBpt {\bodyfontsize} % still dutch %D \macros{CEE,UNIX,TEX,CPLUSPLUS}{} %D diff --git a/tex/context/base/mult-con.tex b/tex/context/base/mult-con.tex index cf3da58b2..3ed401edb 100644 --- a/tex/context/base/mult-con.tex +++ b/tex/context/base/mult-con.tex @@ -2136,6 +2136,10 @@ subsubsubsubsubsubject: subsubsubsubsubonderwerp subsubsubsubsub endfassung finalni finale final final + float: blok float + gleitobjekt plvouciobjekt + oggettomobile obiectmobil + flottant depth: diepte depth tiefe podlehloubky profondita adancime diff --git a/tex/context/base/page-bck.tex b/tex/context/base/page-bck.tex index 22596001d..9dcc920ad 100644 --- a/tex/context/base/page-bck.tex +++ b/tex/context/base/page-bck.tex @@ -524,7 +524,7 @@ \setupbackgrounds [\v!paper,\v!page,\v!leftpage,\v!rightpage] [\c!frame=\v!off, - \c!radius=.5\korpsgrootte, + \c!radius=.5\bodyfontsize, \c!corner=\v!rectangular, \c!background=, \c!screen=\@@rsscreen, diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex index a19c326a3..8e4c16e36 100644 --- a/tex/context/base/page-flt.tex +++ b/tex/context/base/page-flt.tex @@ -557,8 +557,8 @@ {\presetlocalframed[\??fl#1]% \setupfloat [#1] - [\c!width=8\lineheight, % 15\korpsgrootte, - \c!height=6\lineheight, % 10\korpsgrootte, + [\c!width=8\lineheight, % 15\bodyfontsize, + \c!height=6\lineheight, % 10\bodyfontsize, \c!minwidth=, \c!maxwidth=, \c!maxheight=, @@ -1339,7 +1339,7 @@ \def\addlocalbackgroundtobox{\resetglobal\gobbleoneargument}% \fi -\def\captionminwidth {15\korpsgrootte} +\def\captionminwidth {15\bodyfontsize} \def\captionovershoot {2em} \def\dopreparenocaption#1#2#3#4% @@ -2068,7 +2068,7 @@ \c!height=\v!fit, \c!offset=\v!overlay, \c!frame=\v!off, - \c!radius=.5\korpsgrootte, + \c!radius=.5\bodyfontsize, \c!corner=\v!rectangular, \c!background=, \c!backgroundscreen=\@@rsscreen, diff --git a/tex/context/base/page-lin.tex b/tex/context/base/page-lin.tex index dfb99ca95..9a18347a0 100644 --- a/tex/context/base/page-lin.tex +++ b/tex/context/base/page-lin.tex @@ -200,12 +200,39 @@ \newevery \everylinenumber \relax +% \def\dodoplacelinenumber +% {% beware of em's, the font is already switched ! +% \setbox\scratchbox\hbox +% {\setbox0\hbox{\@@rncommand{\completelinenumber}}\vsmashbox0% +% \ifcase\linenumberlocation +% \rlap{\hbox to \@@rnwidth{\box0\hss}}% was \llap, nog testen !! +% \or +% \inleftmargin +% {\forgetall +% \doifelse\@@rnwidth\v!margin +% {\hsize\leftmarginwidth}{\hsize\@@rnwidth}% +% \alignedline\@@rnalign\v!right{\box0\hskip\@@rndistance}}% +% \else +% \inrightmargin +% {\forgetall +% \doifelse\@@rnwidth\v!margin +% {\hsize\rightmarginwidth}{\hsize\@@rnwidth}% +% \alignedline\@@rnalign\v!left{\hskip\@@rndistance\box0}}% +% \fi}% +% \vsmashbox\scratchbox +% \box\scratchbox +% \the\everylinenumber} + \def\dodoplacelinenumber {% beware of em's, the font is already switched ! \setbox\scratchbox\hbox {\setbox0\hbox{\@@rncommand{\completelinenumber}}\vsmashbox0% \ifcase\linenumberlocation - \rlap{\hbox to \@@rnwidth{\box0\hss}}% was \llap, nog testen !! + \iftypesettinglines % hack + \expandafter\llap + \else + \expandafter\rlap + \fi{\hbox to \@@rnwidth{\box0\hss}}% was \llap, nog testen !! \or \inleftmargin {\forgetall @@ -240,9 +267,12 @@ % \v!text=>\chardef\linenumberlocation\zerocount, %\s!unknown=>\chardef\linenumberlocation\zerocount, %\s!default=>\chardef\linenumberlocation\zerocount]% - \ifcase\linenumberlocation % text - \advance\leftskip \@@rnwidth\relax - \fi + \doifnot\@@rnwidth\v!margin + {\freezedimenmacro\@@rnwidth + \ifcase\linenumberlocation % text + \advance\leftskip\@@rnwidth\relax + \fi}% + \freezedimenmacro\@@rndistance \chardef\@@rn@@rnmethod \ifprocessingverbatim\zerocount\else\iftypesettinglines\plusone\else\plustwo\fi\fi \processaction @@ -431,7 +461,7 @@ \newcount\internalparagraphnumber -\def\setupparagraphnumbering% +\def\setupparagraphnumbering {\dosingleempty\dosetupparagraphnumbering} \def\dosetupparagraphnumbering[#1]% diff --git a/tex/context/base/page-lyr.tex b/tex/context/base/page-lyr.tex index fc5a17317..727bbec3f 100644 --- a/tex/context/base/page-lyr.tex +++ b/tex/context/base/page-lyr.tex @@ -724,8 +724,8 @@ {\doifelselayerdata{OTRTEXT} {\setbox#1\hbox to \makeupwidth {\startoverlay + {\tightlayer[OTRTEXT]} % first, otherwise problems with toc {\normalsettextpagecontent{#1}{#2}{#3}\box#1} - {\tightlayer[OTRTEXT]} \stopoverlay}% \dp#1\zeropoint}% {\normalsettextpagecontent{#1}{#2}{#3}}} diff --git a/tex/context/base/page-mul.tex b/tex/context/base/page-mul.tex index c68a4dcf2..0a8a5c75b 100644 --- a/tex/context/base/page-mul.tex +++ b/tex/context/base/page-mul.tex @@ -27,7 +27,7 @@ \let\OTRMULsetvsize \OTRONEsetvsize \let\OTRMULsethsize \OTRONEsethsize \let\OTRMULdopagecontents \OTRONEdopagecontents -\let\OTRMULfinalsidefloatoutput\OTRONEfinalsidefloatoutput +\let\OTRMULfinalsidefloatoutput\OTRONEfinalsidefloatoutput % ??? \let\OTRMULflushfloatbox \OTRONEflushfloatbox \let\OTRMULdosettopinserts \relax @@ -37,6 +37,9 @@ \let\OTRMULdosetbothinserts \relax \let\OTRMULflushsavedfloats \relax +\let\OTRMULflushsidefloats \forgetsidefloats % \relax +\let\OTRMULsynchronizesidefloats\forgetsidefloats % \relax + \newtoks \OTRMULoutput \def\OTRMULgotonextpage @@ -632,6 +635,8 @@ \edef\maxcolumndepth{\the\dp\currentcolumnbox}% \fi}} +\chardef\columnedtopflushmethod\plusone + \def\flushcolumnedpage {\bgroup \forgetall @@ -698,14 +703,26 @@ \global\precolumnboxheight\zeropoint \setvsize \dosomebreak\nobreak - % wrong, but keep it as a reminder - % \ifgridsnapping \else - % \scratchdimen\topskip - % \advance\scratchdimen -\openstrutheight - % \nointerlineskip - % \vskip-\scratchdimen - % \fi - % so that we don't add it again + \ifgridsnapping \else + \ifcase\columnedtopflushmethod + % sometimes method 1 goes wrong, so we need a way out; best sort this out + % when we run into it again + \or + % \input tufte \startcolumns \showbaselines \input tufte \stopcolumns \input tufte + \scratchdimen\topskip + \advance\scratchdimen -\openstrutheight + \nointerlineskip + \vskip-\scratchdimen + \or + % untested but maybe handy + \scratchdimen\topskip + \advance\scratchdimen -\openstrutheight + \nointerlineskip + \vskip-\scratchdimen + \vskip-\lineheight + \vbox{\strut}% + \fi + \fi \prevdepth\openstrutdepth \nointerlineskip \dp\columnpagebox\zeropoint @@ -984,7 +1001,7 @@ \getmulticolumnlines \dimen0=\nofcolumnlines\openlineheight \dohandleallcolumns - {\splitcurrentcolumn from \box\normalpagebox to \dimen0} + {\splitcurrentcolumn from \box\normalpagebox to \dimen0}% \setbox\restofpage\vbox{\unvbox\normalpagebox}% \ifinheritcolumns \ifr@ggedbottom % vreemd @@ -1038,6 +1055,8 @@ %D \type{\box4} garantees a more robust check when skips are %D used. +\def\multicolumnsbalancemax{250} % 100 is too small when floats are involved + \def\balancedmulticolumnsout {\bgroup \setmulticolumnsout @@ -1083,49 +1102,58 @@ \dimen2=\onepoint % RUBISH \dimen2=\spacingfactor\dimen2 \fi - \loop - \advance\count255 \plusone - \global\setbox\restofpage\copy0\relax - \splitfirstcolumn from \box\restofpage to \dimen0 - \dohandlemidcolumns - {\splitcurrentcolumn from \box\restofpage to \dimen0}% - \splitlastcolumn from \box\restofpage to \dimen0 - \setbox2\vbox{\unvcopy\firstcolumnbox}% - \dimen4\zeropoint - \dohandleallcolumns - {\setbox4\vbox - {\unvcopy\currentcolumnbox - %rather new, test this on pdftex-z.tex - \unpenalty\unskip\unpenalty\unskip}% maybe better in main splitter - %\writestatus{balance}{\the\currentcolumnbox: \the\ht4}% - \dimen6\ht4 - \ifdim\dimen6>\dimen4 \dimen4=\dimen6 \fi}% - \advance\dimen4 -.0005pt % get rid of accurracy problem, pretty new - \ifnum\count255>100 - \donefalse - \else\ifdim\dimen4>\ht2 - \donetrue - \else - \donefalse - \fi\fi - \ifdone - \advance\dimen0 \dimen2\relax - \repeat + \doloop + {\advance\count255 \plusone + \global\setbox\restofpage\copy0\relax + \splitfirstcolumn from \box\restofpage to \dimen0 + \dohandlemidcolumns + {\splitcurrentcolumn from \box\restofpage to \dimen0}% + \splitlastcolumn from \box\restofpage to \dimen0 + \setbox2\vbox{\unvcopy\firstcolumnbox}% + \dimen4\zeropoint + \dohandleallcolumns + {\setbox4\vbox + {\unvcopy\currentcolumnbox + %rather new, test this on pdftex-z.tex + \unpenalty\unskip\unpenalty\unskip}% maybe better in main splitter + %\writestatus{balance}{\the\currentcolumnbox: \the\ht4}% +% \dimen6\ht4 \ifdim\dimen6>\dimen4 \dimen4=\dimen6 \fi}% + \ifdim\ht4>\dimen4 \dimen4=\ht4 \fi}% + \advance\dimen4 -.0005pt % get rid of accurracy problem, pretty new + \ifnum\count255>\multicolumnsbalancemax\relax + \exitloop + \else\ifdim\dimen4>\ht2 + \advance\dimen0 \dimen2\relax + \else + \exitloop + \fi\fi}% \dohandleallcolumns {\global\setbox\currentcolumnbox\vbox{\unvcopy\currentcolumnbox}}% NIEUW - \ifnum\count255>100\relax + \ifnum\count255>\multicolumnsbalancemax\relax \showmessage\m!columns7\empty \else \showmessage\m!columns8{\the\count255\space}% \fi \egroup \ifinheritcolumns - \dimen0\ht\firstcolumnbox - \dimen2\ht\firstcolumnbox + % We cannot assume that the first column is the tallest, if + % only because we may have an aborted balance (one line in the + % first column and a graphic in the second one). + % + % \dimen0\ht\firstcolumnbox + % \dimen2\ht\firstcolumnbox + % + \dimen0=\zeropoint + \dohandleallcolumns + {\ifdim\ht\currentcolumnbox>\dimen0 + \dimen0=\ht\currentcolumnbox + \fi}% + \dimen2\dimen0 + % so far \advance\dimen2 -\openlineheight \dohandleallcolumns {\dimen4\ht\currentcolumnbox - \dimen6=10\openlineheight + \dimen6=10\openlineheight % funny value \global\setbox\currentcolumnbox\vbox to \dimen0 {\unvbox\currentcolumnbox \ifdim\dimen4>\dimen6 @@ -1175,7 +1203,11 @@ \global\output{\balancingerror}% \b@selinebottomtrue % forces depth in separation rule \flushcolumnedpage +\ifdim\pagetotal>\textheight + \eject % new +\else \allowbreak +\fi \egroup} %D The multicolumn mechanism is incorporated in a \CONTEXT\ @@ -1238,8 +1270,7 @@ \let\flushcolumnfloats\noflushcolumnfloats} \def\setlocalcolumnfloats - {\everypar - {\flushnotes\flushcolumnfloat\flushmargincontents\checkindentation}% + {\everypar{\flushnotes\flushcolumnfloat\flushmargincontents\checkindentation}% \let\flushcolumnfloat\doflushcolumnfloat %\let\doroomfloat\docolumnroomfloat \let\docheckiffloatfits\docolumnroomfloat @@ -1490,6 +1521,24 @@ \egroup \fi} +%D The next macro can be used to flush floats in the current +%D stream. No width checking is (yet) done. + +\def\insertcolumnfloats + {\doloop + {\ifsomefloatwaiting + \bgroup + \forgetall + % no check for width + \dogetfloat + \blank[\@@bkspacebefore] + \snaptogrid\vbox{\copy\floatbox} + \blank[\@@bkspaceafter] + \egroup + \else + \exitloop + \fi}} + %D This were the multi||column routines. They can and need to %D be improved but at the moment their behaviour is acceptable. %D @@ -1632,9 +1681,9 @@ {\goodbreak} \installcolumnbreakhandler {MUL} \v!yes - {\par % todo: since + {\par % todo: since {\testrulewidth\zeropoint\ruledvskip\textheight} % we misuse a - \penalty-200 % side effect + \penalty-200 % side effect \vskip-\textheight \prevdepth-\thousandpoint} % signals top of column to \blank @@ -1645,14 +1694,14 @@ \c!direction=\v!right, \c!rule=\v!off, \c!tolerance=\v!tolerant, - \c!distance=1.5\korpsgrootte, % influenced by switching + \c!distance=1.5\bodyfontsize, % influenced by switching \c!height=, \c!balance=\v!yes, \c!align=\v!text, \c!blank={\v!line,\v!fixed}, \c!option=, \c!rulethickness=\linewidth, - \c!offset=.5\korpsgrootte] + \c!offset=.5\bodyfontsize] %D Undocumented and still under development. @@ -1663,7 +1712,7 @@ {\bgroup \nopenalties \getparameters[\??kl] - [\c!width=\hsize,\c!distance=1.5\korpsgrootte,% + [\c!width=\hsize,\c!distance=1.5\bodyfontsize,% \c!n=2,\c!lines=0,#1]% \let\rigidcolumnlines\@@kllines \setrigidcolumnhsize\@@klwidth\@@kldistance\@@kln diff --git a/tex/context/base/page-set.tex b/tex/context/base/page-set.tex index 3aa1b0dc5..5e295b82d 100644 --- a/tex/context/base/page-set.tex +++ b/tex/context/base/page-set.tex @@ -52,6 +52,9 @@ \def\@otr@{otr} +\let\OTRSETflushsidefloats \forgetsidefloats % \relax +\let\OTRSETsynchronizesidefloats\forgetsidefloats % \relax + \def\OTRSETgridcell #1#2{\csname \@otr@:\number#1:\number#2\endcsname} \def\OTRSETgetgridcell#1#2{\box\csname \@otr@:\number#1:\number#2\endcsname} \def\OTRSETsetgridcell#1#2{\global\setbox\csname\@otr@:\number#1:\number#2\endcsname} diff --git a/tex/context/base/page-sid.tex b/tex/context/base/page-sid.tex index 882464fc3..e67f3e50f 100644 --- a/tex/context/base/page-sid.tex +++ b/tex/context/base/page-sid.tex @@ -864,4 +864,22 @@ \kern-\!!counta\baselineskip \penalty\zerocount } +% We need to hook it into the other otr's. This code will move. + +\let\OTRONEflushsidefloats \flushsidefloats +\let\OTRONEsynchronizesidefloats\synchronizesidefloats + +% page-set +% +% \let\OTRSETflushsidefloats \forgetsidefloats +% \let\OTRSETsynchronizesidefloats\forgetsidefloats + +% page-mul +% +% \let\OTRMULflushsidefloats \forgetsidefloats +% \let\OTRMULsynchronizesidefloats\forgetsidefloats + +\def\synchronizesidefloats{\OTRcommand\synchronizesidefloats} +\def\flushsidefloats {\OTRcommand\flushsidefloats} + \protect \endinput diff --git a/tex/context/base/prop-lay.tex b/tex/context/base/prop-lay.tex index 749848fa8..a5f43dc13 100644 --- a/tex/context/base/prop-lay.tex +++ b/tex/context/base/prop-lay.tex @@ -36,11 +36,15 @@ {0}% type (1=frozen) {\printviewerlayer}}% 1=printable +\let\currentlayerproperty\empty + \def\startlayerproperty - {\dostartviewerlayer\currentproperty} + {\let\currentlayerproperty\currentproperty + \dostartviewerlayer\currentproperty} \def\stoplayerproperty - {\dostopviewerlayer} + {\dostopviewerlayer + \let\currentlayerproperty\previousproperty} \setglobalsystemreference \rt!exec \v!HideLayer {hidelayer} \setglobalsystemreference \rt!exec \v!VideLayer {videlayer} diff --git a/tex/context/base/regi-utf.tex b/tex/context/base/regi-utf.tex index 96f1a4061..fe7b0b958 100644 --- a/tex/context/base/regi-utf.tex +++ b/tex/context/base/regi-utf.tex @@ -17,6 +17,18 @@ %D instead of a active token handler because here we don't want %D the \type {{}}. We only support this in \ETEX. +% ÀÁÂÃÄÅàáâãäå +% ÆÇæç +% ÈÉÊËèéêë +% ÌÍÎÏÞìíîïþ +% Ðð +% Ññ +% ÒÓÔÕÖòóôõö +% Øø +% ÙÚÛÜùúû +% Ýýÿ +% ß + \beginTEX \expandafter \endinput \endTEX diff --git a/tex/context/base/spec-dpx.tex b/tex/context/base/spec-dpx.tex index 161cee303..3c0d45897 100644 --- a/tex/context/base/spec-dpx.tex +++ b/tex/context/base/spec-dpx.tex @@ -412,13 +412,13 @@ \scratchdimen#4\edef\height{\the\scratchdimen\space}% \setbox\nextbox\vbox {\special{pdf:bxobj @#1::#2 width \width height \height}% - % we need to compensate for the box offset (ugly, sigh) - \scratchdimen\nextboxht - \advance\scratchdimen\nextboxdp - \advance\scratchdimen-#4\relax - \nextboxdp\zeropoint - \nextboxht\zeropoint - \hbox to #3{\hss\lower.5\scratchdimen\box\nextbox\hss}% + % we need to compensate for the box offset (ugly, sigh) + \scratchdimen\nextboxht + \advance\scratchdimen\nextboxdp + \advance\scratchdimen-#4\relax + \nextboxdp\zeropoint + \nextboxht\zeropoint + \hbox to #3{\hss\lower.5\scratchdimen\box\nextbox\hss}% \ifx\currentPDFresources\empty \else \special{pdf:put @resources <<\currentPDFresources\the\pdfpageresources>>}% @@ -753,9 +753,9 @@ {\vbox to \zeropoint {\vss \hbox to \zeropoint - {\special{pdf:btrans matrix #1 #2 #3 #4 #5 #6}% + {\special{pdf:btrans matrix #1 #2 #3 #4 #5 #6}% \rlap{\special{pdf:image width 1bp height 1bp (#7)}} - \special{pdf:etrans}\hss}}} + \special{pdf:etrans}\hss}}} {\message{[unknown figure #7]}}} %D 5. Modified codes from \type{supp-pdf} @@ -809,7 +809,7 @@ \vss\hbox to #4\scaledpoint{\hss\box\scratchbox\hss}\vss \else %\vss\box\scratchbox - \vss\hbox to #4\scaledpoint{\box\scratchbox\hss} + \vss\hbox to #4\scaledpoint{\box\scratchbox\hss}% \fi\fi}}% \box\scratchbox \elabelgroup} diff --git a/tex/context/base/spec-tpd.tex b/tex/context/base/spec-tpd.tex index f6c7097bc..a69cfff09 100644 --- a/tex/context/base/spec-tpd.tex +++ b/tex/context/base/spec-tpd.tex @@ -97,7 +97,7 @@ %D bitmap fonts (when asked for). \ifx\pdfimageresolution\undefined \newcount\pdfimageresolution \fi -\ifx\pdfimageresolution\undefined \newcount\pdfpkresolution \fi +\ifx\pdfpkresolution \undefined \newcount\pdfpkresolution \fi \pdfimageresolution=300 \pdfpkresolution =600 diff --git a/tex/context/base/supp-mis.tex b/tex/context/base/supp-mis.tex index 7ad444695..9ab55142f 100644 --- a/tex/context/base/supp-mis.tex +++ b/tex/context/base/supp-mis.tex @@ -23,12 +23,14 @@ \def\StartLatexHack {\edef\StopLatexHack {\catcode`\noexpand/=\the\catcode`/ + \catcode`\noexpand-=\the\catcode`- \catcode`\noexpand:=\the\catcode`: \catcode`\noexpand;=\the\catcode`; \catcode`\noexpand"=\the\catcode`" \catcode`\noexpand<=\the\catcode`< \catcode`\noexpand>=\the\catcode`>}% - \catcode`/=12 \catcode`:=12 \catcode`;=12 + \catcode`/=12 \catcode`-=12 + \catcode`:=12 \catcode`;=12 \catcode`"=12 \catcode`<=12 \catcode`>=12 } %D This hack is needed especially for \LATEX\ users who use diff --git a/tex/context/base/supp-mpe.tex b/tex/context/base/supp-mpe.tex index 23a2410ab..04ee0a813 100644 --- a/tex/context/base/supp-mpe.tex +++ b/tex/context/base/supp-mpe.tex @@ -175,7 +175,8 @@ \fi} \def\handleMPspecialscommentx #1 % version 2 - {\doifelse{#1}{10000}{\settrue\manyMPspecials}{\setfalse\manyMPspecials}% local +% {\doifelsedoifelse{#1}{10000}{\settrue\manyMPspecials}{\setfalse\manyMPspecials}% local + {\ifnum10000=0#1\relax\settrue\manyMPspecials\else\setfalse\manyMPspecials\fi \handleMPsequence} % one can say (in meta-ini): diff --git a/tex/context/base/supp-vis.tex b/tex/context/base/supp-vis.tex index 95cee5176..efe47751f 100644 --- a/tex/context/base/supp-vis.tex +++ b/tex/context/base/supp-vis.tex @@ -1869,10 +1869,10 @@ %D %D Beware, it's a macro not a \DIMENSION. -\ifx\korpsgrootte\undefined +\ifx\bodyfontsize\undefined \edef\defaulttestrulewidth{\the\testrulewidth} \else - \def\defaulttestrulewidth{.02\korpsgrootte} % still dutch + \def\defaulttestrulewidth{.02\bodyfontsize} % still dutch \fi \def\showmakeup diff --git a/tex/context/base/unic-037.tex b/tex/context/base/unic-037.tex new file mode 100644 index 000000000..87f655a68 --- /dev/null +++ b/tex/context/base/unic-037.tex @@ -0,0 +1,278 @@ +%D \module +%D [ file=unic-037, +%D version=2006.02.13, +%D title=\CONTEXT\ \UNICODE\ Macros, +%D subtitle=Vector 37, +%D author=Luigi Scarso, +%D date=\currentdate, +%D copyright={PRAGMA}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\unprotect + +\startunicodevector 37 + \expandafter\strippedcsname + \ifcase\numexpr #1+1\relax\or %% + \UnicodeLightHorizontal\or + \UnicodeHeavyHorizontal\or + \UnicodeLightVertical\or + \UnicodeHeavyVertical\or + \UnicodeLightTripleDashHorizontal\or + \UnicodeHeavyTripleDashHorizontal\or + \UnicodeLightTripleDashVertical\or + \UnicodeHeavyTripleDashVertical\or + \UnicodeLightQuadrupleDashHorizontal\or + \UnicodeHeavyQuadrupleDashHorizontal\or + \UnicodeLightQuadrupleDashVertical\or + \UnicodeHeavyQuadrupleDashVertical\or + \UnicodeLightDownAndRight\or + \UnicodeDownLightAndRightHeavy\or + \UnicodeDownHeavyAndRightLight\or + \UnicodeHeavyDownAndRight\or + \UnicodeLightDownAndLeft\or + \UnicodeDownLightAndLeftHeavy\or + \UnicodeDownHeavyAndLeftLight\or + \UnicodeHeavyDownAndLeft\or + \UnicodeLightUpAndRight\or + \UnicodeUpLightAndRightHeavy\or + \UnicodeUpHeavyAndRightLight\or + \UnicodeHeavyUpAndRight\or + \UnicodeLightUpAndLeft\or + \UnicodeUpLightAndLeftHeavy\or + \UnicodeUpHeavyAndLeftLight\or + \UnicodeHeavyUpAndLeft\or + \UnicodeLightVerticalAndRight\or + \UnicodeVerticalLightAndRightHeavy\or + \UnicodeUpHeavyAndRightDownLight\or + \UnicodeDownHeavyAndRightUpLight\or + \UnicodeVerticalHeavyAndRightLight\or + \UnicodeDownLightAndRightUpHeavy\or + \UnicodeUpLightAndRightDownHeavy\or + \UnicodeHeavyVerticalAndRight\or + \UnicodeLightVerticalAndLeft\or + \UnicodeVerticalLightAndLeftHeavy\or + \UnicodeUpHeavyAndLeftDownLight\or + \UnicodeDownHeavyAndLeftUpLight\or + \UnicodeVerticalHeavyAndLeftLight\or + \UnicodeDownLightAndLeftUpHeavy\or + \UnicodeUpLightAndLeftDownHeavy\or + \UnicodeHeavyVerticalAndLeft\or + \UnicodeLightDownAndHorizontal\or + \UnicodeLeftHeavyAndRightDownLight\or + \UnicodeRightHeavyAndLeftDownLight\or + \UnicodeDownLightAndHorizontalHeavy\or + \UnicodeDownHeavyAndHorizontalLight\or + \UnicodeRightLightAndLeftDownHeavy\or + \UnicodeLeftLightAndRightDownHeavy\or + \UnicodeHeavyDownAndHorizontal\or + \UnicodeLightUpAndHorizontal\or + \UnicodeLeftHeavyAndRightUpLight\or + \UnicodeRightHeavyAndLeftUpLight\or + \UnicodeUpLightAndHorizontalHeavy\or + \UnicodeUpHeavyAndHorizontalLight\or + \UnicodeRightLightAndLeftUpHeavy\or + \UnicodeLeftLightAndRightUpHeavy\or + \UnicodeHeavyUpAndHorizontal\or + \UnicodeLightVerticalAndHorizontal\or + \UnicodeLeftHeavyAndRightVerticalLight\or + \UnicodeRightHeavyAndLeftVerticalLight\or + \UnicodeVerticalLightAndHorizontalHeavy\or + \UnicodeUpHeavyAndDownHorizontalLight\or + \UnicodeDownHeavyAndUpHorizontalLight\or + \UnicodeVerticalHeavyAndHorizontalLight\or + \UnicodeLeftUpHeavyAndRightDownLight\or + \UnicodeRightUpHeavyAndLeftDownLight\or + \UnicodeLeftDownHeavyAndRightUpLight\or + \UnicodeRightDownHeavyAndLeftUpLight\or + \UnicodeDownLightAndUpHorizontalHeavy\or + \UnicodeUpLightAndDownHorizontalHeavy\or + \UnicodeRightLightAndLeftVerticalHeavy\or + \UnicodeLeftLightAndRightVerticalHeavy\or + \UnicodeHeavyVerticalAndHorizontal\or + \UnicodeLightDoubleDashHorizontal\or + \UnicodeHeavyDoubleDashHorizontal\or + \UnicodeLightDoubleDashVertical\or + \UnicodeHeavyDoubleDashVertical\or + \UnicodeDoubleHorizontal\or + \UnicodeDoubleVertical\or + \UnicodeDownSingleAndRightDouble\or + \UnicodeDownDoubleAndRightSingle\or + \UnicodeDoubleDownAndRight\or + \UnicodeDownSingleAndLeftDouble\or + \UnicodeDownDoubleAndLeftSingle\or + \UnicodeDoubleDownAndLeft\or + \UnicodeUpSingleAndRightDouble\or + \UnicodeUpDoubleAndRightSingle\or + \UnicodeDoubleUpAndRight\or + \UnicodeUpSingleAndLeftDouble\or + \UnicodeUpDoubleAndLeftSingle\or + \UnicodeDoubleUpAndLeft\or + \UnicodeVerticalSingleAndRightDouble\or + \UnicodeVerticalDoubleAndRightSingle\or + \UnicodeDoubleVerticalAndRight\or + \UnicodeVerticalSingleAndLeftDouble\or + \UnicodeVerticalDoubleAndLeftSingle\or + \UnicodeDoubleVerticalAndLeft\or + \UnicodeDownSingleAndHorizontalDouble\or + \UnicodeDownDoubleAndHorizontalSingle\or + \UnicodeDoubleDownAndHorizontal\or + \UnicodeUpSingleAndHorizontalDouble\or + \UnicodeUpDoubleAndHorizontalSingle\or + \UnicodeDoubleUpAndHorizontal\or + \UnicodeVerticalSingleAndHorizontalDouble\or + \UnicodeVerticalDoubleAndHorizontalSingle\or + \UnicodeDoubleVerticalAndHorizontal\or + \UnicodeLightArcDownAndRight\or + \UnicodeLightArcDownAndLeft\or + \UnicodeLightArcUpAndLeft\or + \UnicodeLightArcUpAndRight\or + \UnicodeLightDiagonalUpperRightToLowerLeft\or + \UnicodeLightDiagonalUpperLeftToLowerRight\or + \UnicodeLightDiagonalCross\or + \UnicodeLightLeft\or + \UnicodeLightUp\or + \UnicodeLightRight\or + \UnicodeLightDown\or + \UnicodeHeavyLeft\or + \UnicodeHeavyUp\or + \UnicodeHeavyRight\or + \UnicodeHeavyDown\or + \UnicodeLightLeftAndHeavyRight\or + \UnicodeLightUpAndHeavyDown\or + \UnicodeHeavyLeftAndLightRight\or + \UnicodeHeavyUpAndLightDown\or + \UnicodeUpperHalfBlock\or + \UnicodeLowerOneEighthBlock\or + \UnicodeLowerOneQuarterBlock\or + \UnicodeLowerThreeEighthsBlock\or + \UnicodeLowerHalfBlock\or + \UnicodeLowerFiveEighthsBlock\or + \UnicodeLowerThreeQuartersBlock\or + \UnicodeLowerSevenEighthsBlock\or + \UnicodeFullBlock\or + \UnicodeLeftSevenEighthsBlock\or + \UnicodeLeftThreeQuartersBlock\or + \UnicodeLeftFiveEighthsBlock\or + \UnicodeLeftHalfBlock\or + \UnicodeLeftThreeEighthsBlock\or + \UnicodeLeftOneQuarterBlock\or + \UnicodeLeftOneEighthBlock\or + \UnicodeRightHalfBlock\or + \UnicodeLightShade\or + \UnicodeMediumShade\or + \UnicodeDarkShade\or + \UnicodeUpperOneEighthBlock\or + \UnicodeRightOneEighthBlock\or + \UnicodeQuadrantLowerLeft\or + \UnicodeQuadrantLowerRight\or + \UnicodeQuadrantUpperLeft\or + \UnicodeQuadrantUpperLeftAndLowerLeftAndLowerRight\or + \UnicodeQuadrantUpperLeftAndLowerRight\or + \UnicodeQuadrantUpperLeftAndUpperRightandLowerLeft\or + \UnicodeQuadrantUpperLeftAndUpperRightAndLowerRight\or + \UnicodeQuadrantUpperRight\or + \UnicodeQuadrantUpperRightAndLowerLeft\or + \UnicodeQuadrantUpperRightAndLowerLeftAndLowerRight\or + \UnicodeBlackSquare\or + \UnicodeWhiteSquare\or + \UnicodeWhiteSquareWithRoundedCorners\or + \UnicodeWhiteSquareContainingBlackSmallSquare\or + \UnicodeSquareWithHorizontalFill\or + \UnicodeSquareWithVerticalFill\or + \UnicodeSquareWithOrthogonalCrosshatchFill\or + \UnicodeSquareWithUpperLeftToLowerRightFill\or + \UnicodeSquareWithUpperRightToLowerLeftFill\or + \UnicodeSquareWithDiagonalCrosshatchFill\or + \UnicodeBlackSmallSquare\or + \UnicodeWhiteSmallSquare\or + \UnicodeBlackRectangle\or + \UnicodeWhiteRectangle\or + \UnicodeBlackVerticalRectangle\or + \UnicodeWhiteVerticalRectangle\or + \UnicodeBlackParallelogram\or + \UnicodeWhiteParallelogram\or + \UnicodeBlackUpPointingTriangle\or + \UnicodeWhiteUpPointingTriangle\or + \UnicodeBlackUpPointingSmallTriangle\or + \UnicodeWhiteUpPointingSmallTriangle\or + \UnicodeBlackRightPointingTriangle\or + \UnicodeWhiteRightPointingTriangle\or + \UnicodeBlackRightPointingSmallTriangle\or + \UnicodeWhiteRightPointingSmallTriangle\or + \UnicodeBlackRightPointingPointer\or + \UnicodeWhiteRightPointingPointer\or + \UnicodeBlackDownPointingTriangle\or + \UnicodeWhiteDownPointingTriangle\or + \UnicodeBlackDownPointingSmallTriangle\or + \UnicodeWhiteDownPointingSmallTriangle\or + \UnicodeBlackLeftPointingTriangle\or + \UnicodeWhiteLeftPointingTriangle\or + \UnicodeBlackLeftPointingSmallTriangle\or + \UnicodeWhiteLeftPointingSmallTriangle\or + \UnicodeBlackLeftPointingPointer\or + \UnicodeWhiteLeftPointingPointer\or + \UnicodeBlackDiamond\or + \UnicodeWhiteDiamond\or + \UnicodeWhiteDiamondContainingBlackSmallDiamond\or + \UnicodeFisheye\or + \UnicodeLozenge\or + \UnicodeWhiteCircle\or + \UnicodeDottedCircle\or + \UnicodeCircleWithVerticalFill\or + \UnicodeBullseye\or + \UnicodeBlackCircle\or + \UnicodeCircleWithLeftHalfBlack\or + \UnicodeCircleWithRightHalfBlack\or + \UnicodeCircleWithLowerHalfBlack\or + \UnicodeCircleWithUpperHalfBlack\or + \UnicodeCircleWithUpperRightQuadrantBlack\or + \UnicodeCircleWithAllButUpperLeftQuadrantBlack\or + \UnicodeLeftHalfBlackCircle\or + \UnicodeRightHalfBlackCircle\or + \UnicodeInverseBullet\or + \UnicodeInverseWhiteCircle\or + \UnicodeUpperHalfInverseWhiteCircle\or + \UnicodeLowerHalfInverseWhiteCircle\or + \UnicodeUpperLeftQuadrantCircularArc\or + \UnicodeUpperRightQuadrantCircularArc\or + \UnicodeLowerRightQuadrantCircularArc\or + \UnicodeLowerLeftQuadrantCircularArc\or + \UnicodeUpperHalfCircle\or + \UnicodeLowerHalfCircle\or + \UnicodeBlackLowerRightTriangle\or + \UnicodeBlackLowerLeftTriangle\or + \UnicodeBlackUpperLeftTriangle\or + \UnicodeBlackUpperRightTriangle\or + \UnicodeWhiteBullet\or + \UnicodeSquareWithLeftHalfBlack\or + \UnicodeSquareWithRightHalfBlack\or + \UnicodeSquareWithUpperLeftDiagonalHalfBlack\or + \UnicodeSquareWithLowerRightDiagonalHalfBlack\or + \UnicodeWhiteSquareWithVerticalBisectingLine\or + \UnicodeWhiteUpPointingTriangleWithDot\or + \UnicodeUpPointingTriangleWithLeftHalfBlack\or + \UnicodeUpPointingTriangleWithRightHalfBlack\or + \UnicodeLargeCircle\or + \UnicodeWhiteSquareWithUpperLeftQuadrant\or + \UnicodeWhiteSquareWithLowerLeftQuadrant\or + \UnicodeWhiteSquareWithLowerRightQuadrant\or + \UnicodeWhiteSquareWithUpperRightQuadrant\or + \UnicodeWhiteCircleWithUpperLeftQuadrant\or + \UnicodeWhiteCircleWithLowerLeftQuadrant\or + \UnicodeWhiteCircleWithLowerRightQuadrant\or + \UnicodeWhiteCircleWithUpperRightQuadrant\or + \UnicodeUpperLeftTriangle\or + \UnicodeUpperRightTriangle\or + \UnicodeLowerLeftTriangle\or + \UnicodeWhiteMediumSquare\or + \UnicodeBlackMediumSquare\or + \UnicodeWhiteMediumSmallSquare\or + \UnicodeBlackMediumSmallSquare\or + \UnicodeLowerRightTriangle\else% + \unknownchar\fi +\stopunicodevector +\protect \endinput + diff --git a/tex/context/base/verb-ini.tex b/tex/context/base/verb-ini.tex index 97bbf02c4..e7d239e2a 100644 --- a/tex/context/base/verb-ini.tex +++ b/tex/context/base/verb-ini.tex @@ -2040,8 +2040,42 @@ % \initializeverbatimline % \copyverbatimline} +% \def\doprocessdisplayverbatim#1#2% +% {\par +% \bgroup +% \escapechar-1 +% \xdef\verbatimname{\string#2}% +% \egroup +% \ifcase#1% +% \let\endofdisplayverbatim\relax +% \else +% \def\endofdisplayverbatim{\csname\verbatimname\endcsname}% +% \fi +% \bgroup +% \parindent\zeropoint +% \ifdim\lastskip<\parskip +% \removelastskip +% \vskip\parskip +% \fi +% \parskip\zeropoint +% \processingverbatimtrue +% \ifcase#1% +% \convertargument#2\to\endofverbatimcommand +% \else +% \expandafter\let\csname\verbatimname\endcsname=\relax +% \expandafter\convertargument\csname\verbatimname\endcsname +% \to\endofverbatimcommand +% \fi +% \verbatimfont +% \setverbatimspaceskip +% \global\linepartrue % needed for paragraph numbering +% \setupcopyverbatim +% \initializeverbatimline +% \copyverbatimline} + \def\doprocessdisplayverbatim#1#2% {\par + \beginofverbatimlines \bgroup \escapechar-1 \xdef\verbatimname{\string#2}% @@ -2049,7 +2083,7 @@ \ifcase#1% \let\endofdisplayverbatim\relax \else - \def\endofdisplayverbatim{\csname\verbatimname\endcsname}% + \def\endofdisplayverbatim{\endofverbatimlines\csname\verbatimname\endcsname}% \fi \bgroup \parindent\zeropoint diff --git a/tex/context/interface/cont-cz.xml b/tex/context/interface/cont-cz.xml index cbc1bb632..a35cf0d6e 100644 --- a/tex/context/interface/cont-cz.xml +++ b/tex/context/interface/cont-cz.xml @@ -869,6 +869,11 @@ + + + + + @@ -4225,6 +4230,7 @@ + @@ -7526,7 +7532,7 @@ - + @@ -7572,7 +7578,7 @@ - + @@ -7657,7 +7663,7 @@ - + @@ -8391,6 +8397,12 @@ + + + + + + @@ -8909,6 +8921,11 @@ + + + + + diff --git a/tex/context/interface/cont-de.xml b/tex/context/interface/cont-de.xml index 6d916958c..0e3be31e7 100644 --- a/tex/context/interface/cont-de.xml +++ b/tex/context/interface/cont-de.xml @@ -869,6 +869,11 @@ + + + + + @@ -4225,6 +4230,7 @@ + @@ -7526,7 +7532,7 @@ - + @@ -7572,7 +7578,7 @@ - + @@ -7657,7 +7663,7 @@ - + @@ -8391,6 +8397,12 @@ + + + + + + @@ -8909,6 +8921,11 @@ + + + + + diff --git a/tex/context/interface/cont-en.xml b/tex/context/interface/cont-en.xml index 1e12929ec..f32882eae 100644 --- a/tex/context/interface/cont-en.xml +++ b/tex/context/interface/cont-en.xml @@ -869,6 +869,11 @@ + + + + + @@ -4225,6 +4230,7 @@ + @@ -8391,6 +8397,12 @@ + + + + + + @@ -8909,6 +8921,11 @@ + + + + + diff --git a/tex/context/interface/cont-fr.xml b/tex/context/interface/cont-fr.xml index 84e9172a2..0b420db07 100644 --- a/tex/context/interface/cont-fr.xml +++ b/tex/context/interface/cont-fr.xml @@ -869,6 +869,11 @@ + + + + + @@ -4225,6 +4230,7 @@ + @@ -7526,7 +7532,7 @@ - + @@ -7572,7 +7578,7 @@ - + @@ -7657,7 +7663,7 @@ - + @@ -8391,6 +8397,12 @@ + + + + + + @@ -8909,6 +8921,11 @@ + + + + + diff --git a/tex/context/interface/cont-it.xml b/tex/context/interface/cont-it.xml index 631277f54..b746a404b 100644 --- a/tex/context/interface/cont-it.xml +++ b/tex/context/interface/cont-it.xml @@ -869,6 +869,11 @@ + + + + + @@ -4225,6 +4230,7 @@ + @@ -7526,7 +7532,7 @@ - + @@ -7572,7 +7578,7 @@ - + @@ -7657,7 +7663,7 @@ - + @@ -8391,6 +8397,12 @@ + + + + + + @@ -8909,6 +8921,11 @@ + + + + + diff --git a/tex/context/interface/cont-nl.xml b/tex/context/interface/cont-nl.xml index cc7e7d77e..a93db0812 100644 --- a/tex/context/interface/cont-nl.xml +++ b/tex/context/interface/cont-nl.xml @@ -869,6 +869,11 @@ + + + + + @@ -4225,6 +4230,7 @@ + @@ -7526,7 +7532,7 @@ - + @@ -7572,7 +7578,7 @@ - + @@ -7657,7 +7663,7 @@ - + @@ -8391,6 +8397,12 @@ + + + + + + @@ -8909,6 +8921,11 @@ + + + + + diff --git a/tex/context/interface/cont-ro.xml b/tex/context/interface/cont-ro.xml index c8f30aa32..9499180e0 100644 --- a/tex/context/interface/cont-ro.xml +++ b/tex/context/interface/cont-ro.xml @@ -869,6 +869,11 @@ + + + + + @@ -4225,6 +4230,7 @@ + @@ -7526,7 +7532,7 @@ - + @@ -7572,7 +7578,7 @@ - + @@ -7657,7 +7663,7 @@ - + @@ -8391,6 +8397,12 @@ + + + + + + @@ -8909,6 +8921,11 @@ + + + + + diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index b0910bb68..0f1558aa8 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@ - + @@ -526,6 +526,7 @@ + diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index e3bff4c65..c65c54bdd 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@ - + @@ -526,6 +526,7 @@ + diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 6d953803a..1495b40f1 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@ - + @@ -526,6 +526,7 @@ + diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index 7db7ff4aa..b5d6c4a0c 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -1,6 +1,6 @@ - + @@ -526,6 +526,7 @@ + diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index f2ed3e237..f5f5acf57 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@ - + @@ -526,6 +526,7 @@ + diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index c9ef3ea26..4e4c83d23 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@ - + @@ -526,6 +526,7 @@ + diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index ca6535388..44e208cdf 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ - + @@ -526,6 +526,7 @@ + -- cgit v1.2.3