From 25c649c5476c74605d93241aa60ff4334819ed7b Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 15 Oct 2012 23:12:00 +0200 Subject: beta 2012.10.15 23:12 --- tex/context/base/chem-str.lua | 19 ++++++------ tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4144 -> 4144 bytes tex/context/base/context-version.png | Bin 106760 -> 106151 bytes tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/phys-dim.lua | 32 ++++++++++----------- tex/context/base/status-files.pdf | Bin 24573 -> 24587 bytes tex/context/base/status-lua.pdf | Bin 195374 -> 195370 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 11 files changed, 32 insertions(+), 29 deletions(-) (limited to 'tex') diff --git a/tex/context/base/chem-str.lua b/tex/context/base/chem-str.lua index 3c1b88123..34b5ba7af 100644 --- a/tex/context/base/chem-str.lua +++ b/tex/context/base/chem-str.lua @@ -208,20 +208,22 @@ local text = (equal * C(P(1)^0)) + Cc(false) local pattern = (amount + Cc(1)) * - operation * - special * ( + Cs(operation/lower) * + Cs(special/lower) * ( +-- operation * +-- special * ( range * Cc(false) * text + Cc(false) * Cc(false) * set * text + single * Cc(false) * Cc(false) * text + Cc(false) * Cc(false) * Cc(false) * text ) ---~ local n, operation, index, upto, set, text = lpegmatch(pattern,"RZ1357") +-- local n, operation, index, upto, set, text = lpegmatch(pattern,"RZ1357") ---~ print(lpegmatch(pattern,"RZ=x")) 1 RZ false false false x ---~ print(lpegmatch(pattern,"RZ1=x")) 1 RZ 1 false false x ---~ print(lpegmatch(pattern,"RZ1..3=x")) 1 RZ 1 3 false x ---~ print(lpegmatch(pattern,"RZ13=x")) 1 RZ false false table x +-- print(lpegmatch(pattern,"RZ=x")) -- 1 RZ false false false x +-- print(lpegmatch(pattern,"RZ1=x")) -- 1 RZ 1 false false x +-- print(lpegmatch(pattern,"RZ1..3=x")) -- 1 RZ 1 3 false x +-- print(lpegmatch(pattern,"RZ13=x")) -- 1 RZ false false table x local function process(spec,text,n,rulethickness,rulecolor,offset) insert(stack,{ spec=spec, text=text, n=n }) @@ -480,7 +482,8 @@ end function chemistry.component(spec,text,settings) rulethickness, rulecolor, offset = settings.rulethickness, settings.rulecolor - local spec = settings_to_array(lower(spec)) +-- local spec = settings_to_array(lower(spec)) + local spec = settings_to_array(spec) local text = settings_to_array(text) metacode[#metacode+1] = "chem_start_component ;" process(spec,text,1,rulethickness,rulecolor) diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index 902ea5681..cd12d88c5 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.10.15 22:38} +\newcontextversion{2012.10.15 23:12} %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 015cdcffc..1ec6b988d 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.10.15 22:38} +\newcontextversion{2012.10.15 23:12} %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 80f16daa8..0a9f2db52 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 10e66ac9c..b169c45ed 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 42ccf76d5..e0a325132 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.10.15 22:38} +\edef\contextversion{2012.10.15 23:12} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index bf7794936..494ae4072 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.10.15 22:38} +\edef\contextversion{2012.10.15 23:12} %D For those who want to use this: diff --git a/tex/context/base/phys-dim.lua b/tex/context/base/phys-dim.lua index ef891c29e..5b883ac88 100644 --- a/tex/context/base/phys-dim.lua +++ b/tex/context/base/phys-dim.lua @@ -140,27 +140,27 @@ local dnumber = (ddigitspace + ddigit)^1 -- -- fix by WS/SB (needs further testing) -local c_p = (ddigitspace^1 * dskipcomma)^0 -- ___, - * (ddigitspace^0 * ddigit * dintercomma)^0 -- _00, 000, - * ddigitspace^0 * ddigit^0 -- _00 000 +local c_p = (ddigitspace^1 * dskipcomma)^0 -- ___, + * (ddigitspace^0 * ddigit * dintercomma)^0 -- _00, 000, + * ddigitspace^0 * ddigit^0 -- _00 000 * ( - dfinalperiod * ddigit -- .00 - + dskipperiod * dpadding^1 -- .== - + dsemiperiod * ddigit -- :00 - + dsemiperiod * dpadding^1 -- :== + dfinalperiod * ddigit * (dintercomma * ddigit)^0 -- .00 + + dskipperiod * dpadding^1 -- .== + + dsemiperiod * ddigit * (dintercomma * ddigit)^0 -- :00 + + dsemiperiod * dpadding^1 -- :== )^0 - + ddigit -- 00 + + ddigit -- 00 -local p_c = (ddigitspace^1 * dskipperiod)^0 -- ___. - * (ddigitspace^0 * ddigit * dinterperiod)^0 -- _00. 000. - * ddigitspace^0 * ddigit^0 -- _00 000 +local p_c = (ddigitspace^1 * dskipperiod)^0 -- ___. + * (ddigitspace^0 * ddigit * dinterperiod)^0 -- _00. 000. + * ddigitspace^0 * ddigit^0 -- _00 000 * ( - dfinalcomma * ddigit -- ,00 - + dskipcomma * dpadding^1 -- ,== - + dsemicomma * ddigit -- :00 - + dsemicomma * dpadding^1 -- :== + dfinalcomma * ddigit * (dinterperiod * ddigit)^0 -- 00 + + dskipcomma * dpadding^1 -- ,== + + dsemicomma * ddigit * (dinterperiod * ddigit)^0 -- :00 + + dsemicomma * dpadding^1 -- :== )^0 - + ddigit -- 00 + + ddigit -- 00 local p_c_dparser = math_one + math_two + dleader * p_c * dtrailer * dfinal local c_p_dparser = math_one + math_two + dleader * c_p * dtrailer * dfinal diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index 8e80dfbbc..e721baed5 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 4e4cf0d81..e0627ac52 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index f9b122f85..6003239a4 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 : 10/15/12 22:38:49 +-- merge date : 10/15/12 23:12:56 do -- begin closure to overcome local limits and interference -- cgit v1.2.3