From 8bf2b14b01c07e915720438abcc5b0441b3c883d Mon Sep 17 00:00:00 2001 From: Marius Date: Thu, 6 Dec 2012 15:40:14 +0200 Subject: beta 2012.12.06 12:15 --- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4140 -> 4145 bytes tex/context/base/context-version.png | Bin 40001 -> 40384 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/math-ini.mkiv | 6 +++--- tex/context/base/math-noa.lua | 6 ++++++ tex/context/base/status-files.pdf | Bin 24534 -> 24520 bytes tex/context/base/status-lua.pdf | Bin 199332 -> 199332 bytes tex/context/fonts/lucida-opentype-math.lfg | 7 ++++++- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 12 files changed, 20 insertions(+), 9 deletions(-) diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 3baf62f07..e355a4c76 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.12.06 01:21} +\newcontextversion{2012.12.06 12:15} %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 d818256a8..9fb4a2663 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.12.06 01:21} +\newcontextversion{2012.12.06 12:15} %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/context-version.pdf b/tex/context/base/context-version.pdf index 916253fcc..9c13eb9dc 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png index 03af39d50..12e6cf850 100644 Binary files a/tex/context/base/context-version.png and b/tex/context/base/context-version.png differ diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index 1b660a60c..fea95e7be 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.12.06 01:21} +\edef\contextversion{2012.12.06 12:15} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 0dd1aeb1a..81237a7a1 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2012.12.06 01:21} +\edef\contextversion{2012.12.06 12:15} %D For those who want to use this: diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv index 763ac4f68..ebe8ea709 100644 --- a/tex/context/base/math-ini.mkiv +++ b/tex/context/base/math-ini.mkiv @@ -108,9 +108,9 @@ % todo: only in mmode -\unexpanded\def\mathgreekupright{\attribute\c_math_greek_attribute22 } -\unexpanded\def\mathgreekitalic {\attribute\c_math_greek_attribute33 } -\unexpanded\def\mathgreekdefault{\attribute\c_math_greek_attribute\attributeunsetvalue} +\unexpanded\def\mathgreekupright{\attribute\mathgreekattribute22 } +\unexpanded\def\mathgreekitalic {\attribute\mathgreekattribute33 } +\unexpanded\def\mathgreekdefault{\attribute\mathgreekattribute\attributeunsetvalue} \let\mathgreeknormal\mathgreekupright \let\mathgreeknone \mathgreekdefault diff --git a/tex/context/base/math-noa.lua b/tex/context/base/math-noa.lua index ad7343d34..e9cf79590 100644 --- a/tex/context/base/math-noa.lua +++ b/tex/context/base/math-noa.lua @@ -37,6 +37,7 @@ local trace_normalizing = false trackers.register("math.normalizing", functio local trace_collapsing = false trackers.register("math.collapsing", function(v) trace_collapsing = v end) local trace_goodies = false trackers.register("math.goodies", function(v) trace_goodies = v end) local trace_variants = false trackers.register("math.variants", function(v) trace_variants = v end) +local trace_alternates = false trackers.register("math.alternates", function(v) trace_alternates = v end) local trace_italics = false trackers.register("math.italics", function(v) trace_italics = v end) local trace_families = false trackers.register("math.families", function(v) trace_families = v end) @@ -48,6 +49,7 @@ local report_normalizing = logs.reporter("mathematics","normalizing") local report_collapsing = logs.reporter("mathematics","collapsing") local report_goodies = logs.reporter("mathematics","goodies") local report_variants = logs.reporter("mathematics","variants") +local report_alternates = logs.reporter("mathematics","alternates") local report_italics = logs.reporter("mathematics","italics") local report_families = logs.reporter("mathematics","families") @@ -738,6 +740,10 @@ alternate[math_char] = function(pointer) local what = mathalternatesattributes[a] local alt = getalternate(tfmdata,pointer.char,what.feature,what.value) if alt then + if trace_alternates then + report_alternates("alternate %s, value: %s, replacing glyph 0x%05X by glyph 0x%05X", + tostring(what.feature),tostring(what.value),pointer.char,alt) + end pointer.char = alt end end diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index ad7c200c0..695fbdabf 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index e3f326b5a..9b5416e5c 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/fonts/lucida-opentype-math.lfg b/tex/context/fonts/lucida-opentype-math.lfg index 38d54eee3..c8556ebca 100644 --- a/tex/context/fonts/lucida-opentype-math.lfg +++ b/tex/context/fonts/lucida-opentype-math.lfg @@ -6,7 +6,12 @@ return { copyright = "ConTeXt development team", mathematics = { alternates = { - italic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Italic" }, + italic = { feature = 'ss01', value = 1, comment = "Mathematical Alternative Lowercase Italic" }, + arrow = { feature = 'ss02', value = 1, comment = "Mathematical Alternative Smaller Arrows" }, + operator = { feature = 'ss03', value = 1, comment = "Mathematical Alternative Smaller Operators" }, + calligraphic = { feature = 'ss04', value = 1, comment = "Mathematical Alternative Calligraphic Characters" }, + zero = { feature = 'ss05', value = 1, comment = "Mathematical Alternative Zero" }, + partial = { feature = 'ss20', value = 1, comment = "Mathematical Alternative Upright Partial Differential" }, } } } diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 219cbbc9d..8cad5d838 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 : 12/06/12 01:21:29 +-- merge date : 12/06/12 12:15:07 do -- begin closure to overcome local limits and interference -- cgit v1.2.3