From 6edea41ff329ce2d76f34a59e90fa5d80d0eaee2 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Sun, 14 May 2006 23:57:00 +0200 Subject: stable 2006.05.14 23:57 --- tex/context/base/cont-new.tex | 2 +- tex/context/base/context.tex | 2 +- tex/context/base/core-fig.tex | 13 ++- tex/context/base/core-job.tex | 5 + tex/context/base/core-mis.tex | 19 ++-- tex/context/base/page-flt.tex | 19 ++-- tex/context/base/s-pre-60.tex | 19 ++++ tex/context/base/s-pre-61.tex | 10 +- tex/context/base/s-pre-62.tex | 210 ++++++++++++++++++++++++++++++++++++++ tex/context/base/s-pre-63.tex | 73 +++++++++++++ tex/context/base/spec-tpd.tex | 2 + tex/context/base/supp-mps.tex | 14 ++- tex/context/interface/keys-cz.xml | 2 +- tex/context/interface/keys-de.xml | 2 +- tex/context/interface/keys-en.xml | 2 +- tex/context/interface/keys-fr.xml | 2 +- tex/context/interface/keys-it.xml | 2 +- tex/context/interface/keys-nl.xml | 2 +- tex/context/interface/keys-ro.xml | 2 +- 19 files changed, 366 insertions(+), 36 deletions(-) create mode 100644 tex/context/base/s-pre-62.tex create mode 100644 tex/context/base/s-pre-63.tex (limited to 'tex') diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index 2ea338088..990bc8365 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2006.05.11 10:30} +\newcontextversion{2006.05.14 23:57} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 4caf3c21e..2dd3b95af 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.05.11 10:30} +\def\contextversion{2006.05.14 23:57} %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 909dbbaf7..cceb9cb1d 100644 --- a/tex/context/base/core-fig.tex +++ b/tex/context/base/core-fig.tex @@ -346,6 +346,9 @@ %D Here we start scanning the other types: +% TODO: svg, get figuresize from file, but when not supported by +% backend, don't use it yet (else backend will force replacement). + \def\@@dogetfiguresize{dogetfiguresize} \def\getfiguredimensionsA @@ -418,8 +421,14 @@ \startnointerference \startXMLignore \defineXMLcommand[svg][width=100,height=75] - {\global\dimen1=\XMLop{width}\onebasepoint - \global\dimen3=\XMLop{height}\onebasepoint +% {\global\dimen1=\XMLpar{svg}{width}{0}\onebasepoint +% \global\dimen3=\XMLpar{svg}{height}{0}\onebasepoint + {\doifdimensionelse{\XMLop{width}} + {\global\dimen1=\XMLop{width}} + {\global\dimen1=\XMLop{width}\onebasepoint}% + \doifdimensionelse{\XMLop{width}} + {\global\dimen3=\XMLop{height}} + {\global\dimen3=\XMLop{height}\onebasepoint}% \endinput}% \processXMLfilegrouped{#1}% \stopXMLignore diff --git a/tex/context/base/core-job.tex b/tex/context/base/core-job.tex index 794af85c3..391c3c7f0 100644 --- a/tex/context/base/core-job.tex +++ b/tex/context/base/core-job.tex @@ -163,6 +163,8 @@ \processcommacommand[\@@svdirectory]\doloadsystemfile \fi} +\ifx\disableXML\undefined \let\disableXML\relax \fi + \def\loadsystemfiles {\reportprotectionstate \readsysfile\f!newfilename @@ -176,7 +178,10 @@ \loadallsystemfiles\f!sysfilename {\loadallsystemfiles{\f!sysfilename.rme}\donothing % new, fall back \doglobal\appendtoks + \bgroup + \disableXML \loadallsystemfiles\f!errfilename\donothing + \egroup \to\everygoodbye}} %\loadallsystemfiles\f!modfilename diff --git a/tex/context/base/core-mis.tex b/tex/context/base/core-mis.tex index cec251e9e..0b1032436 100644 --- a/tex/context/base/core-mis.tex +++ b/tex/context/base/core-mis.tex @@ -2087,24 +2087,23 @@ \def\dostartcombination[#1][#2]% {\global\setsystemmode{combination}% - \doifnothing{#1}\firstargumentfalse % to be sure (when called in macros) - \doifnothing{#2}\secondargumentfalse % to be sure (when called in macros) + \doifnothing{#1}\firstargumentfalse % to be sure (when called in macros) + \doifnothing{#2}\secondargumentfalse % to be sure (when called in macros) \ifsecondargument \def\currentcombination{#1}% + \edef\currentcombinationspec{#2*1*}% \else - \let\currentcombination\empty + \doifinstringelse{*}{#1} + {\let\currentcombination\empty + \edef\currentcombinationspec{#1*1*}} + {\def\currentcombination{#1}% + \edef\currentcombinationspec{2*1*}}% \fi \forgetall \doifelse{\combinationparameter\c!height}\v!fit \vbox {\vbox to \combinationparameter\c!height}% \bgroup - %\doifelsenothing{#1} - % {\dodostartcombination[2*1*]} - % {\doifelsenothing{#2} - % {\dodostartcombination[#1*1*]} - % {\dodostartcombination[#2*1*]}}} - \expanded{\dodostartcombination - [\ifsecondargument#2\else\iffirstargument#1\else2\fi\fi*1*]}} + \expanded{\dodostartcombination[\currentcombinationspec]}} \long\def\dodostartcombination[#1*#2*#3]% {\setuphorizontaldivision diff --git a/tex/context/base/page-flt.tex b/tex/context/base/page-flt.tex index cf03fd40a..471a61693 100644 --- a/tex/context/base/page-flt.tex +++ b/tex/context/base/page-flt.tex @@ -272,14 +272,14 @@ {\expanded{\doifcommonelse{#2}{\flushfloatslist}}\doflushfloats\donothing}% % but which should be done before using box \floatbox \fi - \ifmargeblokken % waarschijnlijk gebroken ! ! ! ! - \doifinset\v!margin{#2} - {\endgraf - \bgroup\everypar{\egroup\the\everypar}% - \hsize\@@mbwidth}% + \ifmargeblokken + \doifinset\v!margin{#2}\endgraf \fi \global\insidefloattrue \begingroup % ** + \ifmargeblokken + \doifinset\v!margin{#2}{\hsize\@@mbwidth}% + \fi \the\everyinsidefloat \let\@@extrafloat\empty \presetmorefloatvariables{#2}% @@ -288,11 +288,10 @@ \getvalue{\??fl#1\c!inner}% \fuzzysnappingfalse \postponenotes} % new - {% -\doifvaluesomething{\??fl#1\c!criterium} - {\ifdim\wd\nextbox>\getvalue{\??fl#1\c!criterium}\relax - \edef\forcedfloatmethod{\executeifdefined{\??fl#1\c!fallback}\v!here}% - \fi}% + {\doifvaluesomething{\??fl#1\c!criterium} + {\ifdim\wd\nextbox>\getvalue{\??fl#1\c!criterium}\relax + \edef\forcedfloatmethod{\executeifdefined{\??fl#1\c!fallback}\v!here}% + \fi}% \xdocompletefloat{#1}{#3}{#1}{#2}{#1}{#4}% ** not yet done % we need to carry over the par because of side floats \doifnotinset\v!text{#2}{\carryoverpar\endgroup}% diff --git a/tex/context/base/s-pre-60.tex b/tex/context/base/s-pre-60.tex index a50462b29..bd6b6ae4f 100644 --- a/tex/context/base/s-pre-60.tex +++ b/tex/context/base/s-pre-60.tex @@ -121,4 +121,23 @@ [symbol={attach-normal,attach-down}, textlayer=\StepLayer] +%D Handy: + +\def\StartLocalSteps{\ResetStep} +\def\StopLocalSteps {} + +\def\StartLocalStep {\NextStep\StartStep} +\def\StopLocalStep {\StopStep} + +%D used as (given some definitions): +%D +%D \starttyping +%D \StartLocalSteps +%D \startcombination[both] +%D {\StartLocalStep\placestreamlayer[left]\StopLocalStep} {} +%D {\StartLocalStep\placestreamlayer[right]\StopLocalStep} {} +%D \stopcombination +%D \StopLocalSteps +%D \stoptyping + \endinput diff --git a/tex/context/base/s-pre-61.tex b/tex/context/base/s-pre-61.tex index fd30624c3..c2040a0d9 100644 --- a/tex/context/base/s-pre-61.tex +++ b/tex/context/base/s-pre-61.tex @@ -30,14 +30,14 @@ \setuplayout [topspace=10pt, - header=40pt, + header=30pt, headerdistance=20pt, height=middle, footerdistance=20pt, footer=0pt, - bottomdistance=10pt, + bottomdistance=20pt, bottom=20pt, - bottomspace=40pt, + bottomspace=50pt, backspace=30pt, width=middle] @@ -123,7 +123,8 @@ enlarged 4pt withcolor \MPcolor{pagecolor} ; fill Field[Text][Text] - topenlarged (TopSpace +4pt) + enlarged 10pt +% topenlarged (HeaderHeight+HeaderDistance) leftenlarged (BackSpace+4pt) rightenlarged (CutSpace +4pt) withcolor OverlayColor ; @@ -136,6 +137,7 @@ enlarged 4pt withcolor \MPcolor{pagecolor} ; fill Field[Text][Text] + enlarged 10pt leftenlarged (BackSpace+4pt) rightenlarged (CutSpace+4pt) withcolor OverlayColor ; diff --git a/tex/context/base/s-pre-62.tex b/tex/context/base/s-pre-62.tex new file mode 100644 index 000000000..c3683cbfa --- /dev/null +++ b/tex/context/base/s-pre-62.tex @@ -0,0 +1,210 @@ +%D \module +%D [ file=s-pre-62, +%D version=2005.03.04, +%D title=\CONTEXT\ Style File, +%D subtitle=Presentation Environment 62, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D Melior + +\usemodule[pre-60] + +\usetypescriptfile + [type-ghz] + +\definetypeface[mainface][rm][serif][melior] [default][encoding=texnansi] +\definetypeface[mainface][tt][mono] [modern] [default][encoding=texnansi,rscale=1.05] +\definetypeface[mainface][ss][serif][melior] [default][encoding=texnansi] +\definetypeface[mainface][mm][math] [palatino][default][encoding=texnansi,rscale=0.95] + +\setupbodyfont + [mainface,14.4pt] + +\setuppapersize + [S6][S6] + +\setvariables[layout][dx=0,dy=1,nx=2,ny=2,step=64] + +\definemeasure[layoutwd][\dimexpr\paperwidth /\getvariable{layout}{step}\relax] +\definemeasure[layoutht][\dimexpr\paperheight/\getvariable{layout}{step}\relax] + +\setuplayout + [ width=middle, + height=middle, + header=0pt, + footer=0pt, + margin=0pt, + backspace=5\measure{layoutwd}, + topspace=5\measure{layoutht}] + +\setuplayout + [step] + [ backspace=\numexpr2+ \getvariable{layout}{dx}\relax\measure{layoutwd}, + cutspace=\numexpr3+\getvariable{layout}{nx}-\getvariable{layout}{dx}\relax\measure{layoutwd}, + topspace=\numexpr2+ \getvariable{layout}{dy}\relax\measure{layoutht}, + bottomspace=\numexpr3+\getvariable{layout}{ny}-\getvariable{layout}{dy}\relax\measure{layoutht}] + + +\definecolor[layout:left] [t=.5,a=1,b=1] +\definecolor[layout:right] [t=.5,a=1,r=1] +\definecolor[layout:top] [t=.5,a=1,g=1] +\definecolor[layout:bottom][t=.5,a=1,y=1] +\definecolor[layout:page] [s=.75] + +\definehspace[menu][\measure{layoutwd}] + +\setupinteraction + [state=start, + click=off, + style=, + color=interactioncolor, + contrastcolor=interactioncolor] + +\setupinteractionscreen + [option=max] + +\setupbuttons + [color=maincolor, + contrastcolor=maincolor, + style=\tf, % acceptable + height=2\measure{layoutht}, + width=2\measure{layoutwd}, + offset=overlay, + frame=off] + +\definecolor[interactioncolor][darkgray] +\definecolor[maincolor] [lightgray] + +\setuptexttexts + [] + [\vbox to \textheight{\vfill\hfill\setups{menu:content}}] + +\startsetups menu:content + + \button{\symbol[firstpage]}[firstpage] + \hspace[menu] + \button{\symbol[previouspage]}[previouspage] + \hspace[menu] + \button{\StartBusy\symbol[PauseRendering]\StopBusy}[InvokeStepper] + \hspace[menu] + \button{\symbol[nextpage]}[nextpage] + \hspace[menu] + \button{\symbol[lastpage]}[lastpage] + \hspace[menu] + \button{\symbol[CloseDocument]}[CloseDocument] + +\stopsetups + +\startuseMPgraphic{page}{step} + StartPage ; + numeric dx, dy ; dx := PaperWidth/\MPvar{step} ; dy := PaperHeight/\MPvar{step} ; + fill Page withcolor .5white ; + fill + ulcorner Page -- urcorner Page -- + urcorner Page shifted (0,-TopSpace+dy) -- ulcorner Page shifted (0,-TopSpace+dy) -- cycle + withcolor \MPcolor{layout:top} ; + fill + llcorner Page -- lrcorner Page -- + lrcorner Page shifted (0,BottomSpace-dy) -- llcorner Page shifted (0,BottomSpace-dy) -- cycle + withcolor \MPcolor{layout:bottom} ; + fill + ulcorner Page -- llcorner Page -- + llcorner Page shifted (BackSpace-dx,0) -- ulcorner Page shifted (BackSpace-dx,0) -- cycle + withcolor \MPcolor{layout:left} ; + fill + urcorner Page -- lrcorner Page -- + lrcorner Page shifted (-CutSpace+dx,0) -- urcorner Page shifted (-CutSpace+dx,0) -- cycle + withcolor \MPcolor{layout:right} ; + fill Field[Text][Text] enlarged (dx,dy) withcolor white ; + fill Field[Text][Text] enlarged (dx,dy) withcolor \MPcolor{layout:page} ; + StopPage ; +\stopuseMPgraphic + +\defineoverlay[page][\useMPgraphic{page}{step=\getvariable{layout}{step}}] + +\setupbackgrounds + [page] + [background=page] + +\setupcolors + [state=start] + +\startsetups nextstep + % pagebreak handlers are grouped, so we need to set global + \ifnum\getvariable{layout}{dx}=\getvariable{layout}{nx}\relax + \ifnum\getvariable{layout}{dy}=\getvariable{layout}{ny}\relax + \setxvariables[layout][dy=1] + \else + \setxvariables[layout][dy=\the\numexpr\getvariable{layout}{dy}+1\relax] + \fi + \setxvariables[layout][dx=1] + \else + \setxvariables[layout][dx=\the\numexpr\getvariable{layout}{dx}+1\relax] + \fi + % global anyway + \setuplayout[step] +\stopsetups + +\definefontsynonym[MainTitleFont][SerifBold] + +\definefont[ChapterTitleFont][MainTitleFont sa 2] + +\appendtoks + \NormalizeFontHeight \TitleFont {\setstrut\strut\quad} {4\lineheight} {MainTitleFont} + \NormalizeFontHeight \SubTitleFont {\setstrut\strut\quad} {3\lineheight} {MainTitleFont} + \NormalizeFontHeight \ChapterNumberFont {XVI} {4\lineheight} {MainTitleFont} +\to \everystarttext + +\setupsection + [section-2] + [bodypartconversion=Romannumerals] + +\installpagebreakhandler {step} {\setups{nextstep}} + +\definepagebreak[chapter][yes,step] + +\setuphead + [chapter] + [page=chapter, + command=\MyChapterCommand] + +\definehead[Topic][chapter] +\definehead[Nopic][title] + +\setuphead[chapter,Topic,Nopic] + [numberstyle=\ChapterNumberFont, + textstyle=\ChapterTitleFont, + numbercolor=lightgray, + textcolor=darkgray] + +\def\MyChapterCommand#1#2% + {\hbox \bgroup % we need to nil the strut added by the headplacement + \setupframed[frame=off,lines=4,offset=overlay]% + \rlap{\hskip2\lineheight\framed{\setnostrut#1}}\framed{#2}% + \egroup} + +\setupitemize + [each] + [R,broad] + [stopper=, + color=lightgray] + +\def\doTitlePage#1#2#3% + {\startstandardmakeup[headerstate=high,textstate=stop] + \setupalign[middle] + \def\\{\def\\{\endgraf}\endgraf\vfil\ignorespaces#2}% + \startcolor[darkgray] + #1\setstrut\setupinterlinespace\vfil#3\vfil + \stopcolor + \stopstandardmakeup} + +\def\TitlePage {\doTitlePage\TitleFont\relax} +\def\SubTitlePage{\doTitlePage\TitleFont\SubTitleFont} + +\endinput diff --git a/tex/context/base/s-pre-63.tex b/tex/context/base/s-pre-63.tex new file mode 100644 index 000000000..76de8b991 --- /dev/null +++ b/tex/context/base/s-pre-63.tex @@ -0,0 +1,73 @@ +%D \module +%D [ file=s-pre-63, +%D version=2006.05.11, +%D title=\CONTEXT\ Style File, +%D subtitle=Presentation Environment 63, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\usemodule[pre-61,streams] + +\definemeasure[textgap] [\dimexpr24pt\relax] + +\definemeasure[leftwidth] [\dimexpr.25\textwidth-.5\measure{textgap}\relax] +\definemeasure[rightwidth][\dimexpr.75\textwidth-.5\measure{textgap}\relax] + +\definestreamlayer[left] [width=\measure{leftwidth}] +\definestreamlayer[right][width=\measure{rightwidth}] + +\setupbodyfont[12pt] + +\definefont[LeftFont][Normal sa 3] + +\setupheader[style=\tfc,before=\vss,after=\vss] + +\startsetups streamlayer:left:settings + \hsize\measure{leftwidth} + \LeftFont + \setupinterlinespace +\stopsetups + +\startsetups streamlayer:right:settings + \hsize\measure{rightwidth} +\stopsetups + +\definecombination[both][distance=\measure{textgap},location=top] + +\startsetups place:both + \startcombination[both] + {\StartLocalStep\placestreamlayer[left]\StopLocalStep} {} + {\StartLocalStep\placestreamlayer[right]\StopLocalStep} {} + \stopcombination +\stopsetups + +\def\StartPage {\page \StartLocalSteps} +\def\StopPage {\StopLocalSteps \page} + +\def\StartLeft {\startstreamlayer[left]} +\def\StartRight{\startstreamlayer[right]} + +\def\StopLeft {\stopstreamlayer} +\def\StopRight {\stopstreamlayer} + +\def\StartPair {} +\def\StopPair {\setups[place:both]} + +\doifnotmode {demo} {\endinput} + +\setupbodyfont[8pt] \definefont[BigFont][Normal sa 4] + +\starttext + +\StartPage + \StartPair \StartLeft ZAPF \StopLeft \StartRight \input zapf \StopRight \StopPair + \StartPair \StartLeft DAVIS \StopLeft \StartRight \input davis \StopRight \StopPair + \StartPair \StartLeft WARD \StopLeft \StartRight \input ward \StopRight \StopPair +\StopPage + +\stoptext diff --git a/tex/context/base/spec-tpd.tex b/tex/context/base/spec-tpd.tex index acd836370..c21139b03 100644 --- a/tex/context/base/spec-tpd.tex +++ b/tex/context/base/spec-tpd.tex @@ -317,6 +317,8 @@ % \definefileinsertion{tpd}{svg}{\doPDFinsertsvg} % \definefileinsertion{tpd}{svgz}{\doPDFinsertsvg} +% +% todo: no placeholder but manipulator of evt autorlx \def\doPDFinsertsvg#1#2#3#4#5#6#7#8#9% {\externalfigureplaceholder{#1}{#7}{#8}} diff --git a/tex/context/base/supp-mps.tex b/tex/context/base/supp-mps.tex index 0b11ef592..d46de7fd4 100644 --- a/tex/context/base/supp-mps.tex +++ b/tex/context/base/supp-mps.tex @@ -517,6 +517,18 @@ %D \stopMPcode %D \stoptyping +%D A goodie for Mojca (the gnuplot wizzard): +%D +%D \starttyping +%D \startMPcode +%D draw fullcircle scaled 4cm ; +%D draw \textext{$\sqrt{\frac{3}{2}^3}$} ; +%D \stopMPcode +%D \stoptyping + +\long\def\textext#1{\normalunexpanded{textext("#1")}} % or \detokenize + + \def\flushMPTEXgraphic {\ifMPTEXgraphic \immediate\write\MPwrite{verbatimtex \the\everyMPTEXgraphic\space etex;}% @@ -1222,7 +1234,7 @@ \bgroup \message{[MP fonts #1]}% %\uncatcodespecials - \endlinechar=-1 + \endlinechar\minusone \setMPspecials \obeyMPspecials \setbox\scratchbox\hbox diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index 27f0b8cc5..dcf341757 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 7bc1325cd..4870b4288 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 489d66e12..d0311f050 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index 59f640722..6a43c3a9c 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index 5239212b0..cbe1efb68 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index e0dab0345..d22c400f4 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index 4c7a2e40f..ed6420c3c 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ - + -- cgit v1.2.3