diff options
21 files changed, 191 insertions, 123 deletions
diff --git a/tex/context/base/attr-ini.lua b/tex/context/base/attr-ini.lua index d29809706..c382302f0 100644 --- a/tex/context/base/attr-ini.lua +++ b/tex/context/base/attr-ini.lua @@ -106,3 +106,41 @@ commands.defineattribute = attributes.define function commands.getprivateattribute(name) context(attributes.private(name)) end + +-- rather special + +local store = { } + +function commands.savecurrentattributes(name) + name = name or "" + local n = node.current_attr() + n = n and n.next + local t = { } + while n do + t[n.number] = n.value + n = n.next + end + store[name] = { + attr = t, + font = font.current(), + } +end + +function commands.restorecurrentattributes(name) + name = name or "" + local t = store[name] + if t then + local attr = t.attr + local font = t.font + if attr then + for k, v in next, attr do + tex.attribute[k] = v + end + end + if font then + -- tex.font = font + context.getvalue(fonts.hashes.csnames[font]) -- we don't have a direct way yet (will discuss it with taco) + end + end + -- store[name] = nil +end diff --git a/tex/context/base/attr-ini.mkiv b/tex/context/base/attr-ini.mkiv index 38038e743..1bdd67022 100644 --- a/tex/context/base/attr-ini.mkiv +++ b/tex/context/base/attr-ini.mkiv @@ -71,6 +71,11 @@ \def\resetallattributes{\the\attributesresetlist} +%D Rather special. + +\def\savecurrentattributes #1{\ctxcommand{savecurrentattributes ("#1")}} +\def\restorecurrentattributes#1{\ctxcommand{restorecurrentattributes("#1")}} + %D For the moment we put this here (later it will move to where it's used): \definesystemattribute [state] diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index df1d5f965..d5242bf5b 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{2011.10.01 10:48} +\newcontextversion{2011.10.02 14:35} %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 e016a0439..0a6b3eec2 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{2011.10.01 10:48} +\newcontextversion{2011.10.02 14:35} %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 cc6037196..144307f33 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 b60bce49d..3ccefb0c0 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 6992af5ef..624d447e6 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{2011.10.01 10:48} +\edef\contextversion{2011.10.02 14:35} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 5ff6de2ce..e92d9dcac 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.10.01 10:48} +\edef\contextversion{2011.10.02 14:35} %D For those who want to use this: diff --git a/tex/context/base/core-con.lua b/tex/context/base/core-con.lua index 46fc69eaa..4ddc9e0b6 100644 --- a/tex/context/base/core-con.lua +++ b/tex/context/base/core-con.lua @@ -803,8 +803,7 @@ end -- a prelude to a function that we can use at the lua end --- historic : day+ month:mnem --- maybe better: day:ord month:mmem +-- day:ord month:mmem function commands.currentdate(str,currentlanguage) -- j and jj obsolete local list = utilities.parsers.settings_to_array(str) @@ -812,7 +811,7 @@ function commands.currentdate(str,currentlanguage) -- j and jj obsolete local auto = true for i=1,#list do local entry = list[i] - local tag, plus = match(entry,"^([^%+:]+)(.*)$") + local tag, plus = languages.labels.split(entry) local ordinal, mnemonic, whatordinal = false, false, nil if not tag then tag = entry diff --git a/tex/context/base/lang-lab.lua b/tex/context/base/lang-lab.lua index d113922a1..91b843beb 100644 --- a/tex/context/base/lang-lab.lua +++ b/tex/context/base/lang-lab.lua @@ -62,56 +62,80 @@ if not modules then modules = { } end modules ['lang-lab'] = { local format, find = string.format, string.find local next, rawget, type = next, rawget, type local prtcatcodes = tex.prtcatcodes +local lpegmatch = lpeg.match -languages.labels = languages.labels or { } - -local trace_labels = false trackers.register("languages.labels", function(v) trace_labels = v end) +languages.labels = languages.labels or { } +local trace_labels = false trackers.register("languages.labels", function(v) trace_labels = v end) local report_labels = logs.reporter("languages","labels") -function languages.labels.define() - local variables = interfaces.variables - local data = languages.data.labels - local function define(command,list,prefixed) - if list then - context.pushcatcodes(prtcatcodes) -- context.unprotect - for tag, data in next, list do - if data.hidden then - -- skip - else - for language, text in next, data.labels do - if text == "" then - -- skip - elseif prefixed and rawget(variables,tag) then - if type(text) == "table" then - context("\\%s[%s][\\v!%s={{%s},{%s}}]",command,language,tag,text[1],text[2]) - else - context("\\%s[%s][\\v!%s={{%s},}]",command,language,tag,text) - end +local variables = interfaces.variables + +local splitter = lpeg.splitat(":") + +local function split(tag) + return lpegmatch(splitter,tag) +end + +languages.labels.split = split + +local function definelanguagelabels(data,command,tag,rawtag) + for language, text in next, data.labels do + if text == "" then + -- skip + elseif type(text) == "table" then + context("\\%s[%s][%s={{%s},{%s}}]",command,language,tag,text[1],text[2]) + if trace_labels then + report_labels("language '%s', defining label '%s' as '%s' and '%s'",language,rawtag,text[1],text[2]) + end + else + context("\\%s[%s][%s={{%s},}]",command,language,tag,text) + if trace_labels then + report_labels("language '%s', defining label '%s' as '%s'",language,rawtag,text) + end + end + end +end + +local function definelabels(command,list,prefixed) + if list then + context.pushcatcodes(prtcatcodes) -- context.unprotect + for tag, data in next, list do + if data.hidden then + -- skip + elseif prefixed then + local first, second = lpegmatch(splitter,tag) + if second then + if rawget(variables,first) then + if rawget(variables,second) then + definelanguagelabels(data,command,format("\\v!%s:\\v!%s",first,second),tag) else - if type(text) == "table" then - context("\\%s[%s][%s={{%s},{%s}}]",command,language,tag,text[1],text[2]) - else - context("\\%s[%s][%s={{%s},}]",command,language,tag,text) - end - end - if trace_labels then - if type(text) == "table" then - report_labels("language '%s', defining label '%s' as '%s' and '%s'",language,tag,text[1],text[2]) - else - report_labels("language '%s', defining label '%s' as '%s'",language,tag,text) - end + definelanguagelabels(data,command,format("\\v!%s:%s",first,second),tag) end + elseif rawget(variables,second) then + definelanguagelabels(data,command,format("%s:\\v!%s",first,second),tag) + else + definelanguagelabels(data,command,format("%s:%s",first,second),tag) end + elseif rawget(variables,rawtag) then + definelanguagelabels(data,command,format("\\v!%s",tag),tag) + else + definelanguagelabels(data,command,tag,tag) end + else + definelanguagelabels(data,command,tag,tag) end - context.popcatcodes() -- context.protect end + context.popcatcodes() -- context.protect end - define("setupheadtext", data.titles, true) - define("setuplabeltext", data.texts, true) - define("setupmathlabeltext", data.functions) - define("setuptaglabeltext", data.tags) +end + +function languages.labels.define() + local data = languages.data.labels + definelabels("setupheadtext", data.titles, true) + definelabels("setuplabeltext", data.texts, true) + definelabels("setupmathlabeltext", data.functions) + definelabels("setuptaglabeltext", data.tags) end --~ function languages.labels.check() diff --git a/tex/context/base/mult-de.mkii b/tex/context/base/mult-de.mkii index 6fcbc3463..8e54cb3a6 100644 --- a/tex/context/base/mult-de.mkii +++ b/tex/context/base/mult-de.mkii @@ -72,11 +72,11 @@ \setinterfacevariable{answerarea}{answerarea} \setinterfacevariable{appendices}{anhaenge} \setinterfacevariable{appendix}{anhang} -\setinterfacevariable{april}{April} +\setinterfacevariable{april}{april} \setinterfacevariable{atmargin}{amrand} \setinterfacevariable{atpage}{aufseite} \setinterfacevariable{attachment}{attachment} -\setinterfacevariable{august}{August} +\setinterfacevariable{august}{august} \setinterfacevariable{author}{autor} \setinterfacevariable{auto}{auto} \setinterfacevariable{autointro}{autointro} @@ -134,7 +134,7 @@ \setinterfacevariable{cutspace}{cutspace} \setinterfacevariable{date}{datum} \setinterfacevariable{day}{tag} -\setinterfacevariable{december}{Dezember} +\setinterfacevariable{december}{dezember} \setinterfacevariable{default}{default} \setinterfacevariable{depth}{tiefe} \setinterfacevariable{description}{beschreibung} @@ -154,7 +154,7 @@ \setinterfacevariable{even}{gerade} \setinterfacevariable{external}{extern} \setinterfacevariable{fact}{gegeben} -\setinterfacevariable{february}{Februar} +\setinterfacevariable{february}{februar} \setinterfacevariable{figure}{abbildung} \setinterfacevariable{figures}{abbildungen} \setinterfacevariable{file}{datei} @@ -232,10 +232,10 @@ \setinterfacevariable{item}{pos} \setinterfacevariable{itemize}{aufzaehlung} \setinterfacevariable{its}{its} -\setinterfacevariable{january}{Januar} +\setinterfacevariable{january}{januar} \setinterfacevariable{joinedup}{keinabstand} -\setinterfacevariable{july}{Juli} -\setinterfacevariable{june}{Juni} +\setinterfacevariable{july}{juli} +\setinterfacevariable{june}{juni} \setinterfacevariable{keep}{behalte} \setinterfacevariable{knockout}{knockout} \setinterfacevariable{label}{label} @@ -268,7 +268,7 @@ \setinterfacevariable{ls}{ls} \setinterfacevariable{makeup}{umbruch} \setinterfacevariable{mar}{mar} -\setinterfacevariable{march}{Maerz} +\setinterfacevariable{march}{maerz} \setinterfacevariable{margin}{marginalie} \setinterfacevariable{marginedge}{marginalkante} \setinterfacevariable{margintitle}{marginaltitel} @@ -281,7 +281,7 @@ \setinterfacevariable{maxdepth}{maxdepth} \setinterfacevariable{maxheight}{maxheight} \setinterfacevariable{maxwidth}{maxwidth} -\setinterfacevariable{may}{Mai} +\setinterfacevariable{may}{mai} \setinterfacevariable{mediaeval}{mittelalterlich} \setinterfacevariable{medium}{mittel} \setinterfacevariable{middle}{mittig} @@ -318,12 +318,12 @@ \setinterfacevariable{note}{note} \setinterfacevariable{nothanging}{nothanging} \setinterfacevariable{nothyphenated}{nothyphenated} -\setinterfacevariable{november}{November} +\setinterfacevariable{november}{november} \setinterfacevariable{nowhere}{nirgens} \setinterfacevariable{nowhite}{keinweiss} \setinterfacevariable{number}{nummer} \setinterfacevariable{numbers}{ziffern} -\setinterfacevariable{october}{Oktober} +\setinterfacevariable{october}{oktober} \setinterfacevariable{odd}{ungerade} \setinterfacevariable{off}{aus} \setinterfacevariable{offset}{offset} @@ -404,7 +404,7 @@ \setinterfacevariable{sectionblockenvironment}{sectionblockenvironment} \setinterfacevariable{sectionnumber}{abschnittsnummer} \setinterfacevariable{see}{sieh} -\setinterfacevariable{september}{September} +\setinterfacevariable{september}{september} \setinterfacevariable{serif}{serif} \setinterfacevariable{serried}{kleinerabstand} \setinterfacevariable{setups}{impostazioni} diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mult-def.lua index 28ebeb7ac..f31d511f5 100644 --- a/tex/context/base/mult-def.lua +++ b/tex/context/base/mult-def.lua @@ -12044,8 +12044,8 @@ return { }, ["april"]={ ["cs"]="duben", - ["de"]="April", - ["en"]="April", + ["de"]="april", + ["en"]="april", ["fr"]="avril", ["it"]="aprile", ["nl"]="april", @@ -12078,8 +12078,8 @@ return { }, ["august"]={ ["cs"]="srpen", - ["de"]="August", - ["en"]="August", + ["de"]="august", + ["en"]="august", ["fr"]="août", ["it"]="agosto", ["nl"]="augustus", @@ -12592,8 +12592,8 @@ return { }, ["december"]={ ["cs"]="prosinec", - ["de"]="Dezember", - ["en"]="December", + ["de"]="dezember", + ["en"]="december", ["fr"]="decembre", ["it"]="dicembre", ["nl"]="december", @@ -12762,8 +12762,8 @@ return { }, ["february"]={ ["cs"]="unor", - ["de"]="Februar", - ["en"]="February", + ["de"]="februar", + ["en"]="february", ["fr"]="fevrier", ["it"]="febbraio", ["nl"]="februari", @@ -13542,8 +13542,8 @@ return { }, ["january"]={ ["cs"]="leden", - ["de"]="Januar", - ["en"]="January", + ["de"]="januar", + ["en"]="january", ["fr"]="janvier", ["it"]="gennaio", ["nl"]="januari", @@ -13562,8 +13562,8 @@ return { }, ["july"]={ ["cs"]="cervenec", - ["de"]="Juli", - ["en"]="July", + ["de"]="juli", + ["en"]="july", ["fr"]="juillet", ["it"]="luglio", ["nl"]="juli", @@ -13572,8 +13572,8 @@ return { }, ["june"]={ ["cs"]="cerven", - ["de"]="Juni", - ["en"]="June", + ["de"]="juni", + ["en"]="june", ["fr"]="juin", ["it"]="giugno", ["nl"]="juni", @@ -13902,8 +13902,8 @@ return { }, ["march"]={ ["cs"]="brezen", - ["de"]="Maerz", - ["en"]="March", + ["de"]="maerz", + ["en"]="march", ["fr"]="mars", ["it"]="marzo", ["nl"]="maart", @@ -14002,8 +14002,8 @@ return { }, ["may"]={ ["cs"]="kveten", - ["de"]="Mai", - ["en"]="May", + ["de"]="mai", + ["en"]="may", ["fr"]="mai", ["it"]="maggio", ["nl"]="mei", @@ -14355,8 +14355,8 @@ return { }, ["november"]={ ["cs"]="listopad", - ["de"]="November", - ["en"]="November", + ["de"]="november", + ["en"]="november", ["fr"]="novembre", ["it"]="novembre", ["nl"]="november", @@ -14405,8 +14405,8 @@ return { }, ["october"]={ ["cs"]="rijen", - ["de"]="Oktober", - ["en"]="October", + ["de"]="oktober", + ["en"]="october", ["fr"]="octobre", ["it"]="ottobre", ["nl"]="oktober", @@ -15169,8 +15169,8 @@ return { }, ["september"]={ ["cs"]="zari", - ["de"]="September", - ["en"]="September", + ["de"]="september", + ["en"]="september", ["fr"]="septembre", ["it"]="settembre", ["nl"]="september", diff --git a/tex/context/base/mult-en.mkii b/tex/context/base/mult-en.mkii index a5e01fdb8..54419eb3a 100644 --- a/tex/context/base/mult-en.mkii +++ b/tex/context/base/mult-en.mkii @@ -72,11 +72,11 @@ \setinterfacevariable{answerarea}{answerarea} \setinterfacevariable{appendices}{appendices} \setinterfacevariable{appendix}{appendix} -\setinterfacevariable{april}{April} +\setinterfacevariable{april}{april} \setinterfacevariable{atmargin}{atmargin} \setinterfacevariable{atpage}{atpage} \setinterfacevariable{attachment}{attachment} -\setinterfacevariable{august}{August} +\setinterfacevariable{august}{august} \setinterfacevariable{author}{author} \setinterfacevariable{auto}{auto} \setinterfacevariable{autointro}{autointro} @@ -134,7 +134,7 @@ \setinterfacevariable{cutspace}{cutspace} \setinterfacevariable{date}{date} \setinterfacevariable{day}{day} -\setinterfacevariable{december}{December} +\setinterfacevariable{december}{december} \setinterfacevariable{default}{default} \setinterfacevariable{depth}{depth} \setinterfacevariable{description}{description} @@ -154,7 +154,7 @@ \setinterfacevariable{even}{even} \setinterfacevariable{external}{external} \setinterfacevariable{fact}{fact} -\setinterfacevariable{february}{February} +\setinterfacevariable{february}{february} \setinterfacevariable{figure}{figure} \setinterfacevariable{figures}{figures} \setinterfacevariable{file}{file} @@ -232,10 +232,10 @@ \setinterfacevariable{item}{item} \setinterfacevariable{itemize}{itemize} \setinterfacevariable{its}{its} -\setinterfacevariable{january}{January} +\setinterfacevariable{january}{january} \setinterfacevariable{joinedup}{joinedup} -\setinterfacevariable{july}{July} -\setinterfacevariable{june}{June} +\setinterfacevariable{july}{july} +\setinterfacevariable{june}{june} \setinterfacevariable{keep}{keep} \setinterfacevariable{knockout}{knockout} \setinterfacevariable{label}{label} @@ -268,7 +268,7 @@ \setinterfacevariable{ls}{ls} \setinterfacevariable{makeup}{makeup} \setinterfacevariable{mar}{mar} -\setinterfacevariable{march}{March} +\setinterfacevariable{march}{march} \setinterfacevariable{margin}{margin} \setinterfacevariable{marginedge}{marginedge} \setinterfacevariable{margintitle}{margintitle} @@ -281,7 +281,7 @@ \setinterfacevariable{maxdepth}{maxdepth} \setinterfacevariable{maxheight}{maxheight} \setinterfacevariable{maxwidth}{maxwidth} -\setinterfacevariable{may}{May} +\setinterfacevariable{may}{may} \setinterfacevariable{mediaeval}{mediaeval} \setinterfacevariable{medium}{medium} \setinterfacevariable{middle}{middle} @@ -318,12 +318,12 @@ \setinterfacevariable{note}{note} \setinterfacevariable{nothanging}{nothanging} \setinterfacevariable{nothyphenated}{nothyphenated} -\setinterfacevariable{november}{November} +\setinterfacevariable{november}{november} \setinterfacevariable{nowhere}{nowhere} \setinterfacevariable{nowhite}{nowhite} \setinterfacevariable{number}{number} \setinterfacevariable{numbers}{numbers} -\setinterfacevariable{october}{October} +\setinterfacevariable{october}{october} \setinterfacevariable{odd}{odd} \setinterfacevariable{off}{off} \setinterfacevariable{offset}{offset} @@ -404,7 +404,7 @@ \setinterfacevariable{sectionblockenvironment}{sectionblockenvironment} \setinterfacevariable{sectionnumber}{sectionnumber} \setinterfacevariable{see}{see} -\setinterfacevariable{september}{September} +\setinterfacevariable{september}{september} \setinterfacevariable{serif}{serif} \setinterfacevariable{serried}{serried} \setinterfacevariable{setups}{setups} diff --git a/tex/context/base/page-one.mkiv b/tex/context/base/page-one.mkiv index ec22dca72..ef2f55752 100644 --- a/tex/context/base/page-one.mkiv +++ b/tex/context/base/page-one.mkiv @@ -194,7 +194,7 @@ \ifnum\rootfloatparameter\c!nlines>\zerocount \ifdim\totaltopinserted>\zeropoint\relax \ifdim\dimexpr\rootfloatparameter\c!nlines\lineheight+\totaltopinserted\relax>\textheight - \showmessage\m!floatblocks8\rootfloatparameter\c!nlines + \showmessage\m!floatblocks8{\rootfloatparameter\c!nlines}% \vfilll\eject \fi \fi diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex a924c0fa0..be86d48a0 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 5cfbd901e..da69c5567 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/strc-num.mkiv b/tex/context/base/strc-num.mkiv index 2fd8d3e72..0d9d30ab4 100644 --- a/tex/context/base/strc-num.mkiv +++ b/tex/context/base/strc-num.mkiv @@ -185,7 +185,7 @@ \def\dorestartsubstructurecounter [#1][#2]#3{\ctxcommand{restartstructurecounter ("\@@thestructurecounter{#1}",#2,#3)}} \def\doincrementsubstructurecounter [#1][#2]{\ctxcommand{incrementedstructurecounter("\@@thestructurecounter{#1}",#2,1)}} \def\dodecrementsubstructurecounter [#1][#2]{\ctxcommand{incrementedstructurecounter("\@@thestructurecounter{#1}",#2,-1)}} -\def\dorawsubstructurecounter [#1][#2]{\ctxcommand{valuestructurecounter ("\@@thestructurecounter{#1}",#2)}} +\def\dorawsubstructurecounter [#1][#2]{\ctxcommand{structurecountervalue ("\@@thestructurecounter{#1}",#2)}} \def\dolastsubstructurecounter [#1][#2]{\ctxcommand{laststructurecounter ("\@@thestructurecounter{#1}",#2)}} \def\dofirstsubstructurecounter [#1][#2]{\ctxcommand{firststructurecounter ("\@@thestructurecounter{#1}",#2)}} \def\dosubstructurecountersubs [#1][#2]{\ctxcommand{structurecountersubs ("\@@thestructurecounter{#1}",#2)}} diff --git a/tex/context/base/supp-box.mkiv b/tex/context/base/supp-box.mkiv index c67c46b3e..ff15d29f9 100644 --- a/tex/context/base/supp-box.mkiv +++ b/tex/context/base/supp-box.mkiv @@ -1303,14 +1303,16 @@ \unexpanded\def\processisolatedchars#1#2% {\dontleavehmode \begingroup - \setbox\scratchbox\normalhbox{#1}% + \setbox\scratchbox\normalhbox{\settrialtypesetting#2{\savecurrentattributes{pic}}}% + \setbox\scratchbox\normalhbox{\restorecurrentattributes{pic}#1}% \ctxcommand{applytochars(\number\scratchbox,"\strippedcsname#2",true)}% \endgroup} \unexpanded\def\processisolatedwords#1#2% {\dontleavehmode \begingroup - \setbox\scratchbox\normalhbox{#1}% + \setbox\scratchbox\normalhbox{\settrialtypesetting#2{\savecurrentattributes{pic}}}% + \setbox\scratchbox\normalhbox{\restorecurrentattributes{pic}#1}% \ctxcommand{applytowords(\number\scratchbox,"\strippedcsname#2",true)}% \endgroup} diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index 5ef5ad82e..eb835dd40 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -75,11 +75,11 @@ <cd:variable name='answerarea' value='answerarea'/> <cd:variable name='appendices' value='anhaenge'/> <cd:variable name='appendix' value='anhang'/> - <cd:variable name='april' value='April'/> + <cd:variable name='april' value='april'/> <cd:variable name='atmargin' value='amrand'/> <cd:variable name='atpage' value='aufseite'/> <cd:variable name='attachment' value='attachment'/> - <cd:variable name='august' value='August'/> + <cd:variable name='august' value='august'/> <cd:variable name='author' value='autor'/> <cd:variable name='auto' value='auto'/> <cd:variable name='autointro' value='autointro'/> @@ -137,7 +137,7 @@ <cd:variable name='cutspace' value='cutspace'/> <cd:variable name='date' value='datum'/> <cd:variable name='day' value='tag'/> - <cd:variable name='december' value='Dezember'/> + <cd:variable name='december' value='dezember'/> <cd:variable name='default' value='default'/> <cd:variable name='depth' value='tiefe'/> <cd:variable name='description' value='beschreibung'/> @@ -157,7 +157,7 @@ <cd:variable name='even' value='gerade'/> <cd:variable name='external' value='extern'/> <cd:variable name='fact' value='gegeben'/> - <cd:variable name='february' value='Februar'/> + <cd:variable name='february' value='februar'/> <cd:variable name='figure' value='abbildung'/> <cd:variable name='figures' value='abbildungen'/> <cd:variable name='file' value='datei'/> @@ -235,10 +235,10 @@ <cd:variable name='item' value='pos'/> <cd:variable name='itemize' value='aufzaehlung'/> <cd:variable name='its' value='its'/> - <cd:variable name='january' value='Januar'/> + <cd:variable name='january' value='januar'/> <cd:variable name='joinedup' value='keinabstand'/> - <cd:variable name='july' value='Juli'/> - <cd:variable name='june' value='Juni'/> + <cd:variable name='july' value='juli'/> + <cd:variable name='june' value='juni'/> <cd:variable name='keep' value='behalte'/> <cd:variable name='knockout' value='knockout'/> <cd:variable name='label' value='label'/> @@ -271,7 +271,7 @@ <cd:variable name='ls' value='ls'/> <cd:variable name='makeup' value='umbruch'/> <cd:variable name='mar' value='mar'/> - <cd:variable name='march' value='Maerz'/> + <cd:variable name='march' value='maerz'/> <cd:variable name='margin' value='marginalie'/> <cd:variable name='marginedge' value='marginalkante'/> <cd:variable name='margintitle' value='marginaltitel'/> @@ -284,7 +284,7 @@ <cd:variable name='maxdepth' value='maxdepth'/> <cd:variable name='maxheight' value='maxheight'/> <cd:variable name='maxwidth' value='maxwidth'/> - <cd:variable name='may' value='Mai'/> + <cd:variable name='may' value='mai'/> <cd:variable name='mediaeval' value='mittelalterlich'/> <cd:variable name='medium' value='mittel'/> <cd:variable name='middle' value='mittig'/> @@ -321,12 +321,12 @@ <cd:variable name='note' value='note'/> <cd:variable name='nothanging' value='nothanging'/> <cd:variable name='nothyphenated' value='nothyphenated'/> - <cd:variable name='november' value='November'/> + <cd:variable name='november' value='november'/> <cd:variable name='nowhere' value='nirgens'/> <cd:variable name='nowhite' value='keinweiss'/> <cd:variable name='number' value='nummer'/> <cd:variable name='numbers' value='ziffern'/> - <cd:variable name='october' value='Oktober'/> + <cd:variable name='october' value='oktober'/> <cd:variable name='odd' value='ungerade'/> <cd:variable name='off' value='aus'/> <cd:variable name='offset' value='offset'/> @@ -407,7 +407,7 @@ <cd:variable name='sectionblockenvironment' value='sectionblockenvironment'/> <cd:variable name='sectionnumber' value='abschnittsnummer'/> <cd:variable name='see' value='sieh'/> - <cd:variable name='september' value='September'/> + <cd:variable name='september' value='september'/> <cd:variable name='serif' value='serif'/> <cd:variable name='serried' value='kleinerabstand'/> <cd:variable name='setups' value='impostazioni'/> diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index edeec95b8..6dc425917 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -75,11 +75,11 @@ <cd:variable name='answerarea' value='answerarea'/> <cd:variable name='appendices' value='appendices'/> <cd:variable name='appendix' value='appendix'/> - <cd:variable name='april' value='April'/> + <cd:variable name='april' value='april'/> <cd:variable name='atmargin' value='atmargin'/> <cd:variable name='atpage' value='atpage'/> <cd:variable name='attachment' value='attachment'/> - <cd:variable name='august' value='August'/> + <cd:variable name='august' value='august'/> <cd:variable name='author' value='author'/> <cd:variable name='auto' value='auto'/> <cd:variable name='autointro' value='autointro'/> @@ -137,7 +137,7 @@ <cd:variable name='cutspace' value='cutspace'/> <cd:variable name='date' value='date'/> <cd:variable name='day' value='day'/> - <cd:variable name='december' value='December'/> + <cd:variable name='december' value='december'/> <cd:variable name='default' value='default'/> <cd:variable name='depth' value='depth'/> <cd:variable name='description' value='description'/> @@ -157,7 +157,7 @@ <cd:variable name='even' value='even'/> <cd:variable name='external' value='external'/> <cd:variable name='fact' value='fact'/> - <cd:variable name='february' value='February'/> + <cd:variable name='february' value='february'/> <cd:variable name='figure' value='figure'/> <cd:variable name='figures' value='figures'/> <cd:variable name='file' value='file'/> @@ -235,10 +235,10 @@ <cd:variable name='item' value='item'/> <cd:variable name='itemize' value='itemize'/> <cd:variable name='its' value='its'/> - <cd:variable name='january' value='January'/> + <cd:variable name='january' value='january'/> <cd:variable name='joinedup' value='joinedup'/> - <cd:variable name='july' value='July'/> - <cd:variable name='june' value='June'/> + <cd:variable name='july' value='july'/> + <cd:variable name='june' value='june'/> <cd:variable name='keep' value='keep'/> <cd:variable name='knockout' value='knockout'/> <cd:variable name='label' value='label'/> @@ -271,7 +271,7 @@ <cd:variable name='ls' value='ls'/> <cd:variable name='makeup' value='makeup'/> <cd:variable name='mar' value='mar'/> - <cd:variable name='march' value='March'/> + <cd:variable name='march' value='march'/> <cd:variable name='margin' value='margin'/> <cd:variable name='marginedge' value='marginedge'/> <cd:variable name='margintitle' value='margintitle'/> @@ -284,7 +284,7 @@ <cd:variable name='maxdepth' value='maxdepth'/> <cd:variable name='maxheight' value='maxheight'/> <cd:variable name='maxwidth' value='maxwidth'/> - <cd:variable name='may' value='May'/> + <cd:variable name='may' value='may'/> <cd:variable name='mediaeval' value='mediaeval'/> <cd:variable name='medium' value='medium'/> <cd:variable name='middle' value='middle'/> @@ -321,12 +321,12 @@ <cd:variable name='note' value='note'/> <cd:variable name='nothanging' value='nothanging'/> <cd:variable name='nothyphenated' value='nothyphenated'/> - <cd:variable name='november' value='November'/> + <cd:variable name='november' value='november'/> <cd:variable name='nowhere' value='nowhere'/> <cd:variable name='nowhite' value='nowhite'/> <cd:variable name='number' value='number'/> <cd:variable name='numbers' value='numbers'/> - <cd:variable name='october' value='October'/> + <cd:variable name='october' value='october'/> <cd:variable name='odd' value='odd'/> <cd:variable name='off' value='off'/> <cd:variable name='offset' value='offset'/> @@ -407,7 +407,7 @@ <cd:variable name='sectionblockenvironment' value='sectionblockenvironment'/> <cd:variable name='sectionnumber' value='sectionnumber'/> <cd:variable name='see' value='see'/> - <cd:variable name='september' value='September'/> + <cd:variable name='september' value='september'/> <cd:variable name='serif' value='serif'/> <cd:variable name='serried' value='serried'/> <cd:variable name='setups' value='setups'/> diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index ab366de23..5544161de 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/01/11 10:48:20 +-- merge date : 10/02/11 14:35:52 do -- begin closure to overcome local limits and interference |
