diff options
Diffstat (limited to 'doc')
14 files changed, 50 insertions, 249 deletions
diff --git a/doc/context/documents/general/manuals/ma-cb-en.pdf b/doc/context/documents/general/manuals/ma-cb-en.pdf Binary files differindex 6ad164eb0..497cecfe0 100644 --- a/doc/context/documents/general/manuals/ma-cb-en.pdf +++ b/doc/context/documents/general/manuals/ma-cb-en.pdf diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf Binary files differindex 85219d097..2bb2fc18e 100644 --- a/doc/context/documents/general/qrcs/setup-cs.pdf +++ b/doc/context/documents/general/qrcs/setup-cs.pdf diff --git a/doc/context/documents/general/qrcs/setup-de.pdf b/doc/context/documents/general/qrcs/setup-de.pdf Binary files differindex 6aed02b46..da2d4062e 100644 --- a/doc/context/documents/general/qrcs/setup-de.pdf +++ b/doc/context/documents/general/qrcs/setup-de.pdf diff --git a/doc/context/documents/general/qrcs/setup-en.pdf b/doc/context/documents/general/qrcs/setup-en.pdf Binary files differindex 802270a96..f48fd5d5b 100644 --- a/doc/context/documents/general/qrcs/setup-en.pdf +++ b/doc/context/documents/general/qrcs/setup-en.pdf diff --git a/doc/context/documents/general/qrcs/setup-fr.pdf b/doc/context/documents/general/qrcs/setup-fr.pdf Binary files differindex c48324585..46f4f13d1 100644 --- a/doc/context/documents/general/qrcs/setup-fr.pdf +++ b/doc/context/documents/general/qrcs/setup-fr.pdf diff --git a/doc/context/documents/general/qrcs/setup-it.pdf b/doc/context/documents/general/qrcs/setup-it.pdf Binary files differindex 7ab21c1e4..8964e2ad2 100644 --- a/doc/context/documents/general/qrcs/setup-it.pdf +++ b/doc/context/documents/general/qrcs/setup-it.pdf diff --git a/doc/context/documents/general/qrcs/setup-nl.pdf b/doc/context/documents/general/qrcs/setup-nl.pdf Binary files differindex 41f5c5221..c37a71b6d 100644 --- a/doc/context/documents/general/qrcs/setup-nl.pdf +++ b/doc/context/documents/general/qrcs/setup-nl.pdf diff --git a/doc/context/documents/general/qrcs/setup-ro.pdf b/doc/context/documents/general/qrcs/setup-ro.pdf Binary files differindex 2768bea19..27edf50a4 100644 --- a/doc/context/documents/general/qrcs/setup-ro.pdf +++ b/doc/context/documents/general/qrcs/setup-ro.pdf 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 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<!-- compare with lmx framework variant --> - -<!-- - filename : context-base.xml - comment : companion to mtx-server-ctx-startup.tex - author : Hans Hagen, PRAGMA-ADE, Hasselt NL - copyright: PRAGMA ADE / ConTeXt Development Team - license : see context related readme files ---> - -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> - <head> - <title>ConTeXt Minimals Updater 1.02</title> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <style type="text/css"> - body { color: #FFFFFF; background-color: #808080; font-family: optima, verdana, futura, "lucida sans", arial, geneva, helvetica, sans; font-size: 12px; line-height: 18px; } a:link, a:active, a:visited { color: #FFFFFF; } a.dir-view:link, a.dir-view:active, a.dir-view:visited { color: #FFFFFF; text-decoration: underline; } .valid { color: #00FF00; } .invalid { color: #FF0000; } .invisible { visibility: hidden; } button, .commonlink, .smallbutton { font-weight: bold; font-size: 12px; text-decoration: none; color: #000000; border-color: #7F7F7F; border-style: solid; border-width: .125ex; background-color: #FFFFFF; padding: .5ex; } .smallbutton { width: 1em; } a.commonlink:link, a.commonlink:active, a.commonlink:visited, a.smalllink:link, a.smalllink:active, a.smalllink:visited { font-weight: bold; font-size: 12px; text-decoration: none; color: #000000; } h1, .title { font-style: normal; font-weight: normal; font-size: 18px; line-height: 18px; margin-bottom: 20px; } h2, .subtitle { font-style: normal; font-weight: normal; font-size: 12px; margin-top: 18px; margin-bottom: 18px; } table { line-height: 18px; font-size: 12px; margin: 0; } th { font-weight: bold; text-align: left; padding-bottom: 6px; } .tc { font-weight: bold; text-align: left; } p, li { max-width: 60em; } .empty-line { margin-top: 4px; } .more-room { margin-right: 1.5em; } .much-more-room { margin-right: 3em; } #main { position: absolute; left: 10%; top: 10%; right: 10%; bottom: 10%; z-index: 2; width: 80%; height: 80%; padding: 0%; margin: 0%; overflow: auto; border-style: none; border-width: 0; background-color: #3F3F3F; } #main-settings { margin: 12px; x_max-width: 60em; line-height: 18px; font-size: 12px; } #left { position: absolute; top : 10%; left: 0%; bottom: 0%; right: 90%; z-index: 1; width: 10%; height: 90%; padding: 0%; margin: 0%; font-size: 16px; border-style: none; border-width: 0; background-color: #4F6F6F; } #right { position: absolute; top : 0%; left: 90%; bottom: 10%; right: 0%; z-index: 1; width: 10%; height: 90%; padding: 0%; margin: 0%; font-size: 16px; border-style: none; border-width: 0; background-color: #4F6F6F; _margin-left: -15px; } #bottom { position: absolute; left: 10%; right: 0%; top: 90%; bottom: 0%; z-index: 1; width: 90%; height: 10%; padding: 0%; margin: 0%; font-size: 16px; border-style: none; border-width: 0; background-color: #6F6F8F; } #top { position: absolute; left: 0%; right: 10%; top: 0%; bottom: 90%; z-index: 1; width: 90%; height: 10%; padding: 0%; margin: 0%; font-size: 16px; border-style: none; border-width: 0; background-color: #6F6F8F; } #top-one { position: absolute; bottom: 50%; width: 100%; buggedheight: 100%; } #top-two { position: relative; margin-bottom: -9px; margin-left: 12px; margin-right: 12px; line-height: 18px; text-align: right; vertical-align: middle; } #bottom-one { position: absolute; bottom: 50%; width: 100%; buggedheight: 100%; } #bottom-two { position: relative; margin-bottom: -9px; margin-left: 12px; margin-right: 12px; line-height: 18px; text-align: left; vertical-align: middle; } #left-one { position: absolute; width: 100%; buggedheight: 100%; } #left-two { position: relative; margin-top: 12px; line-height: 18px; text-align: center; vertical-align: top; } #right-one { display: table; height: 100%; width: 100%; } #right-two { display: table-row; height: 100%; width: 100%; } #right-three { display: table-cell; width: 100%; vertical-align: bottom; _position: absolute; _top: 100%; } #right-four { text-align: center; margin-bottom: 2ex; _position: relative; _top: -100%; } #more-top { position: absolute; top: 0%; left: 90%; bottom: 90%; right: 0%; z-index: 3; width: 10%; height: 10%; padding: 0%; margin: 0%; border-style: none; border-width: 0; } #more-top-settings { text-align: center; } #more-right-settings { margin-right: 12px; margin-left: 12px; line-height: 18px; font-size: 10px; text-align: center; } #right-safari { _display: table; width: 100%; height: 100%; } - </style> - <style type="text/css"> - </style> - </head> - <body> - <div id="top"> <div id="top-one"> - <div id="top-two">ConTeXt Minimals Updater 1.02 </div> - </div> - </div> - <div id="bottom"> <div id="bottom-one"> - <div id="bottom-two">wiki: http://contextgarden.net | mail: ntg-context@ntg.nl | website: http://www.pragma-ade.nl</div> - </div> - </div> - <div id="left"></div> - <div id="right"></div> - <div id="main"> - <div id='main-settings'> - <h1>Command line options</h1> -<table> - <tr><th style="width: 10em">flag</th><th style="width: 8em">value</th><th>description</th></tr> - <tr><th/><td/><td/></tr> - <tr><th>--platform</th><td>string</td><td>platform (windows, linux, linux-64, osx-intel, osx-ppc, linux-ppc)</td></tr> - <tr><th>--server</th><td>string</td><td>repository url (rsync://contextgarden.net)</td></tr> - <tr><th>--module</th><td>string</td><td>repository url (minimals)</td></tr> - <tr><th>--repository</th><td>string</td><td>specify version (current, experimental)</td></tr> - <tr><th>--context</th><td>string</td><td>specify version (current, latest, beta, yyyy.mm.dd)</td></tr> - <tr><th>--rsync</th><td>string</td><td>rsync binary (rsync)</td></tr> - <tr><th>--texroot</th><td>string</td><td>installation directory (not guessed for the moment)</td></tr> - <tr><th>--engine</th><td>string</td><td>tex engine (luatex, pdftex, xetex)</td></tr> - <tr><th>--modules</th><td>string</td><td>extra modules (can be list or 'all')</td></tr> - <tr><th>--fonts</th><td>string</td><td>additional fonts (can be list or 'all')</td></tr> - <tr><th>--goodies</th><td>string</td><td>extra binaries (like scite and texworks)</td></tr> - <tr><th>--force</th><td></td><td>instead of a dryrun, do the real thing</td></tr> - <tr><th>--update</th><td></td><td>update minimal tree</td></tr> - <tr><th>--make</th><td></td><td>also make formats and generate file databases</td></tr> - <tr><th>--keep</th><td></td><td>don't delete unused or obsolete files</td></tr> - <tr><th>--state</th><td></td><td>update tree using saved state</td></tr> - <tr><th>--cygwin</th><td></td><td>adapt drive specs to cygwin</td></tr> - <tr><th>--mingw</th><td></td><td>assume mingw binaries being used</td></tr> - <tr><th>--silent</th><td></td><td>less (or no) logging</td></tr> - </table> -<br/> - </div> - </div> - </body> -</html> 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 @@ -<?xml version="1.0"?> -<application> - <metadata> - <entry name="name">mtx-update</entry> - <entry name="detail">ConTeXt Minimals Updater</entry> - <entry name="version">1.02</entry> - </metadata> - <flags> - <category name="basic"> - <subcategory> - <flag name="platform" value="string"><short>platform (windows, linux, linux-64, osx-intel, osx-ppc, linux-ppc)</short></flag> - <flag name="server" value="string"><short>repository url (rsync://contextgarden.net)</short></flag> - <flag name="module" value="string"><short>repository url (minimals)</short></flag> - <flag name="repository" value="string"><short>specify version (current, experimental)</short></flag> - <flag name="context" value="string"><short>specify version (current, latest, beta, yyyy.mm.dd)</short></flag> - <flag name="rsync" value="string"><short>rsync binary (rsync)</short></flag> - <flag name="texroot" value="string"><short>installation directory (not guessed for the moment)</short></flag> - <flag name="engine" value="string"><short>tex engine (luatex, pdftex, xetex)</short></flag> - <flag name="modules" value="string"><short>extra modules (can be list or 'all')</short></flag> - <flag name="fonts" value="string"><short>additional fonts (can be list or 'all')</short></flag> - <flag name="goodies" value="string"><short>extra binaries (like scite and texworks)</short></flag> - <flag name="force"><short>instead of a dryrun, do the real thing</short></flag> - <flag name="update"><short>update minimal tree</short></flag> - <flag name="make"><short>also make formats and generate file databases</short></flag> - <flag name="keep"><short>don't delete unused or obsolete files</short></flag> - <flag name="state"><short>update tree using saved state</short></flag> - <flag name="cygwin"><short>adapt drive specs to cygwin</short></flag> - <flag name="mingw"><short>assume mingw binaries being used</short></flag> - <flag name="silent"><short>less (or no) logging</short></flag> - </subcategory> - </category> - </flags> -</application> 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 Binary files differindex 6ad164eb0..497cecfe0 100644 --- a/doc/context/sources/general/manuals/start/en/ma-cb-en.pdf +++ b/doc/context/sources/general/manuals/start/en/ma-cb-en.pdf 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 |