diff options
| author | Context Git Mirror Bot <phg42.2a@gmail.com> | 2015-01-01 14:15:05 +0100 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2015-01-01 14:15:05 +0100 |
| commit | d60864031986987f840bae4bf36922af3b324477 (patch) | |
| tree | b862d3c5438e14516d04c2217bfe675670d33f0a | |
| parent | 2e0731c0e1b16577a3cc394aad3e0734560d60c6 (diff) | |
| download | context-d60864031986987f840bae4bf36922af3b324477.tar.gz | |
2015-01-01 13:17:00
58 files changed, 331 insertions, 446 deletions
diff --git a/doc/context/scripts/mkii/ctxtools.man b/doc/context/scripts/mkii/ctxtools.man index 3eb988c9c..38f10ef7c 100644 --- a/doc/context/scripts/mkii/ctxtools.man +++ b/doc/context/scripts/mkii/ctxtools.man @@ -1,4 +1,4 @@ -.TH "ctxtools" "1" "01-01-2014" "version 1.3.5" "CtxTools" +.TH "ctxtools" "1" "01-01-2015" "version 1.3.5" "CtxTools" .SH NAME .B ctxtools .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/imgtopdf.man b/doc/context/scripts/mkii/imgtopdf.man index ade6ce4f3..864cf5a98 100644 --- a/doc/context/scripts/mkii/imgtopdf.man +++ b/doc/context/scripts/mkii/imgtopdf.man @@ -1,4 +1,4 @@ -.TH "imgtopdf" "1" "01-01-2014" "version 1.1.2" "ImgToPdf" +.TH "imgtopdf" "1" "01-01-2015" "version 1.1.2" "ImgToPdf" .SH NAME .B imgtopdf .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/mptopdf.man b/doc/context/scripts/mkii/mptopdf.man index e064ba895..30197a9f2 100644 --- a/doc/context/scripts/mkii/mptopdf.man +++ b/doc/context/scripts/mkii/mptopdf.man @@ -1,4 +1,4 @@ -.TH "mptopdf" "1" "01-01-2014" "version 1.4.1" "convert MetaPost figures to PDF" +.TH "mptopdf" "1" "01-01-2015" "version 1.4.1" "convert MetaPost figures to PDF" .SH NAME .B mptopdf .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/pdftools.man b/doc/context/scripts/mkii/pdftools.man index ddbebe386..f63bf7e39 100644 --- a/doc/context/scripts/mkii/pdftools.man +++ b/doc/context/scripts/mkii/pdftools.man @@ -1,4 +1,4 @@ -.TH "pdftools" "1" "01-01-2014" "version 1.2.1" "PDFTools" +.TH "pdftools" "1" "01-01-2015" "version 1.2.1" "PDFTools" .SH NAME .B pdftools .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/pstopdf.man b/doc/context/scripts/mkii/pstopdf.man index 9a8e5c637..8203e76cc 100644 --- a/doc/context/scripts/mkii/pstopdf.man +++ b/doc/context/scripts/mkii/pstopdf.man @@ -1,4 +1,4 @@ -.TH "pstopdf" "1" "01-01-2014" "version 2.0.1" "PStoPDF" +.TH "pstopdf" "1" "01-01-2015" "version 2.0.1" "PStoPDF" .SH NAME .B pstopdf .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/rlxtools.man b/doc/context/scripts/mkii/rlxtools.man index a42a80c38..58e7032d8 100644 --- a/doc/context/scripts/mkii/rlxtools.man +++ b/doc/context/scripts/mkii/rlxtools.man @@ -1,4 +1,4 @@ -.TH "rlxtools" "1" "01-01-2014" "version 1.0.1" "RlxTools" +.TH "rlxtools" "1" "01-01-2015" "version 1.0.1" "RlxTools" .SH NAME .B rlxtools .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/texexec.man b/doc/context/scripts/mkii/texexec.man index cfefa9a74..841622bcd 100644 --- a/doc/context/scripts/mkii/texexec.man +++ b/doc/context/scripts/mkii/texexec.man @@ -1,4 +1,4 @@ -.TH "texexec" "1" "01-01-2014" "version 6.2.1" "TeXExec" +.TH "texexec" "1" "01-01-2015" "version 6.2.1" "TeXExec" .SH NAME .B texexec .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/texmfstart.man b/doc/context/scripts/mkii/texmfstart.man index 5bb88c47f..643d8b1c9 100644 --- a/doc/context/scripts/mkii/texmfstart.man +++ b/doc/context/scripts/mkii/texmfstart.man @@ -1,4 +1,4 @@ -.TH "mtxrun" "1" "01-01-2014" "version 1.31" "ConTeXt TDS Runner Tool" +.TH "mtxrun" "1" "01-01-2015" "version 1.31" "ConTeXt TDS Runner Tool" .SH NAME .B mtxrun .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/textools.man b/doc/context/scripts/mkii/textools.man index ce26c5172..c256969fd 100644 --- a/doc/context/scripts/mkii/textools.man +++ b/doc/context/scripts/mkii/textools.man @@ -1,4 +1,4 @@ -.TH "textools" "1" "01-01-2014" "version 1.3.1" "TeXTools" +.TH "textools" "1" "01-01-2015" "version 1.3.1" "TeXTools" .SH NAME .B textools .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/texutil.man b/doc/context/scripts/mkii/texutil.man index 0dab17baa..c92f51a6f 100644 --- a/doc/context/scripts/mkii/texutil.man +++ b/doc/context/scripts/mkii/texutil.man @@ -1,4 +1,4 @@ -.TH "texutil" "1" "01-01-2014" "version 9.1.0" "TeXUtil" +.TH "texutil" "1" "01-01-2015" "version 9.1.0" "TeXUtil" .SH NAME .B texutil .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/tmftools.man b/doc/context/scripts/mkii/tmftools.man index 980441719..780efb7eb 100644 --- a/doc/context/scripts/mkii/tmftools.man +++ b/doc/context/scripts/mkii/tmftools.man @@ -1,4 +1,4 @@ -.TH "tmftools" "1" "01-01-2014" "version 1.1.0" "TMFTools" +.TH "tmftools" "1" "01-01-2015" "version 1.1.0" "TMFTools" .SH NAME .B tmftools .SH SYNOPSIS diff --git a/doc/context/scripts/mkii/xmltools.man b/doc/context/scripts/mkii/xmltools.man index 2e61a1431..d43cc1a03 100644 --- a/doc/context/scripts/mkii/xmltools.man +++ b/doc/context/scripts/mkii/xmltools.man @@ -1,4 +1,4 @@ -.TH "xmltools" "1" "01-01-2014" "version 1.2.2" "XMLTools" +.TH "xmltools" "1" "01-01-2015" "version 1.2.2" "XMLTools" .SH NAME .B xmltools .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/context.man b/doc/context/scripts/mkiv/context.man index 5fe794095..0c2f607f2 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-2014" "version 0.60" "ConTeXt Process Management" +.TH "mtx-context" "1" "01-01-2015" "version 0.60" "ConTeXt Process Management" .SH NAME .B mtx-context .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/luatools.man b/doc/context/scripts/mkiv/luatools.man index 72dea5800..ecdd6aa32 100644 --- a/doc/context/scripts/mkiv/luatools.man +++ b/doc/context/scripts/mkiv/luatools.man @@ -1,4 +1,4 @@ -.TH "luatools" "1" "01-01-2014" "version 1.35" "ConTeXt TDS Management Tool (aka luatools)" +.TH "luatools" "1" "01-01-2015" "version 1.35" "ConTeXt TDS Management Tool (aka luatools)" .SH NAME .B luatools .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-babel.man b/doc/context/scripts/mkiv/mtx-babel.man index 6f78cf43d..8477eb522 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-2014" "version 1.20" "Babel Input To UTF Conversion" +.TH "mtx-babel" "1" "01-01-2015" "version 1.20" "Babel Input To UTF Conversion" .SH NAME .B mtx-babel .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-base.man b/doc/context/scripts/mkiv/mtx-base.man index 84d67a3fe..08e13b09d 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-2014" "version 1.35" "ConTeXt TDS Management Tool (aka luatools)" +.TH "mtx-base" "1" "01-01-2015" "version 1.35" "ConTeXt TDS Management Tool (aka luatools)" .SH NAME .B mtx-base .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-cache.man b/doc/context/scripts/mkiv/mtx-cache.man index 02f8a2ec4..a7acb8b2e 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-2014" "version 0.10" "ConTeXt &error; MetaTeX Cache Management" +.TH "mtx-cache" "1" "01-01-2015" "version 0.10" "ConTeXt &error; MetaTeX Cache Management" .SH NAME .B mtx-cache .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-chars.man b/doc/context/scripts/mkiv/mtx-chars.man index 749f6315e..5c9d79bb3 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-2014" "version 0.10" "MkII Character Table Generators" +.TH "mtx-chars" "1" "01-01-2015" "version 0.10" "MkII Character Table Generators" .SH NAME .B mtx-chars .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-check.man b/doc/context/scripts/mkiv/mtx-check.man index 153787d5c..ca18bc1a6 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-2014" "version 0.10" "Basic ConTeXt Syntax Checking" +.TH "mtx-check" "1" "01-01-2015" "version 0.10" "Basic ConTeXt Syntax Checking" .SH NAME .B mtx-check .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-colors.man b/doc/context/scripts/mkiv/mtx-colors.man index 68959ae74..a969e474c 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-2014" "version 0.10" "ConTeXt Color Management" +.TH "mtx-colors" "1" "01-01-2015" "version 0.10" "ConTeXt Color Management" .SH NAME .B mtx-colors .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-context.man b/doc/context/scripts/mkiv/mtx-context.man index 5fe794095..0c2f607f2 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-2014" "version 0.60" "ConTeXt Process Management" +.TH "mtx-context" "1" "01-01-2015" "version 0.60" "ConTeXt Process Management" .SH NAME .B mtx-context .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-epub.man b/doc/context/scripts/mkiv/mtx-epub.man index 23e5f71d5..bb33c23df 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-2014" "version 1.10" "ConTeXt EPUB Helpers" +.TH "mtx-epub" "1" "01-01-2015" "version 1.10" "ConTeXt EPUB Helpers" .SH NAME .B mtx-epub .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-fcd.man b/doc/context/scripts/mkiv/mtx-fcd.man index 41d5120e0..311f90e4a 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-2014" "version 1.00" "Fast Directory Change" +.TH "mtx-fcd" "1" "01-01-2015" "version 1.00" "Fast Directory Change" .SH NAME .B mtx-fcd .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-flac.man b/doc/context/scripts/mkiv/mtx-flac.man index 0d2c94308..4ab875899 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-2014" "version 0.10" "ConTeXt Flac Helpers" +.TH "mtx-flac" "1" "01-01-2015" "version 0.10" "ConTeXt Flac Helpers" .SH NAME .B mtx-flac .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-fonts.man b/doc/context/scripts/mkiv/mtx-fonts.man index 06a20635f..c0806a32c 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-2014" "version 0.21" "ConTeXt Font Database Management" +.TH "mtx-fonts" "1" "01-01-2015" "version 0.21" "ConTeXt Font Database Management" .SH NAME .B mtx-fonts .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-grep.man b/doc/context/scripts/mkiv/mtx-grep.man index 4bc7ea62e..6b85f541f 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-2014" "version 0.10" "Simple Grepper" +.TH "mtx-grep" "1" "01-01-2015" "version 0.10" "Simple Grepper" .SH NAME .B mtx-grep .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-interface.man b/doc/context/scripts/mkiv/mtx-interface.man index 862fa08bc..36bf8bc13 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-2014" "version 0.13" "ConTeXt Interface Related Goodies" +.TH "mtx-interface" "1" "01-01-2015" "version 0.13" "ConTeXt Interface Related Goodies" .SH NAME .B mtx-interface .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-metapost.man b/doc/context/scripts/mkiv/mtx-metapost.man index 0c60e33e2..37b1b7c9f 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-2014" "version 0.10" "MetaPost to PDF processor" +.TH "mtx-metapost" "1" "01-01-2015" "version 0.10" "MetaPost to PDF processor" .SH NAME .B mtx-metapost .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-metatex.man b/doc/context/scripts/mkiv/mtx-metatex.man index a85268645..72635044f 100644 --- a/doc/context/scripts/mkiv/mtx-metatex.man +++ b/doc/context/scripts/mkiv/mtx-metatex.man @@ -1,4 +1,4 @@ -.TH "mtx-metatex" "1" "01-01-2014" "version 0.10" "MetaTeX Process Management" +.TH "mtx-metatex" "1" "01-01-2015" "version 0.10" "MetaTeX Process Management" .SH NAME .B mtx-metatex .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-modules.man b/doc/context/scripts/mkiv/mtx-modules.man index ebdc51c9e..a51a1b00e 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-2014" "version 1.00" "ConTeXt Module Documentation Generators" +.TH "mtx-modules" "1" "01-01-2015" "version 1.00" "ConTeXt Module Documentation Generators" .SH NAME .B mtx-modules .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-package.man b/doc/context/scripts/mkiv/mtx-package.man index 6df6cf0ca..83c140f35 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-2014" "version 0.10" "Distribution Related Goodies" +.TH "mtx-package" "1" "01-01-2015" "version 0.10" "Distribution Related Goodies" .SH NAME .B mtx-package .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-patterns.man b/doc/context/scripts/mkiv/mtx-patterns.man index d97bc931b..e93c1aff0 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-2014" "version 0.20" "ConTeXt Pattern File Management" +.TH "mtx-patterns" "1" "01-01-2015" "version 0.20" "ConTeXt Pattern File Management" .SH NAME .B mtx-patterns .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-pdf.man b/doc/context/scripts/mkiv/mtx-pdf.man index 979148462..29b5ad420 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-2014" "version 0.10" "ConTeXt PDF Helpers" +.TH "mtx-pdf" "1" "01-01-2015" "version 0.10" "ConTeXt PDF Helpers" .SH NAME .B mtx-pdf .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-plain.man b/doc/context/scripts/mkiv/mtx-plain.man index 717c9b6e1..c2e0e0bd9 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-2014" "version 1.00" "Plain TeX Runner" +.TH "mtx-plain" "1" "01-01-2015" "version 1.00" "Plain TeX Runner" .SH NAME .B mtx-plain .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-profile.man b/doc/context/scripts/mkiv/mtx-profile.man index 9b4671f13..6aa8e2087 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-2014" "version 1.00" "ConTeXt MkIV LuaTeX Profiler" +.TH "mtx-profile" "1" "01-01-2015" "version 1.00" "ConTeXt MkIV LuaTeX Profiler" .SH NAME .B mtx-profile .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-rsync.man b/doc/context/scripts/mkiv/mtx-rsync.man index 5119eae29..195b6b0f0 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-2014" "version 0.10" "Rsync Helpers" +.TH "mtx-rsync" "1" "01-01-2015" "version 0.10" "Rsync Helpers" .SH NAME .B mtx-rsync .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-scite.man b/doc/context/scripts/mkiv/mtx-scite.man index 8f268c554..cbaed08d1 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-2014" "version 1.00" "Scite Helper Script" +.TH "mtx-scite" "1" "01-01-2015" "version 1.00" "Scite Helper Script" .SH NAME .B mtx-scite .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-server.man b/doc/context/scripts/mkiv/mtx-server.man index a43fd449c..f3d3ae6e4 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-2014" "version 0.10" "Simple Webserver For Helpers" +.TH "mtx-server" "1" "01-01-2015" "version 0.10" "Simple Webserver For Helpers" .SH NAME .B mtx-server .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-texworks.man b/doc/context/scripts/mkiv/mtx-texworks.man index 21dd62fe4..b9cc2ed98 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-2014" "version 1.00" "TeXworks Startup Script" +.TH "mtx-texworks" "1" "01-01-2015" "version 1.00" "TeXworks Startup Script" .SH NAME .B mtx-texworks .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-timing.man b/doc/context/scripts/mkiv/mtx-timing.man index 19aaca173..2f7584f3d 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-2014" "version 0.10" "ConTeXt Timing Tools" +.TH "mtx-timing" "1" "01-01-2015" "version 0.10" "ConTeXt Timing Tools" .SH NAME .B mtx-timing .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-tools.man b/doc/context/scripts/mkiv/mtx-tools.man index 45011d21d..408d467cd 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-2014" "version 1.01" "Some File Related Goodies" +.TH "mtx-tools" "1" "01-01-2015" "version 1.01" "Some File Related Goodies" .SH NAME .B mtx-tools .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-unzip.man b/doc/context/scripts/mkiv/mtx-unzip.man index ffddc1cf9..d9e2c8447 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-2014" "version 0.10" "Simple Unzipper" +.TH "mtx-unzip" "1" "01-01-2015" "version 0.10" "Simple Unzipper" .SH NAME .B mtx-unzip .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-update.man b/doc/context/scripts/mkiv/mtx-update.man index 60ba09fb5..e27c2ab43 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-2014" "version 1.02" "ConTeXt Minimals Updater" +.TH "mtx-update" "1" "01-01-2015" "version 1.02" "ConTeXt Minimals Updater" .SH NAME .B mtx-update .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-watch.man b/doc/context/scripts/mkiv/mtx-watch.man index babd2fcca..d8fab3acd 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-2014" "version 1.00" "ConTeXt Request Watchdog" +.TH "mtx-watch" "1" "01-01-2015" "version 1.00" "ConTeXt Request Watchdog" .SH NAME .B mtx-watch .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtx-youless.man b/doc/context/scripts/mkiv/mtx-youless.man index c1e9594c1..2703ec34f 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-2014" "version 1.00" "youless Fetcher" +.TH "mtx-youless" "1" "01-01-2015" "version 1.00" "youless Fetcher" .SH NAME .B mtx-youless .SH SYNOPSIS diff --git a/doc/context/scripts/mkiv/mtxrun.man b/doc/context/scripts/mkiv/mtxrun.man index 5bb88c47f..643d8b1c9 100644 --- a/doc/context/scripts/mkiv/mtxrun.man +++ b/doc/context/scripts/mkiv/mtxrun.man @@ -1,4 +1,4 @@ -.TH "mtxrun" "1" "01-01-2014" "version 1.31" "ConTeXt TDS Runner Tool" +.TH "mtxrun" "1" "01-01-2015" "version 1.31" "ConTeXt TDS Runner Tool" .SH NAME .B mtxrun .SH SYNOPSIS diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index e642b5be1..fa756369d 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{2014.12.31 20:42} +\newcontextversion{2015.01.01 13:15} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 5b1834d62..abae22c5d 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index abac94514..2f3248eb6 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2014.12.31 20:42} +\edef\contextversion{2015.01.01 13:15} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/publ-aut.lua b/tex/context/base/publ-aut.lua index 01b41c167..f203d1f79 100644 --- a/tex/context/base/publ-aut.lua +++ b/tex/context/base/publ-aut.lua @@ -384,16 +384,6 @@ function commands.btxauthor(dataset,tag,field,settings) end end --- We can consider creating a hashtable key -> entry but I wonder if it ever --- pays off. - -local compare = sorters.comparers.basic -- (a,b) ------ compare = sorters.basicsorter -- (a,b) -local strip = sorters.strip -local splitter = sorters.splitters.utf - --- authors(s) | year | journal | title | pages - local function components(snippet,short) local vons = snippet.vons local surnames = snippet.surnames @@ -445,162 +435,25 @@ local function writer(key,snippets) return concat(snippets," ",1,s) end -local function newsplitter(splitter) - return table.setmetatableindex({},function(t,k) -- could be done in the sorter but seldom that many shared - local v = splitter(k,true) -- in other cases - t[k] = v - return v - end) -end + +publications.writers .author = writer +publications.casters .author = splitauthorstring +publications.components.author = components + +-- sharedmethods.author = { +-- { field = "key", default = "", unknown = "" }, +-- { field = "author", default = "", unknown = "" }, +-- { field = "title", default = "", unknown = "" }, +-- } -- Analysis of the APA by Alan: -- -- first : key author editor publisher title journal volume number pages -- second: year suffix title month day journal volume number --- local function indexer(dataset,list,method) --- local current = datasets[dataset] --- local luadata = current.luadata --- local details = current.details --- local result = { } --- local splitted = newsplitter(splitter) -- saves mem --- local snippets = { } -- saves mem --- local field = "author" -- todo --- for i=1,#list do --- -- either { tag, tag, ... } or { { tag, index }, { tag, index } } --- local li = list[i] --- local tag = type(li) == "string" and li or li[1] --- local index = tostring(i) --- local entry = luadata[tag] --- if entry then --- local value = getcasted(current,tag,field) or "" --- local mainkey = writer(value,snippets) --- local detail = details[tag] --- result[i] = { --- index = i, --- split = { --- splitted[entry.key or "" ], --- splitted[strip(mainkey) ], --- splitted[entry.year or "9998"], --- splitted[detail.suffix or " " ], --- splitted[entry.month or "13" ], --- splitted[entry.day or "32" ], --- splitted[strip(entry.journal or "" )], --- splitted[strip(entry.volume or "" )], --- splitted[strip(entry.number or "" )], --- splitted[strip(entry.title or "" )], --- splitted[entry.pages or "" ], --- splitted[index], --- }, --- } --- else --- result[i] = { --- index = i, --- split = { --- splitted[""], -- key --- splitted[""], -- mainkey --- splitted["9999"], -- year --- splitted[" "], -- suffix --- splitted["14"], -- month --- splitted["33"], -- day --- splitted[""], -- journal --- splitted[""], -- volume --- splitted[""], -- number --- splitted[""], -- title --- splitted[""], -- pages --- splitted[index], -- index --- }, --- } --- end --- end --- return result --- end - --- if needed we can optimize this one: chekc if it's detail or something else --- and use direct access, but in practice it's fast enough - -local template = [[ -local type, tostring = type, tostring - -local writers = publications.writers -local datasets = publications.datasets -local getter = publications.getfaster -- (current,data,details,field,categories,types) -local strip = sorters.strip -local splitter = sorters.splitters.utf - -local function newsplitter(splitter) - return table.setmetatableindex({},function(t,k) -- could be done in the sorter but seldom that many shared - local v = splitter(k,true) -- in other cases - t[k] = v - return v - end) -end - -return function(dataset,list,method) -- indexer - local current = datasets[dataset] - local luadata = current.luadata - local details = current.details - local specification = publications.currentspecification - local categories = specification.categories - local types = specification.types - local splitted = newsplitter(splitter) -- saves mem - local snippets = { } -- saves mem - local result = { } - -%helpers% - - for i=1,#list do - -- either { tag, tag, ... } or { { tag, index }, { tag, index } } - local li = list[i] - local tag = type(li) == "string" and li or li[1] - local index = tostring(i) - local entry = luadata[tag] - if entry then - local detail = details[tag] - result[i] = { - index = i, - split = { - splitted[entry.key or ""], - -%getters% - - splitted[index], - }, - } - else - result[i] = { - index = i, - split = { - splitted[""], - -%unknowns% - - splitted[index], - }, - } - end - end - return result -end -]] - -local f_getter = formatters["splitted[strip(getter(current,entry,detail,%q,categories,types) or %q)], -- %s"] -local f_writer = formatters["splitted[strip(writer_%s(getter(current,entry,detail,%q,categories,types) or %q,snippets))], -- %s"] -local f_helper = formatters["local writer_%s = writers[%q] -- %s: %s"] -local f_value = formatters["splitted[%q], -- %s"] - -local function indexer(dataset,list,method) - local writers = publications.writers - local specification = publications.currentspecification - ----- categories = specification.categories - local types = specification.types - - local getters = { } - local unknowns = { } - local helpers = { } - - local sequence = { - -- always key first (or should that be made explicit) +publications.sortmethods.authoryear = { + sequence = { + { field = "key", default = "", unknown = "" }, { field = "author", default = "", unknown = "" }, { field = "year", default = "9998", unknown = "9999" }, { field = "suffix", default = " ", unknown = " " }, @@ -611,68 +464,5 @@ local function indexer(dataset,list,method) { field = "number", default = "", unknown = "" }, { field = "title", default = "", unknown = "" }, { field = "pages", default = "", unknown = "" }, - -- always index last (to catch duplicates) - } - - for i=1,#sequence do - local step = sequence[i] - local field = step.field or "?" - local default = step.default or "" - local unknown = step.unknown or "" - local fldtype = types[field] - local writer = fldtype and writers[fldtype] - if writer then - local h = #helpers + 1 - getters[i] = f_writer(h,field,default,field) - helpers[h] = f_helper(h,fldtype,field,fldtype) - else - getters[i] = f_getter(field,default,field) - end - unknowns[i] = f_value(unknown,field) - end - - local code = utilities.templates.replace(template, { - helpers = concat(helpers, "\n"), - getters = concat(getters, "\n"), - unknowns = concat(unknowns,"\n"), - }) - - -- print(code) - - local action, error = loadstring(code) - if type(action) == "function" then - action = action() - end - if type(action) == "function" then - return action(dataset,list,method) or { } - else - return { } - end - -end - --- local function sorted(dataset,list) -- experimental --- local valid = indexer(dataset,list,sorttype) --- if #valid == 0 or #valid ~= #list then --- return list --- else --- sorters.sort(valid,function(a,b) return a ~= b and compare(a,b) == -1 end) --- for i=1,#valid do --- valid[i] = valid[i].index --- end --- return valid --- end --- end - -local function sorted(dataset,valid) -- experimental - sorters.sort(valid,compare) - return valid -end - --- made public - -publications.indexers .author = indexer -publications.writers .author = writer -publications.sorters .author = sorted -publications.casters .author = splitauthorstring -publications.components.author = components + }, +} diff --git a/tex/context/base/publ-dat.lua b/tex/context/base/publ-dat.lua index dcaabb015..e360ca1fe 100644 --- a/tex/context/base/publ-dat.lua +++ b/tex/context/base/publ-dat.lua @@ -72,11 +72,11 @@ publications.loaders = loaders local casters = { } publications.casters = casters -local sorters = { } -publications.sorters = sorters - -local indexers = { } -publications.indexers = indexers +-- local sorters = { } +-- publications.sorters = sorters +-- +-- local indexers = { } +-- publications.indexers = indexers local components = { } publications.components = components -- register components diff --git a/tex/context/base/publ-ini.lua b/tex/context/base/publ-ini.lua index 120957034..e09ba3a38 100644 --- a/tex/context/base/publ-ini.lua +++ b/tex/context/base/publ-ini.lua @@ -69,13 +69,9 @@ local v_middle = variables.middle local v_inbetween = variables.inbetween local v_yes = variables.yes local v_all = variables.all -local v_short = variables.short local v_cite = variables.cite local v_default = variables.default -local v_reference = variables.reference local v_dataset = variables.dataset -local v_author = variables.author or "author" -local v_editor = variables.editor or "editor" local numbertochar = converters.characters @@ -84,10 +80,9 @@ local logspushtarget = logs.pushtarget local logspoptarget = logs.poptarget local csname_id = token.csname_id -local basicsorter = sorters.basicsorter -- (a,b) -local sortcomparer = sorters.comparers.basic -- (a,b) -local sortstripper = sorters.strip -local sortsplitter = sorters.splitters.utf +----- basicsorter = sorters.basicsorter -- (a,b) +----- sortstripper = sorters.strip +----- sortsplitter = sorters.splitters.utf local manipulators = typesetters.manipulators local splitmanipulation = manipulators.splitspecification @@ -891,7 +886,7 @@ do s[#s+1] = { tag, year, u, i } end else - report("author typecast expected for fiel %a",field) + report("author typecast expected for field %a",field) end else --- no spec so let's forget about it @@ -1503,158 +1498,6 @@ do filtermethod(dataset,rendering,keyword) end - -- experiment - - local splitspec = lpeg.splitat(S(":.")) - local splitter = sorters.splitters.utf - local strip = sorters.strip - - local function newsplitter(splitter) - return setmetatableindex({},function(t,k) -- could be done in the sorter but seldom that many shared - local v = splitter(k,true) -- in other cases - t[k] = v - return v - end) - end - - local template = [[ - local strip = sorters.strip - local writers = publications.writers - return function(entry,detail,splitted,i) -- snippets - return { - index = i, - split = { %s, splitted[tostring(i)] } - } - end - ]] - - local function byspec(dataset,list,method) -- todo: yearsuffix - local luadata = datasets[dataset].luadata - local details = datasets[dataset].details - local result = { } - local splitted = newsplitter(splitter) -- saves mem - -- local snippets = { } -- saves mem - local fields = settings_to_array(method) - for i=1,#fields do - local f = settings_to_array(fields[i]) - local r = { } - for i=1,#f do - local a, b = lpegmatch(splitspec,f[i]) - if b then - if a == "detail" or a == "entry" then - local t = currentspecification.types[b] - local w = t and writers[t] - if w then - r[#r+1] = formatters["(%s.%s and writers[%q](%s.%s))"](a,b,t,a,b) - else - r[#r+1] = formatters["%s.%s"](a,b,a,b) - end - end - elseif a then - r[#r+1] = formatters["%s"](a) - end - end - r[#r+1] = '""' - fields[i] = "splitted[strip(" .. concat(r," or ") .. ")]" - end - local action = formatters[template](concat(fields,", ")) - local prepare = loadstring(action) - if prepare then - prepare = prepare() - local dummy = { } - for i=1,#list do - -- either { tag, tag, ... } or { { tag, index }, { tag, index } } - local li = list[i] - local tag = type(li) == "string" and li or li[1] - local entry = luadata[tag] - local detail = details[tag] - if entry and detail then - result[i] = prepare(entry,detail,splitted,i) -- ,snippets) - else - result[i] = prepare(dummy,dummy,splitted,i) -- ,snippets) - end - end - end - return result - end - - lists.sorters = { - [v_short] = function(dataset,rendering,list) - local shorts = rendering.shorts - local function compare(a,b) - local aa, bb = a and a[1], b and b[1] - if aa and bb then - aa, bb = shorts[aa], shorts[bb] - return aa and bb and aa < bb - end - return false - end - sort(list,compare) - end, - [v_reference] = function(dataset,rendering,list) - local function compare(a,b) - local aa, bb = a and a[1], b and b[1] - if aa and bb then - return aa and bb and aa < bb - end - return false - end - sort(list,compare) - end, - [v_dataset] = function(dataset,rendering,list) - local function compare(a,b) - local aa, bb = a and a[1], b and b[1] - if aa and bb then - aa, bb = list[aa].index or 0, list[bb].index or 0 - return aa and bb and aa < bb - end - return false - end - sort(list,compare) - end, - [v_default] = function(dataset,rendering,list,sorttype) -- experimental - if sorttype == "" or sorttype == v_default then - local function compare(a,b) - local aa, bb = a and a[3], b and b[3] - if aa and bb then - return aa and bb and aa < bb - end - return false - end - sort(list,compare) - else - local valid = byspec(dataset,list,sorttype) - if #valid == 0 or #valid ~= #list then - -- nothing to sort - else - -- if needed we can wrap compare and use the list directly but this is cleaner - sorters.sort(valid,sortcomparer) - for i=1,#valid do - local v = valid[i] - valid[i] = list[v.index] - end - return valid - end - end - end, - [v_author] = function(dataset,rendering,list) - -- there is no real need to go vi aindex as the list itself can be sorted ... todo - local valid = publications.indexers.author(dataset,list) - if #valid == 0 or #valid ~= #list then - -- nothing to sort - else - -- if needed we can wrap compare and use the list directly but this is cleaner --- sorters.sort(valid,publications.sorters.author) - local valid = publications.sorters.author(dataset,valid) - for i=1,#valid do - local v = valid[i] - valid[i] = list[v.index] - end - return valid - end - end, - } - -- for determining width local lastreferencenumber = 0 -- document wide @@ -1666,7 +1509,7 @@ do local forceall = rendering.criterium == v_all local repeated = rendering.repeated == v_yes local sorttype = rendering.sorttype or v_default - local sorter = lists.sorters[sorttype] or lists.sorters[v_default] + local sorter = lists.sorters[sorttype] local current = datasets[dataset] local luadata = current.luadata local details = current.details diff --git a/tex/context/base/publ-ini.mkiv b/tex/context/base/publ-ini.mkiv index aaee08d53..801a274d3 100644 --- a/tex/context/base/publ-ini.mkiv +++ b/tex/context/base/publ-ini.mkiv @@ -40,6 +40,7 @@ \registerctxluafile{publ-dat}{1.001} \registerctxluafile{publ-ini}{1.001} +\registerctxluafile{publ-sor}{1.001} \registerctxluafile{publ-aut}{1.001} \registerctxluafile{publ-usr}{1.001} \registerctxluafile{publ-oth}{1.001} % this could become an option diff --git a/tex/context/base/publ-sor.lua b/tex/context/base/publ-sor.lua new file mode 100644 index 000000000..5f0764472 --- /dev/null +++ b/tex/context/base/publ-sor.lua @@ -0,0 +1,243 @@ +if not modules then modules = { } end modules ['publ-sor'] = { + version = 1.001, + comment = "this module part of publication support", + author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", + copyright = "PRAGMA ADE / ConTeXt Development Team", + license = "see context related readme files" +} + +-- if needed we can optimize this one: chekc if it's detail or something else +-- and use direct access, but in practice it's fast enough + +local type = type +local concat = table.concat +local formatters = string.formatters +local compare = sorters.comparers.basic -- (a,b) + +local publications = publications +local writers = publications.writers + +local variables = interfaces.variables +local v_short = variables.short +local v_default = variables.reference +local v_reference = variables.reference +local v_dataset = variables.dataset + +local report = logs.reporter("publications","sorters") + +local trace_sorters trackers.register("publications.sorters",function(v) trace_sorters = v end) + +-- authors(s) | year | journal | title | pages + +local template = [[ +local type, tostring = type, tostring + +local writers = publications.writers +local datasets = publications.datasets +local getter = publications.getfaster -- (current,data,details,field,categories,types) +local strip = sorters.strip +local splitter = sorters.splitters.utf + +local function newsplitter(splitter) + return table.setmetatableindex({},function(t,k) -- could be done in the sorter but seldom that many shared + local v = splitter(k,true) -- in other cases + t[k] = v + return v + end) +end + +return function(dataset,list,method) -- indexer + local current = datasets[dataset] + local luadata = current.luadata + local details = current.details + local specification = publications.currentspecification + local categories = specification.categories + local types = specification.types + local splitted = newsplitter(splitter) -- saves mem + local snippets = { } -- saves mem + local result = { } + +%helpers% + + for i=1,#list do + -- either { tag, tag, ... } or { { tag, index }, { tag, index } } + local li = list[i] + local tag = type(li) == "string" and li or li[1] + local index = tostring(i) + local entry = luadata[tag] + if entry then + local detail = details[tag] + result[i] = { + index = i, + split = { + +%getters% + + }, + } + else + result[i] = { + index = i, + split = { + +%unknowns% + + }, + } + end + end + return result +end +]] + +local f_getter = formatters["splitted[strip(getter(current,entry,detail,%q,categories,types) or %q)], -- %s"] +local f_writer = formatters["splitted[strip(writer_%s(getter(current,entry,detail,%q,categories,types) or %q,snippets))], -- %s"] +local f_helper = formatters["local writer_%s = writers[%q] -- %s: %s"] +local f_value = formatters["splitted[%q], -- %s"] +local s_index = "splitted[index], -- the order in the list, always added" + +-- there is no need to cache this in specification + +local sharedmethods = { } +publications.sortmethods = sharedmethods + +local function sortsequence(dataset,list,sorttype) + local specification = publications.currentspecification + local types = specification.types + local sortmethods = specification.sortmethods + local method = sortmethods and sortmethods[sorttype] or sharedmethods[sorttype] + local sequence = method and method.sequence + + if not sequence and type(sorttype) == "string" then + local list = utilities.parsers.settings_to_array(sorttype) + if #list > 0 then + sequence = { } + for i=1,#list do + sequence[i] = { field = list[i] } + end + end + if trace_sorters then + report("creating sequence from method %a",sorttype) + end + end + + if sequence then + + local getters = { } + local unknowns = { } + local helpers = { } + + if trace_sorters then + report("initializing method %a",sorttype) + end + + for i=1,#sequence do + local step = sequence[i] + local field = step.field or "?" + local default = step.default or "" + local unknown = step.unknown or "" + local fldtype = types[field] + local writer = fldtype and writers[fldtype] + + if trace_sorters then + report("% 3i : field %a, type %a, default %a, unknown %a",i,field,fldtype,default,unknown) + end + + if writer then + local h = #helpers + 1 + getters[i] = f_writer(h,field,default,field) + helpers[h] = f_helper(h,fldtype,field,fldtype) + else + getters[i] = f_getter(field,default,field) + end + unknowns[i] = f_value(unknown,field) + end + + unknowns[#unknowns+1] = s_index + getters [#getters +1] = s_index + + local code = utilities.templates.replace(template, { + helpers = concat(helpers, "\n"), + getters = concat(getters, "\n"), + unknowns = concat(unknowns,"\n"), + }) + + -- print(code) + + local action, error = loadstring(code) + if type(action) == "function" then + action = action() + end + if type(action) == "function" then + local valid = action(dataset,list,method) + if valid and #valid > 0 then + sorters.sort(valid,compare) + return valid + end + end + else + report("invalid sort method %a",sorttype) + end + +end + +local sorters = { + [v_short] = function(dataset,rendering,list) + local shorts = rendering.shorts + local function compare(a,b) + local aa, bb = a and a[1], b and b[1] + if aa and bb then + aa, bb = shorts[aa], shorts[bb] + return aa and bb and aa < bb + end + return false + end + sort(list,compare) + end, + [v_reference] = function(dataset,rendering,list) + local function compare(a,b) + local aa, bb = a and a[1], b and b[1] + if aa and bb then + return aa and bb and aa < bb + end + return false + end + sort(list,compare) + end, + [v_dataset] = function(dataset,rendering,list) + local function compare(a,b) + local aa, bb = a and a[1], b and b[1] + if aa and bb then + aa, bb = list[aa].index or 0, list[bb].index or 0 + return aa and bb and aa < bb + end + return false + end + sort(list,compare) + end, + [v_default] = function(dataset,rendering,list,sorttype) -- experimental + if sorttype == "" or sorttype == v_default then + local function compare(a,b) + local aa, bb = a and a[3], b and b[3] + if aa and bb then + return aa and bb and aa < bb + end + return false + end + sort(list,compare) + else + local valid = sortsequence(dataset,list,sorttype) + if #valid > 0 then + for i=1,#valid do + local v = valid[i] + valid[i] = list[v.index] + end + return valid + end + end + end +} + +table.setmetatableindex(sorters,function(t,k) return t[v_default] end) + +publications.lists.sorters = sorters diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 6ded1f9a4..8cca48991 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 bb67d0ed5..23b6fa723 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/tabl-ntb.mkiv b/tex/context/base/tabl-ntb.mkiv index 04d4cadbd..77b0be2fa 100644 --- a/tex/context/base/tabl-ntb.mkiv +++ b/tex/context/base/tabl-ntb.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -%D This module as a more modern variant in xtables but as we follow a bit +%D This module has a more modern variant in xtables but as we follow a bit %D different approach with settings there, this mechanism will stay. In fact %D each of them has its advantages. This module could be sped up a bit and made %D more efficient by delegating some housekeeping to \LUA\ but it's not worth @@ -344,6 +344,7 @@ \newif\ifenableTBLbreak \enableTBLbreakfalse \newif\ifmultipleTBLheads \multipleTBLheadsfalse \newif\iftightTBLrowspan \tightTBLrowspantrue +\newif\iftightTBLcolspan \tightTBLcolspantrue \newif\iftraceTABLE \traceTABLEfalse @@ -1514,7 +1515,7 @@ % eigenlijk moet dit alleen als de kolom wordt overspannen door een % vorige, maw extra dubbele loop en status var \ifnum\c_tabl_ntb_encountered_max=\c_tabl_ntb_maximum_col % *nx* bah - \advance\!!counta \plusone % settign maxwidth to a large value also works + \advance\!!counta \plusone % setting maxwidth to a large value also works \fi \fi \fi @@ -1652,6 +1653,10 @@ \unexpanded\def\tabl_ntb_cell_process_x#1#2[#3]#4% {} +% problem: when span doesn't break we can have a span that is the sum of +% cells but still to small .. chicken egg problem ... for that we should +% also have a smallest width run + \unexpanded\def\tabl_ntb_cell_process_a#1#2[#3]#4% grouping added ! ! ! {\bgroup \tabl_ntb_setup_cell{#1}{#2}% @@ -1676,10 +1681,13 @@ \fi \fi \tabl_ntb_spn_doifelse\c_tabl_ntb_col - \donothing - {\ifdim\tabl_ntb_get_wid\c_tabl_ntb_col<\wd\scratchbox + {\iftightTBLcolspan\donefalse\else\donetrue\fi}% + \donetrue + \ifdone + \ifdim\tabl_ntb_get_wid\c_tabl_ntb_col<\wd\scratchbox \tabl_ntb_set_wid\c_tabl_ntb_col{\the\wd\scratchbox}% - \fi}% auto set + \fi + \fi \fi \scratchcounter\numexpr\c_tabl_ntb_row+\plusone\relax \scratchdimen\tabl_ntb_get_hei\scratchcounter\relax diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 3d5443875..523de8fd4 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 : 12/31/14 20:42:33 +-- merge date : 01/01/15 13:15:11 do -- begin closure to overcome local limits and interference |