diff options
Diffstat (limited to 'tex')
28 files changed, 123 insertions, 53 deletions
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 45bbe7b03..4f5952d9b 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/mkii/mult-de.mkii b/tex/context/base/mkii/mult-de.mkii index 249e18523..67bacc727 100644 --- a/tex/context/base/mkii/mult-de.mkii +++ b/tex/context/base/mkii/mult-de.mkii @@ -207,7 +207,7 @@ \setinterfacevariable{force}{zwinge} \setinterfacevariable{foreground}{vordergrund} \setinterfacevariable{formula}{formel} -\setinterfacevariable{formulae}{formeln} +\setinterfacevariable{formulas}{formeln} \setinterfacevariable{forward}{vorwaerts} \setinterfacevariable{four}{vier} \setinterfacevariable{frame}{rahmen} diff --git a/tex/context/base/mkii/mult-en.mkii b/tex/context/base/mkii/mult-en.mkii index 3ea8f87c5..ba08baa65 100644 --- a/tex/context/base/mkii/mult-en.mkii +++ b/tex/context/base/mkii/mult-en.mkii @@ -207,7 +207,7 @@ \setinterfacevariable{force}{force} \setinterfacevariable{foreground}{foreground} \setinterfacevariable{formula}{formula} -\setinterfacevariable{formulae}{formulae} +\setinterfacevariable{formulas}{formulas} \setinterfacevariable{forward}{forward} \setinterfacevariable{four}{four} \setinterfacevariable{frame}{frame} diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii index 9a1f53a52..d80cfe21e 100644 --- a/tex/context/base/mkii/mult-fr.mkii +++ b/tex/context/base/mkii/mult-fr.mkii @@ -207,7 +207,7 @@ \setinterfacevariable{force}{force} \setinterfacevariable{foreground}{premierplan} \setinterfacevariable{formula}{formule} -\setinterfacevariable{formulae}{formules} +\setinterfacevariable{formulas}{formules} \setinterfacevariable{forward}{avance} \setinterfacevariable{four}{quatre} \setinterfacevariable{frame}{cadre} diff --git a/tex/context/base/mkii/mult-it.mkii b/tex/context/base/mkii/mult-it.mkii index 4d68bc4df..c038379e8 100644 --- a/tex/context/base/mkii/mult-it.mkii +++ b/tex/context/base/mkii/mult-it.mkii @@ -207,7 +207,7 @@ \setinterfacevariable{force}{forza} \setinterfacevariable{foreground}{foreground} \setinterfacevariable{formula}{formula} -\setinterfacevariable{formulae}{formule} +\setinterfacevariable{formulas}{formule} \setinterfacevariable{forward}{avanti} \setinterfacevariable{four}{quattro} \setinterfacevariable{frame}{cornice} diff --git a/tex/context/base/mkii/mult-nl.mkii b/tex/context/base/mkii/mult-nl.mkii index 0711108d1..dccbfa42d 100644 --- a/tex/context/base/mkii/mult-nl.mkii +++ b/tex/context/base/mkii/mult-nl.mkii @@ -207,7 +207,7 @@ \setinterfacevariable{force}{forceer} \setinterfacevariable{foreground}{voorgrond} \setinterfacevariable{formula}{formule} -\setinterfacevariable{formulae}{formules} +\setinterfacevariable{formulas}{formules} \setinterfacevariable{forward}{vooruit} \setinterfacevariable{four}{vier} \setinterfacevariable{frame}{kader} diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii index de5030276..d103eab63 100644 --- a/tex/context/base/mkii/mult-pe.mkii +++ b/tex/context/base/mkii/mult-pe.mkii @@ -207,7 +207,7 @@ \setinterfacevariable{force}{اجبار} \setinterfacevariable{foreground}{پیشزمینه} \setinterfacevariable{formula}{فرمول} -\setinterfacevariable{formulae}{فرمولها} +\setinterfacevariable{formulas}{فرمولها} \setinterfacevariable{forward}{بهجلو} \setinterfacevariable{four}{چهار} \setinterfacevariable{frame}{قالب} diff --git a/tex/context/base/mkii/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii index 44e01db6a..83d68a61e 100644 --- a/tex/context/base/mkii/mult-ro.mkii +++ b/tex/context/base/mkii/mult-ro.mkii @@ -207,7 +207,7 @@ \setinterfacevariable{force}{fortat} \setinterfacevariable{foreground}{primplan} \setinterfacevariable{formula}{formula} -\setinterfacevariable{formulae}{formule} +\setinterfacevariable{formulas}{formule} \setinterfacevariable{forward}{avans} \setinterfacevariable{four}{patru} \setinterfacevariable{frame}{incadrat} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 9d03d82da..852e0fddd 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.06.18 16:28} +\newcontextversion{2016.06.19 13:29} %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 ec4da7bd0..c441cf7ad 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.06.18 16:28} +\edef\contextversion{2016.06.19 13:29} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua index f59851f49..da982d949 100644 --- a/tex/context/base/mkiv/mult-def.lua +++ b/tex/context/base/mkiv/mult-def.lua @@ -13538,10 +13538,10 @@ return { ["pe"]="فرمول", ["ro"]="formula", }, - ["formulae"]={ + ["formulas"]={ ["cs"]="rovnice", ["de"]="formeln", - ["en"]="formulae", + ["en"]="formulas", ["fr"]="formules", ["it"]="formule", ["nl"]="formules", diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 1030dfbde..08d64337b 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 ed14795e4..4582f1650 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/strc-mat.mkiv b/tex/context/base/mkiv/strc-mat.mkiv index 554dc84ca..272b5d9b5 100644 --- a/tex/context/base/mkiv/strc-mat.mkiv +++ b/tex/context/base/mkiv/strc-mat.mkiv @@ -968,10 +968,21 @@ \unexpanded\def\startformulas {\dosingleempty\strc_formulas_start_formulas} -\unexpanded\def\startformulas - {\dosingleempty\strc_formulas_start_formulas} +\expandafter\let\csname\e!stop\v!formulas\endcsname\relax + +\unexpanded\def\strc_formulas_nested_formula_start + {\hbox to \displaywidth \bgroup + \hsize\displaywidth + \hss + \Ustartmath} + +\unexpanded\def\strc_formulas_nested_formula_stop + {\Ustopmath + \hss + \egroup + \hss} -\def\strc_formulas_start_formulas[#1]#2\stopformulas % new / to be internationalized +\normalexpanded{\def\noexpand\strc_formulas_start_formulas[#1]#2\csname\e!stop\v!formulas\endcsname}% {\startformula \dostarttagged\t!formulaset\empty \global\settrue\c_strc_formulas_inside_formulas @@ -979,8 +990,9 @@ \strc_formulas_handle_number \let\currentformula\empty \strc_formulas_forget_display_skips - \unexpanded\def\startformula##1\stopformula - {\advance\scratchcounter\plusone}% + \unexpanded\def\startformula + {\advance\scratchcounter\plusone + \expandafter\gobbleuntil\csname\e!stop\v!formula\endcsname}% \scratchcounter\zerocount #2% preroll \hbox to \displaywidth \bgroup @@ -997,22 +1009,6 @@ \hangafter\minusone % added for side floats \hangindent\zeropoint} % added for side floats -\unexpanded\def\strc_formulas_nested_formula_start - {\hbox to \displaywidth \bgroup - \hsize\displaywidth - \Ustartmath - \vcenter\bgroup % not optimal - \vskip-\strutdepth - \Ustartdisplaymath} - -\unexpanded\def\strc_formulas_nested_formula_stop - {\Ustopdisplaymath - \obeydepth - \egroup - \Ustopmath - \egroup - \hss} - % place \def\m_strc_formulas_flag_inhibit{-} diff --git a/tex/context/fonts/mkiv/minion-math.lfg b/tex/context/fonts/mkiv/minion-math.lfg index a867a00e3..72bf7d436 100644 --- a/tex/context/fonts/mkiv/minion-math.lfg +++ b/tex/context/fonts/mkiv/minion-math.lfg @@ -14,6 +14,10 @@ return { ["9.8pt"] = "file:MinionMath-Capt.otf", default = "file:MinionMath-Regular.otf", }, + ["Minion-BoldMath"] = { + default = "file:MinionMath-Semibold.otf", + ["Minion-MediumMath"] = { + default = "file:MinionMath-Semibold.otf", }, mathematics = { kerns = { diff --git a/tex/context/fonts/mkiv/minion.lfg b/tex/context/fonts/mkiv/minion.lfg new file mode 100644 index 000000000..84f01b6a9 --- /dev/null +++ b/tex/context/fonts/mkiv/minion.lfg @@ -0,0 +1,54 @@ +-- We just assume that Minion Pro is used. After all it's a commercial font so +-- that is probably whey people will buy. + +return { + name = "minion", + version = "1.00", + comment = "Goodies that complement minion pro.", + author = "Hans Hagen and Mathias Schickel", + copyright = "ConTeXt development team", + designsizes = { + ["Minion-Regular"] = { + ["9.5pt"] = "file:MinionPro-Capt.otf", + ["12.5pt"] = "file:MinionPro-Regular.otf", + ["14.5pt"] = "file:MinionPro-Subh.otf", + ["16pt"] = "file:MinionPro-Disp.otf", + default = "file:MinionPro-Regular.otf", + }, + ["Minion-Italic"] = { + ["9.5pt"] = "file:MinionPro-ItCapt.otf", + ["12.5pt"] = "file:MinionPro-It.otf", + ["14.5pt"] = "file:MinionPro-ItSubh.otf", + ["16pt"] = "file:MinionPro-ItDisp.otf", + default = "file:MinionPro-It.otf", + }, + ["Minion-Bold"] = { + ["9.5pt"] = "file:MinionPro-BoldCapt.otf", + ["12.5pt"] = "file:MinionPro-Bold.otf", + ["14.5pt"] = "file:MinionPro-BoldSubh.otf", + ["16pt"] = "file:MinionPro-BoldDisp.otf", + default = "file:MinionPro-Bold.otf", + }, + ["Minion-BoldItalic"] = { + ["9.5pt"] = "file:MinionPro-BoldItCapt.otf", + ["12.5pt"] = "file:MinionPro-BoldIt.otf", + ["14.5pt"] = "file:MinionPro-BoldItSubh.otf", + ["16pt"] = "file:MinionPro-BoldItDisp.otf", + default = "file:MinionPro-It.otf", + }, + ["Minion-Medium"] = { + ["9.5pt"] = "file:MinionPro-SemiboldCapt.otf", + ["12.5pt"] = "file:MinionPro-Semibold.otf", + ["14.5pt"] = "file:MinionPro-SemiboldSubh.otf", + ["16pt"] = "file:MinionPro-SemiboldDisp.otf", + default = "file:MinionPro-Semibold.otf", + }, + ["Minion-MediumItalic"] = { + ["9.5pt"] = "file:MinionPro-SemiboldItCapt.otf", + ["12.5pt"] = "file:MinionPro-SemiboldIt.otf", + ["14.5pt"] = "file:MinionPro-SemiboldItSubh.otf", + ["16pt"] = "file:MinionPro-SemiboldItDisp.otf", + default = "file:MinionPro-SemiboldIt.otf", + }, + }, +} diff --git a/tex/context/fonts/mkiv/type-imp-minion.mkiv b/tex/context/fonts/mkiv/type-imp-minion.mkiv index a09bc6264..06bc842ac 100644 --- a/tex/context/fonts/mkiv/type-imp-minion.mkiv +++ b/tex/context/fonts/mkiv/type-imp-minion.mkiv @@ -11,28 +11,44 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. - -\definefontfallback[MinionMathFallback][file:latinmodern-math.otf][uppercasescript] +\definefontfallback[MinionMathFallback] [file:latinmodern-math.otf][uppercasescript] +\definefontfallback[MinionBoldMathFallback][file:latinmodern-math.otf][uppercasescript] \starttypescriptcollection[minion] \starttypescript [\s!serif][minion][\s!all] - \definefontsynonym[\s!Serif] [\s!file:MinionPro-Regular.otf][\s!features=\s!default] - \definefontsynonym[\s!SerifBold] [\s!file:MinionPro-Bold.otf] [\s!features=\s!default] - \definefontsynonym[\s!SerifItalic] [\s!file:MinionPro-It.otf] [\s!features=\s!default] - \definefontsynonym[\s!SerifBoldItalic][\s!file:MinionPro-BoldIt.otf] [\s!features=\s!default] + \loadfontgoodies[minion] + \definefontsynonym[\s!Serif] [Minion-Regular] [\s!features=\s!default,\s!goodies=minion] + \definefontsynonym[\s!SerifBold] [Minion-Bold] [\s!features=\s!default,\s!goodies=minion] + \definefontsynonym[\s!SerifItalic] [Minion-Italic] [\s!features=\s!default,\s!goodies=minion] + \definefontsynonym[\s!SerifBoldItalic][Minion-BoldItalic][\s!features=\s!default,\s!goodies=minion] + \stoptypescript + + \starttypescript [\s!serif][minion-medium][\s!all] + \loadfontgoodies[minion] + \definefontsynonym[\s!Serif] [Minion-Regular] [\s!features=\s!default,\s!goodies=minion] + \definefontsynonym[\s!SerifBold] [Minion-Medium] [\s!features=\s!default,\s!goodies=minion] + \definefontsynonym[\s!SerifItalic] [Minion-Italic] [\s!features=\s!default,\s!goodies=minion] + \definefontsynonym[\s!SerifBoldItalic][Minion-MediumItalic][\s!features=\s!default,\s!goodies=minion] \stoptypescript \starttypescript [\s!math][minion][\s!all] \loadfontgoodies[minion-math] - \definefontsynonym[\s!MathRoman][Minion-Math][\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionMathFallback] + \definefontsynonym[\s!MathRoman] [Minion-Math] [\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionMathFallback] + \definefontsynonym[\s!MathRomanBold][Minion-BoldMath][\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionBoldMathFallback] + \stoptypescript + + \starttypescript [\s!math][minion-medium][\s!all] + \loadfontgoodies[minion-math] + \definefontsynonym[\s!MathRoman] [Minion-Math] [\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionMathFallback] + \definefontsynonym[\s!MathRomanBold][Minion-MediumMath][\s!features=\s!math\mathsizesuffix,\s!designsize=\s!auto,\s!goodies=minion-math,\s!fallbacks=MinionBoldMathFallback] \stoptypescript - \starttypescript [minion] - \definetypeface [\typescriptone] [\s!rm] [\s!serif] [minion] [\s!default] - \definetypeface [\typescriptone] [\s!ss] [\s!sans] [dejavu] [\s!default] [\s!rscale=0.8] - \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] [\s!rscale=0.8] - \definetypeface [\typescriptone] [\s!mm] [\s!math] [minion] [\s!default] + \starttypescript [minion,minion-medium] + \definetypeface [\typescriptone] [\s!rm] [\s!serif] [\typescriptone] [\s!default] + \definetypeface [\typescriptone] [\s!ss] [\s!sans] [dejavu] [\s!default] [\s!rscale=0.8] + \definetypeface [\typescriptone] [\s!tt] [\s!mono] [dejavu] [\s!default] [\s!rscale=0.8] + \definetypeface [\typescriptone] [\s!mm] [\s!math] [\typescriptone] [\s!default] \stoptypescript \stoptypescriptcollection diff --git a/tex/context/interface/mkii/keys-cs.xml b/tex/context/interface/mkii/keys-cs.xml index 8d3f17a4e..473756022 100644 --- a/tex/context/interface/mkii/keys-cs.xml +++ b/tex/context/interface/mkii/keys-cs.xml @@ -210,7 +210,7 @@ <cd:variable name='force' value='sila'/> <cd:variable name='foreground' value='popredi'/> <cd:variable name='formula' value='rovnice'/> - <cd:variable name='formulae' value='rovnice'/> + <cd:variable name='formulas' value='rovnice'/> <cd:variable name='forward' value='vpred'/> <cd:variable name='four' value='ctyri'/> <cd:variable name='frame' value='ramecek'/> diff --git a/tex/context/interface/mkii/keys-de.xml b/tex/context/interface/mkii/keys-de.xml index 2f6fc9bcc..bef6a9b73 100644 --- a/tex/context/interface/mkii/keys-de.xml +++ b/tex/context/interface/mkii/keys-de.xml @@ -210,7 +210,7 @@ <cd:variable name='force' value='zwinge'/> <cd:variable name='foreground' value='vordergrund'/> <cd:variable name='formula' value='formel'/> - <cd:variable name='formulae' value='formeln'/> + <cd:variable name='formulas' value='formeln'/> <cd:variable name='forward' value='vorwaerts'/> <cd:variable name='four' value='vier'/> <cd:variable name='frame' value='rahmen'/> diff --git a/tex/context/interface/mkii/keys-en.xml b/tex/context/interface/mkii/keys-en.xml index ab91bf43e..599609f29 100644 --- a/tex/context/interface/mkii/keys-en.xml +++ b/tex/context/interface/mkii/keys-en.xml @@ -210,7 +210,7 @@ <cd:variable name='force' value='force'/> <cd:variable name='foreground' value='foreground'/> <cd:variable name='formula' value='formula'/> - <cd:variable name='formulae' value='formulae'/> + <cd:variable name='formulas' value='formulas'/> <cd:variable name='forward' value='forward'/> <cd:variable name='four' value='four'/> <cd:variable name='frame' value='frame'/> diff --git a/tex/context/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml index 03e20c347..7f7f99094 100644 --- a/tex/context/interface/mkii/keys-fr.xml +++ b/tex/context/interface/mkii/keys-fr.xml @@ -210,7 +210,7 @@ <cd:variable name='force' value='force'/> <cd:variable name='foreground' value='premierplan'/> <cd:variable name='formula' value='formule'/> - <cd:variable name='formulae' value='formules'/> + <cd:variable name='formulas' value='formules'/> <cd:variable name='forward' value='avance'/> <cd:variable name='four' value='quatre'/> <cd:variable name='frame' value='cadre'/> diff --git a/tex/context/interface/mkii/keys-it.xml b/tex/context/interface/mkii/keys-it.xml index 616d491fe..7f917eb8e 100644 --- a/tex/context/interface/mkii/keys-it.xml +++ b/tex/context/interface/mkii/keys-it.xml @@ -210,7 +210,7 @@ <cd:variable name='force' value='forza'/> <cd:variable name='foreground' value='foreground'/> <cd:variable name='formula' value='formula'/> - <cd:variable name='formulae' value='formule'/> + <cd:variable name='formulas' value='formule'/> <cd:variable name='forward' value='avanti'/> <cd:variable name='four' value='quattro'/> <cd:variable name='frame' value='cornice'/> diff --git a/tex/context/interface/mkii/keys-nl.xml b/tex/context/interface/mkii/keys-nl.xml index da812cb7b..33fe35c39 100644 --- a/tex/context/interface/mkii/keys-nl.xml +++ b/tex/context/interface/mkii/keys-nl.xml @@ -210,7 +210,7 @@ <cd:variable name='force' value='forceer'/> <cd:variable name='foreground' value='voorgrond'/> <cd:variable name='formula' value='formule'/> - <cd:variable name='formulae' value='formules'/> + <cd:variable name='formulas' value='formules'/> <cd:variable name='forward' value='vooruit'/> <cd:variable name='four' value='vier'/> <cd:variable name='frame' value='kader'/> diff --git a/tex/context/interface/mkii/keys-pe.xml b/tex/context/interface/mkii/keys-pe.xml index a6c908796..522778150 100644 --- a/tex/context/interface/mkii/keys-pe.xml +++ b/tex/context/interface/mkii/keys-pe.xml @@ -210,7 +210,7 @@ <cd:variable name='force' value='اجبار'/> <cd:variable name='foreground' value='پیشزمینه'/> <cd:variable name='formula' value='فرمول'/> - <cd:variable name='formulae' value='فرمولها'/> + <cd:variable name='formulas' value='فرمولها'/> <cd:variable name='forward' value='بهجلو'/> <cd:variable name='four' value='چهار'/> <cd:variable name='frame' value='قالب'/> diff --git a/tex/context/interface/mkii/keys-ro.xml b/tex/context/interface/mkii/keys-ro.xml index 7a5da9946..9011c24d6 100644 --- a/tex/context/interface/mkii/keys-ro.xml +++ b/tex/context/interface/mkii/keys-ro.xml @@ -210,7 +210,7 @@ <cd:variable name='force' value='fortat'/> <cd:variable name='foreground' value='primplan'/> <cd:variable name='formula' value='formula'/> - <cd:variable name='formulae' value='formule'/> + <cd:variable name='formulas' value='formule'/> <cd:variable name='forward' value='avans'/> <cd:variable name='four' value='patru'/> <cd:variable name='frame' value='incadrat'/> diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 6e5c2e428..4a675467a 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 f49b500fc..d2d76e5ba 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index e19ac93fa..6c33374c7 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 : 06/18/16 16:28:26 +-- merge date : 06/19/16 13:29:04 do -- begin closure to overcome local limits and interference |