summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/context/documents/general/manuals/columnsets.pdfbin4512620 -> 4509576 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-cs.pdfbin834423 -> 834408 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-de.pdfbin836226 -> 836210 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-en.pdfbin839570 -> 839557 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-fr.pdfbin832480 -> 832459 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-it.pdfbin836929 -> 836899 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-nl.pdfbin829841 -> 829823 bytes
-rw-r--r--doc/context/documents/general/qrcs/setup-ro.pdfbin830964 -> 830937 bytes
-rw-r--r--doc/context/sources/general/manuals/columnsets/columnsets-000.tex3
-rw-r--r--doc/context/sources/general/manuals/columnsets/columnsets.tex169
10 files changed, 17 insertions, 155 deletions
diff --git a/doc/context/documents/general/manuals/columnsets.pdf b/doc/context/documents/general/manuals/columnsets.pdf
index 32a7f8b06..e0be48ec5 100644
--- a/doc/context/documents/general/manuals/columnsets.pdf
+++ b/doc/context/documents/general/manuals/columnsets.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf
index 3b3b7a33f..421bb6fa7 100644
--- a/doc/context/documents/general/qrcs/setup-cs.pdf
+++ b/doc/context/documents/general/qrcs/setup-cs.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf
index 55c5a2bf2..420b07a80 100644
--- a/doc/context/documents/general/qrcs/setup-de.pdf
+++ b/doc/context/documents/general/qrcs/setup-de.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf
index 8c8249219..35b8810b8 100644
--- a/doc/context/documents/general/qrcs/setup-en.pdf
+++ b/doc/context/documents/general/qrcs/setup-en.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf
index 358285012..be181d883 100644
--- a/doc/context/documents/general/qrcs/setup-fr.pdf
+++ b/doc/context/documents/general/qrcs/setup-fr.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf
index af879734a..56914364e 100644
--- a/doc/context/documents/general/qrcs/setup-it.pdf
+++ b/doc/context/documents/general/qrcs/setup-it.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf
index 9495e9598..bcc7963ce 100644
--- a/doc/context/documents/general/qrcs/setup-nl.pdf
+++ b/doc/context/documents/general/qrcs/setup-nl.pdf
Binary files differ
diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf
index a913fa7e5..431fbba29 100644
--- a/doc/context/documents/general/qrcs/setup-ro.pdf
+++ b/doc/context/documents/general/qrcs/setup-ro.pdf
Binary files differ
diff --git a/doc/context/sources/general/manuals/columnsets/columnsets-000.tex b/doc/context/sources/general/manuals/columnsets/columnsets-000.tex
index 429a067de..4f254e2ae 100644
--- a/doc/context/sources/general/manuals/columnsets/columnsets-000.tex
+++ b/doc/context/sources/general/manuals/columnsets/columnsets-000.tex
@@ -40,6 +40,9 @@
\setupfooter
[style=\tttf]
+\setupheader
+ [style=\tttf]
+
\setuptolerance
[verytolerant,stretch]
diff --git a/doc/context/sources/general/manuals/columnsets/columnsets.tex b/doc/context/sources/general/manuals/columnsets/columnsets.tex
index 0cb95229d..6df706d90 100644
--- a/doc/context/sources/general/manuals/columnsets/columnsets.tex
+++ b/doc/context/sources/general/manuals/columnsets/columnsets.tex
@@ -107,6 +107,11 @@
\definecolor[color-5][.5(white,color-4)]
\definecolor[color-6][.2(white,color-4)]
+\usemodule[typesetting]
+
+\setupcombination
+ [style=mono]
+
\startuseMPgraphic{page}
StartPage ;
path p ;
@@ -143,144 +148,6 @@ StopPage ;
\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,
@@ -352,23 +219,15 @@ StartPage ;
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 ;
+ 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} ;
StopPage ;
\stopMPpage