From 705b807c950a697d3c8be592c452a6fb3e561c7e Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Wed, 4 Jan 2023 12:09:26 +0100 Subject: 2023-01-04 11:35:00 --- .../documents/general/manuals/lowlevel-loops.pdf | Bin 43457 -> 44159 bytes .../documents/general/manuals/luametatex.pdf | Bin 1456293 -> 1463760 bytes doc/context/scripts/mkii/ctxtools.man | 2 +- doc/context/scripts/mkii/imgtopdf.man | 2 +- doc/context/scripts/mkii/mptopdf.man | 2 +- doc/context/scripts/mkii/pdftools.man | 2 +- doc/context/scripts/mkii/pstopdf.man | 2 +- doc/context/scripts/mkii/rlxtools.man | 2 +- doc/context/scripts/mkii/texexec.man | 2 +- doc/context/scripts/mkii/texmfstart.man | 2 +- doc/context/scripts/mkii/textools.man | 2 +- doc/context/scripts/mkii/texutil.man | 2 +- doc/context/scripts/mkii/tmftools.man | 2 +- doc/context/scripts/mkii/xmltools.man | 2 +- doc/context/scripts/mkiv/context.man | 2 +- doc/context/scripts/mkiv/luatools.man | 2 +- doc/context/scripts/mkiv/mtx-babel.man | 2 +- doc/context/scripts/mkiv/mtx-base.man | 2 +- doc/context/scripts/mkiv/mtx-bibtex.man | 2 +- doc/context/scripts/mkiv/mtx-cache.man | 2 +- doc/context/scripts/mkiv/mtx-chars.man | 2 +- doc/context/scripts/mkiv/mtx-check.man | 2 +- doc/context/scripts/mkiv/mtx-colors.man | 2 +- doc/context/scripts/mkiv/mtx-context.man | 2 +- doc/context/scripts/mkiv/mtx-dvi.man | 2 +- doc/context/scripts/mkiv/mtx-epub.man | 2 +- doc/context/scripts/mkiv/mtx-evohome.man | 2 +- doc/context/scripts/mkiv/mtx-fcd.man | 2 +- doc/context/scripts/mkiv/mtx-flac.man | 2 +- doc/context/scripts/mkiv/mtx-fonts.man | 2 +- doc/context/scripts/mkiv/mtx-grep.man | 2 +- doc/context/scripts/mkiv/mtx-interface.man | 2 +- doc/context/scripts/mkiv/mtx-metapost.man | 2 +- doc/context/scripts/mkiv/mtx-modules.man | 2 +- doc/context/scripts/mkiv/mtx-package.man | 2 +- doc/context/scripts/mkiv/mtx-patterns.man | 2 +- doc/context/scripts/mkiv/mtx-pdf.man | 2 +- doc/context/scripts/mkiv/mtx-plain.man | 2 +- doc/context/scripts/mkiv/mtx-profile.man | 2 +- doc/context/scripts/mkiv/mtx-rsync.man | 2 +- doc/context/scripts/mkiv/mtx-scite.man | 2 +- doc/context/scripts/mkiv/mtx-server.man | 2 +- doc/context/scripts/mkiv/mtx-spell.man | 2 +- doc/context/scripts/mkiv/mtx-texworks.man | 2 +- doc/context/scripts/mkiv/mtx-timing.man | 2 +- doc/context/scripts/mkiv/mtx-tools.man | 2 +- doc/context/scripts/mkiv/mtx-unicode.man | 2 +- doc/context/scripts/mkiv/mtx-unzip.man | 2 +- doc/context/scripts/mkiv/mtx-update.man | 2 +- doc/context/scripts/mkiv/mtx-vscode.man | 2 +- doc/context/scripts/mkiv/mtx-watch.man | 2 +- doc/context/scripts/mkiv/mtx-youless.man | 2 +- doc/context/scripts/mkiv/mtxrun.man | 2 +- .../general/manuals/luametatex/luametatex-math.tex | 6 +- .../general/manuals/metafun/metafun-basics.tex | 2 +- .../general/manuals/metafun/metafun-effects.tex | 145 +++++++------- .../general/manuals/metafun/metafun-examples.tex | 37 ++++ .../manuals/metafun/metafun-introduction.tex | 11 ++ .../general/manuals/metafun/metafun-lua.tex | 58 ------ .../manuals/metafun/metafun-positioning.tex | 11 +- .../general/manuals/metafun/metafun-reference.tex | 1 + .../general/manuals/metafun/metafun-text-lmtx.tex | 69 +++++++ .../general/manuals/metafun/metafun-text.tex | 218 ++++++++++----------- .../general/manuals/metafun/metafun-welcome.tex | 52 ++++- 64 files changed, 415 insertions(+), 297 deletions(-) (limited to 'doc') diff --git a/doc/context/documents/general/manuals/lowlevel-loops.pdf b/doc/context/documents/general/manuals/lowlevel-loops.pdf index e47919f75..83620457c 100644 Binary files a/doc/context/documents/general/manuals/lowlevel-loops.pdf and b/doc/context/documents/general/manuals/lowlevel-loops.pdf differ diff --git a/doc/context/documents/general/manuals/luametatex.pdf b/doc/context/documents/general/manuals/luametatex.pdf index 432cf05e4..76d2769db 100644 Binary files a/doc/context/documents/general/manuals/luametatex.pdf and b/doc/context/documents/general/manuals/luametatex.pdf differ diff --git a/doc/context/scripts/mkii/ctxtools.man b/doc/context/scripts/mkii/ctxtools.man index 10ed988da..8b79a7ad7 100644 --- a/doc/context/scripts/mkii/ctxtools.man +++ b/doc/context/scripts/mkii/ctxtools.man @@ -1,4 +1,4 @@ -.TH "ctxtools" "1" "01-01-2022" "version 1.3.5" "CtxTools" +.TH "ctxtools" "1" "01-01-2023" "version 1.3.5" "CtxTools" .SH NAME ctxtools - CtxTools .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/imgtopdf.man b/doc/context/scripts/mkii/imgtopdf.man index 8ddd1abba..829678e92 100644 --- a/doc/context/scripts/mkii/imgtopdf.man +++ b/doc/context/scripts/mkii/imgtopdf.man @@ -1,4 +1,4 @@ -.TH "imgtopdf" "1" "01-01-2022" "version 1.1.2" "ImgToPdf" +.TH "imgtopdf" "1" "01-01-2023" "version 1.1.2" "ImgToPdf" .SH NAME imgtopdf - ImgToPdf .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/mptopdf.man b/doc/context/scripts/mkii/mptopdf.man index c11ab0730..182065898 100644 --- a/doc/context/scripts/mkii/mptopdf.man +++ b/doc/context/scripts/mkii/mptopdf.man @@ -1,4 +1,4 @@ -.TH "mptopdf" "1" "01-01-2022" "version 1.4.1" "convert MetaPost figures to PDF" +.TH "mptopdf" "1" "01-01-2023" "version 1.4.1" "convert MetaPost figures to PDF" .SH NAME mptopdf - convert MetaPost figures to PDF .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/pdftools.man b/doc/context/scripts/mkii/pdftools.man index 2b9e03751..fbb707910 100644 --- a/doc/context/scripts/mkii/pdftools.man +++ b/doc/context/scripts/mkii/pdftools.man @@ -1,4 +1,4 @@ -.TH "pdftools" "1" "01-01-2022" "version 1.2.1" "PDFTools" +.TH "pdftools" "1" "01-01-2023" "version 1.2.1" "PDFTools" .SH NAME pdftools - PDFTools .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/pstopdf.man b/doc/context/scripts/mkii/pstopdf.man index 039fe427b..3d38ac3bb 100644 --- a/doc/context/scripts/mkii/pstopdf.man +++ b/doc/context/scripts/mkii/pstopdf.man @@ -1,4 +1,4 @@ -.TH "pstopdf" "1" "01-01-2022" "version 2.0.1" "PStoPDF" +.TH "pstopdf" "1" "01-01-2023" "version 2.0.1" "PStoPDF" .SH NAME pstopdf - PStoPDF .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/rlxtools.man b/doc/context/scripts/mkii/rlxtools.man index e413f1afb..1f4066adc 100644 --- a/doc/context/scripts/mkii/rlxtools.man +++ b/doc/context/scripts/mkii/rlxtools.man @@ -1,4 +1,4 @@ -.TH "rlxtools" "1" "01-01-2022" "version 1.0.1" "RlxTools" +.TH "rlxtools" "1" "01-01-2023" "version 1.0.1" "RlxTools" .SH NAME rlxtools - RlxTools .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/texexec.man b/doc/context/scripts/mkii/texexec.man index caea0051a..ebaa8fe97 100644 --- a/doc/context/scripts/mkii/texexec.man +++ b/doc/context/scripts/mkii/texexec.man @@ -1,4 +1,4 @@ -.TH "texexec" "1" "01-01-2022" "version 6.2.1" "TeXExec" +.TH "texexec" "1" "01-01-2023" "version 6.2.1" "TeXExec" .SH NAME texexec - TeXExec .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/texmfstart.man b/doc/context/scripts/mkii/texmfstart.man index 511812aa8..644ceefd1 100644 --- a/doc/context/scripts/mkii/texmfstart.man +++ b/doc/context/scripts/mkii/texmfstart.man @@ -1,4 +1,4 @@ -.TH "mtxrun" "1" "01-01-2022" "version 1.33" "ConTeXt TDS Runner Tool" +.TH "mtxrun" "1" "01-01-2023" "version 1.33" "ConTeXt TDS Runner Tool" .SH NAME mtxrun - ConTeXt TDS Runner Tool .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/textools.man b/doc/context/scripts/mkii/textools.man index 956370a12..d040d7d0d 100644 --- a/doc/context/scripts/mkii/textools.man +++ b/doc/context/scripts/mkii/textools.man @@ -1,4 +1,4 @@ -.TH "textools" "1" "01-01-2022" "version 1.3.1" "TeXTools" +.TH "textools" "1" "01-01-2023" "version 1.3.1" "TeXTools" .SH NAME textools - TeXTools .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/texutil.man b/doc/context/scripts/mkii/texutil.man index b27878586..dd27460f8 100644 --- a/doc/context/scripts/mkii/texutil.man +++ b/doc/context/scripts/mkii/texutil.man @@ -1,4 +1,4 @@ -.TH "texutil" "1" "01-01-2022" "version 9.1.0" "TeXUtil" +.TH "texutil" "1" "01-01-2023" "version 9.1.0" "TeXUtil" .SH NAME texutil - TeXUtil .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/tmftools.man b/doc/context/scripts/mkii/tmftools.man index 5720465d2..1355bae16 100644 --- a/doc/context/scripts/mkii/tmftools.man +++ b/doc/context/scripts/mkii/tmftools.man @@ -1,4 +1,4 @@ -.TH "tmftools" "1" "01-01-2022" "version 1.1.0" "TMFTools" +.TH "tmftools" "1" "01-01-2023" "version 1.1.0" "TMFTools" .SH NAME tmftools - TMFTools .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/xmltools.man b/doc/context/scripts/mkii/xmltools.man index 23a75f65e..5a4840add 100644 --- a/doc/context/scripts/mkii/xmltools.man +++ b/doc/context/scripts/mkii/xmltools.man @@ -1,4 +1,4 @@ -.TH "xmltools" "1" "01-01-2022" "version 1.2.2" "XMLTools" +.TH "xmltools" "1" "01-01-2023" "version 1.2.2" "XMLTools" .SH NAME xmltools - XMLTools .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/context.man b/doc/context/scripts/mkiv/context.man index f1f705815..9a36d403c 100644 --- a/doc/context/scripts/mkiv/context.man +++ b/doc/context/scripts/mkiv/context.man @@ -1,4 +1,4 @@ -.TH "mtx-context" "1" "01-01-2022" "version 1.04" "ConTeXt Process Management" +.TH "mtx-context" "1" "01-01-2023" "version 1.04" "ConTeXt Process Management" .SH NAME mtx-context - ConTeXt Process Management .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/luatools.man b/doc/context/scripts/mkiv/luatools.man index 23beaece1..58de54abf 100644 --- a/doc/context/scripts/mkiv/luatools.man +++ b/doc/context/scripts/mkiv/luatools.man @@ -1,4 +1,4 @@ -.TH "luatools" "1" "01-01-2022" "version 1.35" "ConTeXt TDS Management Tool (aka luatools)" +.TH "luatools" "1" "01-01-2023" "version 1.35" "ConTeXt TDS Management Tool (aka luatools)" .SH NAME luatools - ConTeXt TDS Management Tool (aka luatools) .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-babel.man b/doc/context/scripts/mkiv/mtx-babel.man index 0c357df08..851c17a7a 100644 --- a/doc/context/scripts/mkiv/mtx-babel.man +++ b/doc/context/scripts/mkiv/mtx-babel.man @@ -1,4 +1,4 @@ -.TH "mtx-babel" "1" "01-01-2022" "version 1.20" "Babel Input To UTF Conversion" +.TH "mtx-babel" "1" "01-01-2023" "version 1.20" "Babel Input To UTF Conversion" .SH NAME mtx-babel - Babel Input To UTF Conversion .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-base.man b/doc/context/scripts/mkiv/mtx-base.man index 99890e0e5..4a5133c13 100644 --- a/doc/context/scripts/mkiv/mtx-base.man +++ b/doc/context/scripts/mkiv/mtx-base.man @@ -1,4 +1,4 @@ -.TH "mtx-base" "1" "01-01-2022" "version 1.35" "ConTeXt TDS Management Tool (aka luatools)" +.TH "mtx-base" "1" "01-01-2023" "version 1.35" "ConTeXt TDS Management Tool (aka luatools)" .SH NAME mtx-base - ConTeXt TDS Management Tool (aka luatools) .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-bibtex.man b/doc/context/scripts/mkiv/mtx-bibtex.man index 582c9fef1..79aeb0ff7 100644 --- a/doc/context/scripts/mkiv/mtx-bibtex.man +++ b/doc/context/scripts/mkiv/mtx-bibtex.man @@ -1,4 +1,4 @@ -.TH "mtx-bibtex" "1" "01-01-2022" "version 1.00" "bibtex helpers" +.TH "mtx-bibtex" "1" "01-01-2023" "version 1.00" "bibtex helpers" .SH NAME mtx-bibtex - bibtex helpers .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-cache.man b/doc/context/scripts/mkiv/mtx-cache.man index e50de8de3..ab1b1293c 100644 --- a/doc/context/scripts/mkiv/mtx-cache.man +++ b/doc/context/scripts/mkiv/mtx-cache.man @@ -1,4 +1,4 @@ -.TH "mtx-cache" "1" "01-01-2022" "version 1.01" "ConTeXt & MetaTeX Cache Management" +.TH "mtx-cache" "1" "01-01-2023" "version 1.01" "ConTeXt & MetaTeX Cache Management" .SH NAME mtx-cache - ConTeXt & MetaTeX Cache Management .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-chars.man b/doc/context/scripts/mkiv/mtx-chars.man index 73cab9b30..059d419e2 100644 --- a/doc/context/scripts/mkiv/mtx-chars.man +++ b/doc/context/scripts/mkiv/mtx-chars.man @@ -1,4 +1,4 @@ -.TH "mtx-chars" "1" "01-01-2022" "version 0.10" "MkII Character Table Generators" +.TH "mtx-chars" "1" "01-01-2023" "version 0.10" "MkII Character Table Generators" .SH NAME mtx-chars - MkII Character Table Generators .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-check.man b/doc/context/scripts/mkiv/mtx-check.man index 4063afc2b..d41ba5c45 100644 --- a/doc/context/scripts/mkiv/mtx-check.man +++ b/doc/context/scripts/mkiv/mtx-check.man @@ -1,4 +1,4 @@ -.TH "mtx-check" "1" "01-01-2022" "version 0.10" "Basic ConTeXt Syntax Checking" +.TH "mtx-check" "1" "01-01-2023" "version 0.10" "Basic ConTeXt Syntax Checking" .SH NAME mtx-check - Basic ConTeXt Syntax Checking .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-colors.man b/doc/context/scripts/mkiv/mtx-colors.man index bd5926f16..e072c8eda 100644 --- a/doc/context/scripts/mkiv/mtx-colors.man +++ b/doc/context/scripts/mkiv/mtx-colors.man @@ -1,4 +1,4 @@ -.TH "mtx-colors" "1" "01-01-2022" "version 0.10" "ConTeXt Color Management" +.TH "mtx-colors" "1" "01-01-2023" "version 0.10" "ConTeXt Color Management" .SH NAME mtx-colors - ConTeXt Color Management .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-context.man b/doc/context/scripts/mkiv/mtx-context.man index f1f705815..9a36d403c 100644 --- a/doc/context/scripts/mkiv/mtx-context.man +++ b/doc/context/scripts/mkiv/mtx-context.man @@ -1,4 +1,4 @@ -.TH "mtx-context" "1" "01-01-2022" "version 1.04" "ConTeXt Process Management" +.TH "mtx-context" "1" "01-01-2023" "version 1.04" "ConTeXt Process Management" .SH NAME mtx-context - ConTeXt Process Management .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-dvi.man b/doc/context/scripts/mkiv/mtx-dvi.man index 2d5fec429..6719dc72c 100644 --- a/doc/context/scripts/mkiv/mtx-dvi.man +++ b/doc/context/scripts/mkiv/mtx-dvi.man @@ -1,4 +1,4 @@ -.TH "mtx-dvi" "1" "01-01-2022" "version 0.01" "ConTeXt DVI Helpers" +.TH "mtx-dvi" "1" "01-01-2023" "version 0.01" "ConTeXt DVI Helpers" .SH NAME mtx-dvi - ConTeXt DVI Helpers .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-epub.man b/doc/context/scripts/mkiv/mtx-epub.man index 58aad4972..3b53984c7 100644 --- a/doc/context/scripts/mkiv/mtx-epub.man +++ b/doc/context/scripts/mkiv/mtx-epub.man @@ -1,4 +1,4 @@ -.TH "mtx-epub" "1" "01-01-2022" "version 1.10" "ConTeXt EPUB Helpers" +.TH "mtx-epub" "1" "01-01-2023" "version 1.10" "ConTeXt EPUB Helpers" .SH NAME mtx-epub - ConTeXt EPUB Helpers .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-evohome.man b/doc/context/scripts/mkiv/mtx-evohome.man index 533729104..c415c5425 100644 --- a/doc/context/scripts/mkiv/mtx-evohome.man +++ b/doc/context/scripts/mkiv/mtx-evohome.man @@ -1,4 +1,4 @@ -.TH "mtx-evohome" "1" "01-01-2022" "version 1.00" "Evohome Fetcher" +.TH "mtx-evohome" "1" "01-01-2023" "version 1.00" "Evohome Fetcher" .SH NAME mtx-evohome - Evohome Fetcher .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-fcd.man b/doc/context/scripts/mkiv/mtx-fcd.man index b88fd56dd..12ac2cd3b 100644 --- a/doc/context/scripts/mkiv/mtx-fcd.man +++ b/doc/context/scripts/mkiv/mtx-fcd.man @@ -1,4 +1,4 @@ -.TH "mtx-fcd" "1" "01-01-2022" "version 1.00" "Fast Directory Change" +.TH "mtx-fcd" "1" "01-01-2023" "version 1.00" "Fast Directory Change" .SH NAME mtx-fcd - Fast Directory Change .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-flac.man b/doc/context/scripts/mkiv/mtx-flac.man index 14b405753..f69819865 100644 --- a/doc/context/scripts/mkiv/mtx-flac.man +++ b/doc/context/scripts/mkiv/mtx-flac.man @@ -1,4 +1,4 @@ -.TH "mtx-flac" "1" "01-01-2022" "version 0.10" "ConTeXt Flac Helpers" +.TH "mtx-flac" "1" "01-01-2023" "version 0.10" "ConTeXt Flac Helpers" .SH NAME mtx-flac - ConTeXt Flac Helpers .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-fonts.man b/doc/context/scripts/mkiv/mtx-fonts.man index d0b7370a9..16cd7f068 100644 --- a/doc/context/scripts/mkiv/mtx-fonts.man +++ b/doc/context/scripts/mkiv/mtx-fonts.man @@ -1,4 +1,4 @@ -.TH "mtx-fonts" "1" "01-01-2022" "version 1.00" "ConTeXt Font Database Management" +.TH "mtx-fonts" "1" "01-01-2023" "version 1.00" "ConTeXt Font Database Management" .SH NAME mtx-fonts - ConTeXt Font Database Management .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-grep.man b/doc/context/scripts/mkiv/mtx-grep.man index 6b2a9d2c4..5114ec7e2 100644 --- a/doc/context/scripts/mkiv/mtx-grep.man +++ b/doc/context/scripts/mkiv/mtx-grep.man @@ -1,4 +1,4 @@ -.TH "mtx-grep" "1" "01-01-2022" "version 0.10" "Simple Grepper" +.TH "mtx-grep" "1" "01-01-2023" "version 0.10" "Simple Grepper" .SH NAME mtx-grep - Simple Grepper .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-interface.man b/doc/context/scripts/mkiv/mtx-interface.man index fcba1e898..f8aa90206 100644 --- a/doc/context/scripts/mkiv/mtx-interface.man +++ b/doc/context/scripts/mkiv/mtx-interface.man @@ -1,4 +1,4 @@ -.TH "mtx-interface" "1" "01-01-2022" "version 0.13" "ConTeXt Interface Related Goodies" +.TH "mtx-interface" "1" "01-01-2023" "version 0.13" "ConTeXt Interface Related Goodies" .SH NAME mtx-interface - ConTeXt Interface Related Goodies .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-metapost.man b/doc/context/scripts/mkiv/mtx-metapost.man index 15f760cec..265a203e4 100644 --- a/doc/context/scripts/mkiv/mtx-metapost.man +++ b/doc/context/scripts/mkiv/mtx-metapost.man @@ -1,4 +1,4 @@ -.TH "mtx-metapost" "1" "01-01-2022" "version 0.10" "MetaPost to PDF processor" +.TH "mtx-metapost" "1" "01-01-2023" "version 0.10" "MetaPost to PDF processor" .SH NAME mtx-metapost - MetaPost to PDF processor .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-modules.man b/doc/context/scripts/mkiv/mtx-modules.man index 8b48a8fa6..11629fede 100644 --- a/doc/context/scripts/mkiv/mtx-modules.man +++ b/doc/context/scripts/mkiv/mtx-modules.man @@ -1,4 +1,4 @@ -.TH "mtx-modules" "1" "01-01-2022" "version 1.00" "ConTeXt Module Documentation Generators" +.TH "mtx-modules" "1" "01-01-2023" "version 1.00" "ConTeXt Module Documentation Generators" .SH NAME mtx-modules - ConTeXt Module Documentation Generators .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-package.man b/doc/context/scripts/mkiv/mtx-package.man index a09e02103..33ce616ed 100644 --- a/doc/context/scripts/mkiv/mtx-package.man +++ b/doc/context/scripts/mkiv/mtx-package.man @@ -1,4 +1,4 @@ -.TH "mtx-package" "1" "01-01-2022" "version 0.10" "Distribution Related Goodies" +.TH "mtx-package" "1" "01-01-2023" "version 0.10" "Distribution Related Goodies" .SH NAME mtx-package - Distribution Related Goodies .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-patterns.man b/doc/context/scripts/mkiv/mtx-patterns.man index 91d394b3b..771c86f0a 100644 --- a/doc/context/scripts/mkiv/mtx-patterns.man +++ b/doc/context/scripts/mkiv/mtx-patterns.man @@ -1,4 +1,4 @@ -.TH "mtx-patterns" "1" "01-01-2022" "version 0.20" "ConTeXt Pattern File Management" +.TH "mtx-patterns" "1" "01-01-2023" "version 0.20" "ConTeXt Pattern File Management" .SH NAME mtx-patterns - ConTeXt Pattern File Management .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-pdf.man b/doc/context/scripts/mkiv/mtx-pdf.man index a705cfbb6..54fdb6d14 100644 --- a/doc/context/scripts/mkiv/mtx-pdf.man +++ b/doc/context/scripts/mkiv/mtx-pdf.man @@ -1,4 +1,4 @@ -.TH "mtx-pdf" "1" "01-01-2022" "version 0.10" "ConTeXt PDF Helpers" +.TH "mtx-pdf" "1" "01-01-2023" "version 0.10" "ConTeXt PDF Helpers" .SH NAME mtx-pdf - ConTeXt PDF Helpers .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-plain.man b/doc/context/scripts/mkiv/mtx-plain.man index a679c272a..c1af287c7 100644 --- a/doc/context/scripts/mkiv/mtx-plain.man +++ b/doc/context/scripts/mkiv/mtx-plain.man @@ -1,4 +1,4 @@ -.TH "mtx-plain" "1" "01-01-2022" "version 1.00" "Plain TeX Runner" +.TH "mtx-plain" "1" "01-01-2023" "version 1.00" "Plain TeX Runner" .SH NAME mtx-plain - Plain TeX Runner .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-profile.man b/doc/context/scripts/mkiv/mtx-profile.man index 14e32e188..13067b503 100644 --- a/doc/context/scripts/mkiv/mtx-profile.man +++ b/doc/context/scripts/mkiv/mtx-profile.man @@ -1,4 +1,4 @@ -.TH "mtx-profile" "1" "01-01-2022" "version 1.00" "ConTeXt MkIV LuaTeX Profiler" +.TH "mtx-profile" "1" "01-01-2023" "version 1.00" "ConTeXt MkIV LuaTeX Profiler" .SH NAME mtx-profile - ConTeXt MkIV LuaTeX Profiler .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-rsync.man b/doc/context/scripts/mkiv/mtx-rsync.man index 19bad440e..b9e500235 100644 --- a/doc/context/scripts/mkiv/mtx-rsync.man +++ b/doc/context/scripts/mkiv/mtx-rsync.man @@ -1,4 +1,4 @@ -.TH "mtx-rsync" "1" "01-01-2022" "version 0.10" "Rsync Helpers" +.TH "mtx-rsync" "1" "01-01-2023" "version 0.10" "Rsync Helpers" .SH NAME mtx-rsync - Rsync Helpers .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-scite.man b/doc/context/scripts/mkiv/mtx-scite.man index f8fd1c638..3de8ea587 100644 --- a/doc/context/scripts/mkiv/mtx-scite.man +++ b/doc/context/scripts/mkiv/mtx-scite.man @@ -1,4 +1,4 @@ -.TH "mtx-scite" "1" "01-01-2022" "version 1.00" "Scite Helper Script" +.TH "mtx-scite" "1" "01-01-2023" "version 1.00" "Scite Helper Script" .SH NAME mtx-scite - Scite Helper Script .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-server.man b/doc/context/scripts/mkiv/mtx-server.man index 3d8016b8d..5fa9da9ca 100644 --- a/doc/context/scripts/mkiv/mtx-server.man +++ b/doc/context/scripts/mkiv/mtx-server.man @@ -1,4 +1,4 @@ -.TH "mtx-server" "1" "01-01-2022" "version 0.10" "Simple Webserver For Helpers" +.TH "mtx-server" "1" "01-01-2023" "version 0.10" "Simple Webserver For Helpers" .SH NAME mtx-server - Simple Webserver For Helpers .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-spell.man b/doc/context/scripts/mkiv/mtx-spell.man index fc4dc340d..578fde17d 100644 --- a/doc/context/scripts/mkiv/mtx-spell.man +++ b/doc/context/scripts/mkiv/mtx-spell.man @@ -1,4 +1,4 @@ -.TH "mtx-spell" "1" "01-01-2022" "version 0.10" "ConTeXt Word Filtering" +.TH "mtx-spell" "1" "01-01-2023" "version 0.10" "ConTeXt Word Filtering" .SH NAME mtx-spell - ConTeXt Word Filtering .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-texworks.man b/doc/context/scripts/mkiv/mtx-texworks.man index 280c70898..0416a11b6 100644 --- a/doc/context/scripts/mkiv/mtx-texworks.man +++ b/doc/context/scripts/mkiv/mtx-texworks.man @@ -1,4 +1,4 @@ -.TH "mtx-texworks" "1" "01-01-2022" "version 1.00" "TeXworks Startup Script" +.TH "mtx-texworks" "1" "01-01-2023" "version 1.00" "TeXworks Startup Script" .SH NAME mtx-texworks - TeXworks Startup Script .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-timing.man b/doc/context/scripts/mkiv/mtx-timing.man index 7504b4802..31b2671c9 100644 --- a/doc/context/scripts/mkiv/mtx-timing.man +++ b/doc/context/scripts/mkiv/mtx-timing.man @@ -1,4 +1,4 @@ -.TH "mtx-timing" "1" "01-01-2022" "version 0.10" "ConTeXt Timing Tools" +.TH "mtx-timing" "1" "01-01-2023" "version 0.10" "ConTeXt Timing Tools" .SH NAME mtx-timing - ConTeXt Timing Tools .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-tools.man b/doc/context/scripts/mkiv/mtx-tools.man index a9e1313c3..10751133d 100644 --- a/doc/context/scripts/mkiv/mtx-tools.man +++ b/doc/context/scripts/mkiv/mtx-tools.man @@ -1,4 +1,4 @@ -.TH "mtx-tools" "1" "01-01-2022" "version 1.01" "Some File Related Goodies" +.TH "mtx-tools" "1" "01-01-2023" "version 1.01" "Some File Related Goodies" .SH NAME mtx-tools - Some File Related Goodies .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-unicode.man b/doc/context/scripts/mkiv/mtx-unicode.man index 04610812d..651a4c076 100644 --- a/doc/context/scripts/mkiv/mtx-unicode.man +++ b/doc/context/scripts/mkiv/mtx-unicode.man @@ -1,4 +1,4 @@ -.TH "mtx-unicode" "1" "01-01-2022" "version 1.02" "Checker for char-dat.lua" +.TH "mtx-unicode" "1" "01-01-2023" "version 1.02" "Checker for char-dat.lua" .SH NAME mtx-unicode - Checker for char-dat.lua .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-unzip.man b/doc/context/scripts/mkiv/mtx-unzip.man index 7f6e70f69..59725ff83 100644 --- a/doc/context/scripts/mkiv/mtx-unzip.man +++ b/doc/context/scripts/mkiv/mtx-unzip.man @@ -1,4 +1,4 @@ -.TH "mtx-unzip" "1" "01-01-2022" "version 0.10" "Simple Unzipper" +.TH "mtx-unzip" "1" "01-01-2023" "version 0.10" "Simple Unzipper" .SH NAME mtx-unzip - Simple Unzipper .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-update.man b/doc/context/scripts/mkiv/mtx-update.man index 6c34aa594..83079fb40 100644 --- a/doc/context/scripts/mkiv/mtx-update.man +++ b/doc/context/scripts/mkiv/mtx-update.man @@ -1,4 +1,4 @@ -.TH "mtx-update" "1" "01-01-2022" "version 1.03" "ConTeXt Minimals Updater" +.TH "mtx-update" "1" "01-01-2023" "version 1.03" "ConTeXt Minimals Updater" .SH NAME mtx-update - ConTeXt Minimals Updater .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-vscode.man b/doc/context/scripts/mkiv/mtx-vscode.man index e364ede50..df9c4f9ba 100644 --- a/doc/context/scripts/mkiv/mtx-vscode.man +++ b/doc/context/scripts/mkiv/mtx-vscode.man @@ -1,4 +1,4 @@ -.TH "mtx-vscode" "1" "01-01-2022" "version 1.00" "vscode extension generator" +.TH "mtx-vscode" "1" "01-01-2023" "version 1.00" "vscode extension generator" .SH NAME mtx-vscode - vscode extension generator .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-watch.man b/doc/context/scripts/mkiv/mtx-watch.man index bc43a7864..8ca17920e 100644 --- a/doc/context/scripts/mkiv/mtx-watch.man +++ b/doc/context/scripts/mkiv/mtx-watch.man @@ -1,4 +1,4 @@ -.TH "mtx-watch" "1" "01-01-2022" "version 1.00" "ConTeXt Request Watchdog" +.TH "mtx-watch" "1" "01-01-2023" "version 1.00" "ConTeXt Request Watchdog" .SH NAME mtx-watch - ConTeXt Request Watchdog .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-youless.man b/doc/context/scripts/mkiv/mtx-youless.man index cb26d099c..0f53b233b 100644 --- a/doc/context/scripts/mkiv/mtx-youless.man +++ b/doc/context/scripts/mkiv/mtx-youless.man @@ -1,4 +1,4 @@ -.TH "mtx-youless" "1" "01-01-2022" "version 1.100" "youless Fetcher" +.TH "mtx-youless" "1" "01-01-2023" "version 1.100" "youless Fetcher" .SH NAME mtx-youless - youless Fetcher .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtxrun.man b/doc/context/scripts/mkiv/mtxrun.man index 511812aa8..644ceefd1 100644 --- a/doc/context/scripts/mkiv/mtxrun.man +++ b/doc/context/scripts/mkiv/mtxrun.man @@ -1,4 +1,4 @@ -.TH "mtxrun" "1" "01-01-2022" "version 1.33" "ConTeXt TDS Runner Tool" +.TH "mtxrun" "1" "01-01-2023" "version 1.33" "ConTeXt TDS Runner Tool" .SH NAME mtxrun - ConTeXt TDS Runner Tool .SH SYNOPSIS diff --git a/doc/context/sources/general/manuals/luametatex/luametatex-math.tex b/doc/context/sources/general/manuals/luametatex/luametatex-math.tex index 0261539da..37926c8ab 100644 --- a/doc/context/sources/general/manuals/luametatex/luametatex-math.tex +++ b/doc/context/sources/general/manuals/luametatex/luametatex-math.tex @@ -396,7 +396,7 @@ set the same: \LL \stoptabulate -In addition there are \prm {UVextensible} and \prm {Uoperator} and extended +In addition there are \prm {Uvextensible} and \prm {Uoperator} and extended versions of fenced: \prm {Uleft}, \prm {Uright} and \prm {Umiddle}. There is also \prm {Uover} and similar primitives that expect the numerator and denominator after the primitive. In addition to regular scripts there are prescripts and a @@ -1060,9 +1060,9 @@ defaults and tweak them in the goodie files: \NC PrimeRaisePercent \NC \prm {Umathprimeraise} \NC 0 \NC \NR \NC PrimeRaiseComposedPercent \NC \prm {Umathprimeraisecomposed} \NC 0 \NC \NR \NC PrimeShiftUp \NC \prm {Umathprimeshiftup} \NC 0 \NC \NR -\NC PrimeShiftUpCramped \NC \prm {Umathprimeshiftupcramped} \NC 0 \NC \NR +\NC PrimeShiftUpCramped \NC \prm {Umathprimeshiftup} \NC 0 \NC \NR \NC PrimeSpaceAfter \NC \prm {Umathprimespaceafter} \NC 0 \NC \NR -\NC PrimeBaselineDropMax \NC \prm {Umathprimebaselinedropmax} \NC 0 \NC \NR +\NC PrimeBaselineDropMax \NC \prm {Umathprimeshiftdrop} \NC 0 \NC \NR \NC PrimeWidthPercent \NC \prm {Umathprimewidth} \NC 0 \NC \NR \NC SkewedDelimiterTolerance \NC \prm {Umathskeweddelimitertolerance} \NC 0 \NC \NR \NC AccentTopShiftUp \NC \prm {Umathaccenttopshiftup} \NC undefined \NC \NR diff --git a/doc/context/sources/general/manuals/metafun/metafun-basics.tex b/doc/context/sources/general/manuals/metafun/metafun-basics.tex index 02f208132..3eeefee22 100644 --- a/doc/context/sources/general/manuals/metafun/metafun-basics.tex +++ b/doc/context/sources/general/manuals/metafun/metafun-basics.tex @@ -1951,7 +1951,7 @@ the point and rotates afterwards. Because each consecutive point on the path is rotated an additional 90 degrees, we use the \METAPOST\ macro \type {hide} to isolate the assignment. The \type {hide} command executes the hidden command and afterwards continues as if it were never there. You must not confuse this with -grouping, since the hidden commands are visible to its surroundings. +grouping, since the hidden commands are visible to their surroundings. \startbuffer[c] def qq = q hide(q := q rotated 90) enddef ; diff --git a/doc/context/sources/general/manuals/metafun/metafun-effects.tex b/doc/context/sources/general/manuals/metafun/metafun-effects.tex index 8a4d9c30c..b9d60e15b 100644 --- a/doc/context/sources/general/manuals/metafun/metafun-effects.tex +++ b/doc/context/sources/general/manuals/metafun/metafun-effects.tex @@ -232,9 +232,12 @@ path p ; p := fullcircle scaled u shifted (u/4,0); % fill p rotated 210 withcolor transparent("\MPvar{a}",.5,xgreen) ; % fill p rotated 330 withcolor transparent("\MPvar{a}",.5,xblue) ; -fill p rotated 90 withcolor (0,0,1,0) withtransparency("\MPvar{a}",.5) ; -fill p rotated 210 withcolor (0,1,0) withtransparency("\MPvar{a}",.5) ; -fill p rotated 330 withcolor (0,0,1) withtransparency("\MPvar{a}",.5) ; +% fill p rotated 90 withcolor (0,0,1,0) withtransparency("\MPvar{a}",.5) ; +% fill p rotated 210 withcolor (0,1,0) withtransparency("\MPvar{a}",.5) ; +% fill p rotated 330 withcolor (0,0,1) withtransparency("\MPvar{a}",.5) ; +fill p rotated 90 withcolor (0,0,1,0) withtransparency(\MPvar{b},.5) ; +fill p rotated 210 withcolor (0,1,0) withtransparency(\MPvar{b},.5) ; +fill p rotated 330 withcolor (0,0,1) withtransparency(\MPvar{b},.5) ; \stopuseMPgraphic \startplacefigure[location=here,reference=fig:transparencies,title={The 12 transparency alternatives by name.}] @@ -244,23 +247,22 @@ fill p rotated 330 withcolor (0,0,1) withtransparency("\MPvar{a}",.5) ; \setupcombination[nx=4,ny=4] } \startcombination - {\useMPgraphic{test}{a=normal}} {\tttf normal} - % {\useMPgraphic{test}{a=multiply}} {\tttf multiply} % here the mu in multiply triggers lookahead in lmtx - {\useMPgraphic{test}{a=2}} {\tttf multiply} % so we go for the numeric value instead (for now) - {\useMPgraphic{test}{a=screen}} {\tttf screen} - {\useMPgraphic{test}{a=overlay}} {\tttf overlay} - {\useMPgraphic{test}{a=softlight}} {\tttf softlight} - {\useMPgraphic{test}{a=hardlight}} {\tttf hardlight} - {\useMPgraphic{test}{a=colordodge}} {\tttf colordodge} - {\useMPgraphic{test}{a=colorburn}} {\tttf colorburn} - {\useMPgraphic{test}{a=darken}} {\tttf darken} - {\useMPgraphic{test}{a=lighten}} {\tttf lighten} - {\useMPgraphic{test}{a=difference}} {\tttf difference} - {\useMPgraphic{test}{a=exclusion}} {\tttf exclusion} - {\useMPgraphic{test}{a=hue}} {\tttf hue} - {\useMPgraphic{test}{a=saturation}} {\tttf saturation} - {\useMPgraphic{test}{a=color}} {\tttf color} - {\useMPgraphic{test}{a=luminosity}} {\tttf luminosity} + {\useMPgraphic{test}{b=1,a=normal}} {\tttf normal} + {\useMPgraphic{test}{b=2,a=multiply}} {\tttf multiply} % here the mu in multiply triggers lookahead in lmtx + {\useMPgraphic{test}{b=3,a=screen}} {\tttf screen} + {\useMPgraphic{test}{b=4,a=overlay}} {\tttf overlay} + {\useMPgraphic{test}{b=5,a=softlight}} {\tttf softlight} + {\useMPgraphic{test}{b=6,a=hardlight}} {\tttf hardlight} + {\useMPgraphic{test}{b=7,a=colordodge}} {\tttf colordodge} + {\useMPgraphic{test}{b=8,a=colorburn}} {\tttf colorburn} + {\useMPgraphic{test}{b=9,a=darken}} {\tttf darken} + {\useMPgraphic{test}{b=10,a=lighten}} {\tttf lighten} + {\useMPgraphic{test}{b=11,a=difference}} {\tttf difference} + {\useMPgraphic{test}{b=12,a=exclusion}} {\tttf exclusion} + {\useMPgraphic{test}{b=13,a=hue}} {\tttf hue} + {\useMPgraphic{test}{b=14,a=saturation}} {\tttf saturation} + {\useMPgraphic{test}{b=15,a=color}} {\tttf color} + {\useMPgraphic{test}{b=16,a=luminosity}} {\tttf luminosity} \stopcombination \stopplacefigure @@ -2024,6 +2026,7 @@ suffix determines the number of arguments and rendering. The \type {r} suffix reverses the order: the fill comes over the draw. There is a \type {p} suffix that returns just the picture. + The next example demonstrates that you can combine \TEX's powerful line breaking algorithm with \METAPOST's graphic capabilities. @@ -2114,7 +2117,7 @@ width is half the size specified. \startbuffer draw outlinetext.b - ("\mathematics{\left({{\sqrt{1+x}}\over{\sqrt{2+x^2}}}\right)}") + ("\mathematics{\left(\frac{\sqrt{1+x}}{\sqrt{2+x^2}}\right)}") (withcolor .850white) (withcolor .625red dashed evenly scaled .1 @@ -2228,7 +2231,7 @@ and one with Dejavu (the Tufte quote). \startcombination[1*4] \bgroup \def|#1|{-}% - \definedfont[texgyrepagella-regular.otf*none]% + \definedfont[file:texgyrepagella-regular.otf*none]% \startMPcode draw outlinetext.b ("\framed[align=normal,width=max]{\input{zapf}}") @@ -2238,7 +2241,7 @@ and one with Dejavu (the Tufte quote). \egroup {pagella / no features} \bgroup \def|#1|{-}% - \definedfont[texgyrepagella-regular.otf*default]% + \definedfont[file:texgyrepagella-regular.otf*default]% \startMPcode draw outlinetext.b ("\framed[align=normal,width=max]{\input{zapf}}") @@ -2248,7 +2251,7 @@ and one with Dejavu (the Tufte quote). \egroup {pagella / default features} \bgroup \def|#1|{-}% - \definedfont[dejavuserif.ttf*none]% + \definedfont[file:dejavuserif.ttf*none]% \startMPcode draw outlinetext.b ("\framed[align=normal,width=max]{\input{tufte}}") @@ -2258,7 +2261,7 @@ and one with Dejavu (the Tufte quote). \egroup {dejavu serif / no features} \bgroup \def|#1|{-}% - \definedfont[dejavuserif.ttf*default]% + \definedfont[file:dejavuserif.ttf*default]% \startMPcode draw outlinetext.b ("\framed[align=normal,width=max]{\input{tufte}}") @@ -2309,7 +2312,7 @@ We start by defining the font: script=hang, language=kor] -\definefont[KoreanFont][hanbatanglvt*korean-base] +\definefont[KoreanFont][file:hanbatanglvt*korean-base] \stopbuffer \typebuffer \getbuffer @@ -2318,52 +2321,52 @@ Next we define a macro that will draw the outline: \startbuffer \startMPdefinitions - string KoreanColors[] ; - - KoreanColors[1] := "darkred" ; - KoreanColors[2] := "darkgreen" ; - KoreanColors[3] := "darkblue" ; - KoreanColors[4] := "darkyellow" ; - KoreanColors[5] := "darkgray" ; - - newinternal KoreanSplit ; KoreanSplit := -1 ; - newinternal KoreanCode ; KoreanCode := -2 ; - newinternal KoreanMode ; KoreanMode := KoreanSplit ; - - def KoreanOutline(expr txt) = - picture p ; p := outlinetext.p(txt) ; - numeric n ; n := 0 ; - string old, new ; old := "" ; - for i within p : - if KoreanMode == KoreanSplit : - n := n + 1 ; - elseif KoreanMode == KoreanCode : - new := prescriptpart i ; - if new <> old : - old := new ; - n := n + 1 ; - fi ; - else : - n := KoreanMode ; - fi ; - if unknown KoreanColors[n] : - n := 1 ; +string KoreanColors[] ; + +KoreanColors[1] := "darkred" ; +KoreanColors[2] := "darkgreen" ; +KoreanColors[3] := "darkblue" ; +KoreanColors[4] := "darkyellow" ; +KoreanColors[5] := "darkgray" ; + +newinternal KoreanSplit ; KoreanSplit := -1 ; +newinternal KoreanCode ; KoreanCode := -2 ; +newinternal KoreanMode ; KoreanMode := KoreanSplit ; + +def KoreanOutline(expr txt) = + picture p ; p := outlinetext.p(txt) ; + numeric n ; n := 0 ; + string old, new ; old := "" ; + for i within p : + if KoreanMode == KoreanSplit : + n := n + 1 ; + elseif KoreanMode == KoreanCode : + new := prescriptpart i ; + if new <> old : + old := new ; + n := n + 1 ; fi ; - draw pathpart i - withpen pencircle scaled 1/10 - withcolor KoreanColors[n] ; - endfor ; - enddef ; - - def KoreanTest(expr txt) = - image ( - KoreanMode := KoreanSplit ; KoreanOutline(txt) ; - currentpicture := currentpicture shifted (- xpart urcorner currentpicture, 0); - KoreanMode := KoreanCode ; KoreanOutline(txt) ; - currentpicture := currentpicture shifted (- xpart urcorner currentpicture, 0); - KoreanMode := 3 ; KoreanOutline(txt) ; - ) - enddef ; + else : + n := KoreanMode ; + fi ; + if unknown KoreanColors[n] : + n := 1 ; + fi ; + draw pathpart i + withpen pencircle scaled 1/10 + withcolor KoreanColors[n] ; + endfor ; +enddef ; + +def KoreanTest(expr txt) = + image ( + KoreanMode := KoreanSplit ; KoreanOutline(txt) ; + currentpicture := currentpicture shifted (- xpart urcorner currentpicture, 0); + KoreanMode := KoreanCode ; KoreanOutline(txt) ; + currentpicture := currentpicture shifted (- xpart urcorner currentpicture, 0); + KoreanMode := 3 ; KoreanOutline(txt) ; + ) +enddef ; \stopMPdefinitions \stopbuffer diff --git a/doc/context/sources/general/manuals/metafun/metafun-examples.tex b/doc/context/sources/general/manuals/metafun/metafun-examples.tex index 20dc64dad..a0721103e 100644 --- a/doc/context/sources/general/manuals/metafun/metafun-examples.tex +++ b/doc/context/sources/general/manuals/metafun/metafun-examples.tex @@ -3515,6 +3515,43 @@ Again we demonstrate the differences with some examples. The result can be seen \stopsection +\startsection[title=Hidden beauty] + +\index {hiding} + +The \type {hide} wraps its (text) argument in a group in such a way that whatever +happens is not interfering with its surrounding. This is comparable with what +\type {vardef} does except that there is nothing of value produced. + +\startbuffer +def mfun_curve_to_a = hide(let connect = mfun_curve_to_b ;) enddef ; def mfun_curve_to_b = .. enddef ; +def mfun_line_to_a = hide(let connect = mfun_line_to_b ;) enddef ; def mfun_line_to_b = -- enddef ; + +def forcurve = hide(let connect = mfun_curve_to_a ;) for enddef; +def forline = hide(let connect = mfun_line_to_a ;) for enddef; + +draw image ( + draw forline i = 0 upto 25 : connect(i,sin(i)) endfor + withcolor darkblue + withtransparency (1,.5) ; + draw forcurve i = 0 upto 25 : connect(i,sin(i)) endfor + withcolor darkyellow + withtransparency (1,.5) ; +) xysized (TextWidth, 3cm) ; +\stopbuffer + +\typebuffer + +In this example we hide the assignment in the loop and not only define the \type +{connect} macro but also adept it after its first expansion. Usage is shown \in +{in } [fig:hide]. + +\startplacefigure[title=Hiding assignments in a loop,reference=fig:hide] + \processMPbuffer +\stopplacefigure + +\stopsection + \stopchapter \stopcomponent diff --git a/doc/context/sources/general/manuals/metafun/metafun-introduction.tex b/doc/context/sources/general/manuals/metafun/metafun-introduction.tex index def3c9a93..fb260e0f5 100644 --- a/doc/context/sources/general/manuals/metafun/metafun-introduction.tex +++ b/doc/context/sources/general/manuals/metafun/metafun-introduction.tex @@ -95,6 +95,17 @@ with the latest version; thanks to Otared Kavian for keeping an eye on that and posting me possible issues. The real new features are part of what is to become \LUAMETAFUN, but for that we have a separate manual. +In 2022 Mikael Sundqvist and I spent a lot of time on improving math in both +\LUAMETATEX\ and \CONTEXT\ \LMTX, which is now the main version. Because we're both +\METAPOST\ fans we let ourselves being sidetracked to also explore new possibilities +in the library. Some of the macros that evolved from that made it into \METAFUN\ +which is why we also discuss some here. Be aware of the fact that we do some things +different in \LMTX\ than in \MKIV, for instance we moved to colors being specified +as strings (references to colors defined in \CONTEXT). There are also some new +features that are unique to the library in \LUAMETATEX, like \type {&&}, \type +{&&&}, \type {&&&&} and \type {nocycle}. THis means that not everything discussed +here works in \MKIV\ too. + \blank[big,samepage] \startlines diff --git a/doc/context/sources/general/manuals/metafun/metafun-lua.tex b/doc/context/sources/general/manuals/metafun/metafun-lua.tex index e9e4b4a8d..a61fa43e5 100644 --- a/doc/context/sources/general/manuals/metafun/metafun-lua.tex +++ b/doc/context/sources/general/manuals/metafun/metafun-lua.tex @@ -1648,64 +1648,6 @@ but also nicely abstract ones. % p = mp.getpath(name) % \stoptyping % -% A is path a table of tables that have six values: the coordinates and the -% pre- and postcontrol. You can manipulate this table and feed it back into -% \METAPOST. -% -% \startlinecorrection -% \startMPcode -% numeric n ; n := lua.mp.newhash() ; -% -% for i=1 upto 3 : -% lua.mp.tohash(n,i) ; -% endfor ; -% -% fill fullcircle scaled 10mm withcolor -% if lua.mp.inhash(n,3) : green else : red fi ; -% -% fill fullcircle scaled 5mm withcolor -% if lua.mp.inhash(n,4) : green else : red fi ; -% -% lua.mp.disposehash(n) -% \stopMPcode -% \stoplinecorrection -% -% You can also store values with keys and access them later: -% -% \startlinecorrection -% \startMPcode -% numeric n ; n := lua.mp.newhash() ; -% -% for i=1 upto 3 : -% lua.mp.tohash(n,i,decimal sqrt(i)) ; -% endfor ; -% -% draw textext(lua.mp.fromhash(n,3)) -% ysized 1cm -% withcolor blue ; -% -% lua.mp.disposehash(n) -% \stopMPcode -% \stoplinecorrection -% -% You can also name your own hash: -% -% \startlinecorrection -% \startMPcode -% lua.mp.newhash("foo") ; -% -% for i=1 upto 3 : -% lua.mp.tohash("foo",i,decimal sqrt(i)) ; -% endfor ; -% -% draw textext(lua.mp.fromhash("foo",2)) -% ysized 1cm -% withcolor green ; -% -% lua.mp.disposehash("foo") -% \stopMPcode -% \stoplinecorrection -% % Although it might look like \METAPOST\ supports arrays the reality is that it % doesn't really. There is a concept of suffixes but internally these are just a % way to compose macros. The following test is one that is used in one of the diff --git a/doc/context/sources/general/manuals/metafun/metafun-positioning.tex b/doc/context/sources/general/manuals/metafun/metafun-positioning.tex index 5f18b3ee6..448dcd966 100644 --- a/doc/context/sources/general/manuals/metafun/metafun-positioning.tex +++ b/doc/context/sources/general/manuals/metafun/metafun-positioning.tex @@ -61,7 +61,7 @@ macro package reading this chapter only makes sense when you use \CONTEXT. save pa, pb, pm, pab, na, nb, sa, sb ; path pa, pb, pm, pab ; numeric na, nb ; string sa, sb ; % the tags - sa := texstr("from") ; + sa := texstr("from") ; % MPvars sb := texstr("to") ; % we need to check page crossing so we fetch the page numbers na := positionpage(sa) ; @@ -134,6 +134,7 @@ macro package reading this chapter only makes sense when you use \CONTEXT. \startbuffer[box:1:also] \startMPpositiongraphic{mpos:box}{fillcolor,linecolor,linewidth} path box ; box := positionbox(texstr("self")) ; +% path box ; box := positionbox("\MPvar{self}") ; box := box enlarged texvar("filloffset") ; fill box withcolor texvar("fillcolor") ; @@ -351,6 +352,7 @@ other tricks with positioning. \startbuffer[g-circle] \startMPpositiongraphic{mypos:circle} path p ; p := positionbox(texstr("self")) ; +% path p ; p := positionbox("\MPvar{self}") ; p := fullcircle xsized (bbwidth(p)+4pt) shifted center p ; pickup pencircle scaled 1pt ; fill p withcolor .800white ; @@ -362,8 +364,8 @@ other tricks with positioning. \startbuffer[g-line] \startMPpositiongraphic{mypos:line} path pa, pb, pab ; numeric na, nb ; string ta, tb ; - ta := texstr("from") ; - tb := texstr("to") ; + ta := texstr("from") ; % "\MPvar{from}" + tb := texstr("to") ; % "\MPvar{to}" na := positionpage(ta) ; nb := positionpage(tb) ; pa := positionbox(ta) ; @@ -543,6 +545,7 @@ saw in the graphic: \starttyping path p ; p := positionbox(texstr("self")) ; +% path p ; p := positionbox("\MPvar{self}") ; \stoptyping \type {texstr("self")} will return the current position, which, fed to \type @@ -806,6 +809,8 @@ desktop. \typebuffer +\page + \startbuffer[demo] \startbuffer \setlayer [DemoLayer] diff --git a/doc/context/sources/general/manuals/metafun/metafun-reference.tex b/doc/context/sources/general/manuals/metafun/metafun-reference.tex index 847bc6565..947610323 100644 --- a/doc/context/sources/general/manuals/metafun/metafun-reference.tex +++ b/doc/context/sources/general/manuals/metafun/metafun-reference.tex @@ -470,6 +470,7 @@ defineshade cshade withshademethod "circular" ; \ShowSampleII {mp} {dashed oddly} {dashed oddly} \ShowSampleII {mp} {dashpattern} {dashed dashpattern (on .1 off .2 on .3 off .4)} \ShowSampleII {mp} {undashed} {dashed evenly undashed} +\ShowSampleII {fm} {withdashes pair} {withdashes (.1,.2)} \ShowSampleJ {mm} {pencircle transform} {pencircle} \ShowSampleJ {mm} {pensquare transform} {pensquare} diff --git a/doc/context/sources/general/manuals/metafun/metafun-text-lmtx.tex b/doc/context/sources/general/manuals/metafun/metafun-text-lmtx.tex index 6fa6b5da6..d6fb2bc23 100644 --- a/doc/context/sources/general/manuals/metafun/metafun-text-lmtx.tex +++ b/doc/context/sources/general/manuals/metafun/metafun-text-lmtx.tex @@ -1510,6 +1510,75 @@ The text and graphics come together in a framed text: \typebuffer \getbuffer +\stopsection + +\startsection[title=Hashes] + +\index {hashes} + +We can store data in a hash and access it later. Storage happens efficiently at the +\LUA\ end. + +\startbuffer +\startMPcode + tohash("foo","bar","gnu") ; + tohash("foo","rab","ung") ; + fill fullcircle scaled 1cm withcolor "lightgray" ; + draw textext(fromhash("foo","bar")) ; + draw textext(fromhash("foo","rab")) rotated 90 ; +\stopMPcode +\stopbuffer + +\typebuffer \startlinecorrection \getbuffer \stoplinecorrection + +With \type {newhash("foo")} we get back an index but this macro is only needed in +\MKIV\ where. With \type {disposehash("foo")} a hash get wiped. + +\startbuffer +\startMPcode + tohash(4,"bar","gnu") ; + tohash(4,"rab","ung") ; + fill fullcircle scaled 1cm withcolor "lightgray" ; + draw textext(fromhash(4,"bar")) ; + draw textext(fromhash(4,"rab")) rotated 90 ; +\stopMPcode +\stopbuffer + +\typebuffer \startlinecorrection \getbuffer \stoplinecorrection + +You can also used an indexed hash: + +\startbuffer +\startMPcode + tohash("foo",1,"gnu") ; + tohash("foo",2,"ung") ; + fill fullcircle scaled 1cm withcolor "lightgray" ; + for i=1 upto 3 : + if inhash("foo",i) : + draw textext(fromhash("foo",i)) + rotated ((i-1) * 90) ; + fi ; + endfor ; +\stopMPcode +\stopbuffer + +\typebuffer \startlinecorrection \getbuffer \stoplinecorrection + +And even booleans can be used as index: + +\startbuffer +\startMPcode + tohash("foo",false,"gnu") ; + tohash("foo",true,"ung") ; + fill fullcircle scaled 1cm withcolor "lightgray" ; + draw textext(fromhash("foo",false)) ; + draw textext(fromhash("foo",true)) rotated 90 ; +\stopMPcode +\stopbuffer + +\typebuffer \startlinecorrection \getbuffer \stoplinecorrection + + \stopsection \stopchapter diff --git a/doc/context/sources/general/manuals/metafun/metafun-text.tex b/doc/context/sources/general/manuals/metafun/metafun-text.tex index 5cebf549f..135fe7e35 100644 --- a/doc/context/sources/general/manuals/metafun/metafun-text.tex +++ b/doc/context/sources/general/manuals/metafun/metafun-text.tex @@ -708,118 +708,118 @@ In the examples, the text is typeset along the path with: \startbuffer[draw] \startuseMPgraphic{followtokens} - path RotPath ; RotPath := fullcircle ; + path RotPath ; RotPath := fullcircle ; \stopuseMPgraphic \stopbuffer - \startbuffer - \typebuffer[draw] - \startlinecorrection[blank] - \hbox - {\getbuffer[draw,toks]\hskip1cm - \getbuffer[trac,draw,toks]} - \stoplinecorrection - \stopbuffer - - \getbuffer - - \startbuffer[draw] - \startuseMPgraphic{followtokens} - path RotPath ; RotPath := reverse fullcircle ; - \stopuseMPgraphic - \stopbuffer - - \getbuffer - - \startbuffer[draw] - \startuseMPgraphic{followtokens} - path RotPath ; RotPath := (-3cm,-1cm)--(0,1cm)--(3cm,-1cm) ; - \stopuseMPgraphic - \stopbuffer - - \getbuffer - - \startbuffer[draw] - \startuseMPgraphic{followtokens} - path RotPath ; RotPath := (-3cm,0)--(3cm,1cm) ; - \stopuseMPgraphic - \stopbuffer - - \getbuffer - - \startbuffer[draw] - \startuseMPgraphic{followtokens} - path RotPath ; RotPath := (-3cm,0)..(-1cm,1cm)..(3cm,0) ; - \stopuseMPgraphic - \stopbuffer - - \getbuffer - - \startbuffer[draw] - \startuseMPgraphic{followtokens} - path RotPath ; RotPath := (-3cm,0)..(-1cm,1cm)..(0cm,-2cm)..(3cm,0) ; - \stopuseMPgraphic - \stopbuffer - - \getbuffer - - When turned on, tracing will produce bounding boxes as well as draw the path. - Tracing can be turned on by saying: - - \typebuffer[trac] - - % let's turn it off now - - \startMPinclusions - boolean TraceRot ; TraceRot := false ; - \stopMPinclusions - - The next example is dedicated to Giuseppe Bilotta who wants to handle multiple - strings and uses a patched version of \type {\followtokens}. To avoid a - complicated explanation, we will present an alternative here that uses overlays. - This method also avoids complicated path definitions. - - \startbuffer - \startoverlay - {\startuseMPgraphic{followtokens} - draw fullcircle scaled 5cm . - withpen pencircle scaled 1pt withcolor .625yellow ; - draw fullsquare scaled 5.25cm - withpen pencircle scaled 1pt withcolor .625red ; - drawoptions (withcolor .625red) ; - path RotPath ; RotPath := halfcircle scaled 5cm ; - setbounds currentpicture to boundingbox fullcircle scaled 5.25cm ; - \stopuseMPgraphic - \followtokens { Met{\`a} superiore }} - {\startuseMPgraphic{followtokens} - drawoptions (withcolor .625red) ; - path RotPath ; RotPath := halfcircle rotated 90 scaled 5cm ; - setbounds currentpicture to boundingbox fullcircle scaled 5.25cm ; - \stopuseMPgraphic - \followtokens { {$\star$} }} - {\startuseMPgraphic{followtokens} - drawoptions (withcolor .625red) ; - path RotPath ; RotPath := halfcircle rotated 180 scaled 5cm ; - setbounds currentpicture to boundingbox fullcircle scaled 5.25cm ; - \stopuseMPgraphic - \followtokens { Met{\`a} inferiore }} - {\startuseMPgraphic{followtokens} - drawoptions (withcolor .625red) ; - path RotPath ; RotPath := halfcircle rotated 270 scaled 5cm ; - setbounds currentpicture to boundingbox fullcircle scaled 5.25cm ; - \stopuseMPgraphic - \followtokens { {$\star$} }} - \stopoverlay - \stopbuffer - - \typebuffer - - In order to fool the overlay macro that each graphic has the same size, we force - a bounding box. - - \startlinecorrection[blank] - \getbuffer - \stoplinecorrection +\startbuffer +\typebuffer[draw] +\startlinecorrection[blank] +\hbox + {\getbuffer[draw,toks]\hskip1cm + \getbuffer[trac,draw,toks]} +\stoplinecorrection +\stopbuffer + +\getbuffer + +\startbuffer[draw] +\startuseMPgraphic{followtokens} + path RotPath ; RotPath := reverse fullcircle ; +\stopuseMPgraphic +\stopbuffer + +\getbuffer + +\startbuffer[draw] +\startuseMPgraphic{followtokens} + path RotPath ; RotPath := (-3cm,-1cm)--(0,1cm)--(3cm,-1cm) ; +\stopuseMPgraphic +\stopbuffer + +\getbuffer + +\startbuffer[draw] +\startuseMPgraphic{followtokens} + path RotPath ; RotPath := (-3cm,0)--(3cm,1cm) ; +\stopuseMPgraphic +\stopbuffer + +\getbuffer + +\startbuffer[draw] +\startuseMPgraphic{followtokens} + path RotPath ; RotPath := (-3cm,0)..(-1cm,1cm)..(3cm,0) ; +\stopuseMPgraphic +\stopbuffer + +\getbuffer + +\startbuffer[draw] +\startuseMPgraphic{followtokens} + path RotPath ; RotPath := (-3cm,0)..(-1cm,1cm)..(0cm,-2cm)..(3cm,0) ; +\stopuseMPgraphic +\stopbuffer + +\getbuffer + +When turned on, tracing will produce bounding boxes as well as draw the path. +Tracing can be turned on by saying: + +\typebuffer[trac] + +% let's turn it off now + +\startMPinclusions + boolean TraceRot ; TraceRot := false ; +\stopMPinclusions + +The next example is dedicated to Giuseppe Bilotta who wants to handle multiple +strings and uses a patched version of \type {\followtokens}. To avoid a +complicated explanation, we will present an alternative here that uses overlays. +This method also avoids complicated path definitions. + +\startbuffer +\startoverlay + {\startuseMPgraphic{followtokens} + draw fullcircle scaled 5cm . + withpen pencircle scaled 1pt withcolor .625yellow ; + draw fullsquare scaled 5.25cm + withpen pencircle scaled 1pt withcolor .625red ; + drawoptions (withcolor .625red) ; + path RotPath ; RotPath := halfcircle scaled 5cm ; + setbounds currentpicture to boundingbox fullcircle scaled 5.25cm ; + \stopuseMPgraphic + \followtokens { Met{\`a} superiore }} + {\startuseMPgraphic{followtokens} + drawoptions (withcolor .625red) ; + path RotPath ; RotPath := halfcircle rotated 90 scaled 5cm ; + setbounds currentpicture to boundingbox fullcircle scaled 5.25cm ; + \stopuseMPgraphic + \followtokens { {$\star$} }} + {\startuseMPgraphic{followtokens} + drawoptions (withcolor .625red) ; + path RotPath ; RotPath := halfcircle rotated 180 scaled 5cm ; + setbounds currentpicture to boundingbox fullcircle scaled 5.25cm ; + \stopuseMPgraphic + \followtokens { Met{\`a} inferiore }} + {\startuseMPgraphic{followtokens} + drawoptions (withcolor .625red) ; + path RotPath ; RotPath := halfcircle rotated 270 scaled 5cm ; + setbounds currentpicture to boundingbox fullcircle scaled 5.25cm ; + \stopuseMPgraphic + \followtokens { {$\star$} }} +\stopoverlay +\stopbuffer + +\typebuffer + +In order to fool the overlay macro that each graphic has the same size, we force +a bounding box. + +\startlinecorrection[blank] +\getbuffer +\stoplinecorrection \stopsection diff --git a/doc/context/sources/general/manuals/metafun/metafun-welcome.tex b/doc/context/sources/general/manuals/metafun/metafun-welcome.tex index a7b1715a7..90ceab730 100644 --- a/doc/context/sources/general/manuals/metafun/metafun-welcome.tex +++ b/doc/context/sources/general/manuals/metafun/metafun-welcome.tex @@ -2181,6 +2181,56 @@ The macro \type {drawoptions} provides you a way to set the default attributes. drawoptions(dashed evenly withcolor red) ; \stoptyping +Dashes are pretty much bound to the backend in the sense that like line width +they are a property that the \POSTSCRIPT\ (or actually nowadays the \PDF) +interpreter handles. There is not that much cleverness involved at the \METAPOST\ +end. Take these examples: + +\startbuffer + pickup pencircle scaled 2mm ; path p ; + + p := (0,0) {dir 25} .. (5cm,0) ; + draw p withcolor darkyellow ; + draw p dashed dashpattern (on 4mm off 3mm) withcolor darkblue ; + drawpoints point 0 of p withcolor white ; + + p := ((0,0) {dir 70} .. {up} (5cm,0) .. cycle) yshifted -1cm ; + draw p withcolor darkyellow ; + draw p dashed dashpattern (on 4mm off 3mm) withcolor darkblue ; + drawpoints point 0 of p withcolor white ; +\stopbuffer + +\typebuffer[a] + +\startlinecorrection[blank] +\processMPbuffer +\stoplinecorrection + +In both cases the dash is not evenly spread which for the line results in +different begin and end rendering while the closed shape gets some weird looking +connection. The next variant uses the \type {withdashes} macro that adapts the +dashes to fit nicely to the path. + +\startbuffer[a] + pickup pencircle scaled 2mm ; path p ; + + p := (0,0) {dir 25} .. (5cm,0) ; + draw p withcolor darkyellow ; + draw p withdashes (4mm,3mm) withcolor darkblue ; + drawpoints point 0 of p withcolor white ; + + p := ((0,0) {dir 70} .. {up} (5cm,0) .. cycle) yshifted -1cm ; + draw p withcolor darkyellow ; + draw p withdashes (4mm,3mm) withcolor darkblue ; + drawpoints point 0 of p withcolor white ; +\stopbuffer + +\typebuffer + +\startlinecorrection[blank] +\processMPbuffer +\stoplinecorrection + \stopsection \startsection[reference=sec:text,title={Text}] @@ -3164,7 +3214,7 @@ following line: \startbuffer[b] redraw currentpicture withpen pencircle scaled 2pt ; -draw boundingbox currenpicture withpen pencircle scaled .5mm ; +draw boundingbox currentpicture withpen pencircle scaled .5mm ; \stopbuffer \typebuffer[b] -- cgit v1.2.3