diff options
| author | Hans Hagen <pragma@wxs.nl> | 2016-10-22 11:36:54 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-10-22 11:36:54 +0200 |
| commit | f46e5a9b112dd6c1601fd1734b03064b4336a262 (patch) | |
| tree | 86f8e1af5aa2de98958161081f00286cb387431e | |
| parent | 9e2c13b12ff90635be145c6c02e21d6e9583037f (diff) | |
| download | context-f46e5a9b112dd6c1601fd1734b03064b4336a262.tar.gz | |
2016-10-22 10:50:00
28 files changed, 202 insertions, 3049 deletions
diff --git a/doc/context/documents/general/qrcs/setup-cs.pdf b/doc/context/documents/general/qrcs/setup-cs.pdf Binary files differindex dffc68c8f..bbdb1f322 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 42a91d31c..e48cdd391 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 5751e4a9a..2951ea756 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 34558794e..72413bf26 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 ee2fb4979..4cc5316b6 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 1446c005c..4b1b82091 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 0480ba296..d8104ffd9 100644 --- a/doc/context/documents/general/qrcs/setup-ro.pdf +++ b/doc/context/documents/general/qrcs/setup-ro.pdf 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 @@ -<?xml version="1.0"?> - -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.17"> - -<!-- -Todo: - - -- bycd:section (\setuppagenumbering) - -- cd:sectionnumber (\setuppagenumbering) ---> - -<cd:command name="textbackground" type="environment"> - <cd:sequence> - <cd:string value="textbackground"/> - </cd:sequence> -</cd:command> - -<cd:command name="textbackground"> - <cd:sequence> - <cd:string value="textbackground"/> - </cd:sequence> -</cd:command> - -<cd:command name="setuptextbackground" file="core-pgr.tex"> - <cd:sequence> - <cd:string value="setuptextbackground"/> - </cd:sequence> - <cd:arguments> - <cd:assignments list="yes"> - <cd:parameter name="leftoffset" default="0pt"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="rightoffset" default="0pt"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="topoffset" default="0pt"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="bottomoffset" default="0pt"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="before"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="after"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="state"> - <cd:constant type="start" default="yes"/> - <cd:constant type="stop"/> - </cd:parameter> - <cd:parameter name="location"> - <cd:constant type="text" default="yes"/> - <cd:constant type="paragraph"/> - <cd:constant type="none"/> - </cd:parameter> - <cd:parameter name="alternative"> - <cd:constant type="0" default="yes"/> - <cd:constant type="1"/> - <cd:constant type="2"/> - </cd:parameter> - <cd:inherit name="setupframed"/> - </cd:assignments> - </cd:arguments> -</cd:command> - -<cd:command name="defineinteractionmenu" variant="1" file="core-int.tex"> - <cd:sequence> - <cd:string value="defineinteractionmenu"/> - </cd:sequence> - <cd:arguments> - <cd:keywords interactive="exclusive"> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:keywords interactive="exclusive" list="yes"> - <cd:constant type="left"/> - <cd:constant type="right"/> - <cd:constant type="top"/> - <cd:constant type="bottom"/> - <cd:constant type="cd:name"/> - </cd:keywords> - <cd:assignments optional="yes" list="yes"> - <cd:parameter name="before"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="after"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="inbetween"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="left"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="right"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="middle"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="state"> - <cd:constant type="start"/> - <cd:constant type="stop"/> - <cd:constant type="none"/> - <cd:constant type="local"/> - </cd:parameter> - <cd:parameter name="style"> - <cd:resolve name="style"/> - </cd:parameter> - <cd:parameter name="color"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="distance"> - <cd:constant type="overlay"/> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="samepage"> - <cd:constant type="yes"/> - <cd:constant type="empty"/> - <cd:constant type="no"/> - <cd:constant type="none"/> - </cd:parameter> - <cd:parameter name="unknownreference"> - <cd:constant type="yes"/> - <cd:constant type="empty"/> - <cd:constant type="no"/> - <cd:constant type="none"/> - </cd:parameter> - <cd:parameter name="leftoffset"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="rightoffset"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="topoffset"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="bottomoffset"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="position"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:inherit name="setupframed"/> - </cd:assignments> - </cd:arguments> -</cd:command> - -<cd:command name="setupframed" file="core-rul.tex"> - <!-- new: rulethickness --> - <cd:sequence> - <cd:string value="setupframed"/> - </cd:sequence> - <cd:arguments> - <cd:assignments list="yes"> - <cd:parameter name="height"> - <cd:constant type="fit"/> - <cd:constant type="broad"/> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="width"> - <cd:constant type="fit"/> - <cd:constant type="broad"/> - <cd:constant type="fixed"/> - <cd:constant type="local"/> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="autowidth"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - <cd:constant type="force"/> - </cd:parameter> - <cd:parameter name="offset"> - <cd:constant type="none"/> - <cd:constant type="overlay"/> - <cd:constant type="default"/> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="location"> - <cd:constant type="depth"/> - <cd:constant type="hanging"/> - <cd:constant type="high"/> - <cd:constant type="lohi"/> - <cd:constant type="low"/> - <cd:constant type="top"/> - <cd:constant type="middle"/> - <cd:constant type="bottom"/> - <cd:constant type="keep"/> - </cd:parameter> - <cd:parameter name="option"> - <cd:constant type="none"/> - <cd:constant type="empty"/> - </cd:parameter> - <cd:parameter name="strut"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - <cd:constant type="global"/> - <cd:constant type="local"/> - </cd:parameter> - <cd:parameter name="align"> - <cd:resolve name="align"/> - </cd:parameter> - <cd:parameter name="bottom"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="top"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="frame"> - <cd:constant type="on"/> - <cd:constant type="off"/> - <cd:constant type="none"/> - <cd:constant type="overlay"/> - </cd:parameter> - <cd:parameter name="topframe"> - <cd:constant type="on"/> - <cd:constant type="off"/> - </cd:parameter> - <cd:parameter name="bottomframe"> - <cd:constant type="on"/> - <cd:constant type="off"/> - </cd:parameter> - <cd:parameter name="leftframe"> - <cd:constant type="on"/> - <cd:constant type="off"/> - </cd:parameter> - <cd:parameter name="rightframe"> - <cd:constant type="on"/> - <cd:constant type="off"/> - </cd:parameter> - <cd:parameter name="frameoffset"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="framedepth"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="framecorner"> - <cd:constant type="round"/> - <cd:constant type="rectangular"/> - </cd:parameter> - <cd:parameter name="frameradius"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="framecolor"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="rulethickness"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="background"> - <cd:constant type="screen"/> - <cd:constant type="color"/> - <cd:constant type="none"/> - <cd:constant type="foreground"/> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="backgroundscreen"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="backgroundcolor"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="backgroundoffset"> - <cd:constant type="frame"/> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="backgrounddepth"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="backgroundcorner"> - <cd:constant type="round"/> - <cd:constant type="rectangular"/> - </cd:parameter> - <cd:parameter name="backgroundradius"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="depth"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="corner"> - <cd:constant type="round"/> - <cd:constant type="rectangular"/> - </cd:parameter> - <cd:parameter name="radius"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="empty"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="foregroundcolor"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="foregroundstyle"> - <cd:resolve name="style"/> - </cd:parameter> - </cd:assignments> - </cd:arguments> -</cd:command> - -<cd:command name="namemakeup" type="environment" generated="yes"> - <cd:sequence> - <cd:variable value="name"/> - <cd:string value="makeup"/> - </cd:sequence> - <cd:arguments> - <cd:assignments optional="yes" list="yes"> - <cd:inherit name="startmakeup"/> - </cd:assignments> - </cd:arguments> -</cd:command> - -<cd:command name="hiding" type="environment"> - <cd:sequence> - <cd:string value="hiding"/> - </cd:sequence> - <cd:arguments> - </cd:arguments> -</cd:command> - -<cd:command name="setupthinrules" file="core-rul.tex"> - <cd:sequence> - <cd:string value="setupthinrules"/> - </cd:sequence> - <cd:arguments> - <cd:assignments> - <cd:parameter name="interlinespace"> - <cd:constant type="small"/> - <cd:constant type="medium"/> - <cd:constant type="big"/> - </cd:parameter> - <cd:parameter name="n"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="before"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="inbetween"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="after"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="color"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="backgroundcolor"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="height"> - <cd:constant type="cd:dimension"/> - <cd:constant type="max"/> - </cd:parameter> - <cd:parameter name="depth"> - <cd:constant type="cd:dimension"/> - <cd:constant type="max"/> - </cd:parameter> - <cd:parameter name="alternative"> - <cd:constant type="a"/> - <!--<cd:constant type="b"/>--> - <cd:constant type="c"/> - <!--<cd:constant type="d"/>--> - </cd:parameter> - <cd:parameter name="rulethickness"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="color"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="background"> - <cd:constant type="color"/> - <cd:constant type="none"/> - </cd:parameter> - <cd:parameter name="backgroundcolor"> - <cd:constant type="cd:name"/> - </cd:parameter> - </cd:assignments> - </cd:arguments> -</cd:command> - -<cd:command name="setupitemize" file="core-itm.tex"> - <cd:sequence> - <cd:string value="setupitemize"/> - </cd:sequence> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:number"/> - <cd:constant type="each"/> - </cd:keywords> - <cd:keywords optional="yes" list="yes"> - <cd:constant type="standard" default="yes"/> - <cd:constant type="broad"/> - <cd:constant type="serried"/> - <cd:constant type="packed"/> - <cd:constant type="unpacked"/> - <cd:constant type="stopper"/> - <cd:constant type="joinedup"/> - <cd:constant type="atmargin"/> - <cd:constant type="inmargin"/> - <cd:constant type="autointro"/> - <cd:constant type="loose"/> - <cd:constant type="repeat"/> - <cd:constant type="cd:section"/> - <cd:constant type="paragraph"/> - <cd:constant type="intext"/> - <cd:constant type="random"/> - </cd:keywords> - <cd:assignments optional="yes" list="yes"> - <cd:parameter name="margin"> - <cd:constant type="no"/> - <cd:constant type="standard"/> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="leftmargin"> - <cd:constant type="no"/> - <cd:constant type="standard"/> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="rightmargin"> - <cd:constant type="no"/> - <cd:constant type="standard"/> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="width"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="distance"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="factor"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="items"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="start"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="before"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="inbetween"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="after"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="left"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:parameter name="right"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:parameter name="beforehead"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="afterhead"> - <cd:constant type="cd:command"/> - </cd:parameter> - <cd:parameter name="headstyle"> - <cd:resolve name="style"/> - </cd:parameter> - <cd:parameter name="marstyle"> - <cd:resolve name="style"/> - </cd:parameter> - <cd:parameter name="symstyle"> - <cd:resolve name="style"/> - </cd:parameter> - <cd:parameter name="stopper"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:parameter name="n"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="symbol"> - <cd:constant type="cd:number"/> - </cd:parameter> - <cd:parameter name="align"> - <cd:resolve name="align"/> - </cd:parameter> - <cd:parameter name="indentnext"> - <cd:resolve name="indentnext"/> - </cd:parameter> - </cd:assignments> - </cd:arguments> -</cd:command> - -<cd:command name="itemize" type="environment" generated="yes"> - <cd:sequence> - <cd:variable value="itemize"/> - </cd:sequence> - <cd:arguments> - <cd:keywords optional="yes" list="yes"> - <cd:constant type="a"/> - <cd:constant type="A"/> - <cd:constant type="KA"/> - <cd:constant type="n"/> - <cd:constant type="N"/> - <cd:constant type="m"/> - <cd:constant type="r"/> - <cd:constant type="R"/> - <cd:constant type="KR"/> - <cd:constant type="cd:number"/> - <cd:constant type="continue"/> - <cd:constant type="standard" default="yes"/> - <cd:constant type="broad"/> - <cd:constant type="serried"/> - <cd:constant type="packed"/> - <cd:constant type="stopper"/> - <cd:constant type="joinedup"/> - <cd:constant type="atmargin"/> - <cd:constant type="inmargin"/> - <cd:constant type="intro"/> - <cd:constant type="columns"/> - <cd:constant type="text"/> - <cd:constant type="paragraph"/> - <cd:constant type="repeat"/> - </cd:keywords> - <cd:assignments optional="yes" list="yes"> - <cd:inherit name="setupitemize"/> - </cd:assignments> - </cd:arguments> -</cd:command> - -<cd:command name="framedtext" type="environment" generated="yes"> - <cd:sequence> - <cd:variable value="framedtext"/> - </cd:sequence> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="left"/> - <cd:constant type="right"/> - <cd:constant type="middle"/> - <cd:constant type="none"/> - </cd:keywords> - <cd:assignments optional="yes" list="yes"> - <cd:inherit name="setupframedtexts"/> - </cd:assignments> - <!-- new --> - <cd:content/> - <cd:content/> - </cd:arguments> -</cd:command> - -<cd:command name="tabulate" type="environment" generated="yes"> - <cd:sequence> - <cd:variable value="tabulate"/> - </cd:sequence> - <cd:arguments> - <cd:keywords optional="yes"> - <cd:constant type="cd:text"/> - </cd:keywords> - <!-- change! --> - <cd:keywords> - <cd:constant type="cd:text"/> - </cd:keywords> - </cd:arguments> -</cd:command> - -<cd:command name="setupcolors" file="colo-ini.tex"> - <cd:sequence> - <cd:string value="setupcolors"/> - </cd:sequence> - <cd:arguments> - <cd:assignments list="yes"> - <cd:parameter name="state"> - <cd:constant type="start"/> - <!-- change! --> - <cd:constant type="stop" default="yes"/> - <cd:constant type="global"/> - <cd:constant type="local"/> - </cd:parameter> - <cd:parameter name="conversion"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - <cd:constant type="always"/> - </cd:parameter> - <cd:parameter name="reduction"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="rgb"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="cmyk"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="mpcmyk"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="mpspot"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="textcolor"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="split"> - <cd:constant type="c"/> - <cd:constant type="m"/> - <cd:constant type="y"/> - <cd:constant type="k"/> - <cd:constant type="p"/> - <cd:constant type="s"/> - <cd:constant type="no"/> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="criterium"> - <cd:constant type="all"/> - <cd:constant type="none"/> - </cd:parameter> - </cd:assignments> - </cd:arguments> -</cd:command> - -<cd:command name="setupinteraction" file="core-nav.tex"> - <cd:sequence> - <cd:string value="setupinteraction"/> - </cd:sequence> - <cd:arguments> - <cd:assignments interactive="exclusive" list="yes"> - <cd:parameter name="state"> - <cd:constant type="start"/> - <!-- change! --> - <cd:constant type="stop" default="yes"/> - </cd:parameter> - <cd:parameter name="menu"> - <cd:constant type="on"/> - <cd:constant type="off"/> - </cd:parameter> - <cd:parameter name="page"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="click"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="split"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="display"> - <cd:constant type="new"/> - </cd:parameter> - <cd:parameter name="openaction"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:parameter name="closeaction"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:parameter name="openpageaction"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:parameter name="closepageaction"> - <cd:constant type="cd:reference"/> - </cd:parameter> - <cd:parameter name="calculate"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="strut"> - <cd:constant type="yes"/> - <cd:constant type="no"/> - </cd:parameter> - <cd:parameter name="width"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="height"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="depth"> - <cd:constant type="cd:dimension"/> - </cd:parameter> - <cd:parameter name="style"> - <cd:resolve name="style"/> - </cd:parameter> - <cd:parameter name="color"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="contrastcolor"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="symbolset"> - <cd:constant type="cd:name"/> - </cd:parameter> - <cd:parameter name="title"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:parameter name="subtitle"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:parameter name="author"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:parameter name="date"> - <cd:constant type="cd:text"/> - </cd:parameter> - <cd:parameter name="keyword"> - <cd:constant type="cd:text"/> - </cd:parameter> - <!-- maybe this will move elsewhere --> - <cd:parameter name="fieldlayer"> - <cd:constant type="auto"/> - <cd:constant type="cd:name"/> - </cd:parameter> - </cd:assignments> - </cd:arguments> -</cd:command> - -<cd:define name="regime"> - <cd:constant type="Latin1"/> - <cd:constant type="Latin2"/> - <cd:constant type="Latin7"/> - <cd:constant type="Latin15"/> - <cd:constant type="iso-8859-1"/> - <cd:constant type="iso-8859-2"/> - <cd:constant type="iso-8859-7"/> - <cd:constant type="iso-8859-15"/> - <cd:constant type="cp1250"/> - <cd:constant type="cp1251"/> - <cd:constant type="cp1252"/> - <cd:constant type="cp1253"/> - <cd:constant type="cp1254"/> - <cd:constant type="cp1257"/> - <cd:constant type="viscii"/> - <cd:constant type="cyr"/> - <cd:constant type="grk"/> - <cd:constant type="mac"/> - <cd:constant type="utf8"/> - <cd:constant type="unicode"/> -</cd:define> - -<cd:command name="enableregime" file="regi-ini.tex"> - <cd:sequence> - <cd:string value="enableregime"/> - </cd:sequence> - <cd:arguments> - <cd:keywords> - <cd:resolve name="regime"/> - </cd:keywords> - </cd:arguments> -</cd:command> - -</cd:interface> - 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/metapost/context/base/mpiv/mp-step.mpiv b/metapost/context/base/mpiv/mp-step.mpiv index 496eb0b20..cc5194af7 100644 --- a/metapost/context/base/mpiv/mp-step.mpiv +++ b/metapost/context/base/mpiv/mp-step.mpiv @@ -14,9 +14,9 @@ % maybe todo: step prefixes .. no save needed % not todo : make it unreadable by lots of suffix compaction -if known context_cell : endinput ; fi ; +if known context_step : endinput ; fi ; -boolean context_cell ; context_cell := true ; +boolean context_step ; context_step := true ; def initialize_step_variables = save @@ -28,12 +28,12 @@ def initialize_step_variables = string chart_category ; chart_category := "" ; - color text_line_color ; text_line_color := red ; - color cell_line_color ; cell_line_color := blue ; - color line_line_color ; line_line_color := green ; + string text_line_color ; text_line_color := "red" ; + string cell_line_color ; cell_line_color := "blue" ; + string line_line_color ; line_line_color := "green" ; - color text_fill_color ; text_fill_color := white ; - color cell_fill_color ; cell_fill_color := white ; + string text_fill_color ; text_fill_color := "white" ; + string cell_fill_color ; cell_fill_color := "white" ; numeric text_line_width ; text_line_width := 2pt ; numeric cell_line_width ; cell_line_width := 2pt ; @@ -155,17 +155,17 @@ def step_begin_chart = save start_t, start_m, start_b ; numeric start_t[], start_m[], start_b[] ; save cells_a ; picture cells_a[][] ; - save cell_top_colors ; color cell_top_colors[] ; - save cell_bot_colors ; color cell_bot_colors[] ; - save text_top_colors ; color text_top_colors[] ; - save text_mid_colors ; color text_mid_colors[] ; - save text_bot_colors ; color text_bot_colors[] ; + save cell_top_colors ; string cell_top_colors[] ; + save cell_bot_colors ; string cell_bot_colors[] ; + save text_top_colors ; string text_top_colors[] ; + save text_mid_colors ; string text_mid_colors[] ; + save text_bot_colors ; string text_bot_colors[] ; - save cell_top_fills ; color cell_top_fills[] ; - save cell_bot_fills ; color cell_bot_fills[] ; - save text_top_fills ; color text_top_fills[] ; - save text_mid_fills ; color text_mid_fills[] ; - save text_bot_fills ; color text_bot_fills[] ; + save cell_top_fills ; string cell_top_fills[] ; + save cell_bot_fills ; string cell_bot_fills[] ; + save text_top_fills ; string text_top_fills[] ; + save text_mid_fills ; string text_mid_fills[] ; + save text_bot_fills ; string text_bot_fills[] ; save cell_top_lines ; numeric cell_top_lines[] ; save cell_bot_lines ; numeric cell_bot_lines[] ; @@ -183,9 +183,9 @@ def step_begin_chart = save line_mid_lines ; numeric line_mid_lines[] ; save line_bot_lines ; numeric line_bot_lines[] ; - save line_top_colors ; color line_top_colors[] ; - save line_mid_colors ; color line_mid_colors[] ; - save line_bot_colors ; color line_bot_colors[] ; + save line_top_colors ; string line_top_colors[] ; + save line_mid_colors ; string line_mid_colors[] ; + save line_bot_colors ; string line_bot_colors[] ; save line_top_shapes ; numeric line_top_shapes[] ; save line_mid_shapes ; numeric line_mid_shapes[] ; diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 83368da12..0a50da857 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{2016.10.19 22:51} +\newcontextversion{2016.10.22 10:43} %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 d7a057bd1..f275566cc 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{2016.10.19 22:51} +\edef\contextversion{2016.10.22 10:43} %D For those who want to use this: diff --git a/tex/context/base/mkiv/buff-ver.mkiv b/tex/context/base/mkiv/buff-ver.mkiv index 5b3ed6f2a..8f222b1ff 100644 --- a/tex/context/base/mkiv/buff-ver.mkiv +++ b/tex/context/base/mkiv/buff-ver.mkiv @@ -751,6 +751,10 @@ \definetyping[\v!typing] +% the \zeropoint forces the number to the margin but also works ok in text + +\setuplinenumbering[\v!typing][\c!location=\v!left,\c!width=\zeropoint] + \setuptyping [\v!file] [\s!parent=\??typing \v!typing] % we don't want \start..\stop overload \setuplinenumbering[\v!file] [\s!parent=\??linenumbering\v!typing] diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 60d157f8a..980b1502b 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{2016.10.19 22:51} +\newcontextversion{2016.10.22 10:43} %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 f134fac64..1dee0f025 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{2016.10.19 22:51} +\edef\contextversion{2016.10.22 10:43} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/font-dsp.lua b/tex/context/base/mkiv/font-dsp.lua index cd2816893..14e3a1d62 100644 --- a/tex/context/base/mkiv/font-dsp.lua +++ b/tex/context/base/mkiv/font-dsp.lua @@ -70,6 +70,7 @@ local readers = fonts.handlers.otf.readers local streamreader = readers.streamreader local setposition = streamreader.setposition +local getposition = streamreader.getposition local skipshort = streamreader.skipshort local readushort = streamreader.readcardinal2 -- 16-bit unsigned integer local readulong = streamreader.readcardinal4 -- 24-bit unsigned integer @@ -397,7 +398,7 @@ local function readlookuparray(f,noflookups,nofcurrent) end end -- if length > nofcurrent then - -- report_issue("more lookups than currently matched characters") + -- report("more lookups than currently matched characters") -- end end return lookups @@ -413,7 +414,7 @@ end -- for i=1,noflookups do -- local index = readushort(f) + 1 -- if index > nofcurrent then --- report_issue("more lookups than currently matched characters") +-- report("more lookups than currently matched characters") -- for i=nofcurrent+1,index-1 do -- lookups[i] = false -- end @@ -1285,20 +1286,50 @@ do 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) + function plugins.size(f,fontdata,tableoffset,feature) + if fontdata.designsize then + -- yes, there are fonts with multiple size entries ... it probably relates + -- to the other two fields (menu entries in some language) + else + local function check(offset) + setposition(f,offset) + local designsize = readushort(f) + if designsize > 0 then -- we could also have a threshold + local fontstyle = readushort(f) + local guimenuid = readushort(f) + local minsize = readushort(f) + local maxsize = readushort(f) + if minsize == 0 and maxsize == 0 and fontstyleid == 0 and guimenuid == 0 then + minsize = designsize + maxsize = designsize + end + if designsize >= minsize and designsize <= maxsize then + return minsize, maxsize, designsize + end + end + end + local minsize, maxsize, designsize = check(tableoffset+feature.offset+feature.parameters) + if not designsize then + -- some old adobe fonts have: tableoffset+feature.parameters and we could + -- use some heuristic but why bother ... this extra check will be removed + -- some day and/or when we run into an issue + minsize, maxsize, designsize = check(tableoffset+feature.parameters) + if designsize then + report("bad size feature in %a, falling back to wrong offset",fontdata.filename or "?") + else + report("bad size feature in %a,",fontdata.filename or "?") + end + end + if designsize then + fontdata.minsize = minsize + fontdata.maxsize = maxsize + fontdata.designsize = designsize end end end - -- feature order needs checking ... as we loop over a hash + -- feature order needs checking ... as we loop over a hash ... however, in the file + -- they are sorted so order is not that relevant local function reorderfeatures(fontdata,scripts,features) local scriptlangs = { } @@ -1440,7 +1471,7 @@ do feature.parameters = parameters local plugin = plugins[feature.tag] if plugin then - plugin(f,fontdata,offset,parameters) + plugin(f,fontdata,featureoffset,feature) end end end diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua index 2851cc6f9..c36f629c5 100644 --- a/tex/context/base/mkiv/lpdf-ini.lua +++ b/tex/context/base/mkiv/lpdf-ini.lua @@ -1188,13 +1188,23 @@ end do - local f_actual_text_one = formatters["BT /Span << /ActualText <feff%04x> >> BDC [<feff>] TJ %s EMC ET"] - local f_actual_text_two = formatters["BT /Span << /ActualText <feff%04x%04x> >> BDC [<feff>] TJ %s EMC ET"] - local f_actual_text_one_b = formatters["BT /Span << /ActualText <feff%04x> >> BDC [<feff>] TJ "] - local f_actual_text_two_b = formatters["BT /Span << /ActualText <feff%04x%04x> >> BDC [<feff>] TJ "] - local f_actual_text_b = formatters["BT /Span << /ActualText <feff%s> >> BDC [<feff>] TJ "] + -- local f_actual_text_one = formatters["BT /Span << /ActualText <feff%04x> >> BDC [<feff>] TJ %s EMC ET"] + -- local f_actual_text_two = formatters["BT /Span << /ActualText <feff%04x%04x> >> BDC [<feff>] TJ %s EMC ET"] + -- local f_actual_text_one_b = formatters["BT /Span << /ActualText <feff%04x> >> BDC [<feff>] TJ "] + -- local f_actual_text_two_b = formatters["BT /Span << /ActualText <feff%04x%04x> >> BDC [<feff>] TJ "] + -- local f_actual_text_b = formatters["BT /Span << /ActualText <feff%s> >> BDC [<feff>] TJ "] + -- local s_actual_text_e = "EMC ET" + -- local f_actual_text_b_not = formatters["/Span << /ActualText <feff%s> >> BDC [<feff>] TJ "] + -- local s_actual_text_e_not = "EMC" + -- local f_actual_text = formatters["/Span <</ActualText %s >> BDC"] + + local f_actual_text_one = formatters["BT /Span << /ActualText <feff%04x> >> %s EMC ET"] + local f_actual_text_two = formatters["BT /Span << /ActualText <feff%04x%04x> >> %s EMC ET"] + local f_actual_text_one_b = formatters["BT /Span << /ActualText <feff%04x> >> "] + local f_actual_text_two_b = formatters["BT /Span << /ActualText <feff%04x%04x> >> "] + local f_actual_text_b = formatters["BT /Span << /ActualText <feff%s> >> "] local s_actual_text_e = "EMC ET" - local f_actual_text_b_not = formatters["/Span << /ActualText <feff%s> >> BDC [<feff>] TJ "] + local f_actual_text_b_not = formatters["/Span << /ActualText <feff%s> >> "] local s_actual_text_e_not = "EMC" local f_actual_text = formatters["/Span <</ActualText %s >> BDC"] diff --git a/tex/context/base/mkiv/lpdf-xmp.lua b/tex/context/base/mkiv/lpdf-xmp.lua index a514d5655..6153b198f 100644 --- a/tex/context/base/mkiv/lpdf-xmp.lua +++ b/tex/context/base/mkiv/lpdf-xmp.lua @@ -31,11 +31,11 @@ local pdfflushstreamobject = lpdf.flushstreamobject -- XMP-Toolkit-SDK-CC201607.zip. So we hardcode the id. local xpacket = format ( [[ -<?xpacket begin="%s%s" id="W5M0MpCehiHzreSzNTczkc9d"?> +<?xpacket begin="%s" id="W5M0MpCehiHzreSzNTczkc9d"?> %%s -<?xpacket end="w"?>]], utfchar(0xFEFF), utfchar(0x0089) ) +<?xpacket end="w"?>]], utfchar(0xFEFF) ) local mapping = { -- user defined keys (pdfx:) diff --git a/tex/context/base/mkiv/page-lin.lua b/tex/context/base/mkiv/page-lin.lua index d6369c432..011418063 100644 --- a/tex/context/base/mkiv/page-lin.lua +++ b/tex/context/base/mkiv/page-lin.lua @@ -405,17 +405,19 @@ function boxed.stage_one(n,nested) end end if getattr(n,a_displaymath) then + -- this probably needs to be adapted ! if is_display_math(n) then check_number(n,a,skip) end else - local v = getattr(list,a_verbatimline) - if not v or v ~= last_v then - last_v = v +-- -- we now prevent nesting anyway .. maybe later we need to check again +-- local v = getattr(list,a_verbatimline) +-- if not v or v ~= last_v then +-- last_v = v check_number(n,a,skip) - else - check_number(n,a,skip,true) - end +-- else +-- check_number(n,a,skip,true) +-- end end skip = false end diff --git a/tex/context/base/mkiv/page-lin.mkvi b/tex/context/base/mkiv/page-lin.mkvi index 5756d870b..2692087cc 100644 --- a/tex/context/base/mkiv/page-lin.mkvi +++ b/tex/context/base/mkiv/page-lin.mkvi @@ -174,11 +174,21 @@ % \startlinenumbering[name][<startvalue>|continue|settings] \unexpanded\def\startlinenumbering - {\dodoubleempty\page_lines_start} + {\begingroup + \dodoubleempty\page_lines_start} + +\newcount\c_pages_lines_nesting \def\page_lines_start % we stay downward compatible - {\begingroup - \ifsecondargument + {\advance\c_pages_lines_nesting\plusone + \ifnum\c_pages_lines_nesting>\plusone + \expandafter\dodoubleempty\expandafter\gobbletwooptionals + \else + \expandafter\page_lines_start_indeed + \fi} + +\def\page_lines_start_indeed + {\ifsecondargument \expandafter\page_lines_start_two \else\iffirstargument \doubleexpandafter\page_lines_start_one @@ -276,9 +286,11 @@ \attribute\linenumberattribute\csname\??linenumberinginstance\currentlinenumbering\endcsname\relax} \unexpanded\def\stoplinenumbering - {\attribute\linenumberattribute\attributeunsetvalue - \the\aftereverylinenumbering - \ifconditional\c_page_lines_auto_narrow\par\fi + {\ifconditional\c_pages_lines_nesting=\plusone + \attribute\linenumberattribute\attributeunsetvalue + \the\aftereverylinenumbering + \ifconditional\c_page_lines_auto_narrow\par\fi + \fi \endgroup} % number placement .. will change into (the new) margin code diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex c06c1ab8a..1b3bf27bf 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex f74a63cbd..8d45cf09a 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 5751e4a9a..2951ea756 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex ad848eedc..09567097e 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/context/modules/mkiv/m-steps.lua b/tex/context/modules/mkiv/m-steps.lua index 7348766af..c02e8f1c1 100644 --- a/tex/context/modules/mkiv/m-steps.lua +++ b/tex/context/modules/mkiv/m-steps.lua @@ -125,9 +125,9 @@ local function step_make_chart(settings) local cellsettings = settings.cell local linesettings = settings.line - local start = context.startMPcode - local stop = context.stopMPcode - local flush = context + local start = nil + local stop = nil + local flush = nil if false then @@ -137,24 +137,27 @@ local function step_make_chart(settings) local mpcode = false - local function start() + start = function() mpcode = { } end - local function stop() + stop = function() + local code = concat(mpcode,"\n") + -- print(code) metapost.graphic { - instance = "metafun", + -- instance = "metafun", + instance = "steps", format = "metafun", - data = concat(mpcode,"\n"), + data = code, -- initializations = "", -- extensions = "", -- inclusions = "", - -- definitions = "", + definitions = 'loadmodule "step" ;', -- figure = "", method = "double", } mpcode = false end - local function flush(fmt,first,...) + flush = function(fmt,first,...) if first then mpcode[#mpcode+1] = formatters[fmt](first,...) else @@ -162,10 +165,15 @@ local function step_make_chart(settings) end end + else + + start = function() context.startMPcode("steps") end + stop = context.stopMPcode + flush = context + end -- start() - flush("if unknown context_cell : input mp-step.mpiv ; fi ;") flush("step_begin_chart ;") -- local alternative = utilities.parsers.settings_to_hash(chartsettings.alternative) @@ -182,24 +190,24 @@ local function step_make_chart(settings) flush("chart_align := true ;") end -- - flush("text_line_color := resolvedcolor(%q) ;", textsettings.framecolor) - flush("text_line_width := %p ;", textsettings.rulethickness) - flush("text_fill_color := resolvedcolor(%q) ;", textsettings.backgroundcolor) - flush("text_offset := %p ;", textsettings.offset) - flush("text_distance_set := %p ;", textsettings.distance) + flush("text_line_color := %q ;", textsettings.framecolor) + flush("text_line_width := %p ;", textsettings.rulethickness) + flush("text_fill_color := %q ;", textsettings.backgroundcolor) + flush("text_offset := %p ;", textsettings.offset) + flush("text_distance_set := %p ;", textsettings.distance) -- - flush("cell_line_color := resolvedcolor(%q) ;", cellsettings.framecolor) - flush("cell_line_width := %p ;", cellsettings.rulethickness) - flush("cell_fill_color := resolvedcolor(%q) ;", cellsettings.backgroundcolor) - flush("cell_offset := %p ;", cellsettings.offset) - flush("cell_distance_x := %p ;", cellsettings.dx) - flush("cell_distance_y := %p ;", cellsettings.dy) + flush("cell_line_color := %q ;", cellsettings.framecolor) + flush("cell_line_width := %p ;", cellsettings.rulethickness) + flush("cell_fill_color := %q ;", cellsettings.backgroundcolor) + flush("cell_offset := %p ;", cellsettings.offset) + flush("cell_distance_x := %p ;", cellsettings.dx) + flush("cell_distance_y := %p ;", cellsettings.dy) -- - flush("line_line_color := resolvedcolor(%q) ;", linesettings.color) - flush("line_line_width := %p ;", linesettings.rulethickness) - flush("line_distance := %p ;", linesettings.distance) - flush("line_offset := %p ;", linesettings.offset) - flush("line_height := %p ;", linesettings.height) + flush("line_line_color := %q ;", linesettings.color) + flush("line_line_width := %p ;", linesettings.rulethickness) + flush("line_distance := %p ;", linesettings.distance) + flush("line_offset := %p ;", linesettings.offset) + flush("line_height := %p ;", linesettings.height) -- for i=1,chart.count do local step = steps[i] @@ -210,7 +218,7 @@ local function step_make_chart(settings) if ali then local text = ali.text local shape = ali.shape - flush('step_cell_ali(%s,%s,%s,resolvedcolor(%q),resolvedcolor(%q),%p,%i) ;', + flush('step_cell_ali(%s,%s,%s,%q,%q,%p,%i) ;', tonumber(text.left) or 0, tonumber(text.middle) or 0, tonumber(text.right) or 0, @@ -222,7 +230,7 @@ local function step_make_chart(settings) end if top then local shape = top.shape - flush('step_cell_top(%s,resolvedcolor(%q),resolvedcolor(%q),%p,%i) ;', + flush('step_cell_top(%s,%q,%q,%p,%i) ;', tonumber(top.text.top) or 0, shape.framecolor, shape.backgroundcolor, @@ -232,7 +240,7 @@ local function step_make_chart(settings) end if bot then local shape = bot.shape - flush('step_cell_bot(%s,resolvedcolor(%q),resolvedcolor(%q),%p,%i) ;', + flush('step_cell_bot(%s,%q,%q,%p,%i) ;', tonumber(bot.text.bot) or 0, shape.framecolor, shape.backgroundcolor, @@ -249,7 +257,7 @@ local function step_make_chart(settings) if top then local shape = top.shape local line = top.line - flush('step_text_top(%s,resolvedcolor(%q),resolvedcolor(%q),%p,%i,resolvedcolor(%q),%p,%i) ;', + flush('step_text_top(%s,%q,%q,%p,%i,%q,%p,%i) ;', tonumber(top.text.top) or 0, shape.framecolor, shape.backgroundcolor, @@ -263,7 +271,7 @@ local function step_make_chart(settings) if mid then -- used ? local shape = mid.shape local line = mid.line - flush('step_text_mid(%s,resolvedcolor(%q),resolvedcolor(%q),%p,%i,resolvedcolor(%q),%p,%i) ;', + flush('step_text_mid(%s,%q,%q,%p,%i,%q,%p,%i) ;', tonumber(mid.text.mid) or 0, shape.framecolor, shape.backgroundcolor, @@ -277,7 +285,7 @@ local function step_make_chart(settings) if bot then local shape = bot.shape local line = bot.line - flush('step_text_bot(%s,resolvedcolor(%q),resolvedcolor(%q),%p,%i,resolvedcolor(%q),%p,%i) ;', + flush('step_text_bot(%s,%q,%q,%p,%i,%q,%p,%i) ;', tonumber(bot.text.bot) or 0, shape.framecolor, shape.backgroundcolor, diff --git a/tex/context/modules/mkiv/m-steps.mkvi b/tex/context/modules/mkiv/m-steps.mkvi index 2d6068481..e03ffa5ef 100644 --- a/tex/context/modules/mkiv/m-steps.mkvi +++ b/tex/context/modules/mkiv/m-steps.mkvi @@ -17,6 +17,17 @@ \unprotect +\defineMPinstance + [steps] + [\s!format=metafun, + \s!extensions=\v!yes, + \s!initializations=\v!yes] + %\c!method=\s!double] + +\startMPdefinitions{steps} + loadmodule "step" ; +\stopMPdefinitions + \installcorenamespace {stepcharts} \installcorenamespace {steptables} \installcorenamespace {stepcells} diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index a0b906d0a..287ef1a0d 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 : 10/19/16 22:51:32 +-- merge date : 10/22/16 10:43:17 do -- begin closure to overcome local limits and interference @@ -11398,6 +11398,7 @@ local report=logs.reporter("otf reader") local readers=fonts.handlers.otf.readers local streamreader=readers.streamreader local setposition=streamreader.setposition +local getposition=streamreader.getposition local skipshort=streamreader.skipshort local readushort=streamreader.readcardinal2 local readulong=streamreader.readcardinal4 @@ -12453,15 +12454,39 @@ function gposhandlers.extension(f,fontdata,lookupid,lookupoffset,offset,glyphs,n end do 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 + function plugins.size(f,fontdata,tableoffset,feature) + if fontdata.designsize then + else + local function check(offset) + setposition(f,offset) + local designsize=readushort(f) + if designsize>0 then + local fontstyle=readushort(f) + local guimenuid=readushort(f) + local minsize=readushort(f) + local maxsize=readushort(f) + if minsize==0 and maxsize==0 and fontstyleid==0 and guimenuid==0 then + minsize=designsize + maxsize=designsize + end + if designsize>=minsize and designsize<=maxsize then + return minsize,maxsize,designsize + end + end + end + local minsize,maxsize,designsize=check(tableoffset+feature.offset+feature.parameters) + if not designsize then + minsize,maxsize,designsize=check(tableoffset+feature.parameters) + if designsize then + report("bad size feature in %a, falling back to wrong offset",fontdata.filename or "?") + else + report("bad size feature in %a,",fontdata.filename or "?") + end + end + if designsize then + fontdata.minsize=minsize + fontdata.maxsize=maxsize fontdata.designsize=designsize - skipshort(f,2) - fontdata.minsize=readushort(f) - fontdata.maxsize=readushort(f) end end end @@ -12598,7 +12623,7 @@ do feature.parameters=parameters local plugin=plugins[feature.tag] if plugin then - plugin(f,fontdata,offset,parameters) + plugin(f,fontdata,featureoffset,feature) end end end |