From 73b98c1460debac19577c07301220a0d7944fbd7 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Thu, 5 Oct 2017 23:05:54 +0200 Subject: 2017-10-05 22:46:00 --- doc/context/documents/general/manuals/ma-cb-en.pdf | Bin 2843652 -> 5865224 bytes doc/context/documents/general/qrcs/setup-cs.pdf | Bin 816236 -> 816258 bytes doc/context/documents/general/qrcs/setup-de.pdf | Bin 816819 -> 816831 bytes doc/context/documents/general/qrcs/setup-en.pdf | Bin 818629 -> 818633 bytes doc/context/documents/general/qrcs/setup-fr.pdf | Bin 811964 -> 811995 bytes doc/context/documents/general/qrcs/setup-it.pdf | Bin 815473 -> 815536 bytes doc/context/documents/general/qrcs/setup-nl.pdf | Bin 810226 -> 810225 bytes doc/context/documents/general/qrcs/setup-ro.pdf | Bin 812623 -> 812602 bytes doc/context/scripts/mkiv/mtx-update.html | 66 ------------- doc/context/scripts/mkiv/mtx-update.man | 81 --------------- doc/context/scripts/mkiv/mtx-update.xml | 33 ------- .../sources/general/manuals/start/en/ma-cb-en.pdf | Bin 2843652 -> 5865224 bytes .../sources/general/manuals/start/en/ma-cb-en.tex | 9 +- .../sources/general/manuals/start/ma-cb-style.tex | 110 +++++++++------------ 14 files changed, 50 insertions(+), 249 deletions(-) delete mode 100644 doc/context/scripts/mkiv/mtx-update.html delete mode 100644 doc/context/scripts/mkiv/mtx-update.man delete mode 100644 doc/context/scripts/mkiv/mtx-update.xml (limited to 'doc') diff --git a/doc/context/documents/general/manuals/ma-cb-en.pdf b/doc/context/documents/general/manuals/ma-cb-en.pdf index 6ad164eb0..497cecfe0 100644 Binary files a/doc/context/documents/general/manuals/ma-cb-en.pdf and b/doc/context/documents/general/manuals/ma-cb-en.pdf differ diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf index 85219d097..2bb2fc18e 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 6aed02b46..da2d4062e 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 802270a96..f48fd5d5b 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 c48324585..46f4f13d1 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 7ab21c1e4..8964e2ad2 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 41f5c5221..c37a71b6d 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 2768bea19..27edf50a4 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/scripts/mkiv/mtx-update.html b/doc/context/scripts/mkiv/mtx-update.html deleted file mode 100644 index 58595f0d8..000000000 --- a/doc/context/scripts/mkiv/mtx-update.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - ConTeXt Minimals Updater 1.02 - - - - - -
-
ConTeXt Minimals Updater 1.02
-
-
-
-
wiki: http://contextgarden.net | mail: ntg-context@ntg.nl | website: http://www.pragma-ade.nl
-
-
-
- -
-
-

Command line options

