From cbc37c39432e0ebe38e0922fc6d14c2955ab3ba2 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Tue, 16 May 2017 11:12:18 +0200 Subject: 2017-05-15 21:54:00 --- .../documents/general/columnsets/columnsets.pdf | Bin 4526014 -> 0 bytes doc/context/documents/general/qrcs/setup-cs.pdf | Bin 808528 -> 808550 bytes doc/context/documents/general/qrcs/setup-de.pdf | Bin 809657 -> 809679 bytes doc/context/documents/general/qrcs/setup-en.pdf | Bin 812376 -> 812394 bytes doc/context/documents/general/qrcs/setup-fr.pdf | Bin 806147 -> 806165 bytes doc/context/documents/general/qrcs/setup-it.pdf | Bin 810008 -> 810030 bytes doc/context/documents/general/qrcs/setup-nl.pdf | Bin 806419 -> 806449 bytes doc/context/documents/general/qrcs/setup-ro.pdf | Bin 805215 -> 805241 bytes .../columnsets/columnsets/columnsets-000.tex | 63 - .../columnsets/columnsets/columnsets-001.tex | 17 - .../columnsets/columnsets/columnsets-002.tex | 17 - .../columnsets/columnsets/columnsets-003.tex | 35 - .../columnsets/columnsets/columnsets-004.tex | 32 - .../columnsets/columnsets/columnsets-005.tex | 29 - .../columnsets/columnsets/columnsets-006.tex | 35 - .../columnsets/columnsets/columnsets-007.tex | 43 - .../columnsets/columnsets/columnsets-101.tex | 30 - .../columnsets/columnsets/columnsets-102.tex | 36 - .../columnsets/columnsets/columnsets-103.tex | 37 - .../columnsets/columnsets/columnsets-201.tex | 31 - .../columnsets/columnsets/columnsets-202.tex | 32 - .../columnsets/columnsets/columnsets-203.tex | 29 - .../columnsets/columnsets/columnsets-204.tex | 41 - .../columnsets/columnsets/columnsets-205.tex | 42 - .../columnsets/columnsets/columnsets-206.tex | 29 - .../columnsets/columnsets/columnsets-301.tex | 29 - .../columnsets/columnsets/columnsets-401.tex | 26 - .../columnsets/columnsets/columnsets-402.tex | 24 - .../columnsets/columnsets/columnsets-403.tex | 23 - .../columnsets/columnsets/columnsets-404.tex | 34 - .../columnsets/columnsets/columnsets-405.tex | 29 - .../columnsets/columnsets/columnsets-601.tex | 29 - .../columnsets/columnsets/columnsets-701.tex | 23 - .../columnsets/columnsets/columnsets-702.tex | 27 - .../columnsets/columnsets/columnsets-703.tex | 34 - .../columnsets/columnsets/columnsets-704.tex | 69 - .../columnsets/columnsets/columnsets-801.tex | 19 - .../columnsets/columnsets/columnsets-802.tex | 22 - .../columnsets/columnsets/columnsets-803.tex | 26 - .../columnsets/columnsets/columnsets-804.tex | 26 - .../columnsets/columnsets/columnsets-805.tex | 26 - .../columnsets/columnsets/columnsets-806.tex | 26 - .../columnsets/columnsets/columnsets-901.tex | 38 - .../columnsets/columnsets/columnsets-902.tex | 38 - .../columnsets/columnsets/columnsets-903.tex | 41 - .../general/columnsets/columnsets/columnsets.tex | 873 -- .../general/manuals/languages/languages-back.tex | 14 - .../manuals/languages/languages-contents.tex | 13 - .../general/manuals/languages/languages-cover.tex | 133 - .../general/manuals/start/cont-en-extra.xml | 749 -- .../manuals/start/graphics/fig-page-areas-en.md | 830 -- .../start/graphics/fig-page-parameters-en.md | 1371 --- fonts/fea/context/greek-babel.fea | 294 - fonts/fea/context/test-features.fea | 20 - fonts/fea/context/texhistoric.fea | 42 - fonts/fea/context/verbose-digits.fea | 36 - scripts/context/lua/mtx-mtxworks.lua | 14 - scripts/context/stubs/mswin/mtxworks.exe | Bin 4608 -> 0 bytes scripts/context/stubs/unix/mtxworks | 2 - scripts/context/stubs/win64/mtxworks.exe | Bin 15360 -> 0 bytes tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/font-ext.lua | 49 + tex/context/base/mkiv/font-gds.lua | 899 -- tex/context/base/mkiv/font-map.lua | 33 +- tex/context/base/mkiv/font-ocl.lua | 2 +- tex/context/base/mkiv/font-otj.lua | 35 +- tex/context/base/mkiv/font-ots.lua | 4 +- tex/context/base/mkiv/font-tmp.lua | 118 - tex/context/base/mkiv/status-files.pdf | Bin 25644 -> 25626 bytes tex/context/base/mkiv/status-lua.pdf | Bin 423833 -> 424885 bytes tex/context/interface/mkii/cont-en.xml | 10396 ------------------- tex/context/interface/mkiv/i-context.pdf | Bin 812376 -> 812394 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 60864 -> 60864 bytes tex/context/modules/common/s-mag-01.tex | 438 - tex/context/modules/common/s-pre-01.tex | 404 - tex/context/modules/common/s-pre-02.tex | 381 - tex/context/modules/common/s-pre-03.tex | 257 - tex/context/modules/common/s-pre-04.tex | 377 - tex/context/modules/common/s-pre-05.tex | 240 - tex/context/modules/common/s-pre-09.tex | 380 - tex/context/modules/common/s-pre-10.tex | 308 - tex/context/modules/common/s-pre-11.tex | 220 - tex/context/modules/common/s-pre-14.tex | 263 - tex/context/modules/common/s-pre-15.tex | 186 - tex/context/modules/common/s-pre-19.tex | 347 - tex/context/modules/common/s-pre-61.tex | 275 - tex/context/modules/common/s-pre-62.tex | 224 - tex/context/modules/common/s-pre-63.tex | 77 - tex/context/modules/common/s-pre-64.tex | 208 - tex/context/modules/common/s-pre-68.tex | 150 - tex/context/modules/mkiv/s-pre-60.mkiv | 212 - tex/context/modules/mkiv/s-pre-69.mkiv | 336 - tex/context/modules/mkiv/s-pre-70.mkiv | 176 - tex/context/modules/mkiv/s-pre-71.lua | 63 - tex/context/modules/mkiv/s-pre-71.mkiv | 170 - tex/generic/context/luatex/luatex-basics-chr.lua | 1420 ++- tex/generic/context/luatex/luatex-basics-nod.lua | 4 +- .../context/luatex/luatex-basics-prepare.tex | 2 + tex/generic/context/luatex/luatex-fonts-merged.lua | 1468 ++- tex/generic/context/luatex/luatex-math.tex | 2 +- 103 files changed, 2977 insertions(+), 22733 deletions(-) delete mode 100644 doc/context/documents/general/columnsets/columnsets.pdf delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-000.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-001.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-002.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-003.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-004.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-005.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-006.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-007.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-101.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-102.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-103.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-201.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-202.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-203.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-204.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-205.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-206.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-301.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-401.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-402.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-403.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-404.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-405.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-601.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-701.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-702.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-703.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-704.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-801.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-802.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-803.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-804.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-805.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-806.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-901.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-902.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets-903.tex delete mode 100644 doc/context/sources/general/columnsets/columnsets/columnsets.tex delete mode 100644 doc/context/sources/general/manuals/languages/languages-back.tex delete mode 100644 doc/context/sources/general/manuals/languages/languages-contents.tex delete mode 100644 doc/context/sources/general/manuals/languages/languages-cover.tex delete mode 100644 doc/context/sources/general/manuals/start/cont-en-extra.xml delete mode 100644 doc/context/sources/general/manuals/start/graphics/fig-page-areas-en.md delete mode 100644 doc/context/sources/general/manuals/start/graphics/fig-page-parameters-en.md delete mode 100644 fonts/fea/context/greek-babel.fea delete mode 100644 fonts/fea/context/test-features.fea delete mode 100644 fonts/fea/context/texhistoric.fea delete mode 100644 fonts/fea/context/verbose-digits.fea delete mode 100644 scripts/context/lua/mtx-mtxworks.lua delete mode 100644 scripts/context/stubs/mswin/mtxworks.exe delete mode 100644 scripts/context/stubs/unix/mtxworks delete mode 100644 scripts/context/stubs/win64/mtxworks.exe delete mode 100644 tex/context/base/mkiv/font-gds.lua delete mode 100644 tex/context/base/mkiv/font-tmp.lua delete mode 100644 tex/context/interface/mkii/cont-en.xml delete mode 100644 tex/context/modules/common/s-mag-01.tex delete mode 100644 tex/context/modules/common/s-pre-01.tex delete mode 100644 tex/context/modules/common/s-pre-02.tex delete mode 100644 tex/context/modules/common/s-pre-03.tex delete mode 100644 tex/context/modules/common/s-pre-04.tex delete mode 100644 tex/context/modules/common/s-pre-05.tex delete mode 100644 tex/context/modules/common/s-pre-09.tex delete mode 100644 tex/context/modules/common/s-pre-10.tex delete mode 100644 tex/context/modules/common/s-pre-11.tex delete mode 100644 tex/context/modules/common/s-pre-14.tex delete mode 100644 tex/context/modules/common/s-pre-15.tex delete mode 100644 tex/context/modules/common/s-pre-19.tex delete mode 100644 tex/context/modules/common/s-pre-61.tex delete mode 100644 tex/context/modules/common/s-pre-62.tex delete mode 100644 tex/context/modules/common/s-pre-63.tex delete mode 100644 tex/context/modules/common/s-pre-64.tex delete mode 100644 tex/context/modules/common/s-pre-68.tex delete mode 100644 tex/context/modules/mkiv/s-pre-60.mkiv delete mode 100644 tex/context/modules/mkiv/s-pre-69.mkiv delete mode 100644 tex/context/modules/mkiv/s-pre-70.mkiv delete mode 100644 tex/context/modules/mkiv/s-pre-71.lua delete mode 100644 tex/context/modules/mkiv/s-pre-71.mkiv diff --git a/doc/context/documents/general/columnsets/columnsets.pdf b/doc/context/documents/general/columnsets/columnsets.pdf deleted file mode 100644 index 0d4e862f1..000000000 Binary files a/doc/context/documents/general/columnsets/columnsets.pdf and /dev/null differ diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf index f16447a53..a3d5d78cf 100644 Binary files a/doc/context/documents/general/qrcs/setup-cs.pdf and b/doc/context/documents/general/qrcs/setup-cs.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf index d7733b4a1..81c15c263 100644 Binary files a/doc/context/documents/general/qrcs/setup-de.pdf and b/doc/context/documents/general/qrcs/setup-de.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf index 27a797b07..9d3fa3314 100644 Binary files a/doc/context/documents/general/qrcs/setup-en.pdf and b/doc/context/documents/general/qrcs/setup-en.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf index fc0f336f6..c3ad68a6b 100644 Binary files a/doc/context/documents/general/qrcs/setup-fr.pdf and b/doc/context/documents/general/qrcs/setup-fr.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf index 935eab1f1..eb563983b 100644 Binary files a/doc/context/documents/general/qrcs/setup-it.pdf and b/doc/context/documents/general/qrcs/setup-it.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf index d99f290f4..3e80d8424 100644 Binary files a/doc/context/documents/general/qrcs/setup-nl.pdf and b/doc/context/documents/general/qrcs/setup-nl.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf index 7f7e85ce9..fc6b0fade 100644 Binary files a/doc/context/documents/general/qrcs/setup-ro.pdf and b/doc/context/documents/general/qrcs/setup-ro.pdf differ diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-000.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-000.tex deleted file mode 100644 index 429a067de..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-000.tex +++ /dev/null @@ -1,63 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\usemodule[visual] -\usemodule[simulate] - -\dontcomplain - -\startenvironment columnsets-000 - -\useMPlibrary[dum] - -\setupbodyfont - [palatino] - -\setuplayout - [grid=yes] - -\setuplayout - [backspace=20mm, - cutspace=15mm, - width=middle, - height=middle] - -\setupsystem - [random=1234] - -\setuppagenumbering - [alternative=doublesided, - location=] - -\setupheadertexts - [pagenumber][right] - [left][pagenumber] - -\setupfootertexts - [\inputfilename] - -\setupfooter - [style=\tttf] - -\setuptolerance - [verytolerant,stretch] - -\definecolor[color-1][.5(red,green)] -\definecolor[color-2][.5(green,blue)] -\definecolor[color-3][.5(blue,red)] -\definecolor[color-4][.5(white,black)] -\definecolor[color-5][.5(white,color-4)] - -\startuniqueMPgraphic{frame} - fill OverlayBox withcolor \MPcolor{color-1} ; -\stopuniqueMPgraphic - -\startuniqueMPgraphic{contrast} - fill OverlayBox withcolor \MPcolor{color-3} ; -\stopuniqueMPgraphic - -\defineoverlay[frame] [\uniqueMPgraphic{frame}] -\defineoverlay[contrast][\uniqueMPgraphic{contrast}] - -\stopenvironment diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-001.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-001.tex deleted file mode 100644 index 689f4e044..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-001.tex +++ /dev/null @@ -1,17 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=2] - -\starttext - -\startcolumnset[example] - - \dorecurse{20}{\fakewords{100}{200}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-002.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-002.tex deleted file mode 100644 index a67dd3161..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-002.tex +++ /dev/null @@ -1,17 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][nleft=3,nright=2,width=5cm] - -\starttext - -\startcolumnset[example] - - \dorecurse{15}{\fakewords{100}{200}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-003.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-003.tex deleted file mode 100644 index eed0286f8..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-003.tex +++ /dev/null @@ -1,35 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=2,page=left] - -\setupbackgrounds[text][background=color,backgroundcolor=color-1] - -\setupcolumnsetstart[example][1][1][2] -\setupcolumnsetstart[example][1][2][4] -\setupcolumnsetstart[example][2][1][6] -\setupcolumnsetstart[example][2][2][6] -\setupcolumnsetstart[example][3][1][4] -\setupcolumnsetstart[example][3][2][2] - -\setupcolumnsetlines[example][1][1][-2] -\setupcolumnsetlines[example][1][2][-4] -\setupcolumnsetlines[example][2][1][-6] -\setupcolumnsetlines[example][2][2][-6] -\setupcolumnsetlines[example][3][1][-4] -\setupcolumnsetlines[example][3][2][-2] -\setupcolumnsetlines[example][4][1][4] -\setupcolumnsetlines[example][4][2][10] - -\starttext - -\startcolumnset[example] - - \dorecurse{20}{\fakewords{100}{200}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-004.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-004.tex deleted file mode 100644 index a58ddf621..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-004.tex +++ /dev/null @@ -1,32 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=3,page=left] - -\definecolor[fakerulecolor] - -\definecolumnsetspan[wide] [n=2,background=contrast,color=white] -\definecolumnsetspan[wider][n=4,background=contrast,color=white] - -\starttext - -\startcolumnset[example] - - \startcolumnsetspan[wider] - wider: \dorecurse{2}{#1: \fakewords{25}{50}\par} - \stopcolumnsetspan - - inbetween: \fakewords{25}{50}\par - - \startcolumnsetspan[wide] - wide : \dorecurse{2}{#1: \fakewords{25}{50}\par} - \stopcolumnsetspan - - after: \dorecurse{15}{#1: \fakewords{100}{200}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-005.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-005.tex deleted file mode 100644 index f1d970d9e..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-005.tex +++ /dev/null @@ -1,29 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=3,page=left] - -\definecolumnsetspan[wide][n=2,background=contrast,color=white] - -\definecolor[fakerulecolor] - -\starttext - -\startcolumnset[example] - - \startcolumnsetspan[wide][default=btlr] - - \startsimplecolumns - \dorecurse{2}{\fakewords{25}{40}\par} - \stopsimplecolumns - - \stopcolumnsetspan - - \dorecurse{15}{\fakewords{100}{200}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-006.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-006.tex deleted file mode 100644 index 033619970..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-006.tex +++ /dev/null @@ -1,35 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=3,page=left] - -\definecolor[fakerulecolor] - -\definecolumnsetspan[wide][n=2,background=contrast,color=white] - -\starttext - -\startcolumnset[example] - - \startcolumnsetspan[wide] - \fakewords{25}{50} - \stopcolumnsetspan - - \fakewords{25}{50} - - \startcolumnsetspan[wide] - \fakewords{25}{50} - \stopcolumnsetspan - - \startcolumnsetspan[wide][default=btrl] - \fakewords{25}{50} - \stopcolumnsetspan - - \dorecurse{15}{\fakewords{100}{200}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-007.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-007.tex deleted file mode 100644 index 137a414d9..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-007.tex +++ /dev/null @@ -1,43 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=3,page=left] - -\definecolor[fakerulecolor] - -\definecolumnsetspan[wide][n=2,background=contrast,color=white] - -\starttext - -\startbuffer - - \startcolumnsetspan[wide] - \fakewords{25}{50} - \stopcolumnsetspan - - \fakewords{25}{50} - - \startcolumnsetspan[wide] - \fakewords{25}{50} - \stopcolumnsetspan - - \startcolumnsetspan[wide][default=btrl] - \fakewords{25}{50} - \stopcolumnsetspan - - \dorecurse{3}{\fakewords{100}{200}\par} - -\stopbuffer - -\startcolumnset[example] - - \dorecurse{4}{\getbuffer} - - \dorecurse{5}{\fakewords{100}{200}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-101.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-101.tex deleted file mode 100644 index f9c7b59cb..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-101.tex +++ /dev/null @@ -1,30 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\starttext - -\startbuffer -\fakewords{100}{200} -\placefigure - {} - {\externalfigure[placeholder][width=\columnsetspanwidth{1}]} -\fakewords{100}{200} -\placefigure - {} - {\externalfigure[placeholder][width=\columnsetspanwidth{2}]} -\fakewords{100}{200} -\stopbuffer - -\startcolumnset[example] - - \dorecurse {5}{\getbuffer} - \dorecurse{10}{\fakewords{100}{200}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-102.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-102.tex deleted file mode 100644 index 3cf4dcd0e..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-102.tex +++ /dev/null @@ -1,36 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\starttext - -\startbuffer -\placefigure [tbrl] - {tblr} - {\externalfigure[fake][width=\columnsetspanwidth{1},lines=5]} -\placefigure [fxtb:6*4] - {fxtb} - {\externalfigure[fake][width=\columnsetspanwidth{2},lines=5]} -\placefigure [btlr] - {btlr} - {\externalfigure[fake][width=\columnsetspanwidth{2},lines=5]} -\placefigure [btlr] - {btlr} - {\externalfigure[fake][width=\columnsetspanwidth{3},lines=5]} - -\dorecurse {5} { - \fakewords{100}{200}\par -} -\stopbuffer - -\startcolumnset[example] - - \dorecurse{6}{\getbuffer} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-103.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-103.tex deleted file mode 100644 index f1d4dbedc..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-103.tex +++ /dev/null @@ -1,37 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\starttext - -\startcolumnset[example] - -\useexternalfigure[fake][fake][width=\textwidth,lines=3] - -\placefigure[btlr]{brlr}{\externalfigure[fake]} -\placefigure[btlr]{brlr}{\externalfigure[fake]} -\placefigure[btrl]{btrl}{\externalfigure[fake]} -\placefigure[btrl]{btrl}{\externalfigure[fake]} -\placefigure[tblr]{tblr}{\externalfigure[fake]} -\placefigure[tblr]{tblr}{\externalfigure[fake]} -\placefigure[tbrl]{tbrl}{\externalfigure[fake]} -\placefigure[tbrl]{tbrl}{\externalfigure[fake]} - -\placefigure[lrbt]{lrbt}{\externalfigure[fake]} -\placefigure[lrbt]{lrbt}{\externalfigure[fake]} -\placefigure[lrtb]{lrtb}{\externalfigure[fake]} -\placefigure[lrtb]{lrtb}{\externalfigure[fake]} -\placefigure[rlbt]{rlbt}{\externalfigure[fake]} -\placefigure[rlbt]{rlbt}{\externalfigure[fake]} -\placefigure[rltb]{rltb}{\externalfigure[fake]} -\placefigure[rltb]{rltb}{\externalfigure[fake]} - -\dorecurse{10}{\fakewords{50}{100}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-201.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-201.tex deleted file mode 100644 index 37b26c391..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-201.tex +++ /dev/null @@ -1,31 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\definecolumnsetarea - [one] - [type=both, - x=1,y=1,nx=2,ny=6, - background=contrast, - state=repeat] - -\definecolumnsetarea - [two] - [type=both, - x=4,y=10,nx=1,ny=6, - background=contrast, - state=repeat] - -\starttext - -\startcolumnset[example] - - \dorecurse{40}{\fakewords{50}{100}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-202.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-202.tex deleted file mode 100644 index 1721d9cbc..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-202.tex +++ /dev/null @@ -1,32 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\definecolumnsetarea - [one][left] - [x=1,y=1,nx=2,ny=6, - background=contrast,state=repeat] - -\definecolumnsetarea - [two][right] - [x=3,y=1,nx=2,ny=6, - background=contrast,state=repeat] - -\definecolumnsetarea - [three][both] - [x=2,y=10,nx=2,ny=6, - background=contrast,state=repeat] - -\starttext - -\startcolumnset[example] - - \dorecurse{30}{\fakewords{50}{100}} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-203.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-203.tex deleted file mode 100644 index 6c15578bc..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-203.tex +++ /dev/null @@ -1,29 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\definecolumnsetarea - [one]% [left] - [x=1,y=1,nx=6,ny=6, - background=contrast,state=start] - -\definecolumnsetarea - [two]%[left] - [x=3,y=10,nx=4,ny=6, - background=contrast,state=start] - -\stopsetups - -\starttext - -\startcolumnset[example] - - \dorecurse{25}{\fakewords{50}{100}} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-204.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-204.tex deleted file mode 100644 index d390f468e..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-204.tex +++ /dev/null @@ -1,41 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\usemodule[oldfun] - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\definecolumnsetarea - [title] - [x=1,y=1,nx=8,ny=8, - background=contrast, - color=white, - align={lohi,right}, - state=start] - -\setupcolumnsetareatext - [title] - [\setups{the title}] - -\startsetups[the title] - - \GapText - {\dimexpr\makeupwidth+\backspace\relax} - {6pt} - {RegularBold*default} {sa 4} - {A Title Spanni\+ng 2 Pages} - -\stopsetups - -\starttext - -\startcolumnset[example] - - \dorecurse{30}{\fakewords{50}{100}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-205.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-205.tex deleted file mode 100644 index b53709770..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-205.tex +++ /dev/null @@ -1,42 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\usemodule[oldfun] - -\environment columnsets-000 - -\unprotected \def\SpreadGapText#1#2{{\def\+{\blackrule[\c!width=#1]}#2}} - -\definecolumnset[example][n=4,page=left] - -\definecolumnsetarea - [title] - [x=1,y=1,nx=8,ny=8, - background=contrast, - color=white, - align={lohi,right}, - state=start] - -\setupcolumnsetareatext - [title] - [\setups{the title}] - -\startsetups[the title] - - \GapText - {\dimexpr(\makeupwidth+\backspace)} {6pt} - {RegularBold} {sa 4} - {A Title Spanni\+ng 2 Pages} - -\stopsetups - -\starttext - -\startcolumnset[example] - - \dorecurse{30}{\fakewords{50}{100}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-206.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-206.tex deleted file mode 100644 index 8b9f524b1..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-206.tex +++ /dev/null @@ -1,29 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\definecolumnsetarea - [first] - [x=2,y=4,nx=2,ny=8, - background=contrast, - state=start] - -\definecolumnsetarea - [second] - [x=1,y=20,nx=1,ny=3, - background=contrast, - state=start] - -\starttext - -\startcolumnset[example] - - \dorecurse{50}{\fakewords{50}{100}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-301.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-301.tex deleted file mode 100644 index 4d21f2b02..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-301.tex +++ /dev/null @@ -1,29 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4] - -\starttext - -\startcolumnset[example] - - 1: \fakewords{50}{75} \column - 2: [] \fakewords{50}{75} \column[yes] - 3: [yes] \fakewords{50}{75} \column[page] - \column[page] % redundant - 4: [page] \fakewords{50}{75} \column[3] - 5: [3] \fakewords{50}{75} \column[4] - 6: [4] \fakewords{50}{75} \column[first] - 7: [first] \fakewords{50}{75} \column[last] - 8: [last] \fakewords{50}{75} \page - 9: (page) \fakewords{50}{75} \page - \page % redundant - 10: (page) \fakewords{50}{75} \column[3*5] - 11: [3*5] \fakewords{50}{75} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-401.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-401.tex deleted file mode 100644 index ee91e608c..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-401.tex +++ /dev/null @@ -1,26 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\setupbackgrounds[text][text][background=contrast] - -\definecolor[fakerulecolor][white] - -\setupcolumnset[example:2][distance=36pt] -\setupcolumnset[example:3][distance=72pt] -\setupcolumnset[example:4][distance=24pt] -\setupcolumnset[example:5][distance=48pt] - -\starttext - -\startcolumnset[example] - - \dorecurse{25}{\fakewords{100}{150}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-402.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-402.tex deleted file mode 100644 index 00db6017c..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-402.tex +++ /dev/null @@ -1,24 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\setupbackgrounds[text][text][background=contrast] - -\setupcolumnset[example] [distance=24pt] -\setupcolumnset[example:1][distance=96pt] - -\definecolor[fakerulecolor][white] - -\starttext - -\startcolumnset[example] - - \dorecurse{25}{\fakewords{100}{150}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-403.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-403.tex deleted file mode 100644 index c9bc2e648..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-403.tex +++ /dev/null @@ -1,23 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\setupbackgrounds[text][text][background=contrast] - -\definecolor[fakerulecolor][white] - -\setupcolumnset[example][width=.15\makeupwidth] - -\starttext - -\startcolumnset[example] - - \dorecurse{25}{\fakewords{100}{150}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-404.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-404.tex deleted file mode 100644 index 05a25acfe..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-404.tex +++ /dev/null @@ -1,34 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=3,page=left] - -\setupbackgrounds[text][text][background=contrast] - -\setupcolumnset[frame=on,framecolor=color-4,rulethickness=1mm] - -\definecolor[fakerulecolor][white] - -\setupcolumnset[example:1][width=2cm] -\setupcolumnset[example:2][width=4cm] -\setupcolumnset[example:3][width=3cm] - -\setupcolumnset[example:4][width=3cm] -\setupcolumnset[example:5][width=4cm] -\setupcolumnset[example:6][width=6cm] - -\starttext - -\startcolumnset[example] - -\dorecurse{15}{ - \dorecurse{3}{\fakewords{10}{15}\par} - \column[yes] -} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-405.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-405.tex deleted file mode 100644 index fa20ef34c..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-405.tex +++ /dev/null @@ -1,29 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\setupbackgrounds[text][text][background=contrast] - -\setupcolumnset[frame=on,framecolor=color-4,rulethickness=1mm] - -\definecolor[fakerulecolor][white] - -\setupcolumnset[example:1][width=.3\makeupwidth] - -\starttext - -\startcolumnset[example] - - \fakewords{150}{150} - \column - \fakewords{25}{50} - - \dorecurse{25}{\fakewords{50}{75}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-601.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-601.tex deleted file mode 100644 index b139210f4..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-601.tex +++ /dev/null @@ -1,29 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left,direction=reverse] - -\setupbackgrounds[text][text][background=contrast] - -\definecolor[fakerulecolor][color-1] - -\starttext - -\startcolumnset[example] - - \dorecurse{50}{ - \dontleavehmode - \snaptogrid\hbox - {\scale[height=2.5\lineheight]{\color[white]{#1}}}% - \space - \fakewords{30}{60} - %\simulatewords[n=30,m=60,min=1,max=5,color=color-1,line=yes]\par - \par - } - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-701.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-701.tex deleted file mode 100644 index b2c50cfaf..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-701.tex +++ /dev/null @@ -1,23 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\setupcolumnset - [example] - [background=contrast] - -\definecolor[fakerulecolor][white] - -\starttext - -\startcolumnset[example] - - \dorecurse{30}{\fakewords{50}{100}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-702.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-702.tex deleted file mode 100644 index 5b9a879c1..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-702.tex +++ /dev/null @@ -1,27 +0,0 @@ -content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\setupcolumnset - [example] - [background=contrast, - backgroundoffset=4pt, - frame=on, - framecolor=white, - rulethickness=2pt] - -\definecolor[fakerulecolor][white] - -\starttext - -\startcolumnset[example] - - \dorecurse{30}{\fakewords{50}{100}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-703.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-703.tex deleted file mode 100644 index 549b49f61..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-703.tex +++ /dev/null @@ -1,34 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=4,page=left] - -\definecolumnsetarea - [title][left] - [x=1,y=1,nx=8,ny=8, - background=contrast,state=repeat] - -\setupcolumnsetareatext - [title][left][\setups{cow}] - -\startsetups[cow] - - \externalfigure - [cow.pdf] - [height=15\lineheight, - width=2\dimexpr\makeupwidth+\backspace\relax] - -\stopsetups - -\starttext - -\startcolumnset[example] - - \dorecurse{30}{\fakewords{50}{100}\par} - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-704.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-704.tex deleted file mode 100644 index 7fa6cb313..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-704.tex +++ /dev/null @@ -1,69 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\startuseMPgraphic{mpos:par:columns} - path p ; numeric h ; - for i=1 upto nofmultipars : - p := multipars[i] ; - h := bbheight(p) ; - if multikind[i] = "single" : - fill p topenlarged -.5h - withshademethod "linear" - withshadedirection shadedup - withcolor \MPcolor{color-1} shadedinto white ; - fill p bottomenlarged -.5h - withshademethod "linear" - withshadedirection shadedup - withcolor white shadedinto \MPcolor{color-1} ; - elseif multikind[i] = "first" : - fill p - withshademethod "linear" - withshadedirection shadedup - withcolor \MPcolor{color-2} shadedinto white ; - elseif multikind[i] = "middle" : - fill p topenlarged -.5h - withshademethod "linear" - withshadedirection shadedup - withcolor \MPcolor{color-2} shadedinto white ; - fill p bottomenlarged -.5h - withshademethod "linear" - withshadedirection shadedup - withcolor white shadedinto \MPcolor{color-3} ; - elseif multikind[i] = "last" : - fill p - withshademethod "linear" - withshadedirection shadedup - withcolor white shadedinto \MPcolor{color-3} ; - fi ; - endfor ; -\stopuseMPgraphic - -\definecolumnset - [example] - [n=4, - page=left] - -\definetextbackground - [shade] - [location=paragraph, - mp=mpos:par:columns, - before=\blank, - after=\blank] - -\starttext - -\startcolumnset[example] - - \dorecurse {40} { - \starttextbackground[shade] - \fakewords{10}{200} - \stoptextbackground - \par - } - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-801.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-801.tex deleted file mode 100644 index 1a84f99ab..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-801.tex +++ /dev/null @@ -1,19 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset [example-1] [n=2] -\definecolumnset [example-2] [n=3] - -\starttext \showgrid - - \startcolumnset [example-1] - \dorecurse {1}{\input tufte \par} - \stopcolumnset - \startcolumnset [example-2] - \dorecurse {2}{\input ward \par} - \stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-802.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-802.tex deleted file mode 100644 index a126d0012..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-802.tex +++ /dev/null @@ -1,22 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset [example-1] [n=2,balance=yes] -\definecolumnset [example-2] [n=3,balance=yes] - -\starttext \showgrid - - \setupcolumnsetlines[example-1][1][1] [8] - \setupcolumnsetlines[example-1][1][2][10] - - \startcolumnset [example-1] - \dorecurse {1}{\input tufte \par} - \stopcolumnset - \startcolumnset [example-2] - \dorecurse {2}{\input ward \par} - \stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-803.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-803.tex deleted file mode 100644 index 58a278bb1..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-803.tex +++ /dev/null @@ -1,26 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset [example-1] [n=2,balance=yes] -\definecolumnset [example-2] [n=3,balance=yes] - -\starttext \showgrid - - \setupcolumnsetlines[example-1][1][1] [8] - \setupcolumnsetlines[example-1][1][2][10] - - \setupcolumnsetlines[example-2][1][1][19] - \setupcolumnsetlines[example-2][1][2][18] - \setupcolumnsetlines[example-2][1][3][19] - - \startcolumnset [example-1] - \dorecurse {1}{\input tufte \par} - \stopcolumnset - \startcolumnset [example-2] - \dorecurse {2}{\input ward \par} - \stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-804.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-804.tex deleted file mode 100644 index c2b7a6b1e..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-804.tex +++ /dev/null @@ -1,26 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset [example-1] [n=2,balance=yes] -\definecolumnset [example-2] [n=3,balance=yes] - -\starttext \showgrid - - \setupcolumnsetlines[example-1][1][1] [8] - \setupcolumnsetlines[example-1][1][2][10] - - \setupcolumnsetlines[example-2][1][1] [0] - \setupcolumnsetlines[example-2][1][2][-2] - \setupcolumnsetlines[example-2][1][3] [0] - - \startcolumnset [example-1] - \dorecurse {1}{\input tufte \par} - \stopcolumnset - \startcolumnset [example-2] - \dorecurse {6}{\input ward \par} - \stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-805.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-805.tex deleted file mode 100644 index fc80e7e9c..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-805.tex +++ /dev/null @@ -1,26 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset [example-1] [n=2,balance=yes] -\definecolumnset [example-2] [n=3,balance=yes] - -\starttext \showgrid - - \setupcolumnsetlines[example-1][1][1] [8] - \setupcolumnsetlines[example-1][1][2][10] - - \setupcolumnsetstart[example-2][1][1][19] - \setupcolumnsetstart[example-2][1][2][17] - \setupcolumnsetstart[example-2][1][3][19] - - \startcolumnset [example-1] - \dorecurse {1}{\input tufte \par} - \stopcolumnset - \startcolumnset [example-2] - \dorecurse {2}{\input ward \par} - \stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-806.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-806.tex deleted file mode 100644 index 0322a336f..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-806.tex +++ /dev/null @@ -1,26 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset [example-1] [n=2,balance=yes] -\definecolumnset [example-2] [n=3,balance=yes] - -\starttext \showgrid - - \setupcolumnsetlines[example-1][1][1] [8] - \setupcolumnsetlines[example-1][1][2][10] - - \setupcolumnsetstart[example-2][1][1][29] - \setupcolumnsetstart[example-2][1][2][29] - \setupcolumnsetstart[example-2][1][3][29] - - \startcolumnset [example-1] - \dorecurse {1}{\input tufte \par} - \stopcolumnset - \startcolumnset [example-2] - \dorecurse {2}{\input ward \par} - \stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-901.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-901.tex deleted file mode 100644 index 300458bf5..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-901.tex +++ /dev/null @@ -1,38 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=2,page=left,distance=1cm] - -\setupcolumnset - [example] - [background=contrast] - -\definecolor[fakerulecolor][white] \faketriggertrue - -\setuphead - [section] - [style=\bfd] - -\setuplinenumbering - [style=bold, - distance=0pt, - align=inner] - -\starttext - -\startcolumnset[example] - - \dorecurse{30}{ - \startsection[title=foo #1] - \startlinenumbering - \fakewords{50}{100}\par - \stoplinenumbering - \stopsection - } - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-902.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-902.tex deleted file mode 100644 index fda2969af..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-902.tex +++ /dev/null @@ -1,38 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=3,page=left,distance=1cm] - -\setupcolumnset - [example] - [background=contrast] - -\definecolor[fakerulecolor][white] \faketriggertrue - -\setuphead - [section] - [style=\bfd] - -\setuplinenumbering - [style=bold, - distance=0pt, - align=inner] - -\starttext - -\startcolumnset[example] - - \dorecurse{30}{ - \startsection[title=foo #1] - \startlinenumbering - \fakewords{50}{100}\par - \stoplinenumbering - \stopsection - } - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets-903.tex b/doc/context/sources/general/columnsets/columnsets/columnsets-903.tex deleted file mode 100644 index 68cd31ae2..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets-903.tex +++ /dev/null @@ -1,41 +0,0 @@ -% content=tex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\environment columnsets-000 - -\definecolumnset[example][n=3,page=left,distance=1cm] - -\setupcolumnset - [example] - [background=contrast] - -\definecolor[fakerulecolor][white] \faketriggertrue - -\setupblank - [line] - -\setuphead - [section] - [style=\bfd] - -\setuplinenumbering - [style=bold, - distance=0pt, - align=inner] - -\starttext - -\startcolumnset[example] - - \dorecurse{30}{ - \startsection[title=foo #1] - \startlinenumbering - \fakewords{50}{100}\par - \stoplinenumbering - \stopsection - } - -\stopcolumnset - -\stoptext diff --git a/doc/context/sources/general/columnsets/columnsets/columnsets.tex b/doc/context/sources/general/columnsets/columnsets/columnsets.tex deleted file mode 100644 index 7d68872ef..000000000 --- a/doc/context/sources/general/columnsets/columnsets/columnsets.tex +++ /dev/null @@ -1,873 +0,0 @@ -% engine=luatex -% -% copyright=pragma-ade readme=readme.pdf licence=cc-by-nc-sa - -\dontcomplain - -\definepagebreak[mine][yes] - -% A complete otf optima pack is too expensive for this (I only have the -% type one set). -% -% \usetypescriptfile -% [type-ghz] -% -% \usetypescript -% [sans] -% [optima-nova] -% -% \setupbodyfont -% [optima-nova,11pt] -% -% \definefont[QuiteLarge][SansBold sa 3] -% \definefont[NotSoLarge][SansBold sa 1.5] -% -% So we could use: -% -% \setupbodyfont -% [pagella,11pt] -% -% \definefont[QuiteLarge][Bold sa 2.50] -% \definefont[NotSoLarge][Bold sa 1.25] -% -% But this one has a matching sans: - -\setupbodyfont - [dejavu,11pt] - -\definefont[QuiteLarge][SansBold sa 2.50] -\definefont[NotSoLarge][SansBold sa 1.25] - -\setuplayout - [backspace=.1\paperwidth, - topspace=.025\paperheight, - header=0.025\paperheight, - footer=0.025\paperheight, - headerdistance=0.025\paperheight, - footerdistance=0.025\paperheight, - width=middle, - height=middle] - -\setuppagenumbering - [alternative=doublesided, - location=] - -\setupwhitespace - [line] - -\setupblank - [line] - -\setuptyping - [blank=halfline] - -\startsetups [pagenumber] - \hbox to .2\paperwidth { - \hss - Page \pagenumber - \hss - } -\stopsetups - -\setupfooter [before=\vfill,after=\vfill,style=\bf,color=color-4] -\setupheader [before=\vfill,after=\vfill,style=\bf,color=color-4] - -\setupfootertexts [] [\setups{pagenumber}] -\setupheadertexts [] [\setups{chapterhead}] - -\startsetups [chapterhead] - \hbox to .2\paperwidth { - \hss - \getmarking[chapter] - \hss - } -\stopsetups - -\setuphead - [chapter] - [header=empty] - -\definecolor[color-1][.5(red,green)] -\definecolor[color-2][.5(green,blue)] -\definecolor[color-3][.5(blue,red)] -\definecolor[color-4][.5(white,black)] -\definecolor[color-5][.5(white,color-4)] -\definecolor[color-6][.2(white,color-4)] - -\startuseMPgraphic{page} -StartPage ; - path p ; - numeric n; n := PageNumber ; - numeric w; w := bbwidth(Page) ; - numeric h; h := bbheight(Page) ; - def DrawBit (expr bit, dx, dy) = - path p ; p := unitsquare xyscaled(w/5,h/40) shifted (dx*w/10,dy*(h-h/40)) ; - if n div bit > 0 : - n := n - (n div bit)*bit ; - fill p withcolor \MPcolor{color-1} ; - else : - fill p withcolor \MPcolor{color-2} ; - fi ; - enddef ; - DrawBit(32,7,1) ; - DrawBit(16,4,1) ; - DrawBit( 8,1,1) ; - DrawBit( 4,7,0) ; - DrawBit( 2,4,0) ; - DrawBit( 1,1,0) ; -StopPage ; -\stopuseMPgraphic - -\startuniqueMPgraphic{frame} - fill OverlayBox withcolor \MPcolor{color-5} ; -\stopuniqueMPgraphic - -\startuniqueMPgraphic{contrast} - fill OverlayBox withcolor \MPcolor{color-4} ; -\stopuniqueMPgraphic - -\defineoverlay[page] [\useMPgraphic{page}] -\defineoverlay[frame] [\useMPgraphic{frame}] -\defineoverlay[contrast][\useMPgraphic{contrast}] - -\setupexternalfigures - [background=frame] - -\definecombination - [sixpages] - [%inbetween=\blank, - style=mono, - distance=.5\bodyfontsize, - width=\textwidth] - -\definecombination - [fourpages] - [%inbetween=\blank, - style=mono, - distance=.5\bodyfontsize, - width=\textwidth] - -\definecombination - [twopages] - [style=mono] - -\definemeasure[twopages] [\dimexpr\dimexpr\textwidth-3 \bodyfontsize\relax/4\relax] -\definemeasure[fourpages] [\dimexpr\dimexpr\textwidth-3 \bodyfontsize\relax/4\relax] -\definemeasure[eightpages][\dimexpr\dimexpr\textwidth-3 \bodyfontsize\relax/4\relax] -\definemeasure[sixpages] [\dimexpr\dimexpr\textwidth-2.5\bodyfontsize\relax/6\relax] - -\starttexdefinition unexpanded OnePage #1 - \startlinecorrection[blank] - \startcombination[twopages][1*1] - {\typesetfile[#1.tex][page=1,lines=15]} {1} - \stopcombination - \stoplinecorrection -\stoptexdefinition - -\starttexdefinition unexpanded OneSpread #1 - \startlinecorrection[blank] - \startcombination[twopages][1*1] - {\typesetfile[#1.tex][page=2,lines=15]} {2} - \stopcombination - \stoplinecorrection -\stoptexdefinition - -\starttexdefinition unexpanded TwoPages #1 - \startlinecorrection[blank] - \startcombination[twopages][2*1] - {\typesetfile[#1.tex][page=1,width=\measure{twopages}]} {1} - {\typesetfile[#1.tex][page=2,width=\measure{twopages}]} {2} - \stopcombination - \stoplinecorrection -\stoptexdefinition - -\starttexdefinition unexpanded TwoSpread #1 - \startlinecorrection[blank] - \startcombination[twopages][2*1] - {\typesetfile[#1.tex][page=2,width=\measure{twopages}]} {2} - {\typesetfile[#1.tex][page=3,width=\measure{twopages}]} {3} - \stopcombination - \stoplinecorrection -\stoptexdefinition - -\starttexdefinition unexpanded FourPages #1 - \startlinecorrection[blank] - \startcombination[fourpages][4*1] - {\typesetfile[#1.tex][page=1,width=\measure{fourpages}]} {1} - {\typesetfile[#1.tex][page=2,width=\measure{fourpages}]} {2} - {\typesetfile[#1.tex][page=3,width=\measure{fourpages}]} {3} - {\typesetfile[#1.tex][page=4,width=\measure{fourpages}]} {4} - \stopcombination - \stoplinecorrection -\stoptexdefinition - -\starttexdefinition unexpanded FourSpread #1 - \startlinecorrection[blank] - \startcombination[fourpages][4*1] - {\typesetfile[#1.tex][page=2,width=\measure{fourpages}]} {2} - {\typesetfile[#1.tex][page=3,width=\measure{fourpages}]} {3} - {\typesetfile[#1.tex][page=4,width=\measure{fourpages}]} {4} - {\typesetfile[#1.tex][page=5,width=\measure{fourpages}]} {5} - \stopcombination - \stoplinecorrection -\stoptexdefinition - -\starttexdefinition unexpanded SixPages #1 - \startlinecorrection[blank] - \startcombination[sixpages][6*1] - {\typesetfile[#1.tex][page=1,width=\measure{sixpages}]} {1} - {\typesetfile[#1.tex][page=2,width=\measure{sixpages}]} {2} - {\typesetfile[#1.tex][page=3,width=\measure{sixpages}]} {3} - {\typesetfile[#1.tex][page=4,width=\measure{sixpages}]} {4} - {\typesetfile[#1.tex][page=5,width=\measure{sixpages}]} {5} - {\typesetfile[#1.tex][page=6,width=\measure{sixpages}]} {6} - \stopcombination - \stoplinecorrection -\stoptexdefinition - -\starttexdefinition unexpanded SixSpread #1 - \startlinecorrection[blank] - \startcombination[sixpages][6*1] - {\typesetfile[#1.tex][page=2,width=\measure{sixpages}]} {2} - {\typesetfile[#1.tex][page=3,width=\measure{sixpages}]} {3} - {\typesetfile[#1.tex][page=4,width=\measure{sixpages}]} {4} - {\typesetfile[#1.tex][page=5,width=\measure{sixpages}]} {5} - {\typesetfile[#1.tex][page=6,width=\measure{sixpages}]} {6} - {\typesetfile[#1.tex][page=7,width=\measure{sixpages}]} {7} - \stopcombination - \stoplinecorrection -\stoptexdefinition - -\starttexdefinition unexpanded EightPages #1 - \startlinecorrection[blank] - \startcombination[fourpages][4*2] - {\typesetfile[#1.tex][page=1,width=\measure{eightpages}]} {#1 / 1} - {\typesetfile[#1.tex][page=2,width=\measure{eightpages}]} {#1 / 2} - {\typesetfile[#1.tex][page=3,width=\measure{eightpages}]} {#1 / 3} - {\typesetfile[#1.tex][page=4,width=\measure{eightpages}]} {#1 / 4} - {\typesetfile[#1.tex][page=5,width=\measure{eightpages}]} {#1 / 5} - {\typesetfile[#1.tex][page=6,width=\measure{eightpages}]} {#1 / 6} - {\typesetfile[#1.tex][page=7,width=\measure{eightpages}]} {#1 / 7} - {\typesetfile[#1.tex][page=8,width=\measure{eightpages}]} {#1 / 8} - \stopcombination - \stoplinecorrection -\stoptexdefinition - -\starttexdefinition unexpanded EightSpread #1 - \startlinecorrection[blank] - \startcombination[fourpages][4*2] - {\typesetfile[#1.tex][page=2,width=\measure{eightpages}]} {#1 / 2} - {\typesetfile[#1.tex][page=3,width=\measure{eightpages}]} {#1 / 3} - {\typesetfile[#1.tex][page=4,width=\measure{eightpages}]} {#1 / 4} - {\typesetfile[#1.tex][page=5,width=\measure{eightpages}]} {#1 / 5} - {\typesetfile[#1.tex][page=6,width=\measure{eightpages}]} {#1 / 6} - {\typesetfile[#1.tex][page=7,width=\measure{eightpages}]} {#1 / 7} - {\typesetfile[#1.tex][page=8,width=\measure{eightpages}]} {#1 / 8} - {\typesetfile[#1.tex][page=9,width=\measure{eightpages}]} {#1 / 9} - \stopcombination - \stoplinecorrection -\stoptexdefinition - -\setuphead - [chapter] - [style=\QuiteLarge, - color=color-3, - number=no] - -\setuplist - [chapter] - [command=\MyListCommand, - alternative=command] - -\starttexdefinition unexpanded MyListCommand #1#2#3 - \snaptogrid - [line,-line]\vbox { - \tfb - \setstrut - \strut#2 - \quad#3 - } -\stoptexdefinition - -\setupmargindata - [style=\tttf, - color=color-3] - -\starttexdefinition unexpanded ShowFile #1 - \margintext - {\cldcontext{string.match("#1","\letterpercent d+")}} - \typefile - [range={environment}] - {#1} -\stoptexdefinition - -% \typefile[range=4] {...} -% \typefile[range={=}]{...} % start after comment lines - -\starttexdefinition unexpanded ShowEnvironmentFile #1 - \margintext - {\cldcontext{string.match("#1","\letterpercent d+")}} - \typefile - [range={=startenvironment}] - {#1} -\stoptexdefinition - -\startdocument - -\startMPpage -StartPage ; - path p ; numeric w, h, d ; picture q ; - if true : - q := image(draw textext.urt("\ssbf COLUMNS") withcolor \MPcolor{color-6}) ; - else : - q := image(draw textext.urt("\ssbf COLUMNSETS") withcolor \MPcolor{color-6}) ; - fi ; - w := bbwidth(Page) ; - h := bbheight(Page) ; - d := h/100 ; - fill Page withcolor \MPcolor{color-1} ; - p := Page xysized (w,d) ; - for i := 5d step 2d until h-5d : - fill p shifted (0,i) withcolor \MPcolor{color-2} ; - endfor - p := Page xysized(w/10,h) ; - for i = 0, .3, .6, .9 : - fill p shifted (i*w,0) withcolor \MPcolor{color-1} withtransparency(1,.75) ; - endfor ; - def do_it(expr sz, sh) = - p := Page xysized sz ; - fill p shifted sh withcolor \MPcolor{color-3} withtransparency(1,.5) ; - draw q xysized (bbwidth(p),bbheight(p)) shifted sh ; - enddef ; - if true : - do_it ((2w/10,17d),(.1w,20d)) ; - do_it ((2w/10,15d),(.1w,56d)) ; - do_it ((2w/10,21d),(.4w,66d)) ; - do_it ((2w/10,13d),(.7w,38d)) ; - do_it ((5w/10,13d),(.4w,13d)) ; - draw textext.urt("\ssbf Hans Hagen") - xysized (5w/10,5d) - shifted (.4w,6d) - withcolor \MPcolor{color-5} ; - else : - do_it ((2w/10,17d),(.1w,15d)) ; - do_it ((2w/10,15d),(.1w,51d)) ; - do_it ((2w/10,21d),(.4w,61d)) ; - do_it ((2w/10,13d),(.7w,31d)) ; - do_it ((5w/10,13d),(.4w, 7d)) ; - fi ; -StopPage ; -\stopMPpage - -\page[empty] \setuppagenumber[number=1] - -\setupbackgrounds - [page] - [background=page] - -\starttitle[title=Contents] - - \placelist[chapter] - -\stoptitle - -\startchapter[title=Introduction] - -This manual introduces {\em column sets}, one of the output routines of \CONTEXT. -Although column sets are mainly meant for typesetting journals in a -semi||automated way, you can also use them for books. We assume that the user is -familiar with \CONTEXT\ and only discuss the commands that are related to column -sets. - -This mechanism performs okay but it needs to be used with care: an occasional -manual intervention is needed to get optimal results. After all, we're operating -in the area where normally click and point desktop publishing is used. - -{\bf For the moment you need to load the new code with: \type{\usemodule[newcolumnsets]}} - -\startlines -Hans Hagen -PRAGMA ADE -Hasselt, 2003\endash2016 -\stoplines - -\stopchapter - -\startchapter[title=Basics] - -As soon as enough content is collected to build a page, \TEX\ will invoke the -output routine. This is not a fixed piece of code, but a collection of macro -calls. The default output routine is a meant for typesetting a single column, as -in this document. A multi||column output routine is available as well. This -routine mixes well with the single column one, and is activated by: - -\starttyping -\startcolumns -some text ... -\stopcolumns -\stoptyping - -In \MKIV\ a new mixed column mechanism has been introduced that will be -developped further and eventually replace the old multi column handler. In \MKII\ -there is also a columnset mechanism that can be used to construct complex multi -column pages. In \MKIV\ this gets replaced by grid columns. All these multi -column mechanisms have in common that the output routine is more complex because -now a page is in fact a collection of pages wrapped onto one. Each column is -(from \TEX's perspective) similar to a one narrow column page. Here we focus on -columnsets (page grids). - -There are some limitations to what you can do with this kind of multi columns, -which is why we have a third routine at out disposal: {\em column sets}. This -routine can be used for rather complex layouts with graphics all over the place, -and text spanning columns or even spreads. There are of course some shortcomings, -which we will discuss later. - -In the examples that follow we use the following style to set up the layout. The -number in the margin serves a reference to the file where this snippet of \TEX\ -is stored. - -\ShowEnvironmentFile{columnsets-000} - -\page[mine] - -Before we will demonstrate more complex layouts, we will introduce a few -features. In the next series of examples we use fake text. You can enlarge the -pages in your viewer if you want to see more detail. - -\FourSpread{columnsets-001} - -These pages were typeset with the following code: - -\ShowFile{columnsets-001} - -We will showmost examples on a spread, so we don't show a first page. On a -spread like above we number columns from~1 to~4, which in practice means that in -this case columns starting on right page start with column~3! - -\SixPages{columnsets-001} - -\page[mine] - -The number of columns is not fixed to two. You can even have a different number -of columns on left and right pages. - -\FourSpread{columnsets-002} - -This time the input is: - -\ShowFile{columnsets-002} - -Again, we started on a right page but showed the spreads. You can see it from the -positioning of the header texts. - -\SixPages{columnsets-002} - -\page[mine] - -In order to get the balancing you want, you can manually influence the height of -a column. - -\FourSpread{columnsets-003} - -When you set the number of column lines to a positive value, that will be the -number of lines. A negative value will be subtracted from the maximum number of -lines. - -\ShowFile{columnsets-003} - -\page[mine] - -In articles you may want to let the introduction span multiple columns. A column -span is defined independent of a column set and shows up as follows: - -\FourSpread{columnsets-004} - -Here we've given the span a background so that it stands out. - -\ShowFile{columnsets-004} - -\page[mine] - -A column span can be positioned like any graphic. Later we will discuss the -placement options in more detail, for the moment all you need to know is that -\type {btlr} tells \CONTEXT\ to place the graphic in the left bottom of the the -text area. - -\FourSpread{columnsets-005} - -Here we pass the \type {default} placement as parameter to the span, but you can -also set it at definition time. We use a brute force simple column splitter to -fake columns inside the span. - -\ShowFile{columnsets-005} - -\page[mine] - -You are not limited to one column span. In this sense a span is like a graphic: -as long as there is room, it will be placed where you want it to be placed. The -main difference between a span and a graphic is that a span expects text and -tries to align the baselines with the rest of the text. In many ways a column -span behaves like a framed text. - -\FourSpread{columnsets-006} - -This time we flushed one of the spans from bottom to top, starting at the right -edge: \type {btrl}. - -\ShowFile{columnsets-006} - -\page[mine] - -Column spans are treated like graphics, which means that they will float if -needed. In the process, the width is limited to the available space, which in -some cases may lead to a smaller span than you may expect. Think of a column -span, calculated (and prepared) in the last column and ending up on the next page -in the first column, where a broader span would have been possible. - -\FourSpread{columnsets-007} - -\ShowFile{columnsets-007} - -\stopchapter - -\startchapter[title=Graphics] - -Most documents have graphics, and therefore column sets can contain them. The -main thing that you have to keep in mind when placing graphics, is that column -sets are based on grids. Therefore spacing around graphics is also grid based. - -\FourSpread{columnsets-101} - -\ShowFile{columnsets-101} - -\page[mine] - -You can tell \CONTEXT\ where it should place the graphic, but this will only be -honored when there is still place. - -\EightSpread{columnsets-102} - -The prefered location is passed as a four character directive: - -\ShowFile{columnsets-102} - -\page[mine] - -The following directives are available: - -\starttabulate[|lT|p|] -\NC btlr \NC flush from bottom to top and left to right \NC \NR -\NC btrl \NC flush from bottom to top and right to left \NC \NR -\NC tblr \NC flush from top to bottom and left to right \NC \NR -\NC tbrl \NC flush from top to bottom and right to left \NC \NR -\NC lrbt \NC flush from left to right and bottom to top \NC \NR -\NC lrtb \NC flush from left to right and top to bottom \NC \NR -\NC rlbt \NC flush from right to left and bottom to top \NC \NR -\NC rltb \NC flush from right to left and top to bottom \NC \NR -\NC here \NC try to place the graphic here \NC \NR -\NC fixd \NC force the graphic here and don't float \NC \NR -\NC fxtb:c*r \NC place the graphic at (c,r) or lower if needed \NC \NR -\NC fxbt:c*r \NC place the graphic at (c,r) or higher if needed \NC \NR -\NC tops \NC place the graphic at the top of the page \NC \NR -\NC bots \NC place the graphic at the bottom of the page \NC \NR -\NC page \NC place the graphic at a separate page \NC \NR -\stoptabulate - -In the next example we show the directional locations: - -\OneSpread{columnsets-103} - -\ShowFile{columnsets-103} - -\stopchapter - -\startchapter[title=Areas] - -So far we have seen texts and graphics that span multiple columns using span -commands and floats placement commands. We have also seen that you can define a -different number of columns for left and right pages. Now that we have arrives at -column areas you will see how we can span information over not only a page but -also over pages in a spread. - -\FourSpread{columnsets-201} - -Being a framed text, by default an area is aligned at the baseline. You can lower -an area by setting the \type {location} to \type {depth}. - -\ShowFile{columnsets-201} - -\page[mine] - -You can position areas on the left, right or next page or on both pages. When you -set \type {state} to \type {repeat}, an area is repeated, otherwise it is only -placed once. - -\FourSpread{columnsets-202} - -Here we just repeat the areas. Normally this only make sense when the content is -worth repeating. - -\ShowFile{columnsets-202} - -\page[mine] - -Areas can span a spread, as is demonstrated in the next example. - -\FourSpread{columnsets-203} - -\ShowFile{columnsets-203} - -\page[mine] - -An application of a spread area is a title. In the next example we show two -spread pages. - -\FourSpread{columnsets-204} - -Watch how we explicitly go to a left page. - -\ShowFile{columnsets-204} - -\page[mine] - -The \type {\GapText} macro is an experimental fun macro and is used to make sure -that we don't end up with a clipped character. - -\startlinecorrection[blank] -\startcombination - {\scale[width=.4\textwidth]{\clip - [nx=2,ny=6,x=2,y=2] - {\typesetfile[columnsets-204.tex][page=2]}}} - {left page} - {\scale[width=.4\textwidth]{\clip - [nx=2,ny=6,x=1,y=2] - {\typesetfile[columnsets-204.tex][page=3]}}} - {right page} -\stopcombination -\stoplinecorrection - -This is a typical example of the kind of optimizations that are needed when you -make documents of styles with text that spans a spread. In the next clip we -visualize the gap. - -\startlinecorrection[blank] -\startcombination - {\scale[width=.4\textwidth]{\clip - [nx=2,ny=6,x=2,y=2] - {\typesetfile[columnsets-205.tex][page=2]}}} - {left page} - {\scale[width=.4\textwidth]{\clip - [nx=2,ny=6,x=1,y=2] - {\typesetfile[columnsets-205.tex][page=3]}}} - {right page} -\stopcombination -\stoplinecorrection - -At some moment you may want to set up an area in advance as we have done in the -following example. - -\FourSpread{columnsets-206} - -The \type {page} key is used to specify the page in the column set that the area -should go into. Column set pages start numbering at~1. The \type {fixed} stands -for left or right, whatever comes first. - -\ShowFile{columnsets-206} - -\stopchapter - -\startchapter[title=Columns] - -You can use \type {\page} to go to a new page in a column set. Likewise you can -use \type {\column} to force a column break. - -\FourPages{columnsets-301} - -This example demonstrates that you can supply \type {\column} with explicit -directives. - -\ShowFile{columnsets-301} - -You can use \type {\column[page]} as an alternative for \type {\page}. - -\stopchapter - -\startchapter[title=Details] - -This chapter will cover a couple of cosmetic details of column sets. {\em Some -features need to be improved, especially in combination with areas, graphics and -alike. We will also provide side floats etc.} - -\FourSpread{columnsets-401} - -You can set the distance between columns for each pair of columns. {\em Todo: -left and right page distances and margins.} - -\ShowFile{columnsets-401} - -\page[mine] - -When you can the distance of the first column as well. This creates a margin. - -\FourSpread{columnsets-402} - -This time we used equal distances: - -\ShowFile{columnsets-402} - -\page[mine] - -The width of columns is normally calculated automatically, but you can also set -the width explicitly: - -\FourSpread{columnsets-403} - -In code: - -\ShowFile{columnsets-403} - -\page[mine] - -For special effects, you can set the width per column. In that case you need to -be aware of the fact that \TEX\ works its way through the document per paragraph. -Changing the width halfway a paragraph is possible but will affect the whole -paragraph. Therefore, this feature works best when you also goto the next column -explicitly. - -\FourSpread{columnsets-404} - -In code: - -\ShowFile{columnsets-404} - -\page[mine] - -If you really want to change the width in the middle of a paragraph, you can do a -trial run and include a breakpoint at the palce where you want it to occur: - -\FourSpread{columnsets-405} - -In the second spread you see how the narrow hsize carries on in the wider -column. A \type {\column} command will synchronize the hsize. - -\ShowFile{columnsets-405} - -% \page[mine] - -\stopchapter - -\startchapter[title=Directions] - -\FourSpread{columnsets-601} - -The direction of flushing columns is determined by the \type {direction} -parameters as demonstrated below. - -\ShowFile{columnsets-601} - -% \page[mine] - -\stopchapter - -\startchapter[title=Backgrounds] - -As with many \CONTEXT\ components, column sets can have backgrounds. - -\FourSpread{columnsets-701} - -Watch how we use the \type {each} keyword to tell \CONTEXT\ that we want to apply -the background to each column of the set. - -\ShowFile{columnsets-701} - -\page[mine] - -Normally, if you apply backgrounds this way, you will also set the background -offset. In a similar fashion you can apply backgrounds to areas and spans. Such -backgrounds can be a color, or any overlay or layer you want. - -\FourSpread{columnsets-702} - -Here we've set the background offset as well as the frame. - -\ShowFile{columnsets-702} - -\page[mine] - -When dealing with areas, you need to be aware of the fact that they are clipped, -the content as well as the background. - -\FourSpread{columnsets-703} - -De default clip offset is two times the lineheight, except in the binding, where -it is set to zero points. You can set the clip offset with the \type {clipoffset} -parameter. - -\ShowFile{columnsets-703} - -\page[mine] - -The text background mechanism is rather well adapted to column sets. The -following example is a variant on an example shown in the manual titled -{details}. - -\EightSpread{columnsets-704} - -Watch how we adapt the background to the fact and extent that the text spans one -or more columns. - -\ShowFile{columnsets-704} - -Backgrounds that follow the paragraph shape also work ok in column sets. - -{\em todo: an example of a bleeding graphic with column feed back (from -techniek)} - -% \page[mine] - -\stopchapter - -\startchapter[title=Numbering lines] - -\FourSpread{columnsets-901} - -This example shows how numbering lines in columns works out. In a two column -layout the numbers end up in the outer margins by default. If you want you can -set the \type {location} to for instance \type {left} or \type {right}. - -\ShowFile{columnsets-901} - -\page[mine] - -\FourSpread{columnsets-902} - -In a three column setup the numbers end up in the left margins.Make sure you make -the distance large enough. - -\ShowFile{columnsets-902} - -% \page[mine] -% -% \FourSpread{columnsets-903} -% -% This example shows again lune numbers but here we made sure that there is no -% stretch in the whitespace. -% -% \ShowFile{columnsets-903} - -\stopchapter - -% \startchapter[title=Spanning and More] -% -% {\em todo: explanation} \page -% -% \TwoPages{columnsets-801} \ShowFile{columnsets-801} \page[mine] -% \TwoPages{columnsets-802} \ShowFile{columnsets-802} \page[mine] -% \TwoPages{columnsets-803} \ShowFile{columnsets-803} \page[mine] -% \TwoPages{columnsets-804} \ShowFile{columnsets-804} \page[mine] -% \TwoPages{columnsets-805} \ShowFile{columnsets-805} \page[mine] -% \TwoPages{columnsets-806} \ShowFile{columnsets-806} \page[mine] -% -% \stopchapter - -\stopdocument diff --git a/doc/context/sources/general/manuals/languages/languages-back.tex b/doc/context/sources/general/manuals/languages/languages-back.tex deleted file mode 100644 index aadcc3aa4..000000000 --- a/doc/context/sources/general/manuals/languages/languages-back.tex +++ /dev/null @@ -1,14 +0,0 @@ -% \doifmodeelse {simple} { -% -% \page -% \page[empty,left] -% -% \startMPpage -% DrawCoverPage("back") ; -% \stopMPpage -% -% } { -% -% % not needed as it's part of the cover page -% -% } diff --git a/doc/context/sources/general/manuals/languages/languages-contents.tex b/doc/context/sources/general/manuals/languages/languages-contents.tex deleted file mode 100644 index 10fadb56b..000000000 --- a/doc/context/sources/general/manuals/languages/languages-contents.tex +++ /dev/null @@ -1,13 +0,0 @@ -% language=uk - -\startcomponent languages-contents - -\environment languages-environment - -\starttitle[title=Contents][color=darkgray] - -\placelist[chapter][criterium=text] - -\stoptitle - -\stopcomponent diff --git a/doc/context/sources/general/manuals/languages/languages-cover.tex b/doc/context/sources/general/manuals/languages/languages-cover.tex deleted file mode 100644 index 75a033b5f..000000000 --- a/doc/context/sources/general/manuals/languages/languages-cover.tex +++ /dev/null @@ -1,133 +0,0 @@ -% language=uk - -\startcomponent languages-cover - -\environment languages-environment - -\startbuffer[abstract] - -This book explains how we support languages (and -scripts) in \CONTEXT\ \MKIV\ and \LUATEX. Some of -the mechanisms discussed are generic and not -\CONTEXT\ specific. We discuss the way languages are -dealt with in the engine, hyphenation, standard -features and additional goodies. Tracing and the -extensibility of code are also discussed. - -\stopbuffer - -\startsetups document:abstract - \framed [ - foregroundstyle=bold, - foregroundcolor=white, - width=7.5cm, - align={normal,tolerant}, - frame=off, - strut=no, - ] { - \getbuffer[abstract] - } -\stopsetups - -\startMPextensions - - def DrawCoverPage (expr what) = - - begingroup ; - - save SpineWidth ; numeric SpineWidth ; SpineWidth := 8mm ; - save PaperBleed ; numeric PaperBleed ; PaperBleed := 2mm ; % todo - - StartCover ; - - save width, size, anchor ; - - numeric width, size ; pair anchor, offset ; - - color ColorVariant[] ; - - % ColorVariant[1] := \MPcolor{darkred} ; - % ColorVariant[2] := \MPcolor{darkgreen} ; - % ColorVariant[3] := \MPcolor{darkblue} ; - % ColorVariant[4] := \MPcolor{darkyellow} ; - - ColorVariant[1] := \MPcolor{darkmagenta} ; - ColorVariant[2] := \MPcolor{darkorange} ; - ColorVariant[3] := \MPcolor{darkyellow} ; - ColorVariant[4] := \MPcolor{darkcyan} ; - - fill CoverPage enlarged PaperBleed withcolor \MPcolor{darkgray} ; - - fill Spine bottomenlarged -.5CoverHeight withcolor ColorVariant[3] ; - fill Spine topenlarged -.5CoverHeight withcolor ColorVariant[2] ; - - width := FrontPageWidth ; - height := FrontPageHeight ; - size := 4 * width / 3 ; - offset := (-1cm,1cm) ; - anchor := .5[lrcorner CoverPage,urcorner CoverPage] ; - - fill anchored.llft(lltriangle scaled size, urcorner FrontPage) withcolor ColorVariant[1] ; - fill anchored.urt (urtriangle scaled size, llcorner FrontPage) withcolor ColorVariant[2] ; - fill anchored.lrt (lrtriangle scaled size, ulcorner FrontPage) withcolor ColorVariant[3] ; - fill anchored.ulft(ultriangle scaled size, lrcorner FrontPage) withcolor ColorVariant[4] ; - - fill anchored.lrt (lrtriangle scaled size, ulcorner BackPage) withcolor ColorVariant[1] ; - fill anchored.llft(lltriangle scaled size, urcorner BackPage) withcolor ColorVariant[3] ; - fill anchored.ulft(ultriangle scaled size, lrcorner BackPage) withcolor ColorVariant[2] ; - fill anchored.urt (urtriangle scaled size, llcorner BackPage) withcolor ColorVariant[4] ; - - draw thetextext.llft(textext("\bf Languages in \ConTeXt\hskip-.1em") rotated 45 ysized .350height, anchor shifted (6*offset+offset)) withcolor white ; - draw thetextext.llft(textext("\bf explaining luatex and mkiv") rotated 45 ysized .275height, anchor shifted (5*offset+offset)) withcolor white ; - draw thetextext.llft(textext("\bf Hans Hagen") rotated 45 ysized .200height, anchor shifted (2*offset+offset)) withcolor white ; - draw thetextext.llft(textext("\bf PRAGMA ADE") rotated 45 ysized .200height, anchor shifted (1*offset+offset)) withcolor white ; - - % for the moment - - draw thetextext.top(textext("\bf work in progress") xsized 4cm, lrcorner Page shifted (-3cm,1cm)) withcolor white ; - - % till here - - width := BackPageWidth ; - - draw thetextext(textext("\bf\setups[document:abstract]") xsized .65width rotated 45 , center BackPage) withcolor white ; - - anchor := .5[ulcorner Spine,urcorner Spine] shifted (0,-1cm); - - draw thetextext.bot(textext("\bf Languages in \ConTeXt\hskip-.1em") rotated 90 xsized .8SpineWidth, anchor) withcolor white ; - - anchor := .5[llcorner Spine,lrcorner Spine] shifted (0,1cm); - - draw thetextext.top(textext("\bf Hans Hagen") rotated 90 xsized .8SpineWidth, anchor) withcolor white ; - - StopCover ; - - if what = "front" : - clip currentpicture to FrontPage ; - elseif what = "back" : - clip currentpicture to BackPage ; - else : - drawboundary CoverPage ; - fi ; - - endgroup ; - - enddef ; - -\stopMPextensions - -\doifmodeelse {simple} { - - \startMPpage - DrawCoverPage("front") ; - \stopMPpage - -} { - - \startMPpage - DrawCoverPage("cover") ; - \stopMPpage - -} - -\stopcomponent diff --git a/doc/context/sources/general/manuals/start/cont-en-extra.xml b/doc/context/sources/general/manuals/start/cont-en-extra.xml deleted file mode 100644 index 4d41391d0..000000000 --- a/doc/context/sources/general/manuals/start/cont-en-extra.xml +++ /dev/null @@ -1,749 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/doc/context/sources/general/manuals/start/graphics/fig-page-areas-en.md b/doc/context/sources/general/manuals/start/graphics/fig-page-areas-en.md deleted file mode 100644 index b7c0ab5a6..000000000 --- a/doc/context/sources/general/manuals/start/graphics/fig-page-areas-en.md +++ /dev/null @@ -1,830 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%Creator: Mayura Draw, Version 4.3 -%%Title: fig-page-areas-en.md -%%CreationDate: Fri Jan 10 14:38:13 2014 -%%BoundingBox: 8 140 580 700 -%%DocumentFonts: ArialMT -%%+ Arial-BoldMT -%%Orientation: Portrait -%%EndComments -%%BeginProlog -%%BeginResource: procset MayuraDraw_ops -%%Version: 4.3 -%%Copyright: (c) 1993-2003 Mayura Software -/PDXDict 100 dict def -PDXDict begin -% width height matrix proc key cache -% definepattern -\> font -/definepattern { %def - 7 dict begin - /FontDict 9 dict def - FontDict begin - /cache exch def - /key exch def - /proc exch cvx def - /mtx exch matrix invertmatrix def - /height exch def - /width exch def - /ctm matrix currentmatrix def - /ptm matrix identmatrix def - /str - (xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - def - end - /FontBBox [ %def - 0 0 FontDict /width get - FontDict /height get - ] def - /FontMatrix FontDict /mtx get def - /Encoding StandardEncoding def - /FontType 3 def - /BuildChar { %def - pop begin - FontDict begin - width 0 cache { %ifelse - 0 0 width height setcachedevice - }{ %else - setcharwidth - } ifelse - 0 0 moveto width 0 lineto - width height lineto 0 height lineto - closepath clip newpath - gsave proc grestore - end end - } def - FontDict /key get currentdict definefont - end -} bind def - -% dict patternpath - -% dict matrix patternpath - -/patternpath { %def - dup type /dicttype eq { %ifelse - begin FontDict /ctm get setmatrix - }{ %else - exch begin FontDict /ctm get setmatrix - concat - } ifelse - currentdict setfont - FontDict begin - FontMatrix concat - width 0 dtransform - round width div exch round width div exch - 0 height dtransform - round height div exch - round height div exch - 0 0 transform round exch round exch - ptm astore setmatrix - - pathbbox - height div ceiling height mul 4 1 roll - width div ceiling width mul 4 1 roll - height div floor height mul 4 1 roll - width div floor width mul 4 1 roll - - 2 index sub height div ceiling cvi exch - 3 index sub width div ceiling cvi exch - 4 2 roll moveto - - FontMatrix ptm invertmatrix pop - { %repeat - gsave - ptm concat - dup str length idiv { %repeat - str show - } repeat - dup str length mod str exch - 0 exch getinterval show - grestore - 0 height rmoveto - } repeat - pop - end end -} bind def - -% dict patternfill - -% dict matrix patternfill - -/patternfill { %def - gsave - eoclip patternpath - grestore - newpath -} bind def - -/img { %def - gsave - /imgh exch def - /imgw exch def - concat - imgw imgh 8 - [imgw 0 0 imgh neg 0 imgh] - /colorstr 768 string def - /colorimage where { - pop - { currentfile colorstr readhexstring pop } - false 3 colorimage - }{ - /graystr 256 string def - { - currentfile colorstr readhexstring pop - length 3 idiv - dup 1 sub 0 1 3 -1 roll - { - graystr exch - colorstr 1 index 3 mul get 30 mul - colorstr 2 index 3 mul 1 add get 59 mul - colorstr 3 index 3 mul 2 add get 11 mul - add add 100 idiv - put - } for - graystr 0 3 -1 roll getinterval - } image - } ifelse - grestore -} bind def - -/arrowhead { - gsave - [] 0 setdash - strokeC strokeM strokeY strokeK setcmykcolor - 2 copy moveto - 4 2 roll exch 4 -1 roll exch - sub 3 1 roll sub - exch atan rotate dup scale - arrowtype - dup 0 eq { - -1 2 rlineto 7 -2 rlineto -7 -2 rlineto - closepath fill - } if - dup 1 eq { - 0 3 rlineto 9 -3 rlineto -9 -3 rlineto - closepath fill - } if - dup 2 eq { - -6 -6 rmoveto 6 6 rlineto -6 6 rlineto - -1.4142 -1.4142 rlineto 4.5858 -4.5858 rlineto - -4.5858 -4.5858 rlineto closepath fill - } if - dup 3 eq { - -6 0 rmoveto -1 2 rlineto 7 -2 rlineto -7 -2 rlineto - closepath fill - } if - dup 4 eq { - -9 0 rmoveto 0 3 rlineto 9 -3 rlineto -9 -3 rlineto - closepath fill - } if - dup 5 eq { - currentpoint newpath 3 0 360 arc - closepath fill - } if - dup 6 eq { - 2.5 2.5 rmoveto 0 -5 rlineto -5 0 rlineto 0 5 rlineto - closepath fill - } if - pop - grestore -} bind def - -/setcmykcolor where { %ifelse - pop -}{ %else - /setcmykcolor { - /black exch def /yellow exch def - /magenta exch def /cyan exch def - cyan black add dup 1 gt { pop 1 } if 1 exch sub - magenta black add dup 1 gt { pop 1 } if 1 exch sub - yellow black add dup 1 gt { pop 1 } if 1 exch sub - setrgbcolor - } bind def -} ifelse - -/RE { %def - findfont begin - currentdict dup length dict begin - { %forall - 1 index /FID ne { def } { pop pop } ifelse - } forall - /FontName exch def dup length 0 ne { %if - /Encoding Encoding 256 array copy def - 0 exch { %forall - dup type /nametype eq { %ifelse - Encoding 2 index 2 index put - pop 1 add - }{ %else - exch pop - } ifelse - } forall - } if pop - currentdict dup end end - /FontName get exch definefont pop -} bind def - -/spacecount { %def - 0 exch - ( ) { %loop - search { %ifelse - pop 3 -1 roll 1 add 3 1 roll - }{ pop exit } ifelse - } loop -} bind def - -/WinAnsiEncoding [ - 39/quotesingle 96/grave 130/quotesinglbase/florin/quotedblbase - /ellipsis/dagger/daggerdbl/circumflex/perthousand - /Scaron/guilsinglleft/OE 145/quoteleft/quoteright - /quotedblleft/quotedblright/bullet/endash/emdash - /tilde/trademark/scaron/guilsinglright/oe/dotlessi - 159/Ydieresis 164/currency 166/brokenbar 168/dieresis/copyright - /ordfeminine 172/logicalnot 174/registered/macron/ring - 177/plusminus/twosuperior/threesuperior/acute/mu - 183/periodcentered/cedilla/onesuperior/ordmasculine - 188/onequarter/onehalf/threequarters 192/Agrave/Aacute - /Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla - /Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute - /Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute - /Ocircumflex/Otilde/Odieresis/multiply/Oslash - /Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn - /germandbls/agrave/aacute/acircumflex/atilde/adieresis - /aring/ae/ccedilla/egrave/eacute/ecircumflex - /edieresis/igrave/iacute/icircumflex/idieresis - /eth/ntilde/ograve/oacute/ocircumflex/otilde - /odieresis/divide/oslash/ugrave/uacute/ucircumflex - /udieresis/yacute/thorn/ydieresis -] def - -/SymbolEncoding [ - 32/space/exclam/universal/numbersign/existential/percent - /ampersand/suchthat/parenleft/parenright/asteriskmath/plus - /comma/minus/period/slash/zero/one/two/three/four/five/six - /seven/eight/nine/colon/semicolon/less/equal/greater/question - /congruent/Alpha/Beta/Chi/Delta/Epsilon/Phi/Gamma/Eta/Iota - /theta1/Kappa/Lambda/Mu/Nu/Omicron/Pi/Theta/Rho/Sigma/Tau - /Upsilon/sigma1/Omega/Xi/Psi/Zeta/bracketleft/therefore - /bracketright/perpendicular/underscore/radicalex/alpha - /beta/chi/delta/epsilon/phi/gamma/eta/iota/phi1/kappa/lambda - /mu/nu/omicron/pi/theta/rho/sigma/tau/upsilon/omega1/omega - /xi/psi/zeta/braceleft/bar/braceright/similar - 161/Upsilon1/minute/lessequal/fraction/infinity/florin/club - /diamond/heart/spade/arrowboth/arrowleft/arrowup/arrowright - /arrowdown/degree/plusminus/second/greaterequal/multiply - /proportional/partialdiff/bullet/divide/notequal/equivalence - /approxequal/ellipsis/arrowvertex/arrowhorizex/carriagereturn - /aleph/Ifraktur/Rfraktur/weierstrass/circlemultiply - /circleplus/emptyset/intersection/union/propersuperset - /reflexsuperset/notsubset/propersubset/reflexsubset/element - /notelement/angle/gradient/registerserif/copyrightserif - /trademarkserif/product/radical/dotmath/logicalnot/logicaland - /logicalor/arrowdblboth/arrowdblleft/arrowdblup/arrowdblright - /arrowdbldown/lozenge/angleleft/registersans/copyrightsans - /trademarksans/summation/parenlefttp/parenleftex/parenleftbt - /bracketlefttp/bracketleftex/bracketleftbt/bracelefttp - /braceleftmid/braceleftbt/braceex - 241/angleright/integral/integraltp/integralex/integralbt - /parenrighttp/parenrightex/parenrightbt/bracketrighttp - /bracketrightex/bracketrightbt/bracerighttp/bracerightmid - /bracerightbt -] def - -/patarray [ -/leftdiagonal /rightdiagonal /crossdiagonal /horizontal -/vertical /crosshatch /fishscale /wave /brick -] def -/arrowtype 0 def -/fillC 0 def /fillM 0 def /fillY 0 def /fillK 0 def -/strokeC 0 def /strokeM 0 def /strokeY 0 def /strokeK 1 def -/pattern -1 def -/mat matrix def -/mat2 matrix def -/nesting 0 def -/deferred /N def -/c /curveto load def -/c2 { pop pop c } bind def -/C /curveto load def -/C2 { pop pop C } bind def -/e { gsave concat 0 0 moveto } bind def -/F { - nesting 0 eq { %ifelse - pattern -1 eq { %ifelse - fillC fillM fillY fillK setcmykcolor eofill - }{ %else - gsave fillC fillM fillY fillK setcmykcolor eofill grestore - 0 0 0 1 setcmykcolor - patarray pattern get findfont patternfill - } ifelse - }{ %else - /deferred /F def - } ifelse -} bind def -/f { closepath F } bind def -/K { /strokeK exch def /strokeY exch def - /strokeM exch def /strokeC exch def } bind def -/k { /fillK exch def /fillY exch def - /fillM exch def /fillC exch def } bind def -/opc { pop } bind def -/Opc { pop } bind def -/L /lineto load def -/L2 { pop pop L } bind def -/m /moveto load def -/m2 { pop pop m } bind def -/n /newpath load def -/N { - nesting 0 eq { %ifelse - newpath - }{ %else - /deferred /N def - } ifelse -} def -/S { - nesting 0 eq { %ifelse - strokeC strokeM strokeY strokeK setcmykcolor stroke - }{ %else - /deferred /S def - } ifelse -} bind def -/s { closepath S } bind def -/Tx { fillC fillM fillY fillK setcmykcolor show - 0 leading neg translate 0 0 moveto } bind def -/T { grestore } bind def -/TX { pop } bind def -/Ts { pop } bind def -/tal { pop } bind def -/tld { pop } bind def -/tbx { pop exch pop sub /jwidth exch def } def -/tpt { %def - fillC fillM fillY fillK setcmykcolor - moveto show -} bind def -/tpj { %def - fillC fillM fillY fillK setcmykcolor - moveto - dup stringwidth pop - 3 -1 roll - exch sub - 1 index spacecount - dup 0 eq { %ifelse - pop pop show - }{ %else - div 0 8#040 4 -1 roll widthshow - } ifelse -} bind def -/u {} def -/U {} def -/*u { /nesting nesting 1 add def } def -/*U { - /nesting nesting 1 sub def - nesting 0 eq { - deferred cvx exec - } if -} def -/w /setlinewidth load def -/d /setdash load def -/B { - nesting 0 eq { %ifelse - gsave F grestore S - }{ %else - /deferred /B def - } ifelse -} bind def -/b { closepath B } bind def -/z { /align exch def pop /leading exch def exch findfont - exch scalefont setfont } bind def -/tfn { exch findfont - exch scalefont setfont } bind def -/Pat { /pattern exch def } bind def -/cm { 6 array astore concat } bind def -/q { mat2 currentmatrix pop } bind def -/Q { mat2 setmatrix } bind def -/Ah { - pop /arrowtype exch def - currentlinewidth 5 1 roll arrowhead -} bind def -/Arc { - mat currentmatrix pop - translate scale 0 0 1 5 -2 roll arc - mat setmatrix -} bind def -/Arc2 { pop pop Arc } bind def -/Bx { - mat currentmatrix pop - concat /y1 exch def /x1 exch def /y2 exch def /x2 exch def - x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto - mat setmatrix -} bind def -/Rr { - mat currentmatrix pop - concat /yrad exch def /xrad exch def - 2 copy gt { exch } if /x2 exch def /x1 exch def - 2 copy gt { exch } if /y2 exch def /y1 exch def - x1 xrad add y2 moveto - matrix currentmatrix x1 xrad add y2 yrad sub translate xrad yrad scale - 0 0 1 90 -180 arc setmatrix - matrix currentmatrix x1 xrad add y1 yrad add translate xrad yrad scale - 0 0 1 180 270 arc setmatrix - matrix currentmatrix x2 xrad sub y1 yrad add translate xrad yrad scale - 0 0 1 270 0 arc setmatrix - matrix currentmatrix x2 xrad sub y2 yrad sub translate xrad yrad scale - 0 0 1 0 90 arc setmatrix - closepath - mat setmatrix -} bind def -/Ov { - mat currentmatrix pop - concat translate scale 1 0 moveto 0 0 1 0 360 arc closepath - mat setmatrix -} bind def -end -%%EndResource -%%EndProlog -%%BeginSetup -%PDX g 3 3 1 1 -%%IncludeFont: ArialMT -%%IncludeFont: Arial-BoldMT -PDXDict begin -%%EndSetup -%%Page: 1 1 -%%BeginPageSetup -/_PDX_savepage save def - -15 15 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 setlinecap - 7.5 0 moveto 15 7.5 lineto - 0 7.5 moveto 7.5 15 lineto - 2 setlinewidth stroke -} bind -/rightdiagonal true definepattern pop - -15 15 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 setlinecap - 7.5 0 moveto 0 7.5 lineto - 15 7.5 moveto 7.5 15 lineto - 2 setlinewidth stroke -} bind -/leftdiagonal true definepattern pop - -15 15 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 setlinecap - 0 7.5 moveto 15 7.5 lineto - 2 setlinewidth stroke -} bind -/horizontal true definepattern pop - -15 15 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 setlinecap - 7.5 0 moveto 7.5 15 lineto - 2 setlinewidth stroke -} bind -/vertical true definepattern pop - -15 15 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 setlinecap - 0 7.5 moveto 15 7.5 lineto - 7.5 0 moveto 7.5 15 lineto - 2 setlinewidth stroke -} bind -/crosshatch true definepattern pop - -30 30 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 setlinecap - 0 7.5 moveto 30 7.5 lineto - 0 22.5 moveto 30 22.5 lineto - 7.5 0 moveto 7.5 7.5 lineto - 7.5 22.5 moveto 7.5 30 lineto - 22.5 7.5 moveto 22.5 22.5 lineto - 1 setlinewidth stroke -} bind -/brick true definepattern pop - -30 30 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 2 scale - 2 setlinecap - 7.5 0 moveto 15 7.5 lineto - 0 7.5 moveto 7.5 15 lineto - 7.5 0 moveto 0 7.5 lineto - 15 7.5 moveto 7.5 15 lineto - 0.5 setlinewidth stroke -} bind -/crossdiagonal true definepattern pop - -30 30 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 2 scale - 1 setlinecap - 0 7.5 moveto 0 15 7.5 270 360 arc - 7.5 15 moveto 15 15 7.5 180 270 arc - 0 7.5 moveto 7.5 7.5 7.5 180 360 arc - 0.5 setlinewidth stroke -} bind -/fishscale true definepattern pop - -30 30 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 1 setlinecap 0.5 setlinewidth - 7.5 0 10.6 135 45 arcn - 22.5 15 10.6 225 315 arc - stroke - 7.5 15 10.6 135 45 arcn - 22.5 30 10.6 225 315 arc - stroke -} bind -/wave true definepattern pop - -WinAnsiEncoding /_ArialMT /ArialMT RE -WinAnsiEncoding /_Arial-BoldMT /Arial-BoldMT RE - -newpath 2 setlinecap 0 setlinejoin 2 setmiterlimit -[] 0 setdash -8 140 moveto 8 700 lineto 580 700 lineto 580 140 lineto closepath clip -newpath -%%EndPageSetup -0.862745 0.956863 -1.42109e-016 0 K -2 w -543 249 -9 789 [1 0 0 1 27.09 -98.91] Bx -s -0.133333 0.133333 0.133333 0 k -0.133333 0.133333 0.133333 0 K -0.5 w -150 480 90 510 [1 0 0 1 -14.91 90.09] Bx -b -150 480 90 510 [1 0 0 1 60.42 90.09] Bx -b -150 480 90 510 [1 0 0 1 299.9 90.09] Bx -b -240 480 90 510 [1 0 0 1 135.1 90.09] Bx -b -150 480 90 510 [1 0 0 1 375.4 90.09] Bx -b -[1 0 0 1 15.14 -89.21] e -33 681 33 681 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(top) 33 670.14 tpt -T -0.133333 0.133333 0.133333 0 k -150 480 90 510 [1 0 0 1 -14.91 45.09] Bx -b -150 480 90 510 [1 0 0 1 60.09 45.09] Bx -b -150 480 90 510 [1 0 0 1 300.1 45.09] Bx -b -240 480 90 510 [1 0 0 1 135.1 45.09] Bx -b -150 480 90 510 [1 0 0 1 375.1 45.09] Bx -b -[1 0 0 1 -5.536 -83.21] e -33 630 33 630 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(header) 33 619.14 tpt -T -0.133333 0.133333 0.133333 0 k -150 480 90 510 [1 0 0 1 -14.91 -180.6] Bx -b -150 480 90 510 [1 0 0 1 60.09 -180.6] Bx -b -150 480 90 510 [1 0 0 1 300.1 -180.6] Bx -b -240 480 90 510 [1 0 0 1 135.1 -180.6] Bx -b -150 480 90 510 [1 0 0 1 375.1 -180.6] Bx -b -[1 0 0 1 1.136 -80.91] e -33 402 33 402 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(footer) 33 391.14 tpt -T -0.133333 0.133333 0.133333 0 k -150 480 90 510 [1 0 0 1 -14.91 -224.9] Bx -b -150 480 90 510 [1 0 0 1 60.09 -224.9] Bx -b -150 480 90 510 [1 0 0 1 300.1 -224.9] Bx -b -240 480 90 510 [1 0 0 1 135.1 -224.9] Bx -b -150 480 90 510 [1 0 0 1 375.1 -224.9] Bx -b -[1 0 0 1 -7.866 -86.21] e -36 363 36 363 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(bottom) 36 352.14 tpt -T -0.133333 0.133333 0.133333 0 k -150 345 90 510 [1 0 0 1 -14.91 0.09051] Bx -b -150 345 90 510 [1 0 0 1 60.09 0.09051] Bx -b -150 345 90 510 [1 0 0 1 300.1 0.09051] Bx -b --1.42109e-016 0.4 0.8 0 k -240 345 90 510 [1 0 0 1 135 0.09051] Bx -b -0.133333 0.133333 0.133333 0 k -150 345 90 510 [1 0 0 1 375.1 0.09051] Bx -b -[1 0 0 1 21.47 -72.71] e -24 507 24 507 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(text) 24 496.14 tpt -T -[1 0 0 1 -10.93 -38.72] e -93 705 93 705 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(left edge) 93 694.14 tpt -T -[1 0 0 1 -4.409 -41.72] e -159 708 159 708 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(left margin) 159 697.14 tpt -T -[1 0 0 1 17.42 -38.72] e -273 705 273 705 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(text) 273 694.14 tpt -T -[1 0 0 1 -13.78 -35.72] e -402 702 402 702 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(right margin) 402 691.14 tpt -T -[1 0 0 1 -11.25 -38.72] e -480 705 480 705 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(right edge) 480 694.14 tpt -T -[1 0 0 1 -13.55 -89.21] e -75 352.596 39 366 tbx -0 tal -13 tld -/_ArialMT 12 tfn -() 39 355.14 tpt -T -[1 0 0 1 0.09051 -89.91] e -402 460.596 333 474 tbx -0 tal -13 tld -/_ArialMT 12 tfn -() 333 463.14 tpt -T -u --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -1 1 1 0 K -1 w -q -1 0 0 1 -14.91 -89.91 cm -60 285 m -90 285 L -Q -S -q -1 0 0 1 0.09051 -89.91 cm -75 285 m -75 255 L -Q -S -U -u -q --1 0 0 1 615.1 -89.91 cm -60 285 m -90 285 L -Q -S -q --1 0 0 1 600.1 -89.91 cm -75 285 m -75 255 L -Q -S -U -u -q -0 -1 -1 0 810.1 735.1 cm -60 285 m -90 285 L -Q -S -q -0 -1 -1 0 810.1 720.1 cm -75 285 m -75 255 L -Q -S -U -u -q -0 -1 1 0 -209.9 735.1 cm -60 285 m -90 285 L -Q -S -q -0 -1 1 0 -209.9 720.1 cm -75 285 m -75 255 L -Q -S -U -0.5 w -[3 3] 0 d -525 735 75 285 [1 0 0 1 0.09051 -89.91] Bx -s -1 w -[] 0 d -q -1 0 0 1 -45 -524.9 cm -128 705 120 705 m2 -562.094 705 570.094 705 L2 -Q -S -q -1 0 0 1 -45 -524.9 cm -570.094 705 120 705 4 1 Ah -120 705 570.094 705 4 2 Ah -Q -[1 0 0 1 0.09051 -89.91] e -271.57 246.83 246 258 tbx -0 tal -11 tld -0.862745 0.956863 -1.42109e-016 0 k -/_ArialMT 10 tfn -() 246 248.95 tpt -T -[1 0 0 1 0.09051 -89.91] e -261 255 261 255 tbx -0 tal -11 tld -1 1 1 0 k -/_ArialMT 10 tfn -() 261 245.95 tpt -T -[1 0 0 1 9.698 -77.82] e -261 255 261 255 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(paperwidth) 261 244.14 tpt -T --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -q -0 1 -1 0 1244 74.39 cm -128 705 120 705 m2 -562.094 705 570.094 705 L2 -Q -S -q -0 1 -1 0 1244 74.39 cm -570.094 705 120 705 4 1 Ah -120 705 570.094 705 4 2 Ah -Q -[0 1 -1 0 797.3 129.1] e -261 255 261 255 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(paperheight) 261 244.14 tpt -T -[1 0 0 1 -10.41 8.644] e -273 429 273 429 tbx -0 tal -19 tld --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -/_Arial-BoldMT 18 tfn -(bodytext) 273 412.71 tpt -T -%%PageTrailer -_PDX_savepage restore -%%Trailer -end -showpage -%%EOF diff --git a/doc/context/sources/general/manuals/start/graphics/fig-page-parameters-en.md b/doc/context/sources/general/manuals/start/graphics/fig-page-parameters-en.md deleted file mode 100644 index 35c04b445..000000000 --- a/doc/context/sources/general/manuals/start/graphics/fig-page-parameters-en.md +++ /dev/null @@ -1,1371 +0,0 @@ -%!PS-Adobe-3.0 EPSF-3.0 -%%Creator: Mayura Draw, Version 4.3 -%%Title: fig-page-parameters-en.md -%%CreationDate: Fri Jan 10 17:04:54 2014 -%%BoundingBox: 8 230 580 790 -%%DocumentFonts: ArialMT -%%Orientation: Portrait -%%EndComments -%%BeginProlog -%%BeginResource: procset MayuraDraw_ops -%%Version: 4.3 -%%Copyright: (c) 1993-2003 Mayura Software -/PDXDict 100 dict def -PDXDict begin -% width height matrix proc key cache -% definepattern -\> font -/definepattern { %def - 7 dict begin - /FontDict 9 dict def - FontDict begin - /cache exch def - /key exch def - /proc exch cvx def - /mtx exch matrix invertmatrix def - /height exch def - /width exch def - /ctm matrix currentmatrix def - /ptm matrix identmatrix def - /str - (xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx) - def - end - /FontBBox [ %def - 0 0 FontDict /width get - FontDict /height get - ] def - /FontMatrix FontDict /mtx get def - /Encoding StandardEncoding def - /FontType 3 def - /BuildChar { %def - pop begin - FontDict begin - width 0 cache { %ifelse - 0 0 width height setcachedevice - }{ %else - setcharwidth - } ifelse - 0 0 moveto width 0 lineto - width height lineto 0 height lineto - closepath clip newpath - gsave proc grestore - end end - } def - FontDict /key get currentdict definefont - end -} bind def - -% dict patternpath - -% dict matrix patternpath - -/patternpath { %def - dup type /dicttype eq { %ifelse - begin FontDict /ctm get setmatrix - }{ %else - exch begin FontDict /ctm get setmatrix - concat - } ifelse - currentdict setfont - FontDict begin - FontMatrix concat - width 0 dtransform - round width div exch round width div exch - 0 height dtransform - round height div exch - round height div exch - 0 0 transform round exch round exch - ptm astore setmatrix - - pathbbox - height div ceiling height mul 4 1 roll - width div ceiling width mul 4 1 roll - height div floor height mul 4 1 roll - width div floor width mul 4 1 roll - - 2 index sub height div ceiling cvi exch - 3 index sub width div ceiling cvi exch - 4 2 roll moveto - - FontMatrix ptm invertmatrix pop - { %repeat - gsave - ptm concat - dup str length idiv { %repeat - str show - } repeat - dup str length mod str exch - 0 exch getinterval show - grestore - 0 height rmoveto - } repeat - pop - end end -} bind def - -% dict patternfill - -% dict matrix patternfill - -/patternfill { %def - gsave - eoclip patternpath - grestore - newpath -} bind def - -/img { %def - gsave - /imgh exch def - /imgw exch def - concat - imgw imgh 8 - [imgw 0 0 imgh neg 0 imgh] - /colorstr 768 string def - /colorimage where { - pop - { currentfile colorstr readhexstring pop } - false 3 colorimage - }{ - /graystr 256 string def - { - currentfile colorstr readhexstring pop - length 3 idiv - dup 1 sub 0 1 3 -1 roll - { - graystr exch - colorstr 1 index 3 mul get 30 mul - colorstr 2 index 3 mul 1 add get 59 mul - colorstr 3 index 3 mul 2 add get 11 mul - add add 100 idiv - put - } for - graystr 0 3 -1 roll getinterval - } image - } ifelse - grestore -} bind def - -/arrowhead { - gsave - [] 0 setdash - strokeC strokeM strokeY strokeK setcmykcolor - 2 copy moveto - 4 2 roll exch 4 -1 roll exch - sub 3 1 roll sub - exch atan rotate dup scale - arrowtype - dup 0 eq { - -1 2 rlineto 7 -2 rlineto -7 -2 rlineto - closepath fill - } if - dup 1 eq { - 0 3 rlineto 9 -3 rlineto -9 -3 rlineto - closepath fill - } if - dup 2 eq { - -6 -6 rmoveto 6 6 rlineto -6 6 rlineto - -1.4142 -1.4142 rlineto 4.5858 -4.5858 rlineto - -4.5858 -4.5858 rlineto closepath fill - } if - dup 3 eq { - -6 0 rmoveto -1 2 rlineto 7 -2 rlineto -7 -2 rlineto - closepath fill - } if - dup 4 eq { - -9 0 rmoveto 0 3 rlineto 9 -3 rlineto -9 -3 rlineto - closepath fill - } if - dup 5 eq { - currentpoint newpath 3 0 360 arc - closepath fill - } if - dup 6 eq { - 2.5 2.5 rmoveto 0 -5 rlineto -5 0 rlineto 0 5 rlineto - closepath fill - } if - pop - grestore -} bind def - -/setcmykcolor where { %ifelse - pop -}{ %else - /setcmykcolor { - /black exch def /yellow exch def - /magenta exch def /cyan exch def - cyan black add dup 1 gt { pop 1 } if 1 exch sub - magenta black add dup 1 gt { pop 1 } if 1 exch sub - yellow black add dup 1 gt { pop 1 } if 1 exch sub - setrgbcolor - } bind def -} ifelse - -/RE { %def - findfont begin - currentdict dup length dict begin - { %forall - 1 index /FID ne { def } { pop pop } ifelse - } forall - /FontName exch def dup length 0 ne { %if - /Encoding Encoding 256 array copy def - 0 exch { %forall - dup type /nametype eq { %ifelse - Encoding 2 index 2 index put - pop 1 add - }{ %else - exch pop - } ifelse - } forall - } if pop - currentdict dup end end - /FontName get exch definefont pop -} bind def - -/spacecount { %def - 0 exch - ( ) { %loop - search { %ifelse - pop 3 -1 roll 1 add 3 1 roll - }{ pop exit } ifelse - } loop -} bind def - -/WinAnsiEncoding [ - 39/quotesingle 96/grave 130/quotesinglbase/florin/quotedblbase - /ellipsis/dagger/daggerdbl/circumflex/perthousand - /Scaron/guilsinglleft/OE 145/quoteleft/quoteright - /quotedblleft/quotedblright/bullet/endash/emdash - /tilde/trademark/scaron/guilsinglright/oe/dotlessi - 159/Ydieresis 164/currency 166/brokenbar 168/dieresis/copyright - /ordfeminine 172/logicalnot 174/registered/macron/ring - 177/plusminus/twosuperior/threesuperior/acute/mu - 183/periodcentered/cedilla/onesuperior/ordmasculine - 188/onequarter/onehalf/threequarters 192/Agrave/Aacute - /Acircumflex/Atilde/Adieresis/Aring/AE/Ccedilla - /Egrave/Eacute/Ecircumflex/Edieresis/Igrave/Iacute - /Icircumflex/Idieresis/Eth/Ntilde/Ograve/Oacute - /Ocircumflex/Otilde/Odieresis/multiply/Oslash - /Ugrave/Uacute/Ucircumflex/Udieresis/Yacute/Thorn - /germandbls/agrave/aacute/acircumflex/atilde/adieresis - /aring/ae/ccedilla/egrave/eacute/ecircumflex - /edieresis/igrave/iacute/icircumflex/idieresis - /eth/ntilde/ograve/oacute/ocircumflex/otilde - /odieresis/divide/oslash/ugrave/uacute/ucircumflex - /udieresis/yacute/thorn/ydieresis -] def - -/SymbolEncoding [ - 32/space/exclam/universal/numbersign/existential/percent - /ampersand/suchthat/parenleft/parenright/asteriskmath/plus - /comma/minus/period/slash/zero/one/two/three/four/five/six - /seven/eight/nine/colon/semicolon/less/equal/greater/question - /congruent/Alpha/Beta/Chi/Delta/Epsilon/Phi/Gamma/Eta/Iota - /theta1/Kappa/Lambda/Mu/Nu/Omicron/Pi/Theta/Rho/Sigma/Tau - /Upsilon/sigma1/Omega/Xi/Psi/Zeta/bracketleft/therefore - /bracketright/perpendicular/underscore/radicalex/alpha - /beta/chi/delta/epsilon/phi/gamma/eta/iota/phi1/kappa/lambda - /mu/nu/omicron/pi/theta/rho/sigma/tau/upsilon/omega1/omega - /xi/psi/zeta/braceleft/bar/braceright/similar - 161/Upsilon1/minute/lessequal/fraction/infinity/florin/club - /diamond/heart/spade/arrowboth/arrowleft/arrowup/arrowright - /arrowdown/degree/plusminus/second/greaterequal/multiply - /proportional/partialdiff/bullet/divide/notequal/equivalence - /approxequal/ellipsis/arrowvertex/arrowhorizex/carriagereturn - /aleph/Ifraktur/Rfraktur/weierstrass/circlemultiply - /circleplus/emptyset/intersection/union/propersuperset - /reflexsuperset/notsubset/propersubset/reflexsubset/element - /notelement/angle/gradient/registerserif/copyrightserif - /trademarkserif/product/radical/dotmath/logicalnot/logicaland - /logicalor/arrowdblboth/arrowdblleft/arrowdblup/arrowdblright - /arrowdbldown/lozenge/angleleft/registersans/copyrightsans - /trademarksans/summation/parenlefttp/parenleftex/parenleftbt - /bracketlefttp/bracketleftex/bracketleftbt/bracelefttp - /braceleftmid/braceleftbt/braceex - 241/angleright/integral/integraltp/integralex/integralbt - /parenrighttp/parenrightex/parenrightbt/bracketrighttp - /bracketrightex/bracketrightbt/bracerighttp/bracerightmid - /bracerightbt -] def - -/patarray [ -/leftdiagonal /rightdiagonal /crossdiagonal /horizontal -/vertical /crosshatch /fishscale /wave /brick -] def -/arrowtype 0 def -/fillC 0 def /fillM 0 def /fillY 0 def /fillK 0 def -/strokeC 0 def /strokeM 0 def /strokeY 0 def /strokeK 1 def -/pattern -1 def -/mat matrix def -/mat2 matrix def -/nesting 0 def -/deferred /N def -/c /curveto load def -/c2 { pop pop c } bind def -/C /curveto load def -/C2 { pop pop C } bind def -/e { gsave concat 0 0 moveto } bind def -/F { - nesting 0 eq { %ifelse - pattern -1 eq { %ifelse - fillC fillM fillY fillK setcmykcolor eofill - }{ %else - gsave fillC fillM fillY fillK setcmykcolor eofill grestore - 0 0 0 1 setcmykcolor - patarray pattern get findfont patternfill - } ifelse - }{ %else - /deferred /F def - } ifelse -} bind def -/f { closepath F } bind def -/K { /strokeK exch def /strokeY exch def - /strokeM exch def /strokeC exch def } bind def -/k { /fillK exch def /fillY exch def - /fillM exch def /fillC exch def } bind def -/opc { pop } bind def -/Opc { pop } bind def -/L /lineto load def -/L2 { pop pop L } bind def -/m /moveto load def -/m2 { pop pop m } bind def -/n /newpath load def -/N { - nesting 0 eq { %ifelse - newpath - }{ %else - /deferred /N def - } ifelse -} def -/S { - nesting 0 eq { %ifelse - strokeC strokeM strokeY strokeK setcmykcolor stroke - }{ %else - /deferred /S def - } ifelse -} bind def -/s { closepath S } bind def -/Tx { fillC fillM fillY fillK setcmykcolor show - 0 leading neg translate 0 0 moveto } bind def -/T { grestore } bind def -/TX { pop } bind def -/Ts { pop } bind def -/tal { pop } bind def -/tld { pop } bind def -/tbx { pop exch pop sub /jwidth exch def } def -/tpt { %def - fillC fillM fillY fillK setcmykcolor - moveto show -} bind def -/tpj { %def - fillC fillM fillY fillK setcmykcolor - moveto - dup stringwidth pop - 3 -1 roll - exch sub - 1 index spacecount - dup 0 eq { %ifelse - pop pop show - }{ %else - div 0 8#040 4 -1 roll widthshow - } ifelse -} bind def -/u {} def -/U {} def -/*u { /nesting nesting 1 add def } def -/*U { - /nesting nesting 1 sub def - nesting 0 eq { - deferred cvx exec - } if -} def -/w /setlinewidth load def -/d /setdash load def -/B { - nesting 0 eq { %ifelse - gsave F grestore S - }{ %else - /deferred /B def - } ifelse -} bind def -/b { closepath B } bind def -/z { /align exch def pop /leading exch def exch findfont - exch scalefont setfont } bind def -/tfn { exch findfont - exch scalefont setfont } bind def -/Pat { /pattern exch def } bind def -/cm { 6 array astore concat } bind def -/q { mat2 currentmatrix pop } bind def -/Q { mat2 setmatrix } bind def -/Ah { - pop /arrowtype exch def - currentlinewidth 5 1 roll arrowhead -} bind def -/Arc { - mat currentmatrix pop - translate scale 0 0 1 5 -2 roll arc - mat setmatrix -} bind def -/Arc2 { pop pop Arc } bind def -/Bx { - mat currentmatrix pop - concat /y1 exch def /x1 exch def /y2 exch def /x2 exch def - x1 y1 moveto x1 y2 lineto x2 y2 lineto x2 y1 lineto - mat setmatrix -} bind def -/Rr { - mat currentmatrix pop - concat /yrad exch def /xrad exch def - 2 copy gt { exch } if /x2 exch def /x1 exch def - 2 copy gt { exch } if /y2 exch def /y1 exch def - x1 xrad add y2 moveto - matrix currentmatrix x1 xrad add y2 yrad sub translate xrad yrad scale - 0 0 1 90 -180 arc setmatrix - matrix currentmatrix x1 xrad add y1 yrad add translate xrad yrad scale - 0 0 1 180 270 arc setmatrix - matrix currentmatrix x2 xrad sub y1 yrad add translate xrad yrad scale - 0 0 1 270 0 arc setmatrix - matrix currentmatrix x2 xrad sub y2 yrad sub translate xrad yrad scale - 0 0 1 0 90 arc setmatrix - closepath - mat setmatrix -} bind def -/Ov { - mat currentmatrix pop - concat translate scale 1 0 moveto 0 0 1 0 360 arc closepath - mat setmatrix -} bind def -end -%%EndResource -%%EndProlog -%%BeginSetup -%PDX g 3 3 1 1 -%%IncludeFont: ArialMT -PDXDict begin -%%EndSetup -%%Page: 1 1 -%%BeginPageSetup -/_PDX_savepage save def - -15 15 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 setlinecap - 7.5 0 moveto 15 7.5 lineto - 0 7.5 moveto 7.5 15 lineto - 2 setlinewidth stroke -} bind -/rightdiagonal true definepattern pop - -15 15 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 setlinecap - 7.5 0 moveto 0 7.5 lineto - 15 7.5 moveto 7.5 15 lineto - 2 setlinewidth stroke -} bind -/leftdiagonal true definepattern pop - -15 15 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 setlinecap - 0 7.5 moveto 15 7.5 lineto - 2 setlinewidth stroke -} bind -/horizontal true definepattern pop - -15 15 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 setlinecap - 7.5 0 moveto 7.5 15 lineto - 2 setlinewidth stroke -} bind -/vertical true definepattern pop - -15 15 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 setlinecap - 0 7.5 moveto 15 7.5 lineto - 7.5 0 moveto 7.5 15 lineto - 2 setlinewidth stroke -} bind -/crosshatch true definepattern pop - -30 30 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 setlinecap - 0 7.5 moveto 30 7.5 lineto - 0 22.5 moveto 30 22.5 lineto - 7.5 0 moveto 7.5 7.5 lineto - 7.5 22.5 moveto 7.5 30 lineto - 22.5 7.5 moveto 22.5 22.5 lineto - 1 setlinewidth stroke -} bind -/brick true definepattern pop - -30 30 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 2 scale - 2 setlinecap - 7.5 0 moveto 15 7.5 lineto - 0 7.5 moveto 7.5 15 lineto - 7.5 0 moveto 0 7.5 lineto - 15 7.5 moveto 7.5 15 lineto - 0.5 setlinewidth stroke -} bind -/crossdiagonal true definepattern pop - -30 30 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 2 2 scale - 1 setlinecap - 0 7.5 moveto 0 15 7.5 270 360 arc - 7.5 15 moveto 15 15 7.5 180 270 arc - 0 7.5 moveto 7.5 7.5 7.5 180 360 arc - 0.5 setlinewidth stroke -} bind -/fishscale true definepattern pop - -30 30 [300 72 div 0 0 300 72 div 0 0] -{ %definepattern - 1 setlinecap 0.5 setlinewidth - 7.5 0 10.6 135 45 arcn - 22.5 15 10.6 225 315 arc - stroke - 7.5 15 10.6 135 45 arcn - 22.5 30 10.6 225 315 arc - stroke -} bind -/wave true definepattern pop - -WinAnsiEncoding /_ArialMT /ArialMT RE - -newpath 2 setlinecap 0 setlinejoin 2 setmiterlimit -[] 0 setdash -8 230 moveto 8 790 lineto 580 790 lineto 580 230 lineto closepath clip -newpath -%%EndPageSetup -0.862745 0.956863 -1.42109e-016 0 K -2 w -543 249 -9 789 [1 0 0 1 27 -9] Bx -s -0.133333 0.133333 0.133333 0 k -0.133333 0.133333 0.133333 0 K -0.5 w -150 480 90 510 [1 0 0 1 -15 180] Bx -b -150 480 90 510 [1 0 0 1 60.33 180] Bx -b -150 480 90 510 [1 0 0 1 299.8 180] Bx -b -240 480 90 510 [1 0 0 1 135 180] Bx -b -150 480 90 510 [1 0 0 1 375.3 180] Bx -b -[1 0 0 1 15.05 0.702] e -33 681 33 681 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(top) 33 670.14 tpt -T -0.133333 0.133333 0.133333 0 k -150 480 90 510 [1 0 0 1 -15 135] Bx -b -150 480 90 510 [1 0 0 1 60 135] Bx -b -150 480 90 510 [1 0 0 1 300 135] Bx -b -240 480 90 510 [1 0 0 1 135 135] Bx -b -150 480 90 510 [1 0 0 1 375 135] Bx -b -[1 0 0 1 -5.627 6.702] e -33 630 33 630 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(header) 33 619.14 tpt -T -0.133333 0.133333 0.133333 0 k -150 480 90 510 [1 0 0 1 -15 -90.7] Bx -b -150 480 90 510 [1 0 0 1 60 -90.7] Bx -b -150 480 90 510 [1 0 0 1 300 -90.7] Bx -b -240 480 90 510 [1 0 0 1 135 -90.7] Bx -b -150 480 90 510 [1 0 0 1 375 -90.7] Bx -b -[1 0 0 1 1.045 9] e -33 402 33 402 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(footer) 33 391.14 tpt -T -0.133333 0.133333 0.133333 0 k -150 480 90 510 [1 0 0 1 -15 -135] Bx -b -150 480 90 510 [1 0 0 1 60 -135] Bx -b -150 480 90 510 [1 0 0 1 300 -135] Bx -b -240 480 90 510 [1 0 0 1 135 -135] Bx -b -150 480 90 510 [1 0 0 1 375 -135] Bx -b -[1 0 0 1 -7.957 3.702] e -36 363 36 363 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(bottom) 36 352.14 tpt -T -0.133333 0.133333 0.133333 0 k -150 345 90 510 [1 0 0 1 -15 90] Bx -b -150 345 90 510 [1 0 0 1 60 90] Bx -b -150 345 90 510 [1 0 0 1 300 90] Bx -b --1.42109e-016 0.4 0.8 0 k -240 345 90 510 [1 0 0 1 135 90] Bx -b -0.133333 0.133333 0.133333 0 k -150 345 90 510 [1 0 0 1 375 90] Bx -b -[1 0 0 1 21.38 17.2] e -24 507 24 507 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(text) 24 496.14 tpt -T -[1 0 0 1 -11.02 51.19] e -93 705 93 705 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(left edge) 93 694.14 tpt -T -[1 0 0 1 -4.5 48.19] e -159 708 159 708 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(left margin) 159 697.14 tpt -T -[1 0 0 1 17.33 51.19] e -273 705 273 705 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(text) 273 694.14 tpt -T -[1 0 0 1 -13.87 54.19] e -402 702 402 702 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(right margin) 402 691.14 tpt -T -[1 0 0 1 -11.34 51.19] e -480 705 480 705 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(right edge) 480 694.14 tpt -T -[1 0 0 1 -13.64 0.702] e -75 352.596 39 366 tbx -0 tal -13 tld -/_ArialMT 12 tfn -() 39 355.14 tpt -T --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -1 1 1 0 K -1 w -q -1 0 0 1 91.45 14.02 cm -150 712 150 720 m2 -150 638 150 630 L2 -Q -S -q -1 0 0 1 91.45 14.02 cm -150 630 150 720 4 1 Ah -150 720 150 630 4 2 Ah -Q -q -1 0 0 1 165 -30 cm -150 712 150 720 m2 -150 698 150 690 L2 -Q -S -q -1 0 0 1 165 -30 cm -150 690 150 720 4 1 Ah -150 720 150 690 4 2 Ah -Q -q -1 0 0 1 -47.91 0 cm -130.909 705 122.909 705 m2 -265 705 273 705 L2 -Q -S -q -1 0 0 1 -47.91 0 cm -273 705 122.909 705 4 1 Ah -122.909 705 273 705 4 2 Ah -Q -q -1 0 0 1 -45 -150 cm -128 705 120 705 m2 -172 705 180 705 L2 -Q -S -q -1 0 0 1 -45 -150 cm -180 705 120 705 4 1 Ah -120 705 180 705 4 2 Ah -Q -0.25 w -q -1 0 0 1 0.09051 53.27 cm -225 660 m -225 645 L -Q -S -q -1 0 0 1 6.094 0 cm -228 645 m -243 645 L -Q -S -[1 0 0 1 -2.909 66] e -126 654 126 654 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(backspace) 126 643.14 tpt -T -[1 0 0 1 -9 30] e -255 690 255 690 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(topspace) 255 679.14 tpt -T --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -1 w -q -1 0 0 1 29.91 -210 cm -128 705 120 705 m2 -172 705 180 705 L2 -Q -S -q -1 0 0 1 29.91 -210 cm -180 705 120 705 4 1 Ah -120 705 180 705 4 2 Ah -Q -q -1 0 0 1 270 -210 cm -128 705 120 705 m2 -172 705 180 705 L2 -Q -S -q -1 0 0 1 270 -210 cm -180 705 120 705 4 1 Ah -120 705 180 705 4 2 Ah -Q -q -1 0 0 1 345 -150 cm -128 705 120 705 m2 -172 705 180 705 L2 -Q -S -q -1 0 0 1 345 -150 cm -180 705 120 705 4 1 Ah -120 705 180 705 4 2 Ah -Q -q -1 0 0 1 165 -75 cm -150 712 150 720 m2 -150 698 150 690 L2 -Q -S -q -1 0 0 1 165 -75 cm -150 690 150 720 4 1 Ah -150 720 150 690 4 2 Ah -Q -q -1 0 0 1 165 -300 cm -150 712 150 720 m2 -150 698 150 690 L2 -Q -S -q -1 0 0 1 165 -300 cm -150 690 150 720 4 1 Ah -150 720 150 690 4 2 Ah -Q -q -1 0 0 1 165 -345 cm -150 712 150 720 m2 -150 698 150 690 L2 -Q -S -q -1 0 0 1 165 -345 cm -150 690 150 720 4 1 Ah -150 720 150 690 4 2 Ah -Q -0.862745 0.956863 -1.42109e-016 0 K -2 w -q -1 0 0 1 104.9 -150 cm -136 705 120 705 m2 -254.094 705 270.094 705 L2 -Q -S -q -1 0 0 1 104.9 -150 cm -270.094 705 120 705 4 1 Ah -120 705 270.094 705 4 2 Ah -Q -q -1 0 0 1 105 -118.5 cm -150 747.547 150 763.547 m2 -150 524.547 150 508.547 L2 -Q -S -q -1 0 0 1 105 -118.5 cm -150 508.547 150 763.547 4 1 Ah -150 763.547 150 508.547 4 2 Ah -Q -[1 0 0 1 -3 6.702] e -324 675 324 675 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(top) 324 664.14 tpt -T -[1 0 0 1 -3 3.702] e -324 633 324 633 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(header) 324 622.14 tpt -T -[1 0 0 1 0 0] e -261 498 261 498 tbx -0 tal -13 tld -0.862745 0.956863 -1.42109e-016 0 k -/_ArialMT 12 tfn -(height) 261 487.14 tpt -T -[1 0 0 1 -14.05 7.406] e -291 564 291 564 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(width) 291 553.14 tpt -T -[1 0 0 1 0 9.702] e -321 402 321 402 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(footer) 321 391.14 tpt -T -[1 0 0 1 0 9.702] e -321 357 321 357 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(bottom) 321 346.14 tpt -T -[1 0 0 1 -0.348 7.5] e -84 564 84 564 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(leftedge) 84 553.14 tpt -T -[1 0 0 1 -13.08 4.359] e -168 507 168 507 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(leftmargin) 168 496.14 tpt -T -[1 0 0 1 -17.44 7.359] e -408 504 408 504 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(rightmargin) 408 493.14 tpt -T -[1 0 0 1 -13.01 7.5] e -483 564 483 564 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(rightedge) 483 553.14 tpt -T --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -1 1 1 0 K -1 w -q -1 0 0 1 165 -120 cm -150 712 150 720 m2 -150 563 150 555 L2 -Q -S -q -1 0 0 1 165 -120 cm -150 555 150 720 4 1 Ah -150 720 150 555 4 2 Ah -Q -[1 0 0 1 0 0] e -402 460.596 333 474 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -() 333 463.14 tpt -T -[1 0 0 1 -33 15.64] e -354 468 354 468 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(textheight) 354 457.14 tpt -T -u --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -0.5 w -q -1 0 0 1 255 -60 cm -150 716 150 720 m2 -150 709 150 705 L2 -Q -S -q -1 0 0 1 255 -60 cm -150 705 150 720 4 1 Ah -150 720 150 705 4 2 Ah -Q -[1 0 0 1 -2.33 7.659] e -411 651 411 651 tbx -0 tal -11 tld -1 1 1 0 k -/_ArialMT 10 tfn -(topdistance) 411 641.95 tpt -T -U --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -q -1 0 0 1 255 -105 cm -150 716 150 720 m2 -150 709 150 705 L2 -Q -S -q -1 0 0 1 255 -105 cm -150 705 150 720 4 1 Ah -150 720 150 705 4 2 Ah -Q -[1 0 0 1 -2.33 -37.34] e -411 651 411 651 tbx -0 tal -11 tld -1 1 1 0 k -/_ArialMT 10 tfn -(headerdistance) 411 641.95 tpt -T --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -q -1 0 0 1 255 -285 cm -150 716 150 720 m2 -150 709 150 705 L2 -Q -S -q -1 0 0 1 255 -285 cm -150 705 150 720 4 1 Ah -150 720 150 705 4 2 Ah -Q -[1 0 0 1 -2.33 -217.3] e -411 651 411 651 tbx -0 tal -11 tld -1 1 1 0 k -/_ArialMT 10 tfn -(footerdistance) 411 641.95 tpt -T --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -q -1 0 0 1 255 -330 cm -150 716 150 720 m2 -150 709 150 705 L2 -Q -S -q -1 0 0 1 255 -330 cm -150 705 150 720 4 1 Ah -150 720 150 705 4 2 Ah -Q -[1 0 0 1 -2.33 -262.3] e -411 651 411 651 tbx -0 tal -11 tld -1 1 1 0 k -/_ArialMT 10 tfn -(bottomdistance) 411 641.95 tpt -T -u --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -q -1 0 0 1 45 0 cm -109 330 105 330 m2 -120 330 L -Q -S -q -1 0 0 1 45 0 cm -120 330 105 330 4 1 Ah -Q -q -1 0 0 1 30 0 cm -101 330 105 330 m2 -90 330 L -Q -S -q -1 0 0 1 30 0 cm -90 330 105 330 4 1 Ah -Q -U -u -q -1 0 0 1 120 -15 cm -109 330 105 330 m2 -120 330 L -Q -S -q -1 0 0 1 120 -15 cm -120 330 105 330 4 1 Ah -Q -q -1 0 0 1 105 -15 cm -101 330 105 330 m2 -90 330 L -Q -S -q -1 0 0 1 105 -15 cm -90 330 105 330 4 1 Ah -Q -U -u -q -1 0 0 1 285 -15 cm -109 330 105 330 m2 -120 330 L -Q -S -q -1 0 0 1 285 -15 cm -120 330 105 330 4 1 Ah -Q -q -1 0 0 1 270 -15 cm -101 330 105 330 m2 -90 330 L -Q -S -q -1 0 0 1 270 -15 cm -90 330 105 330 4 1 Ah -Q -U -u -q -1 0 0 1 360 0 cm -109 330 105 330 m2 -120 330 L -Q -S -q -1 0 0 1 360 0 cm -120 330 105 330 4 1 Ah -Q -q -1 0 0 1 345 0 cm -101 330 105 330 m2 -90 330 L -Q -S -q -1 0 0 1 345 0 cm -90 330 105 330 4 1 Ah -Q -U -[1 0 0 1 -15 5.998] e -123 321 123 321 tbx -0 tal -11 tld -1 1 1 0 k -/_ArialMT 10 tfn -(leftedgedistance) 123 311.95 tpt -T -[1 0 0 1 -36 9.633] e -300.14 291.83 219 303 tbx -0 tal -11 tld -/_ArialMT 10 tfn -(leftmargindistance) 219 293.95 tpt -T -[1 0 0 1 120.2 8.906] e -306.25 291.83 219 303 tbx -0 tal -11 tld -/_ArialMT 10 tfn -(rightmargindistance) 219 293.95 tpt -T -[1 0 0 1 -27 8.998] e -450 318 450 318 tbx -0 tal -11 tld -/_ArialMT 10 tfn -(rightedgedistance) 450 308.95 tpt -T -[1 0 0 1 -6 58.55] e -183 246.83 120 258 tbx -0 tal -11 tld -/_ArialMT 10 tfn -(edgedistance) 120 248.95 tpt -T -[1 0 0 1 18 53.27] e -171 249 171 249 tbx -0 tal -11 tld -/_ArialMT 10 tfn -(margindistance) 171 239.95 tpt -T -[1 0 0 1 180 53.27] e -171 249 171 249 tbx -0 tal -11 tld -/_ArialMT 10 tfn -(margindistance) 171 239.95 tpt -T -[1 0 0 1 312 58.55] e -183 246.83 120 258 tbx -0 tal -11 tld -/_ArialMT 10 tfn -(edgedistance) 120 248.95 tpt -T -u --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -1 w -q -1 0 0 1 -15 0 cm -60 285 m -90 285 L -Q -S -q -1 0 0 1 0 0 cm -75 285 m -75 255 L -Q -S -U -u -q --1 0 0 1 615 0 cm -60 285 m -90 285 L -Q -S -q --1 0 0 1 600 0 cm -75 285 m -75 255 L -Q -S -U -u -q -0 -1 -1 0 810 825 cm -60 285 m -90 285 L -Q -S -q -0 -1 -1 0 810 810 cm -75 285 m -75 255 L -Q -S -U -u -q -0 -1 1 0 -210 825 cm -60 285 m -90 285 L -Q -S -q -0 -1 1 0 -210 810 cm -75 285 m -75 255 L -Q -S -U -0.5 w -[3 3] 0 d -525 735 75 285 [1 0 0 1 0 0] Bx -s -1 w -[] 0 d -q -1 0 0 1 -45.09 -435 cm -128 705 120 705 m2 -562.094 705 570.094 705 L2 -Q -S -q -1 0 0 1 -45.09 -435 cm -570.094 705 120 705 4 1 Ah -120 705 570.094 705 4 2 Ah -Q -[1 0 0 1 0 0] e -271.57 246.83 246 258 tbx -0 tal -11 tld -0.862745 0.956863 -1.42109e-016 0 k -/_ArialMT 10 tfn -() 246 248.95 tpt -T -[1 0 0 1 0 0] e -261 255 261 255 tbx -0 tal -11 tld -1 1 1 0 k -/_ArialMT 10 tfn -() 261 245.95 tpt -T -[1 0 0 1 9.607 12.09] e -261 255 261 255 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(paperwidth) 261 244.14 tpt -T --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -q -0 1 -1 0 1244 164.3 cm -128 705 120 705 m2 -562.094 705 570.094 705 L2 -Q -S -q -0 1 -1 0 1244 164.3 cm -570.094 705 120 705 4 1 Ah -120 705 570.094 705 4 2 Ah -Q -[0 1 -1 0 797.2 219] e -261 255 261 255 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(paperheight) 261 244.14 tpt -T -[1 0 0 1 -12 12] e -285 540 285 540 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(textwidth) 285 529.14 tpt -T -[1 0 0 1 0 12] e -90 540 90 540 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(edge) 90 529.14 tpt -T -[1 0 0 1 0 9] e -162 483 162 483 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(margin) 162 472.14 tpt -T -[1 0 0 1 -6.336 12] e -408 480 408 480 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(margin) 408 469.14 tpt -T -[1 0 0 1 -6 18] e -489 534 489 534 tbx -0 tal -13 tld -/_ArialMT 12 tfn -(edge) 489 523.14 tpt -T --1.42109e-016 -1.42109e-016 -1.42109e-016 0 k -q -1 0 0 1 252.1 0 cm -130.909 705 122.909 705 m2 -265 705 273 705 L2 -Q -S -q -1 0 0 1 252.1 0 cm -273 705 122.909 705 4 1 Ah -122.909 705 273 705 4 2 Ah -Q -0.25 w -q -1 0 0 1 150.1 52.55 cm -225 660 m -225 645 L -Q -S -[1 0 0 1 297.1 66] e -126 654 126 654 tbx -0 tal -13 tld -1 1 1 0 k -/_ArialMT 12 tfn -(cutspace) 126 643.14 tpt -T -%%PageTrailer -_PDX_savepage restore -%%Trailer -end -showpage -%%EOF diff --git a/fonts/fea/context/greek-babel.fea b/fonts/fea/context/greek-babel.fea deleted file mode 100644 index 68f5cd145..000000000 --- a/fonts/fea/context/greek-babel.fea +++ /dev/null @@ -1,294 +0,0 @@ -# This file has been written by Arthur Reutenauer. -# An Opentype feature to replace the Babel input scheme - -lookup GreekBabelLookupMultiple { - lookupflag 1 ; - sub quotedbl quotesingle i by uni1FD3 ; - sub quotedbl quotesingle u by uni1FE3 ; - sub quotedbl grave i by uni1FD2 ; - sub quotedbl grave u by uni1FE2 ; - sub quotedbl asciitilde i by uni1FD7 ; - sub quotedbl asciitilde u by uni1FE7 ; - sub quotedbl i by uni03CA ; - sub quotedbl u by uni03CB ; - sub equal a by uni1FB1 ; - sub equal i by uni1FD1 ; - sub equal u by uni1FE1 ; - sub equal quotesingle a by uniEB00 ; - sub equal quotesingle i by uniEB39 ; - sub equal u quotesingle by uniEB7A ; - sub greater a by uni1F00 ; - sub greater A by uni1F08 ; - sub greater e by uni1F10 ; - sub greater E by uni1F18 ; - sub greater h by uni1F20 ; - sub greater H by uni1F28 ; - sub greater i by uni1F30 ; - sub greater I by uni1F38 ; - sub greater o by uni1F40 ; - sub greater O by uni1F48 ; - sub greater u by uni1F50 ; - sub greater w by uni1F60 ; - sub greater W by uni1F68 ; - sub greater grave a by uni1F02 ; - sub greater grave A by uni1F0A ; - sub greater grave e by uni1F12 ; - sub greater grave E by uni1F1A ; - sub greater grave h by uni1F22 ; - sub greater grave H by uni1F2A ; - sub greater grave i by uni1F32 ; - sub greater grave I by uni1F3A ; - sub greater grave o by uni1F42 ; - sub greater grave O by uni1F4A ; - sub greater grave u by uni1F52 ; - sub greater grave w by uni1F62 ; - sub greater grave W by uni1F6A ; - sub greater quotesingle a by uni1F04 ; - sub greater quotesingle A by uni1F0C ; - sub greater quotesingle e by uni1F14 ; - sub greater quotesingle E by uni1F1C ; - sub greater quotesingle h by uni1F24 ; - sub greater quotesingle H by uni1F2C ; - sub greater quotesingle i by uni1F34 ; - sub greater quotesingle I by uni1F3C ; - sub greater quotesingle o by uni1F44 ; - sub greater quotesingle O by uni1F4C ; - sub greater quotesingle u by uni1F54 ; - sub greater quotesingle U by uni1F5C ; - sub greater quotesingle w by uni1F64 ; - sub greater quotesingle W by uni1F6C ; - sub greater asciitilde a by uni1F06 ; - sub greater asciitilde A by uni1F0E ; - sub greater asciitilde e by uni1F16 ; - sub greater asciitilde E by uni1F1E ; - sub greater asciitilde h by uni1F26 ; - sub greater asciitilde H by uni1F2E ; - sub greater asciitilde i by uni1F36 ; - sub greater asciitilde I by uni1F3E ; - sub greater asciitilde o by uni1F46 ; - sub greater asciitilde O by uni1F4E ; - sub greater asciitilde u by uni1F56 ; - sub greater asciitilde U by uni1F5E ; - sub greater asciitilde w by uni1F66 ; - sub greater asciitilde W by uni1F6E ; - sub less a by uni1F01 ; - sub less A by uni1F09 ; - sub less e by uni1F11 ; - sub less E by uni1F19 ; - sub less h by uni1F21 ; - sub less H by uni1F29 ; - sub less i by uni1F31 ; - sub less I by uni1F39 ; - sub less o by uni1F41 ; - sub less O by uni1F49 ; - sub less u by uni1F51 ; - sub less U by uni1F59 ; - sub less w by uni1F61 ; - sub less W by uni1F69 ; - sub less grave a by uni1F03 ; - sub less grave A by uni1F0B ; - sub less grave e by uni1F13 ; - sub less grave E by uni1F1B ; - sub less grave h by uni1F23 ; - sub less grave H by uni1F2B ; - sub less grave i by uni1F33 ; - sub less grave I by uni1F3B ; - sub less grave o by uni1F43 ; - sub less grave O by uni1F4B ; - sub less grave u by uni1F53 ; - sub less grave U by uni1F5B ; - sub less grave w by uni1F63 ; - sub less grave W by uni1F6B ; - sub less quotesingle a by uni1F05 ; - sub less quotesingle A by uni1F0D ; - sub less quotesingle e by uni1F15 ; - sub less quotesingle E by uni1F1D ; - sub less quotesingle h by uni1F25 ; - sub less quotesingle H by uni1F2D ; - sub less quotesingle i by uni1F35 ; - sub less quotesingle I by uni1F3D ; - sub less quotesingle o by uni1F45 ; - sub less quotesingle O by uni1F4D ; - sub less quotesingle u by uni1F55 ; - sub less quotesingle U by uni1F5D ; - sub less quotesingle w by uni1F65 ; - sub less quotesingle W by uni1F6D ; - sub less asciitilde a by uni1F07 ; - sub less asciitilde A by uni1F0F ; - sub less asciitilde e by uni1F17 ; - sub less asciitilde E by uni1F1F ; - sub less asciitilde h by uni1F27 ; - sub less asciitilde H by uni1F2F ; - sub less asciitilde i by uni1F37 ; - sub less asciitilde I by uni1F3F ; - sub less asciitilde o by uni1F47 ; - sub less asciitilde O by uni1F4F ; - sub less asciitilde u by uni1F57 ; - sub less asciitilde U by uni1F5F ; - sub less asciitilde w by uni1F67 ; - sub less asciitilde W by uni1F6F ; - sub grave a by uni1F70 ; - sub quotesingle a by uni1F71 ; - sub grave e by uni1F72 ; - sub quotesingle e by uni1F73 ; - sub grave h by uni1F74 ; - sub quotesingle h by uni1F75 ; - sub grave i by uni1F76 ; - sub quotesingle i by uni1F77 ; - sub grave o by uni1F78 ; - sub quotesingle o by uni1F79 ; - sub grave u by uni1F7A ; - sub quotesingle u by uni1F7B ; - sub grave w by uni1F7C ; - sub quotesingle w by uni1F7D ; - sub grave A by uni1FBA ; - sub quotesingle A by uni1FBB ; - sub grave E by uni1FC8 ; - sub quotesingle E by uni1FC9 ; - sub grave H by uni1FCA ; - sub quotesingle H by uni1FCB ; - sub grave I by uni1FDA ; - sub quotesingle I by uni1FDB ; - sub grave U by uni1FEA ; - sub quotesingle U by uni1FEB ; - sub grave W by uni1FFA ; - sub quotesingle W by uni1FFB ; - sub greater a bar by uni1F80 ; - sub greater A bar by uni1F88 ; - sub greater h bar by uni1F90 ; - sub greater H bar by uni1F98 ; - sub greater w bar by uni1FA0 ; - sub greater W bar by uni1FA8 ; - sub greater grave a bar by uni1F82 ; - sub greater grave A bar by uni1F8A ; - sub greater grave h bar by uni1F92 ; - sub greater grave H bar by uni1F9A ; - sub greater grave w bar by uni1FA2 ; - sub greater grave W bar by uni1FAA ; - sub greater quotesingle a bar by uni1F84 ; - sub greater quotesingle A bar by uni1F8C ; - sub greater quotesingle h bar by uni1F94 ; - sub greater quotesingle H bar by uni1F9C ; - sub greater quotesingle w bar by uni1FA4 ; - sub greater quotesingle W bar by uni1FAC ; - sub greater asciitilde a bar by uni1F86 ; - sub greater asciitilde A bar by uni1F8E ; - sub greater asciitilde h bar by uni1F96 ; - sub greater asciitilde H bar by uni1F9E ; - sub greater asciitilde w bar by uni1FA6 ; - sub greater asciitilde W bar by uni1FAE ; - sub less a bar by uni1F81 ; - sub less A bar by uni1F89 ; - sub less h bar by uni1F91 ; - sub less H bar by uni1F99 ; - sub less w bar by uni1FA1 ; - sub less W bar by uni1FA9 ; - sub less grave a bar by uni1F83 ; - sub less grave A bar by uni1F8B ; - sub less grave h bar by uni1F93 ; - sub less grave H bar by uni1F9B ; - sub less grave w bar by uni1FA3 ; - sub less grave W bar by uni1FAB ; - sub less quotesingle a bar by uni1F85 ; - sub less quotesingle A bar by uni1F8D ; - sub less quotesingle h bar by uni1F95 ; - sub less quotesingle H bar by uni1F9D ; - sub less quotesingle w bar by uni1FA5 ; - sub less quotesingle W bar by uni1FAD ; - sub less asciitilde a bar by uni1F87 ; - sub less asciitilde A bar by uni1F8F ; - sub less asciitilde h bar by uni1F97 ; - sub less asciitilde H bar by uni1F9F ; - sub less asciitilde w bar by uni1FA7 ; - sub less asciitilde W bar by uni1FAF ; - sub grave a bar by uni1FB2 ; - sub a bar by uni1FB3 ; - sub quotesingle a bar by uni1FB4 ; - sub h bar by uni1FC3 ; - sub grave h bar by uni1FC2 ; - sub quotesingle h bar by uni1FC4 ; - sub grave w bar by uni1FF2 ; - sub w bar by uni1FF3 ; - sub quotesingle w bar by uni1FF4 ; - sub asciitilde a by uni1FB6 ; - sub asciitilde a bar by uni1FB7 ; - sub asciitilde h by uni1FC6 ; - sub asciitilde h bar by uni1FC7 ; - sub asciitilde i by uni1FD6 ; - sub asciitilde u by uni1FE6 ; - sub asciitilde w by uni1FF6 ; - sub asciitilde w bar by uni1FF7 ; - sub greater r by uni1FE4 ; - sub less r by uni1FE5 ; - sub less R by uni1FEC ; -} GreekBabelLookupMultiple ; - -lookup GreekBabelLookupSimple { - lookupflag 0 ; - sub a by alpha ; - sub b by beta ; - sub g by gamma ; - sub d by delta ; - sub e by epsilon ; - sub z by zeta ; - sub h by eta ; - sub j by theta ; - sub i by iota ; - sub k by kappa ; - sub l by lambda ; - sub m by mu ; - sub n by nu ; - sub x by xi ; - sub o by omicron ; - sub p by pi ; - sub r by rho ; - sub c by uni03F2 ; - sub s by uni03F2 ; - sub t by tau ; - sub u by upsilon ; - sub f by phi ; - sub q by chi ; - sub y by psi ; - sub w by omega ; - sub A by Alpha ; - sub B by Beta ; - sub G by Gamma ; - sub D by Delta ; - sub E by Epsilon ; - sub Z by Zeta ; - sub H by Eta ; - sub J by Theta ; - sub I by Iota ; - sub K by Kappa ; - sub L by Lambda ; - sub M by Mu ; - sub N by Nu ; - sub X by Xi ; - sub O by Omicron ; - sub P by Pi ; - sub R by Rho ; - sub C by Uni03C2 ; - sub S by uni03F9 ; - sub T by Tau ; - sub U by Upsilon ; - sub F by Phi ; - sub Q by Chi ; - sub Y by Psi ; - sub W by Omega ; - sub semicolon by anoteleia ; - sub exclam by dotbelowcomb ; -} GreekBabelLookupSimple ; - -feature grbl { - - script DFLT ; - language dflt ; - lookup GreekBabelLookupMultiple ; - lookup GreekBabelLookupSimple ; - - script latn; - language dflt ; - lookup GreekBabelLookupMultiple ; - lookup GreekBabelLookupSimple ; -} grbl ; - diff --git a/fonts/fea/context/test-features.fea b/fonts/fea/context/test-features.fea deleted file mode 100644 index ffc3c588d..000000000 --- a/fonts/fea/context/test-features.fea +++ /dev/null @@ -1,20 +0,0 @@ -lookup TestLookupENGLISH { - lookupflag 0 ; - sub l a n g u a g e by e n g l i s h ; -} TestLookupENGLISH ; - -lookup TestLookupDUTCH { - lookupflag 0 ; - sub l a n g u a g e by d u t c h ; -} TestLookupDUTCH ; - -feature test { - - script latn ; - language ENG exclude_dflt ; - lookup TestLookupENGLISH ; - language NLD exclude_dflt ; - lookup TestLookupDUTCH ; - -} test ; - diff --git a/fonts/fea/context/texhistoric.fea b/fonts/fea/context/texhistoric.fea deleted file mode 100644 index 453ea0188..000000000 --- a/fonts/fea/context/texhistoric.fea +++ /dev/null @@ -1,42 +0,0 @@ -# The first MkIV OpenType Handler used internal methods, but -# after we implemented other things it made more sense to -# do the following. (HH) - -lookup TeXPseudoLigaturesLookup { - lookupflag 1 ; - sub hyphen hyphen hypen by emdash ; - sub hyphen hyphen by endash ; - sub hyphen endash by emdash ; - sub endash hyphen by emdash ; - sub quoteleft quoteleft by quotedblleft ; - sub quoteright quoteright by quotedblright ; - sub grave grave by quotedblleft ; - sub quotesingle quotesingle by quotedblright ; - sub comma comma by quotedblbase ; -} TeXPseudoLigaturesLookup ; - -lookup TeXQuoteReplacementLookup { - lookupflag 1 ; - sub quotedbl by quotedblright ; - sub quotesingle by quoteright ; - sub grave by quoteleft ; -} TeXQuoteReplacementLookup ; - -feature tlig { - script DFLT ; - language dflt ; - lookup TeXPseudoLigaturesLookup ; - script latn; - language dflt ; - lookup TeXPseudoLigaturesLookup ; -} tlig ; - -feature trep { - script DFLT ; - language dflt ; - lookup TeXQuoteReplacementLookup ; - script latn; - language dflt ; - lookup TeXQuoteReplacementLookup ; -} trep ; - diff --git a/fonts/fea/context/verbose-digits.fea b/fonts/fea/context/verbose-digits.fea deleted file mode 100644 index 866734853..000000000 --- a/fonts/fea/context/verbose-digits.fea +++ /dev/null @@ -1,36 +0,0 @@ -lookup NumericLookupDFLT { - lookupflag 0 ; - sub zero by z e r o ; - sub one by o n e ; - sub two by t w o ; - sub three by t h r e e ; - sub four by f o u r ; - sub five by f i v e ; - sub six by s i x ; - sub seven by s e v e n ; - sub eight by e i g h t ; - sub nine by n i n e ; -} NumericLookupDFLT ; - -feature verb { - - script DFLT ; - language dflt ; - lookup NumericLookupDFLT ; - - script latn; - language dflt ; - lookup NumericLookupDFLT ; - language AZE exclude_dflt ; - lookup NumericLookupDFLT ; - language CRT exclude_dflt ; - lookup NumericLookupDFLT ; - language MOL exclude_dflt ; - lookup NumericLookupDFLT ; - language ROM exclude_dflt ; - lookup NumericLookupDFLT ; - language TRK exclude_dflt ; - lookup NumericLookupDFLT ; - -} verb ; - diff --git a/scripts/context/lua/mtx-mtxworks.lua b/scripts/context/lua/mtx-mtxworks.lua deleted file mode 100644 index 1239ae4c5..000000000 --- a/scripts/context/lua/mtx-mtxworks.lua +++ /dev/null @@ -1,14 +0,0 @@ -if not modules then modules = { } end modules ['mtx-mtxworks'] = { - version = 1.002, - comment = "companion to mtxrun.lua", - author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", - copyright = "PRAGMA ADE / ConTeXt Development Team", - license = "see context related readme files" -} - --- this is a shortcut to "mtxrun --script texworks --start" - -environment.setargument("start",true) - -require "mtx-texworks" - diff --git a/scripts/context/stubs/mswin/mtxworks.exe b/scripts/context/stubs/mswin/mtxworks.exe deleted file mode 100644 index 0e7882cf9..000000000 Binary files a/scripts/context/stubs/mswin/mtxworks.exe and /dev/null differ diff --git a/scripts/context/stubs/unix/mtxworks b/scripts/context/stubs/unix/mtxworks deleted file mode 100644 index ef8f230c3..000000000 --- a/scripts/context/stubs/unix/mtxworks +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -mtxrun --script texworks --start diff --git a/scripts/context/stubs/win64/mtxworks.exe b/scripts/context/stubs/win64/mtxworks.exe deleted file mode 100644 index 93290a6e0..000000000 Binary files a/scripts/context/stubs/win64/mtxworks.exe and /dev/null differ diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index ec59205b7..b23a010d9 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2017.05.14 19:09} +\newcontextversion{2017.05.15 21:48} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii index b31ece259..9b79652fe 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2017.05.14 19:09} +\edef\contextversion{2017.05.15 21:48} %D For those who want to use this: diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index ea14b4c7b..cad08c512 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2017.05.14 19:09} +\newcontextversion{2017.05.15 21:48} %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 3d521d98c..509077bc9 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2017.05.14 19:09} +\edef\contextversion{2017.05.15 21:48} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/font-ext.lua b/tex/context/base/mkiv/font-ext.lua index 6edfe7025..965b6e6dc 100644 --- a/tex/context/base/mkiv/font-ext.lua +++ b/tex/context/base/mkiv/font-ext.lua @@ -1296,3 +1296,52 @@ do -- another hack for a crappy font } end + +do + + local tounicode = fonts.mappings.tounicode + + local function check(tfmdata,key,value) + if value == "ligatures" then + local private = fonts.constructors and fonts.constructors.privateoffset or 0xF0000 + local collected = fonts.handlers.otf.readers.getcomponents(tfmdata.shared.rawdata) + if collected and next(collected)then + for unicode, char in next, tfmdata.characters do + if true then -- if unicode >= private or (unicode >= 0xE000 and unicode <= 0xF8FF) then + local u = collected[unicode] + if u then + local n = #u + for i=1,n do + if u[i] > private then + n = 0 + break + end + end + if n > 0 then + if n == 1 then + u = u[1] + end + char.unicode = u + char.tounicode = tounicode(u) + end + end + end + end + end + end + end + + -- forceunicodes=ligatures : aggressive lig resolving (e.g. for emoji) + -- + -- kind of like: \enabletrackers[fonts.mapping.forceligatures] + + registerotffeature { + name = "forceunicodes", + description = "forceunicodes", + manipulators = { + base = check, + node = check, + } + } + +end diff --git a/tex/context/base/mkiv/font-gds.lua b/tex/context/base/mkiv/font-gds.lua deleted file mode 100644 index 52bb9c983..000000000 --- a/tex/context/base/mkiv/font-gds.lua +++ /dev/null @@ -1,899 +0,0 @@ -if not modules then modules = { } end modules ['font-gds'] = { - version = 1.000, - comment = "companion to font-gds.mkiv", - author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", - copyright = "PRAGMA ADE / ConTeXt Development Team", - license = "see context related readme files" -} - --- depends on ctx - -local type, next, tonumber = type, next, tonumber -local gmatch, lower, find, splitup = string.gmatch, string.lower, string.find, string.splitup - -local fonts = fonts -local nodes = nodes -local attributes = attributes -local node = node - -local trace_goodies = false trackers.register("fonts.goodies", function(v) trace_goodies = v end) -local report_goodies = logs.reporter("fonts","goodies") - -local allocate = utilities.storage.allocate -local setmetatableindex = table.setmetatableindex - -local implement = interfaces.implement - -local texsp = tex.sp -local formatters = string.formatters - -local otf = fonts.handlers.otf -local afm = fonts.handlers.afm -local tfm = fonts.handlers.tfm - -local registerotffeature = otf.features.register -local registerafmfeature = afm.features.register -local registertfmfeature = tfm.features.register - -local fontgoodies = fonts.goodies or { } -fonts.goodies = fontgoodies - -local typefaces = fonts.typefaces or allocate() -fonts.typefaces = typefaces - -local data = fontgoodies.data or allocate() -fontgoodies.data = data - -local list = fontgoodies.list or { } -fontgoodies.list = list -- no allocate as we want to see what is there - -local addotffeature = otf.enhancers.addfeature - -local findfile = resolvers.findfile - -local glyph_code = nodes.nodecodes.glyph - -local nuts = nodes.nuts -local tonut = nuts.tonut -local getfont = nuts.getfont -local getchar = nuts.getchar -local getattr = nuts.getattr -local traverse_id = nuts.traverse_id - -function fontgoodies.report(what,trace,goodies) - if trace_goodies or trace then - local whatever = goodies[what] - if whatever then - report_goodies("goodie %a found in %a",what,goodies.name) - end - end -end - -local function loadgoodies(filename) -- maybe a merge is better - local goodies = data[filename] -- we assume no suffix is given - if goodies ~= nil then - -- found or tagged unfound - elseif type(filename) == "string" then - local fullname = findfile(file.addsuffix(filename,"lfg")) or "" -- prefered suffix - if fullname == "" then - fullname = findfile(file.addsuffix(filename,"lua")) or "" -- fallback suffix - end - if fullname == "" then - report_goodies("goodie file '%s.lfg' is not found",filename) - data[filename] = false -- signal for not found - else - goodies = dofile(fullname) or false - if not goodies then - report_goodies("goodie file %a is invalid",fullname) - return nil - elseif trace_goodies then - report_goodies("goodie file %a is loaded",fullname) - end - goodies.name = goodies.name or "no name" - for name, fnc in next, list do - if trace_goodies then - report_goodies("handling goodie %a",name) - end - fnc(goodies) - end - goodies.initialized = true - data[filename] = goodies - end - end - return goodies -end - -function fontgoodies.register(name,fnc) -- will be a proper sequencer - list[name] = fnc -end - -fontgoodies.load = loadgoodies - --- register goodies file - -local function setgoodies(tfmdata,value) - local goodies = tfmdata.goodies - if not goodies then -- actually an error - goodies = { } - tfmdata.goodies = goodies - end - for filename in gmatch(value,"[^, ]+") do - -- we need to check for duplicates - local ok = loadgoodies(filename) - if ok then - if trace_goodies then - report_goodies("assigning goodie %a",filename) - end - goodies[#goodies+1] = ok - end - end -end - --- this will be split into good-* files and this file might become good-ini.lua - --- featuresets - -local function flattenedfeatures(t,tt) - -- first set value dominates - local tt = tt or { } - for i=1,#t do - local ti = t[i] - if type(ti) == "table" then - flattenedfeatures(ti,tt) - elseif tt[ti] == nil then - tt[ti] = true - end - end - for k, v in next, t do - if type(k) ~= "number" then -- not tonumber(k) - if type(v) == "table" then - flattenedfeatures(v,tt) - elseif tt[k] == nil then - tt[k] = v - end - end - end - return tt -end - --- fonts.features.flattened = flattenedfeatures - -local function prepare_features(goodies,name,set) - if set then - local ff = flattenedfeatures(set) - local fullname = goodies.name .. "::" .. name - local n, s = fonts.specifiers.presetcontext(fullname,"",ff) - goodies.featuresets[name] = s -- set - if trace_goodies then - report_goodies("feature set %a gets number %a and name %a",name,n,fullname) - end - return n - end -end - -fontgoodies.prepare_features = prepare_features - -local function initialize(goodies,tfmdata) - local featuresets = goodies.featuresets - local goodiesname = goodies.name - if featuresets then - if trace_goodies then - report_goodies("checking featuresets in %a",goodies.name) - end - for name, set in next, featuresets do - prepare_features(goodies,name,set) - end - end -end - -fontgoodies.register("featureset",initialize) - -local function setfeatureset(tfmdata,set,features) - local goodies = tfmdata.goodies -- shared ? - if goodies then - local properties = tfmdata.properties - local what - for i=1,#goodies do - -- last one wins - local g = goodies[i] - what = g.featuresets and g.featuresets[set] or what - end - if what then - for feature, value in next, what do - if features[feature] == nil then - features[feature] = value - end - end - properties.mode = what.mode or properties.mode - end - end -end - --- postprocessors (we could hash processor and share code) - -function fontgoodies.registerpostprocessor(tfmdata,f,prepend) - local postprocessors = tfmdata.postprocessors - if not postprocessors then - tfmdata.postprocessors = { f } - elseif prepend then - table.insert(postprocessors,f,1) - else - table.insert(postprocessors,f) - end -end - -local function setpostprocessor(tfmdata,processor) - local goodies = tfmdata.goodies - if goodies and type(processor) == "string" then - local found = { } - local asked = utilities.parsers.settings_to_array(processor) - for i=1,#goodies do - local g = goodies[i] - local p = g.postprocessors - if p then - for i=1,#asked do - local a = asked[i] - local f = p[a] - if type(f) == "function" then - found[a] = f - end - end - end - end - local postprocessors = tfmdata.postprocessors or { } - for i=1,#asked do - local a = asked[i] - local f = found[a] - if f then - postprocessors[#postprocessors+1] = f - end - end - if #postprocessors > 0 then - tfmdata.postprocessors = postprocessors - end - end -end - --- colorschemes - -local colorschemes = fontgoodies.colorschemes or allocate { } -fontgoodies.colorschemes = colorschemes -colorschemes.data = colorschemes.data or { } - -local function setcolorscheme(tfmdata,scheme) - if type(scheme) == "string" then - local goodies = tfmdata.goodies - -- todo : check for already defined in shared - if goodies then - local what - for i=1,#goodies do - -- last one counts - local g = goodies[i] - what = g.colorschemes and g.colorschemes[scheme] or what - end - if type(what) == "table" then - -- this is font bound but we can share them if needed - -- just as we could hash the conversions (per font) - local hash = tfmdata.resources.unicodes - local reverse = { } - local characters = tfmdata.characters - for i=1,#what do - local w = what[i] - for j=1,#w do - local name = w[j] - if name == "*" then - -- inefficient but only used for tracing anyway - for _, unicode in next, hash do - reverse[unicode] = i - end - elseif type(name) == "number" then - reverse[name] = i - elseif find(name,":",1,true) then - local start, stop = splitup(name,":") - start = tonumber(start) - stop = tonumber(stop) - if start and stop then - -- limited usage: we only deal with non reassigned - -- maybe some day I'll also support the ones with a - -- tounicode in this range - for unicode=start,stop do - if characters[unicode] then - reverse[unicode] = i - end - end - end - else - local unicode = hash[name] - if unicode then - reverse[unicode] = i - end - end - end - end - tfmdata.properties.colorscheme = reverse - return - end - end - end - tfmdata.properties.colorscheme = false -end - -local fontproperties = fonts.hashes.properties - -local a_colorscheme = attributes.private('colorscheme') -local setnodecolor = nodes.tracers.colors.set - --- function colorschemes.coloring(head) --- local lastfont, lastscheme --- local done = false --- for n in traverse_id(glyph_code,tonut(head)) do --- local a = getattr(n,a_colorscheme) --- if a then --- local f = getfont(n) --- if f ~= lastfont then --- lastscheme = fontproperties[f].colorscheme --- lastfont = f --- end --- if lastscheme then --- local sc = lastscheme[getchar(n)] --- if sc then --- done = true --- setnodecolor(n,"colorscheme:"..a..":"..sc) -- slow --- end --- end --- end --- end --- return head, done --- end - --- seldom used, mostly in manuals, so non critical .. anyhow, somewhat faster: - --- function colorschemes.coloring(head) --- local lastfont = nil --- local lastattr = nil --- local lastscheme = nil --- local lastprefix = nil --- local done = nil --- for n in traverse_id(glyph_code,tonut(head)) do --- local a = getattr(n,a_colorscheme) --- if a then --- if a ~= lastattr then --- lastattr = a --- lastprefix = "colorscheme:" .. a .. ":" --- end --- local f = getfont(n) --- if f ~= lastfont then --- lastfont = f --- lastscheme = fontproperties[f].colorscheme --- end --- if lastscheme then --- local sc = lastscheme[getchar(n)] --- if sc then --- setnodecolor(n,lastprefix .. sc) -- slow --- done = true --- end --- end --- end --- end --- return head, done --- end - --- ok, in case we have hundreds of pages colored: - -local cache = { } -- this could be a weak table - -setmetatableindex(cache,function(t,a) - local v = { } - setmetatableindex(v,function(t,c) - local v = "colorscheme:" .. a .. ":" .. c - t[c] = v - return v - end) - t[a]= v - return v -end) - -function colorschemes.coloring(head) - local lastfont = nil - local lastattr = nil - local lastcache = nil - local lastscheme = nil - local done = nil - for n in traverse_id(glyph_code,tonut(head)) do - local a = getattr(n,a_colorscheme) - if a then - local f = getfont(n) - if f ~= lastfont then - lastfont = f - lastscheme = fontproperties[f].colorscheme - end - if a ~= lastattr then - lastattr = a - lastcache = cache[a] - end - if lastscheme then - local sc = lastscheme[getchar(n)] - if sc then - setnodecolor(n,lastcache[sc]) -- we could inline this one - done = true - end - end - end - end - return head, done -end - -function colorschemes.enable() - nodes.tasks.appendaction("processors","fonts","fonts.goodies.colorschemes.coloring") - function colorschemes.enable() end -end - -local function setextrafeatures(tfmdata) - local goodies = tfmdata.goodies - if goodies then - for i=1,#goodies do - local g = goodies[i] - local f = g.features - if f then - for feature, specification in next, f do - addotffeature(tfmdata.shared.rawdata,feature,specification) - registerotffeature { - name = feature, - description = formatters["extra: %s"](feature) - } - end - end - end - end -end - -local function setextensions(tfmdata) - local goodies = tfmdata.goodies - if goodies then - for i=1,#goodies do - local g = goodies[i] - local e = g.extensions - if e then - local goodie = g.name or "unknown" - for i=1,#e do - local name = "extension-" .. i - -- report_goodies("adding extension %s from %s",name,goodie) - otf.enhancers.addfeature(tfmdata.shared.rawdata,name,e[i]) - end - end - end - end -end - --- installation - -local goodies_specification = { - name = "goodies", - description = "goodies on top of built in features", - initializers = { - position = 1, - base = setgoodies, - node = setgoodies, - } -} - -registerotffeature(goodies_specification) -registerafmfeature(goodies_specification) -registertfmfeature(goodies_specification) - --- maybe more of the following could be for type one too - -registerotffeature { - name = "extrafeatures", - description = "extra features", - default = true, - initializers = { - position = 2, - base = setextrafeatures, - node = setextrafeatures, - } -} - -registerotffeature { - name = "extensions", - description = "extensions to features", - default = true, - initializers = { - position = 2, - base = setextensions, - node = setextensions, - } -} - -registerotffeature { - name = "featureset", - description = "goodie feature set", - initializers = { - position = 3, - base = setfeatureset, - node = setfeatureset, - } -} - -registerotffeature { - name = "colorscheme", - description = "goodie color scheme", - initializers = { - base = setcolorscheme, - node = setcolorscheme, - } -} - -registerotffeature { - name = "postprocessor", - description = "goodie postprocessor", - initializers = { - base = setpostprocessor, - node = setpostprocessor, - } -} - --- experiment, we have to load the definitions immediately as they precede --- the definition so they need to be initialized in the typescript - -local function initialize(goodies) - local mathgoodies = goodies.mathematics - if mathgoodies then - local virtuals = mathgoodies.virtuals - local mapfiles = mathgoodies.mapfiles - local maplines = mathgoodies.maplines - if virtuals then - for name, specification in next, virtuals do - -- beware, they are all constructed - mathematics.makefont(name,specification,goodies) - end - end - if mapfiles then - for i=1,#mapfiles do - fonts.mappings.loadfile(mapfiles[i]) -- todo: backend function - end - end - if maplines then - for i=1,#maplines do - fonts.mappings.loadline(maplines[i]) -- todo: backend function - end - end - end -end - -fontgoodies.register("mathematics", initialize) - --- the following takes care of explicit file specifications --- --- files = { --- name = "antykwapoltawskiego", --- list = { --- ["AntPoltLtCond-Regular.otf"] = { --- -- name = "antykwapoltawskiego", --- style = "regular", --- weight = "light", --- width = "condensed", --- }, --- }, --- } - --- math italics (not rteally needed) --- --- it would be nice to have a \noitalics\font option - -local function initialize(tfmdata) - local goodies = tfmdata.goodies - if goodies then - local shared = tfmdata.shared - for i=1,#goodies do - local mathgoodies = goodies[i].mathematics - local mathitalics = mathgoodies and mathgoodies.italics - if mathitalics then - local properties = tfmdata.properties - if properties.setitalics then - mathitalics = mathitalics[file.nameonly(properties.name)] or mathitalics - if mathitalics then - if trace_goodies then - report_goodies("loading mathitalics for font %a",properties.name) - end - local corrections = mathitalics.corrections - local defaultfactor = mathitalics.defaultfactor - -- properties.mathitalic_defaultfactor = defaultfactor -- we inherit outer one anyway (name will change) - if corrections then - fontgoodies.registerpostprocessor(tfmdata, function(tfmdata) -- this is another tfmdata (a copy) - -- better make a helper so that we have less code being defined - local properties = tfmdata.properties - local parameters = tfmdata.parameters - local characters = tfmdata.characters - properties.mathitalic_defaultfactor = defaultfactor - properties.mathitalic_defaultvalue = defaultfactor * parameters.quad - if trace_goodies then - report_goodies("assigning mathitalics for font %a",properties.name) - end - local quad = parameters.quad - local hfactor = parameters.hfactor - for k, v in next, corrections do - local c = characters[k] - if c then - if v > -1 and v < 1 then - c.italic = v * quad - else - c.italic = v * hfactor - end - else - report_goodies("invalid mathitalics entry %U for font %a",k,properties.name) - end - end - end) - end - return -- maybe not as these can accumulate - end - end - end - end - end -end - -registerotffeature { - name = "mathitalics", - description = "additional math italic corrections", - -- default = true, - initializers = { - base = initialize, - node = initialize, - } -} - --- fontgoodies.register("mathitalics", initialize) - --- files - -local function initialize(goodies) - local files = goodies.files - if files then - fonts.names.register(files) - end -end - -fontgoodies.register("files", initialize) - --- some day we will have a define command and then we can also do some --- proper tracing --- --- fonts.typefaces["antykwapoltawskiego-condensed"] = { --- shortcut = "rm", --- shape = "serif", --- fontname = "antykwapoltawskiego", --- normalweight = "light", --- boldweight = "medium", --- width = "condensed", --- size = "default", --- features = "default", --- } - -local function initialize(goodies) - local typefaces = goodies.typefaces - if typefaces then - local ft = fonts.typefaces - for k, v in next, typefaces do - ft[k] = v - end - end -end - -fontgoodies.register("typefaces", initialize) - -local compositions = { } - -function fontgoodies.getcompositions(tfmdata) - return compositions[file.nameonly(tfmdata.properties.filename or "")] -end - -local function initialize(goodies) - local gc = goodies.compositions - if gc then - for k, v in next, gc do - compositions[k] = v - end - end -end - -fontgoodies.register("compositions", initialize) - --- extra treatments (on top of defaults): \loadfontgoodies[mytreatments] - -local treatmentdata = fonts.treatments.data - -local function initialize(goodies) - local treatments = goodies.treatments - if treatments then - for name, data in next, treatments do - treatmentdata[name] = data -- always wins - end - end -end - -fontgoodies.register("treatments", initialize) - -local filenames = fontgoodies.filenames or allocate() -fontgoodies.filenames = filenames - -local filedata = filenames.data or allocate() -filenames.data = filedata - -local function initialize(goodies) -- design sizes are registered global - local fn = goodies.filenames - if fn then - for usedname, alternativenames in next, fn do - filedata[usedname] = alternativenames - end - end -end - -fontgoodies.register("filenames", initialize) - -function fontgoodies.filenames.resolve(name) - local fd = filedata[name] - if fd and findfile(name) == "" then - for i=1,#fd do - local fn = fd[i] - if findfile(fn) ~= "" then - return fn - end - end - else - -- no lookup, just use the regular mechanism - end - return name -end - -local designsizes = fontgoodies.designsizes or allocate() -fontgoodies.designsizes = designsizes - -local designdata = designsizes.data or allocate() -designsizes.data = designdata - -local function initialize(goodies) -- design sizes are registered global - local gd = goodies.designsizes - if gd then - for name, data in next, gd do - local ranges = { } - for size, file in next, data do - if size ~= "default" then - ranges[#ranges+1] = { texsp(size), file } -- also lower(file) - end - end - table.sort(ranges,function(a,b) return a[1] < b[1] end) - designdata[lower(name)] = { -- overloads, doesn't merge! - default = data.default, - ranges = ranges, - } - end - end -end - -fontgoodies.register("designsizes", initialize) - -function fontgoodies.designsizes.register(name,size,specification) - local d = designdata[name] - if not d then - d = { - ranges = { }, - default = nil, -- so we have no default set - } - designdata[name] = d - end - if size == "default" then - d.default = specification - else - if type(size) == "string" then - size = texsp(size) -- hm - end - local ranges = d.ranges - ranges[#ranges+1] = { size, specification } - end -end - -function fontgoodies.designsizes.filename(name,spec,size) -- returns nil of no match - local data = designdata[lower(name)] - if data then - if not spec or spec == "" or spec == "default" then - return data.default - elseif spec == "auto" then - local ranges = data.ranges - if ranges then - for i=1,#ranges do - local r = ranges[i] - if r[1] >= size then -- todo: rounding so maybe size - 100 - return r[2] - end - end - end - return data.default or (ranges and ranges[#ranges][2]) - end - end -end - --- The following file (husayni.lfg) is the experimental setup that we used --- for Idris font. For the moment we don't store this in the cache and quite --- probably these files sit in one of the paths: --- --- tex/context/fonts/goodies --- tex/fonts/goodies/context --- tex/fonts/data/foundry/collection --- --- see lfg files in distribution - --- interface - -implement { - name = "loadfontgoodies", - actions = fontgoodies.load, - arguments = "string", - overload = true, -- for now, permits new font loader -} - -implement { - name = "enablefontcolorschemes", - onlyonce = true, - actions = colorschemes.enable, - overload = true, -- for now, permits new font loader -} - --- weird place ... depends on math - -local function finalize(tfmdata,feature,value) - mathematics.overloaddimensions(tfmdata,tfmdata,value) -end - -registerotffeature { - name = "mathdimensions", - description = "manipulate math dimensions", - -- default = true, - manipulators = { - base = finalize, - node = finalize, - } -} - --- kern hackery: --- --- yes : use goodies table --- auto : assume features to be set (often ccmp only) - -local function setkeepligatures(tfmdata,value) - if not tfmdata.properties.keptligatures then - local goodies = tfmdata.goodies - if goodies then - for i=1,#goodies do - local g = goodies[i] - local letterspacing = g.letterspacing - if letterspacing then - local keptligatures = letterspacing.keptligatures - if keptligatures then - local unicodes = tfmdata.resources.unicodes -- so we accept names - local hash = { } - for k, v in next, keptligatures do - local u = unicodes[k] - if u then - hash[u] = true - else - -- error: unknown name - end - end - tfmdata.properties.keptligatures = hash - end - end - end - end - end -end - -registerotffeature { - name = "keepligatures", - description = "keep ligatures in letterspacing", - initializers = { - base = setkeepligatures, - node = setkeepligatures, - } -} diff --git a/tex/context/base/mkiv/font-map.lua b/tex/context/base/mkiv/font-map.lua index cf369708c..706c5b709 100644 --- a/tex/context/base/mkiv/font-map.lua +++ b/tex/context/base/mkiv/font-map.lua @@ -19,9 +19,9 @@ local trace_mapping = false trackers.register("fonts.mapping", function(v) trac local report_fonts = logs.reporter("fonts","loading") -- not otf only --- force_ligatures is true per 2017-04-20 so that these emoji's with bad names work too +-- force_ligatures was true for a while so that these emoji's with bad names work too -local force_ligatures = true directives.register("fonts.mapping.forceligatures",function(v) force_ligatures = v end) +local force_ligatures = false directives.register("fonts.mapping.forceligatures",function(v) force_ligatures = v end) local fonts = fonts or { } local mappings = fonts.mappings or { } @@ -279,6 +279,9 @@ do ffl = { name = "f_f_l", unicode = { 0x66, 0x66, 0x6C }, mess = 0xFB04 }, fj = { name = "f_j", unicode = { 0x66, 0x6A } }, fk = { name = "f_k", unicode = { 0x66, 0x6B } }, + + -- endash = { name = "endash", unicode = 0x2013, mess = 0x2013 }, + -- emdash = { name = "emdash", unicode = 0x2014, mess = 0x2014 }, } local o = { } @@ -299,7 +302,7 @@ do end -function mappings.addtounicode(data,filename,checklookups) +function mappings.addtounicode(data,filename,checklookups,forceligatures) local resources = data.resources local unicodes = resources.unicodes if not unicodes then @@ -517,22 +520,26 @@ function mappings.addtounicode(data,filename,checklookups) if not collected then -- move on - elseif force_ligatures then + elseif forceligatures or force_ligatures then for i=1,#dlist do local du = dlist[i] - local u = collected[du] -- always tables - if u then - resolve(descriptions[du],u) + if du >= private or (du >= 0xE000 and du <= 0xF8FF) then + local u = collected[du] -- always tables + if u then + resolve(descriptions[du],u) + end end end else for i=1,#dlist do - local du = dlist[i] - local glyph = descriptions[du] - if glyph.class == "ligature" and not glyph.unicode then - local u = collected[du] -- always tables - if u then - resolve(glyph,u) + local du = dlist[i] + if du >= private or (du >= 0xE000 and du <= 0xF8FF) then + local glyph = descriptions[du] + if glyph.class == "ligature" and not glyph.unicode then + local u = collected[du] -- always tables + if u then + resolve(glyph,u) + end end end end diff --git a/tex/context/base/mkiv/font-ocl.lua b/tex/context/base/mkiv/font-ocl.lua index c166f5ce4..2ecf1ba42 100644 --- a/tex/context/base/mkiv/font-ocl.lua +++ b/tex/context/base/mkiv/font-ocl.lua @@ -40,7 +40,7 @@ else function otf.getactualtext(s) return - "/Span << /ActualText >> BDC", + "/Span << /ActualText >> BDC", "EMC" end diff --git a/tex/context/base/mkiv/font-otj.lua b/tex/context/base/mkiv/font-otj.lua index 634f8a83c..2c79500e7 100644 --- a/tex/context/base/mkiv/font-otj.lua +++ b/tex/context/base/mkiv/font-otj.lua @@ -1434,6 +1434,35 @@ function injections.isspace(n,threshold,id) end end +-- We have a plugin so that Kai can use the next in plain. Such a plugin is rather application +-- specific. +-- +-- local getboth = nodes.direct.getboth +-- local getid = nodes.direct.getid +-- local getprev = nodes.direct.getprev +-- local getnext = nodes.direct.getnext +-- +-- local whatsit_code = nodes.nodecodes.whatsit +-- local glyph_code = nodes.nodecodes.glyph +-- +-- local function getspaceboth(n) -- fragile: what it prev/next has no width field +-- local prev, next = getboth(n) +-- while prev and (getid(prev) == whatsit_code or (getwidth(prev) == 0 and getid(prev) ~= glyph_code)) do +-- prev = getprev(prev) +-- end +-- while next and (getid(next) == whatsit_code or (getwidth(next) == 0 and getid(next) ~= glyph_code)) do +-- next = getnext(next) +-- end +-- end +-- +-- injections.installgetspaceboth(getspaceboth) + +local getspaceboth = getboth + +function injections.installgetspaceboth(gb) + getspaceboth = gb or getboth +end + local function injectspaces(head) if not triggers then @@ -1458,9 +1487,9 @@ local function injectspaces(head) end for n in traverse_id(glue_code,tonut(head)) do - local prev, next = getboth(n) - local prevchar = ischar(prev) - local nextchar = ischar(next) + local prev, next = getspaceboth(n) + local prevchar = prev and ischar(prev) + local nextchar = next and ischar(next) if nextchar then local font = getfont(next) local trig = triggers[font] diff --git a/tex/context/base/mkiv/font-ots.lua b/tex/context/base/mkiv/font-ots.lua index 16c2ce735..04ecaa923 100644 --- a/tex/context/base/mkiv/font-ots.lua +++ b/tex/context/base/mkiv/font-ots.lua @@ -4289,9 +4289,9 @@ local function spaceinitializer(tfmdata,value) -- attr if type(kern) ~= "table" then left[k] = kern elseif single then - left[k] = v[3] + left[k] = kern[3] else - local one = v[1] + local one = kern[1] if one then left[k] = one[3] end diff --git a/tex/context/base/mkiv/font-tmp.lua b/tex/context/base/mkiv/font-tmp.lua deleted file mode 100644 index 8db5cff14..000000000 --- a/tex/context/base/mkiv/font-tmp.lua +++ /dev/null @@ -1,118 +0,0 @@ -if not modules then modules = { } end modules ['font-tmp'] = { - version = 1.001, - comment = "companion to font-ini.mkiv", - author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", - copyright = "PRAGMA ADE / ConTeXt Development Team", - license = "see context related readme files" -} - --- There is a complete feature loader but it needs a bit of testing, first so this --- one does design size only (as needed for identifying). - -local next, type = next, type - -local report = logs.reporter("otf reader") - -local readers = fonts.handlers.otf.readers -local streamreader = readers.streamreader - -local readushort = streamreader.readcardinal2 -- 16-bit unsigned integer -local readulong = streamreader.readcardinal4 -- 24-bit unsigned integer -local readshort = streamreader.readinteger2 -- 16-bit signed integer -local readtag = streamreader.readtag -local skipshort = streamreader.skipshort -local setposition = streamreader.setposition - -local plugins = { } - -function plugins.size(f,fontdata,tableoffset,parameters) - if not fontdata.designsize then - setposition(f,tableoffset+parameters) - local designsize = readushort(f) - if designsize > 0 then - fontdata.designsize = designsize - skipshort(f,2) - fontdata.minsize = readushort(f) - fontdata.maxsize = readushort(f) - end - end -end - -local function readscripts(f,fontdata,what) - local datatable = fontdata.tables[what] - if not datatable then - return - end - local tableoffset = datatable.offset - setposition(f,tableoffset) - local version = readulong(f) - if version ~= 0x00010000 then - report("table version %a of %a is not supported (yet), maybe font %s is bad",version,what,fontdata.filename) - return - end - -- - local scriptoffset = tableoffset + readushort(f) - local featureoffset = tableoffset + readushort(f) - local lookupoffset = tableoffset + readushort(f) - -- - setposition(f,scriptoffset) - local nofscripts = readushort(f) - local scripts = { } - for i=1,nofscripts do - scripts[readtag(f)] = scriptoffset + readushort(f) - end - local languagesystems = table.setmetatableindex("table") -- we share when possible - for script, offset in next, scripts do - setposition(f,offset) - local defaultoffset = readushort(f) - local noflanguages = readushort(f) - local languages = { } - if defaultoffset > 0 then - languages.dflt = languagesystems[offset + defaultoffset] - end - for i=1,noflanguages do - local language = readtag(f) - local offset = offset + readushort(f) - languages[language] = languagesystems[offset] - end - scripts[script] = languages - end - -- - setposition(f,featureoffset) - local features = { } - local noffeatures = readushort(f) - for i=1,noffeatures do - features[i] = { - tag = readtag(f), - offset = readushort(f) - } - end - -- - for i=1,noffeatures do - local feature = features[i] - local offset = featureoffset + feature.offset - setposition(f,offset) - local parameters = readushort(f) -- feature.parameters - local noflookups = readushort(f) - skipshort(f,noflookups+1) - if parameters > 0 then - feature.parameters = parameters - local plugin = plugins[feature.tag] - if plugin then - plugin(f,fontdata,offset,parameters) - end - end - end -end - -function readers.gsub(f,fontdata,specification) - if specification.details then - readscripts(f,fontdata,"gsub") - end -end - -function readers.gpos(f,fontdata,specification) - if specification.details then - readscripts(f,fontdata,"gpos") - end -end diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index ccf6de7ab..56ab3aa69 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index 37f242020..85a976f79 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ diff --git a/tex/context/interface/mkii/cont-en.xml b/tex/context/interface/mkii/cont-en.xml deleted file mode 100644 index 59a6bf6bb..000000000 --- a/tex/context/interface/mkii/cont-en.xml +++ /dev/null @@ -1,10396 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index 27a797b07..9d3fa3314 100644 Binary files a/tex/context/interface/mkiv/i-context.pdf and b/tex/context/interface/mkiv/i-context.pdf differ diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf index e08b84165..daf6f6248 100644 Binary files a/tex/context/interface/mkiv/i-readme.pdf and b/tex/context/interface/mkiv/i-readme.pdf differ diff --git a/tex/context/modules/common/s-mag-01.tex b/tex/context/modules/common/s-mag-01.tex deleted file mode 100644 index e2d30f4e5..000000000 --- a/tex/context/modules/common/s-mag-01.tex +++ /dev/null @@ -1,438 +0,0 @@ -%D \module -%D [ file=s-mag-01, -%D version=2002.12.14, -%D title=\CONTEXT\ Style File, -%D subtitle=\CONTEXT\ Magazine Base Style, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -% This style is used for producing explanationary documents. -% Don't misuse it for other purposes, since it may confuse -% users. Don't change the title either, since it provides a -% way to categorize documents. Numbers are disabled in -% instances produced outside PRAGMA ADE. -% -% The layout setup is such that one has several text areas -% available: headers and footers, margins and edges as well -% as the main text area. The surrounding (gray) makes the -% main page stand out and is suitable for viewing in spread -% mode. -% -% Since this style is under constant construction, messing -% around with settings will produce unwanted side effects. -% So, if some feature or settings is needed, let me know. - -% todo: mp frames - -\setvariables[magazine][number=0] -\setvariables[magazine][author=] -\setvariables[magazine][title={Zero Issue}] -\setvariables[magazine][date=\currentdate] - -% These are reserved for PRAGMA-ADE, don't use them yourself! - -% \setvariables[magazine][main=Tricky] -% \setvariables[magazine][main=Update] -% \setvariables[magazine][main=HOWTO] - -% \setvariables[magazine][main=This Way] % preludes to a/the manual -% \setvariables[magazine][main=A Better Way] % dirty versus clean -% \setvariables[magazine][main=No Way] % how users should not do it -% \setvariables[magazine][main=Your Way] % how users do it -% \setvariables[magazine][main=My Way] % how users do it -% \setvariables[magazine][main=Our Way] % how we do things at pragma -% \setvariables[magazine][main=Their Way] % how to do latex things in context - -\setvariables[magazine][main=My Way] - -\startmode[atpragma] - \setvariables[magazine][main=This Way] -\stopmode - -\definepapersize - [magazine] - [width=\dimexpr\paperwidth-.1\paperwidth\relax, - height=\dimexpr\paperheight-.1\paperheight\relax] - -\setuppapersize - [magazine] - [A4] - -\setupinteractionscreen - [option=doublesided] - -\definecolor[OuterColor][s=.3] -\definecolor[InnerColor][s=.8] -\definecolor[MainColor] [s=.2] -\definecolor[TitleColor][s=.7] - -\definecolor[MyRed] [r=.6] -\definecolor[MyGreen][g=.6] -\definecolor[MyBlue] [b=.6] - -\startuseMPgraphic{paper} - sh := define_circular_shade(a,a,0,bbheight(OverlayBox), - \MPcolor{InnerColor},\MPcolor{OuterColor}) ; - fill OverlayBox withshade sh ; -\stopuseMPgraphic - -\startreusableMPgraphic{middlepaper} - pair a ; a := center OverlayBox ; - \includeMPgraphic{paper} -\stopreusableMPgraphic - -\startreusableMPgraphic{rightpaper} - pair a ; a := .5[urcorner OverlayBox,lrcorner OverlayBox] ; - \includeMPgraphic{paper} -\stopreusableMPgraphic - -\startreusableMPgraphic{leftpaper} - pair a ; a := .5[ulcorner OverlayBox,llcorner OverlayBox] ; - \includeMPgraphic{paper} -\stopreusableMPgraphic - -\startreusableMPgraphic{page} - fill OverlayBox withcolor white ; -\stopreusableMPgraphic - -\startusableMPgraphic{text} - StartPage ; - for i = Header,Text,Footer : - for j = LeftEdge, LeftMargin, Text, RightMargin, RightEdge : - draw Field[i][j] withpen pencircle scaled .5pt ; - endfor ; - endfor ; - StopPage ; - setbounds currentpicture to Field[Text][Text] ; -\stopusableMPgraphic - -\startsetups[paper] - - \doifmodeelse{*makeup} - {\reuseMPgraphic{middlepaper}} - {\doifoddpageelse - {\reuseMPgraphic{rightpaper}} - {\reuseMPgraphic{leftpaper}}} - -\stopsetups - -\defineoverlay[paper] [\setups{paper}] -\defineoverlay[page] [\reuseMPgraphic{page}] -\defineoverlay[text] [\doifmode{frame}{\useMPgraphic{text}}] - -\setupbackgrounds [paper] [background=paper] -\setupbackgrounds [page] [background={page,title}] -\setupbackgrounds [text] [background=text] - -\definelayer - [title] - [state=repeat, - hoffset=-1cm, - voffset=1cm, - width=\paperwidth, - height=\paperheight] - -\setupoutput - [pdftex] - -\setuplayout - [width=middle, - topspace=1.5cm, - height=middle, - header=1.5cm, - footer=1cm, - %grid=yes, - headerdistance=.25cm, - footerdistance=.5cm, - backspace=3cm, - margin=1.5cm, - margindistance=.25cm, - edge=.75cm, - edgedistance=.25cm, - bottomdistance=1.5cm, - bottom=.1\printpaperheight] - -\definelayout - [makeup] - [topspace=1cm, - backspace=1cm, - header=0pt, - footer=0pt, - bottom=0pt] - -\setuppagenumbering - [alternative=doublesided] - -\setupcolors - [state=start] - -\usetypescript - [palatino][\defaultencoding] - -\setupbodyfont - [palatino,10pt] - -\setuptolerance - [verytolerant,stretch] - -\appendtoks\setups[papershift]\to\beforeeverypage - -\startsetups[papershift] - - \setuppapersize[top=\vskip.5cm,bottom=\vss] - - \doifmodeelse{*makeup} - {\setuppapersize[left=\hfill,right=\hfill]} - {\doifoddpageelse - {\setuppapersize[right=\hfill]} - {\setuppapersize[left=\hfill]}} - -\stopsetups - -\setupbottomtexts - [\setups{rightbanner}] [] - [] [\setups{leftbanner}] - -\startsetups [leftbanner] - - \definedfont[Regular at \the\bottomheight] - \setbox\scratchbox\hbox{\TitleColor\getvariable{magazine}{main}} - \ht\scratchbox1ex - \dp\scratchbox\zeropoint - \MainColor - \definedfont[Regular sa 2] - \doifsomething{\getvariable{magazine}{number}} - {\doifnot{\getvariable{magazine}{number}}{0} - {\#\getvariable{magazine}{number}}} - \quad - \currentdate - \quad - \scale[height=.25\bottomheight]{\box\scratchbox} - \quad - \hbox to 1.5em{\hss\pagenumber\hss} - \quad - \hskip-\backspace - -\stopsetups - -\startsetups [rightbanner] - - \definedfont[Regular at \the\bottomheight] - \setbox\scratchbox\hbox{\TitleColor\getvariable{magazine}{main}} - \ht\scratchbox1ex - \dp\scratchbox\zeropoint - \MainColor - \hskip-\backspace - \definedfont[Regular sa 2] - \quad - \hbox to 1.5em{\hss\pagenumber\hss} - \quad - \scale[height=.25\bottomheight]{\box\scratchbox} - \quad - \currentdate - \quad - \doifmode{atpragma}{\#\getvariable{magazine}{number}} - -\stopsetups - -\startsetups[titlepage] - - \disablemode[frame] - - \setuplayout[makeup] - - \startstandardmakeup[doublesided=no] - - \dontcomplain - - \definelayer - [makeup] - [width=\textwidth, - height=\textheight] - - \setlayerframed - [makeup] - [corner={left,top},location={right,bottom}] - [frame=off, - foregroundcolor=MainColor] - {\scale - [width=\makeupwidth] - {\definedfont[Regular sa 10]% - \getvariable{magazine}{main}}} - - \setlayerframed - [makeup] - [corner={right,top},location={left},y=.4\textheight] - [frame=off, - foregroundcolor=MainColor, - width=\textwidth, - align=left] - {\definedfont[Regular sa 2.5]\setupinterlinespace - \startmode[atpragma] - \strut \ConTeXt\ magazine \#\getvariable{magazine}{number}\endgraf - \stopmode - \strut \getvariable{magazine}{date} \endgraf - \blank - \strut \getvariable{magazine}{title}\endgraf - \doifsomething{\getvariable{magazine}{author}} - {\strut \getvariable{magazine}{author}\endgraf} - \doifsomething{\getvariable{magazine}{affiliation}} - {\strut \getvariable{magazine}{affiliation}\endgraf}} - - \setlayerframed - [makeup] - [corner={right,bottom},location={left,top}] - [frame=off, - align=normal, - width=.8\textwidth, - foregroundcolor=MainColor] - {\getbuffer[abstract]} - - \flushlayer[makeup] - - \stopstandardmakeup - - \setuplayout[reset] - -\stopsetups - -\startsetups[listing] - - \page \disablemode[frame] - - \setuptexttexts [][] \setuptexttexts [] - \setupheadertexts[][] \setupheadertexts[source code of this document] - \setupfootertexts[][] \setupfootertexts[] - - \start \dontcomplain - - \typefile[TEX]{\inputfilename} - - \stop - -\stopsetups - -\startsetups[lastpage] - - \page \disablemode[frame] \page[even] - - \doifoddpageelse - {} - {\setuplayout[makeup] - \startstandardmakeup[doublesided=no,page=] - \stopstandardmakeup - \setuplayout[reset]} - -\stopsetups - -\startsetups[title] - - \disablemode[frame] - - \setlayerframed - [title] - [corner={left,top},location={left,bottom}, - rotation=90] - [frame=off, - foregroundcolor=MainColor] - {\definedfont[RegularBold sa 2]\strut\getvariable{magazine}{title}} - - \setlayerframed - [title] - [corner={right,top}, - rotation=270] - [frame=off, - foregroundcolor=MainColor] - {\definedfont[RegularBold sa 2]\strut\getvariable{magazine}{title}} - -\stopsetups - -\startbuffer[abstract] - % no abstract -\stopbuffer - -\setuphead - [chapter] - [page=yes, - after={\blank[2*big]}, - color=MainColor, - style=\bfc] - -\setuphead - [section] - [before={\blank[2*big]}, - after=\blank, - color=MainColor, - style=\bfb] - -\setuphead - [subsection] - [before=\blank, - after=, - color=MainColor, - style=\bf] - -\setupwhitespace - [big] - -\definetyping[xtyping] [style=\ttx] -\definetyping[xxtyping][style=\ttxx] - -\definetypeface - [narrowtt] [tt] - [mono] [modern-cond] [default] [encoding=\defaultencoding] - -\definetyping[ntyping] \setuptyping[ntyping][style=\narrowtt] -\definetype [ntype] \setuptype [ntype] [style=\narrowtt] - -\doifnotmode{demo}{\endinput} - -% \usemodule[mag-01] - -\setvariables - [magazine] - [title={Introduction}, - author=Hans Hagen, - affiliation=PRAGMA ADE, - date=Januari 2003, - number=0] - -\startbuffer[abstract] - This is the zero issue of a semi periodical. The - associated style can be used by \CONTEXT\ users to - typeset and publish their own issues. -\stopbuffer - -\starttext \setups [titlepage] \setups [title] - -\setupheadertexts[welcome] - -This is the zero issue of a range of \CONTEXT\ related -publications, in most cases short introductions to new -functionality. The style may be used by users for providing -similar documents, but preferably not for other purposes, -since it may confuse readers in their expectations. - -We've chosen a layout which is more functional than -beautiful. This layout provides several text areas: headers -and footers, margins and edges as well as a main text area. -The surrounding (gray) makes the main page (which is -slightly smaller than A4) stand out and is suitable for -viewing in spread mode. - -The documents produced at \PRAGMA\ are called {\bf This -Way}, user documents gets the title {\bf My Way}. The -\PRAGMA\ issues are numbered. We strongly advise you not to -use the \type {mag-} prefix for your issues, since this may -lead to clashes with files distributed by \PRAGMA. - -\setups [listing] - -\setups [lastpage] - -\stoptext diff --git a/tex/context/modules/common/s-pre-01.tex b/tex/context/modules/common/s-pre-01.tex deleted file mode 100644 index 89c5642f9..000000000 --- a/tex/context/modules/common/s-pre-01.tex +++ /dev/null @@ -1,404 +0,0 @@ -%D \module -%D [ file=s-pre-01, -%D version=1997.07.22, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 1, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D This environment can be used to typeset interactive -%D presentations. This module was first used at the 1997 \TUG\ -%D meeting. - -\usemodule[pre-general] - -%D \macros -%D {language} -%D -%D Because this module is defined in english, we default to the -%D english hyphenation patterns and labels too. - -\language - [en] - -%D \macros -%D {setupbodyfont,setuplayout} -%D -%D For screen reading, a Lucida Bright font looks nice. We use -%D a 14.4 point bodyfont for the main text, but switch back to -%D 12 points for ornaments. - -\startmode[asintended] \setupbodyfont[lbr] \stopmode - -\setupbodyfont[14.4pt] - -\setuplayout - [style=smallbodyfont] - -%D \macros -%D {setupcolors,definecolor} -%D -%D Screen presentations without color just look dull, so we -%D enable color support. We define ourselves a yellowish -%D backgroundcolor and a not too dark blue interactioncolor. - -\setupcolors - [state=start] - -\definecolor [BackgroundColor] [r=1, g=1, b=.7] -\definecolor [InteractionColor] [r=.1, g=.5, b=.8] -\definecolor [ContrastColor] [r=.9, g=.5, b=.2] - -%D \macros -%D {setuppapersize,setuplayout,setupinteractionscreen} -%D -%D -%D We use a nice large screen, and dedicate the right edge and -%D bottom part to navigational tools. We automatically set -%D the width and height of the page and start up full screen. - -\setuppapersize - [S6][S6] - -\setuplayout - [topspace=12pt, - header=0pt, - footer=0pt, - height=402pt, % 450 - 12 - 15 - 12 - 12 + 3 - bottomdistance=15pt, - bottom=12pt, - backspace=12pt, - margin=0pt, - width=fit, - edgedistance=12pt, - rightedge=96pt] - -\setupinteractionscreen - [option=max] - -%D \macros -%D {setupbackgrounds} -%D -%D We set the pagecolor to yellow except the part of the screen -%D that is used to display the running text. By seting the -%D offset to 3pt the text will not touch the yellow parts. We -%D do not set the depth. - -\setupbackgrounds - [page] - [background=color, - backgroundcolor=BackgroundColor, - offset=3pt] - -\setupbackgrounds - [text][text] - [background=color, - backgroundcolor=white] - -%D I considered the next setup too, but finaly decided to -%D comment it out. -%D -%D \starttyping -%D \setupbackgrounds -%D [bottom][text] -%D [frame=on, -%D framecolor=white] -%D \stoptyping - -%D \macros -%D {setupinteraction} -%D -%D We did not enable interactive text support yet, so let's do -%D that now. We force page reference to circumvent problems -%D with named destinations in buggy viewers. - -\setupinteraction - [page=yes, - color=InteractionColor, - contrastcolor=ContrastColor, - menu=on, - state=start] - -%D \macros -%D {setupinteractionmenu,startinteractionmenu} -%D -%D At the bottom of the screen we show two navigational bars. -%D At the left we show the subpage bar, at the right we use a -%D non default backward|/|forward bar. - -\setupinteractionmenu - [bottom] - [leftoffset=-3pt, - rightoffset=-3pt] - -\startinteractionmenu[bottom] - \txt \InteractionBar \\ - \txt \InteractionButtons \\ -\stopinteractionmenu - -%D \macros -%D {interactionbar} -%D -%D The left bar gets a white border (on the yellow background). -%D Because we don't want to typeset an empty frame when no -%D subpage bar is shown, we check for the number of subpages. - -\def\InteractionBar% - {\ifnum\nofsubpages>1 - \framed - [framecolor=white,rulethickness=1pt, - height=\bottomheight,strut=no] - {\interactionbar[alternative=f,width=.5\makeupwidth,height=1ex]} - \fi} - -%D \macros -%D {setupinteractionbar, interactionbuttons} -%D -%D The right hand buttons enable us to jump backward and forward, -%D as well as to the previous and next jump. We also enable to -%D close the presentation. - -\setupinteractionbar - [framecolor=white,rulethickness=1pt, - height=\bottomheight,strut=no] - -\def\InteractionButtons% - {\interactionbuttons - [width=15em] - [PreviousJump,NextJump, - firstpage, - firstsubpage,previouspage,nextpage,lastsubpage, - lastpage, - CloseDocument]} - -%D \macros -%D {StartTitlePage, TitlePage} -%D -%D The titlepage is rather simple and can be typeset in two -%D ways: -%D -%D \starttyping -%D \StartTitlePage -%D text \\ text \\ text -%D \StopTitlepage -%D \stoptyping -%D -%D or more straightforward: -%D -%D \starttyping -%D \TitlePage{text\\text\\text} -%D \stoptyping -%D -%D The first alternative can be used for more complicated -%D title pages. - -\def\StartTitlePage% - {\startstandardmakeup - \bfd\setupinterlinespace - \setupalign[middle] - \vfil - \let\\=\vfil} - -\def\StopTitlePage% - {\vfil\vfil\vfil - \stopstandardmakeup} - -\def\TitlePage#1% - {\StartTitlePage#1\StopTitlePage} - -%D \macros -%D {TitlePage, Topics, Topic, Subject} -%D -%D A presentation after loading this module looks like: -%D -%D \starttyping -%D \TitlePage {About Whatever\\Topics} -%D -%D \Topics {Todays Talk} -%D -%D \Topic {Some topic} -%D -%D \Subject {Alfa} -%D -%D ..... -%D -%D \Subject {Beta} -%D -%D ..... -%D \stoptyping - -%D \macros -%D {definehead} -%D -%D The commands \type{\Topic} and \type{\Subject} are defined -%D as copies of head. We use \type{\Nopic} for internal -%D purposes. - -\definehead [Topic] [chapter] -\definehead [Subject] [section] - -\definehead [Nopic] [title] - -%D \macros -%D {setuphead} -%D -%D Because chapters and sections do not make sense in -%D presentations, we use our own command for typesetting the -%D titles. Sectionnumbers are of course hidden from viewing. -%D Each topic is followed by a list of subjects that belong -%D to the topic. - -\setuphead - [Topic, Nopic, Subject] - [command=\HeadLine, - page=yes, - style=\tfb, - after=\blank, - sectionnumber=no] - -\setuphead - [Topic] - [after=\PlaceSubjectList] - -\setuphead - [Subject] - [continue=no] - -%D \macros -%D {framed, midalined} -%D -%D The command used to typeset the head lines is rather simple. -%D We just center the framed title. The frame macro optimizes -%D the alignment and at the same time enables us to typeset a -%D nice colored rule. - -\def\HeadLine#1#2% - {\midaligned - {\framed - [framecolor=BackgroundColor,rulethickness=1pt, - width=.8\hsize,align=middle,strut=no] - {#2}}} - -%D \macros -%D {setuplist} -%D -%D The subject list is automatically placed. We center each -%D subject line by using one of the default alternatives (g). We -%D could have said: -%D -%D \starttyping -%D \setuplist -%D [Subject] -%D [alternative=none, -%D command=\SubjectListLine, -%D interaction=all] -%D -%D \def\SubjectListLine#1#2#3% -%D {\midaligned{#2}} -%D \stoptyping -%D -%D But why should we complicate things when we can use -%D alternative~\type{g}. The test is only needed if one -%D does not automatically goes a new page with each subject. - -\def\PlaceSubjectList% - {\blank - \determinelistcharacteristics[Subject] - % \ifnum\utilitylistlength>0 \placelist[Subject] \fi} - \doifmode{*list}{\placelist[Subject]}} - -\setuplist - [Subject, Topic] - [alternative=g, - interaction=all, - before=, - after=] - -% %D \macros -% %D {setuptexttexts} -% %D -% %D The topics will be listed in the right edge, using: -% -% \setuptexttexts -% [edge] -% [][\TopicList] - -%D \macros -%D {setuplist, placelist,startinteractionmenu} -%D -%D The actual topic list is typeset using a \type{\vbox}. We -%D have to specify \type{criteriumcriterium=all} because otherwise no -%D list will be typeset. (By default lists are typeset -%D locally.) - -\startinteractionmenu[right] - \placelist - [Topic] - [alternative=f, % command, % none, - maxwidth=\hsize, - width=\hsize, - offset=0pt, - criterium=all, - align=left, - style=\setsmallbodyfont\bfx] -\stopinteractionmenu - -\def\Topics#1% temporary hack - {\Nopic{#1} - \placelist[Topic][criterium=all]} - -\def\Subjects% - {} - -%D \macros -%D {setuptexttexts, button} -%D -%D During a presentation, we want to use the cursor to point to -%D parts of the text. Furthermore we want to be able to jump to -%D the next page, without the need to move the cursor on buttons. -%D Therefore we make the text part of the screen into an -%D invisible button. - -\setuptexttexts - [\GotoNextPage][] - -\def\GotoNextPage - {\button[width=\hsize,height=\vsize,frame=off]{}[nextpage]} - -%D \macros -%D {setupsubpagenumber} -%D -%D The left bottom navigation bar shows the subpages, which will -%D be counted by text. One can change this in the preentation -%D itself by saying \type {[way=byTopic]}. - -\setupsubpagenumber - [way=bytext, % Topic, - state=start] - -\doifnotmode{demo}{\endinput} - -%D The (rather silly) demo section. - -\starttext - -\TitlePage{Title Page\\pre-original} - -\Topics{Some Nice Quotes} - -\Topic{A Few} - -\Subject{Knuth} \input knuth -\Subject{Tufte} \input tufte - -\Topic{Some More} - -\Subject{Zapf} \input zapf -\Subject{Bryson} \input bryson - -\stoptext diff --git a/tex/context/modules/common/s-pre-02.tex b/tex/context/modules/common/s-pre-02.tex deleted file mode 100644 index d7a6fe458..000000000 --- a/tex/context/modules/common/s-pre-02.tex +++ /dev/null @@ -1,381 +0,0 @@ -%D \module -%D [ file=s-pre-02, -%D version=1998.04.21, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 2, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D This environment can be used to typeset interactive -%D presentations. This module was first used at the 1998 -%D publishers conference of the European Portable Document -%D Association (now merged into a graphics association). - -\usemodule[pre-general] - -%D \macros -%D {setupbodyfont, switchtobodyfont, setuplayout} -%D -%D At \PRAGMA\ we prefer using the Lucida Bright fonts, but -%D one can of course load another typeface. - -\startmode[asintended] \setupbodyfont[lbr] \stopmode - -\setupbodyfont[14.4pt] - -\setuplayout - [style=smallbodyfont] - -%D \macros -%D {setuppapersize, setuplayout} -%D -%D The papersize suits the screen dimensions. The layout is -%D rather simple. We use the whole width of the screen and only -%D have navigational tools at the bottom of the screen. - -\setuppapersize - [S6][S6] - -\setuplayout - [backspace=1cm, - topspace=1cm, - margin=0pt, - header=0pt, - footer=0pt, - bottomdistance=.875cm, - bottom=1cm, - width=fit, - height=fit] - -%D \macros -%D {setupwhitespace, setuptyping} -%D -%D We don't have much height, so we use a more cramped -%D spacing. Verbatim text looks better when indented. -%D - -\setupwhitespace - [medium] - -\setuptyping - [margin=standard] - -%D \macros -%D {definecolor, setupcolors} -%D -%D Of course we enable color. We define some logical colors, -%D of which most default to the same green shade. - -\definecolor [BackgroundColor] [r=.8, g=.8, b=.8] -\definecolor [OrnamentColor] [r= 0, g=.7, b=.4] - -\setupcolors - [state=start] - -%D \macros -%D {setupinteraction, setupinteractionscreen} -%D -%D We still have to enable interaction mode. We go full -%D screen! - -\setupinteraction - [state=start, - color=OrnamentColor, - contrastcolor=OrnamentColor] - -\setupinteractionscreen - [option=max, - width=fit, - height=fit] - -%D \macros -%D {setupitemize} -%D -%D And why not bring some color in itemizations too? - -\setupitemize - [color=OrnamentColor] - -%D \macros -%D {defineoverlay, setupbackgrounds} -%D -%D The navigational elements and the backgrounds are -%D provided by \METAPOST. -%D -%D When \METAPOST\ is used, it makes sense to generate the -%D graphics at runtime. This is supported when one enables -%D system calls in the local \type {texmf.cnf} file and add the -%D switch \type {\runMPgraphicstrue} to the local file \type -%D {cont-sys.tex}. When direct processing is disabled or not -%D supported, \TEXEXEC\ will take care of graphic generation. - -\startuniqueMPgraphic{PageBackground} - fill unitsquare - xyscaled(OverlayWidth,OverlayHeight) - withcolor OverlayColor ; - draw unitsquare - xyscaled(OverlayWidth,OverlayHeight) - enlarged (-2*OverlayLineWidth) - withpen pencircle scaled OverlayLineWidth - withcolor OverlayLineColor ; -\stopuniqueMPgraphic - -\defineoverlay - [PageBackground] - [\uniqueMPgraphic{PageBackground}] - -\setupbackgrounds - [page] - [background=PageBackground, - backgroundcolor=BackgroundColor, - rulethickness=.125cm, - framecolor=OrnamentColor] - -%D \macros -%D {setuptexttexts} -%D -%D By clicking on the text area, one goes to the next page. -%D We hook this feature into the text backgrounds. - -\startuniqueMPgraphic{TextBackground} - draw unitsquare - xyscaled(OverlayWidth,OverlayHeight) - enlarged (4*OverlayLineWidth) - withpen pencircle scaled OverlayLineWidth - withcolor OverlayLineColor ; -\stopuniqueMPgraphic - -\defineoverlay - [TextBackground] - [\uniqueMPgraphic{TextBackground}] - -\defineoverlay - [NextPage] - [\overlaybutton{nextpage}] - -\setupbackgrounds - [text] - [background={TextBackground,NextPage}, - backgroundcolor=BackgroundColor, - rulethickness=.0625cm, - framecolor=OrnamentColor] - -%D \macros -%D {setupinteractionmenu,startinteractionmenu} -%D -%D At the bottom of the screen, we show three buttons. These -%D direct us to the previous or next jump or exit the document. - -\setupMPvariables[RightArrow][height=\bottomheight] -\setupMPvariables[LeftArrow] [height=\bottomheight] -\setupMPvariables[Circle] [height=\bottomheight] -\setupMPvariables[UpArrow] [height=\bottomheight] - -\startuniqueMPgraphic{RightArrow}{height} - z1=(0,0) ; z2=(\MPvar{height},.5y3) ; z3=(0,\MPvar{height}) ; - drawfill z1--z2--z3--cycle - withpen pencircle scaled (\MPvar{height}/5) - withcolor \MPcolor{OrnamentColor} ; -\stopuniqueMPgraphic - -\startuniqueMPgraphic{LeftArrow}{height} - z1=(\MPvar{height},0) ; z2=(0,.5y3) ; z3=(\MPvar{height},\MPvar{height}) ; - drawfill z1--z2--z3--cycle - withpen pencircle scaled (\MPvar{height}/5) - withcolor \MPcolor{OrnamentColor} ; -\stopuniqueMPgraphic - -\startuniqueMPgraphic{Circle}{height} - drawfill fullcircle scaled \MPvar{height} - withpen pencircle scaled (\MPvar{height}/5) - withcolor \MPcolor{OrnamentColor} ; -\stopuniqueMPgraphic - -\startuniqueMPgraphic{UpArrow}{height} - z1=(0,0) ; z2=(\MPvar{height},0) ; z3=(.5x2,\MPvar{height}) ; - drawfill z1--z2--z3--cycle - withpen pencircle scaled (\MPvar{height}/5) - withcolor \MPcolor{OrnamentColor} ; -\stopuniqueMPgraphic - -\setupinteractionmenu - [bottom] - [state=start, - frame=off, - width=.3\textwidth, - height=\bottomheight] - -\setupinteraction - [menu=on] - -\def\WhateverButton - {\doifreferencefoundelse{Whatever} - {\raw [Whatever] \uniqueMPgraphic{UpArrow} \\} - {}} - -\startinteractionmenu[bottom] - \but [Topics] \\ % secret button - \hfill - \WhateverButton % user specific - \kern2\bottomheight - \raw [previouspage] \uniqueMPgraphic{LeftArrow} \\ - \kern.5\bottomheight - \raw [CloseDocument] \uniqueMPgraphic{Circle} \\ - \kern.5\bottomheight - \raw [nextpage] \uniqueMPgraphic{RightArrow} \\ - \kern.5\bottomheight -\stopinteractionmenu - -%D \macros -%D {TitlePage, Topics, Topic, Subject} -%D -%D A presentation after loading this module looks like: -%D -%D \starttyping -%D \TitlePage {About Whatever\\Topics} -%D -%D \Topics {Todays Talk} -%D -%D \Topic {Some topic} -%D -%D ..... -%D -%D \Topic {Next Topic} -%D -%D ..... -%D \stoptyping - -%D \macros -%D {StartTitlePage, TitlePage} -%D -%D The titlepage is rather simple and can be typeset in two -%D ways: -%D -%D \starttyping -%D \StartTitlePage -%D text \\ text \\ text -%D \StopTitlepage -%D \stoptyping -%D -%D or as one||liner: -%D -%D \starttyping -%D \TitlePage{text\\text\\text} -%D \stoptyping -%D -%D The first alternative can be used for more complicated -%D title pages. - -\def\StartTitlePage% - {\startstandardmakeup - \bfd\setupinterlinespace - \setupalign[middle] - \vfil - \let\\=\vfil} - -\def\StopTitlePage% - {\vfil\vfil\vfil - \stopstandardmakeup} - -\def\TitlePage#1% - {\StartTitlePage#1\StopTitlePage} - -%D \macros -%D {definehead} -%D -%D The commands \type{\Topic} and \type{\Subject} are defined -%D as copies of head. We use \type{\Nopic} for internal -%D purposes. - -\definehead [Topic] [chapter] -\definehead [Subject] [section] - -\definehead [Nopic] [title] - -%D \macros -%D {setuphead} -%D -%D We use our own command for typesetting the titles. We hide -%D sectionnumbers from viewing. Each topic is followed by a -%D list of subjects that belong to the topic. - -\setuphead - [Topic, Nopic] - [after={\blank[3*medium]}, - number=no, - style=\tfb, - page=yes, - alternative=middle] - -\setuphead - [Subject] - [after=\blank, - number=no, - page=yes, - continue=no, - style=\tfa] - -%D \macros -%D {setuplist} -%D -%D When found, the subject list is automatically placed -%D after the topic head. - -\setuplist - [Topic,Subject] - [alternative=g, - interaction=all, - before=, - after=] - -\setuplist - [Topic] - [criterium=all] - -\def\Topics#1% - {\determinelistcharacteristics[Topic] - \doifmode{*list} - {\Nopic[Topics]{#1} - \startcolumns - \placelist[Topic] - \stopcolumns}} - -\setuplist - [Subject] - [criterium=Topic] - -\def\Subjects% - {\determinelistcharacteristics[Subject] - \doifmode{*list} - {\placelist[Subject]}} - -\setuphead - [Topic] - [after={\blank[3*medium]\Subjects}] - -\doifnotmode{demo}{\endinput} - -%D The (rather silly) demo section. - -\starttext - -\TitlePage{Title Page\\pre-green} - -\Topics{Some Nice Quotes} - -\Topic{A Few} - -\Subject{Knuth} \input knuth -\Subject{Tufte} \input tufte - -\Topic{Some More} - -\Subject{Zapf} \input zapf -\Subject{Bryson} \input bryson - -\stoptext diff --git a/tex/context/modules/common/s-pre-03.tex b/tex/context/modules/common/s-pre-03.tex deleted file mode 100644 index 19a11d24e..000000000 --- a/tex/context/modules/common/s-pre-03.tex +++ /dev/null @@ -1,257 +0,0 @@ -%D \module -%D [ file=s-pre-03, -%D version=1998.09.06, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 3, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D This is the third environment for typesetting interactive -%D presentations. I used this style for a talk on \TEX\ and -%D \JAVASCRIPT\ at \TUG98, mainly because I didn't want to -%D use the same style three times. Therefore this is a rather -%D simple, silly style. - -\usemodule[pre-general] - -%D \macros -%D {setupbodyfont} -%D -%D We use a large bodyfont. Combined with the fancy -%D background, this does not leave that much room for text, but -%D presentations should use much text anyway. - -\startmode[asintended] \setupbodyfont[lbr] \stopmode - -\setupbodyfont[14.4pt] - -%D \macros -%D {setuppapersize,setuplayout,setupinteractionscreen} -%D -%D The page dimensions are set to size \type {S6}, being -%D 600pt by 450pt. We use wide margins and discard headers -%D and footers. We also launch the document full screen. - -\setuppapersize - [S6][S6] - -\setuplayout - [width=middle, - height=middle, - topspace=75pt, - backspace=100pt, - header=0pt, - footer=0pt] - -\setupinteractionscreen - [option=max] - -%D \macros -%D {setupcolors,definecolor} -%D -%D Next, color support is turned on and a dark red color is -%D defined. Other red shades will be derived from this one -%D color. - -\setupcolors - [state=start] - -\definecolor [PageColor] [black] -\definecolor [BackgroundColor] [s=.85] -\definecolor [OrnamentColor] [r=.75] - -%D \macros -%D {setupinteraction} -%D -%D We turn on interaction mode and use the same color for -%D hyperlinks and redundant hyperlinks (the ones that point -%D to the current page). - -\setupinteraction - [state=start, - contrastcolor=OrnamentColor, - color=OrnamentColor] - -%D \macros -%D {defineoverlay, setupbackgrounds} -%D -%D The joke in this presentation is the elliptical shape of -%D which the bottom part includes a page indication. - -\defineoverlay - [PageShape][\useMPgraphic{PageShape}] - -% \startuseMPgraphic{PageShape} -% lin := 20pt ; off := .75lin ; -% wid := \overlaywidth ; hei := \overlayheight ; -% pos := \currentpage ; tot := \lastpage ; -% path bb; bb := unitsquare xscaled wid yscaled hei ; -% filldraw bb withcolor \MPcolor{PageColor} ; -% pickup pencircle xscaled .5lin yscaled lin rotated 45 ; -% pair r, t, l, b ; -% r := (wid-off,.5hei) ; t := (.5wid,hei-off) ; -% l := (off,.5hei) ; b := (.5wid,off) ; -% path p; p := superellipse(r,t,l,b,.8) ; -% fill p withcolor \MPcolor{Backgroundcolor} ; -% draw p withcolor \MPcolor{OrnamentColor} ; -% color contrastcolor ; contrastcolor = 2/3 * \MPcolor{OrnamentColor} ; -% if (pos>0) and (tot>0): -% pair pa ; pa := point 5 of p ; -% pair pb ; pb := point 7 of p ; -% draw pa withcolor contrastcolor ; -% draw pb withcolor contrastcolor ; -% len := 2/tot ; -% pair pa ; pa := point (5+len*pos) of p ; -% pair pb ; pb := point (5+len*(pos-1)) of p ; -% p := p cutafter pa ; -% p := p cutbefore pb ; -% draw p withcolor contrastcolor ; -% fi ; -% setbounds currentpicture to bb ; -% \stopuseMPgraphic - -\startuseMPgraphic{PageShape} - StartPage ; - path p ; pair pa, pb ; numeric len ; color contrastcolor ; - fill Page withcolor \MPcolor {PageColor} ; - pickup pencircle rotated 45 xscaled 10pt yscaled 20pt ; - p := Page enlarged (-10pt,-15pt) superellipsed .8 ; - p := p shifted (-1.5pt,0) ; % looks better - fill p withcolor \MPcolor{BackgroundColor} ; - draw p withcolor \MPcolor{OrnamentColor} ; - contrastcolor = 2/3 * \MPcolor{OrnamentColor} ; - if (PageNumber>0) and (NOfPages>0): - draw point 5 of p withcolor contrastcolor ; - draw point 7 of p withcolor contrastcolor ; - len := 2/NOfPages ; - pa := point (5+len*PageNumber) of p ; - pb := point (5+len*(PageNumber-1)) of p ; - draw (p cutafter pa) cutbefore pb - withcolor contrastcolor ; - fi ; - StopPage ; -\stopuseMPgraphic - -%D We use the viewer provided feature to go to the previous or -%D next page. - -\defineoverlay[PrevButton][\overlaybutton{PreviousPage}] -\defineoverlay[NextButton][\overlaybutton{NextPage}] - -\setupbackgrounds - [page] - [background={PageShape,PrevButton}] - -\setupbackgrounds - [text][text] - [background=NextButton] - -% or using hard coded next/prev pages: -% -% \defineoverlay[PrevButton][\overlaybutton{previouspage}] -% \defineoverlay[NextButton][\overlaybutton{nextpage}] -% -% \setupbackgrounds[state=repeat] -% \setupbackground[text][text][background=NextButton] -% -% or simply (using an repeated layer): -% -% \setupbackground[text][background=NextButton] - -%D \macros -%D {definehead, setuphead} -%D -%D Like the other presentation styles, we use \type {\Topic} -%D instead of \type {\chapters}. This time we don't provide -%D an additional sectioning. So we have: -%D -%D \starttyping -%D \TitlePage{How nice} -%D -%D \Topics{This is about ...} -%D -%D \Topic{The first one} -%D -%D \Topic{Another one} -%D \stoptyping - -\definehead [Topic] [chapter] -\definehead [Nopic] [title] - -\setuphead - [Topic,Nopic] - [after={\blank[3*medium]}, - number=no, - style=\tfb, - page=yes, - alternative=middle] - -\setuplist - [Topic] - [alternative=g, - interaction=all, - before=, - after=] - -\def\Subject - {\Topic} - -%D The tables of contents is associated with \type -%D {\Topics}. - -\def\Topics#1% - {\Nopic[Topics]{#1} - \placelist[Topic][criterium=all]} - -\def\Subjects - {} - -%D Instead of \type {\TitlePage}, one can use the pair -%D \type {\StartTitlePage} -- \type {\StopTitlePage}: -%D -%D \starttyping -%D \StartTitlePage -%D A Self Made Title -%D \StopTitlePage -%D \stoptyping - -\def\StartTitlePage% - {\startstandardmakeup - \bfd\setupinterlinespace - \setupalign[middle] - \vfil - \def\\{\vfil\bfb\setupinterlinespace}} - -\def\StopTitlePage% - {\vfil\vfil\vfil - \stopstandardmakeup} - -\def\TitlePage#1% - {\StartTitlePage#1\StopTitlePage} - -\doifnotmode{demo}{\endinput} - -%D The (rather silly) demo section. - -\starttext - -\TitlePage{Title Page\\pre-funny} - -\Topics{Some Nice Quotes} - -\Topic{A Few} - -\Subject{Knuth} \input knuth -\Subject{Tufte} \input tufte - -\Topic{Some More} - -\Subject{Zapf} \input zapf -\Subject{Bryson} \input bryson - -\stoptext diff --git a/tex/context/modules/common/s-pre-04.tex b/tex/context/modules/common/s-pre-04.tex deleted file mode 100644 index 088f4e510..000000000 --- a/tex/context/modules/common/s-pre-04.tex +++ /dev/null @@ -1,377 +0,0 @@ -%D \module -%D [ file=s-pre-04, -%D version=1998.09.06, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 4, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -\usemodule[pre-general] - -%D \macros -%D {setupbodyfont} -%D -%D This is just another environment for typesetting interactive -%D presentations. I wrote this module on behalf of a course I -%D gave for the United Kingdom \TeX\ users group. - -\setupbodyfont[ams,pos,14.4pt] - -%D \macros -%D {setupcolors,definecolor} -%D -%D I started using dark blue for the navigational elements. In -%D that context, dark red is a logical choice for the contrast -%D color. While playing around with the navigational elements -%D I decided to use the not so dominant color yellow for the -%D status bar. -%D -%D A few days before I wrote this style, the recent acquisition -%D of Mondriaans last painting by the Dutch governement was a -%D hot topic in the dutch news scenary. Therefore I decided to -%D replace the rather dull title page by something more -%D colorful, in mondriaan colors, but far more random than any -%D of his paintings. For consistence we remap the already -%D defined primary colors. - -\setupcolors [state=start] - -\definecolor [NoneColor] [s=.6] -\definecolor [GotoColor] [b=.6] \definecolor[blue] [GotoColor] -\definecolor [ExitColor] [r=.6] \definecolor[red] [ExitColor] -\definecolor [JumpColor] [s=.6] -\definecolor [UserColor] [g=.6] \definecolor[green] [UserColor] -\definecolor [StepColor] [r=.6,g=.6] \definecolor[yellow][StepColor] - -\definecolor [PageColor] [s=.80] \definecolor[gray] [PageColor] -\definecolor [TextColor] [s=.90] - -%D \macros -%D {setuppapersize} -%D -%D As usual, we take a screen oriented paper size: - -\setuppapersize - [S6][S6] - -%D \macros -%D {setuplayout,setupinteractionscreen} -%D -%D The layout definition fits into this $600\times450$ point -%D area, but the dimensions are somewhat diffused by the text -%D background offset. - -\setuplayout - [width=530pt, - height=400pt, - header=0pt, - footer=0pt, - backspace=15pt, - topspace=15pt, - bottomdistance=15pt, - bottom=10pt, - margin=0pt, - rightedgedistance=15pt, - rightedge=30pt] - -\setupinteractionscreen - [option=max] - -%D \macros -%D {setupbackgrounds} -%D -%D Both the page and the text area have a gray background. -%D The \type {[text,text]} area also has an offset. Later we -%D will see that we have to compensate for that in the -%D navigational areas. - -\setupbackgrounds - [page] - [background=color, - backgroundcolor=PageColor] - -\setupbackgrounds - [text][text] - [background=color, - backgroundcolor=TextColor, - backgroundoffset=5pt] - -%D \macros -%D {setupinteraction} -%D -%D For convenient navigation, we turn on interaction. - -\setupinteraction - [state=start, - menu=on, - color=UserColor, - contrastcolor=NoneColor] - -%D \macros -%D {setupsubpagenumber} -%D -%D When navigating the document, we keep the title page out -%D of sight, therefore we use sub page numbers. - -\setupsubpagenumber - [state=start, - way=bytext] - -%D \macros -%D {setupinteractionmenu} -%D -%D There is only one interaction menu, located in the right -%D edge of the screen. Both offsets enlarge the edge by the -%D same amount as the text background offset. - -\setupinteractionmenu - [right] - [state=start, - frame=off, - strut=no, - offset=0pt, - inbetween=, - bottomoffset=-5pt, - topoffset=-5pt] - -%D \macros -%D {startinteractionmenu} -%D -%D The menu itself is not that spectacular. We use the -%D start||stop alternative for setting the content. The macro -%D \type {\interactioncolor} expands into either the -%D interaction color or the contrast color, the latter only -%D when no jump is possible. - -\startinteractionmenu[right] - \setupinteraction[color=GotoColor] - \but [previoussubpage] \Triangle {90}\framedwidth\interactioncolor \\ - \vskip10pt - \but [nextsubpage] \Triangle{270}\framedwidth\interactioncolor \\ - \vfill - \but [PreviousJump] \Triangle{180}\framedwidth{NoneColor} \\ - \vskip-5pt - \but [NextJump] \Triangle {0}\framedwidth{NoneColor} \\ -\stopinteractionmenu - -%D \macros -%D {setupinteractionbar} -%D -%D The interaction bar at the bottom is also larger than the -%D normal width of the bottom area. - -\setupinteractionbar - [alternative=f, - width=\textwidth, - height=\bottomheight, - distance=10pt, - color=NoneColor, - contrastcolor=StepColor] - -%D \macros -%D {setupbottomtexts} -%D -%D The bar is centered in the middle. - -\setupbottomtexts - [\interactionbar] - -%D We can exit viewing with a close button, located on the -%D rightmost bottom area. - -\def\CloseButton - {\button - [width=\rightedgewidth,height=\bottomheight,offset=overlay, - background=color,backgroundcolor=ExitColor,frame=off] - {}% - [CloseDocument]} - -\setupbottomtexts - [edge][][\CloseButton] - -%D \macros -%D {definesymbol,setupitemize} -%D -%D Because some prominent things are rectangular or triangular, -%D we prefer some different symbols in itemizations: - -\definesymbol[1][$\blacktriangleright$] -\definesymbol[2][$\blacktriangledown$] -\definesymbol[3][$\blacktriangleright$] -\definesymbol[4][$\blacktriangledown$] - -\setupitemize[each][color=NoneColor] - -%D \macros -%D {TitlePage,defineoverlay,button,setupalign, -%D setupbackgrounds,setupinteraction,setupinteractionbar, -%D startstandardmakeup,switchtobodyfont,setupinterlinespace} -%D -%D Now the main layout and navigational definitions are -%D done, it makes sense to define and tune some structuring -%D commands. First we build the titlepage. - -\defineoverlay [TitleGraphic] [\useMPgraphic{title}] -\defineoverlay [NextPage] [\overlaybutton{nextpage}] - -\def\StartTitlePage - {\setupbackgrounds[page][background={color,TitleGraphic,NextPage}] - \setupbackgrounds[text][text][background=] - \setupinteraction[menu=off] - \setupinteractionbar[state=stop] - \startstandardmakeup - \switchtobodyfont[24pt] - \bfd\setupinterlinespace - \setupalign[middle] - \vfil - \let\\=\vfil} - -\def\StopTitlePage - {\vfil\vfil\vfil - \stopstandardmakeup - \setupinteraction[menu=on] - \setupinteractionbar[state=start] - \setupbackgrounds[page][background=color] - \setupbackgrounds[text][text][background=color] - \setupsubpagenumber[reset]} - -\def\TitlePage#1% - {\StartTitlePage#1\StopTitlePage} - -%D \macros -%D {Topic, Nopic, Subject, -%D definehead, setuphead} -%D -%D We use \type {\Topic} and \type {\Subject} instead of -%D chapters and sections. The \type {\Nopic} alternative is -%D meant for internal use. - -\definehead [Topic] [chapter] -\definehead [Nopic] [title] -\definehead [Subject] [section] - -\setuphead - [Topic, Nopic] - [after={\blank[3*medium]}, - number=no, - style=\tfb, - page=yes, - alternative=middle] - -\setuphead - [Subject] - [after=\blank, - number=no, - page=yes, - continue=no, - style=\tfa] - -%D \macros -%D {Topics, Subjects, -%D setuplist, placelist, startcolumns} -%D -%D This style is meant for the more large presentations, and -%D therefore provided for a list of topics as well as local -%D lists of subjects. When many topics are introduces, the -%D list is typeset in columns. - -\setuplist - [Topic,Subject] - [alternative=g, - interaction=all, - before=, - after=] - -\setuplist - [Topic] - [criterium=all] - -\def\Topics#1% - {\determinelistcharacteristics[Topic] - \ifnum\utilitylistlength>0 - \Nopic[Topics]{#1} - \ifnum\utilitylistlength>12 - \startcolumns - \placelist[Topic] - \stopcolumns - \else - \placelist[Topic] - \fi - \fi} - -\def\Subjects% - {\placelist[Subject]} - -%D Last we define the overlays. Look at the way colors are -%D linked into the macros. - -\startMPinclusions - def triangle (expr wid, rot, col) = - x1 := x3 := y1 := 0 ; x2 := y3 := wid ; y2 := .5y3 ; - fill (z1--z2--z3--cycle) rotated rot withcolor col ; - currentpicture := currentpicture xysized (wid,wid) ; - enddef ; -\stopMPinclusions - -\setupMPvariables - [triangle] - [width=1cm, - rotation=0, - color=black] - -\startuniqueMPgraphic{triangle}{width,rotation,color} - triangle(\MPvar{width},\MPvar{rotation},\MPvar{color}) ; -\stopuniqueMPgraphic - -\def\Triangle#1#2#3% - {\uniqueMPgraphic{triangle}{rotation=#1,width=#2,color=#3}} - -\startuseMPgraphic{title} % can be simplified with "randomized" - color c ; path p ; - for i=1 upto 250 : - x0 := uniformdeviate \overlaywidth ; - y0 := uniformdeviate \overlayheight ; - sx := uniformdeviate 20 ; - sy := uniformdeviate 20 ; - cc := round(uniformdeviate 2) ; - if cc=0 : c := \MPcolor{GotoColor} fi ; - if cc=1 : c := \MPcolor{ExitColor} fi ; - if cc=2 : c := \MPcolor{StepColor} fi ; - qq := round(uniformdeviate 1) ; - if qq=0 : - p := unitsquare xscaled sx yscaled sy ; - else : - rr := round(uniformdeviate 3) * 90 ; - x1 := x3 := y1 := 0 ; x2 := y3 := sx; y2 := .5y3 ; - p := (z1--z2--z3--cycle) rotated rr ; - fi ; - fill p shifted z0 withcolor c ; - endfor ; -\stopuseMPgraphic - -\doifnotmode{demo}{\endinput} - -%D The (rather silly) demo section. - -\starttext - -\TitlePage{Title Page\\pre-colorfull} - -\Topics{Some Nice Quotes} - -\Topic{A Few} - -\Subject{Knuth} \input knuth -\Subject{Tufte} \input tufte - -\Topic{Some More} - -\Subject{Zapf} \input zapf -\Subject{Bryson} \input bryson - -\stoptext diff --git a/tex/context/modules/common/s-pre-05.tex b/tex/context/modules/common/s-pre-05.tex deleted file mode 100644 index ccffd1f4d..000000000 --- a/tex/context/modules/common/s-pre-05.tex +++ /dev/null @@ -1,240 +0,0 @@ -%D \module -%D [ file=s-pre-05, -%D version=1998.12.12, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 5, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -\usemodule[pre-general] - -%D As all styles sofar, this one has the same structuring -%D commands. - -\startmode[asintended] \setupbodyfont[ludicaot] \stopmode - -\setupbodyfont[14.4pt] - -\setupcolors [state=start] - -\definecolor [BackgroundColor] [s=.95] -\definecolor [OrnamentColor] [r=.6,g=.7,b=.8] - -\setuppapersize - [S6][S6] - -\setuplayout - [width=430pt, - height=400pt, - header=0pt, - footer=0pt, - margin=0pt, - backspace=25pt, - topspace=25pt, - rightedgedistance=20pt, - rightedge=110pt] - -\setupinteractionscreen - [option=max] - -\setupbackgrounds - [state=repeat] - -\setupbackgrounds - [page] - [backgroundcolor=white] - -\setupbackgrounds - [text][text] - [background={HashFrameA,NextPage}, - backgroundoffset=20pt] - -\defineoverlay - [HashFrameA] - [\useMPgraphic{HashFrameA}] - -\defineoverlay - [HashFrameB] - [\useMPgraphic{HashFrameB}] - -\setupinteraction - [state=start, - menu=on, - color=OrnamentColor, - contrastcolor=OrnamentColor] - -%D Watch how we use a list alternative that matches the -%D menu. - -\setupinteractionmenu - [right] - [background=HashFrameB, - style=smallbold, - frame=off, - offset=10pt, - height=35pt, - before=, - after=, - inbetween=\endgraf, - width=\rightedgewidth] - -\startinteractionmenu[right] - \placelist - [Topic] - [criterium=all, - alternative=right, - maxwidth=.8\rightedgewidth, - interaction=all, - before=, - after=] - \vfill - \setupinteractionmenu - [right] - [height=30pt] - \but [CloseDocument] Close \\ -\stopinteractionmenu - -\setupwhitespace - [big] - -\setupblank - [big] - -%D \macros -%D {TitlePage} -%D -%D Now the main layout and navigational definitions are -%D done, it makes sense to define and tune some structuring -%D commands. First we build the titlepage. - -\defineoverlay [TitleGraphic] [\useMPgraphic{TitleGraphic}] -\defineoverlay [NextPage] [\overlaybutton{forward}] - -\unexpanded\def\StartTitlePage - {\setupbackgrounds[page][background={color,TitleGraphic,NextPage}] - \setupbackgrounds[text][text][background=] - \setupinteraction[menu=off] - \setupinteractionbar[state=stop] - \setuplayout[width=550pt,rightedge=0pt] - \startstandardmakeup - \switchtobodyfont[24pt] - \bfd\setupinterlinespace - \setupalign[middle] - \vfil - \let\\=\vfil} - -\unexpanded\def\StopTitlePage - {\vfil\vfil\vfil - \stopstandardmakeup - \setuplayout[width=430pt,rightedge=110pt] - \setupinteraction[menu=on] - \setupinteractionbar[state=start] - \setupbackgrounds[page][background=color] - \setupbackgrounds[text][text][background={HashFrameA,NextPage}]} - -\unexpanded\def\TitlePage#1% - {\StartTitlePage#1\StopTitlePage} - -%D \macros -%D {Topics,Subjects} -%D -%D Since the lists are in the menu, we don't honor list -%D placement macros. - -\unexpanded\def\Topics#1{} -\unexpanded\def\Subjects{} - -%D \macros -%D {Topic, Nopic, Subject} -%D -%D Since t his style is meant for rather flat structured -%D documents, only \type {\Topic} makes sense. - -\definehead [Topic] [chapter] -\definehead [Nopic] [title] -\definehead [Subject] [section] - -\setuphead - [Topic, Nopic] - [after={\blank[3*medium]}, - number=no, - style=\tfb, - page=yes, - alternative=middle] - -\setuphead - [Subject] - [after=\blank, - number=no, - page=yes, - continue=no, - style=\tfa] - -%D We use only one kind of base graphic, which is sligthly -%D tuned for the different usage. - -\startMPinclusions - def random_hash_frame (expr width, height, offset, linewidth ) = - - def delta = ((uniformdeviate .5offset) + .25offset) enddef ; - x1 := offset ; y1 := offset ; x2 := width-offset ; y2 := height-offset ; - - drawoptions(withpen pencircle scaled linewidth withcolor \MPcolor{BackgroundColor}) ; - fill z1--(x2,y1)--z2--(x1,y2)--cycle ; - - drawoptions(withpen pencircle scaled linewidth withcolor \MPcolor{OrnamentColor}) ; - draw (x1-delta,y1)--(x2+delta,y1) ; - draw (x2,y1-delta)--(x2,y2+delta) ; - draw (x2+delta,y2)--(x1-delta,y2) ; - draw (x1,y2+delta)--(x1,y1-delta) ; - - drawoptions(); - setbounds currentpicture to unitsquare xscaled width yscaled height ; - enddef ; -\stopMPinclusions - -\startuseMPgraphic{HashFrameA} - random_hash_frame(OverlayWidth,OverlayHeight,15pt,2pt) ; -\stopuseMPgraphic - -\startuseMPgraphic{HashFrameB} - random_hash_frame(OverlayWidth,OverlayHeight, 5pt,2pt) ; -\stopuseMPgraphic - -\startuseMPgraphic{TitleGraphic} - for i=1 upto 300 : - offset := uniformdeviate 10pt ; - width := 2*offset + 30pt + uniformdeviate 30pt ; - height := 2*offset + 10pt + uniformdeviate 10pt ; - addto currentpicture also - image(random_hash_frame(width,height,offset,1pt)) shifted - (uniformdeviate OverlayWidth, uniformdeviate OverlayHeight) ; - endfor ; -\stopuseMPgraphic - -\continueifinputfile{s-pre-05.tex} - -%D The (rather silly) demo section. - -\starttext - -\TitlePage{Title Page\\pre-fuzzy} - -\Topics{Some Nice Quotes} - -\Topic{A Few} - -\Subject{Knuth} \input knuth -\Subject{Tufte} \input tufte - -\Topic{Some More} - -\Subject{Zapf} \input zapf -\Subject{Bryson} \input bryson - -\stoptext diff --git a/tex/context/modules/common/s-pre-09.tex b/tex/context/modules/common/s-pre-09.tex deleted file mode 100644 index a20b9f31a..000000000 --- a/tex/context/modules/common/s-pre-09.tex +++ /dev/null @@ -1,380 +0,0 @@ -%D \module -%D [ file=s-pre-09, -%D version=unknown, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 9, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D I made this style when I had to give a presentation on -%D the \MAPS\ bibliography production for several user group -%D meetings. This style is rather tuned for combinations of -%D examples and explanations. The colors match the \MAPS\ -%D bibliography colors. - -\startmode[asintended] \setupbodyfont[lbr] \stopmode - -\setupbodyfont[14.4pt] - -%D A couple of years later, in 2001 this style was documented -%D and made public. While documenting, I also changed box -%D building on top of overlays into the now available layer -%D positioning. So, this styles demonstrates quite some -%D tricks. - -\setuppapersize - [S6][S6] - -\setuplayout - [topspace=0cm, - backspace=0cm, - header=0pt, - footer=0pt, - width=middle, - height=middle] - -%D Local environments can be set by using the setups commands. -%D For downward compatibility, we keep supporting the \type -%D {\...Settings} hooks. Using local environments is seldom -%D needed. - -\let\TextSettings \empty -\let\SampleSettings\empty - -\startsetups [text] \TextSettings \stopsetups -\startsetups [sample] \SampleSettings \stopsetups - -%D The dimensions are kind of fixed. - -\def\FrameWidth {448pt} -\def\FrameHeight {348pt} -\def\FrameOffset {24pt} -\def\FrameSkip {12pt} - -%D But they {\em can} and {\em will} be changed. - -\def\FrameWidth {408pt} -\def\FrameHeight {318pt} - -%D The funny values come from the $3:4$ display aspect -%D ratio. - -\setupcolors - [state=start] - -\definecolor[PageColor] [s=.40] -\definecolor[TextColor] [s=.90] -\definecolor[InteractionColor][r=.40] -\definecolor[LineColor] [r=.60,g=.60] - -%D Of course we go interactive and since we will probably -%D open other documents, we make sure that the viewer opens a -%D new window. - -\setupinteraction - [color=InteractionColor, - contrastcolor=LineColor, - display=new, - state=start] - -\setupinteractionscreen - [option=max] - -%D Before we come to the real macros, we do a little bit of -%D tuning. - -\setupitemize - [1][packed] - -\setuptyping - [blank=medium] - -%D Apart from the titlepage, the page gets a simple colored -%D background. Later we will activate the background. - -\setupbackgrounds - [page] - [backgroundcolor=PageColor] - -%D Everything gets frames by a nice \METAPOST\ frame. - -\defineoverlay [background] [\uniqueMPgraphic{background}] - -\startuniqueMPgraphic{background} - path p ; color c, w, d ; - c := \MPcolor{PageColor} ; - w := \MPcolor{TextColor} ; - d := \MPcolor{LineColor} ; - p := unitsquare xscaled OverlayWidth yscaled OverlayHeight ; - pickup pencircle scaled (1.5*\FrameSkip) ; - draw p withcolor c ; - pickup pencircle scaled \FrameSkip ; - fill p withcolor w ; - draw p withcolor d ; -\stopuniqueMPgraphic - -%D We will present samples and explanation pair||wise, so -%D we need a hyperlink that skips a page. - -\defineoverlay [nextpage] [\overlaybutton{nextpage}] -\defineoverlay [previouspage] [\overlaybutton{previouspage}] -\defineoverlay [skippage] [\overlaybutton{page(+2)}] - -%D Layers are normally used to position multiple content on -%D a specific overlay. Here we will use them to position -%D only and since the samples and text will swap place, we -%D will use quite a few layers. - -\defineoverlay [text] [\composedlayer{text}] -\defineoverlay [sample] [\composedlayer{sample}] -\defineoverlay [common] [\composedlayer{common}] - -%D There are three positions. When combined, the sample and -%D text windows overlap, otherwise the lone window is -%D centered. We could have used one layer and reversed the -%D order by setting the \type {direction} parameter, but -%D this approach is more readable. - -\definelayer - [text] - [x=\makeupwidth,y=\makeupheight,location=lt, - hoffset=-\FrameSkip,voffset=-\FrameSkip] - -\definelayer - [sample] - [hoffset=\FrameSkip,voffset=\FrameSkip] - -\definelayer - [common] - [x=.5\makeupwidth,y=.5\makeupheight,location=c] - -%D The topic is put in the lower right corner of the text -%D window. - -\defineoverlay [topic] [\composedlayer{topic}] - -\definelayer - [topic] - [x=\FrameWidth,y=\FrameHeight,location=lt, - hoffset=-\FrameOffset,voffset=-\FrameSkip] - -%D The topic is put in a framed box. That way we can make -%D sure that it gets a background, which looks better when -%D it covers something else. Otherwise we could have stuct -%D to: -%D -%D \starttyping -%D \def\Topic#1% -%D {\setlayer[topic]{\color[PageColor]{\bfb\setstrut#1}}} -%D \stoptyping -%D -%D But, we go for the nice alternative: - -\def\Topic#1% - {\doifsomething{#1} - {\setlayer [topic] - {\bfb\setstrut - \inframed - [frame=off,foregroundcolor=PageColor,offset=0pt, - background=color,backgroundcolor=TextColor] - {#1}}}} - -%D The sample as well as the explanation will be collected in -%D a buffer. That way we can reuse the content. We could -%D have used a box instead, but can we be sure that the content -%D is not adapting itself? So, buffers we use. - -\resetbuffer[sample] -\resetbuffer[text] - -%D Both the sample and explanation are kind of windowed. - -\defineframedtext - [SampleText] - [width=\FrameWidth,height=\FrameHeight,offset=\FrameOffset, - frame=off,align=normal,strut=no,before=,after=, - background={background,nextpage}] - -%D We safe some keying in by combining things in one macro. - -\def\DoSampleText#1#2#3% kind layer overlays - {\setupframedtexts[SampleText][background={background,#3}] - \setlayer[#2] - {\startSampleText[none] - \setups[#1] - \getbuffer[#1] - \stopSampleText}} - -\def\StartSample{\dostartbuffer[sample][StartSample][StopSample]} -\def\StartText {\dostartbuffer[text] [StartText] [StopText]} - -%D The following definitions apply at the outer level. - -\def\StopSample - {\startstandardmakeup - \DoSampleText{sample}{common}{nextpage} - \stopstandardmakeup - \resetbuffer[sample]} - -\def\StopText - {\startstandardmakeup - \DoSampleText{text}{common}{topic,nextpage} - \stopstandardmakeup - \resetbuffer[text]} - -\setupbackgrounds[page][background={color,nextpage}] -\setupbackgrounds[text][background=common] - -%D When we combine sample and text, we get slightly -%D different definitions. As you can see we generate two -%D pages. Watch how we manipulate the order of the -%D overlays and teh nature of the buttons. Here data -%D abstraction really pays off. - -\def\StartIdea - {\bgroup - \let\StopSample\relax - \let\StopText \relax} - -\def\StopIdea% - {\setupbackgrounds[page][background={color,skippage}] - \setupbackgrounds[text][background={text,sample}] - \startstandardmakeup - \DoSampleText{sample}{sample}{previouspage} - \DoSampleText{text} {text} {topic,nextpage} - \stopstandardmakeup - \setupbackgrounds[page][background={color,nextpage}] - \setupbackgrounds[text][background={sample,text}] - \startstandardmakeup - \DoSampleText{sample}{sample}{previouspage} - \DoSampleText{text} {text} {topic,nextpage} - \stopstandardmakeup - \egroup} - -%D The rest of the definitions takes care of the title page. -%D Please don't steal this one for your own documents. - -\defineoverlay[joke] [\useMPgraphic{joke}{n=0}] % not to be changed! - -\startuseMPgraphic{joke}{n} - StartPage ; - path p, q ; numeric w ; pair xy ; - set_grid(OverlayWidth,OverlayHeight,OverlayWidth/8,OverlayHeight/8) ; - if \MPvar{n}=1 : - p := fulldiamond ; fill Page withcolor \MPcolor{TextColor} ; - else : - p := fullsquare ; fill Page withcolor \MPcolor{PageColor} ; - fi ; - forever : - xy := center Page randomized (OverlayWidth,OverlayHeight) ; - if new_on_grid(xpart xy, ypart xy) : - q := (p xyscaled (OverlayWidth/5,OverlayHeight/5)) - randomized (\FrameSkip,\FrameSkip) - shifted xy ; - w := (\FrameSkip) randomized (\FrameSkip/2) ; - draw q withcolor \MPcolor{PageColor} withpen pencircle scaled (1.5w) ; - fill q withcolor \MPcolor{TextColor} ; - draw q withcolor \MPcolor{LineColor} withpen pencircle scaled ( w) ; - fi ; - exitif grid_full ; - endfor ; - StopPage ; -\stopuseMPgraphic - -\defineoverlay[fuzzy][\useMPgraphic{fuzzy}] - -\startuseMPgraphic{fuzzy} - path p ; numeric w ; - p := (fullsquare xyscaled (OverlayWidth,OverlayHeight)) - randomized (\FrameSkip,\FrameSkip) ; - w := (\FrameSkip) randomized (\FrameSkip/2) ; - draw p withcolor \MPcolor{PageColor} withpen pencircle scaled (1.5w) ; - fill p withcolor \MPcolor{TextColor} ; - draw p withcolor \MPcolor{LineColor} withpen pencircle scaled ( w) ; -\stopuseMPgraphic - -%D This time we use a fit window, but with a slightly randomized -%D frame, our trademark so to say. - -\def\StartTitlePage - {\bgroup - \setupbackgrounds[page][background={joke,nextpage}] - \startstandardmakeup - \switchtobodyfont[big] - \setupframedtexts - [SampleText] - [background=fuzzy, - foregroundcolor=PageColor, - width=fit, - height=fit, - align=middle] - \startSampleText[middle] - \bfd\setupinterlinespace - \def\\{\bfb\setupinterlinespace\vfil\def\\{\vfil}}} - -\def\StopTitlePage - {\stopSampleText - \stopstandardmakeup - \egroup} - -\def\TitlePage#1% - {\StartTitlePage#1\StopTitlePage} - -%D Let's nill some error prone presentation macros. - -\let\Subject \Topic -\let\Topics \gobbleoneargument -\let\Subjects \relax - -%D We will avoid \quote {overfull} messages. - -\dontcomplain - -\doifnotmode{demo}{\endinput} - -%D The (rather silly) demo section. - -\starttext - -\setupbodyfont[12pt] - -\TitlePage{Quotes, Quotes\\and more quotes} - -\StartIdea - \StartSample - \input knuth \par - \StopSample - \StartText - \Topic{Tufte} - \input tufte \par - \StopText - \StopIdea - -\StartIdea - \StartSample - \input materie \par - \StopSample - \StartText - \input reich \par - \StopText -\StopIdea - -\StartText - \input tufte \par -\StopText - -\StartIdea - \StartSample - \input knuth \par - \StopSample - \StartText - \input tufte \par - \StopText -\StopIdea - -\stoptext diff --git a/tex/context/modules/common/s-pre-10.tex b/tex/context/modules/common/s-pre-10.tex deleted file mode 100644 index a92e5af01..000000000 --- a/tex/context/modules/common/s-pre-10.tex +++ /dev/null @@ -1,308 +0,0 @@ -%D \module -%D [ file=s-pre-10, -%D version=unknown, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 10, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D This style is derived from the ninth style, which was -%D used first at \EUROTEX\ 99 and later at \TUG\ 2000. This -%D alternative build up a page. - -\startmode [demo] - \disablemode[demo] \usemodule[pre-09] \enablemode[demo] -\stopmode - -\startnotmode [demo] - \usemodule[pre-09] -\stopnotmode - -%D We use blue colors instead of yellow ones. Since we have -%D used symbolic names, we can easily overload the existing -%D scheme. - -\definecolor[LineColor][r=.40,g=.40,b=1.00] - -%D Here we don't use fixed dimensions, but fit the sample -%D windows and derive the text windows's width from this one. - -\setupframedtexts - [SampleText] - [width=fit,height=fit, - background={background,nextpage}] - -%D The topic goes to the top right corner of the screen which -%D means that it is positioned left down to the reference -%D point. Watch how we make data on this layer (here only -%D the topic but it can be more) persistent. - -\setuplayer - [topic] - [y=0pt,x=\makeupwidth,location=lb,state=repeat, - hoffset=-\FrameSkip,voffset=\FrameSkip] - -%D Clicking on the page brings us back. - -\setupbackgrounds - [page] - [background={previouspage,color,topic}] - -%D All layers end up on the text area. This could have been -%D the page area too since these have the same dimensions. - -\setupbackgrounds - [text] - [background={common,sample,text}] - -%D Because we build up the text window step by step, we will -%D separate the entries by white space. - -\startsetups [always] - \setupwhitespace[big] - \setupblank[big] -\stopsetups - -%D The \type {\Topic} commands can be simplified to: - -\def\Topic#1% - {\resetlayer[topic] - \setlayer[topic]{\bfb\setstrut\color[TextColor]{#1}}} - -%D We also provide a way to erase the topic. - -\def\NoTopic - {\resetlayer[topic]} - -%D We have to redefine the structuring commands to support -%D the resetting of buffer counters. - -\newcounter\TextN - -\def\StartSample - {\doglobal\newcounter\TextN - \dostartbuffer[sample][StartSample][StopSample]} - -\def\StartText - {\doglobal\newcounter\TextN - \dostartbuffer[text][StartText][StopText]} - -\def\StartSubText - {\doglobal\increment\TextN - \dostartbuffer[text-\TextN][StartSubText][StopSubText]} - -\def\StopText - {\startstandardmakeup - \DoSampleText{text}{common}{nextpage} - \stopstandardmakeup} - -\def\StopSubText - {\startstandardmakeup - \DoSampleText{text}{common}{nextpage} - \stopstandardmakeup} - -%D The \type {\DoSampleText} command is adapted to support -%D addition of subtexts (each subtext goes into its own -%D buffer). - -\def\DoSampleText#1#2#3% - {\setupframedtexts[SampleText][background={background,#3}] - \bgroup - \setups[#1]% - \setups[always]% - \setbox\nextbox=\hbox - {\startSampleText[none] - \getbuffer[#1]\par - \doif{#1}{text} - {\dorecurse{\TextN}{\getbuffer[text-\recurselevel]\par}} - \stopSampleText} - \xdef\SampleTextWidth{\the\wd\nextbox} - \setlayer[#2]{\box\nextbox}% - \egroup} - -%D Since we are no longer swapping windows, we end up with a -%D much simplier \type {\Stopidea} macro. We don't reset -%D samples at the inner level. - -\def\StartIdea% - {\bgroup - \let\StopSample \relax - \let\StopText \relax - \let\StopSubText\relax - \def\StartSample{\dostartbuffer[sample][StartSample][StopSample]}} - -\def\StopIdea% - {\startstandardmakeup - \DoSampleText{sample}{sample}{nextpage} - \SetTextWidth - \DoSampleText{text} {text} {nextpage} - \stopstandardmakeup - \egroup} - -%D Here we determine the width of the text window. It is -%D derived from the width of the sample and stays the same -%D within a sequence. - -\def\SetTextWidth - {\ifnum\TextN<1 % yes or no, may change - \scratchdimen=\makeupwidth - \advance\scratchdimen by -\SampleTextWidth - \advance\scratchdimen by \FrameSkip - \xdef\SampleWidth{\the\scratchdimen}% - \fi - \setupframedtexts - [SampleText] - [width=\SampleWidth]} - -%D We use the (already implemented) second alternative of -%D the titlepage graphic. Please don't change this. - -\defineoverlay[joke] [\useMPgraphic{joke}{n=1}] % not to be changed ! - -\doifnotmode{demo}{\endinput} - -%D The demo section. The original presentation uses proper -%D graphics and has better spacing. - -\def\SomeSymbol#1#2{\definedfont[ContextNavigation at #1]\char#2} - -\setupcombinations[distance=\FrameOffset,inbetween=\vskip\FrameOffset] - -\starttext - -\TitlePage{Some Famous Symbols} - -\Topic{Symbols} - -\StartSample - \startcombination[2*2] - {\SomeSymbol{5cm}{1}} {} - {\SomeSymbol{5cm}{3}} {} - {\SomeSymbol{5cm}{2}} {} - {\SomeSymbol{5cm}{4}} {} - \stopcombination -\StopSample - -\Topic{Previous} - -\StartIdea - \StartSample - \SomeSymbol{7cm}{1} - \StopSample - \StartText - This symbol can be used to indicate a hyperlink to a - previous page. - \StopText -\StopIdea - -\StartIdea - \StartSubText - As one can expect there is also a symbol for going to - the next page. - \StopSubText -\StopIdea - -\Topic{Previous} - -\StartIdea - \StartSample - \SomeSymbol{9cm}{2} - \StopSample - \StartText - This symbol is actually just a mirrored version of the - first symbol we showed. - \StopText -\StopIdea - -\NoTopic - -\StartText - Is this nice or not? -\StopText - -\Topic{First and Last} - -\StartSample - \SomeSymbol{11cm}{3} -\StopSample - -\StartSample - \SomeSymbol{11cm}{4} -\StopSample - -\StartIdea - \StartSample - \SomeSymbol{5cm}{3} - \StopSample - \StartText - A few screens back, we saw this symbol. - \StopText -\StopIdea - -\StartIdea - \StartSubText - This symbol represents the beginning of something. - \StopSubText -\StopIdea - -\StartIdea - \StartSample - \SomeSymbol{5cm}{4} - \StopSample - \StartSubText - Just like this one represents an end. - \StopSubText -\StopIdea - -\StartIdea - \StartSubText - They look just like the symbols found on audio and - video players. - \StopSubText -\StopIdea - -\Topic{Summary} - -\StartIdea - \StartSample - \SomeSymbol{6cm}{1} - \StopSample - \StartText - So we have a symbol for previous \unknown - \StopText -\StopIdea - -\StartIdea - \StartSample - \SomeSymbol{6cm}{2} - \StopSample - \StartSubText - \unknown\ and one for next \unknown - \StopSubText -\StopIdea - -\StartIdea - \StartSample - \SomeSymbol{6cm}{3} - \StopSample - \StartSubText - \unknown\ and yet another for first \unknown - \StopSubText -\StopIdea - -\StartIdea - \StartSample - \SomeSymbol{6cm}{4} - \StopSample - \StartSubText - \unknown\ and of course for last. - \StopSubText -\StopIdea - -\stoptext - diff --git a/tex/context/modules/common/s-pre-11.tex b/tex/context/modules/common/s-pre-11.tex deleted file mode 100644 index 551c5ebbc..000000000 --- a/tex/context/modules/common/s-pre-11.tex +++ /dev/null @@ -1,220 +0,0 @@ -%D \module -%D [ file=s-pre-11, -%D version=1999.08.20, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 11, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -\setuppapersize - [S6][S6] - -\setuplayout - [topspace=0cm, - backspace=0cm, - header=0pt, - footer=0pt, - width=middle, - height=middle] - -\setupbodyfont - [14.4pt,lbr] - -\setupcolors - [state=start] - -\setupinteraction - [click=no, - display=new, - state=start] - -\setupinteractionscreen - [option=max] - -\def\SomeShape% - {\resetMPdrawing - \startMPdrawing - path p[], q[] ; pair a, b ; - StartPage ; - \stopMPdrawing - \dorecurse{\CurrentTopic} - {\startMPdrawing - initialize_box(\MPpos{topic-\realfolio-\recurselevel}) ; - p[\recurselevel] := tensecircle (wxy,hxy,.25cm) shifted cxy ; - fill p[\recurselevel] withcolor .9white ; - pickup pencircle scaled .25cm ; - \ifnum\recurselevel=\CurrentTopic\space - draw p[\recurselevel] withcolor \MPcolor{ShowColor} ; - \else - draw p[\recurselevel] withcolor \MPcolor{DoneColor} ; - \fi - \stopMPdrawing}% - \dorecurse{\CurrentMaxItem} - {\startMPdrawing - initialize_box(\MPpos{item-\realfolio-\recurselevel}) ; - linewidth := .25cm ; - q[\recurselevel] := tensecircle (wxy,hxy,linewidth) shifted cxy ; - fill q[\recurselevel] withcolor .9white ; - pickup pencircle scaled linewidth ; - \ifnum\recurselevel=\CurrentMaxItem\space - draw q[\recurselevel] withcolor \MPcolor{ShowColor} ; - \else - draw q[\recurselevel] withcolor \MPcolor{DoneColor} ; - \fi - \stopMPdrawing}% - \dostepwiserecurse{2}{\CurrentTopic}{1} - {\startMPdrawing - draw - rt point 3 of p[\recurselevel-1] -- - lft point 7 of p[\recurselevel] - withcolor \MPcolor{ArrowColor} ; - \stopMPdrawing}% - \dostepwiserecurse{2}{\CurrentMaxItem}{1} - {\startMPdrawing - draw - bot point 9 of q[\recurselevel-1] -- - top point 5 of q[\recurselevel] - withcolor \MPcolor{ArrowColor} ; - \stopMPdrawing}% - \startMPdrawing - draw Page - withpen pencircle scaled .5cm - withcolor \MPcolor{EdgeColor} ; - StopPage ; - \stopMPdrawing - \MPdrawingdonetrue - \getMPdrawing} - -\def\TitlePage#1% - {\startstandardmakeup - \setupalign[middle] - \def\\{\vfil\bfb\setupinterlinespace} - \bfd\setupinterlinespace - \vfil#1\vfil\vfil - \stopstandardmakeup} - -\definecolor[PageColor][r=.5,g=.4,b=.3] -\definecolor[LineColor][r=.7,g=.6,b=.5] - -\definecolor[PageColor] [s=.60] -\definecolor[ShowColor] [r=.40] -\definecolor[EdgeColor] [g=.40] -\definecolor[DoneColor] [r=.40,g=.40] -\definecolor[ArrowColor] [b=.40] -\definecolor[LineColor] [r=.60,g=.60] -\definecolor[GotoColor] [ArrowColor] - -\setupinteraction[color=GotoColor,contrastcolor=GotoColor] - -\defineoverlay [shape] [\SomeShape] -\defineoverlay [next] [\overlaybutton{forward}] % [{nextpage}] - -\setupbackgrounds - [page] - [background={color,next,shape}, - backgroundcolor=PageColor] - -\doglobal\newcounter\CurrentMaxItem -\doglobal\newcounter\CurrentItem -\doglobal\newcounter\CurrentTopic - -\def\StartIdea% - {\doglobal\newcounter\CurrentItem} - -\def\StartTopic% - {\doglobal\increment\CurrentTopic - \dostartbuffer[topic-\CurrentTopic][StartTopic][StopTopic]} - -\def\StopIdea% - {\dorecurse{\CurrentItem} - {\let\CurrentMaxItem\recurselevel - \doStopIdea}} - -\def\doStopIdea% - {\startstandardmakeup - \dontcomplain - \vskip.875cm - \hbox to \makeupwidth - {\hfill - \dorecurse{\CurrentTopic} - {\edef\Topic{topic-\realfolio-\recurselevel}% - \hpos - {\Topic} - {\framed - [frame=off,align=middle,offset=.25cm] - {\getbuffer[topic-\recurselevel]}}% - \ifnum\recurselevel<\CurrentTopic - \hskip.875cm - \fi}% - \hfill} - \vskip.875cm - \vfilll - \dorecurse{\CurrentMaxItem} - {\edef\Item{item-\realfolio-\recurselevel} - \hbox to \makeupwidth - {\hfill - \hpos - {\Item} - {\framed - [width=.75\makeupwidth, - frame=off, - align=middle,offset=.125cm] - {\getbuffer[item-\recurselevel]}}% - \hfill} - \vskip.875cm} - \vfilll - \stopstandardmakeup} - -\def\StartItem% - {\doglobal\increment\CurrentItem - \dostartbuffer[item-\CurrentItem][StartItem][StopItem]} - -\lefthyphenmin =\maxdimen -\righthyphenmin=\maxdimen - -\doifnotmode{demo}{\endinput} - -\starttext - -\StartIdea - \StartTopic - A Nice Idea - \StopTopic - \StartItem - \input reich \relax - \StopItem - \StartItem - \input reich \relax - \StopItem - \StartItem - \input reich \relax - \StopItem -\StopIdea - -\StartIdea - \StartTopic - One More Nice Idea - \StopTopic - \StartItem - \input reich \relax - \StopItem - \StartItem - \input reich \relax - \StopItem -\StopIdea - -\StartIdea - \StartTopic - The Last Idea - \StopTopic - \StartItem - \input tufte \relax - \StopItem -\StopIdea - -\stoptext diff --git a/tex/context/modules/common/s-pre-14.tex b/tex/context/modules/common/s-pre-14.tex deleted file mode 100644 index 4dae6c009..000000000 --- a/tex/context/modules/common/s-pre-14.tex +++ /dev/null @@ -1,263 +0,0 @@ -%D \module -%D [ file=s-pre-14, -%D version=1999.08.20, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 14, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D In the process of making a couple of simple styles for -%D \EUROTEX\ 99, I came to this one. The joke is in the -%D pagenumber. This style can be used for short presentations -%D with much text. - -\startmode[asintended] \setupbodyfont[lbr] \stopmode - -\setupbodyfont[14.4pt] - -%D Since we expect text, we can best be very tolerant. - -\setuptolerance - [verytolerant,stretch] - -%D As most styles we choose a large screen page size. - -\setuppapersize - [S6][S6] - -\setuplayout - [width=fit, - rightedge=3cm, - margin=0pt, - rightedgedistance=2cm, - height=middle, - header=0pt, - footer=0pt, - topspace=1cm, - backspace=1cm] - -%D We only use two colors, named \type {One} and \type -%D {Two}: - -\setupcolors - [state=start] - -\definecolor [One] [r=.6,g=.4,b=.4] -\definecolor [Two] [r=.4,g=.6,b=.6] - -%D If you've looked at the demo file, you will have noticed -%D that the background consists of four pieces: two filled -%D rectangles and two half numbers. These are put on th epage -%D using four overlays: - -\setupbackgrounds - [page] - [background={one,two,three,four}] - -%D When we code this in \TEX, we get the following -%D definitions. As an alternative we coudl have used layers -%D but I'm afraid that it would not have led to less code. - -\defineoverlay - [one] - [{\framed - [frame=off,background=color,backgroundcolor=Two, - width=\overlaywidth,height=\overlayheight] - {}}] - -\defineoverlay - [three] - [{\hbox to \overlaywidth - {\hfill\SetOverlayWidth - \framed - [frame=off,background=color,backgroundcolor=One, - width=\overlaywidth,height=\overlayheight] - {}}}] - -%D We could have used the main backgroundcolor instead of -%D overlay \type {one}. - -\definefont[NumberFont][RegularBold at 3cm] - -\defineoverlay - [two] - [{\framed - [frame=off,width=\overlaywidth,height=\overlayheight, - offset=overlay] - {\vfill - \NumberFont\setstrut\SetOverlayWidth - \hbox to \hsize - {\hfill - \setupinteraction[style=,color=]% - \setbox0=\hbox{\strut\One\pagenumber}% - \hbox to 0pt{\hss\gotobox{\box0}[previouspage]\hss}% - \hskip\overlaywidth}}}] - -\defineoverlay - [four] - [{\framed - [frame=off,width=\overlaywidth,height=\overlayheight,offset=overlay] - {\vfill - \hbox to \hsize - {\hfill - \SetOverlayWidth - \framed - [frame=off,width=\overlaywidth,height=\overlayheight,offset=overlay] - {\vfill\NumberFont\setstrut - \setbox0=\hbox{\strut\Two\pagenumber}% - \setbox2=\hbox{\clip[nx=2,ny=1,x=2,y=1]{\copy0}}% - \dp2=\dp0 - \hbox to \hsize{\hbox to 0pt{\hss\hskip.5\wd0\box2\hss}\hfill}}}}}] - -\def\SetOverlayWidth% - {\scratchdimen = \rightedgedistance - \divide\scratchdimen by 2 - \advance\scratchdimen by \rightedgewidth - \advance\scratchdimen by \backspace - \edef\overlaywidth{\the\scratchdimen}} - -%D A much cleaner implementation is the following. If you hate -%D \METAPOST, you can run this style in the specified mode: - -\startnotmode[no-metapost] - -\setupbackgrounds - [page] - [background={number}] - -\defineoverlay[number][\useMPgraphic{number}] - -\startuseMPgraphic{number} - StartPage ; - path Vage ; picture Left, Right ; - x1 = x2 = xpart (llcorner Field[Text][RightEdge] shifted (-RightEdgeDistance/2,0)) ; - y1 = ypart llcorner Page ; - y2 = ypart ulcorner Page ; - Vage := llcorner Page -- z1 -- z2 -- ulcorner Page -- cycle ; - fill Page withcolor \MPcolor {One} ; - fill Vage withcolor \MPcolor {Two} ; - if PageNumber>0 : - defaultfont := "\truefontname{RegularBold}" ; - Left := Right := thelabel("\folio",origin) ysized 3cm ; - clip Right to boundingbox Right shifted (bbwidth(Right)/2,0) ; - draw Left shifted z1 shifted (0,2.25cm) withcolor \MPcolor {One} ; - draw Right shifted z1 shifted (0,2.25cm) withcolor \MPcolor {Two} ; - fi ; - StopPage ; -\stopuseMPgraphic - -\stopnotmode - -%D We use the simple label typesetting present in \METAPOST\ -%D because digits are seldom kerned so real \TEX ing is not -%D needed. As in the previous method, we let the graphics -%D overlap so that we don't get white lines due to rounding -%D problems in viewers. -%D -%D We put a button behind the text (this overlay is calculated -%D each page). - -\defineoverlay - [nextpage] - [\overlaybutton{nextpage}] - -\setupbackgrounds - [text] - [backgroundoffset=.5cm, - background=nextpage] - -%D We still have to turn on interaction mode. - -\setupinteraction - [state=start, - display=new, - menu=on] - -\setupinteraction - [color=, - contrastcolor=] - -%D Next we define structuring commands. - -\definehead[Topic] [chapter] \setuphead[Topic] [style=\bfc] -\definehead[Subject][section] \setuphead[Subject][style=\bfa] - -\setuphead - [Topic, Subject] - [number=no, - after={\blank[big]}] - -%D Because we will provide a menu, we don't offer lists. - -\let\Topics \gobbleoneargument -\let\Subjects\relax - -%D The table of contents goes to the right edge. - -\startinteractionmenu[right] - \setupinteraction - [color=black, - contrastcolor=Two] - \placelist - [Topic] - [alternative=e, - frame=off, - criterium=all] - \vfill -\stopinteractionmenu - -\setuplist - [Topic] - [width=\rightedgewidth, - maxwidth=\rightedgewidth, - style=\bfa] - -%D We safe some space: - -\setupwhitespace - [medium] - -\setupblank - [medium] - -%D In the titlepage, we still use the \TEX\ overlays, -%D so that we don't have to define a second graphic. - -\def\TitlePage#1% - {\StartTitlePage#1\StopTitlePage} - -\def\StartTitlePage% - {\bgroup - \setupbackgrounds[page][background={one,three}] - \startstandardmakeup - \setupalign[middle] - \def\\{\vfil\bfb\setupinterlinespace} - \bfd\setupinterlinespace - \vfil} - -\def\StopTitlePage% - {\vfil\vfil\vfil - \stopstandardmakeup - \egroup} - -%D This is it. - -\doifnotmode{demo}{\endinput} - -\starttext - -\TitlePage{Some Quotes\\(that you probably know by now)} - -\Topic{Tufte} \input tufte -\Topic{Knuth} \input knuth -\Topic{Reich} \input reich -\Topic{Zapf} \input zapf -\Topic{Materie} \input materie -%Topic{Stork} \input stork - -\stoptext diff --git a/tex/context/modules/common/s-pre-15.tex b/tex/context/modules/common/s-pre-15.tex deleted file mode 100644 index 25fb35783..000000000 --- a/tex/context/modules/common/s-pre-15.tex +++ /dev/null @@ -1,186 +0,0 @@ -%D \module -%D [ file=s-pre-15, -%D version=1999.09.01, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 15, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D This is one of the styles I made for the presentation on -%D the \NTS\ project at Euro\TeX\ 1998. You need balls to let -%D \TEX\ typeset graphics, but this style demonstrates that it -%D can be done. -%D -%D This presentation is meant for presentations that build up -%D an idea stepwise. -%D -%D \starttyping -%D \TitlePage{Do you know \TEX ?} -%D -%D \StartIdea -%D \StartItem We use \TEX\ for typesetting \unknown \StopItem -%D \StartItem mathematical text \unknown \StopItem -%D \StartItem but also for text that has no math \unknown \StopItem -%D \StartItem or presentations like this \unknown \StopItem -%D \StartItem and whatever you can come up with! \StopItem -%D \StopIdea -%D \stoptyping - -%D The basic layout is rather simple and used as much of the -%D screen as possible. - -\setuppapersize - [S6][S6] - -\setuplayout - [backspace=25pt, - topspace=25pt, - width=middle, - height=middle, - header=0pt, - footer=0pt] - -\setupinteraction - [state=start, - display=new, - color=LineColor, - contrastcolor=LineColor, - click=no] - -\setupinteractionscreen - [option=max] - -\startmode[asintended] \setupbodyfont[lbr] \stopmode - -\setupbodyfont[14.4pt] - -%D We use a lot of color. You can remap them if you want -%D differend ones. The ideas circulate over the colors. - -\setupcolors - [state=start] - -\definecolor[TextColor][s=.8] -\definecolor[PageColor][s=.6] -\definecolor[LineColor][s=.4] - -\definecolor[red] [r=.4] \definecolor[cyan] [g=.4,b=.4] -\definecolor[green][g=.4] \definecolor[magenta][r=.4,b=.4] -\definecolor[blue] [b=.4] \definecolor[yellow] [r=.4,g=.4] - -\definecolor[linecolor 1][red] \definecolor[linecolor 5][cyan] -\definecolor[linecolor 2][green] \definecolor[linecolor 6][magenta] -\definecolor[linecolor 3][blue] \definecolor[linecolor 4][yellow] - -%D We use variables to make sure that the graphics are reused -%D but unique. - -\setupMPvariables[pageframe][pagecolor=PageColor,linecolor=LineColor] -\setupMPvariables[textframe][textcolor=TextColor,linecolor=LineColor] - -\setupbackgrounds - [page] - [background={pageframe,nextpage}] - -\defineoverlay [pageframe] [\uniqueMPgraphic{pageframe}] -\defineoverlay [textframe] [\uniqueMPgraphic{textframe}] -\defineoverlay [nextpage] [\overlaybutton{forward}] - -\startuniqueMPgraphic{pageframe}{pagecolor,linecolor} - path p ; p := fullsquare xyscaled (\overlaywidth,\overlayheight) ; - pickup pencircle scaled 10pt ; - fill p withcolor \MPvar{pagecolor} ; - draw p withcolor \MPvar{linecolor} ; -\stopuniqueMPgraphic - -\startuniqueMPgraphic{textframe}{textcolor,linecolor} - path p ; p := fullcircle xyscaled (\overlaywidth,\overlayheight) ; - pickup pencircle scaled 10pt ; - fill p withcolor \MPvar{textcolor} ; - draw p withcolor \MPvar{linecolor} ; -\stopuniqueMPgraphic - -%D The rest of the file implements the nasty part: typesetting -%D text embedded in a graphic. The text is collected in a box -%D so that we can reuse it. - -\newbox\CollectedIdeas -\newcounter\CurrentTopic - -\def\StartItem% - {\setbox\CollectedIdeas=\hbox\bgroup - \ifdim\wd\CollectedIdeas>0pt \unhbox\CollectedIdeas\hskip25pt \fi - \setbox\scratchbox=\hbox\bgroup - \framed - [width=160pt,height=160pt,align=middle,frame=off, - background=textframe,offset=15pt,top=\vfill,bottom=\vfill] - \bgroup} - -\def\StopItem% - {\egroup - \egroup - \setbox\scratchbox=\hbox{\lower.5\ht\scratchbox\box\scratchbox}% - \ht\scratchbox=.5\ht\scratchbox - \dp\scratchbox= \ht\scratchbox - \box\scratchbox - \egroup - \startstandardmakeup - \dontcomplain - \leftskip 0pt plus 50pt - \rightskip 0pt plus 50pt - \parfillskip 0pt - \baselineskip 100pt - \unhcopy\CollectedIdeas - \stopstandardmakeup} - -\def\StartIdea% - {\ifnum\CurrentTopic=6 \doglobal\newcounter\CurrentTopic \fi - \doglobal\increment\CurrentTopic - \definecolor[LineColor][linecolor \CurrentTopic] - \setbox\CollectedIdeas=\null} - -\def\StopIdea% - {} - -\def\StartTitlePage% - {\startstandardmakeup - \setupalign[middle] - \def\\{\vfil\bfb\setupinterlinespace} - \bfd\setupinterlinespace - \vfil} - -\def\StopTitlePage% - {\vfil\vfil - \stopstandardmakeup} - -\def\TitlePage#1% - {\StartTitlePage#1\StopTitlePage} - -\doifnotmode{demo}{\endinput} - -%D A simple test on functionality. - -\setupoutput[pdftex] - -\starttext - -\TitlePage{Do you know \TEX ?} - -\startbuffer -\StartIdea - \StartItem We use \TEX\ for typesetting \unknown \StopItem - \StartItem mathematical text \unknown \StopItem - \StartItem but also for text that has no math \unknown \StopItem - \StartItem or presentations like this \unknown \StopItem - \StartItem and whatever you can come up with! \StopItem -\StopIdea -\stopbuffer - -\dorecurse{6}{\getbuffer} - -\stoptext diff --git a/tex/context/modules/common/s-pre-19.tex b/tex/context/modules/common/s-pre-19.tex deleted file mode 100644 index 991d311ce..000000000 --- a/tex/context/modules/common/s-pre-19.tex +++ /dev/null @@ -1,347 +0,0 @@ -%D \module -%D [ file=s-pre-19, -%D version=2000.07.31, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 19, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D This style is made in the process or writing the \METAFUN\ -%D manual. It exploits a few tricks, like graphics calculated -%D using positional information. It also uses the (at that -%D moment) new menu list placement alternative. If you forget -%D about the definition of the button shapes, which is -%D complicated in any system, this style is not even that hard -%D to follow. Watch how the left side of the buttons follow -%D the right side of the text graphic. -%D -%D While playing bit with this style, the random alternative -%D made me think of those organic building with non equal -%D windows (we have a few in The Netherlands), so I decided to -%D label this style as \type {pre-organic}. -%D -%D At the end of this file, there is a small test file, so -%D when you process this file with \TEXEXEC\ and the options -%D \type {--mode=demo} and \type {--pdf}, you will get a demo -%D document. - -%D We use one of the standard screen \quote {paper} sizes, and -%D map it onto the same size, so that we get a nicely cropped -%D page. - -\setuppapersize - [S6][S6] - -%D Like in the \METAFUN\ manual, we use the Palatino as main -%D bodyfont. This font is quite readable on even low -%D resolution screens, although I admit that this style is -%D developed using an $1400\times1050$ pixel LCD screen, so I -%D may be biased. - -%\startmode[asintended] \setupbodyfont[ppl] \stopmode - -%D The layout specification sets up a text area and a right -%D edge area where the menus will go. Watch the rather large -%D edge distance. By setting the header and footer dimensions -%D to zero, we automatically get rid of page body ornaments, -%D like the pagenumber. - -\setuplayout - [topspace=48pt, - backspace=48pt, - cutspace=12pt, - width=400pt, - margin=0cm, - rightedge=88pt, - rightedgedistance=48pt, - header=0cm, - footer=0cm, - height=middle] - -%D We use a moderate, about a line height, interparagraph -%D white space. - -\setupwhitespace - [big] - -%D Of course we use colors, since on computer displays they -%D come for free. - -\setupcolors - [state=start] - -\definecolor [red] [r=.75] -\definecolor [yellow] [r=.75,g=.75] -\definecolor [gray] [s=.50] -\definecolor [white] [s=.85] - -\definecolor [PageColor] [yellow] -\definecolor [TextColor] [white] -\definecolor [OrnamentColor] [red] -\definecolor [InteractionColor] [red] -\definecolor [ContrastColor] [gray] - -%D This is an interactive document, so we enable interaction. -%D In this style, we disable the viewer's \quote {highlight a -%D hyperlink when it's clicked on} feature. We will use a -%D menu, so we enable menus. Later we will see the contract -%D color |<|hyperlinks gets that color when we are already on -%D the location|>| in action. - -\setupinteraction - [state=start, - click=off, - color=InteractionColor, - contrastcolor=ContrastColor, - menu=on] - -%D The menu itself is set up as follows. Because we will -%D calculate menubuttons based on their position on the page, -%D we have to keep track of the positions. Therefore, we set -%D the \type {position} variable to \type {yes}. - -\setupinteractionmenu - [right] - [frame=off, - position=yes, - align=middle, - topoffset=-.75cm, - bottomoffset=-.75cm, - color=gray, - contrastcolor=gray, - style=bold, - before=, - after=] - -%D The menu content is rather sober: a list of topics (later -%D we will define the command that generates topic entries), -%D and a close button. - -\startinteractionmenu[right] - \placelist[Topic][alternative=right] - \vfill - \but [CloseDocument] close \\ -\stopinteractionmenu - -%D We have now arived at the more interesting part of the style -%D definition: the graphic that goes in the page background. -%D Because this graphic will change, we define a usable -%D \METAPOST\ graphic. Page backgrounds are recalculated each -%D page, opposite to the other backgrounds that are calculated -%D when a new background is defined, or when repetitive -%D calculation is turned on. - -\setupbackgrounds - [page] - [background=page] - -\defineoverlay - [page] - [\useMPgraphic{page}] - -\setupMPvariables - [page] - [alternative=3] - -\startuseMPgraphic{page} - - \includeMPgraphic{rightsuperbutton} - - StartPage ; - - path p, q ; pickup pencircle scaled 3pt ; - - p := Field[Text][Text] enlarged 36pt superellipsed .90 ; - - fill Page withcolor \MPcolor{PageColor} ; - fill p withcolor \MPcolor{TextColor} ; - draw p withcolor \MPcolor{OrnamentColor} ; - - p := Field[Text][Text] enlarged 48pt superellipsed .90 ; - - def right_menu_button (expr nn, rr, pp, xx, yy, ww, hh, dd) = - if (pp>0) and (rr>0) : - q := rightsuperbutton(p,xx,yy,RightEdgeWidth,hh) ; - fill q withcolor \MPcolor{TextColor} ; - draw q withcolor if rr=2 : \MPcolor{ContrastColor} - else : \MPcolor{InteractionColor} fi ; - fi ; - enddef ; - - \MPmenubuttons{right} - - StopPage ; -\stopuseMPgraphic - -\startuseMPgraphic{page} - - \includeMPgraphic{rightsuperbutton} - - StartPage ; - - numeric alternative, seed, superness, squeezeness, randomness ; - path p, q ; transform t ; - - alternative := \MPvar{alternative} ; - seed := uniformdeviate 100 ; - - if alternative > 10 : - superness := .85 + ((\realfolio-1)/\lastpage) * .15 ; - squeezeness := 12pt - ((\realfolio-1)/\lastpage) * 10pt ; - else : - superness := .90 ; - squeezeness := 12pt ; - fi ; - - randomness := squeezeness ; - - alternative := alternative mod 10 ; - - t := identity if alternative=3: shifted (9pt,-9pt) fi ; - - % first we draw the shape that surrounds the text - - randomseed := seed ; - - p := Field[Text][Text] enlarged if - alternative = 1 : 36pt superellipsed superness elseif - alternative = 2 : 36pt squeezed squeezeness elseif - alternative = 3 : 36pt randomized randomness else - : 36pt fi ; - pickup pencircle scaled 3pt ; - - fill Page withcolor \MPcolor{PageColor} ; - fill p withcolor \MPcolor{TextColor} ; - draw p withcolor \MPcolor{OrnamentColor} ; - - % we set p to the wider shape from which we will chip off pieces - - randomseed := seed ; - - p := ( Field[Text][Text] enlarged if - alternative = 1 : 48pt superellipsed superness elseif - alternative = 2 : 48pt squeezed squeezeness elseif - alternative = 3 : 36pt randomized randomness else - : 48pt fi ) transformed t ; - - % calls to *_menu_button are generated automatically ... - - vardef right_menu_button (expr nn, rr, pp, xx, yy, ww, hh, dd) = - save q ; path q ; - if (pp>0) and (rr>0) : - q := rightsuperbutton(p,xx,yy,RightEdgeWidth,hh) ; % \MPw{menu:right:\realfolio} - fill q withcolor \MPcolor{TextColor} ; - draw q withcolor if rr=2 : \MPcolor{ContrastColor} - else : \MPcolor{InteractionColor} fi ; - fi ; - enddef ; - - % ... and inserted when the graphic data is flushed here ... - - \MPmenubuttons{right} - - StopPage ; -\stopuseMPgraphic - -\startuseMPgraphic{rightsuperbutton} - -vardef rightsuperbutton (expr pat, xpos, ypos, wid, hei) = - - save p, ptop, pbot, t, b, edge, shift, width, height ; - path p, ptop, pbot ; pair t, b ; numeric edge, shift, width, height ; - - edge := xpos + wid ; shift := ypos + hei ; - - p := rightpath pat ; - - ptop := ((-infinity,shift)--(edge,shift)) ; - pbot := ((-infinity,shift-hei)--(edge,shift-hei)) ; - - t := p intersection_point ptop ; - b := p intersection_point pbot ; - - p := subpath(0,xpart (p intersectiontimes ptop)) of p ; - p := subpath(xpart (p intersectiontimes pbot),length(p)) of p ; - - (p -- t -- point 1 of ptop & - point 1 of ptop -- point 1 of pbot & - point 1 of pbot -- b - -- cycle) - -enddef ; - -\stopuseMPgraphic - -%D Topics are identified with \type {\Topic}, which is an -%D instance of chapter headings. The number is made invisible. -%D Since it still is a numbered section header, \CONTEXT\ will -%D write the header to the table of contents. - -\definehead - [Topic] - [chapter] - -\setuphead - [Topic] - [number=no] - -%D We will use a bold font in the table of contents. We also -%D force a complete list. - -\setuplist - [Topic] - [criterium=all, - style=bold, - before=, - after=] - -%D The \type {\TitlePage} macro looks horrible, because we -%D want to keep the interface simple: a list of small -%D sentences, separated by \type {\\}. - -\def\StartTitlePage - {\startstandardmakeup - \switchtobodyfont[big] - \def\\{\vfill\bfb\let\\=\par} - \bfd\setupinterlinespace\gray - \vskip.5cm} - -\def\StopTitlePage - {\\\vskip.5cm % the \\ is really needed - \stopstandardmakeup} - -\def\TitlePage#1% - {\StartTitlePage#1\StopTitlePage} - -%D A couple of goodies: - -\def\Subject {\Topic} -\def\Topics #1{} -\def\Subjects {} - -%D For those who want to test: - -\doifnotmode{demo}{\endinput} - -\starttext - -\setupMPvariables[page][alternative=3] - -\TitlePage - {A Few Nice Quotes\\ - A Simple Style Demo\\ - Hans Hagen, August 2000} - - -\Topic {Douglas R. Hofstadter} \input douglas \page -\Topic {Donald E. Knuth} \input knuth \page -\Topic {Edward R. Tufte} \input tufte \page -\Topic {Hermann Zapf} \input zapf \page -%Topic {David F. Stork} \input stork \page - -\stoptext diff --git a/tex/context/modules/common/s-pre-61.tex b/tex/context/modules/common/s-pre-61.tex deleted file mode 100644 index 48b9d09a0..000000000 --- a/tex/context/modules/common/s-pre-61.tex +++ /dev/null @@ -1,275 +0,0 @@ -%D \module -%D [ file=s-pre-61, -%D version=2004.03.15, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 61, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D Optima - -\usemodule[pre-60] - -\doifmodeelse {mkiv} { - \usetypescriptfile[ghz] - \definetypeface[mainface][ss][sans][optima-nova][default] -} { - \usetypescriptfile[type-ghz] - \definetypeface[mainface][ss][sans][optima-nova][default][encoding=\defaultencoding] -} - -\setupbodyfont[mainface,ss,18pt] -\setupinterlinespace[line=3.25ex] - -\setuppapersize - [S6][S6] - -% \setuppapersize -% [SW][SW] - -\setuplayout - [topspace=10pt, - header=30pt, - headerdistance=20pt, - height=middle, - footerdistance=20pt, - footer=0pt, - bottomdistance=20pt, - bottom=20pt, - bottomspace=50pt, - backspace=30pt, - width=middle] - -\setupinteraction - [state=start, - click=off, - menu=on, - style=, - color=interactioncolor, - contrastcolor=interactioncolor] - -\setupinteractionscreen - [option=max] - -\setupinteractionmenu - [bottom] - [color=maincolor, - contrastcolor=maincolor, - style=\tfa, % acceptable - left=\hfill, - middle=, - right=, - height=\bottomheight, - width=2\bottomheight, - offset=overlay, - frame=off] - -\startinteractionmenu[bottom] - \but [firstpage] \symbol[firstpage] \\ - \but [previouspage] \symbol[previouspage] \\ - \but [InvokeStepper] \StartBusy\symbol[PauseRendering]\StopBusy \\ - \but [nextpage] \symbol[nextpage] \\ - \but [lastpage] \symbol[lastpage] \\ - \but [CloseDocument] \symbol[CloseDocument] \\ -\stopinteractionmenu - -% maybe in colo-sjk : \setupcolor[sjk] - -\definecolor [dark] [s=.4] -\definecolor [bright] [s=.9] - -\definecolor [red] [r=.4,g=.2,b=.2] -\definecolor [green] [r=.2,g=.4,b=.2] -\definecolor [blue] [r=.2,g=.2,b=.4] - -\definecolor [cyan] [r=.2,g=.4,b=.4] -\definecolor [magenta][r=.4,g=.2,b=.4] -\definecolor [yellow] [r=.4,g=.4,b=.2] - -\definecolor [pagecolor] [dark] -\definecolor [maincolor] [bright] -\definecolor [textcolor] [red] - -\definecolor [interactioncolor] [r=.8,g=.8,b=.6] - -\setupcolors - [state=start, - textcolor=maincolor] - -\setupbackgrounds - [page] - [background=page, - backgroundcolor=textcolor] - -\setupbackgrounds - [text]% [text] - [background={comments,text,invoke}] - -\definelayer - [text] - [width=\textwidth, - height=\textheight] - -\defineoverlay - [comments] - [{\setlayer[text][preset=middle]{\placecomments}}] - -\defineoverlay[page][\uniqueMPgraphic{page-\ifcase\realpageno\or one\else plus\fi}] - -\startuniqueMPgraphic{page-one} - StartPage ; - fill Page - enlarged 4pt - withcolor \MPcolor{pagecolor} ; - fill Field[Text][Text] - enlarged 10pt -% topenlarged (HeaderHeight+HeaderDistance) - leftenlarged (BackSpace+4pt) - rightenlarged (CutSpace +4pt) - withcolor OverlayColor ; - StopPage ; -\stopuniqueMPgraphic - -\startuniqueMPgraphic{page-plus} - StartPage ; - fill Page - enlarged 4pt - withcolor \MPcolor{pagecolor} ; - fill Field[Text][Text] - enlarged 10pt - leftenlarged (BackSpace+4pt) - rightenlarged (CutSpace+4pt) - withcolor OverlayColor ; - StopPage ; -\stopuniqueMPgraphic - -% this needs to be sorted out ! - -\appendtoks - \NormalizeFontHeight \HeadFont {\setstrut\strut\quad} {1.0\headerheight} {SansBold} - \NormalizeFontHeight \TitleFont {\setstrut\strut\quad} {2.0\headerheight} {SansBold} - \NormalizeFontHeight \SubTitleFont {\setstrut\strut\quad} {1.5\headerheight} {SansBold} - \NormalizeFontHeight \SubSubTitleFont {\setstrut\strut\quad} {1.0\headerheight} {SansBold} -\to \everystarttext - -\appendtoks - \NormalizeFontHeight \HeadFont {\setstrut\strut\quad} {1.0\headerheight} {SansBold} - \NormalizeFontHeight \TitleFont {\setstrut\strut\quad} {2.0\headerheight} {SansBold} - \NormalizeFontHeight \SubTitleFont {\setstrut\strut\quad} {1.5\headerheight} {SansBold} - \NormalizeFontHeight \SubSubTitleFont {\setstrut\strut\quad} {1.0\headerheight} {SansBold} -\to \everystoptext - -\setuphead - [chapter] - [placehead=empty, - after={\blank[medium]}, - color=maincolor, - placenumber=no, - style=\HeadFont] - -\setupheadertexts - [\doiftextelse{\currentheadnumber}{\placeheadtext[Topic]}{\placeheadtext[Nopic]}] - [] - -\setuppagenumbering - [location=] - -\definesymbol - [emdash] - [\emdash] - -\setupitemize - [each] - [loose,serried,joinedup,broad] - [symbol=emdash] - -\setupalign - [broad,right] - -\def\doTitlePage#1#2#3% - {\startstandardmakeup[headerstate=high] - \def\\{\def\\{\endgraf\quad\quad}\endgraf\quad\ignorespaces#2}% - #1\setstrut\setupinterlinespace\vfil#3\vfil\vfil - \stopstandardmakeup} - -\def\TitlePage {\doTitlePage\TitleFont\relax} -\def\SubTitlePage{\doTitlePage\TitleFont\SubTitleFont} - -\definehead[Topic][chapter] -\definehead[Nopic][title] - -\def\Topics#1% - {\Nopic[topics]{#1} - \startcolumns - \placelist[Topic] - \stopcolumns} - -\setuplist - [Topic] - [alternative=f, - color=maincolor, - contrastcolor=maincolor, - criterium=all] - -\defineoverlay[topics][\overlaybutton{topics}] - -\setupbackgrounds - [bottom] [text] - [background=topics] - -\continueifinputfile{s-pre-61.tex} - -\starttext - -\TitlePage{Stepwise\\Refinement} - -\Topics{Topics} - -\Topic{Female Artists} - -\StartSteps - -\startitemize -\item Fiona Apple \FlushStep -\item Tori Amos \FlushStep -\item Kate Bush \FlushStep -\item Heather Nova \FlushStep -\item Alanis Morissette \FlushStep -\item Suzanne Vega \FlushStep -\stopitemize - -\StopSteps - -\Topic{Male Composers} - -\StartSteps - -\startitemize -\item John Adams \FlushStep -\item Steve Reich \FlushStep -\item Louis Andriessen \FlushStep -\item Olivier Messiaen \FlushStep -\stopitemize - -\StopSteps - -\Topic{And Some More} - -\StartSteps - -\startitemize -\item Mark Hollis \FlushStep -\item Roger Waters \FlushStep -\item David Gilmore \FlushStep -\item Peter Gabriel \FlushStep -\item Randy Newman \FlushStep -\stopitemize - -\StopSteps - -\stoptext diff --git a/tex/context/modules/common/s-pre-62.tex b/tex/context/modules/common/s-pre-62.tex deleted file mode 100644 index a1a405c23..000000000 --- a/tex/context/modules/common/s-pre-62.tex +++ /dev/null @@ -1,224 +0,0 @@ -%D \module -%D [ file=s-pre-62, -%D version=2005.03.04, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 62, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D Melior - -\usemodule[pre-60] - -\usetypescriptfile - [type-ghz] - -\doifmodeelse {mkiv} { - - \definetypeface[mainface][rm][serif][melior] [default] - \definetypeface[mainface][tt][mono] [modern] [default][rscale=1.05] - \definetypeface[mainface][ss][serif][melior] [default] - \definetypeface[mainface][mm][math] [palatino][default][rscale=0.95] - -} { - - \definetypeface[mainface][rm][serif][melior] [default][encoding=texnansi] - \definetypeface[mainface][tt][mono] [modern] [default][encoding=texnansi,rscale=1.05] - \definetypeface[mainface][ss][serif][melior] [default][encoding=texnansi] - \definetypeface[mainface][mm][math] [palatino][default][encoding=texnansi,rscale=0.95] - -} - -\setupbodyfont - [mainface,14.4pt] - -\setuppapersize - [S6][S6] - -\setvariables[layout][dx=0,dy=1,nx=2,ny=2,step=64] - -\definemeasure[layoutwd][\dimexpr\paperwidth /\getvariable{layout}{step}\relax] -\definemeasure[layoutht][\dimexpr\paperheight/\getvariable{layout}{step}\relax] - -\setuplayout - [ width=middle, - height=middle, - header=0pt, - footer=0pt, - margin=0pt, - backspace=5\measure{layoutwd}, - topspace=5\measure{layoutht}] - -\definelayout - [step] - [ backspace=\numexpr2+ \getvariable{layout}{dx}\relax\measure{layoutwd}, - cutspace=\numexpr3+\getvariable{layout}{nx}-\getvariable{layout}{dx}\relax\measure{layoutwd}, - topspace=\numexpr2+ \getvariable{layout}{dy}\relax\measure{layoutht}, - bottomspace=\numexpr3+\getvariable{layout}{ny}-\getvariable{layout}{dy}\relax\measure{layoutht}] - -\definecolor[layout:left] [t=.5,a=1,b=1] -\definecolor[layout:right] [t=.5,a=1,r=1] -\definecolor[layout:top] [t=.5,a=1,g=1] -\definecolor[layout:bottom][t=.5,a=1,y=1] -\definecolor[layout:page] [s=.75] - -\definehspace[menu][\measure{layoutwd}] - -\setupinteraction - [state=start, - click=off, - style=, - color=interactioncolor, - contrastcolor=interactioncolor] - -\setupinteractionscreen - [option=max] - -\setupbuttons - [color=maincolor, - contrastcolor=maincolor, - style=\tf, % acceptable - height=2\measure{layoutht}, - width=2\measure{layoutwd}, - offset=overlay, - frame=off] - -\definecolor[interactioncolor][darkgray] -\definecolor[maincolor] [lightgray] - -\setuptexttexts - [] - [\vbox to \textheight{\vfill\hfill\setups{menu:content}}] - -\startsetups menu:content - - \button{\symbol[firstpage]}[firstpage] - \hspace[menu] - \button{\symbol[previouspage]}[previouspage] - \hspace[menu] - \button{\StartBusy\symbol[PauseRendering]\StopBusy}[InvokeStepper] - \hspace[menu] - \button{\symbol[nextpage]}[nextpage] - \hspace[menu] - \button{\symbol[lastpage]}[lastpage] - \hspace[menu] - \button{\symbol[CloseDocument]}[CloseDocument] - -\stopsetups - -\startuseMPgraphic{page}{step} - StartPage ; - numeric dx, dy ; dx := PaperWidth/\MPvar{step} ; dy := PaperHeight/\MPvar{step} ; - fill Page withcolor .5white ; - fill - ulcorner Page -- urcorner Page -- - urcorner Page shifted (0,-TopSpace+dy) -- ulcorner Page shifted (0,-TopSpace+dy) -- cycle - withcolor \MPcolor{layout:top} ; - fill - llcorner Page -- lrcorner Page -- - lrcorner Page shifted (0,BottomSpace-dy) -- llcorner Page shifted (0,BottomSpace-dy) -- cycle - withcolor \MPcolor{layout:bottom} ; - fill - ulcorner Page -- llcorner Page -- - llcorner Page shifted (BackSpace-dx,0) -- ulcorner Page shifted (BackSpace-dx,0) -- cycle - withcolor \MPcolor{layout:left} ; - fill - urcorner Page -- lrcorner Page -- - lrcorner Page shifted (-CutSpace+dx,0) -- urcorner Page shifted (-CutSpace+dx,0) -- cycle - withcolor \MPcolor{layout:right} ; - fill Field[Text][Text] enlarged (dx,dy) withcolor white ; - fill Field[Text][Text] enlarged (dx,dy) withcolor \MPcolor{layout:page} ; - StopPage ; -\stopuseMPgraphic - -\defineoverlay[page][\useMPgraphic{page}{step=\getvariable{layout}{step}}] - -\setupbackgrounds - [page] - [background=page] - -\setupcolors - [state=start] - -\startsetups nextstep - % pagebreak handlers are grouped, so we need to set global - \ifnum\getvariable{layout}{dx}=\getvariable{layout}{nx}\relax - \ifnum\getvariable{layout}{dy}=\getvariable{layout}{ny}\relax - \setxvariables[layout][dy=1] - \else - \setxvariables[layout][dy=\the\numexpr\getvariable{layout}{dy}+1\relax] - \fi - \setxvariables[layout][dx=1] - \else - \setxvariables[layout][dx=\the\numexpr\getvariable{layout}{dx}+1\relax] - \fi - % global anyway - \setuplayout[step] -\stopsetups - -\definefontsynonym[MainTitleFont][SerifBold] - -\definefont[ChapterTitleFont][MainTitleFont sa 2] - -\appendtoks - \NormalizeFontHeight \TitleFont {\setstrut\strut\quad} {4\lineheight} {MainTitleFont} - \NormalizeFontHeight \SubTitleFont {\setstrut\strut\quad} {3\lineheight} {MainTitleFont} - \NormalizeFontHeight \ChapterNumberFont {XVI} {4\lineheight} {MainTitleFont} -\to \everystarttext - -\setupsection - [section-2] - [bodypartconversion=Romannumerals] - -\installpagebreakhandler {step} {\setups{nextstep}} - -\definepagebreak[chapter][yes,step] - -\setuphead - [chapter] - [page=chapter, - command=\MyChapterCommand] - -\definehead[Topic][chapter] -\definehead[Nopic][title] - -\setuphead[chapter,Topic,Nopic] - [numberstyle=\ChapterNumberFont, - textstyle=\ChapterTitleFont, - numbercolor=lightgray, - textcolor=darkgray] - -\def\MyChapterCommand#1#2% - {\hbox \bgroup % we need to nil the strut added by the headplacement - \setupframed[frame=off,lines=4,offset=overlay]% - \rlap{\hskip2\lineheight\framed{\setnostrut#1}}\framed{#2}% - \egroup} - -\setupitemize - [each] - [R,broad] - [stopper=, - color=lightgray] - -\def\doTitlePage#1#2#3% - {\startstandardmakeup[headerstate=high,textstate=stop] - \setupalign[middle] - \def\\{\def\\{\endgraf}\endgraf\vfil\ignorespaces#2}% - \startcolor[darkgray] - #1\setstrut\setupinterlinespace\vfil#3\vfil - \stopcolor - \stopstandardmakeup} - -\def\TitlePage {\doTitlePage\TitleFont\relax} -\def\SubTitlePage{\doTitlePage\TitleFont\SubTitleFont} - -\long\def\StartTitlePage #1\StopTitlePage {\TitlePage {#1}} -\long\def\StartSubTitlePage#1\StopSubTitlePage{\SubTitlePage{#1}} - -\endinput - diff --git a/tex/context/modules/common/s-pre-63.tex b/tex/context/modules/common/s-pre-63.tex deleted file mode 100644 index 974c67a5f..000000000 --- a/tex/context/modules/common/s-pre-63.tex +++ /dev/null @@ -1,77 +0,0 @@ -%D \module -%D [ file=s-pre-63, -%D version=2006.05.11, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 63, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -this module is under reconstruction - -\endinput - -\usemodule[pre-61,streams] - -\definemeasure[textgap] [\dimexpr24pt\relax] - -\definemeasure[leftwidth] [\dimexpr.25\textwidth-.5\measure{textgap}\relax] -\definemeasure[rightwidth][\dimexpr.75\textwidth-.5\measure{textgap}\relax] - -\definestreamlayer[left] [width=\measure{leftwidth}] -\definestreamlayer[right][width=\measure{rightwidth}] - -\setupbodyfont[12pt] - -\definefont[LeftFont][Normal sa 3] - -\setupheader[style=\tfc,before=\vss,after=\vss] - -\startsetups streamlayer:left:settings - \hsize\measure{leftwidth} - \LeftFont - \setupinterlinespace -\stopsetups - -\startsetups streamlayer:right:settings - \hsize\measure{rightwidth} -\stopsetups - -\definecombination[both][distance=\measure{textgap},location=top] - -\startsetups place:both - \startcombination[both] - {\StartLocalStep\placestreamlayer[left]\StopLocalStep} {} - {\StartLocalStep\placestreamlayer[right]\StopLocalStep} {} - \stopcombination -\stopsetups - -\def\StartPage {\page \StartLocalSteps} -\def\StopPage {\StopLocalSteps \page} - -\def\StartLeft {\startstreamlayer[left]} -\def\StartRight{\startstreamlayer[right]} - -\def\StopLeft {\stopstreamlayer} -\def\StopRight {\stopstreamlayer} - -\def\StartPair {} -\def\StopPair {\setups[place:both]} - -% \doifnotmode {demo} {\endinput} - -\setupbodyfont[8pt] \definefont[BigFont][Normal sa 4] - -\starttext - -\StartPage - \StartPair \StartLeft ZAPF \StopLeft \StartRight \input zapf \StopRight \StopPair - \StartPair \StartLeft DAVIS \StopLeft \StartRight \input davis \StopRight \StopPair - \StartPair \StartLeft WARD \StopLeft \StartRight \input ward \StopRight \StopPair -\StopPage - -\stoptext diff --git a/tex/context/modules/common/s-pre-64.tex b/tex/context/modules/common/s-pre-64.tex deleted file mode 100644 index ef4889bbb..000000000 --- a/tex/context/modules/common/s-pre-64.tex +++ /dev/null @@ -1,208 +0,0 @@ -%D \module -%D [ file=s-pre-64, -%D version=2006.05.11, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 64, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -% To be documented, used in 2007 - -\usemodule[s][pre-60] - -\newcounter\shapesynctag -\newdimen\slantedshapedimen -\newdimen\slantedshapestep -\newdimen\slantedshapeleftskip -\newdimen\slantedshapeoffset -\newdimen\slantedshapeextra - -\positioningtrue - -\def\AdaptShape - {\doglobal\increment\shapesynctag - \getnoflines\textheight - \slantedshapestep\dimexpr\slantedshapeleftskip/\noflines\relax - \leftskip\slantedshapeleftskip - \scratchdimen\dimexpr\MPy{text:\MPp\shapesynctag}+\MPh{text:\MPp\shapesynctag}-\topskip-\MPy\shapesynctag\relax - \advance\scratchdimen\slantedshapeextra - \getnoflines\scratchdimen - \slantedshapedimen \noflines \slantedshapestep - \scratchtoks\emptytoks - \dorecurse{30} - {\appendetoks - \the\dimexpr-\slantedshapedimen+\slantedshapeoffset \relax\space - \the\dimexpr \hsize-2\slantedshapeoffset\relax\space - \to\scratchtoks - \advance\slantedshapedimen \slantedshapestep}% - \parshape 30 \the\scratchtoks - \strut\xypos\shapesynctag} - -\def\AdaptShapeX - {\doglobal\increment\shapesynctag - \getnoflines\textheight - \slantedshapestep\dimexpr\slantedshapeleftskip/\noflines\relax - \leftskip\slantedshapeleftskip - \scratchdimen\dimexpr\MPy{text:\MPp\shapesynctag}+\MPh{text:\MPp\shapesynctag}-\topskip-\MPy\shapesynctag\relax - \advance\scratchdimen\slantedshapeextra - \getnoflines\scratchdimen - \slantedshapedimen \noflines \slantedshapestep - \scratchtoks\emptytoks - \dorecurse{30} - {\appendetoks - \the\dimexpr-\slantedshapedimen+\slantedshapeoffset +5cm \relax\space - \the\dimexpr \hsize-2\slantedshapeoffset\relax\space - \to\scratchtoks - \advance\slantedshapedimen \slantedshapestep}% - \parshape 30 \the\scratchtoks - \strut\xypos\shapesynctag} - -\setuppapersize[S6][S6] - -\setupinteraction - [state=start, - click=no] - -\setupinteractionscreen - [option=max] - -\setuplayout - [backspace=12pt, - topspace=24pt, - height=middle, - width=middle, - header=0pt, - footer=0pt] - -\definecolor[maincolor][b=.5] -\definecolor[somecolor][g=.5] -\definecolor[morecolor][r=.5] - -\setupcolors - [textcolor=maincolor, - state=start] - -\setupbackgrounds - [text]% [text] - [background={base,text,invoke}] - -\definelayer - [text] - [width=\textwidth, - height=\textheight] - -\definelayer - [base] - [width=\textwidth, - height=\textheight] - -\definetype [epet] [style=,color=morecolor] -\setuptype [style=,color=somecolor] - -\slantedshapeleftskip150pt -\slantedshapeoffset12pt -\slantedshapeextra10pt - -\startreusableMPgraphic{page} - StartPage ; - fill Page withcolor \MPcolor{maincolor} ; - path p ; p := Field[Text][Text] enlarged 6pt ; - p := - llcorner p shifted (0,-12pt) -- - lrcorner p shifted (-150pt,0) -- - urcorner p shifted (0,12pt) -- - ulcorner p shifted (150pt,0) -- - cycle ; - fill p - withcolor .9white ; - StopPage ; -\stopreusableMPgraphic - -\defineoverlay[page][\reuseMPgraphic{page}] -\setupbackgrounds[page][background=page] - -\setupalign[flushleft] - -\def\StartItem - {\blank[line] - \begingroup - \EveryPar {\AdaptShape}} % beware: \ABBREV aan begin gaat fout - -\def\StopItem - {\endgraf - \endgroup - \blank[line]} - -\def\StartType - {\blank[halfline] - \begingroup - \EveryPar {\AdaptShape} - \dontleavehmode \quad} - -\def\StopType - {\endgraf - \endgroup - \blank[halfline]} - -\def\Title#1% - {\page - \setlayer - [text] - [preset=lefttop, - rotation=90] - {\color[white]{\scale[height=24pt]{\strut#1}}}} - -\def\SetBanner#1% - {\setuplayer[base][state=repeat] - \setlayer[base][preset=rightbottom]{\color[white]{\scale[height=9pt]{\strut#1}}}} - -\let\TitleFont\relax - -\startmode[atpragma] - \definefontfeature[default][method=node,script=latn,language=dflt,liga=yes,onum=yes,kern=yes] - \definefont[TitleFont][palatinosanscom-bold*default at 48pt] - \definefont[MainTextFont][palatinosanscom-regular*default at 12pt] \setupinterlinespace[line=15pt] - \appendtoks - \MainTextFont % hack, as we define a bodyfont at that point (better have a proper typeface) - \to \everystarttext -\stopmode - -\doifnotmode{demo}{\endinput} - -\starttext - -\usemodule[abr-01] - -\SetBanner{tug 2007 san diego} - -\Title {hans hagen} - -\startstandardmakeup \TitleFont \setupinterlinespace[line=3ex] \vfill - -\StartItem \dontleavehmode \quad {\morecolor zapfino, a} \StopItem -\StartItem \dontleavehmode \quad {\morecolor torture test} \StopItem -\StartItem \dontleavehmode \quad {\morecolor for luatex} \StopItem - -\vfill \stopstandardmakeup - -\Title{loading fonts} - -\StartSteps - -\StartItem the \OPENTYPE\ font reader is borrowed from \FONTFORGE\ \FlushStep \StopItem -\StartItem once it was ready, we could look into such a font \FlushStep \StopItem -\StartItem it tooks while to figure out the format due to rather fuzzy specs \FlushStep \StopItem -\StartItem it took us even more time to find out that the loader was flawed \FlushStep \StopItem -\StartItem one reason was that fonts themselves may have bugs or be incomplete \FlushStep \StopItem -\StartItem then we changed to \FONTFORGE\ version 2 \FlushStep \StopItem -\StartItem this made the missing pieces surface in more complex feature handling \FlushStep \StopItem -\StartItem while implementing features the new table format was cleaned up \FlushStep \StopItem - -\StopSteps - -\stoptext diff --git a/tex/context/modules/common/s-pre-68.tex b/tex/context/modules/common/s-pre-68.tex deleted file mode 100644 index 3c04a87e1..000000000 --- a/tex/context/modules/common/s-pre-68.tex +++ /dev/null @@ -1,150 +0,0 @@ -%D \module -%D [ file=s-pre-68, -%D version=2009.08.28, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 68, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -\usemodule[pre-60,abr-02] - -% style - -\setuppapersize - [S66][S66] - -\setuplayout - [height=middle, - width=middle, - header=0pt, - footer=0pt, - backspace=2cm, - topspace=2cm] - -\setupinteraction - [state=start, - click=no] - -\definecolor[maincolor][r=.4] - -\startreusableMPgraphic{page} - StartPage ; - fill Page enlarged 5mm withcolor \MPcolor{maincolor} ; - StopPage ; -\stopreusableMPgraphic - -\startreusableMPgraphic{next} - fill ultriangle scaled .15PaperWidth withcolor white ; -\stopreusableMPgraphic - -\startreusableMPgraphic{last} - fill boundingbox(ultriangle scaled .15PaperWidth) withcolor white ; -\stopreusableMPgraphic - -\startuniqueMPgraphic{bullit} - fill ultriangle scaled 2ExHeight withcolor white ; -\stopuniqueMPgraphic - -\definelayer - [extra] - [width=\paperwidth, - height=\paperheight] - -\defineoverlay - [page] - [\reuseMPgraphic{page}] - -\setupbackgrounds - [page] - [background={page,extra}] - -\setupcolors - [state=start, - textcolor=white] - -\setuphead - [chapter] - [style=\bfc] - -\definehead[Title][title] - -\definesymbol[MyBullet][\uniqueMPgraphic{bullit}] - -\setupitemgroup[itemize][each][symbol=MyBullet] - -\usetypescript[cambria] -\setupbodyfont[cambria,14.4pt] - -% interface - -\def\StartItems - {\begingroup - \StartSteps - \startitemize - \def\StartItems{\startitemize\def\StopItems{\stopitemize}}} - -\def\StopItems - {\FlushStep - \stopitemize - \NextPageSymbol - \StopSteps - \endgroup} - -\def\Item - {\def\Item{\FlushStep\item} - \item} - -\def\NextPageSymbol - {\setlayer - [extra] - [preset=rightbottom,offset=2mm] - {\ifnum\realpageno=\lastpage - \reuseMPgraphic{last}% - \else\ifnum\realpageno>1 - \reuseMPgraphic{next}% - \fi\fi - \FlushStep}} - -\def\TitlePage#1#2% - {\startstandardmakeup[bottom=,top=] - \scale[width=\textwidth]{\framed[align=flushleft,foregroundstyle=\bf,frame=off]{#1}} - \vfilll - \hfill\scale[width=.5\textwidth]{\framed[align=flushright,foregroundstyle=\bf,frame=off]{#2}} - \stopstandardmakeup} - -\doifnotmode{demo}{\endinput} - -\starttext - -\TitlePage{I'm running\\out of examples}{Hans Hagen\\Someplace, 2031} - -\Title{Alpha} - -\StartItems -\Item one -\Item two -\Item three -\StopItems - -\Title{Beta} - -\StartItems -\Item four -\Item five -\Item six -\StopItems - -\Title{Gamma} - -\StartItems -\Item seven -\Item eight -\Item nine -\StopItems - -\stoptext diff --git a/tex/context/modules/mkiv/s-pre-60.mkiv b/tex/context/modules/mkiv/s-pre-60.mkiv deleted file mode 100644 index 70f8978b0..000000000 --- a/tex/context/modules/mkiv/s-pre-60.mkiv +++ /dev/null @@ -1,212 +0,0 @@ -%D \module -%D [ file=s-pre-60, -%D version=2004.03.15, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 60, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -% use lua instead of global mess - -\unprotect - -\startmode[paper,print] - \let\StartSteps\relax - \let\StopSteps \relax - \let\FlushStep \relax - \let\ResetStep \relax - \let\StartBusy \relax - \let\StopBusy \relax - \endinput -\stopmode - -\newcount\c_module_pre_steps_current -\newcount\c_module_pre_steps_maximum -\newcount\c_module_pre_steps_nesting_step -\newcount\c_module_pre_steps_nesting_steps -\newcount\c_module_pre_steps_nesting_busy - -\def\StepCounter {\the\c_module_pre_steps_current} -\def\StepMaximum {\the\c_module_pre_steps_maximum} -\def\StepLayer {step:\the\c_module_pre_steps_current} -\def\NextStepLayer {step:\the\numexpr\c_module_pre_steps_current+\plusone\relax} -\def\FirstStepLayer{step:1} - -\useJSscripts[stp] - -\startsetups[set-stepper] - - \ifnum\getvariable{stepper}{nofsteps}>\c_module_pre_steps_maximum - - \dostepwiserecurse {\numexpr\c_module_pre_steps_maximum+\plusone\relax} {\getvariable{stepper}{nofsteps}} {1} { - \doifnotmode{nosteps,nostep} { - \expanded{\defineviewerlayer[step:\recurselevel][state=stop,scope=global]} - } - } - - \global\c_module_pre_steps_maximum\getvariable{stepper}{nofsteps}\relax - - \fi - -\stopsetups - -\setvariables - [stepper] - [set=\setups{set-stepper}, - nofsteps=50] - -\defineviewerlayer[step:busy][state=start] - -\definereference [SetupStepper] [JS(SetupStepper{step,\StepMaximum})] -\definereference [ResetStepper] [JS(ResetStepper)] -\definereference [CheckStepper] [JS(CheckStepper{\StepCounter})] -\definereference [InvokeStepper] [JS(InvokeStepper)] - -% todo: roll back blank - -\unexpanded\def\ResetStep - {\iftrialtypesetting\else - \global\c_module_pre_steps_current\zerocount - \fi} - -\unexpanded\def\NextStep - {\iftrialtypesetting\else - \global\advance\c_module_pre_steps_current\plusone - \fi} - -\unexpanded\def\PrevStep - {\iftrialtypesetting\else - \global\advance\c_module_pre_steps_current\minusone - \fi} - -\unexpanded\def\FlushStep - {\iftrialtypesetting\else - \StopStep - \NextStep - \StartStep - \fi} - -\unexpanded\def\StartStep - {\iftrialtypesetting\else - \global\advance\c_module_pre_steps_nesting_step\plusone - \ifcase\c_module_pre_steps_nesting_step\or - \startviewerlayer[\StepLayer]% - \fi - \fi - \ignorespaces} - -\unexpanded\def\StopStep - {\removeunwantedspaces - \iftrialtypesetting\else - \ifcase\c_module_pre_steps_nesting_step\or - \stopviewerlayer - \fi - \global\advance\c_module_pre_steps_nesting_step\minusone - \fi} - -\unexpanded\def\StartSteps - {\iftrialtypesetting\else - \global\advance\c_module_pre_steps_nesting_steps\plusone - \ifcase\c_module_pre_steps_nesting_steps\or - \ResetStep - \NextStep - \StartStep - \fi - \fi} - -\unexpanded\def\StopSteps - {\iftrialtypesetting\else - \ifcase\c_module_pre_steps_nesting_steps\or - \StopStep - \PrevStep - \fi - \global\advance\c_module_pre_steps_nesting_steps\minusone - \fi} - -\unexpanded\def\StartBusy - {\iftrialtypesetting\else - \global\advance\c_module_pre_steps_nesting_busy\plusone - \ifcase\c_module_pre_steps_nesting_busy\or - \startviewerlayer[step:busy] - \fi - \fi - \ignorespaces} - -\unexpanded\def\StopBusy - {\removeunwantedspaces - \iftrialtypesetting\else - \ifcase\c_module_pre_steps_nesting_busy\or - \stopviewerlayer - \fi - \global\advance\c_module_pre_steps_nesting_busy\minusone - \fi} - -%D Handy: - -\unexpanded\def\StartLocalSteps - {\ResetStep} - -\unexpanded\def\StopLocalSteps - {} - -\unexpanded\def\StartLocalStep - {\NextStep - \StartStep} - -\unexpanded\def\StopLocalStep - {\StopStep} - -\appendtoks - \ResetStep -\to \everyaftershipout - -\setupinteraction - [%openaction=SetupStepper, - closeaction=ResetStepper, - openpageaction=CheckStepper, - closepageaction=ResetStepper] - -\defineoverlay[invoke][\overlaybutton{InvokeStepper}] - -\setupbackgrounds - [text] - [background=invoke] - -% bonus - -\useMPlibrary[nav] - -\definepalet - [navplus] - [attach=interactioncolor, - comment=interactioncolor] - -\setupcomment - [symbol={comment-normal,comment-down}, - textlayer=\StepLayer, - option=buffer, - height=\textheight, - width=\textwidth, - margin=0pt] - -\setupattachments - [symbol={attach-normal,attach-down}, - textlayer=\StepLayer] - -%D used as (given some definitions): -%D -%D \starttyping -%D \StartLocalSteps -%D \startcombination[both] -%D {\StartLocalStep\placestreamlayer[left]\StopLocalStep} {} -%D {\StartLocalStep\placestreamlayer[right]\StopLocalStep} {} -%D \stopcombination -%D \StopLocalSteps -%D \stoptyping - -\protect \endinput diff --git a/tex/context/modules/mkiv/s-pre-69.mkiv b/tex/context/modules/mkiv/s-pre-69.mkiv deleted file mode 100644 index cc6af9ad3..000000000 --- a/tex/context/modules/mkiv/s-pre-69.mkiv +++ /dev/null @@ -1,336 +0,0 @@ -%D \module -%D [ file=s-pre-69, -%D version=2010.04.28, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 69, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -\setuppapersize[S6][S6] -\setuppapersize[SM][SM] - -\usemodule - [abr-01,pre-60] - -\setupinteraction - [state=start, - contrastcolor=white, - color=white, - click=no] - -\setuplayout - [location=middle, - topspace=60pt, - bottomspace=80pt, - backspace=80pt, - header=0pt, - footer=0pt, - width=middle, - height=middle] - -\setupcolors - [textcolor=white] - -\setupbodyfont[euler] - -\definecolor[maincolor] [blue] -\definecolor[extracolor][green] - -% \definecolor[maincolor] [red] -% \definecolor[extracolor][blue] - -\startMPinitializations - if unknown MyColor[1] : - color MyColor[] ; - MyColor[1] := transparent(1,.25,\MPcolor{maincolor}) ; - MyColor[2] := transparent(1,.25,\MPcolor{extracolor}) ; - - picture MySoFar ; MySoFar := nullpicture ; - path MyLastOne ; MyLastOne := origin -- cycle ; - color MyPageColor ; MyPageColor := MyColor[1] ; - path MyLeftSteps, MyRightSteps ; - boolean MyPageDone ; MyPageDone := false ; - - vardef MySmallShape(expr parent) = - path p ; p := boundingbox parent ; - p := boundingbox parent ; - numeric w, h ; w := bbwidth(p) ; h := bbheight(p) ; - urcorner p shifted (-uniformdeviate w/4,0) -- - lrcorner p shifted (0,uniformdeviate h/4) -- - llcorner p shifted (uniformdeviate w/4,0) -- - ulcorner p shifted (0,-uniformdeviate h/4) -- cycle - enddef ; - - vardef MyShape(expr parent) = - path p ; p := boundingbox parent ; - if MyPageDone : - MyPageDone := false ; - urcorner p shifted (-EmWidth + -uniformdeviate CutSpace/2,0) -- - lrcorner p shifted (0,EmWidth + uniformdeviate BottomSpace/2) -- - llcorner p shifted (EmWidth + uniformdeviate BackSpace/2,0) -- - ulcorner p shifted (0,-EmWidth + -uniformdeviate TopSpace/2) -- cycle - else : - MyPageDone := true ; - urcorner p shifted (0,-EmWidth + -uniformdeviate TopSpace/2) -- - lrcorner p shifted (-EmWidth + -uniformdeviate CutSpace/2,0) -- - llcorner p shifted (0,EmWidth + uniformdeviate BottomSpace/2) -- - ulcorner p shifted (EmWidth + uniformdeviate BackSpace/2,0) -- cycle - fi - enddef ; - - vardef MyMakeOne = - MyLastOne := MyShape(Page) ; - enddef ; - - vardef MyAddOne = - addto MySoFar also image(fill MyLastOne withcolor MyPageColor ; ) ; - enddef ; - - vardef MyDrawOne = - fill MyLastOne withcolor black ; - fill MyLastOne withcolor MyPageColor ; - enddef ; - - vardef MyDrawPage = - draw MySoFar ; - enddef ; - - vardef MySetSteps = - path l, r ; numeric s ; path ll[], rr[] ; path t ; - l := point 2 of MyLastOne -- point 3 of MyLastOne ; - r := point 0 of MyLastOne -- point 1 of MyLastOne ; - t := topboundary Field[Text][Text] rightenlarged TextWidth leftenlarged TextWidth ; - s := bbheight(Field[Text][Text])/LineHeight + 2 ; - t := t shifted (0,-TopSkip) ; - for i=1 upto s : - ll[i] := t intersectionpoint l ; - rr[i] := t intersectionpoint r ; - t := t shifted (0,-LineHeight) ; - endfor ; - MyLeftSteps := for i=1 upto s : ll[i] -- endfor cycle ; - MyRightSteps := for i=1 upto s : rr[i] -- endfor cycle ; - enddef ; - - vardef MyDrawText(expr txt) = - pair a ; a := (point 1 of MyLastOne) - (point 2 of MyLastOne) ; - picture p ; p := txt ; - p := p - shifted (-EmWidth,EmWidth) - shifted ulcorner txt - shifted point 1 of MyLastOne ; - p := p rotatedaround(lrcorner p, radian * tan(ypart a/xpart a)) ; - setbounds p to origin -- cycle ; - draw p ; - enddef ; - - vardef MyDrawTitle(expr txt) = - % pair a ; a := (point 2 of MyLastOne) - (point 3 of MyLastOne) ; - pair a ; a := (point 3 of MyLastOne) - (point 4 of MyLastOne) ; - picture p ; - if bbheight(txt) > bbwidth(txt) : - p := txt ysized(0.8*TextHeight) ; - else : - p := txt xsized(0.8*TextWidth) ; - fi ; - numeric d ; d := arclength(point 2 of MyLastOne -- point 3 of MyLastOne) - bbheight(p) ; - p := p - shifted (BackSpace,-d/2) - shifted -ulcorner p - shifted point 3 of MyLastOne ; - % p := p rotatedaround(ulcorner p, - radian * tan(xpart a/ypart a)) ; - % p := p rotatedaround(ulcorner p, radian * tan(ypart a/xpart a)) ; - setbounds p to origin -- cycle ; - draw p ; - enddef ; - - vardef MyDrawSteps = - s := bbheight(Field[Text][Text])/LineHeight + 2 ; - for i=1 upto s : - draw ll[i] withpen pencircle scaled 1mm ; - draw rr[i] withpen pencircle scaled 1mm ; - draw ll[i] -- rr[i] ; - endfor ; - draw Field[Text][Text] ; - enddef ; - - fi ; -\stopMPinitializations - -\startuseMPgraphic{initialization} - StartPage ; - MySoFar := image(fill Page enlarged 12pt withcolor MyPageColor) ; - MyMakeOne ; - MySetSteps ; - StopPage ; -\stopuseMPgraphic - -\appendtoks - \startnointerference - \useMPgraphic{initialization} - \stopnointerference -\to \everystarttext - -\startuseMPgraphic{page} - StartPage ; - MyDrawPage ; - MyDrawOne ; - MySetSteps ; - MyDrawTitle(textext("\getvariable{document}{title}")) ; - MyDrawText(textext("\getvariable{document}{topic}")) ; - % - % we have multiple runs when we have text - % -% MyDrawSteps ; -% MyMakeOne ; -% MySetSteps ; - StopPage ; -\stopuseMPgraphic - -\appendtoks - \startnointerference - \startMPcode - MyAddOne ; - MyMakeOne ; - MySetSteps ; - \stopMPcode - \stopnointerference -\to \everyshipout - -\defineoverlay[page][\useMPgraphic{page}] - -\startuseMPgraphic{symbol} - color cc ; cc := MyColor[2] ; - path p ; p := MySmallShape(unitsquare scaled (.6*LineHeight)) ; - fill p withcolor white ; - fill p withcolor cc ; -\stopuseMPgraphic - -\definesymbol[mysymbol][\struttedbox{\useMPgraphic{symbol}}] - -\setupitemgroup[itemize][1][symbol=mysymbol] - -\setupbackgrounds - [page] - [background=page] - -\startluacode - local texdimen = tex.dimen - function document.SetParShape() - local leftpath = metapost.getclippath("metafun","metafun","clip currentpicture to MyLeftSteps ;") - local rightpath = metapost.getclippath("metafun","metafun","clip currentpicture to MyRightSteps ;") - local shape = { } - for i=1,#leftpath do - local left = leftpath[i].x_coord - local right = rightpath[i].x_coord - local hsize = right - left - (texdimen.backspace + texdimen.cutspace)*number.dimenfactors.bp - shape[#shape+1] = string.format("%sbp %sbp",left,hsize) - end - -- print(table.serialize(shape)) - -- context.parshape(string.format("%s %s ",#shape,table.concat(shape," "))) - context("\\parshape %s %s ",#shape,table.concat(shape," ")) - end -\stopluacode - -\nopenalties \dontcomplain - -\setupwhitespace[none] - -\def\StartText#1#2% - {\starttext - \setvariable{document}{title}{\framed[frame=off,offset=0pt,align=flushleft,foregroundstyle=\tfd\setupinterlinespace]{\begstrut#1\endstrut}} - \setvariable{document}{topic}{\tfb#2} - \startstandardmakeup - % dummy page - \stopstandardmakeup - \setvariable{document}{title}{} - \setvariable{document}{topic}{}} - -\def\StopText - {\stoptext} - -\def\StartItems#1% - {\setvariable{document}{topic}{\tfb#1} - \startstandardmakeup[top=,bottom=\vss] - \startelement[items][title={#1}]% - \ctxlua{document.SetParShape()} - \StartSteps} - -\def\StopItems - {\StopSteps - \stopelement - \stopstandardmakeup} - -\def\StartItem - {\dontleavehmode - \startelement[item]% - \llap{\symbol[mysymbol]\quad}% graphic - \ignorespaces} - -\def\StopItem - {\removeunwantedspaces - \nobreak - \crlf - \stopelement - \crlf - \FlushStep} - -\def\ShapeParagraph - {\ctxlua{document.SetParShape()}} - -% no parshape yet - -\def\StartParagraphs#1% - {\setvariable{document}{topic}{\tfb#1} - \startstandardmakeup[top=,bottom=\vss] - %\ctxlua{document.SetParShape()} - \startelement[paragraphs]% - \StartSteps} - -\def\StopParagraphs - {\StopSteps - \stopelement - \stopstandardmakeup} - -\def\StartParagraph - {\startelement[paragraph]} - -\def\StopParagraph - {\par - \stopelement - \FlushStep} - -% experiment .. likely to change - -\setelementexporttag[items] [nature][display] -\setelementexporttag[item] [nature][mixed] -\setelementexporttag[paragraphs][nature][display] -\setelementexporttag[paragraph] [nature][mixed] - -\continueifinputfile{s-pre-69.mkiv} - -% finetuning: \StartText{\TEX\ and Reality\vskip2exClashing Mindsets?\vskip1ex}{Bacho\TEX, May 1, 2010} - -\StartText{Just\\A Demo}{Bacho\TEX, May 1, 2010} - -\StartItems{Quote from Tufte and Ward} - \StartItem - \input tufte - \StopItem - \StartItem - \input ward - \StopItem -\StopItems - -% \dorecurse{20}{ -% \ctxlua{document.SetParShape()} -% \input tufte -% \page -% } - -\StopText - diff --git a/tex/context/modules/mkiv/s-pre-70.mkiv b/tex/context/modules/mkiv/s-pre-70.mkiv deleted file mode 100644 index 2c8bb2d26..000000000 --- a/tex/context/modules/mkiv/s-pre-70.mkiv +++ /dev/null @@ -1,176 +0,0 @@ -%D \module -%D [ file=s-pre-70, -%D version=2008.04.15, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 70, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D At the cost of more runtime and a larger output file, we -%D turn on randomization. The instances are cached in the -%D MkIV cache, so successive runs use the same shapes. - -% \usemodule[punk] \usetypescript[punk] \setupbodyfont[punk,20pt] -% -% \EnableRandomPunk - -\setupbodyfont[punknova,20pt] % we now use the opentype variant - -%D We use the regular screen size paper and layout setup. - -\setuppapersize - [S6][S6] - -\setuplayout - [topspace=30pt, - backspace=30pt, - width=middle, - height=fit, - header=0pt, - footer=0pt, - bottomdistance=24pt, - bottom=30pt, - bottom=18pt, - top=0pt] - -\setupinterlinespace - [top=height, - line=1.25\bodyfontsize] - -\setupcolors - [state=start, - textcolor=white] - -\setupinteraction - [state=start, - %click=off, - menu=on] - -%D We predefine a few palets. Of course you can define more. - -\definecolor[punkblue] [r=.4,b=.8,g=.4] -\definecolor[punkgreen] [r=.4,b=.4,g=.8] -\definecolor[punkred] [r=.8,b=.4,g=.4] -\definecolor[punkyellow][r=.6,g=.6,b=.2] - -\definepalet [punk-one] [textcolor=punkblue,pagecolor=punkgreen] -\definepalet [punk-two] [textcolor=punkred,pagecolor=punkyellow] -\definepalet [punk-three] [textcolor=punkblue,pagecolor=punkyellow] -\definepalet [punk-one-reverse] [textcolor=punkgreen,pagecolor=punkblue] -\definepalet [punk-two-reverse] [textcolor=punkyellow,pagecolor=punkred] -\definepalet [punk-three-reverse] [textcolor=punkyellow,pagecolor=punkblue] - -\setuppalet[punk-one] - -%D We use a few backgrounds. The hyperlink that invokes the -%D stepper is hooked into the text background. - -\definelayer - [page] - [width=\paperwidth, - height=\paperheight] - -\setupbackgrounds - [page] - [background={color,page}, - backgroundcolor=pagecolor, - setups=pagestuff] - -\setupbackgrounds - [text] - [background={color,invoke}, - backgroundoffset=12pt, - backgroundcolor=textcolor] - -%D We need different symbols for itemized lists. - -\definesymbol[1][\hbox{\lower1ex\hbox{*}}] -\definesymbol[2][\endash] -\definesymbol[3][\letterhash] -\definesymbol[3][>] - -%D We don't want these reversed clicked areas in Acrobat. - -\setupinteraction - [click=no, - color=white, % pagecolor, - contrastcolor=white] % pagecolor, - -%D We define a rather simple navigational panel at the -%D bottom - -\setupinteractionmenu - [bottom] - [color=white, % pagecolor, - contrastcolor=white, % pagecolor, - background=color, - backgroundcolor=textcolor, - frame=off, - height=24pt, - left=\hfill, - middle=\hskip12pt] - -\setupsubpagenumber - [state=start] - -\startinteractionmenu[bottom] - \starttxt - \interactionbar - [alternative=d, - symbol=yes, - color=white, - contrastcolor=textcolor] - \stoptxt - \hfilll - \startbut [previouspage] < < < \stopbut - \startbut [nextpage] > > > \stopbut -\stopinteractionmenu - -%D Instead of the normal symbols we use more punky ones. - -\startsymbolset [punk] - \definesymbol[previous] [\string<\string<] - \definesymbol[somewhere] [\string^\string^] - \definesymbol[next] [\string>\string>] -\stopsymbolset - -\setupinteraction[symbolset=punk] - -%D Because the font is rather large, we use less whitespace. - -\setuphead - [chapter] - [after={\blank[big]}] - -%D Run this file with the command: \type {context --mode=demo s-pre-70} -%D in order to get an example. - -\continueifinputfile{s-pre-70.mkiv} - -\usemodule[pre-60] % use the stepper - -\starttext - -\title {Punk for dummies} - -\dorecurse{10} { - - \title{Just a few dummy pages} - - \StartSteps - \startitemize[packed] - \startitem bla \FlushStep \stopitem - \startitem bla bla \FlushStep \stopitem - \startitem bla bla bla \FlushStep \stopitem - \startitem bla bla bla bla \FlushStep \stopitem - \stopitemize - \StopSteps - -} - -\stoptext diff --git a/tex/context/modules/mkiv/s-pre-71.lua b/tex/context/modules/mkiv/s-pre-71.lua deleted file mode 100644 index bfa45a705..000000000 --- a/tex/context/modules/mkiv/s-pre-71.lua +++ /dev/null @@ -1,63 +0,0 @@ -if not modules then modules = { } end modules ['steps'] = { - version = 1.001, - comment = "companion to steps.mkiv", - author = "Hans Hagen, PRAGMA-ADE, Hasselt NL", - copyright = "PRAGMA ADE / ConTeXt Development Team", - license = "see context related readme files" -} - -moduledata.steps = moduledata.steps or { } -local steps = moduledata.steps - -local locations = { - 'lefttop', - 'middletop', - 'righttop', - 'middleleft', - 'middle', - 'middleright', - 'leftbottom', - 'middlebottom', - 'rightbottom', -} - -local done, current, previous, n - -function steps.reset_locations() - done, current, previous, n = table.tohash(locations,false), 0, 0, 0 -end - -function steps.next_location(loc) - previous = current - n = n + 1 - loc = loc and loc ~= "" and tonumber(loc) - while true do - current = loc or math.random(1,#locations) - if not done[current] then - done[current] = true - break - end - end -end - -function steps.current_location() - context(locations[current] or "") -end - -function steps.previous_location() - context(locations[previous] or "") -end - -function steps.current_n() - context(current) -end - -function steps.previous_n() - context(previous) -end - -function steps.step() - context(n) -end - -steps.reset_locations() diff --git a/tex/context/modules/mkiv/s-pre-71.mkiv b/tex/context/modules/mkiv/s-pre-71.mkiv deleted file mode 100644 index 38dae61df..000000000 --- a/tex/context/modules/mkiv/s-pre-71.mkiv +++ /dev/null @@ -1,170 +0,0 @@ -% engine=luatex - -%D \module -%D [ file=s-pre-71, -%D version=2008.08.05, -%D title=\CONTEXT\ Style File, -%D subtitle=Presentation Environment 71, -%D author=Hans Hagen, -%D date=\currentdate, -%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}] -%C -%C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. - -%D I might improve this module so consider it experimental. - -% \enablemode[numbers] -% \enablemode[paper] - -\usemodule[pre-60,abr-02] - -\registerctxluafile{s-pre-71}{} - -\setupinteraction[state=start,click=off] - -\definepapersize[wide][width=900pt,height=600pt] - -\setuppapersize[wide][wide] - -\setuplayout[page] - -% \setupbodyfont[15pt] - -\usetypescriptfile[type-hgz] -\usetypescript[palatino-informal] -\setupbodyfont[palatino-informal,15pt] - -\setupsorting[logo][style=] - -\startnotmode[paper] - \setupbackgrounds[page][background=color,backgroundcolor=black] -\stopnotmode - -\TransparencyHack - -\definelayer[page][width=\paperwidth,height=\paperheight] - -\definecolor[TopicColor-1][r=.3,g=.4,b=.5] -\definecolor[TopicColor-2][r=.3,g=.5,b=.4] -\definecolor[TopicColor-3][r=.4,g=.3,b=.5] -\definecolor[TopicColor-4][r=.4,g=.5,b=.3] -\definecolor[TopicColor-5][r=.5,g=.3,b=.4] -\definecolor[TopicColor-6][r=.5,g=.4,b=.3] -\definecolor[TopicColor-7][r=.35,g=.35,b=.6] -\definecolor[TopicColor-8][r=.6,g=.35,b=.35] -\definecolor[TopicColor-9][r=.35,g=.6,b=.35] - -\definecolor[TopicColor-0][t=.5,a=1,s=.5] -\definecolor[TopicColor] [s=1] - -\setupcolors[state=start] -\setupcolors[textcolor=TopicColor] - -\def\StartTopics - {\startstandardmakeup - \ctxlua{moduledata.steps.reset_locations()} - \doifnotmode{paper}{\StartLocalSteps}} - -\def\StopTopics - {\doifnotmode{paper}{\StopLocalSteps} - \flushlayer[page] - \stopstandardmakeup} - -\def\StartTopic - {\dosingleempty\doStartTopic} - -\def\doStartTopic[#1]% - {\doifnotmode{paper}{\NextStep} - \ctxlua{moduledata.steps.next_location("#1")} - \startnotmode[paper] - \doifnothing{#1} - {\ifcase\ctxlua{moduledata.steps.previous_n()}\else - \setlayer - [page] - [preset=\ctxlua{moduledata.steps.previous_location()}] - \bgroup - \doifnotmode{paper}{\startviewerlayer[\StepLayer]}% - \framed - [offset=20pt, - strut=no, - align=normal, - frame=off, - height=\dimexpr\paperheight/3\relax, - width=\dimexpr\paperwidth/3\relax, - background=color, - backgroundcolor=TopicColor-0] - {}% - \doifnotmode{paper}{\stopviewerlayer}% - \egroup - \fi} - \stopnotmode - \setlayer - [page] - [preset=\ctxlua{moduledata.steps.current_location()}] - \bgroup - \doifnotmode{paper}{\startviewerlayer[\StepLayer]}% - \framed - [offset=20pt, - strut=no, - align=\expdoifelse{#1}{}{normal}{middle,lohi}, - align=\expdoifelse{#1}{}{flushleft,verytolerant}{middle,lohi}, - frame=off, - height=\dimexpr\paperheight/3\relax, - width=\dimexpr\paperwidth/3\relax, - background=color, - backgroundcolor=TopicColor-\ctxlua{moduledata.steps.current_n()}] - \bgroup - \ignorespaces} - -\def\StopTopic - {\removeunwantedspaces - \egroup - \doifnotmode{paper}{\stopviewerlayer}% - \egroup - \startmode[numbers] - \setlayerframed - [page] - [preset=\ctxlua{moduledata.steps.current_location()}] - [height=\dimexpr\paperheight/3\relax, - width=\dimexpr\paperwidth/3\relax, - frame=off, - foregroundstyle=\bfa, - align={flushright,low}] - {\doifnotmode{paper}{\startviewerlayer[\StepLayer]}% - \ctxlua{moduledata.steps.step()}\kern\strutdepth - \doifnotmode{paper}{\stopviewerlayer}} - \stopmode} - -\logo [METAPOST] {MetaPost} - -\definefont[TitleFont][SansBold at 60pt] -\definefont[TempFont] [SansBold at 12pt] - -\let\StartText\starttext -\let\StopText \stoptext - -\continueifinputfile{s-pre-71.mkiv} - -\starttext - -\StartTopics - \StartTopic[1] A \StopTopic - \StartTopic[5] B \StopTopic - \StartTopic[9] C \StopTopic -\StopTopics - -\StartTopics - \StartTopic A \StopTopic - \StartTopic B \StopTopic - \StartTopic C \StopTopic - \StartTopic D \StopTopic - \StartTopic E \StopTopic - \StartTopic F \StopTopic - \StartTopic G \StopTopic - \StartTopic H \StopTopic - \StartTopic I \StopTopic -\StopTopics - -\stoptext diff --git a/tex/generic/context/luatex/luatex-basics-chr.lua b/tex/generic/context/luatex/luatex-basics-chr.lua index 4329256f2..75dffd192 100644 --- a/tex/generic/context/luatex/luatex-basics-chr.lua +++ b/tex/generic/context/luatex/luatex-basics-chr.lua @@ -9,6 +9,174 @@ characters.blockrange = { } -- classifiers needed for analysis characters.classifiers={ + [768]=5, + [769]=5, + [770]=5, + [771]=5, + [772]=5, + [773]=5, + [774]=5, + [775]=5, + [776]=5, + [777]=5, + [778]=5, + [779]=5, + [780]=5, + [781]=5, + [782]=5, + [783]=5, + [784]=5, + [785]=5, + [786]=5, + [787]=5, + [788]=5, + [789]=5, + [790]=5, + [791]=5, + [792]=5, + [793]=5, + [794]=5, + [795]=5, + [796]=5, + [797]=5, + [798]=5, + [799]=5, + [800]=5, + [801]=5, + [802]=5, + [803]=5, + [804]=5, + [805]=5, + [806]=5, + [807]=5, + [808]=5, + [809]=5, + [810]=5, + [811]=5, + [812]=5, + [813]=5, + [814]=5, + [815]=5, + [816]=5, + [817]=5, + [818]=5, + [819]=5, + [820]=5, + [821]=5, + [822]=5, + [823]=5, + [824]=5, + [825]=5, + [826]=5, + [827]=5, + [828]=5, + [829]=5, + [830]=5, + [831]=5, + [832]=5, + [833]=5, + [834]=5, + [835]=5, + [836]=5, + [837]=5, + [838]=5, + [839]=5, + [840]=5, + [841]=5, + [842]=5, + [843]=5, + [844]=5, + [845]=5, + [846]=5, + [847]=5, + [848]=5, + [849]=5, + [850]=5, + [851]=5, + [852]=5, + [853]=5, + [854]=5, + [855]=5, + [856]=5, + [857]=5, + [858]=5, + [859]=5, + [860]=5, + [861]=5, + [862]=5, + [863]=5, + [864]=5, + [865]=5, + [866]=5, + [867]=5, + [868]=5, + [869]=5, + [870]=5, + [871]=5, + [872]=5, + [873]=5, + [874]=5, + [875]=5, + [876]=5, + [877]=5, + [878]=5, + [879]=5, + [1155]=5, + [1156]=5, + [1157]=5, + [1158]=5, + [1159]=5, + [1425]=5, + [1426]=5, + [1427]=5, + [1428]=5, + [1429]=5, + [1430]=5, + [1431]=5, + [1432]=5, + [1433]=5, + [1434]=5, + [1435]=5, + [1436]=5, + [1437]=5, + [1438]=5, + [1439]=5, + [1440]=5, + [1441]=5, + [1442]=5, + [1443]=5, + [1444]=5, + [1445]=5, + [1446]=5, + [1447]=5, + [1448]=5, + [1449]=5, + [1450]=5, + [1451]=5, + [1452]=5, + [1453]=5, + [1454]=5, + [1455]=5, + [1456]=5, + [1457]=5, + [1458]=5, + [1459]=5, + [1460]=5, + [1461]=5, + [1462]=5, + [1463]=5, + [1464]=5, + [1465]=5, + [1466]=5, + [1467]=5, + [1468]=5, + [1469]=5, + [1471]=5, + [1473]=5, + [1474]=5, + [1476]=5, + [1477]=5, + [1479]=5, [1536]=4, [1537]=4, [1538]=4, @@ -389,6 +557,17 @@ characters.classifiers={ [1917]=2, [1918]=2, [1919]=2, + [1958]=5, + [1959]=5, + [1960]=5, + [1961]=5, + [1962]=5, + [1963]=5, + [1964]=5, + [1965]=5, + [1966]=5, + [1967]=5, + [1968]=5, [1984]=6, [1985]=6, [1986]=6, @@ -448,6 +627,27 @@ characters.classifiers={ [2040]=6, [2041]=6, [2042]=2, + [2070]=5, + [2071]=5, + [2072]=5, + [2073]=5, + [2075]=5, + [2076]=5, + [2077]=5, + [2078]=5, + [2079]=5, + [2080]=5, + [2081]=5, + [2082]=5, + [2083]=5, + [2085]=5, + [2086]=5, + [2087]=5, + [2089]=5, + [2090]=5, + [2091]=5, + [2092]=5, + [2093]=5, [2112]=3, [2113]=2, [2114]=2, @@ -473,6 +673,9 @@ characters.classifiers={ [2134]=4, [2135]=4, [2136]=4, + [2137]=5, + [2138]=5, + [2139]=5, [2208]=2, [2209]=2, [2210]=2, @@ -494,9 +697,339 @@ characters.classifiers={ [2226]=3, [2227]=2, [2228]=2, + [2230]=2, + [2231]=2, + [2232]=2, + [2233]=3, + [2234]=2, + [2235]=2, + [2236]=2, + [2237]=2, + [2260]=5, + [2261]=5, + [2262]=5, + [2263]=5, + [2264]=5, + [2265]=5, + [2266]=5, + [2267]=5, + [2268]=5, + [2269]=5, + [2270]=5, + [2271]=5, + [2272]=5, + [2273]=5, + [2274]=4, + [2275]=5, + [2276]=5, + [2277]=5, + [2278]=5, + [2279]=5, + [2280]=5, + [2281]=5, + [2282]=5, + [2283]=5, + [2284]=5, + [2285]=5, + [2286]=5, + [2287]=5, + [2288]=5, + [2289]=5, + [2290]=5, + [2291]=5, + [2292]=5, + [2293]=5, + [2294]=5, + [2295]=5, + [2296]=5, + [2297]=5, + [2298]=5, + [2299]=5, + [2300]=5, + [2301]=5, + [2302]=5, + [2303]=5, + [2304]=5, + [2305]=5, + [2306]=5, + [2362]=5, + [2364]=5, + [2369]=5, + [2370]=5, + [2371]=5, + [2372]=5, + [2373]=5, + [2374]=5, + [2375]=5, + [2376]=5, + [2381]=5, + [2385]=5, + [2386]=5, + [2387]=5, + [2388]=5, + [2389]=5, + [2390]=5, + [2391]=5, + [2402]=5, + [2403]=5, + [2433]=5, + [2492]=5, + [2497]=5, + [2498]=5, + [2499]=5, + [2500]=5, + [2509]=5, + [2530]=5, + [2531]=5, + [2561]=5, + [2562]=5, + [2620]=5, + [2625]=5, + [2626]=5, + [2631]=5, + [2632]=5, + [2635]=5, + [2636]=5, + [2637]=5, + [2641]=5, + [2672]=5, + [2673]=5, + [2677]=5, + [2689]=5, + [2690]=5, + [2748]=5, + [2753]=5, + [2754]=5, + [2755]=5, + [2756]=5, + [2757]=5, + [2759]=5, + [2760]=5, + [2765]=5, + [2786]=5, + [2787]=5, + [2817]=5, + [2876]=5, + [2879]=5, + [2881]=5, + [2882]=5, + [2883]=5, + [2884]=5, + [2893]=5, + [2902]=5, + [2914]=5, + [2915]=5, + [2946]=5, + [3008]=5, + [3021]=5, + [3072]=5, + [3134]=5, + [3135]=5, + [3136]=5, + [3142]=5, + [3143]=5, + [3144]=5, + [3146]=5, + [3147]=5, + [3148]=5, + [3149]=5, + [3157]=5, + [3158]=5, + [3170]=5, + [3171]=5, + [3201]=5, + [3260]=5, + [3263]=5, + [3270]=5, + [3276]=5, + [3277]=5, + [3298]=5, + [3299]=5, + [3329]=5, + [3393]=5, + [3394]=5, + [3395]=5, + [3396]=5, + [3405]=5, + [3426]=5, + [3427]=5, + [3530]=5, + [3538]=5, + [3539]=5, + [3540]=5, + [3542]=5, + [3633]=5, + [3636]=5, + [3637]=5, + [3638]=5, + [3639]=5, + [3640]=5, + [3641]=5, + [3642]=5, + [3655]=5, + [3656]=5, + [3657]=5, + [3658]=5, + [3659]=5, + [3660]=5, + [3661]=5, + [3662]=5, + [3761]=5, + [3764]=5, + [3765]=5, + [3766]=5, + [3767]=5, + [3768]=5, + [3769]=5, + [3771]=5, + [3772]=5, + [3784]=5, + [3785]=5, + [3786]=5, + [3787]=5, + [3788]=5, + [3789]=5, + [3864]=5, + [3865]=5, + [3893]=5, + [3895]=5, + [3897]=5, + [3953]=5, + [3954]=5, + [3955]=5, + [3956]=5, + [3957]=5, + [3958]=5, + [3959]=5, + [3960]=5, + [3961]=5, + [3962]=5, + [3963]=5, + [3964]=5, + [3965]=5, + [3966]=5, + [3968]=5, + [3969]=5, + [3970]=5, + [3971]=5, + [3972]=5, + [3974]=5, + [3975]=5, + [3981]=5, + [3982]=5, + [3983]=5, + [3984]=5, + [3985]=5, + [3986]=5, + [3987]=5, + [3988]=5, + [3989]=5, + [3990]=5, + [3991]=5, + [3993]=5, + [3994]=5, + [3995]=5, + [3996]=5, + [3997]=5, + [3998]=5, + [3999]=5, + [4000]=5, + [4001]=5, + [4002]=5, + [4003]=5, + [4004]=5, + [4005]=5, + [4006]=5, + [4007]=5, + [4008]=5, + [4009]=5, + [4010]=5, + [4011]=5, + [4012]=5, + [4013]=5, + [4014]=5, + [4015]=5, + [4016]=5, + [4017]=5, + [4018]=5, + [4019]=5, + [4020]=5, + [4021]=5, + [4022]=5, + [4023]=5, + [4024]=5, + [4025]=5, + [4026]=5, + [4027]=5, + [4028]=5, + [4038]=5, + [4141]=5, + [4142]=5, + [4143]=5, + [4144]=5, + [4146]=5, + [4147]=5, + [4148]=5, + [4149]=5, + [4150]=5, + [4151]=5, + [4153]=5, + [4154]=5, + [4157]=5, + [4158]=5, + [4184]=5, + [4185]=5, + [4190]=5, + [4191]=5, + [4192]=5, + [4209]=5, + [4210]=5, + [4211]=5, + [4212]=5, + [4226]=5, + [4229]=5, + [4230]=5, + [4237]=5, + [4253]=5, + [4957]=5, + [4958]=5, + [4959]=5, + [5906]=5, + [5907]=5, + [5908]=5, + [5938]=5, + [5939]=5, + [5940]=5, + [5970]=5, + [5971]=5, + [6002]=5, + [6003]=5, + [6071]=5, + [6072]=5, + [6073]=5, + [6074]=5, + [6075]=5, + [6076]=5, + [6077]=5, + [6086]=5, + [6089]=5, + [6090]=5, + [6091]=5, + [6092]=5, + [6093]=5, + [6094]=5, + [6095]=5, + [6096]=5, + [6097]=5, + [6098]=5, + [6099]=5, + [6109]=5, [6150]=4, [6151]=2, [6154]=2, + [6155]=5, + [6156]=5, + [6157]=5, [6158]=4, [6176]=2, [6177]=2, @@ -591,8 +1124,6 @@ characters.classifiers={ [6274]=4, [6275]=4, [6276]=4, - [6277]=4, - [6278]=4, [6279]=2, [6280]=2, [6281]=2, @@ -627,13 +1158,291 @@ characters.classifiers={ [6310]=2, [6311]=2, [6312]=2, + [6313]=5, [6314]=2, + [6432]=5, + [6433]=5, + [6434]=5, + [6439]=5, + [6440]=5, + [6450]=5, + [6457]=5, + [6458]=5, + [6459]=5, + [6679]=5, + [6680]=5, + [6742]=5, + [6744]=5, + [6745]=5, + [6746]=5, + [6747]=5, + [6748]=5, + [6749]=5, + [6750]=5, + [6752]=5, + [6754]=5, + [6757]=5, + [6758]=5, + [6759]=5, + [6760]=5, + [6761]=5, + [6762]=5, + [6763]=5, + [6764]=5, + [6771]=5, + [6772]=5, + [6773]=5, + [6774]=5, + [6775]=5, + [6776]=5, + [6777]=5, + [6778]=5, + [6779]=5, + [6780]=5, + [6783]=5, + [6832]=5, + [6833]=5, + [6834]=5, + [6835]=5, + [6836]=5, + [6837]=5, + [6838]=5, + [6839]=5, + [6840]=5, + [6841]=5, + [6842]=5, + [6843]=5, + [6844]=5, + [6845]=5, + [6912]=5, + [6913]=5, + [6914]=5, + [6915]=5, + [6964]=5, + [6966]=5, + [6967]=5, + [6968]=5, + [6969]=5, + [6970]=5, + [6972]=5, + [6978]=5, + [7019]=5, + [7020]=5, + [7021]=5, + [7022]=5, + [7023]=5, + [7024]=5, + [7025]=5, + [7026]=5, + [7027]=5, + [7040]=5, + [7041]=5, + [7074]=5, + [7075]=5, + [7076]=5, + [7077]=5, + [7080]=5, + [7081]=5, + [7083]=5, + [7142]=5, + [7144]=5, + [7145]=5, + [7149]=5, + [7151]=5, + [7152]=5, + [7153]=5, + [7212]=5, + [7213]=5, + [7214]=5, + [7215]=5, + [7216]=5, + [7217]=5, + [7218]=5, + [7219]=5, + [7222]=5, + [7223]=5, + [7376]=5, + [7377]=5, + [7378]=5, + [7380]=5, + [7381]=5, + [7382]=5, + [7383]=5, + [7384]=5, + [7385]=5, + [7386]=5, + [7387]=5, + [7388]=5, + [7389]=5, + [7390]=5, + [7391]=5, + [7392]=5, + [7394]=5, + [7395]=5, + [7396]=5, + [7397]=5, + [7398]=5, + [7399]=5, + [7400]=5, + [7405]=5, + [7412]=5, + [7416]=5, + [7417]=5, + [7616]=5, + [7617]=5, + [7618]=5, + [7619]=5, + [7620]=5, + [7621]=5, + [7622]=5, + [7623]=5, + [7624]=5, + [7625]=5, + [7626]=5, + [7627]=5, + [7628]=5, + [7629]=5, + [7630]=5, + [7631]=5, + [7632]=5, + [7633]=5, + [7634]=5, + [7635]=5, + [7636]=5, + [7637]=5, + [7638]=5, + [7639]=5, + [7640]=5, + [7641]=5, + [7642]=5, + [7643]=5, + [7644]=5, + [7645]=5, + [7646]=5, + [7647]=5, + [7648]=5, + [7649]=5, + [7650]=5, + [7651]=5, + [7652]=5, + [7653]=5, + [7654]=5, + [7655]=5, + [7656]=5, + [7657]=5, + [7658]=5, + [7659]=5, + [7660]=5, + [7661]=5, + [7662]=5, + [7663]=5, + [7664]=5, + [7665]=5, + [7666]=5, + [7667]=5, + [7668]=5, + [7669]=5, + [7675]=5, + [7676]=5, + [7677]=5, + [7678]=5, + [7679]=5, [8204]=4, [8205]=2, + [8239]=4, [8294]=4, [8295]=4, [8296]=4, [8297]=4, + [8400]=5, + [8401]=5, + [8402]=5, + [8403]=5, + [8404]=5, + [8405]=5, + [8406]=5, + [8407]=5, + [8408]=5, + [8409]=5, + [8410]=5, + [8411]=5, + [8412]=5, + [8417]=5, + [8421]=5, + [8422]=5, + [8423]=5, + [8424]=5, + [8425]=5, + [8426]=5, + [8427]=5, + [8428]=5, + [8429]=5, + [8430]=5, + [8431]=5, + [8432]=5, + [11503]=5, + [11504]=5, + [11505]=5, + [11647]=5, + [11744]=5, + [11745]=5, + [11746]=5, + [11747]=5, + [11748]=5, + [11749]=5, + [11750]=5, + [11751]=5, + [11752]=5, + [11753]=5, + [11754]=5, + [11755]=5, + [11756]=5, + [11757]=5, + [11758]=5, + [11759]=5, + [11760]=5, + [11761]=5, + [11762]=5, + [11763]=5, + [11764]=5, + [11765]=5, + [11766]=5, + [11767]=5, + [11768]=5, + [11769]=5, + [11770]=5, + [11771]=5, + [11772]=5, + [11773]=5, + [11774]=5, + [11775]=5, + [12330]=5, + [12331]=5, + [12332]=5, + [12333]=5, + [12334]=5, + [12335]=5, + [12441]=5, + [12442]=5, + [42607]=5, + [42612]=5, + [42613]=5, + [42614]=5, + [42615]=5, + [42616]=5, + [42617]=5, + [42618]=5, + [42619]=5, + [42620]=5, + [42621]=5, + [42654]=5, + [42655]=5, + [42736]=5, + [42737]=5, + [43014]=5, + [43019]=5, + [43045]=5, + [43046]=5, [43072]=2, [43073]=2, [43074]=2, @@ -686,6 +1495,120 @@ characters.classifiers={ [43121]=2, [43122]=1, [43123]=4, + [43204]=5, + [43205]=5, + [43232]=5, + [43233]=5, + [43234]=5, + [43235]=5, + [43236]=5, + [43237]=5, + [43238]=5, + [43239]=5, + [43240]=5, + [43241]=5, + [43242]=5, + [43243]=5, + [43244]=5, + [43245]=5, + [43246]=5, + [43247]=5, + [43248]=5, + [43249]=5, + [43302]=5, + [43303]=5, + [43304]=5, + [43305]=5, + [43306]=5, + [43307]=5, + [43308]=5, + [43309]=5, + [43335]=5, + [43336]=5, + [43337]=5, + [43338]=5, + [43339]=5, + [43340]=5, + [43341]=5, + [43342]=5, + [43343]=5, + [43344]=5, + [43345]=5, + [43392]=5, + [43393]=5, + [43394]=5, + [43443]=5, + [43446]=5, + [43447]=5, + [43448]=5, + [43449]=5, + [43452]=5, + [43493]=5, + [43561]=5, + [43562]=5, + [43563]=5, + [43564]=5, + [43565]=5, + [43566]=5, + [43569]=5, + [43570]=5, + [43573]=5, + [43574]=5, + [43587]=5, + [43596]=5, + [43644]=5, + [43696]=5, + [43698]=5, + [43699]=5, + [43700]=5, + [43703]=5, + [43704]=5, + [43710]=5, + [43711]=5, + [43713]=5, + [43756]=5, + [43757]=5, + [43766]=5, + [44005]=5, + [44008]=5, + [44013]=5, + [64286]=5, + [65056]=5, + [65057]=5, + [65058]=5, + [65059]=5, + [65060]=5, + [65061]=5, + [65062]=5, + [65063]=5, + [65064]=5, + [65065]=5, + [65066]=5, + [65067]=5, + [65068]=5, + [65069]=5, + [65070]=5, + [65071]=5, + [66045]=5, + [66272]=5, + [66422]=5, + [66423]=5, + [66424]=5, + [66425]=5, + [66426]=5, + [68097]=5, + [68098]=5, + [68099]=5, + [68101]=5, + [68102]=5, + [68108]=5, + [68109]=5, + [68110]=5, + [68111]=5, + [68152]=5, + [68153]=5, + [68154]=5, + [68159]=5, [68288]=2, [68289]=2, [68290]=2, @@ -723,6 +1646,8 @@ characters.classifiers={ [68322]=4, [68323]=4, [68324]=3, + [68325]=5, + [68326]=5, [68331]=2, [68332]=2, [68333]=2, @@ -753,6 +1678,497 @@ characters.classifiers={ [68525]=2, [68526]=2, [68527]=4, + [69633]=5, + [69688]=5, + [69689]=5, + [69690]=5, + [69691]=5, + [69692]=5, + [69693]=5, + [69694]=5, + [69695]=5, + [69696]=5, + [69697]=5, + [69698]=5, + [69699]=5, + [69700]=5, + [69701]=5, + [69702]=5, + [69759]=5, + [69760]=5, + [69761]=5, + [69811]=5, + [69812]=5, + [69813]=5, + [69814]=5, + [69817]=5, + [69818]=5, + [69888]=5, + [69889]=5, + [69890]=5, + [69927]=5, + [69928]=5, + [69929]=5, + [69930]=5, + [69931]=5, + [69933]=5, + [69934]=5, + [69935]=5, + [69936]=5, + [69937]=5, + [69938]=5, + [69939]=5, + [69940]=5, + [70003]=5, + [70016]=5, + [70017]=5, + [70070]=5, + [70071]=5, + [70072]=5, + [70073]=5, + [70074]=5, + [70075]=5, + [70076]=5, + [70077]=5, + [70078]=5, + [70090]=5, + [70091]=5, + [70092]=5, + [70191]=5, + [70192]=5, + [70193]=5, + [70196]=5, + [70198]=5, + [70199]=5, + [70206]=5, + [70367]=5, + [70371]=5, + [70372]=5, + [70373]=5, + [70374]=5, + [70375]=5, + [70376]=5, + [70377]=5, + [70378]=5, + [70400]=5, + [70401]=5, + [70460]=5, + [70464]=5, + [70502]=5, + [70503]=5, + [70504]=5, + [70505]=5, + [70506]=5, + [70507]=5, + [70508]=5, + [70512]=5, + [70513]=5, + [70514]=5, + [70515]=5, + [70516]=5, + [70712]=5, + [70713]=5, + [70714]=5, + [70715]=5, + [70716]=5, + [70717]=5, + [70718]=5, + [70719]=5, + [70722]=5, + [70723]=5, + [70724]=5, + [70726]=5, + [70835]=5, + [70836]=5, + [70837]=5, + [70838]=5, + [70839]=5, + [70840]=5, + [70842]=5, + [70847]=5, + [70848]=5, + [70850]=5, + [70851]=5, + [71090]=5, + [71091]=5, + [71092]=5, + [71093]=5, + [71100]=5, + [71101]=5, + [71103]=5, + [71104]=5, + [71132]=5, + [71133]=5, + [71219]=5, + [71220]=5, + [71221]=5, + [71222]=5, + [71223]=5, + [71224]=5, + [71225]=5, + [71226]=5, + [71229]=5, + [71231]=5, + [71232]=5, + [71339]=5, + [71341]=5, + [71344]=5, + [71345]=5, + [71346]=5, + [71347]=5, + [71348]=5, + [71349]=5, + [71351]=5, + [71453]=5, + [71454]=5, + [71455]=5, + [71458]=5, + [71459]=5, + [71460]=5, + [71461]=5, + [71463]=5, + [71464]=5, + [71465]=5, + [71466]=5, + [71467]=5, + [72752]=5, + [72753]=5, + [72754]=5, + [72755]=5, + [72756]=5, + [72757]=5, + [72758]=5, + [72760]=5, + [72761]=5, + [72762]=5, + [72763]=5, + [72764]=5, + [72765]=5, + [72767]=5, + [72850]=5, + [72851]=5, + [72852]=5, + [72853]=5, + [72854]=5, + [72855]=5, + [72856]=5, + [72857]=5, + [72858]=5, + [72859]=5, + [72860]=5, + [72861]=5, + [72862]=5, + [72863]=5, + [72864]=5, + [72865]=5, + [72866]=5, + [72867]=5, + [72868]=5, + [72869]=5, + [72870]=5, + [72871]=5, + [72874]=5, + [72875]=5, + [72876]=5, + [72877]=5, + [72878]=5, + [72879]=5, + [72880]=5, + [72882]=5, + [72883]=5, + [72885]=5, + [72886]=5, + [92912]=5, + [92913]=5, + [92914]=5, + [92915]=5, + [92916]=5, + [92976]=5, + [92977]=5, + [92978]=5, + [92979]=5, + [92980]=5, + [92981]=5, + [92982]=5, + [94095]=5, + [94096]=5, + [94097]=5, + [94098]=5, + [113821]=5, + [113822]=5, + [119143]=5, + [119144]=5, + [119145]=5, + [119163]=5, + [119164]=5, + [119165]=5, + [119166]=5, + [119167]=5, + [119168]=5, + [119169]=5, + [119170]=5, + [119173]=5, + [119174]=5, + [119175]=5, + [119176]=5, + [119177]=5, + [119178]=5, + [119179]=5, + [119210]=5, + [119211]=5, + [119212]=5, + [119213]=5, + [119362]=5, + [119363]=5, + [119364]=5, + [121344]=5, + [121345]=5, + [121346]=5, + [121347]=5, + [121348]=5, + [121349]=5, + [121350]=5, + [121351]=5, + [121352]=5, + [121353]=5, + [121354]=5, + [121355]=5, + [121356]=5, + [121357]=5, + [121358]=5, + [121359]=5, + [121360]=5, + [121361]=5, + [121362]=5, + [121363]=5, + [121364]=5, + [121365]=5, + [121366]=5, + [121367]=5, + [121368]=5, + [121369]=5, + [121370]=5, + [121371]=5, + [121372]=5, + [121373]=5, + [121374]=5, + [121375]=5, + [121376]=5, + [121377]=5, + [121378]=5, + [121379]=5, + [121380]=5, + [121381]=5, + [121382]=5, + [121383]=5, + [121384]=5, + [121385]=5, + [121386]=5, + [121387]=5, + [121388]=5, + [121389]=5, + [121390]=5, + [121391]=5, + [121392]=5, + [121393]=5, + [121394]=5, + [121395]=5, + [121396]=5, + [121397]=5, + [121398]=5, + [121403]=5, + [121404]=5, + [121405]=5, + [121406]=5, + [121407]=5, + [121408]=5, + [121409]=5, + [121410]=5, + [121411]=5, + [121412]=5, + [121413]=5, + [121414]=5, + [121415]=5, + [121416]=5, + [121417]=5, + [121418]=5, + [121419]=5, + [121420]=5, + [121421]=5, + [121422]=5, + [121423]=5, + [121424]=5, + [121425]=5, + [121426]=5, + [121427]=5, + [121428]=5, + [121429]=5, + [121430]=5, + [121431]=5, + [121432]=5, + [121433]=5, + [121434]=5, + [121435]=5, + [121436]=5, + [121437]=5, + [121438]=5, + [121439]=5, + [121440]=5, + [121441]=5, + [121442]=5, + [121443]=5, + [121444]=5, + [121445]=5, + [121446]=5, + [121447]=5, + [121448]=5, + [121449]=5, + [121450]=5, + [121451]=5, + [121452]=5, + [121461]=5, + [121476]=5, + [121499]=5, + [121500]=5, + [121501]=5, + [121502]=5, + [121503]=5, + [121505]=5, + [121506]=5, + [121507]=5, + [121508]=5, + [121509]=5, + [121510]=5, + [121511]=5, + [121512]=5, + [121513]=5, + [121514]=5, + [121515]=5, + [121516]=5, + [121517]=5, + [121518]=5, + [121519]=5, + [122880]=5, + [122881]=5, + [122882]=5, + [122883]=5, + [122884]=5, + [122885]=5, + [122886]=5, + [122888]=5, + [122889]=5, + [122890]=5, + [122891]=5, + [122892]=5, + [122893]=5, + [122894]=5, + [122895]=5, + [122896]=5, + [122897]=5, + [122898]=5, + [122899]=5, + [122900]=5, + [122901]=5, + [122902]=5, + [122903]=5, + [122904]=5, + [122907]=5, + [122908]=5, + [122909]=5, + [122910]=5, + [122911]=5, + [122912]=5, + [122913]=5, + [122915]=5, + [122916]=5, + [122918]=5, + [122919]=5, + [122920]=5, + [122921]=5, + [122922]=5, + [125136]=5, + [125137]=5, + [125138]=5, + [125139]=5, + [125140]=5, + [125141]=5, + [125142]=5, + [125184]=2, + [125185]=2, + [125186]=2, + [125187]=2, + [125188]=2, + [125189]=2, + [125190]=2, + [125191]=2, + [125192]=2, + [125193]=2, + [125194]=2, + [125195]=2, + [125196]=2, + [125197]=2, + [125198]=2, + [125199]=2, + [125200]=2, + [125201]=2, + [125202]=2, + [125203]=2, + [125204]=2, + [125205]=2, + [125206]=2, + [125207]=2, + [125208]=2, + [125209]=2, + [125210]=2, + [125211]=2, + [125212]=2, + [125213]=2, + [125214]=2, + [125215]=2, + [125216]=2, + [125217]=2, + [125218]=2, + [125219]=2, + [125220]=2, + [125221]=2, + [125222]=2, + [125223]=2, + [125224]=2, + [125225]=2, + [125226]=2, + [125227]=2, + [125228]=2, + [125229]=2, + [125230]=2, + [125231]=2, + [125232]=2, + [125233]=2, + [125234]=2, + [125235]=2, + [125236]=2, + [125237]=2, + [125238]=2, + [125239]=2, + [125240]=2, + [125241]=2, + [125242]=2, + [125243]=2, + [125244]=2, + [125245]=2, + [125246]=2, + [125247]=2, + [125248]=2, + [125249]=2, + [125250]=2, + [125251]=2, + [125252]=5, + [125253]=5, + [125254]=5, + [125255]=5, + [125256]=5, + [125257]=5, + [125258]=5, + [1042752]=5, } -- done diff --git a/tex/generic/context/luatex/luatex-basics-nod.lua b/tex/generic/context/luatex/luatex-basics-nod.lua index 5571a82ba..f9a59734b 100644 --- a/tex/generic/context/luatex/luatex-basics-nod.lua +++ b/tex/generic/context/luatex/luatex-basics-nod.lua @@ -228,8 +228,8 @@ nuts.getcomponents = direct.getcomponents or function(n) return getfield(n,"co nuts.setcomponents = direct.setcomponents or function(n,c) setfield(n,"components",c) end nuts.getkern = direct.getkern or function(n) return getfield(n,"kern") end nuts.setkern = direct.setkern or function(n,k) setfield(n,"kern",k) end -nuts.getdir = direct.getkern or function(n) return getfield(n,"dir") end -nuts.setdir = direct.setkern or function(n,d) setfield(n,"dir",d) end +nuts.getdir = direct.getdir or function(n) return getfield(n,"dir") end +nuts.setdir = direct.setdir or function(n,d) setfield(n,"dir",d) end nuts.getwidth = direct.getwidth or function(n) return getfield(n,"width") end nuts.setwidth = direct.setwidth or function(n,w) return setfield(n,"width",w) end nuts.getheight = direct.getheight or function(n) return getfield(n,"height") end diff --git a/tex/generic/context/luatex/luatex-basics-prepare.tex b/tex/generic/context/luatex/luatex-basics-prepare.tex index 105226440..76a35cc94 100644 --- a/tex/generic/context/luatex/luatex-basics-prepare.tex +++ b/tex/generic/context/luatex/luatex-basics-prepare.tex @@ -58,6 +58,8 @@ for k, c in next, chardata do else classifiers[k] = s_rest end + elseif c.category == "mn" then + classifiers[k] = s_mark end end end diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index dbd0a5227..cc9ce7b5f 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 05/14/17 19:09:26 +-- merge date : 05/15/17 21:48:19 do -- begin closure to overcome local limits and interference @@ -5105,8 +5105,8 @@ nuts.getcomponents=direct.getcomponents or function(n) return getfield(n,"compo nuts.setcomponents=direct.setcomponents or function(n,c) setfield(n,"components",c) end nuts.getkern=direct.getkern or function(n) return getfield(n,"kern") end nuts.setkern=direct.setkern or function(n,k) setfield(n,"kern",k) end -nuts.getdir=direct.getkern or function(n) return getfield(n,"dir") end -nuts.setdir=direct.setkern or function(n,d) setfield(n,"dir",d) end +nuts.getdir=direct.getdir or function(n) return getfield(n,"dir") end +nuts.setdir=direct.setdir or function(n,d) setfield(n,"dir",d) end nuts.getwidth=direct.getwidth or function(n) return getfield(n,"width") end nuts.setwidth=direct.setwidth or function(n,w) return setfield(n,"width",w) end nuts.getheight=direct.getheight or function(n) return getfield(n,"height") end @@ -5319,6 +5319,174 @@ do -- begin closure to overcome local limits and interference characters=characters or {} characters.blockrange={} characters.classifiers={ + [768]=5, + [769]=5, + [770]=5, + [771]=5, + [772]=5, + [773]=5, + [774]=5, + [775]=5, + [776]=5, + [777]=5, + [778]=5, + [779]=5, + [780]=5, + [781]=5, + [782]=5, + [783]=5, + [784]=5, + [785]=5, + [786]=5, + [787]=5, + [788]=5, + [789]=5, + [790]=5, + [791]=5, + [792]=5, + [793]=5, + [794]=5, + [795]=5, + [796]=5, + [797]=5, + [798]=5, + [799]=5, + [800]=5, + [801]=5, + [802]=5, + [803]=5, + [804]=5, + [805]=5, + [806]=5, + [807]=5, + [808]=5, + [809]=5, + [810]=5, + [811]=5, + [812]=5, + [813]=5, + [814]=5, + [815]=5, + [816]=5, + [817]=5, + [818]=5, + [819]=5, + [820]=5, + [821]=5, + [822]=5, + [823]=5, + [824]=5, + [825]=5, + [826]=5, + [827]=5, + [828]=5, + [829]=5, + [830]=5, + [831]=5, + [832]=5, + [833]=5, + [834]=5, + [835]=5, + [836]=5, + [837]=5, + [838]=5, + [839]=5, + [840]=5, + [841]=5, + [842]=5, + [843]=5, + [844]=5, + [845]=5, + [846]=5, + [847]=5, + [848]=5, + [849]=5, + [850]=5, + [851]=5, + [852]=5, + [853]=5, + [854]=5, + [855]=5, + [856]=5, + [857]=5, + [858]=5, + [859]=5, + [860]=5, + [861]=5, + [862]=5, + [863]=5, + [864]=5, + [865]=5, + [866]=5, + [867]=5, + [868]=5, + [869]=5, + [870]=5, + [871]=5, + [872]=5, + [873]=5, + [874]=5, + [875]=5, + [876]=5, + [877]=5, + [878]=5, + [879]=5, + [1155]=5, + [1156]=5, + [1157]=5, + [1158]=5, + [1159]=5, + [1425]=5, + [1426]=5, + [1427]=5, + [1428]=5, + [1429]=5, + [1430]=5, + [1431]=5, + [1432]=5, + [1433]=5, + [1434]=5, + [1435]=5, + [1436]=5, + [1437]=5, + [1438]=5, + [1439]=5, + [1440]=5, + [1441]=5, + [1442]=5, + [1443]=5, + [1444]=5, + [1445]=5, + [1446]=5, + [1447]=5, + [1448]=5, + [1449]=5, + [1450]=5, + [1451]=5, + [1452]=5, + [1453]=5, + [1454]=5, + [1455]=5, + [1456]=5, + [1457]=5, + [1458]=5, + [1459]=5, + [1460]=5, + [1461]=5, + [1462]=5, + [1463]=5, + [1464]=5, + [1465]=5, + [1466]=5, + [1467]=5, + [1468]=5, + [1469]=5, + [1471]=5, + [1473]=5, + [1474]=5, + [1476]=5, + [1477]=5, + [1479]=5, [1536]=4, [1537]=4, [1538]=4, @@ -5699,6 +5867,17 @@ characters.classifiers={ [1917]=2, [1918]=2, [1919]=2, + [1958]=5, + [1959]=5, + [1960]=5, + [1961]=5, + [1962]=5, + [1963]=5, + [1964]=5, + [1965]=5, + [1966]=5, + [1967]=5, + [1968]=5, [1984]=6, [1985]=6, [1986]=6, @@ -5758,6 +5937,27 @@ characters.classifiers={ [2040]=6, [2041]=6, [2042]=2, + [2070]=5, + [2071]=5, + [2072]=5, + [2073]=5, + [2075]=5, + [2076]=5, + [2077]=5, + [2078]=5, + [2079]=5, + [2080]=5, + [2081]=5, + [2082]=5, + [2083]=5, + [2085]=5, + [2086]=5, + [2087]=5, + [2089]=5, + [2090]=5, + [2091]=5, + [2092]=5, + [2093]=5, [2112]=3, [2113]=2, [2114]=2, @@ -5783,6 +5983,9 @@ characters.classifiers={ [2134]=4, [2135]=4, [2136]=4, + [2137]=5, + [2138]=5, + [2139]=5, [2208]=2, [2209]=2, [2210]=2, @@ -5804,9 +6007,339 @@ characters.classifiers={ [2226]=3, [2227]=2, [2228]=2, + [2230]=2, + [2231]=2, + [2232]=2, + [2233]=3, + [2234]=2, + [2235]=2, + [2236]=2, + [2237]=2, + [2260]=5, + [2261]=5, + [2262]=5, + [2263]=5, + [2264]=5, + [2265]=5, + [2266]=5, + [2267]=5, + [2268]=5, + [2269]=5, + [2270]=5, + [2271]=5, + [2272]=5, + [2273]=5, + [2274]=4, + [2275]=5, + [2276]=5, + [2277]=5, + [2278]=5, + [2279]=5, + [2280]=5, + [2281]=5, + [2282]=5, + [2283]=5, + [2284]=5, + [2285]=5, + [2286]=5, + [2287]=5, + [2288]=5, + [2289]=5, + [2290]=5, + [2291]=5, + [2292]=5, + [2293]=5, + [2294]=5, + [2295]=5, + [2296]=5, + [2297]=5, + [2298]=5, + [2299]=5, + [2300]=5, + [2301]=5, + [2302]=5, + [2303]=5, + [2304]=5, + [2305]=5, + [2306]=5, + [2362]=5, + [2364]=5, + [2369]=5, + [2370]=5, + [2371]=5, + [2372]=5, + [2373]=5, + [2374]=5, + [2375]=5, + [2376]=5, + [2381]=5, + [2385]=5, + [2386]=5, + [2387]=5, + [2388]=5, + [2389]=5, + [2390]=5, + [2391]=5, + [2402]=5, + [2403]=5, + [2433]=5, + [2492]=5, + [2497]=5, + [2498]=5, + [2499]=5, + [2500]=5, + [2509]=5, + [2530]=5, + [2531]=5, + [2561]=5, + [2562]=5, + [2620]=5, + [2625]=5, + [2626]=5, + [2631]=5, + [2632]=5, + [2635]=5, + [2636]=5, + [2637]=5, + [2641]=5, + [2672]=5, + [2673]=5, + [2677]=5, + [2689]=5, + [2690]=5, + [2748]=5, + [2753]=5, + [2754]=5, + [2755]=5, + [2756]=5, + [2757]=5, + [2759]=5, + [2760]=5, + [2765]=5, + [2786]=5, + [2787]=5, + [2817]=5, + [2876]=5, + [2879]=5, + [2881]=5, + [2882]=5, + [2883]=5, + [2884]=5, + [2893]=5, + [2902]=5, + [2914]=5, + [2915]=5, + [2946]=5, + [3008]=5, + [3021]=5, + [3072]=5, + [3134]=5, + [3135]=5, + [3136]=5, + [3142]=5, + [3143]=5, + [3144]=5, + [3146]=5, + [3147]=5, + [3148]=5, + [3149]=5, + [3157]=5, + [3158]=5, + [3170]=5, + [3171]=5, + [3201]=5, + [3260]=5, + [3263]=5, + [3270]=5, + [3276]=5, + [3277]=5, + [3298]=5, + [3299]=5, + [3329]=5, + [3393]=5, + [3394]=5, + [3395]=5, + [3396]=5, + [3405]=5, + [3426]=5, + [3427]=5, + [3530]=5, + [3538]=5, + [3539]=5, + [3540]=5, + [3542]=5, + [3633]=5, + [3636]=5, + [3637]=5, + [3638]=5, + [3639]=5, + [3640]=5, + [3641]=5, + [3642]=5, + [3655]=5, + [3656]=5, + [3657]=5, + [3658]=5, + [3659]=5, + [3660]=5, + [3661]=5, + [3662]=5, + [3761]=5, + [3764]=5, + [3765]=5, + [3766]=5, + [3767]=5, + [3768]=5, + [3769]=5, + [3771]=5, + [3772]=5, + [3784]=5, + [3785]=5, + [3786]=5, + [3787]=5, + [3788]=5, + [3789]=5, + [3864]=5, + [3865]=5, + [3893]=5, + [3895]=5, + [3897]=5, + [3953]=5, + [3954]=5, + [3955]=5, + [3956]=5, + [3957]=5, + [3958]=5, + [3959]=5, + [3960]=5, + [3961]=5, + [3962]=5, + [3963]=5, + [3964]=5, + [3965]=5, + [3966]=5, + [3968]=5, + [3969]=5, + [3970]=5, + [3971]=5, + [3972]=5, + [3974]=5, + [3975]=5, + [3981]=5, + [3982]=5, + [3983]=5, + [3984]=5, + [3985]=5, + [3986]=5, + [3987]=5, + [3988]=5, + [3989]=5, + [3990]=5, + [3991]=5, + [3993]=5, + [3994]=5, + [3995]=5, + [3996]=5, + [3997]=5, + [3998]=5, + [3999]=5, + [4000]=5, + [4001]=5, + [4002]=5, + [4003]=5, + [4004]=5, + [4005]=5, + [4006]=5, + [4007]=5, + [4008]=5, + [4009]=5, + [4010]=5, + [4011]=5, + [4012]=5, + [4013]=5, + [4014]=5, + [4015]=5, + [4016]=5, + [4017]=5, + [4018]=5, + [4019]=5, + [4020]=5, + [4021]=5, + [4022]=5, + [4023]=5, + [4024]=5, + [4025]=5, + [4026]=5, + [4027]=5, + [4028]=5, + [4038]=5, + [4141]=5, + [4142]=5, + [4143]=5, + [4144]=5, + [4146]=5, + [4147]=5, + [4148]=5, + [4149]=5, + [4150]=5, + [4151]=5, + [4153]=5, + [4154]=5, + [4157]=5, + [4158]=5, + [4184]=5, + [4185]=5, + [4190]=5, + [4191]=5, + [4192]=5, + [4209]=5, + [4210]=5, + [4211]=5, + [4212]=5, + [4226]=5, + [4229]=5, + [4230]=5, + [4237]=5, + [4253]=5, + [4957]=5, + [4958]=5, + [4959]=5, + [5906]=5, + [5907]=5, + [5908]=5, + [5938]=5, + [5939]=5, + [5940]=5, + [5970]=5, + [5971]=5, + [6002]=5, + [6003]=5, + [6071]=5, + [6072]=5, + [6073]=5, + [6074]=5, + [6075]=5, + [6076]=5, + [6077]=5, + [6086]=5, + [6089]=5, + [6090]=5, + [6091]=5, + [6092]=5, + [6093]=5, + [6094]=5, + [6095]=5, + [6096]=5, + [6097]=5, + [6098]=5, + [6099]=5, + [6109]=5, [6150]=4, [6151]=2, [6154]=2, + [6155]=5, + [6156]=5, + [6157]=5, [6158]=4, [6176]=2, [6177]=2, @@ -5901,8 +6434,6 @@ characters.classifiers={ [6274]=4, [6275]=4, [6276]=4, - [6277]=4, - [6278]=4, [6279]=2, [6280]=2, [6281]=2, @@ -5937,13 +6468,291 @@ characters.classifiers={ [6310]=2, [6311]=2, [6312]=2, + [6313]=5, [6314]=2, + [6432]=5, + [6433]=5, + [6434]=5, + [6439]=5, + [6440]=5, + [6450]=5, + [6457]=5, + [6458]=5, + [6459]=5, + [6679]=5, + [6680]=5, + [6742]=5, + [6744]=5, + [6745]=5, + [6746]=5, + [6747]=5, + [6748]=5, + [6749]=5, + [6750]=5, + [6752]=5, + [6754]=5, + [6757]=5, + [6758]=5, + [6759]=5, + [6760]=5, + [6761]=5, + [6762]=5, + [6763]=5, + [6764]=5, + [6771]=5, + [6772]=5, + [6773]=5, + [6774]=5, + [6775]=5, + [6776]=5, + [6777]=5, + [6778]=5, + [6779]=5, + [6780]=5, + [6783]=5, + [6832]=5, + [6833]=5, + [6834]=5, + [6835]=5, + [6836]=5, + [6837]=5, + [6838]=5, + [6839]=5, + [6840]=5, + [6841]=5, + [6842]=5, + [6843]=5, + [6844]=5, + [6845]=5, + [6912]=5, + [6913]=5, + [6914]=5, + [6915]=5, + [6964]=5, + [6966]=5, + [6967]=5, + [6968]=5, + [6969]=5, + [6970]=5, + [6972]=5, + [6978]=5, + [7019]=5, + [7020]=5, + [7021]=5, + [7022]=5, + [7023]=5, + [7024]=5, + [7025]=5, + [7026]=5, + [7027]=5, + [7040]=5, + [7041]=5, + [7074]=5, + [7075]=5, + [7076]=5, + [7077]=5, + [7080]=5, + [7081]=5, + [7083]=5, + [7142]=5, + [7144]=5, + [7145]=5, + [7149]=5, + [7151]=5, + [7152]=5, + [7153]=5, + [7212]=5, + [7213]=5, + [7214]=5, + [7215]=5, + [7216]=5, + [7217]=5, + [7218]=5, + [7219]=5, + [7222]=5, + [7223]=5, + [7376]=5, + [7377]=5, + [7378]=5, + [7380]=5, + [7381]=5, + [7382]=5, + [7383]=5, + [7384]=5, + [7385]=5, + [7386]=5, + [7387]=5, + [7388]=5, + [7389]=5, + [7390]=5, + [7391]=5, + [7392]=5, + [7394]=5, + [7395]=5, + [7396]=5, + [7397]=5, + [7398]=5, + [7399]=5, + [7400]=5, + [7405]=5, + [7412]=5, + [7416]=5, + [7417]=5, + [7616]=5, + [7617]=5, + [7618]=5, + [7619]=5, + [7620]=5, + [7621]=5, + [7622]=5, + [7623]=5, + [7624]=5, + [7625]=5, + [7626]=5, + [7627]=5, + [7628]=5, + [7629]=5, + [7630]=5, + [7631]=5, + [7632]=5, + [7633]=5, + [7634]=5, + [7635]=5, + [7636]=5, + [7637]=5, + [7638]=5, + [7639]=5, + [7640]=5, + [7641]=5, + [7642]=5, + [7643]=5, + [7644]=5, + [7645]=5, + [7646]=5, + [7647]=5, + [7648]=5, + [7649]=5, + [7650]=5, + [7651]=5, + [7652]=5, + [7653]=5, + [7654]=5, + [7655]=5, + [7656]=5, + [7657]=5, + [7658]=5, + [7659]=5, + [7660]=5, + [7661]=5, + [7662]=5, + [7663]=5, + [7664]=5, + [7665]=5, + [7666]=5, + [7667]=5, + [7668]=5, + [7669]=5, + [7675]=5, + [7676]=5, + [7677]=5, + [7678]=5, + [7679]=5, [8204]=4, [8205]=2, + [8239]=4, [8294]=4, [8295]=4, [8296]=4, [8297]=4, + [8400]=5, + [8401]=5, + [8402]=5, + [8403]=5, + [8404]=5, + [8405]=5, + [8406]=5, + [8407]=5, + [8408]=5, + [8409]=5, + [8410]=5, + [8411]=5, + [8412]=5, + [8417]=5, + [8421]=5, + [8422]=5, + [8423]=5, + [8424]=5, + [8425]=5, + [8426]=5, + [8427]=5, + [8428]=5, + [8429]=5, + [8430]=5, + [8431]=5, + [8432]=5, + [11503]=5, + [11504]=5, + [11505]=5, + [11647]=5, + [11744]=5, + [11745]=5, + [11746]=5, + [11747]=5, + [11748]=5, + [11749]=5, + [11750]=5, + [11751]=5, + [11752]=5, + [11753]=5, + [11754]=5, + [11755]=5, + [11756]=5, + [11757]=5, + [11758]=5, + [11759]=5, + [11760]=5, + [11761]=5, + [11762]=5, + [11763]=5, + [11764]=5, + [11765]=5, + [11766]=5, + [11767]=5, + [11768]=5, + [11769]=5, + [11770]=5, + [11771]=5, + [11772]=5, + [11773]=5, + [11774]=5, + [11775]=5, + [12330]=5, + [12331]=5, + [12332]=5, + [12333]=5, + [12334]=5, + [12335]=5, + [12441]=5, + [12442]=5, + [42607]=5, + [42612]=5, + [42613]=5, + [42614]=5, + [42615]=5, + [42616]=5, + [42617]=5, + [42618]=5, + [42619]=5, + [42620]=5, + [42621]=5, + [42654]=5, + [42655]=5, + [42736]=5, + [42737]=5, + [43014]=5, + [43019]=5, + [43045]=5, + [43046]=5, [43072]=2, [43073]=2, [43074]=2, @@ -5996,6 +6805,120 @@ characters.classifiers={ [43121]=2, [43122]=1, [43123]=4, + [43204]=5, + [43205]=5, + [43232]=5, + [43233]=5, + [43234]=5, + [43235]=5, + [43236]=5, + [43237]=5, + [43238]=5, + [43239]=5, + [43240]=5, + [43241]=5, + [43242]=5, + [43243]=5, + [43244]=5, + [43245]=5, + [43246]=5, + [43247]=5, + [43248]=5, + [43249]=5, + [43302]=5, + [43303]=5, + [43304]=5, + [43305]=5, + [43306]=5, + [43307]=5, + [43308]=5, + [43309]=5, + [43335]=5, + [43336]=5, + [43337]=5, + [43338]=5, + [43339]=5, + [43340]=5, + [43341]=5, + [43342]=5, + [43343]=5, + [43344]=5, + [43345]=5, + [43392]=5, + [43393]=5, + [43394]=5, + [43443]=5, + [43446]=5, + [43447]=5, + [43448]=5, + [43449]=5, + [43452]=5, + [43493]=5, + [43561]=5, + [43562]=5, + [43563]=5, + [43564]=5, + [43565]=5, + [43566]=5, + [43569]=5, + [43570]=5, + [43573]=5, + [43574]=5, + [43587]=5, + [43596]=5, + [43644]=5, + [43696]=5, + [43698]=5, + [43699]=5, + [43700]=5, + [43703]=5, + [43704]=5, + [43710]=5, + [43711]=5, + [43713]=5, + [43756]=5, + [43757]=5, + [43766]=5, + [44005]=5, + [44008]=5, + [44013]=5, + [64286]=5, + [65056]=5, + [65057]=5, + [65058]=5, + [65059]=5, + [65060]=5, + [65061]=5, + [65062]=5, + [65063]=5, + [65064]=5, + [65065]=5, + [65066]=5, + [65067]=5, + [65068]=5, + [65069]=5, + [65070]=5, + [65071]=5, + [66045]=5, + [66272]=5, + [66422]=5, + [66423]=5, + [66424]=5, + [66425]=5, + [66426]=5, + [68097]=5, + [68098]=5, + [68099]=5, + [68101]=5, + [68102]=5, + [68108]=5, + [68109]=5, + [68110]=5, + [68111]=5, + [68152]=5, + [68153]=5, + [68154]=5, + [68159]=5, [68288]=2, [68289]=2, [68290]=2, @@ -6033,6 +6956,8 @@ characters.classifiers={ [68322]=4, [68323]=4, [68324]=3, + [68325]=5, + [68326]=5, [68331]=2, [68332]=2, [68333]=2, @@ -6063,6 +6988,497 @@ characters.classifiers={ [68525]=2, [68526]=2, [68527]=4, + [69633]=5, + [69688]=5, + [69689]=5, + [69690]=5, + [69691]=5, + [69692]=5, + [69693]=5, + [69694]=5, + [69695]=5, + [69696]=5, + [69697]=5, + [69698]=5, + [69699]=5, + [69700]=5, + [69701]=5, + [69702]=5, + [69759]=5, + [69760]=5, + [69761]=5, + [69811]=5, + [69812]=5, + [69813]=5, + [69814]=5, + [69817]=5, + [69818]=5, + [69888]=5, + [69889]=5, + [69890]=5, + [69927]=5, + [69928]=5, + [69929]=5, + [69930]=5, + [69931]=5, + [69933]=5, + [69934]=5, + [69935]=5, + [69936]=5, + [69937]=5, + [69938]=5, + [69939]=5, + [69940]=5, + [70003]=5, + [70016]=5, + [70017]=5, + [70070]=5, + [70071]=5, + [70072]=5, + [70073]=5, + [70074]=5, + [70075]=5, + [70076]=5, + [70077]=5, + [70078]=5, + [70090]=5, + [70091]=5, + [70092]=5, + [70191]=5, + [70192]=5, + [70193]=5, + [70196]=5, + [70198]=5, + [70199]=5, + [70206]=5, + [70367]=5, + [70371]=5, + [70372]=5, + [70373]=5, + [70374]=5, + [70375]=5, + [70376]=5, + [70377]=5, + [70378]=5, + [70400]=5, + [70401]=5, + [70460]=5, + [70464]=5, + [70502]=5, + [70503]=5, + [70504]=5, + [70505]=5, + [70506]=5, + [70507]=5, + [70508]=5, + [70512]=5, + [70513]=5, + [70514]=5, + [70515]=5, + [70516]=5, + [70712]=5, + [70713]=5, + [70714]=5, + [70715]=5, + [70716]=5, + [70717]=5, + [70718]=5, + [70719]=5, + [70722]=5, + [70723]=5, + [70724]=5, + [70726]=5, + [70835]=5, + [70836]=5, + [70837]=5, + [70838]=5, + [70839]=5, + [70840]=5, + [70842]=5, + [70847]=5, + [70848]=5, + [70850]=5, + [70851]=5, + [71090]=5, + [71091]=5, + [71092]=5, + [71093]=5, + [71100]=5, + [71101]=5, + [71103]=5, + [71104]=5, + [71132]=5, + [71133]=5, + [71219]=5, + [71220]=5, + [71221]=5, + [71222]=5, + [71223]=5, + [71224]=5, + [71225]=5, + [71226]=5, + [71229]=5, + [71231]=5, + [71232]=5, + [71339]=5, + [71341]=5, + [71344]=5, + [71345]=5, + [71346]=5, + [71347]=5, + [71348]=5, + [71349]=5, + [71351]=5, + [71453]=5, + [71454]=5, + [71455]=5, + [71458]=5, + [71459]=5, + [71460]=5, + [71461]=5, + [71463]=5, + [71464]=5, + [71465]=5, + [71466]=5, + [71467]=5, + [72752]=5, + [72753]=5, + [72754]=5, + [72755]=5, + [72756]=5, + [72757]=5, + [72758]=5, + [72760]=5, + [72761]=5, + [72762]=5, + [72763]=5, + [72764]=5, + [72765]=5, + [72767]=5, + [72850]=5, + [72851]=5, + [72852]=5, + [72853]=5, + [72854]=5, + [72855]=5, + [72856]=5, + [72857]=5, + [72858]=5, + [72859]=5, + [72860]=5, + [72861]=5, + [72862]=5, + [72863]=5, + [72864]=5, + [72865]=5, + [72866]=5, + [72867]=5, + [72868]=5, + [72869]=5, + [72870]=5, + [72871]=5, + [72874]=5, + [72875]=5, + [72876]=5, + [72877]=5, + [72878]=5, + [72879]=5, + [72880]=5, + [72882]=5, + [72883]=5, + [72885]=5, + [72886]=5, + [92912]=5, + [92913]=5, + [92914]=5, + [92915]=5, + [92916]=5, + [92976]=5, + [92977]=5, + [92978]=5, + [92979]=5, + [92980]=5, + [92981]=5, + [92982]=5, + [94095]=5, + [94096]=5, + [94097]=5, + [94098]=5, + [113821]=5, + [113822]=5, + [119143]=5, + [119144]=5, + [119145]=5, + [119163]=5, + [119164]=5, + [119165]=5, + [119166]=5, + [119167]=5, + [119168]=5, + [119169]=5, + [119170]=5, + [119173]=5, + [119174]=5, + [119175]=5, + [119176]=5, + [119177]=5, + [119178]=5, + [119179]=5, + [119210]=5, + [119211]=5, + [119212]=5, + [119213]=5, + [119362]=5, + [119363]=5, + [119364]=5, + [121344]=5, + [121345]=5, + [121346]=5, + [121347]=5, + [121348]=5, + [121349]=5, + [121350]=5, + [121351]=5, + [121352]=5, + [121353]=5, + [121354]=5, + [121355]=5, + [121356]=5, + [121357]=5, + [121358]=5, + [121359]=5, + [121360]=5, + [121361]=5, + [121362]=5, + [121363]=5, + [121364]=5, + [121365]=5, + [121366]=5, + [121367]=5, + [121368]=5, + [121369]=5, + [121370]=5, + [121371]=5, + [121372]=5, + [121373]=5, + [121374]=5, + [121375]=5, + [121376]=5, + [121377]=5, + [121378]=5, + [121379]=5, + [121380]=5, + [121381]=5, + [121382]=5, + [121383]=5, + [121384]=5, + [121385]=5, + [121386]=5, + [121387]=5, + [121388]=5, + [121389]=5, + [121390]=5, + [121391]=5, + [121392]=5, + [121393]=5, + [121394]=5, + [121395]=5, + [121396]=5, + [121397]=5, + [121398]=5, + [121403]=5, + [121404]=5, + [121405]=5, + [121406]=5, + [121407]=5, + [121408]=5, + [121409]=5, + [121410]=5, + [121411]=5, + [121412]=5, + [121413]=5, + [121414]=5, + [121415]=5, + [121416]=5, + [121417]=5, + [121418]=5, + [121419]=5, + [121420]=5, + [121421]=5, + [121422]=5, + [121423]=5, + [121424]=5, + [121425]=5, + [121426]=5, + [121427]=5, + [121428]=5, + [121429]=5, + [121430]=5, + [121431]=5, + [121432]=5, + [121433]=5, + [121434]=5, + [121435]=5, + [121436]=5, + [121437]=5, + [121438]=5, + [121439]=5, + [121440]=5, + [121441]=5, + [121442]=5, + [121443]=5, + [121444]=5, + [121445]=5, + [121446]=5, + [121447]=5, + [121448]=5, + [121449]=5, + [121450]=5, + [121451]=5, + [121452]=5, + [121461]=5, + [121476]=5, + [121499]=5, + [121500]=5, + [121501]=5, + [121502]=5, + [121503]=5, + [121505]=5, + [121506]=5, + [121507]=5, + [121508]=5, + [121509]=5, + [121510]=5, + [121511]=5, + [121512]=5, + [121513]=5, + [121514]=5, + [121515]=5, + [121516]=5, + [121517]=5, + [121518]=5, + [121519]=5, + [122880]=5, + [122881]=5, + [122882]=5, + [122883]=5, + [122884]=5, + [122885]=5, + [122886]=5, + [122888]=5, + [122889]=5, + [122890]=5, + [122891]=5, + [122892]=5, + [122893]=5, + [122894]=5, + [122895]=5, + [122896]=5, + [122897]=5, + [122898]=5, + [122899]=5, + [122900]=5, + [122901]=5, + [122902]=5, + [122903]=5, + [122904]=5, + [122907]=5, + [122908]=5, + [122909]=5, + [122910]=5, + [122911]=5, + [122912]=5, + [122913]=5, + [122915]=5, + [122916]=5, + [122918]=5, + [122919]=5, + [122920]=5, + [122921]=5, + [122922]=5, + [125136]=5, + [125137]=5, + [125138]=5, + [125139]=5, + [125140]=5, + [125141]=5, + [125142]=5, + [125184]=2, + [125185]=2, + [125186]=2, + [125187]=2, + [125188]=2, + [125189]=2, + [125190]=2, + [125191]=2, + [125192]=2, + [125193]=2, + [125194]=2, + [125195]=2, + [125196]=2, + [125197]=2, + [125198]=2, + [125199]=2, + [125200]=2, + [125201]=2, + [125202]=2, + [125203]=2, + [125204]=2, + [125205]=2, + [125206]=2, + [125207]=2, + [125208]=2, + [125209]=2, + [125210]=2, + [125211]=2, + [125212]=2, + [125213]=2, + [125214]=2, + [125215]=2, + [125216]=2, + [125217]=2, + [125218]=2, + [125219]=2, + [125220]=2, + [125221]=2, + [125222]=2, + [125223]=2, + [125224]=2, + [125225]=2, + [125226]=2, + [125227]=2, + [125228]=2, + [125229]=2, + [125230]=2, + [125231]=2, + [125232]=2, + [125233]=2, + [125234]=2, + [125235]=2, + [125236]=2, + [125237]=2, + [125238]=2, + [125239]=2, + [125240]=2, + [125241]=2, + [125242]=2, + [125243]=2, + [125244]=2, + [125245]=2, + [125246]=2, + [125247]=2, + [125248]=2, + [125249]=2, + [125250]=2, + [125251]=2, + [125252]=5, + [125253]=5, + [125254]=5, + [125255]=5, + [125256]=5, + [125257]=5, + [125258]=5, + [1042752]=5, } end -- closure @@ -7548,7 +8964,7 @@ local sortedhash,sortedkeys=table.sortedhash,table.sortedkeys local trace_loading=false trackers.register("fonts.loading",function(v) trace_loading=v end) local trace_mapping=false trackers.register("fonts.mapping",function(v) trace_mapping=v end) local report_fonts=logs.reporter("fonts","loading") -local force_ligatures=true directives.register("fonts.mapping.forceligatures",function(v) force_ligatures=v end) +local force_ligatures=false directives.register("fonts.mapping.forceligatures",function(v) force_ligatures=v end) local fonts=fonts or {} local mappings=fonts.mappings or {} fonts.mappings=mappings @@ -7662,7 +9078,7 @@ do end mappings.overloads=o end -function mappings.addtounicode(data,filename,checklookups) +function mappings.addtounicode(data,filename,checklookups,forceligatures) local resources=data.resources local unicodes=resources.unicodes if not unicodes then @@ -7851,22 +9267,26 @@ function mappings.addtounicode(data,filename,checklookups) end end if not collected then - elseif force_ligatures then + elseif forceligatures or force_ligatures then for i=1,#dlist do local du=dlist[i] - local u=collected[du] - if u then - resolve(descriptions[du],u) + if du>=private or (du>=0xE000 and du<=0xF8FF) then + local u=collected[du] + if u then + resolve(descriptions[du],u) + end end end else for i=1,#dlist do local du=dlist[i] - local glyph=descriptions[du] - if glyph.class=="ligature" and not glyph.unicode then - local u=collected[du] - if u then - resolve(glyph,u) + if du>=private or (du>=0xE000 and du<=0xF8FF) then + local glyph=descriptions[du] + if glyph.class=="ligature" and not glyph.unicode then + local u=collected[du] + if u then + resolve(glyph,u) + end end end end @@ -20205,6 +21625,10 @@ function injections.isspace(n,threshold,id) end end end +local getspaceboth=getboth +function injections.installgetspaceboth(gb) + getspaceboth=gb or getboth +end local function injectspaces(head) if not triggers then return head,false @@ -20225,9 +21649,9 @@ local function injectspaces(head) factor=getthreshold(font) end for n in traverse_id(glue_code,tonut(head)) do - local prev,next=getboth(n) - local prevchar=ischar(prev) - local nextchar=ischar(next) + local prev,next=getspaceboth(n) + local prevchar=prev and ischar(prev) + local nextchar=next and ischar(next) if nextchar then local font=getfont(next) local trig=triggers[font] @@ -24035,9 +25459,9 @@ local function spaceinitializer(tfmdata,value) if type(kern)~="table" then left[k]=kern elseif single then - left[k]=v[3] + left[k]=kern[3] else - local one=v[1] + local one=kern[1] if one then left[k]=one[3] end @@ -26093,7 +27517,7 @@ else local tounicode=fonts.mappings.tounicode16 function otf.getactualtext(s) return - "/Span << /ActualText >> BDC", + "/Span << /ActualText >> BDC", "EMC" end end diff --git a/tex/generic/context/luatex/luatex-math.tex b/tex/generic/context/luatex/luatex-math.tex index acf1d2308..6edc6f74b 100644 --- a/tex/generic/context/luatex/luatex-math.tex +++ b/tex/generic/context/luatex/luatex-math.tex @@ -2245,7 +2245,7 @@ \def\root#1\of {\setbox\rootbox\hbox\bgroup $\m@th\scriptscriptstyle{#1}$% - \egroup}% + \egroup \mathpalette\r@@t} \catcode`@=12 -- cgit v1.2.3