diff options
26 files changed, 52 insertions, 30 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 9bae77545..d1d15ae1d 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.03.28 10:11} +\newcontextversion{2012.03.28 15:03} %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 080164dcb..b47131749 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.03.28 10:11} +\newcontextversion{2012.03.28 15:03} %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/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 31ae0bccb..b386b2a52 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex f8809368e..cfe0d0e30 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index a129ed4c9..3f032abea 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2012.03.28 10:11} +\edef\contextversion{2012.03.28 15:03} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 5ebfe3a6b..0c1aff0ee 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -23,7 +23,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2012.03.28 10:11} +\edef\contextversion{2012.03.28 15:03} %D For those who want to use this: diff --git a/tex/context/base/mult-de.mkii b/tex/context/base/mult-de.mkii index fb9c61d08..9659a4a7c 100644 --- a/tex/context/base/mult-de.mkii +++ b/tex/context/base/mult-de.mkii @@ -365,6 +365,7 @@ \setinterfacevariable{project}{projekt} \setinterfacevariable{protected}{geschuetzt} \setinterfacevariable{quadruple}{viertel} +\setinterfacevariable{quarterline}{quarterline} \setinterfacevariable{quotation}{zitat} \setinterfacevariable{quote}{zitieren} \setinterfacevariable{ran}{ran} diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mult-def.lua index dc6f67189..d65d96ab4 100644 --- a/tex/context/base/mult-def.lua +++ b/tex/context/base/mult-def.lua @@ -13207,6 +13207,10 @@ return { ["pe"]="نیمخط", ["ro"]="jumatatelinie", }, + ["quarterline"]={ + ["en"]="quarterline", + ["nl"]="kwartregel", + }, ["handwritten"]={ ["cs"]="rukopisne", ["de"]="handschrift", diff --git a/tex/context/base/mult-en.mkii b/tex/context/base/mult-en.mkii index 252e81613..37209110b 100644 --- a/tex/context/base/mult-en.mkii +++ b/tex/context/base/mult-en.mkii @@ -365,6 +365,7 @@ \setinterfacevariable{project}{project} \setinterfacevariable{protected}{protected} \setinterfacevariable{quadruple}{quadruple} +\setinterfacevariable{quarterline}{quarterline} \setinterfacevariable{quotation}{quotation} \setinterfacevariable{quote}{quote} \setinterfacevariable{ran}{ran} diff --git a/tex/context/base/mult-fr.mkii b/tex/context/base/mult-fr.mkii index 907cda0cc..ed75db73e 100644 --- a/tex/context/base/mult-fr.mkii +++ b/tex/context/base/mult-fr.mkii @@ -365,6 +365,7 @@ \setinterfacevariable{project}{projet} \setinterfacevariable{protected}{protege} \setinterfacevariable{quadruple}{quadruple} +\setinterfacevariable{quarterline}{quarterline} \setinterfacevariable{quotation}{citation} \setinterfacevariable{quote}{citer} \setinterfacevariable{ran}{cours} diff --git a/tex/context/base/mult-it.mkii b/tex/context/base/mult-it.mkii index 065736d15..a7a598485 100644 --- a/tex/context/base/mult-it.mkii +++ b/tex/context/base/mult-it.mkii @@ -365,6 +365,7 @@ \setinterfacevariable{project}{progetto} \setinterfacevariable{protected}{protetto} \setinterfacevariable{quadruple}{quadruplo} +\setinterfacevariable{quarterline}{quarterline} \setinterfacevariable{quotation}{citazione} \setinterfacevariable{quote}{menzione} \setinterfacevariable{ran}{corse} diff --git a/tex/context/base/mult-nl.mkii b/tex/context/base/mult-nl.mkii index 56cbf0159..cc3dc1629 100644 --- a/tex/context/base/mult-nl.mkii +++ b/tex/context/base/mult-nl.mkii @@ -365,6 +365,7 @@ \setinterfacevariable{project}{project} \setinterfacevariable{protected}{beschermd} \setinterfacevariable{quadruple}{viertal} +\setinterfacevariable{quarterline}{kwartregel} \setinterfacevariable{quotation}{citaat} \setinterfacevariable{quote}{citeer} \setinterfacevariable{ran}{ran} diff --git a/tex/context/base/mult-pe.mkii b/tex/context/base/mult-pe.mkii index 570dc6b8c..1c4e03900 100644 --- a/tex/context/base/mult-pe.mkii +++ b/tex/context/base/mult-pe.mkii @@ -365,6 +365,7 @@ \setinterfacevariable{project}{پروژه} \setinterfacevariable{protected}{حفاظتشده} \setinterfacevariable{quadruple}{quadruple} +\setinterfacevariable{quarterline}{quarterline} \setinterfacevariable{quotation}{نقلقول} \setinterfacevariable{quote}{نقل} \setinterfacevariable{ran}{برد} diff --git a/tex/context/base/mult-ro.mkii b/tex/context/base/mult-ro.mkii index 6e556a1db..c46f629c3 100644 --- a/tex/context/base/mult-ro.mkii +++ b/tex/context/base/mult-ro.mkii @@ -365,6 +365,7 @@ \setinterfacevariable{project}{proiect} \setinterfacevariable{protected}{protejat} \setinterfacevariable{quadruple}{cvadrupul} +\setinterfacevariable{quarterline}{quarterline} \setinterfacevariable{quotation}{citat} \setinterfacevariable{quote}{minicitat} \setinterfacevariable{ran}{rulat} diff --git a/tex/context/base/spac-ver.mkiv b/tex/context/base/spac-ver.mkiv index 4dfcec326..f962e6694 100644 --- a/tex/context/base/spac-ver.mkiv +++ b/tex/context/base/spac-ver.mkiv @@ -388,18 +388,19 @@ \unexpanded\def\installwhitespacemethod#1#2% {\setvalue{\??whitespacemethod#1}{#2}} -\installwhitespacemethod \v!fix {} -\installwhitespacemethod \v!fixed {\setfalse\c_spac_whitespace_flexible} -\installwhitespacemethod \v!flexible {\settrue \c_spac_whitespace_flexible} +\installwhitespacemethod \v!fix {} +\installwhitespacemethod \v!fixed {\setfalse\c_spac_whitespace_flexible} +\installwhitespacemethod \v!flexible {\settrue \c_spac_whitespace_flexible} -\installwhitespacemethod \v!line {\s_spac_whitespace_parskip \baselineskip} -\installwhitespacemethod \v!halfline {\s_spac_whitespace_parskip.5\baselineskip} -\installwhitespacemethod \v!none {\s_spac_whitespace_parskip \zeropoint} -\installwhitespacemethod \v!big {\s_spac_whitespace_parskip \bigskipamount} -\installwhitespacemethod \v!medium {\s_spac_whitespace_parskip \medskipamount} -\installwhitespacemethod \v!small {\s_spac_whitespace_parskip \smallskipamount} +\installwhitespacemethod \v!line {\s_spac_whitespace_parskip \baselineskip} +\installwhitespacemethod \v!halfline {\s_spac_whitespace_parskip .5\baselineskip} +\installwhitespacemethod \v!quarterline {\s_spac_whitespace_parskip.25\baselineskip} +\installwhitespacemethod \v!none {\s_spac_whitespace_parskip \zeropoint} +\installwhitespacemethod \v!big {\s_spac_whitespace_parskip \bigskipamount} +\installwhitespacemethod \v!medium {\s_spac_whitespace_parskip \medskipamount} +\installwhitespacemethod \v!small {\s_spac_whitespace_parskip \smallskipamount} -\installwhitespacemethod \s!default {\spac_whitespace_setup_nop} +\installwhitespacemethod \s!default {\spac_whitespace_setup_nop} \def\spac_whitespace_setup_method#1% {\ifcsname\??whitespacemethod#1\endcsname @@ -1655,21 +1656,23 @@ % this interface might change (into an \install, buw we will then keep this one hidden) -\definevspacingamount[\v!none] [\zeropoint] [\zeropoint] -\definevspacingamount[\v!big] [\bigskipamount] [\bodyfontlineheight] -\definevspacingamount[\v!medium] [\medskipamount] [.5\bodyfontlineheight] -\definevspacingamount[\v!small] [\smallskipamount] [.25\bodyfontlineheight] -\definevspacingamount[\v!line] [\openlineheight] [\bodyfontlineheight] -\definevspacingamount[\v!halfline][.5\openlineheight] [.5\bodyfontlineheight] -\definevspacingamount[\v!formula] [\medskipamount] [.5\bodyfontlineheight] -\definevspacingamount[\v!white] [\parskip] [\bodyfontwhitespace] -\definevspacingamount[\v!height] [\strutheight] [\bodyfontstrutheight] -\definevspacingamount[\v!depth] [\strutdepth] [\bodyfontstrutdepth] - -\definevspacingamount[-\v!line] [-\openlineheight] [-\bodyfontlineheight] -\definevspacingamount[-\v!halfline][-.5\openlineheight][-.5\bodyfontlineheight] - -\definevspacingamount[\v!standard] [.75\openlineheight][.75\openlineheight] % mkii compatible +\definevspacingamount[\v!none] [\zeropoint] [\zeropoint] +\definevspacingamount[\v!big] [\bigskipamount] [\bodyfontlineheight] +\definevspacingamount[\v!medium] [\medskipamount] [.5\bodyfontlineheight] +\definevspacingamount[\v!small] [\smallskipamount] [.25\bodyfontlineheight] +\definevspacingamount[\v!line] [\openlineheight] [\bodyfontlineheight] +\definevspacingamount[\v!halfline] [.5\openlineheight] [.5\bodyfontlineheight] +\definevspacingamount[\v!quarterline] [.25\openlineheight] [.25\bodyfontlineheight] +\definevspacingamount[\v!formula] [\medskipamount] [.5\bodyfontlineheight] +\definevspacingamount[\v!white] [\parskip] [\bodyfontwhitespace] +\definevspacingamount[\v!height] [\strutheight] [\bodyfontstrutheight] +\definevspacingamount[\v!depth] [\strutdepth] [\bodyfontstrutdepth] + +\definevspacingamount[-\v!line] [-\openlineheight] [-\bodyfontlineheight] +\definevspacingamount[-\v!halfline] [-.5\openlineheight] [-.5\bodyfontlineheight] +\definevspacingamount[-\v!quarterline][-.25\openlineheight][-.25\bodyfontlineheight] + +\definevspacingamount[\v!standard] [.75\openlineheight] [.75\openlineheight] % mkii compatible \def\bodyfontwhitespace {\dimexpr diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 59d92404f..d0c786e4d 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex 7fb68b889..2a73bc2ec 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/interface/keys-cs.xml b/tex/context/interface/keys-cs.xml index 5950694cf..24b7a1709 100644 --- a/tex/context/interface/keys-cs.xml +++ b/tex/context/interface/keys-cs.xml @@ -368,6 +368,7 @@ <cd:variable name='project' value='projekt'/> <cd:variable name='protected' value='chranene'/> <cd:variable name='quadruple' value='ctyrnasobny'/> + <cd:variable name='quarterline' value='quarterline'/> <cd:variable name='quotation' value='citace'/> <cd:variable name='quote' value='citovat'/> <cd:variable name='ran' value='rozsah'/> diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 7fd3f361c..8bf801e62 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -368,6 +368,7 @@ <cd:variable name='project' value='projekt'/> <cd:variable name='protected' value='geschuetzt'/> <cd:variable name='quadruple' value='viertel'/> + <cd:variable name='quarterline' value='quarterline'/> <cd:variable name='quotation' value='zitat'/> <cd:variable name='quote' value='zitieren'/> <cd:variable name='ran' value='ran'/> diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 39438a222..975b65d7a 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -368,6 +368,7 @@ <cd:variable name='project' value='project'/> <cd:variable name='protected' value='protected'/> <cd:variable name='quadruple' value='quadruple'/> + <cd:variable name='quarterline' value='quarterline'/> <cd:variable name='quotation' value='quotation'/> <cd:variable name='quote' value='quote'/> <cd:variable name='ran' value='ran'/> diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index f1b2efe88..f426da007 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -368,6 +368,7 @@ <cd:variable name='project' value='projet'/> <cd:variable name='protected' value='protege'/> <cd:variable name='quadruple' value='quadruple'/> + <cd:variable name='quarterline' value='quarterline'/> <cd:variable name='quotation' value='citation'/> <cd:variable name='quote' value='citer'/> <cd:variable name='ran' value='cours'/> diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index fd1709034..73bf9db91 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -368,6 +368,7 @@ <cd:variable name='project' value='progetto'/> <cd:variable name='protected' value='protetto'/> <cd:variable name='quadruple' value='quadruplo'/> + <cd:variable name='quarterline' value='quarterline'/> <cd:variable name='quotation' value='citazione'/> <cd:variable name='quote' value='menzione'/> <cd:variable name='ran' value='corse'/> diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index b727157ec..6b89db114 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -368,6 +368,7 @@ <cd:variable name='project' value='project'/> <cd:variable name='protected' value='beschermd'/> <cd:variable name='quadruple' value='viertal'/> + <cd:variable name='quarterline' value='kwartregel'/> <cd:variable name='quotation' value='citaat'/> <cd:variable name='quote' value='citeer'/> <cd:variable name='ran' value='ran'/> diff --git a/tex/context/interface/keys-pe.xml b/tex/context/interface/keys-pe.xml index 5bc66bf37..cfb9d9dd3 100644 --- a/tex/context/interface/keys-pe.xml +++ b/tex/context/interface/keys-pe.xml @@ -368,6 +368,7 @@ <cd:variable name='project' value='پروژه'/> <cd:variable name='protected' value='حفاظتشده'/> <cd:variable name='quadruple' value='quadruple'/> + <cd:variable name='quarterline' value='quarterline'/> <cd:variable name='quotation' value='نقلقول'/> <cd:variable name='quote' value='نقل'/> <cd:variable name='ran' value='برد'/> diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index 9ce2f8512..9cf9c7846 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -368,6 +368,7 @@ <cd:variable name='project' value='proiect'/> <cd:variable name='protected' value='protejat'/> <cd:variable name='quadruple' value='cvadrupul'/> + <cd:variable name='quarterline' value='quarterline'/> <cd:variable name='quotation' value='citat'/> <cd:variable name='quote' value='minicitat'/> <cd:variable name='ran' value='rulat'/> diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index ad8985653..fb3c156e1 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 : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 03/28/12 10:11:09 +-- merge date : 03/28/12 15:03:10 do -- begin closure to overcome local limits and interference |