- - - - - - - - - - - - - - - - - - - - - - -
flagvaluedescription
--platformstringplatform (windows, linux, linux-64, osx-intel, osx-ppc, linux-ppc)
--serverstringrepository url (rsync://contextgarden.net)
--modulestringrepository url (minimals)
--repositorystringspecify version (current, experimental)
--contextstringspecify version (current, latest, beta, yyyy.mm.dd)
--rsyncstringrsync binary (rsync)
--texrootstringinstallation directory (not guessed for the moment)
--enginestringtex engine (luatex, pdftex, xetex)
--modulesstringextra modules (can be list or 'all')
--fontsstringadditional fonts (can be list or 'all')
--goodiesstringextra binaries (like scite and texworks)
--forceinstead of a dryrun, do the real thing
--updateupdate minimal tree
--makealso make formats and generate file databases
--keepdon't delete unused or obsolete files
--stateupdate tree using saved state
--cygwinadapt drive specs to cygwin
--mingwassume mingw binaries being used
--silentless (or no) logging
-
-
-
- - diff --git a/doc/context/scripts/mkiv/mtx-update.man b/doc/context/scripts/mkiv/mtx-update.man deleted file mode 100644 index 5e1313aa6..000000000 --- a/doc/context/scripts/mkiv/mtx-update.man +++ /dev/null @@ -1,81 +0,0 @@ -.TH "mtx-update" "1" "01-01-2017" "version 1.02" "ConTeXt Minimals Updater" -.SH NAME -.B mtx-update -.SH SYNOPSIS -.B mtxrun --script update [ -.I OPTIONS ... -.B ] [ -.I FILENAMES -.B ] -.SH DESCRIPTION -.B ConTeXt Minimals Updater -.SH OPTIONS -.TP -.B --platform=string -platform (windows, linux, linux-64, osx-intel, osx-ppc, linux-ppc) -.TP -.B --server=string -repository url (rsync://contextgarden.net) -.TP -.B --module=string -repository url (minimals) -.TP -.B --repository=string -specify version (current, experimental) -.TP -.B --context=string -specify version (current, latest, beta, yyyy.mm.dd) -.TP -.B --rsync=string -rsync binary (rsync) -.TP -.B --texroot=string -installation directory (not guessed for the moment) -.TP -.B --engine=string -tex engine (luatex, pdftex, xetex) -.TP -.B --modules=string -extra modules (can be list or 'all') -.TP -.B --fonts=string -additional fonts (can be list or 'all') -.TP -.B --goodies=string -extra binaries (like scite and texworks) -.TP -.B --force -instead of a dryrun, do the real thing -.TP -.B --update -update minimal tree -.TP -.B --make -also make formats and generate file databases -.TP -.B --keep -don't delete unused or obsolete files -.TP -.B --state -update tree using saved state -.TP -.B --cygwin -adapt drive specs to cygwin -.TP -.B --mingw -assume mingw binaries being used -.TP -.B --silent -less (or no) logging -.SH AUTHOR -More information about ConTeXt and the tools that come with it can be found at: - - -.B "maillist:" -ntg-context@ntg.nl / http://www.ntg.nl/mailman/listinfo/ntg-context - -.B "webpage:" -http://www.pragma-ade.nl / http://tex.aanhet.net - -.B "wiki:" -http://contextgarden.net diff --git a/doc/context/scripts/mkiv/mtx-update.xml b/doc/context/scripts/mkiv/mtx-update.xml deleted file mode 100644 index 00be476fb..000000000 --- a/doc/context/scripts/mkiv/mtx-update.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - mtx-update - ConTeXt Minimals Updater - 1.02 - - - - - platform (windows, linux, linux-64, osx-intel, osx-ppc, linux-ppc) - repository url (rsync://contextgarden.net) - repository url (minimals) - specify version (current, experimental) - specify version (current, latest, beta, yyyy.mm.dd) - rsync binary (rsync) - installation directory (not guessed for the moment) - tex engine (luatex, pdftex, xetex) - extra modules (can be list or 'all') - additional fonts (can be list or 'all') - extra binaries (like scite and texworks) - instead of a dryrun, do the real thing - update minimal tree - also make formats and generate file databases - don't delete unused or obsolete files - update tree using saved state - adapt drive specs to cygwin - assume mingw binaries being used - less (or no) logging - - - - diff --git a/doc/context/sources/general/manuals/start/en/ma-cb-en.pdf b/doc/context/sources/general/manuals/start/en/ma-cb-en.pdf index 6ad164eb0..497cecfe0 100644 Binary files a/doc/context/sources/general/manuals/start/en/ma-cb-en.pdf and b/doc/context/sources/general/manuals/start/en/ma-cb-en.pdf differ diff --git a/doc/context/sources/general/manuals/start/en/ma-cb-en.tex b/doc/context/sources/general/manuals/start/en/ma-cb-en.tex index 2e0b283af..2e7f7eac4 100644 --- a/doc/context/sources/general/manuals/start/en/ma-cb-en.tex +++ b/doc/context/sources/general/manuals/start/en/ma-cb-en.tex @@ -6,13 +6,10 @@ \project ma-cb -% \disabledirectives[otf.kernruns] -% \disabledirectives[otf.discruns] -% \disabledirectives[otf.compruns] - \startdocument - [title={\ConTeXt\ Mark IV\crlf an excursion}, - subtitle={English\crlf version}, + [title={\ConTeXt\ Mark IV}, + subtitle={an excursion}, + version={English}, author={Ton Otten\crlf PRAGMA ADE}] \startfrontmatter diff --git a/doc/context/sources/general/manuals/start/ma-cb-style.tex b/doc/context/sources/general/manuals/start/ma-cb-style.tex index 294e4a5cc..d4f7d7c5f 100644 --- a/doc/context/sources/general/manuals/start/ma-cb-style.tex +++ b/doc/context/sources/general/manuals/start/ma-cb-style.tex @@ -11,7 +11,9 @@ % Setups are kind of special. -\loadsetups[cont-\currentmainlanguage.xml] +% \loadsetups[cont-\currentmainlanguage.xml] + +\loadsetups[i-context] \setupsetup [\c!criterium=\v!used] @@ -254,59 +256,26 @@ \newbox\CoverBackgroundBox % reuse saves .8 sec, could be an object! +\definebodyfontenvironment[1.9pt] + +\defineframed + [CoverFramed] + [%\c!foregroundstyle=\CoverFont, + \c!background=basic-shape-dark, + \c!backgroundoffset=1pt, + \c!rulethickness=2pt, + \c!frame=\v!off] + \starttexdefinition unexpanded ShowSetupOnCover #n #tag #xmlroot \dontleavehmode - \framed [ - \c!background=basic-shape-light, - \c!backgroundoffset=5pt, - \c!rulethickness=2pt, - \c!frame=\v!off - ] { - \xmlsetup{#xmlroot}{xml:setups:assemblename} - \tttf - \texescape\currentSETUPfullname + \CoverFramed { + \tttf\showsetupnameonly{#1}{#2}{#3} } - \hskip1.25em plus 1em minus 1em\relax + \kern\zeropoint + \hskip1em plus 1em minus .25em\relax \stoptexdefinition -% \startsetups coverbackground -% -% \ifvoid\CoverBackgroundBox -% -% \global\setbox\CoverBackgroundBox=\vbox to \paperheight \bgroup -% \hsize\paperwidth -% \emergencystretch3em -% \parfillskip0pt -% \switchtobodyfont -% [6pt] -% \baselineskip 0pt plus 1pt minus 1pt -% \setupsorting -% [texcommand] -% [\c!command=\ShowSetupOnCover, -% \c!criterium=\v!all] -% \beginofshapebox -% \leftskip3pt -% \rightskip3pt -% \placelistofsorts -% [texcommand] -% \endofshapebox -% \doreshapebox -% {\box\shapebox} -% {\penalty\shapepenalty} -% {\kern\shapekern} -% {\vfil} -% \kern3pt -% \vfilneg -% \flushshapebox -% \vfilneg -% \kern3pt -% \egroup -% -% \fi -% -% \copy\CoverBackgroundBox -% -% \stopsetups +\definecolor[CoverTransparency][a=1,t=.5] \startsetups coverbackground @@ -316,14 +285,18 @@ \startnicelyfilledbox [\c!width=\paperwidth, \c!height=\paperheight, - \c!offset=\exheight, +% \c!offset=\exheight, +% \c!offset=\emwidth, + \c!offset=\zeropoint, \c!strut=\v!no] \switchtobodyfont - [6pt] + [1.9pt] + \starttransparent[CoverTransparency] \placelistofsorts [texcommand] [\c!command=\ShowSetupOnCover, - \c!criterium=\v!all] + \c!criterium=\v!all]% used + \stoptransparent \stopnicelyfilledbox \fi @@ -362,14 +335,16 @@ \hbox to \hsize \bgroup \hss - \definedfont[SansBold*default at 40pt] + %\definedfont[SansBold*default at 40pt] + \definedfont[Bold*default at 40pt] \framed [\c!background=basic-shape-dark, \c!frame=\v!off, - \c!rulethickness=15pt, + \c!rulethickness=30pt, \c!align=\v!middle, \c!offset=40pt] - {\documentvariable{title}} + {\dontleavehmode\hbox{\documentvariable{title}}\par + \dontleavehmode\hbox{\documentvariable{subtitle}}} \egroup \vfill @@ -377,14 +352,15 @@ \doifsomething {\documentvariable{subtitle}} { \hbox to \hsize \bgroup - \definedfont[SansBold*default at 14pt] + %\definedfont[SansBold*default at 20pt] + \definedfont[Bold*default at 20pt] \framed [\c!background=basic-shape-dark, \c!frame=\v!off, - \c!rulethickness=10pt, + \c!rulethickness=15pt, \c!align=\v!middle, \c!offset=20pt] - {\documentvariable{subtitle}} + {\documentvariable{version}} \hss \egroup @@ -392,11 +368,12 @@ \hbox to \hsize \bgroup \hss - \definedfont[SansBold*default at 20pt] + %\definedfont[SansBold*default at 24pt] + \definedfont[Bold*default at 24pt] \framed [\c!background=basic-shape-dark, \c!frame=\v!off, - \c!rulethickness=12.5pt, + \c!rulethickness=18pt, \c!align=\v!middle, \c!offset=35pt] {\documentvariable{author}} @@ -547,9 +524,16 @@ \switchtobodyfont[8pt] - \startmixedcolumns[documentcolumns] + % somehow \blank doesn't work here + + \setupframedtexts + [setuptext] + [\c!before={\vskip6pt}, + \c!after={\vskip6pt}] + + % \startmixedcolumns[documentcolumns] \placelistofsorts[texcommand] - \stopmixedcolumns + % \stopmixedcolumns \stop @@ -671,7 +655,7 @@ \setupregister [Command] [\c!indicator=\v!off, - c!before={\blank[\v!line]}] + \c!before={\blank[\v!line]}] \protect -- cgit v1.2.3