From 753dd0cbafc567d4960c5fc4888ccb4e2302c64d Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Wed, 3 Oct 2018 16:44:19 +0200 Subject: 2018-10-03 16:11:00 --- .../documents/general/manuals/xtables-mkiv.pdf | Bin 154883 -> 157802 bytes doc/context/documents/general/qrcs/setup-cs.pdf | Bin 853260 -> 853517 bytes doc/context/documents/general/qrcs/setup-de.pdf | Bin 853887 -> 854115 bytes doc/context/documents/general/qrcs/setup-en.pdf | Bin 857249 -> 857465 bytes doc/context/documents/general/qrcs/setup-fr.pdf | Bin 849721 -> 849774 bytes doc/context/documents/general/qrcs/setup-it.pdf | Bin 856256 -> 856480 bytes .../documents/general/qrcs/setup-mapping-cs.pdf | Bin 346962 -> 347104 bytes .../documents/general/qrcs/setup-mapping-de.pdf | Bin 431246 -> 431389 bytes .../documents/general/qrcs/setup-mapping-en.pdf | Bin 344851 -> 344995 bytes .../documents/general/qrcs/setup-mapping-fr.pdf | Bin 347377 -> 347524 bytes .../documents/general/qrcs/setup-mapping-it.pdf | Bin 346372 -> 346521 bytes .../documents/general/qrcs/setup-mapping-nl.pdf | Bin 345408 -> 345548 bytes .../documents/general/qrcs/setup-mapping-ro.pdf | Bin 508246 -> 508390 bytes doc/context/documents/general/qrcs/setup-nl.pdf | Bin 846609 -> 846824 bytes doc/context/documents/general/qrcs/setup-ro.pdf | Bin 851378 -> 851605 bytes .../general/manuals/xtables/xtables-mkiv.tex | 95 +++++++++++++++++++++ 16 files changed, 95 insertions(+) (limited to 'doc') diff --git a/doc/context/documents/general/manuals/xtables-mkiv.pdf b/doc/context/documents/general/manuals/xtables-mkiv.pdf index d1b1a3ed0..255a730b8 100644 Binary files a/doc/context/documents/general/manuals/xtables-mkiv.pdf and b/doc/context/documents/general/manuals/xtables-mkiv.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf index 4e9d547c5..aa527b862 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 0941e1f49..ea5fc1ed7 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 7137482f0..f373195d9 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 cfdd71b78..9ce8b8717 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 93e68397f..9bca93711 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-mapping-cs.pdf b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf index 746595024..d6be2f850 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-cs.pdf and b/doc/context/documents/general/qrcs/setup-mapping-cs.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-de.pdf b/doc/context/documents/general/qrcs/setup-mapping-de.pdf index 4b463d18a..b4fb3686f 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-de.pdf and b/doc/context/documents/general/qrcs/setup-mapping-de.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-en.pdf b/doc/context/documents/general/qrcs/setup-mapping-en.pdf index d9bddbfc0..c6324683a 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-en.pdf and b/doc/context/documents/general/qrcs/setup-mapping-en.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf index af22546f6..4782d388e 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-fr.pdf and b/doc/context/documents/general/qrcs/setup-mapping-fr.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-it.pdf b/doc/context/documents/general/qrcs/setup-mapping-it.pdf index 8027468ab..25ca636c0 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-it.pdf and b/doc/context/documents/general/qrcs/setup-mapping-it.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf index e87d00337..1b70533ac 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-nl.pdf and b/doc/context/documents/general/qrcs/setup-mapping-nl.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf index 61d893e81..dc4c994be 100644 Binary files a/doc/context/documents/general/qrcs/setup-mapping-ro.pdf and b/doc/context/documents/general/qrcs/setup-mapping-ro.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf index c25f2cbff..39bcb233c 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 5714672c7..69a744975 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/manuals/xtables/xtables-mkiv.tex b/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex index 827ad3fcc..1b878e5cb 100644 --- a/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex +++ b/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex @@ -1250,6 +1250,101 @@ you're lucky. \stopsection +\startsection[title={Swapping}] + +The next two examples demonstrate a feature added for Taco, who wanted to input +vertical instead of horizontal. It's a bit of a hack but it works okay for +simple cases. We assume these settings: + +\startbuffer[settings] +\setupxtable[one] [foregroundcolor=darkred] +\setupxtable[two] [foregroundcolor=darkgreen] +\setupxtable[three][foregroundcolor=darkblue] +\setupxtable[four] [foregroundcolor=darkorange] +\stopbuffer + +\startbuffer[demo-1] +\startxtable[frame=on] + \startxcolumn[one] + \startxcell A1 \stopxcell + \startxcell B1 \stopxcell + \startxcell C1 \stopxcell + \startxcell D1 \stopxcell + \startxcell E1 \stopxcell + \stopxcolumn + \startxcolumn[two] + \startxcell A2 \stopxcell + \startxcell B2 \stopxcell + \startxcell C2 \stopxcell + \startxcell D2 \stopxcell + \startxcell E2 \stopxcell + \stopxcolumn + \startxcolumn[three] + \startxcell A3 \stopxcell + \startxcell B3 \stopxcell + \startxcell C3 \stopxcell + \startxcell D3 \stopxcell + \startxcell E3 \stopxcell + \stopxcolumn + \startxcolumn[four] + \startxcell A4 \stopxcell + \startxcell B4 \stopxcell + \startxcell C4 \stopxcell + \startxcell D4 \stopxcell + \startxcell E4 \stopxcell + \stopxcolumn +\stopxtable +\stopbuffer + +\startbuffer[demo-2] +\startxtable[frame=on] + \startxcolumn[one] + \startxcell A \stopxcell + \startxcell B \stopxcell + \startxcell C \stopxcell + \startxcell D \stopxcell + \startxcell E \stopxcell + \stopxcolumn + \startxcolumn[two] + \startxcell A \stopxcell + \startxcell[ny=2] BC \stopxcell + \startxcell[ny=2] DE \stopxcell + \stopxcolumn + \startxcolumn[three] + \startxcell A \stopxcell + \startxcell[ny=4] BCDE \stopxcell + \stopxcolumn + \startxcolumn[four] + \startxcell A \stopxcell + \startxcell B \stopxcell + \startxcell[ny=2] CD \stopxcell + \startxcell E \stopxcell + \stopxcolumn +\stopxtable +\stopbuffer + +\typebuffer[settings] + +The first example has no spans: + +\typebuffer[demo-1] + +while the second one has: + +\typebuffer[demo-2] + +The results are shown in \in {figure} [fig:swapped]. + +\startplacefigure[title={Entering columns instead of rows.},reference=fig:swapped] + \getbuffer[settings] + \startcombination + {\getbuffer[demo-1]} {no spans} + {\getbuffer[demo-2]} {some spans} + \stopcombination +\stopplacefigure + +\stopsection + \startsection[title={Examples}] On the following pages we show some examples of (experimental) features. For this -- cgit v1.2.3