diff options
| author | Marius <mariausol@gmail.com> | 2012-05-19 01:20:14 +0300 |
|---|---|---|
| committer | Marius <mariausol@gmail.com> | 2012-05-19 01:20:14 +0300 |
| commit | 3821b4213bf250551cfa122313ae2c56f9923533 (patch) | |
| tree | 291a4a12a622e6d081ba8b709ab3c03780e5d445 | |
| parent | eda07bb8527bbb5d411be813ccd1e916c83e9d5b (diff) | |
| download | context-3821b4213bf250551cfa122313ae2c56f9923533.tar.gz | |
beta 2012.05.18 23:50
58 files changed, 348 insertions, 336 deletions
diff --git a/fonts/tfm/public/marvosym/fmvr8x.tfm b/fonts/tfm/public/marvosym/fmvr8x.tfm Binary files differdeleted file mode 100644 index ce8172f1c..000000000 --- a/fonts/tfm/public/marvosym/fmvr8x.tfm +++ /dev/null diff --git a/metapost/context/base/mp-abck.mpiv b/metapost/context/base/mp-abck.mpiv index 977bebcfd..02fab0337 100644 --- a/metapost/context/base/mp-abck.mpiv +++ b/metapost/context/base/mp-abck.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-abck.mp, +%D [ file=mp-abck.mpiv, %D version=2012.02.19, % was mp-core: 1999.08.01, anchoring %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=anchored background macros, diff --git a/metapost/context/base/mp-apos.mpiv b/metapost/context/base/mp-apos.mpiv index fad185b78..f92efc5fd 100644 --- a/metapost/context/base/mp-apos.mpiv +++ b/metapost/context/base/mp-apos.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-apos.mp, +%D [ file=mp-apos.mpiv, %D version=2012.02.19, % was mp-core: 1999.08.01, anchoring %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=anchored background macros, diff --git a/metapost/context/base/mp-asnc.mpiv b/metapost/context/base/mp-asnc.mpiv index cfee782e7..dfd88317c 100644 --- a/metapost/context/base/mp-asnc.mpiv +++ b/metapost/context/base/mp-asnc.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-asnc.mp, +%D [ file=mp-asnc.mpiv, %D version=2012.02.19, % was mp-core: 1999.08.01, anchoring %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=anchored background macros, diff --git a/metapost/context/base/mp-butt.mpii b/metapost/context/base/mp-butt.mpii index 5c1edd42e..107886bb5 100644 --- a/metapost/context/base/mp-butt.mpii +++ b/metapost/context/base/mp-butt.mpii @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-butt.mp, +%D [ file=mp-butt.mpii, %D version=2000.05.31, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=buttons, diff --git a/metapost/context/base/mp-butt.mpiv b/metapost/context/base/mp-butt.mpiv index 5c1edd42e..df7e9e4fd 100644 --- a/metapost/context/base/mp-butt.mpiv +++ b/metapost/context/base/mp-butt.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-butt.mp, +%D [ file=mp-butt.mpiv, %D version=2000.05.31, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=buttons, diff --git a/metapost/context/base/mp-char.mpii b/metapost/context/base/mp-char.mpii index 5e7a31c50..63a71eff8 100644 --- a/metapost/context/base/mp-char.mpii +++ b/metapost/context/base/mp-char.mpii @@ -1,7 +1,7 @@ % to be cleaned up, namespace needed ! ! ! ! ! %D \module -%D [ file=mp-char.mp, +%D [ file=mp-char.mpii, %D version=1998.10.10, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=charts, diff --git a/metapost/context/base/mp-char.mpiv b/metapost/context/base/mp-char.mpiv index 28fe41512..c293b7284 100644 --- a/metapost/context/base/mp-char.mpiv +++ b/metapost/context/base/mp-char.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-char.mp, +%D [ file=mp-char.mpiv, %D version=2011.10.1, % 1998.10.10, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=charts, diff --git a/metapost/context/base/mp-chem.mpiv b/metapost/context/base/mp-chem.mpiv index 04fec713b..cb595f2c6 100644 --- a/metapost/context/base/mp-chem.mpiv +++ b/metapost/context/base/mp-chem.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-chem.mp, +%D [ file=mp-chem.mpiv, %D version=2009.05.13, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=chemicals, diff --git a/metapost/context/base/mp-core.mpiv b/metapost/context/base/mp-core.mpiv index fd0b8bb9c..1934e3040 100644 --- a/metapost/context/base/mp-core.mpiv +++ b/metapost/context/base/mp-core.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-core.mp, +%D [ file=mp-core.mpiv, %D version=1999.08.01, % anchoring %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=background macros, diff --git a/metapost/context/base/mp-crop.mpiv b/metapost/context/base/mp-crop.mpiv index 260823e68..6360757e5 100644 --- a/metapost/context/base/mp-crop.mpiv +++ b/metapost/context/base/mp-crop.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-crop.mp, +%D [ file=mp-crop.mpiv, %D version=2011.06.23, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=Cropmarks, diff --git a/metapost/context/base/mp-figs.mpii b/metapost/context/base/mp-figs.mpii index aecdc07e7..d4fcc2b35 100644 --- a/metapost/context/base/mp-figs.mpii +++ b/metapost/context/base/mp-figs.mpii @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-figs.mp, +%D [ file=mp-figs.mpii, %D version=2003.01.15, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=figures, diff --git a/metapost/context/base/mp-figs.mpiv b/metapost/context/base/mp-figs.mpiv index aecdc07e7..c65808f6d 100644 --- a/metapost/context/base/mp-figs.mpiv +++ b/metapost/context/base/mp-figs.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-figs.mp, +%D [ file=mp-figs.mpiv, %D version=2003.01.15, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=figures, diff --git a/metapost/context/base/mp-form.mpiv b/metapost/context/base/mp-form.mpiv index 56df0bd63..d0519b4f2 100644 --- a/metapost/context/base/mp-form.mpiv +++ b/metapost/context/base/mp-form.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-form.mp, +%D [ file=mp-form.mpiv, %D version=2011.10.14, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=form support, diff --git a/metapost/context/base/mp-func.mpii b/metapost/context/base/mp-func.mpii index 407d534e8..94e400b91 100644 --- a/metapost/context/base/mp-func.mpii +++ b/metapost/context/base/mp-func.mpii @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-func.mp, +%D [ file=mp-func.mpii, %D version=2001.12.29, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=function hacks, diff --git a/metapost/context/base/mp-func.mpiv b/metapost/context/base/mp-func.mpiv index 26037f48c..1d289b606 100644 --- a/metapost/context/base/mp-func.mpiv +++ b/metapost/context/base/mp-func.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-func.mp, +%D [ file=mp-func.mpiv, %D version=2001.12.29, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=function hacks, diff --git a/metapost/context/base/mp-grid.mpii b/metapost/context/base/mp-grid.mpii index c49fbeec2..ea28d60af 100644 --- a/metapost/context/base/mp-grid.mpii +++ b/metapost/context/base/mp-grid.mpii @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-grid.mp, +%D [ file=mp-grid.mpii, %D version=2000.07.10, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=grid support, diff --git a/metapost/context/base/mp-grid.mpiv b/metapost/context/base/mp-grid.mpiv index e7420e4f6..cc5c2b76e 100644 --- a/metapost/context/base/mp-grid.mpiv +++ b/metapost/context/base/mp-grid.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-grid.mp, +%D [ file=mp-grid.mpiv, %D version=2000.07.10, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=grid support, diff --git a/metapost/context/base/mp-grph.mpii b/metapost/context/base/mp-grph.mpii index 148d9834a..782942946 100644 --- a/metapost/context/base/mp-grph.mpii +++ b/metapost/context/base/mp-grph.mpii @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-grph.mp, +%D [ file=mp-grph.mpii, %D version=2000.12.14, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=graphic text support, diff --git a/metapost/context/base/mp-grph.mpiv b/metapost/context/base/mp-grph.mpiv index 3cbe42bdb..a8868033b 100644 --- a/metapost/context/base/mp-grph.mpiv +++ b/metapost/context/base/mp-grph.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-grph.mp, +%D [ file=mp-grph.mpiv, %D version=2000.12.14, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=graphic text support, diff --git a/metapost/context/base/mp-mlib.mpiv b/metapost/context/base/mp-mlib.mpiv index ef3408198..71985cef8 100644 --- a/metapost/context/base/mp-mlib.mpiv +++ b/metapost/context/base/mp-mlib.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-mlib.mp, +%D [ file=mp-mlib.mpiv, %D version=2008.03.21, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=plugins, diff --git a/metapost/context/base/mp-page.mpii b/metapost/context/base/mp-page.mpii index c7542a5f9..456ee61cc 100644 --- a/metapost/context/base/mp-page.mpii +++ b/metapost/context/base/mp-page.mpii @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-page.mp, +%D [ file=mp-page.mpii, %D version=1999.03.10, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=page enhancements, diff --git a/metapost/context/base/mp-page.mpiv b/metapost/context/base/mp-page.mpiv index bb8218be5..96f617257 100644 --- a/metapost/context/base/mp-page.mpiv +++ b/metapost/context/base/mp-page.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-page.mp, +%D [ file=mp-page.mpiv, %D version=1999.03.10, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=page enhancements, diff --git a/metapost/context/base/mp-shap.mpii b/metapost/context/base/mp-shap.mpii index 291506997..17d21314c 100644 --- a/metapost/context/base/mp-shap.mpii +++ b/metapost/context/base/mp-shap.mpii @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-shap.mp, +%D [ file=mp-shap.mpii, %D version=2000.05.31, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=shapes, diff --git a/metapost/context/base/mp-shap.mpiv b/metapost/context/base/mp-shap.mpiv index c86edaf82..b62e636d5 100644 --- a/metapost/context/base/mp-shap.mpiv +++ b/metapost/context/base/mp-shap.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-shap.mp, +%D [ file=mp-shap.mpiv, %D version=2000.05.31, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=shapes, diff --git a/metapost/context/base/mp-spec.mpii b/metapost/context/base/mp-spec.mpii index 7cb960524..19d81f312 100644 --- a/metapost/context/base/mp-spec.mpii +++ b/metapost/context/base/mp-spec.mpii @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-spec.mp, +%D [ file=mp-spec.mpii, %D version=1999.6.26, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=special extensions, diff --git a/metapost/context/base/mp-step.mpii b/metapost/context/base/mp-step.mpii index a8d0df8e0..e05f00b6e 100644 --- a/metapost/context/base/mp-step.mpii +++ b/metapost/context/base/mp-step.mpii @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-step.mp, +%D [ file=mp-step.mpii, %D version=2001.05.22, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=steps, diff --git a/metapost/context/base/mp-step.mpiv b/metapost/context/base/mp-step.mpiv index 21a20ce71..654ef443d 100644 --- a/metapost/context/base/mp-step.mpiv +++ b/metapost/context/base/mp-step.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-cell.mpiv, % mp-step.mp, +%D [ file=mp-cell.mpiv, % mp-step.mpiv, %D version=2010.10.07, % 2001.05.22, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=steps, diff --git a/metapost/context/base/mp-text.mpii b/metapost/context/base/mp-text.mpii index 67dff15f9..d529e9242 100644 --- a/metapost/context/base/mp-text.mpii +++ b/metapost/context/base/mp-text.mpii @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-text.mp, +%D [ file=mp-text.mpii, %D version=2000.07.10, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=text support, diff --git a/metapost/context/base/mp-text.mpiv b/metapost/context/base/mp-text.mpiv index c7bafeb8a..d5630f68e 100644 --- a/metapost/context/base/mp-text.mpiv +++ b/metapost/context/base/mp-text.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-text.mp, +%D [ file=mp-text.mpiv, %D version=2000.07.10, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=text support, diff --git a/metapost/context/base/mp-tool.mpii b/metapost/context/base/mp-tool.mpii index 96932d58a..8d8c9d920 100644 --- a/metapost/context/base/mp-tool.mpii +++ b/metapost/context/base/mp-tool.mpii @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-tool.mp, +%D [ file=mp-tool.mpii, %D version=1998.02.15, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=auxiliary macros, diff --git a/metapost/context/base/mp-tool.mpiv b/metapost/context/base/mp-tool.mpiv index 39449b511..764863b65 100644 --- a/metapost/context/base/mp-tool.mpiv +++ b/metapost/context/base/mp-tool.mpiv @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-tool.mp, +%D [ file=mp-tool.mpiv, %D version=1998.02.15, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=auxiliary macros, diff --git a/metapost/context/base/mp-txts.mpii b/metapost/context/base/mp-txts.mpii index d3d25293d..d3597488f 100644 --- a/metapost/context/base/mp-txts.mpii +++ b/metapost/context/base/mp-txts.mpii @@ -1,5 +1,5 @@ %D \module -%D [ file=mp-txts.mp, +%D [ file=mp-txts.mpii, %D version=2006.06.08, %D title=\CONTEXT\ \METAPOST\ graphics, %D subtitle=more text support, diff --git a/scripts/context/lua/mtx-grep.lua b/scripts/context/lua/mtx-grep.lua index 6e33d440c..3cbc1421a 100644 --- a/scripts/context/lua/mtx-grep.lua +++ b/scripts/context/lua/mtx-grep.lua @@ -32,7 +32,7 @@ local cr = lpeg.P("\r") local lf = lpeg.P("\n") local crlf = cr * lf local newline = crlf + cr + lf -local content = lpeg.C((1-newline)^0) * newline +local content = lpeg.C((1-newline)^0) * newline + lpeg.C(lpeg.P(1)^1) local write_nl = texio.write_nl diff --git a/tex/context/base/colo-ini.mkiv b/tex/context/base/colo-ini.mkiv index 164b39262..21d70decb 100644 --- a/tex/context/base/colo-ini.mkiv +++ b/tex/context/base/colo-ini.mkiv @@ -702,6 +702,42 @@ "#5",false,\iffreezecolors true\else false\fi)}% not global \unexpanded\setvalue{#1}{\colo_helpers_activate{#1}}} +%D Here is a more efficient helper for pgf: +%D +%D \starttying +%D \startluacode +%D function commands.pgfxcolorspec(ca) -- {}{}{colorspace}{list} +%D local cv = attributes.colors.values[ca] +%D if cv then +%D local model = cv[1] +%D if model == 2 then +%D context("{}{}{gray}{%1.3f}",cv[2]) +%D elseif model == 3 then +%D context("{}{}{rgb}{%1.3f,%1.3f,%1.3f}",cv[3],cv[4],cv[5]) +%D elseif model == 4 then +%D context("{}{}{cmyk}{%1.3f,%1.3f,%1.3f,%1.3f}",cv[6],cv[7],cv[8],cv[9]) +%D else +%D context("{}{}{gray}{%1.3f}",cv[2]) +%D end +%D else +%D context("{}{}{gray}{0}") +%D end +%D end +%D \stopluacode +%D +%D \def\pgfutil@registercolor#1% +%D {\setevalue{\string\color@#1}{\noexpand\xcolor@\ctxcommand{pgfxcolorspec(\thecolorattribute{#1})}}} +%D +%D \definecolor [darkblue] [r=0,g=0,b=0.5] +%D +%D \starttikzpicture +%D \fill [blue] (0,0) circle(1); +%D \fill [darkblue] (0,0) circle(1); +%D \stoptikzpicture +%D \stoptyping +%D +%D \stopmode + %D \macros %D {doifcolorelse, doifcolor} %D diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 400df7282..165cf971f 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.05.14 16:00} +\newcontextversion{2012.05.18 23:50} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 772d5780a..b6532341c 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.05.14 16:00} +\newcontextversion{2012.05.18 23:50} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 69902446d..a85b09e0b 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex 044c6d782..65df0f2da 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 5ab89d934..a3abacbe7 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2012.05.14 16:00} +\edef\contextversion{2012.05.18 23:50} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index fcbe7872c..755d807ee 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -23,7 +23,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2012.05.14 16:00} +\edef\contextversion{2012.05.18 23:50} %D For those who want to use this: diff --git a/tex/context/base/luat-mac.lua b/tex/context/base/luat-mac.lua index 75d52781c..f8f87a25a 100644 --- a/tex/context/base/luat-mac.lua +++ b/tex/context/base/luat-mac.lua @@ -14,12 +14,6 @@ if not modules then modules = { } end modules ['luat-mac'] = { -- -- \def\foo#1{\expandafter\normaldef\csname#1\endcsname} --- todo: --- --- \def\dosomething#content{%%%<= fine with “#1” --- % { %%% Open unbalanced brace breaks macros. --- } - local P, V, S, R, C, Cs, Cmt, Carg = lpeg.P, lpeg.V, lpeg.S, lpeg.R, lpeg.C, lpeg.Cs, lpeg.Cmt, lpeg.Carg local lpegmatch, patterns = lpeg.match, lpeg.patterns @@ -116,7 +110,7 @@ local always = patterns.alwaysmatched local commenttoken = P("%") local crorlf = S("\n\r") -local commentline = commenttoken * ((Carg(1) * C((1-crorlf)^0))/function(strip,s) return strip and "" or s end) +----- commentline = commenttoken * ((Carg(1) * C((1-crorlf)^0))/function(strip,s) return strip and "" or s end) local commentline = commenttoken * ((1-crorlf)^0) local leadingcomment = (commentline * crorlf^1)^1 local furthercomment = (crorlf^1 * commentline)^1 @@ -166,6 +160,7 @@ local grammar = { "converter", + V("texcode") + V("braced") + furthercomment + + leadingcomment -- new per 2012-05-15 (message on mailing list) + nobrace )^0 -- * rightbrace^-1, -- the -1 catches errors @@ -291,7 +286,14 @@ end -- {\normalexpanded{\def\noexpand\next#content\expandafter\noexpand\csname stop#name\endcsname}{#name : #content}% -- \next} -- ]])) - +-- +-- print(macros.preprocessed([[ +-- \def\dosomething#content{%%% {{ +-- % { }{{ %% +-- \bgroup\italic#content\egroup +-- } +-- ]])) +-- -- Just an experiment: -- -- \catcode\numexpr"10FF25=\commentcatcode %% > 110000 is invalid diff --git a/tex/context/base/mlib-run.lua b/tex/context/base/mlib-run.lua index f42b53594..59dc88b90 100644 --- a/tex/context/base/mlib-run.lua +++ b/tex/context/base/mlib-run.lua @@ -148,7 +148,7 @@ if mplibone then local preamble = [[ boolean mplib ; mplib := true ; string mp_parent_version ; mp_parent_version := "%s" ; - input %s ; dump ; + input "%s" ; dump ; ]] metapost.parameters = { @@ -244,7 +244,7 @@ else local preamble = [[ boolean mplib ; mplib := true ; let dump = endinput ; - input %s ; + input "%s" ; ]] function metapost.load(name) @@ -257,7 +257,7 @@ else if not mpx then result = { status = 99, error = "out of memory"} else - result = mpx:execute(format(preamble, file.addsuffix(name,"mp"))) + result = mpx:execute(format(preamble, file.addsuffix(name,"mp"))) -- addsuffix is redundant end stoptiming(mplib) metapost.reporterror(result) diff --git a/tex/context/base/pack-rul.mkiv b/tex/context/base/pack-rul.mkiv index f65641b96..d7e41dd70 100644 --- a/tex/context/base/pack-rul.mkiv +++ b/tex/context/base/pack-rul.mkiv @@ -803,6 +803,7 @@ {\bgroup \advance\framednesting\plusone \expandafter\let\csname\??ol:\the\framednesting\s!parent\endcsname\??ol + \iffirstargument\secondargumenttrue\fi % dirty trick \pack_framed_process[\??ol:\the\framednesting][#1]% \bgroup} diff --git a/tex/context/base/page-box.mkvi b/tex/context/base/page-box.mkvi index 42db40e5f..58a5627cb 100644 --- a/tex/context/base/page-box.mkvi +++ b/tex/context/base/page-box.mkvi @@ -166,6 +166,8 @@ % backgroundoffset=10mm,background=color,backgroundcolor=red] % \starttext \dorecurse{10}{\input tufte \par} \stoptext +% best use private variables + \newconditional\c_page_boxes_clip_print \settrue\c_page_boxes_clip_print \def\page_boxes_apply_clip_print_left % box diff --git a/tex/context/base/page-imp.mkiv b/tex/context/base/page-imp.mkiv index 71c30a7e1..9d0f722fe 100644 --- a/tex/context/base/page-imp.mkiv +++ b/tex/context/base/page-imp.mkiv @@ -560,18 +560,23 @@ \def\handlearrangedpageTWOUP {\splitoffarrangedpagesTWO + \ht\arrangedpageA\paperheight + \ht\arrangedpageB\paperheight \ifconditional\arrangedswapstate \global\setbox\arrangedpageA\hbox - {\page_boxes_apply_clip_print_left \arrangedpageA\box\arrangedpageA - \page_boxes_apply_clip_print_right\arrangedpageB\box\arrangedpageB}% + {\page_boxes_apply_clip_print_left \arrangedpageA + \box\arrangedpageA + \page_boxes_apply_clip_print_right\arrangedpageB + \box\arrangedpageB}% \setfalse\arrangedswapstate \else \global\setbox\arrangedpageA\hbox - {\page_boxes_apply_clip_print_left \arrangedpageB\box\arrangedpageB - \page_boxes_apply_clip_print_right\arrangedpageA\box\arrangedpageA}% + {\page_boxes_apply_clip_print_left \arrangedpageB + \box\arrangedpageB + \page_boxes_apply_clip_print_right\arrangedpageA + \box\arrangedpageA}% \settrue\arrangedswapstate \fi - \ht\arrangedpageA\paperheight \global\setbox\arrangedpageB\box\scratchbox} \def\handlearrangedpageTWODOWN @@ -580,13 +585,17 @@ \ht\arrangedpageB\paperheight \ifconditional\arrangedswapstate \global\setbox\arrangedpageA\vbox - {\offinterlineskip\vskip\paperheight - \box\arrangedpageA\box\arrangedpageB}% + {\offinterlineskip + \vskip\paperheight + \box\arrangedpageA + \box\arrangedpageB}% \setfalse\arrangedswapstate \else \global\setbox\arrangedpageA\vbox - {\offinterlineskip\vskip\paperheight - \box\arrangedpageB\box\arrangedpageA}% + {\offinterlineskip + \vskip\paperheight + \box\arrangedpageB + \box\arrangedpageA}% \settrue\arrangedswapstate \fi \global\setbox\arrangedpageB\box\scratchbox} @@ -616,6 +625,7 @@ {\offinterlineskip \unvbox\arrangedpageB \allowbreak + \setbox#1\vbox{\box#1}% really needed in order to keep real dimensions \ht#1\onepoint \dp#1\zeropoint \vbox{\box#1}}} diff --git a/tex/context/base/s-pre-06.tex b/tex/context/base/s-pre-06.tex index 21e7236e7..47948262c 100644 --- a/tex/context/base/s-pre-06.tex +++ b/tex/context/base/s-pre-06.tex @@ -120,7 +120,6 @@ \defineoverlay [Joke] [\useMPgraphic{background}] \startuseMPgraphic{background} - input mp-tool ; width := \overlaywidth ; height := \overlayheight ; picture p ; p := char 79 infont "\truefontname{Regular}" scaled 1 ; diff --git a/tex/context/base/spac-ver.mkiv b/tex/context/base/spac-ver.mkiv index 23229b650..72ee80d4f 100644 --- a/tex/context/base/spac-ver.mkiv +++ b/tex/context/base/spac-ver.mkiv @@ -563,7 +563,7 @@ \blank[\v!white,\the\d_spac_lines_correction_before]% \blank[\v!white]\dotopbaselinecorrection \fi \nointerlineskip % new - \dontleavehmode + \noindent % not just \dontleavehmode (MKII compatible) \box\scratchbox \endgraf \blank[\the\d_spac_lines_correction_after]% \dobotbaselinecorrection diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 071753577..9327292a4 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex fd66c594f..38c7dde20 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/strc-ref.mkvi b/tex/context/base/strc-ref.mkvi index d3c932598..161502c9b 100644 --- a/tex/context/base/strc-ref.mkvi +++ b/tex/context/base/strc-ref.mkvi @@ -821,23 +821,30 @@ %D shows one of: \hbox {$^\goforwardcharacter$ %D $^\gobackwardcharacter$ $^\gonowherecharacter$}, depending %D on the direction to go. +%D +%D \starttyping +%D ... \somewhere{backward text}{forward text}[someref] ... +%D ... \atpage[someref] ... +%D \stoptyping % 0 = unknown % 1 = same % 2 = before % 3 = after -% \def\strc_references_by_reference_page_state#unknown#before#current#after% -% {\ifcase\referencepagestate\relax#unknown\or#current\or#before\or#after\fi} -% -% this fails in an expansion as the \relax stays, so we need: - \def\strc_references_by_reference_page_state#unknown#before#current#after% {\ifcase\referencepagestate\space#unknown\or#current\or#before\or#after\fi} +% \unexpanded\def\somewhere#backward#foreward#dummy[#label]% #dummy gobbles space around #foreward +% {\doifreferencefoundelse{#label}% usage needs checking (useless) +% {\goto{\strc_references_by_reference_page_state{#label}{#backward}{}{#foreward}}[#label]} +% {[#label]}} +% +% better: + \unexpanded\def\somewhere#backward#foreward#dummy[#label]% #dummy gobbles space around #foreward - {\doifreferencefoundelse{#label}% usage needs checking (useless) - {\goto{\strc_references_by_reference_page_state{#label}{#backward}{}{#foreward}}[#label]} + {\doifreferencefoundelse{#label}% + {\strc_references_by_reference_page_state{#label}{\goto{#backward}[#label]}{}{\goto{#foreward}[#label]}} {[#label]}} \unexpanded\def\atpage[#label]% todo @@ -1518,23 +1525,6 @@ %D The previous definitions are somewhat obsolete so we don't %D use it here. -%D A still very rudimentary|/|experimental forward|/|backward -%D reference mechanism is provided by the macro \type{\atpage}: -%D -%D \starttyping -%D ... \somewhere{backward text}{forward text}[someref] ... -%D ... \atpage[someref] ... -%D \stoptyping -%D -%D In future versions there will be more sophisticated - -% 0 = no page reference -% 1 = same page -% 2 = preceding page -% 3 = following page -% 4 = backward, same page (todo) -% 5 = forward, same page (todo) - %D We can cross link documents by using: %D %D \showsetup{coupledocument} diff --git a/tex/context/base/strc-ren.mkiv b/tex/context/base/strc-ren.mkiv index 543c55fff..b2d23c108 100644 --- a/tex/context/base/strc-ren.mkiv +++ b/tex/context/base/strc-ren.mkiv @@ -462,17 +462,27 @@ \fi #2}} +% \unexpanded\def\placeheadmarginalternative#1#2% +% {\vbox +% {\localheadsetup +% \begstrut % use one \strut here! +% \dontleavehmode % in case there is no strut, else side effects with llap +% \ifconditional\headshownumber +% \llap{\hbox{\hfill{#1}\hskip\localheadskip\hskip\leftmargindistance}}% introduces whitespace +% % maybe better: +% % \inleftmargin{\hbox{\hss{#1}\hskip\localheadskip}}% +% \fi +% {#2}}} + \unexpanded\def\placeheadmarginalternative#1#2% - {\vbox - {\localheadsetup - \begstrut % use one \strut here! - \dontleavehmode % in case there is no strut, else side effects with llap - \ifconditional\headshownumber - \llap{\hbox{\hfill{#1}\hskip\localheadskip\hskip\leftmargindistance}}% introduces whitespace - % maybe better: - % \inleftmargin{\hbox{\hss{#1}\hskip\localheadskip}}% - \fi - {#2}}} + {\vbox + {\localheadsetup + \begstrut % use one \strut here! + \dontleavehmode % in case there is no strut, else side effects with llap + \ifconditional\headshownumber + \llap{\hbox{\hfill{#1}\hskip\dimexpr\localheadskip+\doifoddpageelse\leftmargindistance\rightmargindistance\relax}}% introduces whitespace + \fi + {#2}}} \defineheadplacement[\v!inmargin][\v!vertical]#1#2{\placeheadmarginalternative{#1}{#2}} \defineheadplacement[\v!margin] [\v!vertical]#1#2{\placeheadmarginalternative{#1}{#2}} diff --git a/tex/context/base/supp-tpi.mkii b/tex/context/base/supp-tpi.mkii index 16e423596..dc230563b 100644 --- a/tex/context/base/supp-tpi.mkii +++ b/tex/context/base/supp-tpi.mkii @@ -118,7 +118,7 @@ \aftergroup\stopTPICspecials \resetMPdrawing \startMPdrawing - input mp-tool.mp; + input mp-tool.mpii ; pair p[]; \stopMPdrawing} diff --git a/tex/context/base/type-imp-latinmodern.mkiv b/tex/context/base/type-imp-latinmodern.mkiv index a9fddad7d..f5a32fad1 100644 --- a/tex/context/base/type-imp-latinmodern.mkiv +++ b/tex/context/base/type-imp-latinmodern.mkiv @@ -217,7 +217,7 @@ %D It doesn't hurt to have these, at least for the moment (can go to type-imp-symbol) -\definefontsynonym [ZapfDingbats] [\s!file:uzdr] [\s!goodies=dingbats] +\definefontsynonym [ZapfDingbats] [\s!file:uzdr] [\s!features=dingbats] % [\s!goodies=dingbats] %definefontsynonym [MartinVogel] [\s!file:marvosym.ttf] %definefontsynonym [RalfSmithFormalScript] [\s!file:rsfs10] diff --git a/tex/context/bib/backup-1/sample.bib b/tex/context/bib/backup-1/sample.bib deleted file mode 100644 index 3f8df623e..000000000 --- a/tex/context/bib/backup-1/sample.bib +++ /dev/null @@ -1,38 +0,0 @@ -@STRING{hh = {Hans Hagen}} - -@ELECTRONIC{hh2010, - author = hh, - year = {2010}, - title = {Metafun. \CONTEXT\ mkiv}, - url = {http://www.pragma-ade.nl/general/manuals/metafun-s.pdf}, -} - -@ARTICLE{hh2010a, - author = hh, - title = {The Font Name Mess}, - journal = {MAPS}, - year = {2010}, - volume = {40}, - pages = {2-8}, - keywords = {context}, -} - -@ARTICLE{hh2010b, - author = hh, - title = {Grouping in Hybrid Environments}, - journal = {MAPS}, - year = {2010}, - volume = {40}, - pages = {67-71}, - keywords = {context}, -} - -@BOOK{Eijkhout1991, - title = {\TeX\ by Topic. A \TeX nician's Reference}, - publisher = {Addison-Wesley}, - year = {1991}, - author = {Victor Eijkhout}, - address = {London}, - keywords = {general}, -} - diff --git a/tex/context/fonts/dingbats.lfg b/tex/context/fonts/dingbats.lfg index eab069c72..b6bf3880f 100644 --- a/tex/context/fonts/dingbats.lfg +++ b/tex/context/fonts/dingbats.lfg @@ -7,207 +7,207 @@ return { remapping = { tounicode = true, unicodes = { - a1 = 0x2701, - a10 = 0x2721, - a100 = 0x275E, - a101 = 0x2761, - a102 = 0x2762, - a103 = 0x2763, - a104 = 0x2764, - a105 = 0x2710, - a106 = 0x2765, - a107 = 0x2766, - a108 = 0x2767, - a109 = 0x2660, - a11 = 0x261B, - a110 = 0x2665, - a111 = 0x2666, - a112 = 0x2663, - a117 = 0x2709, - a118 = 0x2708, - a119 = 0x2707, - a12 = 0x261E, - a120 = 0x2460, - a121 = 0x2461, - a122 = 0x2462, - a123 = 0x2463, - a124 = 0x2464, - a125 = 0x2465, - a126 = 0x2466, - a127 = 0x2467, - a128 = 0x2468, - a129 = 0x2469, - a13 = 0x270C, - a130 = 0x2776, - a131 = 0x2777, - a132 = 0x2778, - a133 = 0x2779, - a134 = 0x277A, - a135 = 0x277B, - a136 = 0x277C, - a137 = 0x277D, - a138 = 0x277E, - a139 = 0x277F, - a14 = 0x270D, - a140 = 0x2780, - a141 = 0x2781, - a142 = 0x2782, - a143 = 0x2783, - a144 = 0x2784, - a145 = 0x2785, - a146 = 0x2786, - a147 = 0x2787, - a148 = 0x2788, - a149 = 0x2789, - a15 = 0x270E, - a150 = 0x278A, - a151 = 0x278B, - a152 = 0x278C, - a153 = 0x278D, - a154 = 0x278E, - a155 = 0x278F, - a156 = 0x2790, - a157 = 0x2791, - a158 = 0x2792, - a159 = 0x2793, - a16 = 0x270F, - a160 = 0x2794, - a161 = 0x2192, - a162 = 0x27A3, - a163 = 0x2194, - a164 = 0x2195, - a165 = 0x2799, - a166 = 0x279B, - a167 = 0x279C, - a168 = 0x279D, - a169 = 0x279E, - a17 = 0x2711, - a170 = 0x279F, - a171 = 0x27A0, - a172 = 0x27A1, - a173 = 0x27A2, - a174 = 0x27A4, - a175 = 0x27A5, - a176 = 0x27A6, - a177 = 0x27A7, - a178 = 0x27A8, - a179 = 0x27A9, - a18 = 0x2712, - a180 = 0x27AB, - a181 = 0x27AD, - a182 = 0x27AF, - a183 = 0x27B2, - a184 = 0x27B3, - a185 = 0x27B5, - a186 = 0x27B8, - a187 = 0x27BA, - a188 = 0x27BB, - a189 = 0x27BC, - a19 = 0x2713, - a190 = 0x27BD, - a191 = 0x27BE, - a192 = 0x279A, - a193 = 0x27AA, - a194 = 0x27B6, - a195 = 0x27B9, - a196 = 0x2798, - a197 = 0x27B4, - a198 = 0x27B7, - a199 = 0x27AC, - a2 = 0x2702, - a20 = 0x2714, - a200 = 0x27AE, - a201 = 0x27B1, - a202 = 0x2703, - a203 = 0x2750, - a204 = 0x2752, - a205 = 0xF8DD, - a206 = 0xF8DF, - a21 = 0x2715, - a22 = 0x2716, - a23 = 0x2717, - a24 = 0x2718, - a25 = 0x2719, - a26 = 0x271A, - a27 = 0x271B, - a28 = 0x271C, - a29 = 0x2722, - a3 = 0x2704, - a30 = 0x2723, - a31 = 0x2724, - a32 = 0x2725, - a33 = 0x2726, - a34 = 0x2727, - a35 = 0x2605, - a36 = 0x2729, - a37 = 0x272A, - a38 = 0x272B, - a39 = 0x272C, - a4 = 0x260E, - a40 = 0x272D, - a41 = 0x272E, - a42 = 0x272F, - a43 = 0x2730, - a44 = 0x2731, - a45 = 0x2732, - a46 = 0x2733, - a47 = 0x2734, - a48 = 0x2735, - a49 = 0x2736, - a5 = 0x2706, - a50 = 0x2737, - a51 = 0x2738, - a52 = 0x2739, - a53 = 0x273A, - a54 = 0x273B, - a55 = 0x273C, - a56 = 0x273D, - a57 = 0x273E, - a58 = 0x273F, - a59 = 0x2740, - a6 = 0x271D, - a60 = 0x2741, - a61 = 0x2742, - a62 = 0x2743, - a63 = 0x2744, - a64 = 0x2745, - a65 = 0x2746, - a66 = 0x2747, - a67 = 0x2748, - a68 = 0x2749, - a69 = 0x274A, - a7 = 0x271E, - a70 = 0x274B, - a71 = 0x25CF, - a72 = 0x274D, - a73 = 0x25A0, - a74 = 0x274F, - a75 = 0x2751, - a76 = 0x25B2, - a77 = 0x25BC, - a78 = 0x25C6, - a79 = 0x2756, - a8 = 0x271F, - a81 = 0x25D7, - a82 = 0x2758, - a83 = 0x2759, - a84 = 0x275A, - a85 = 0xF8DE, - a86 = 0xF8E0, - a87 = 0xF8E1, - a88 = 0xF8E2, - a89 = 0xF8D7, - a9 = 0x2720, - a90 = 0xF8D8, - a91 = 0xF8DB, - a92 = 0xF8DC, - a93 = 0xF8D9, - a94 = 0xF8DA, - a95 = 0xF8E3, - a96 = 0xF8E4, - a97 = 0x275B, - a98 = 0x275C, - a99 = 0x275D, + a1 = 0x2701, + a10 = 0x2721, + a100 = 0x275E, + a101 = 0x2761, + a102 = 0x2762, + a103 = 0x2763, + a104 = 0x2764, + a105 = 0x2710, + a106 = 0x2765, + a107 = 0x2766, + a108 = 0x2767, + a109 = 0x2660, + a11 = 0x261B, + a110 = 0x2665, + a111 = 0x2666, + a112 = 0x2663, + a117 = 0x2709, + a118 = 0x2708, + a119 = 0x2707, + a12 = 0x261E, + a120 = 0x2460, + a121 = 0x2461, + a122 = 0x2462, + a123 = 0x2463, + a124 = 0x2464, + a125 = 0x2465, + a126 = 0x2466, + a127 = 0x2467, + a128 = 0x2468, + a129 = 0x2469, + a13 = 0x270C, + a130 = 0x2776, + a131 = 0x2777, + a132 = 0x2778, + a133 = 0x2779, + a134 = 0x277A, + a135 = 0x277B, + a136 = 0x277C, + a137 = 0x277D, + a138 = 0x277E, + a139 = 0x277F, + a14 = 0x270D, + a140 = 0x2780, + a141 = 0x2781, + a142 = 0x2782, + a143 = 0x2783, + a144 = 0x2784, + a145 = 0x2785, + a146 = 0x2786, + a147 = 0x2787, + a148 = 0x2788, + a149 = 0x2789, + a15 = 0x270E, + a150 = 0x278A, + a151 = 0x278B, + a152 = 0x278C, + a153 = 0x278D, + a154 = 0x278E, + a155 = 0x278F, + a156 = 0x2790, + a157 = 0x2791, + a158 = 0x2792, + a159 = 0x2793, + a16 = 0x270F, + a160 = 0x2794, + a161 = 0x2192, + a162 = 0x27A3, + a163 = 0x2194, + a164 = 0x2195, + a165 = 0x2799, + a166 = 0x279B, + a167 = 0x279C, + a168 = 0x279D, + a169 = 0x279E, + a17 = 0x2711, + a170 = 0x279F, + a171 = 0x27A0, + a172 = 0x27A1, + a173 = 0x27A2, + a174 = 0x27A4, + a175 = 0x27A5, + a176 = 0x27A6, + a177 = 0x27A7, + a178 = 0x27A8, + a179 = 0x27A9, + a18 = 0x2712, + a180 = 0x27AB, + a181 = 0x27AD, + a182 = 0x27AF, + a183 = 0x27B2, + a184 = 0x27B3, + a185 = 0x27B5, + a186 = 0x27B8, + a187 = 0x27BA, + a188 = 0x27BB, + a189 = 0x27BC, + a19 = 0x2713, + a190 = 0x27BD, + a191 = 0x27BE, + a192 = 0x279A, + a193 = 0x27AA, + a194 = 0x27B6, + a195 = 0x27B9, + a196 = 0x2798, + a197 = 0x27B4, + a198 = 0x27B7, + a199 = 0x27AC, + a2 = 0x2702, + a20 = 0x2714, + a200 = 0x27AE, + a201 = 0x27B1, + a202 = 0x2703, + a203 = 0x2750, + a204 = 0x2752, + a205 = 0xF8DD, + a206 = 0xF8DF, + a21 = 0x2715, + a22 = 0x2716, + a23 = 0x2717, + a24 = 0x2718, + a25 = 0x2719, + a26 = 0x271A, + a27 = 0x271B, + a28 = 0x271C, + a29 = 0x2722, + a3 = 0x2704, + a30 = 0x2723, + a31 = 0x2724, + a32 = 0x2725, + a33 = 0x2726, + a34 = 0x2727, + a35 = 0x2605, + a36 = 0x2729, + a37 = 0x272A, + a38 = 0x272B, + a39 = 0x272C, + a4 = 0x260E, + a40 = 0x272D, + a41 = 0x272E, + a42 = 0x272F, + a43 = 0x2730, + a44 = 0x2731, + a45 = 0x2732, + a46 = 0x2733, + a47 = 0x2734, + a48 = 0x2735, + a49 = 0x2736, + a5 = 0x2706, + a50 = 0x2737, + a51 = 0x2738, + a52 = 0x2739, + a53 = 0x273A, + a54 = 0x273B, + a55 = 0x273C, + a56 = 0x273D, + a57 = 0x273E, + a58 = 0x273F, + a59 = 0x2740, + a6 = 0x271D, + a60 = 0x2741, + a61 = 0x2742, + a62 = 0x2743, + a63 = 0x2744, + a64 = 0x2745, + a65 = 0x2746, + a66 = 0x2747, + a67 = 0x2748, + a68 = 0x2749, + a69 = 0x274A, + a7 = 0x271E, + a70 = 0x274B, + a71 = 0x25CF, + a72 = 0x274D, + a73 = 0x25A0, + a74 = 0x274F, + a75 = 0x2751, + a76 = 0x25B2, + a77 = 0x25BC, + a78 = 0x25C6, + a79 = 0x2756, + a8 = 0x271F, + a81 = 0x25D7, + a82 = 0x2758, + a83 = 0x2759, + a84 = 0x275A, + a85 = 0xF8DE, + a86 = 0xF8E0, + a87 = 0xF8E1, + a88 = 0xF8E2, + a89 = 0xF8D7, + a9 = 0x2720, + a90 = 0xF8D8, + a91 = 0xF8DB, + a92 = 0xF8DC, + a93 = 0xF8D9, + a94 = 0xF8DA, + a95 = 0xF8E3, + a96 = 0xF8E4, + a97 = 0x275B, + a98 = 0x275C, + a99 = 0x275D, }, }, } diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index cdef91b38..1b65dbffd 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 05/14/12 16:00:55 +-- merge date : 05/18/12 23:50:46 do -- begin closure to overcome local limits and interference diff --git a/tex/generic/context/mptopdf/mptopdf.tex b/tex/generic/context/mptopdf/mptopdf.tex index 3efe57392..d033a2f56 100644 --- a/tex/generic/context/mptopdf/mptopdf.tex +++ b/tex/generic/context/mptopdf/mptopdf.tex @@ -1,6 +1,6 @@ %D \module %D [ file=mptopdf, -%D version=2000.03.27, +%D version=2011.05.19, % 2000.03.27, %D title=\METAPOST, %D subtitle=conversion to \PDF, %D author=Hans Hagen, |
