diff options
25 files changed, 419 insertions, 7 deletions
diff --git a/context/data/scite/lexers/scite-context-lexer-tex.lua b/context/data/scite/lexers/scite-context-lexer-tex.lua index cbe6d261d..34c88b16b 100644 --- a/context/data/scite/lexers/scite-context-lexer-tex.lua +++ b/context/data/scite/lexers/scite-context-lexer-tex.lua @@ -413,7 +413,7 @@ local metafuncall = ( P("reusable") + P("usable") + P("unique") + P(" + P("MPpositiongraphic") local metafunenvironment = metafuncall -- ( P("use") + P("reusable") + P("unique") ) * ("MPgraphic") - + P("MP") * ( P("code")+ P("page") + P("inclusions") + P("initializations") + P("definitions") + P("extensions") + P("graphic") ) + + P("MP") * ( P("code")+ P("page") + P("inclusions") + P("initializations") + P("definitions") + P("extensions") + P("graphic") + P("calculation") ) local startmetafun = P("\\start") * metafunenvironment local stopmetafun = P("\\stop") * metafunenvironment -- todo match start diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index d0472ac24..74fc7d4fa 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{2013.09.11 01:32} +\newcontextversion{2013.09.11 11:46} %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 Binary files differindex 21b7ddaa1..552000037 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 5ec23b41c..b1911ab51 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{2013.09.11 01:32} +\edef\contextversion{2013.09.11 11:46} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/meta-ini.mkiv b/tex/context/base/meta-ini.mkiv index 78d17b95d..32f72cfe6 100644 --- a/tex/context/base/meta-ini.mkiv +++ b/tex/context/base/meta-ini.mkiv @@ -1364,6 +1364,67 @@ defaultcolormodel := \ifcase\MPcolormethod1\or1\or3\else3\fi; \stopMPinitializations +%D macros +%D {mprunvar,mpruntab,mprunset} +%D +%D \starttyping +%D \startMPcode +%D passvariable("version","1.0") ; +%D passvariable("number",123) ; +%D passvariable("string","whatever") ; +%D passvariable("point",(1.5,2.8)) ; +%D passvariable("triplet",(1/1,1/2,1/3)) ; +%D passvariable("quad",(1.1,2.2,3.3,4.4)) ; +%D passvariable("boolean",false) ; +%D passvariable("path",fullcircle scaled 1cm) ; +%D draw fullcircle scaled 20pt ; +%D \stopMPcode +%D +%D \ctxlua{inspect(metapost.variables)} +%D +%D \MPrunvar{version} \MPruntab{quad}{3} (\MPrunset{triplet}{,}) +%D +%D $(x,y) = (\MPruntab{point}{1},\MPruntab{point}{2})$ +%D $(x,y) = (\MPrunset{point}{,})$ +%D \stoptyping + +\def\MPrunvar #1{\ctxcommand{mprunvar("#1")}} \let\mprunvar\MPrunvar +\def\MPruntab#1#2{\ctxcommand{mprunvar("#1",\number#2)}} \let\mpruntab\MPruntab +\def\MPrunset#1#2{\ctxcommand{mprunvar("#1","#2")}} \let\mprunset\MPrunset + +%D We also provide an outputless run: + +\unexpanded\def\startMPcalculation + {\begingroup + \setbox\nextbox\hbox\bgroup + \dosinglegroupempty\meta_start_calculation} + +\def\meta_start_calculation + {\iffirstargument + \expandafter\meta_start_calculation_instance + \else + \expandafter\meta_start_calculation_standard + \fi} + +\def\meta_start_calculation_instance#1#2\stopMPcalculation + {\edef\currentMPinstance{#1}% + \let\currentMPgraphicname\empty + \edef\currentMPformat{\MPinstanceparameter\s!format}% + \meta_enable_include + \meta_process_graphic{#2;draw origin}% + \egroup + \endgroup} + +\def\meta_start_calculation_standard#1#2\stopMPcalculation + {\let\currentMPinstance\defaultMPinstance + \let\currentMPgraphicname\empty + \edef\currentMPformat{\MPinstanceparameter\s!format}% + \meta_process_graphic{#2;draw origin}% + \egroup + \endgroup} + +\let\stopMPcalculation\relax + %D \macros %D {setupMPgraphics} %D diff --git a/tex/context/base/mlib-pdf.lua b/tex/context/base/mlib-pdf.lua index 5e60999c1..4fa97a7c7 100644 --- a/tex/context/base/mlib-pdf.lua +++ b/tex/context/base/mlib-pdf.lua @@ -291,12 +291,19 @@ metapost.lly = 0 metapost.urx = 0 metapost.ury = 0 -function commands.mprunvar(key) +function commands.mprunvar(key,n) local value = metapost.variables[key] if value ~= nil then local tvalue = type(value) if tvalue == "table" then - context(concat(value," ")) + local ntype = type(n) + if ntype == "number" then + context(value[n]) + elseif ntype == "string" then + context(concat(value,n)) + else + context(concat(value," ")) + end elseif tvalue == "number" or tvalue == "boolean" then context(tostring(value)) elseif tvalue == "string" then diff --git a/tex/context/base/mult-de.mkii b/tex/context/base/mult-de.mkii index 7e8995bef..5f2714ce6 100644 --- a/tex/context/base/mult-de.mkii +++ b/tex/context/base/mult-de.mkii @@ -281,6 +281,7 @@ \setinterfacevariable{marginedge}{marginalkante} \setinterfacevariable{margintitle}{marginaltitel} \setinterfacevariable{marking}{beschriftung} +\setinterfacevariable{math}{math} \setinterfacevariable{mathalignment}{mathalignment} \setinterfacevariable{mathcases}{mathcases} \setinterfacevariable{mathematics}{mathematik} @@ -414,12 +415,14 @@ \setinterfacevariable{sectionblockenvironment}{sectionblockenvironment} \setinterfacevariable{sectionnumber}{abschnittsnummer} \setinterfacevariable{see}{sieh} +\setinterfacevariable{selectfont}{selectfont} \setinterfacevariable{september}{september} \setinterfacevariable{serif}{serif} \setinterfacevariable{serried}{kleinerabstand} \setinterfacevariable{setups}{impostazioni} \setinterfacevariable{sheet}{sheet} \setinterfacevariable{short}{kurz} +\setinterfacevariable{simplefonts}{simplefonts} \setinterfacevariable{singlesided}{einzelseitig} \setinterfacevariable{slanted}{geneigt} \setinterfacevariable{slantedbold}{geneigtfett} @@ -593,6 +596,12 @@ \setinterfaceconstant{blockway}{blockauf} \setinterfaceconstant{bodyfont}{fliesstext} \setinterfaceconstant{boffset}{boffset} +\setinterfaceconstant{boldfeatures}{boldfeatures} +\setinterfaceconstant{boldfont}{boldfont} +\setinterfaceconstant{bolditalicfeatures}{bolditalicfeatures} +\setinterfaceconstant{bolditalicfont}{bolditalicfont} +\setinterfaceconstant{boldslantedfeatures}{boldslantedfeatures} +\setinterfaceconstant{boldslantedfont}{boldslantedfont} \setinterfaceconstant{bookmark}{bookmark} \setinterfaceconstant{bottom}{unten} \setinterfaceconstant{bottomafter}{bottomafter} @@ -608,6 +617,7 @@ \setinterfaceconstant{calculate}{berechnen} \setinterfaceconstant{category}{category} \setinterfaceconstant{ccommand}{cbefehl} +\setinterfaceconstant{check}{check} \setinterfaceconstant{click}{klick} \setinterfaceconstant{clickin}{klickin} \setinterfaceconstant{clickout}{klickaus} @@ -683,6 +693,7 @@ \setinterfaceconstant{factor}{faktor} \setinterfaceconstant{fallback}{fallback} \setinterfaceconstant{family}{familie} +\setinterfaceconstant{features}{features} \setinterfaceconstant{fieldbackgroundcolor}{feldhintergrundfarbe} \setinterfaceconstant{fieldframecolor}{feldrahmenfarbe} \setinterfaceconstant{fieldlayer}{fieldlayer} @@ -712,6 +723,7 @@ \setinterfaceconstant{from}{von} \setinterfaceconstant{get}{hole} \setinterfaceconstant{global}{global} +\setinterfaceconstant{goodies}{goodies} \setinterfaceconstant{grid}{gritter} \setinterfaceconstant{hang}{haengend} \setinterfaceconstant{hcompact}{hcompact} @@ -748,6 +760,8 @@ \setinterfaceconstant{interaction}{interaktion} \setinterfaceconstant{interlinespace}{zeilenabstande} \setinterfaceconstant{internalgrid}{internalgrid} +\setinterfaceconstant{italicfeatures}{italicfeatures} +\setinterfaceconstant{italicfont}{italicfont} \setinterfaceconstant{itemalign}{itemalign} \setinterfaceconstant{items}{posten} \setinterfaceconstant{juniorsep}{juniorsep} @@ -868,6 +882,7 @@ \setinterfaceconstant{openaction}{oeffenaktion} \setinterfaceconstant{openpage}{openpage} \setinterfaceconstant{openpageaction}{openpageaction} +\setinterfaceconstant{opticalsize}{opticalsize} \setinterfaceconstant{option}{option} \setinterfaceconstant{order}{order} \setinterfaceconstant{orientation}{orientation} @@ -935,6 +950,8 @@ \setinterfaceconstant{region}{region} \setinterfaceconstant{regionin}{regionin} \setinterfaceconstant{regionout}{regionaus} +\setinterfaceconstant{regularfeatures}{regularfeatures} +\setinterfaceconstant{regularfont}{regularfont} \setinterfaceconstant{repeat}{wiederholen} \setinterfaceconstant{reset}{reset} \setinterfaceconstant{resetnumber}{resetnumber} @@ -993,7 +1010,11 @@ \setinterfaceconstant{sidespacebefore}{nebenvorspatium} \setinterfaceconstant{sign}{zeichen} \setinterfaceconstant{size}{groesse} +\setinterfaceconstant{slantedfeatures}{slantedfeatures} +\setinterfaceconstant{slantedfont}{slantedfont} \setinterfaceconstant{small}{klein} +\setinterfaceconstant{smallcapsfeatures}{smallcapsfeatures} +\setinterfaceconstant{smallcapsfont}{smallcapsfont} \setinterfaceconstant{solution}{solution} \setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{sorttype} diff --git a/tex/context/base/mult-def.lua b/tex/context/base/mult-def.lua index 8fee30242..afd466531 100644 --- a/tex/context/base/mult-def.lua +++ b/tex/context/base/mult-def.lua @@ -6454,6 +6454,26 @@ return { }, }, ["constants"]={ + -- select/simplefonts + ["regularfont"] ={ ["en"]="regularfont" }, + ["boldfont"] ={ ["en"]="boldfont" }, + ["italicfont"] ={ ["en"]="italicfont" }, + ["slantedfont"] ={ ["en"]="slantedfont" }, + ["bolditalicfont"] ={ ["en"]="bolditalicfont" }, + ["boldslantedfont"] ={ ["en"]="boldslantedfont" }, + ["smallcapsfont"] ={ ["en"]="smallcapsfont" }, + ["features"] ={ ["en"]="features" }, + ["regularfeatures"] ={ ["en"]="regularfeatures" }, + ["boldfeatures"] ={ ["en"]="boldfeatures" }, + ["italicfeatures"] ={ ["en"]="italicfeatures" }, + ["slantedfeatures"] ={ ["en"]="slantedfeatures" }, + ["bolditalicfeatures"] ={ ["en"]="bolditalicfeatures" }, + ["boldslantedfeatures"]={ ["en"]="boldslantedfeatures" }, + ["smallcapsfeatures"] ={ ["en"]="smallcapsfeatures" }, + ["opticalsize"] ={ ["en"]="opticalsize" }, + ["goodies"] ={ ["en"]="goodies" }, + ["check"] ={ ["en"]="check" }, + -- ["separatorcolor"]={ ["en"]="separatorcolor", ["nl"]="scheiderkleur", @@ -11373,6 +11393,15 @@ return { }, }, ["variables"]={ + ["math"]={ + ["en"]="math", + }, + ["selectfont"]={ + ["en"]="selectfont", + }, + ["simplefonts"]={ + ["en"]="simplefonts", + }, ["more"]={ ["en"]="more", ["nl"]="meer", diff --git a/tex/context/base/mult-en.mkii b/tex/context/base/mult-en.mkii index 0a049f6f0..97732dab7 100644 --- a/tex/context/base/mult-en.mkii +++ b/tex/context/base/mult-en.mkii @@ -281,6 +281,7 @@ \setinterfacevariable{marginedge}{marginedge} \setinterfacevariable{margintitle}{margintitle} \setinterfacevariable{marking}{marking} +\setinterfacevariable{math}{math} \setinterfacevariable{mathalignment}{mathalignment} \setinterfacevariable{mathcases}{mathcases} \setinterfacevariable{mathematics}{mathematics} @@ -414,12 +415,14 @@ \setinterfacevariable{sectionblockenvironment}{sectionblockenvironment} \setinterfacevariable{sectionnumber}{sectionnumber} \setinterfacevariable{see}{see} +\setinterfacevariable{selectfont}{selectfont} \setinterfacevariable{september}{september} \setinterfacevariable{serif}{serif} \setinterfacevariable{serried}{serried} \setinterfacevariable{setups}{setups} \setinterfacevariable{sheet}{sheet} \setinterfacevariable{short}{short} +\setinterfacevariable{simplefonts}{simplefonts} \setinterfacevariable{singlesided}{singlesided} \setinterfacevariable{slanted}{slanted} \setinterfacevariable{slantedbold}{slantedbold} @@ -593,6 +596,12 @@ \setinterfaceconstant{blockway}{blockway} \setinterfaceconstant{bodyfont}{bodyfont} \setinterfaceconstant{boffset}{boffset} +\setinterfaceconstant{boldfeatures}{boldfeatures} +\setinterfaceconstant{boldfont}{boldfont} +\setinterfaceconstant{bolditalicfeatures}{bolditalicfeatures} +\setinterfaceconstant{bolditalicfont}{bolditalicfont} +\setinterfaceconstant{boldslantedfeatures}{boldslantedfeatures} +\setinterfaceconstant{boldslantedfont}{boldslantedfont} \setinterfaceconstant{bookmark}{bookmark} \setinterfaceconstant{bottom}{bottom} \setinterfaceconstant{bottomafter}{bottomafter} @@ -608,6 +617,7 @@ \setinterfaceconstant{calculate}{calculate} \setinterfaceconstant{category}{category} \setinterfaceconstant{ccommand}{ccommand} +\setinterfaceconstant{check}{check} \setinterfaceconstant{click}{click} \setinterfaceconstant{clickin}{clickin} \setinterfaceconstant{clickout}{clickout} @@ -683,6 +693,7 @@ \setinterfaceconstant{factor}{factor} \setinterfaceconstant{fallback}{fallback} \setinterfaceconstant{family}{family} +\setinterfaceconstant{features}{features} \setinterfaceconstant{fieldbackgroundcolor}{fieldbackgroundcolor} \setinterfaceconstant{fieldframecolor}{fieldframecolor} \setinterfaceconstant{fieldlayer}{fieldlayer} @@ -712,6 +723,7 @@ \setinterfaceconstant{from}{from} \setinterfaceconstant{get}{get} \setinterfaceconstant{global}{global} +\setinterfaceconstant{goodies}{goodies} \setinterfaceconstant{grid}{grid} \setinterfaceconstant{hang}{hang} \setinterfaceconstant{hcompact}{hcompact} @@ -748,6 +760,8 @@ \setinterfaceconstant{interaction}{interaction} \setinterfaceconstant{interlinespace}{interlinespace} \setinterfaceconstant{internalgrid}{internalgrid} +\setinterfaceconstant{italicfeatures}{italicfeatures} +\setinterfaceconstant{italicfont}{italicfont} \setinterfaceconstant{itemalign}{itemalign} \setinterfaceconstant{items}{items} \setinterfaceconstant{juniorsep}{juniorsep} @@ -868,6 +882,7 @@ \setinterfaceconstant{openaction}{openaction} \setinterfaceconstant{openpage}{openpage} \setinterfaceconstant{openpageaction}{openpageaction} +\setinterfaceconstant{opticalsize}{opticalsize} \setinterfaceconstant{option}{option} \setinterfaceconstant{order}{order} \setinterfaceconstant{orientation}{orientation} @@ -935,6 +950,8 @@ \setinterfaceconstant{region}{region} \setinterfaceconstant{regionin}{regionin} \setinterfaceconstant{regionout}{regionout} +\setinterfaceconstant{regularfeatures}{regularfeatures} +\setinterfaceconstant{regularfont}{regularfont} \setinterfaceconstant{repeat}{repeat} \setinterfaceconstant{reset}{reset} \setinterfaceconstant{resetnumber}{resetnumber} @@ -993,7 +1010,11 @@ \setinterfaceconstant{sidespacebefore}{sidespacebefore} \setinterfaceconstant{sign}{sign} \setinterfaceconstant{size}{size} +\setinterfaceconstant{slantedfeatures}{slantedfeatures} +\setinterfaceconstant{slantedfont}{slantedfont} \setinterfaceconstant{small}{small} +\setinterfaceconstant{smallcapsfeatures}{smallcapsfeatures} +\setinterfaceconstant{smallcapsfont}{smallcapsfont} \setinterfaceconstant{solution}{solution} \setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{sorttype} diff --git a/tex/context/base/mult-fr.mkii b/tex/context/base/mult-fr.mkii index 61b3b0a0f..520f8e1a6 100644 --- a/tex/context/base/mult-fr.mkii +++ b/tex/context/base/mult-fr.mkii @@ -281,6 +281,7 @@ \setinterfacevariable{marginedge}{bordmarge} \setinterfacevariable{margintitle}{titremarge} \setinterfacevariable{marking}{marquage} +\setinterfacevariable{math}{math} \setinterfacevariable{mathalignment}{mathalignment} \setinterfacevariable{mathcases}{mathcases} \setinterfacevariable{mathematics}{mathematique} @@ -414,12 +415,14 @@ \setinterfacevariable{sectionblockenvironment}{environementblocsection} \setinterfacevariable{sectionnumber}{numerosection} \setinterfacevariable{see}{voit} +\setinterfacevariable{selectfont}{selectfont} \setinterfacevariable{september}{septembre} \setinterfacevariable{serif}{serif} \setinterfacevariable{serried}{serried} \setinterfacevariable{setups}{reglages} \setinterfacevariable{sheet}{sheet} \setinterfacevariable{short}{short} +\setinterfacevariable{simplefonts}{simplefonts} \setinterfacevariable{singlesided}{recto} \setinterfacevariable{slanted}{incline} \setinterfacevariable{slantedbold}{grasincline} @@ -593,6 +596,12 @@ \setinterfaceconstant{blockway}{blockway} \setinterfaceconstant{bodyfont}{policecorps} \setinterfaceconstant{boffset}{boffset} +\setinterfaceconstant{boldfeatures}{boldfeatures} +\setinterfaceconstant{boldfont}{boldfont} +\setinterfaceconstant{bolditalicfeatures}{bolditalicfeatures} +\setinterfaceconstant{bolditalicfont}{bolditalicfont} +\setinterfaceconstant{boldslantedfeatures}{boldslantedfeatures} +\setinterfaceconstant{boldslantedfont}{boldslantedfont} \setinterfaceconstant{bookmark}{marquepage} \setinterfaceconstant{bottom}{inf} \setinterfaceconstant{bottomafter}{bottomafter} @@ -608,6 +617,7 @@ \setinterfaceconstant{calculate}{calculer} \setinterfaceconstant{category}{category} \setinterfaceconstant{ccommand}{ccommande} +\setinterfaceconstant{check}{check} \setinterfaceconstant{click}{clic} \setinterfaceconstant{clickin}{clicinterieur} \setinterfaceconstant{clickout}{clicexterieur} @@ -683,6 +693,7 @@ \setinterfaceconstant{factor}{facteur} \setinterfaceconstant{fallback}{fallback} \setinterfaceconstant{family}{famille} +\setinterfaceconstant{features}{features} \setinterfaceconstant{fieldbackgroundcolor}{couleurarrierreplanchamp} \setinterfaceconstant{fieldframecolor}{couleurcadrechamp} \setinterfaceconstant{fieldlayer}{calquechamp} @@ -712,6 +723,7 @@ \setinterfaceconstant{from}{de} \setinterfaceconstant{get}{obtient} \setinterfaceconstant{global}{global} +\setinterfaceconstant{goodies}{goodies} \setinterfaceconstant{grid}{grille} \setinterfaceconstant{hang}{suspend} \setinterfaceconstant{hcompact}{hcompact} @@ -748,6 +760,8 @@ \setinterfaceconstant{interaction}{interaction} \setinterfaceconstant{interlinespace}{espaceinterligne} \setinterfaceconstant{internalgrid}{internalgrid} +\setinterfaceconstant{italicfeatures}{italicfeatures} +\setinterfaceconstant{italicfont}{italicfont} \setinterfaceconstant{itemalign}{itemalign} \setinterfaceconstant{items}{elements} \setinterfaceconstant{juniorsep}{juniorsep} @@ -868,6 +882,7 @@ \setinterfaceconstant{openaction}{actionouverture} \setinterfaceconstant{openpage}{openpage} \setinterfaceconstant{openpageaction}{actionouverturepage} +\setinterfaceconstant{opticalsize}{opticalsize} \setinterfaceconstant{option}{option} \setinterfaceconstant{order}{order} \setinterfaceconstant{orientation}{orientation} @@ -935,6 +950,8 @@ \setinterfaceconstant{region}{region} \setinterfaceconstant{regionin}{entreregion} \setinterfaceconstant{regionout}{regionexterieure} +\setinterfaceconstant{regularfeatures}{regularfeatures} +\setinterfaceconstant{regularfont}{regularfont} \setinterfaceconstant{repeat}{repete} \setinterfaceconstant{reset}{reset} \setinterfaceconstant{resetnumber}{raznumero} @@ -993,7 +1010,11 @@ \setinterfaceconstant{sidespacebefore}{espacelateralavant} \setinterfaceconstant{sign}{signe} \setinterfaceconstant{size}{dimension} +\setinterfaceconstant{slantedfeatures}{slantedfeatures} +\setinterfaceconstant{slantedfont}{slantedfont} \setinterfaceconstant{small}{petit} +\setinterfaceconstant{smallcapsfeatures}{smallcapsfeatures} +\setinterfaceconstant{smallcapsfont}{smallcapsfont} \setinterfaceconstant{solution}{solution} \setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{sorttype} diff --git a/tex/context/base/mult-it.mkii b/tex/context/base/mult-it.mkii index e5ebe3b25..2b31e8e10 100644 --- a/tex/context/base/mult-it.mkii +++ b/tex/context/base/mult-it.mkii @@ -281,6 +281,7 @@ \setinterfacevariable{marginedge}{bordomargine} \setinterfacevariable{margintitle}{titoloinmargine} \setinterfacevariable{marking}{marcatura} +\setinterfacevariable{math}{math} \setinterfacevariable{mathalignment}{mathalignment} \setinterfacevariable{mathcases}{mathcases} \setinterfacevariable{mathematics}{matematica} @@ -414,12 +415,14 @@ \setinterfacevariable{sectionblockenvironment}{ambientebloccosezione} \setinterfacevariable{sectionnumber}{numerosezione} \setinterfacevariable{see}{vedi} +\setinterfacevariable{selectfont}{selectfont} \setinterfacevariable{september}{settembre} \setinterfacevariable{serif}{serif} \setinterfacevariable{serried}{vicino} \setinterfacevariable{setups}{nastaveni} \setinterfacevariable{sheet}{sheet} \setinterfacevariable{short}{short} +\setinterfacevariable{simplefonts}{simplefonts} \setinterfacevariable{singlesided}{facciasingola} \setinterfacevariable{slanted}{inclinato} \setinterfacevariable{slantedbold}{inclinatograssetto} @@ -593,6 +596,12 @@ \setinterfaceconstant{blockway}{blockway} \setinterfaceconstant{bodyfont}{fonttesto} \setinterfaceconstant{boffset}{boffset} +\setinterfaceconstant{boldfeatures}{boldfeatures} +\setinterfaceconstant{boldfont}{boldfont} +\setinterfaceconstant{bolditalicfeatures}{bolditalicfeatures} +\setinterfaceconstant{bolditalicfont}{bolditalicfont} +\setinterfaceconstant{boldslantedfeatures}{boldslantedfeatures} +\setinterfaceconstant{boldslantedfont}{boldslantedfont} \setinterfaceconstant{bookmark}{segnalibro} \setinterfaceconstant{bottom}{fondo} \setinterfaceconstant{bottomafter}{bottomafter} @@ -608,6 +617,7 @@ \setinterfaceconstant{calculate}{calcola} \setinterfaceconstant{category}{category} \setinterfaceconstant{ccommand}{ccomando} +\setinterfaceconstant{check}{check} \setinterfaceconstant{click}{click} \setinterfaceconstant{clickin}{clickdentro} \setinterfaceconstant{clickout}{clickfuori} @@ -683,6 +693,7 @@ \setinterfaceconstant{factor}{fattore} \setinterfaceconstant{fallback}{fallback} \setinterfaceconstant{family}{famiglia} +\setinterfaceconstant{features}{features} \setinterfaceconstant{fieldbackgroundcolor}{coloresfondocampo} \setinterfaceconstant{fieldframecolor}{colorecornicecampo} \setinterfaceconstant{fieldlayer}{fieldlayer} @@ -712,6 +723,7 @@ \setinterfaceconstant{from}{da} \setinterfaceconstant{get}{prendi} \setinterfaceconstant{global}{globale} +\setinterfaceconstant{goodies}{goodies} \setinterfaceconstant{grid}{griglia} \setinterfaceconstant{hang}{sospendi} \setinterfaceconstant{hcompact}{hcompact} @@ -748,6 +760,8 @@ \setinterfaceconstant{interaction}{interazione} \setinterfaceconstant{interlinespace}{interlinea} \setinterfaceconstant{internalgrid}{internalgrid} +\setinterfaceconstant{italicfeatures}{italicfeatures} +\setinterfaceconstant{italicfont}{italicfont} \setinterfaceconstant{itemalign}{itemalign} \setinterfaceconstant{items}{elementi} \setinterfaceconstant{juniorsep}{juniorsep} @@ -868,6 +882,7 @@ \setinterfaceconstant{openaction}{azioneapri} \setinterfaceconstant{openpage}{openpage} \setinterfaceconstant{openpageaction}{azioneapripagina} +\setinterfaceconstant{opticalsize}{opticalsize} \setinterfaceconstant{option}{opzione} \setinterfaceconstant{order}{order} \setinterfaceconstant{orientation}{orientation} @@ -935,6 +950,8 @@ \setinterfaceconstant{region}{region} \setinterfaceconstant{regionin}{entraregione} \setinterfaceconstant{regionout}{esciregione} +\setinterfaceconstant{regularfeatures}{regularfeatures} +\setinterfaceconstant{regularfont}{regularfont} \setinterfaceconstant{repeat}{ripeti} \setinterfaceconstant{reset}{reset} \setinterfaceconstant{resetnumber}{resetnumber} @@ -993,7 +1010,11 @@ \setinterfaceconstant{sidespacebefore}{spaziolateraleprima} \setinterfaceconstant{sign}{segno} \setinterfaceconstant{size}{dimensione} +\setinterfaceconstant{slantedfeatures}{slantedfeatures} +\setinterfaceconstant{slantedfont}{slantedfont} \setinterfaceconstant{small}{piccolo} +\setinterfaceconstant{smallcapsfeatures}{smallcapsfeatures} +\setinterfaceconstant{smallcapsfont}{smallcapsfont} \setinterfaceconstant{solution}{solution} \setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{sorttype} diff --git a/tex/context/base/mult-nl.mkii b/tex/context/base/mult-nl.mkii index 6846a212e..9f91515cb 100644 --- a/tex/context/base/mult-nl.mkii +++ b/tex/context/base/mult-nl.mkii @@ -281,6 +281,7 @@ \setinterfacevariable{marginedge}{kantlijn} \setinterfacevariable{margintitle}{margetitel} \setinterfacevariable{marking}{markering} +\setinterfacevariable{math}{math} \setinterfacevariable{mathalignment}{wiskundeuitlijnen} \setinterfacevariable{mathcases}{mathcases} \setinterfacevariable{mathematics}{wiskunde} @@ -414,12 +415,14 @@ \setinterfacevariable{sectionblockenvironment}{sectieblokomgeving} \setinterfacevariable{sectionnumber}{sectienummer} \setinterfacevariable{see}{zie} +\setinterfacevariable{selectfont}{selectfont} \setinterfacevariable{september}{september} \setinterfacevariable{serif}{serif} \setinterfacevariable{serried}{aanelkaar} \setinterfacevariable{setups}{instellingen} \setinterfacevariable{sheet}{sheet} \setinterfacevariable{short}{kort} +\setinterfacevariable{simplefonts}{simplefonts} \setinterfacevariable{singlesided}{enkelzijdig} \setinterfacevariable{slanted}{schuin} \setinterfacevariable{slantedbold}{schuinvet} @@ -593,6 +596,12 @@ \setinterfaceconstant{blockway}{blokwijze} \setinterfaceconstant{bodyfont}{korps} \setinterfaceconstant{boffset}{boffset} +\setinterfaceconstant{boldfeatures}{boldfeatures} +\setinterfaceconstant{boldfont}{boldfont} +\setinterfaceconstant{bolditalicfeatures}{bolditalicfeatures} +\setinterfaceconstant{bolditalicfont}{bolditalicfont} +\setinterfaceconstant{boldslantedfeatures}{boldslantedfeatures} +\setinterfaceconstant{boldslantedfont}{boldslantedfont} \setinterfaceconstant{bookmark}{bookmark} \setinterfaceconstant{bottom}{onder} \setinterfaceconstant{bottomafter}{bottomafter} @@ -608,6 +617,7 @@ \setinterfaceconstant{calculate}{bereken} \setinterfaceconstant{category}{categorie} \setinterfaceconstant{ccommand}{ccommando} +\setinterfaceconstant{check}{check} \setinterfaceconstant{click}{klik} \setinterfaceconstant{clickin}{klikin} \setinterfaceconstant{clickout}{klikuit} @@ -683,6 +693,7 @@ \setinterfaceconstant{factor}{factor} \setinterfaceconstant{fallback}{terugval} \setinterfaceconstant{family}{soort} +\setinterfaceconstant{features}{features} \setinterfaceconstant{fieldbackgroundcolor}{veldachtergrondkleur} \setinterfaceconstant{fieldframecolor}{veldkaderkleur} \setinterfaceconstant{fieldlayer}{veldlaag} @@ -712,6 +723,7 @@ \setinterfaceconstant{from}{van} \setinterfaceconstant{get}{haal} \setinterfaceconstant{global}{globaal} +\setinterfaceconstant{goodies}{goodies} \setinterfaceconstant{grid}{grid} \setinterfaceconstant{hang}{hang} \setinterfaceconstant{hcompact}{hcomprimeer} @@ -748,6 +760,8 @@ \setinterfaceconstant{interaction}{interactie} \setinterfaceconstant{interlinespace}{interlinie} \setinterfaceconstant{internalgrid}{interngrid} +\setinterfaceconstant{italicfeatures}{italicfeatures} +\setinterfaceconstant{italicfont}{italicfont} \setinterfaceconstant{itemalign}{itemuitlijnen} \setinterfaceconstant{items}{items} \setinterfaceconstant{juniorsep}{juniorsep} @@ -868,6 +882,7 @@ \setinterfaceconstant{openaction}{openactie} \setinterfaceconstant{openpage}{openpagina} \setinterfaceconstant{openpageaction}{openpaginaactie} +\setinterfaceconstant{opticalsize}{opticalsize} \setinterfaceconstant{option}{optie} \setinterfaceconstant{order}{volgorde} \setinterfaceconstant{orientation}{orientatie} @@ -935,6 +950,8 @@ \setinterfaceconstant{region}{gebied} \setinterfaceconstant{regionin}{gebiedin} \setinterfaceconstant{regionout}{gebieduit} +\setinterfaceconstant{regularfeatures}{regularfeatures} +\setinterfaceconstant{regularfont}{regularfont} \setinterfaceconstant{repeat}{herhaal} \setinterfaceconstant{reset}{reset} \setinterfaceconstant{resetnumber}{resetnummer} @@ -993,7 +1010,11 @@ \setinterfaceconstant{sidespacebefore}{zijvoorwit} \setinterfaceconstant{sign}{teken} \setinterfaceconstant{size}{formaat} +\setinterfaceconstant{slantedfeatures}{slantedfeatures} +\setinterfaceconstant{slantedfont}{slantedfont} \setinterfaceconstant{small}{klein} +\setinterfaceconstant{smallcapsfeatures}{smallcapsfeatures} +\setinterfaceconstant{smallcapsfont}{smallcapsfont} \setinterfaceconstant{solution}{oplossing} \setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{sortering} diff --git a/tex/context/base/mult-pe.mkii b/tex/context/base/mult-pe.mkii index 300e07146..240130cdf 100644 --- a/tex/context/base/mult-pe.mkii +++ b/tex/context/base/mult-pe.mkii @@ -281,6 +281,7 @@ \setinterfacevariable{marginedge}{لبهحاشیه} \setinterfacevariable{margintitle}{عنوانحاشیه} \setinterfacevariable{marking}{نشانهگذاری} +\setinterfacevariable{math}{math} \setinterfacevariable{mathalignment}{تنظیمریاضی} \setinterfacevariable{mathcases}{حالتهایریاضی} \setinterfacevariable{mathematics}{ریاضی} @@ -414,12 +415,14 @@ \setinterfacevariable{sectionblockenvironment}{محیطبلوکبخش} \setinterfacevariable{sectionnumber}{شمارهبخش} \setinterfacevariable{see}{ببینید} +\setinterfacevariable{selectfont}{selectfont} \setinterfacevariable{september}{سپتامبر} \setinterfacevariable{serif}{سریف} \setinterfacevariable{serried}{تنگهم} \setinterfacevariable{setups}{بارگذاریها} \setinterfacevariable{sheet}{ورقه} \setinterfacevariable{short}{short} +\setinterfacevariable{simplefonts}{simplefonts} \setinterfacevariable{singlesided}{یکرو} \setinterfacevariable{slanted}{خوابیده} \setinterfacevariable{slantedbold}{مشکیخوابیده} @@ -593,6 +596,12 @@ \setinterfaceconstant{blockway}{راهبلوک} \setinterfaceconstant{bodyfont}{قلمبدنه} \setinterfaceconstant{boffset}{boffset} +\setinterfaceconstant{boldfeatures}{boldfeatures} +\setinterfaceconstant{boldfont}{boldfont} +\setinterfaceconstant{bolditalicfeatures}{bolditalicfeatures} +\setinterfaceconstant{bolditalicfont}{bolditalicfont} +\setinterfaceconstant{boldslantedfeatures}{boldslantedfeatures} +\setinterfaceconstant{boldslantedfont}{boldslantedfont} \setinterfaceconstant{bookmark}{چوبخط} \setinterfaceconstant{bottom}{پایین} \setinterfaceconstant{bottomafter}{bottomafter} @@ -608,6 +617,7 @@ \setinterfaceconstant{calculate}{محاسبه} \setinterfaceconstant{category}{category} \setinterfaceconstant{ccommand}{فرمان} +\setinterfaceconstant{check}{check} \setinterfaceconstant{click}{فشردن} \setinterfaceconstant{clickin}{فشردنداخل} \setinterfaceconstant{clickout}{فشردنخارج} @@ -683,6 +693,7 @@ \setinterfaceconstant{factor}{عامل} \setinterfaceconstant{fallback}{عقبریختن} \setinterfaceconstant{family}{خانواده} +\setinterfaceconstant{features}{features} \setinterfaceconstant{fieldbackgroundcolor}{رنگپسزمینهمیدان} \setinterfaceconstant{fieldframecolor}{رنگقالبمیدان} \setinterfaceconstant{fieldlayer}{لایهمیدان} @@ -712,6 +723,7 @@ \setinterfaceconstant{from}{از} \setinterfaceconstant{get}{بگیر} \setinterfaceconstant{global}{سراسری} +\setinterfaceconstant{goodies}{goodies} \setinterfaceconstant{grid}{توری} \setinterfaceconstant{hang}{بیاویز} \setinterfaceconstant{hcompact}{hcompact} @@ -748,6 +760,8 @@ \setinterfaceconstant{interaction}{پانل} \setinterfaceconstant{interlinespace}{فضایبینخط} \setinterfaceconstant{internalgrid}{internalgrid} +\setinterfaceconstant{italicfeatures}{italicfeatures} +\setinterfaceconstant{italicfont}{italicfont} \setinterfaceconstant{itemalign}{تنظیمآیتم} \setinterfaceconstant{items}{آیتمها} \setinterfaceconstant{juniorsep}{juniorsep} @@ -868,6 +882,7 @@ \setinterfaceconstant{openaction}{عملباز} \setinterfaceconstant{openpage}{openpage} \setinterfaceconstant{openpageaction}{عملصفحهباز} +\setinterfaceconstant{opticalsize}{opticalsize} \setinterfaceconstant{option}{گزینه} \setinterfaceconstant{order}{order} \setinterfaceconstant{orientation}{جهتدهی} @@ -935,6 +950,8 @@ \setinterfaceconstant{region}{region} \setinterfaceconstant{regionin}{ناحیهدرون} \setinterfaceconstant{regionout}{ناحیهبیرون} +\setinterfaceconstant{regularfeatures}{regularfeatures} +\setinterfaceconstant{regularfont}{regularfont} \setinterfaceconstant{repeat}{تکرار} \setinterfaceconstant{reset}{بازنشانی} \setinterfaceconstant{resetnumber}{بازنشانیشماره} @@ -993,7 +1010,11 @@ \setinterfaceconstant{sidespacebefore}{فضایکناریقبل} \setinterfaceconstant{sign}{علامت} \setinterfaceconstant{size}{اندازه} +\setinterfaceconstant{slantedfeatures}{slantedfeatures} +\setinterfaceconstant{slantedfont}{slantedfont} \setinterfaceconstant{small}{کوچک} +\setinterfaceconstant{smallcapsfeatures}{smallcapsfeatures} +\setinterfaceconstant{smallcapsfont}{smallcapsfont} \setinterfaceconstant{solution}{solution} \setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{ترتیبتایپ} diff --git a/tex/context/base/mult-ro.mkii b/tex/context/base/mult-ro.mkii index 326a8e905..3b7206e44 100644 --- a/tex/context/base/mult-ro.mkii +++ b/tex/context/base/mult-ro.mkii @@ -281,6 +281,7 @@ \setinterfacevariable{marginedge}{marginebordura} \setinterfacevariable{margintitle}{titlumarginal} \setinterfacevariable{marking}{marcaje} +\setinterfacevariable{math}{math} \setinterfacevariable{mathalignment}{mathalignment} \setinterfacevariable{mathcases}{mathcases} \setinterfacevariable{mathematics}{matematica} @@ -414,12 +415,14 @@ \setinterfacevariable{sectionblockenvironment}{blocsectiuneambient} \setinterfacevariable{sectionnumber}{numarsetiune} \setinterfacevariable{see}{vezi} +\setinterfacevariable{selectfont}{selectfont} \setinterfacevariable{september}{septembrie} \setinterfacevariable{serif}{serif} \setinterfacevariable{serried}{serried} \setinterfacevariable{setups}{setari} \setinterfacevariable{sheet}{sheet} \setinterfacevariable{short}{short} +\setinterfacevariable{simplefonts}{simplefonts} \setinterfacevariable{singlesided}{ofata} \setinterfacevariable{slanted}{inclinat} \setinterfacevariable{slantedbold}{inclinataldin} @@ -593,6 +596,12 @@ \setinterfaceconstant{blockway}{blockway} \setinterfaceconstant{bodyfont}{fonttext} \setinterfaceconstant{boffset}{boffset} +\setinterfaceconstant{boldfeatures}{boldfeatures} +\setinterfaceconstant{boldfont}{boldfont} +\setinterfaceconstant{bolditalicfeatures}{bolditalicfeatures} +\setinterfaceconstant{bolditalicfont}{bolditalicfont} +\setinterfaceconstant{boldslantedfeatures}{boldslantedfeatures} +\setinterfaceconstant{boldslantedfont}{boldslantedfont} \setinterfaceconstant{bookmark}{semncarte} \setinterfaceconstant{bottom}{jos} \setinterfaceconstant{bottomafter}{bottomafter} @@ -608,6 +617,7 @@ \setinterfaceconstant{calculate}{calculeaza} \setinterfaceconstant{category}{category} \setinterfaceconstant{ccommand}{comandac} +\setinterfaceconstant{check}{check} \setinterfaceconstant{click}{click} \setinterfaceconstant{clickin}{clickintru} \setinterfaceconstant{clickout}{clickies} @@ -683,6 +693,7 @@ \setinterfaceconstant{factor}{factor} \setinterfaceconstant{fallback}{fallback} \setinterfaceconstant{family}{familie} +\setinterfaceconstant{features}{features} \setinterfaceconstant{fieldbackgroundcolor}{culoarefundalcamp} \setinterfaceconstant{fieldframecolor}{culoareframecamp} \setinterfaceconstant{fieldlayer}{fieldlayer} @@ -712,6 +723,7 @@ \setinterfaceconstant{from}{dela} \setinterfaceconstant{get}{adu} \setinterfaceconstant{global}{global} +\setinterfaceconstant{goodies}{goodies} \setinterfaceconstant{grid}{grid} \setinterfaceconstant{hang}{suspenda} \setinterfaceconstant{hcompact}{hcompact} @@ -748,6 +760,8 @@ \setinterfaceconstant{interaction}{interactiune} \setinterfaceconstant{interlinespace}{spatiereinterliniara} \setinterfaceconstant{internalgrid}{internalgrid} +\setinterfaceconstant{italicfeatures}{italicfeatures} +\setinterfaceconstant{italicfont}{italicfont} \setinterfaceconstant{itemalign}{itemalign} \setinterfaceconstant{items}{elemente} \setinterfaceconstant{juniorsep}{juniorsep} @@ -868,6 +882,7 @@ \setinterfaceconstant{openaction}{actiunedeschidere} \setinterfaceconstant{openpage}{openpage} \setinterfaceconstant{openpageaction}{actiunedeschiderepagina} +\setinterfaceconstant{opticalsize}{opticalsize} \setinterfaceconstant{option}{optiune} \setinterfaceconstant{order}{order} \setinterfaceconstant{orientation}{orientation} @@ -935,6 +950,8 @@ \setinterfaceconstant{region}{region} \setinterfaceconstant{regionin}{regiuneintrare} \setinterfaceconstant{regionout}{regiuneiesire} +\setinterfaceconstant{regularfeatures}{regularfeatures} +\setinterfaceconstant{regularfont}{regularfont} \setinterfaceconstant{repeat}{repeta} \setinterfaceconstant{reset}{reset} \setinterfaceconstant{resetnumber}{resetnumber} @@ -993,7 +1010,11 @@ \setinterfaceconstant{sidespacebefore}{spatiulateralinainte} \setinterfaceconstant{sign}{semn} \setinterfaceconstant{size}{dimensiune} +\setinterfaceconstant{slantedfeatures}{slantedfeatures} +\setinterfaceconstant{slantedfont}{slantedfont} \setinterfaceconstant{small}{mic} +\setinterfaceconstant{smallcapsfeatures}{smallcapsfeatures} +\setinterfaceconstant{smallcapsfont}{smallcapsfont} \setinterfaceconstant{solution}{solution} \setinterfaceconstant{sort}{sort} \setinterfaceconstant{sorttype}{sorttype} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 1d72a62ec..c5f42232e 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log index 55ea9f960..4e6c06c97 100644 --- a/tex/context/base/status-lua.log +++ b/tex/context/base/status-lua.log @@ -1,6 +1,6 @@ (cont-yes.mkiv -ConTeXt ver: 2013.09.11 01:32 MKIV beta fmt: 2013.9.11 int: english/english +ConTeXt ver: 2013.09.11 11:46 MKIV beta fmt: 2013.9.11 int: english/english system > 'cont-new.mkiv' loaded (cont-new.mkiv) diff --git a/tex/context/interface/keys-cs.xml b/tex/context/interface/keys-cs.xml index 899e439da..d36f969f3 100644 --- a/tex/context/interface/keys-cs.xml +++ b/tex/context/interface/keys-cs.xml @@ -284,6 +284,7 @@ <cd:variable name='marginedge' value='textovahrana'/> <cd:variable name='margintitle' value='titulmarginalie'/> <cd:variable name='marking' value='znaceni'/> + <cd:variable name='math' value='math'/> <cd:variable name='mathalignment' value='mathalignment'/> <cd:variable name='mathcases' value='mathcases'/> <cd:variable name='mathematics' value='mathematika'/> @@ -417,12 +418,14 @@ <cd:variable name='sectionblockenvironment' value='sectionblockenvironment'/> <cd:variable name='sectionnumber' value='cislooddilu'/> <cd:variable name='see' value='viz'/> + <cd:variable name='selectfont' value='selectfont'/> <cd:variable name='september' value='zari'/> <cd:variable name='serif' value='serif'/> <cd:variable name='serried' value='semknuto'/> <cd:variable name='setups' value='einstellungen'/> <cd:variable name='sheet' value='sheet'/> <cd:variable name='short' value='short'/> + <cd:variable name='simplefonts' value='simplefonts'/> <cd:variable name='singlesided' value='jednostranne'/> <cd:variable name='slanted' value='sklonene'/> <cd:variable name='slantedbold' value='sklonenetucne'/> @@ -599,6 +602,12 @@ <cd:constant name='blockway' value='dobloku'/> <cd:constant name='bodyfont' value='zakladnifont'/> <cd:constant name='boffset' value='boffset'/> + <cd:constant name='boldfeatures' value='boldfeatures'/> + <cd:constant name='boldfont' value='boldfont'/> + <cd:constant name='bolditalicfeatures' value='bolditalicfeatures'/> + <cd:constant name='bolditalicfont' value='bolditalicfont'/> + <cd:constant name='boldslantedfeatures' value='boldslantedfeatures'/> + <cd:constant name='boldslantedfont' value='boldslantedfont'/> <cd:constant name='bookmark' value='zalozka'/> <cd:constant name='bottom' value='spodek'/> <cd:constant name='bottomafter' value='bottomafter'/> @@ -614,6 +623,7 @@ <cd:constant name='calculate' value='pocitat'/> <cd:constant name='category' value='category'/> <cd:constant name='ccommand' value='cprikaz'/> + <cd:constant name='check' value='check'/> <cd:constant name='click' value='klik'/> <cd:constant name='clickin' value='klikuvnitr'/> <cd:constant name='clickout' value='klikvne'/> @@ -689,6 +699,7 @@ <cd:constant name='factor' value='faktor'/> <cd:constant name='fallback' value='fallback'/> <cd:constant name='family' value='rodina'/> + <cd:constant name='features' value='features'/> <cd:constant name='fieldbackgroundcolor' value='barvapozadipole'/> <cd:constant name='fieldframecolor' value='barvarameckupole'/> <cd:constant name='fieldlayer' value='fieldlayer'/> @@ -718,6 +729,7 @@ <cd:constant name='from' value='z'/> <cd:constant name='get' value='ziskat'/> <cd:constant name='global' value='globalne'/> + <cd:constant name='goodies' value='goodies'/> <cd:constant name='grid' value='mrizka'/> <cd:constant name='hang' value='zaveseni'/> <cd:constant name='hcompact' value='hcompact'/> @@ -754,6 +766,8 @@ <cd:constant name='interaction' value='interakce'/> <cd:constant name='interlinespace' value='meziradkovamezera'/> <cd:constant name='internalgrid' value='internalgrid'/> + <cd:constant name='italicfeatures' value='italicfeatures'/> + <cd:constant name='italicfont' value='italicfont'/> <cd:constant name='itemalign' value='itemalign'/> <cd:constant name='items' value='polozky'/> <cd:constant name='juniorsep' value='juniorsep'/> @@ -874,6 +888,7 @@ <cd:constant name='openaction' value='otevriakci'/> <cd:constant name='openpage' value='openpage'/> <cd:constant name='openpageaction' value='akceotevrenistranky'/> + <cd:constant name='opticalsize' value='opticalsize'/> <cd:constant name='option' value='volba'/> <cd:constant name='order' value='order'/> <cd:constant name='orientation' value='orientation'/> @@ -941,6 +956,8 @@ <cd:constant name='region' value='region'/> <cd:constant name='regionin' value='oblastuvnitr'/> <cd:constant name='regionout' value='oblastvne'/> + <cd:constant name='regularfeatures' value='regularfeatures'/> + <cd:constant name='regularfont' value='regularfont'/> <cd:constant name='repeat' value='opakovat'/> <cd:constant name='reset' value='reset'/> <cd:constant name='resetnumber' value='resetnumber'/> @@ -999,7 +1016,11 @@ <cd:constant name='sidespacebefore' value='bocnimezerapred'/> <cd:constant name='sign' value='znak'/> <cd:constant name='size' value='velikost'/> + <cd:constant name='slantedfeatures' value='slantedfeatures'/> + <cd:constant name='slantedfont' value='slantedfont'/> <cd:constant name='small' value='male'/> + <cd:constant name='smallcapsfeatures' value='smallcapsfeatures'/> + <cd:constant name='smallcapsfont' value='smallcapsfont'/> <cd:constant name='solution' value='solution'/> <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sorttype'/> diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index ddb3c42d6..c5ba364e3 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -284,6 +284,7 @@ <cd:variable name='marginedge' value='marginalkante'/> <cd:variable name='margintitle' value='marginaltitel'/> <cd:variable name='marking' value='beschriftung'/> + <cd:variable name='math' value='math'/> <cd:variable name='mathalignment' value='mathalignment'/> <cd:variable name='mathcases' value='mathcases'/> <cd:variable name='mathematics' value='mathematik'/> @@ -417,12 +418,14 @@ <cd:variable name='sectionblockenvironment' value='sectionblockenvironment'/> <cd:variable name='sectionnumber' value='abschnittsnummer'/> <cd:variable name='see' value='sieh'/> + <cd:variable name='selectfont' value='selectfont'/> <cd:variable name='september' value='september'/> <cd:variable name='serif' value='serif'/> <cd:variable name='serried' value='kleinerabstand'/> <cd:variable name='setups' value='impostazioni'/> <cd:variable name='sheet' value='sheet'/> <cd:variable name='short' value='kurz'/> + <cd:variable name='simplefonts' value='simplefonts'/> <cd:variable name='singlesided' value='einzelseitig'/> <cd:variable name='slanted' value='geneigt'/> <cd:variable name='slantedbold' value='geneigtfett'/> @@ -599,6 +602,12 @@ <cd:constant name='blockway' value='blockauf'/> <cd:constant name='bodyfont' value='fliesstext'/> <cd:constant name='boffset' value='boffset'/> + <cd:constant name='boldfeatures' value='boldfeatures'/> + <cd:constant name='boldfont' value='boldfont'/> + <cd:constant name='bolditalicfeatures' value='bolditalicfeatures'/> + <cd:constant name='bolditalicfont' value='bolditalicfont'/> + <cd:constant name='boldslantedfeatures' value='boldslantedfeatures'/> + <cd:constant name='boldslantedfont' value='boldslantedfont'/> <cd:constant name='bookmark' value='bookmark'/> <cd:constant name='bottom' value='unten'/> <cd:constant name='bottomafter' value='bottomafter'/> @@ -614,6 +623,7 @@ <cd:constant name='calculate' value='berechnen'/> <cd:constant name='category' value='category'/> <cd:constant name='ccommand' value='cbefehl'/> + <cd:constant name='check' value='check'/> <cd:constant name='click' value='klick'/> <cd:constant name='clickin' value='klickin'/> <cd:constant name='clickout' value='klickaus'/> @@ -689,6 +699,7 @@ <cd:constant name='factor' value='faktor'/> <cd:constant name='fallback' value='fallback'/> <cd:constant name='family' value='familie'/> + <cd:constant name='features' value='features'/> <cd:constant name='fieldbackgroundcolor' value='feldhintergrundfarbe'/> <cd:constant name='fieldframecolor' value='feldrahmenfarbe'/> <cd:constant name='fieldlayer' value='fieldlayer'/> @@ -718,6 +729,7 @@ <cd:constant name='from' value='von'/> <cd:constant name='get' value='hole'/> <cd:constant name='global' value='global'/> + <cd:constant name='goodies' value='goodies'/> <cd:constant name='grid' value='gritter'/> <cd:constant name='hang' value='haengend'/> <cd:constant name='hcompact' value='hcompact'/> @@ -754,6 +766,8 @@ <cd:constant name='interaction' value='interaktion'/> <cd:constant name='interlinespace' value='zeilenabstande'/> <cd:constant name='internalgrid' value='internalgrid'/> + <cd:constant name='italicfeatures' value='italicfeatures'/> + <cd:constant name='italicfont' value='italicfont'/> <cd:constant name='itemalign' value='itemalign'/> <cd:constant name='items' value='posten'/> <cd:constant name='juniorsep' value='juniorsep'/> @@ -874,6 +888,7 @@ <cd:constant name='openaction' value='oeffenaktion'/> <cd:constant name='openpage' value='openpage'/> <cd:constant name='openpageaction' value='openpageaction'/> + <cd:constant name='opticalsize' value='opticalsize'/> <cd:constant name='option' value='option'/> <cd:constant name='order' value='order'/> <cd:constant name='orientation' value='orientation'/> @@ -941,6 +956,8 @@ <cd:constant name='region' value='region'/> <cd:constant name='regionin' value='regionin'/> <cd:constant name='regionout' value='regionaus'/> + <cd:constant name='regularfeatures' value='regularfeatures'/> + <cd:constant name='regularfont' value='regularfont'/> <cd:constant name='repeat' value='wiederholen'/> <cd:constant name='reset' value='reset'/> <cd:constant name='resetnumber' value='resetnumber'/> @@ -999,7 +1016,11 @@ <cd:constant name='sidespacebefore' value='nebenvorspatium'/> <cd:constant name='sign' value='zeichen'/> <cd:constant name='size' value='groesse'/> + <cd:constant name='slantedfeatures' value='slantedfeatures'/> + <cd:constant name='slantedfont' value='slantedfont'/> <cd:constant name='small' value='klein'/> + <cd:constant name='smallcapsfeatures' value='smallcapsfeatures'/> + <cd:constant name='smallcapsfont' value='smallcapsfont'/> <cd:constant name='solution' value='solution'/> <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sorttype'/> diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 5aea6102f..be59542e7 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -284,6 +284,7 @@ <cd:variable name='marginedge' value='marginedge'/> <cd:variable name='margintitle' value='margintitle'/> <cd:variable name='marking' value='marking'/> + <cd:variable name='math' value='math'/> <cd:variable name='mathalignment' value='mathalignment'/> <cd:variable name='mathcases' value='mathcases'/> <cd:variable name='mathematics' value='mathematics'/> @@ -417,12 +418,14 @@ <cd:variable name='sectionblockenvironment' value='sectionblockenvironment'/> <cd:variable name='sectionnumber' value='sectionnumber'/> <cd:variable name='see' value='see'/> + <cd:variable name='selectfont' value='selectfont'/> <cd:variable name='september' value='september'/> <cd:variable name='serif' value='serif'/> <cd:variable name='serried' value='serried'/> <cd:variable name='setups' value='setups'/> <cd:variable name='sheet' value='sheet'/> <cd:variable name='short' value='short'/> + <cd:variable name='simplefonts' value='simplefonts'/> <cd:variable name='singlesided' value='singlesided'/> <cd:variable name='slanted' value='slanted'/> <cd:variable name='slantedbold' value='slantedbold'/> @@ -599,6 +602,12 @@ <cd:constant name='blockway' value='blockway'/> <cd:constant name='bodyfont' value='bodyfont'/> <cd:constant name='boffset' value='boffset'/> + <cd:constant name='boldfeatures' value='boldfeatures'/> + <cd:constant name='boldfont' value='boldfont'/> + <cd:constant name='bolditalicfeatures' value='bolditalicfeatures'/> + <cd:constant name='bolditalicfont' value='bolditalicfont'/> + <cd:constant name='boldslantedfeatures' value='boldslantedfeatures'/> + <cd:constant name='boldslantedfont' value='boldslantedfont'/> <cd:constant name='bookmark' value='bookmark'/> <cd:constant name='bottom' value='bottom'/> <cd:constant name='bottomafter' value='bottomafter'/> @@ -614,6 +623,7 @@ <cd:constant name='calculate' value='calculate'/> <cd:constant name='category' value='category'/> <cd:constant name='ccommand' value='ccommand'/> + <cd:constant name='check' value='check'/> <cd:constant name='click' value='click'/> <cd:constant name='clickin' value='clickin'/> <cd:constant name='clickout' value='clickout'/> @@ -689,6 +699,7 @@ <cd:constant name='factor' value='factor'/> <cd:constant name='fallback' value='fallback'/> <cd:constant name='family' value='family'/> + <cd:constant name='features' value='features'/> <cd:constant name='fieldbackgroundcolor' value='fieldbackgroundcolor'/> <cd:constant name='fieldframecolor' value='fieldframecolor'/> <cd:constant name='fieldlayer' value='fieldlayer'/> @@ -718,6 +729,7 @@ <cd:constant name='from' value='from'/> <cd:constant name='get' value='get'/> <cd:constant name='global' value='global'/> + <cd:constant name='goodies' value='goodies'/> <cd:constant name='grid' value='grid'/> <cd:constant name='hang' value='hang'/> <cd:constant name='hcompact' value='hcompact'/> @@ -754,6 +766,8 @@ <cd:constant name='interaction' value='interaction'/> <cd:constant name='interlinespace' value='interlinespace'/> <cd:constant name='internalgrid' value='internalgrid'/> + <cd:constant name='italicfeatures' value='italicfeatures'/> + <cd:constant name='italicfont' value='italicfont'/> <cd:constant name='itemalign' value='itemalign'/> <cd:constant name='items' value='items'/> <cd:constant name='juniorsep' value='juniorsep'/> @@ -874,6 +888,7 @@ <cd:constant name='openaction' value='openaction'/> <cd:constant name='openpage' value='openpage'/> <cd:constant name='openpageaction' value='openpageaction'/> + <cd:constant name='opticalsize' value='opticalsize'/> <cd:constant name='option' value='option'/> <cd:constant name='order' value='order'/> <cd:constant name='orientation' value='orientation'/> @@ -941,6 +956,8 @@ <cd:constant name='region' value='region'/> <cd:constant name='regionin' value='regionin'/> <cd:constant name='regionout' value='regionout'/> + <cd:constant name='regularfeatures' value='regularfeatures'/> + <cd:constant name='regularfont' value='regularfont'/> <cd:constant name='repeat' value='repeat'/> <cd:constant name='reset' value='reset'/> <cd:constant name='resetnumber' value='resetnumber'/> @@ -999,7 +1016,11 @@ <cd:constant name='sidespacebefore' value='sidespacebefore'/> <cd:constant name='sign' value='sign'/> <cd:constant name='size' value='size'/> + <cd:constant name='slantedfeatures' value='slantedfeatures'/> + <cd:constant name='slantedfont' value='slantedfont'/> <cd:constant name='small' value='small'/> + <cd:constant name='smallcapsfeatures' value='smallcapsfeatures'/> + <cd:constant name='smallcapsfont' value='smallcapsfont'/> <cd:constant name='solution' value='solution'/> <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sorttype'/> diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index cf366e3bb..43c47d578 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -284,6 +284,7 @@ <cd:variable name='marginedge' value='bordmarge'/> <cd:variable name='margintitle' value='titremarge'/> <cd:variable name='marking' value='marquage'/> + <cd:variable name='math' value='math'/> <cd:variable name='mathalignment' value='mathalignment'/> <cd:variable name='mathcases' value='mathcases'/> <cd:variable name='mathematics' value='mathematique'/> @@ -417,12 +418,14 @@ <cd:variable name='sectionblockenvironment' value='environementblocsection'/> <cd:variable name='sectionnumber' value='numerosection'/> <cd:variable name='see' value='voit'/> + <cd:variable name='selectfont' value='selectfont'/> <cd:variable name='september' value='septembre'/> <cd:variable name='serif' value='serif'/> <cd:variable name='serried' value='serried'/> <cd:variable name='setups' value='reglages'/> <cd:variable name='sheet' value='sheet'/> <cd:variable name='short' value='short'/> + <cd:variable name='simplefonts' value='simplefonts'/> <cd:variable name='singlesided' value='recto'/> <cd:variable name='slanted' value='incline'/> <cd:variable name='slantedbold' value='grasincline'/> @@ -599,6 +602,12 @@ <cd:constant name='blockway' value='blockway'/> <cd:constant name='bodyfont' value='policecorps'/> <cd:constant name='boffset' value='boffset'/> + <cd:constant name='boldfeatures' value='boldfeatures'/> + <cd:constant name='boldfont' value='boldfont'/> + <cd:constant name='bolditalicfeatures' value='bolditalicfeatures'/> + <cd:constant name='bolditalicfont' value='bolditalicfont'/> + <cd:constant name='boldslantedfeatures' value='boldslantedfeatures'/> + <cd:constant name='boldslantedfont' value='boldslantedfont'/> <cd:constant name='bookmark' value='marquepage'/> <cd:constant name='bottom' value='inf'/> <cd:constant name='bottomafter' value='bottomafter'/> @@ -614,6 +623,7 @@ <cd:constant name='calculate' value='calculer'/> <cd:constant name='category' value='category'/> <cd:constant name='ccommand' value='ccommande'/> + <cd:constant name='check' value='check'/> <cd:constant name='click' value='clic'/> <cd:constant name='clickin' value='clicinterieur'/> <cd:constant name='clickout' value='clicexterieur'/> @@ -689,6 +699,7 @@ <cd:constant name='factor' value='facteur'/> <cd:constant name='fallback' value='fallback'/> <cd:constant name='family' value='famille'/> + <cd:constant name='features' value='features'/> <cd:constant name='fieldbackgroundcolor' value='couleurarrierreplanchamp'/> <cd:constant name='fieldframecolor' value='couleurcadrechamp'/> <cd:constant name='fieldlayer' value='calquechamp'/> @@ -718,6 +729,7 @@ <cd:constant name='from' value='de'/> <cd:constant name='get' value='obtient'/> <cd:constant name='global' value='global'/> + <cd:constant name='goodies' value='goodies'/> <cd:constant name='grid' value='grille'/> <cd:constant name='hang' value='suspend'/> <cd:constant name='hcompact' value='hcompact'/> @@ -754,6 +766,8 @@ <cd:constant name='interaction' value='interaction'/> <cd:constant name='interlinespace' value='espaceinterligne'/> <cd:constant name='internalgrid' value='internalgrid'/> + <cd:constant name='italicfeatures' value='italicfeatures'/> + <cd:constant name='italicfont' value='italicfont'/> <cd:constant name='itemalign' value='itemalign'/> <cd:constant name='items' value='elements'/> <cd:constant name='juniorsep' value='juniorsep'/> @@ -874,6 +888,7 @@ <cd:constant name='openaction' value='actionouverture'/> <cd:constant name='openpage' value='openpage'/> <cd:constant name='openpageaction' value='actionouverturepage'/> + <cd:constant name='opticalsize' value='opticalsize'/> <cd:constant name='option' value='option'/> <cd:constant name='order' value='order'/> <cd:constant name='orientation' value='orientation'/> @@ -941,6 +956,8 @@ <cd:constant name='region' value='region'/> <cd:constant name='regionin' value='entreregion'/> <cd:constant name='regionout' value='regionexterieure'/> + <cd:constant name='regularfeatures' value='regularfeatures'/> + <cd:constant name='regularfont' value='regularfont'/> <cd:constant name='repeat' value='repete'/> <cd:constant name='reset' value='reset'/> <cd:constant name='resetnumber' value='raznumero'/> @@ -999,7 +1016,11 @@ <cd:constant name='sidespacebefore' value='espacelateralavant'/> <cd:constant name='sign' value='signe'/> <cd:constant name='size' value='dimension'/> + <cd:constant name='slantedfeatures' value='slantedfeatures'/> + <cd:constant name='slantedfont' value='slantedfont'/> <cd:constant name='small' value='petit'/> + <cd:constant name='smallcapsfeatures' value='smallcapsfeatures'/> + <cd:constant name='smallcapsfont' value='smallcapsfont'/> <cd:constant name='solution' value='solution'/> <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sorttype'/> diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index 19cb86ab1..95c2d8aa5 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -284,6 +284,7 @@ <cd:variable name='marginedge' value='bordomargine'/> <cd:variable name='margintitle' value='titoloinmargine'/> <cd:variable name='marking' value='marcatura'/> + <cd:variable name='math' value='math'/> <cd:variable name='mathalignment' value='mathalignment'/> <cd:variable name='mathcases' value='mathcases'/> <cd:variable name='mathematics' value='matematica'/> @@ -417,12 +418,14 @@ <cd:variable name='sectionblockenvironment' value='ambientebloccosezione'/> <cd:variable name='sectionnumber' value='numerosezione'/> <cd:variable name='see' value='vedi'/> + <cd:variable name='selectfont' value='selectfont'/> <cd:variable name='september' value='settembre'/> <cd:variable name='serif' value='serif'/> <cd:variable name='serried' value='vicino'/> <cd:variable name='setups' value='nastaveni'/> <cd:variable name='sheet' value='sheet'/> <cd:variable name='short' value='short'/> + <cd:variable name='simplefonts' value='simplefonts'/> <cd:variable name='singlesided' value='facciasingola'/> <cd:variable name='slanted' value='inclinato'/> <cd:variable name='slantedbold' value='inclinatograssetto'/> @@ -599,6 +602,12 @@ <cd:constant name='blockway' value='blockway'/> <cd:constant name='bodyfont' value='fonttesto'/> <cd:constant name='boffset' value='boffset'/> + <cd:constant name='boldfeatures' value='boldfeatures'/> + <cd:constant name='boldfont' value='boldfont'/> + <cd:constant name='bolditalicfeatures' value='bolditalicfeatures'/> + <cd:constant name='bolditalicfont' value='bolditalicfont'/> + <cd:constant name='boldslantedfeatures' value='boldslantedfeatures'/> + <cd:constant name='boldslantedfont' value='boldslantedfont'/> <cd:constant name='bookmark' value='segnalibro'/> <cd:constant name='bottom' value='fondo'/> <cd:constant name='bottomafter' value='bottomafter'/> @@ -614,6 +623,7 @@ <cd:constant name='calculate' value='calcola'/> <cd:constant name='category' value='category'/> <cd:constant name='ccommand' value='ccomando'/> + <cd:constant name='check' value='check'/> <cd:constant name='click' value='click'/> <cd:constant name='clickin' value='clickdentro'/> <cd:constant name='clickout' value='clickfuori'/> @@ -689,6 +699,7 @@ <cd:constant name='factor' value='fattore'/> <cd:constant name='fallback' value='fallback'/> <cd:constant name='family' value='famiglia'/> + <cd:constant name='features' value='features'/> <cd:constant name='fieldbackgroundcolor' value='coloresfondocampo'/> <cd:constant name='fieldframecolor' value='colorecornicecampo'/> <cd:constant name='fieldlayer' value='fieldlayer'/> @@ -718,6 +729,7 @@ <cd:constant name='from' value='da'/> <cd:constant name='get' value='prendi'/> <cd:constant name='global' value='globale'/> + <cd:constant name='goodies' value='goodies'/> <cd:constant name='grid' value='griglia'/> <cd:constant name='hang' value='sospendi'/> <cd:constant name='hcompact' value='hcompact'/> @@ -754,6 +766,8 @@ <cd:constant name='interaction' value='interazione'/> <cd:constant name='interlinespace' value='interlinea'/> <cd:constant name='internalgrid' value='internalgrid'/> + <cd:constant name='italicfeatures' value='italicfeatures'/> + <cd:constant name='italicfont' value='italicfont'/> <cd:constant name='itemalign' value='itemalign'/> <cd:constant name='items' value='elementi'/> <cd:constant name='juniorsep' value='juniorsep'/> @@ -874,6 +888,7 @@ <cd:constant name='openaction' value='azioneapri'/> <cd:constant name='openpage' value='openpage'/> <cd:constant name='openpageaction' value='azioneapripagina'/> + <cd:constant name='opticalsize' value='opticalsize'/> <cd:constant name='option' value='opzione'/> <cd:constant name='order' value='order'/> <cd:constant name='orientation' value='orientation'/> @@ -941,6 +956,8 @@ <cd:constant name='region' value='region'/> <cd:constant name='regionin' value='entraregione'/> <cd:constant name='regionout' value='esciregione'/> + <cd:constant name='regularfeatures' value='regularfeatures'/> + <cd:constant name='regularfont' value='regularfont'/> <cd:constant name='repeat' value='ripeti'/> <cd:constant name='reset' value='reset'/> <cd:constant name='resetnumber' value='resetnumber'/> @@ -999,7 +1016,11 @@ <cd:constant name='sidespacebefore' value='spaziolateraleprima'/> <cd:constant name='sign' value='segno'/> <cd:constant name='size' value='dimensione'/> + <cd:constant name='slantedfeatures' value='slantedfeatures'/> + <cd:constant name='slantedfont' value='slantedfont'/> <cd:constant name='small' value='piccolo'/> + <cd:constant name='smallcapsfeatures' value='smallcapsfeatures'/> + <cd:constant name='smallcapsfont' value='smallcapsfont'/> <cd:constant name='solution' value='solution'/> <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sorttype'/> diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index e1c18eefc..bc940ebc4 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -284,6 +284,7 @@ <cd:variable name='marginedge' value='kantlijn'/> <cd:variable name='margintitle' value='margetitel'/> <cd:variable name='marking' value='markering'/> + <cd:variable name='math' value='math'/> <cd:variable name='mathalignment' value='wiskundeuitlijnen'/> <cd:variable name='mathcases' value='mathcases'/> <cd:variable name='mathematics' value='wiskunde'/> @@ -417,12 +418,14 @@ <cd:variable name='sectionblockenvironment' value='sectieblokomgeving'/> <cd:variable name='sectionnumber' value='sectienummer'/> <cd:variable name='see' value='zie'/> + <cd:variable name='selectfont' value='selectfont'/> <cd:variable name='september' value='september'/> <cd:variable name='serif' value='serif'/> <cd:variable name='serried' value='aanelkaar'/> <cd:variable name='setups' value='instellingen'/> <cd:variable name='sheet' value='sheet'/> <cd:variable name='short' value='kort'/> + <cd:variable name='simplefonts' value='simplefonts'/> <cd:variable name='singlesided' value='enkelzijdig'/> <cd:variable name='slanted' value='schuin'/> <cd:variable name='slantedbold' value='schuinvet'/> @@ -599,6 +602,12 @@ <cd:constant name='blockway' value='blokwijze'/> <cd:constant name='bodyfont' value='korps'/> <cd:constant name='boffset' value='boffset'/> + <cd:constant name='boldfeatures' value='boldfeatures'/> + <cd:constant name='boldfont' value='boldfont'/> + <cd:constant name='bolditalicfeatures' value='bolditalicfeatures'/> + <cd:constant name='bolditalicfont' value='bolditalicfont'/> + <cd:constant name='boldslantedfeatures' value='boldslantedfeatures'/> + <cd:constant name='boldslantedfont' value='boldslantedfont'/> <cd:constant name='bookmark' value='bookmark'/> <cd:constant name='bottom' value='onder'/> <cd:constant name='bottomafter' value='bottomafter'/> @@ -614,6 +623,7 @@ <cd:constant name='calculate' value='bereken'/> <cd:constant name='category' value='categorie'/> <cd:constant name='ccommand' value='ccommando'/> + <cd:constant name='check' value='check'/> <cd:constant name='click' value='klik'/> <cd:constant name='clickin' value='klikin'/> <cd:constant name='clickout' value='klikuit'/> @@ -689,6 +699,7 @@ <cd:constant name='factor' value='factor'/> <cd:constant name='fallback' value='terugval'/> <cd:constant name='family' value='soort'/> + <cd:constant name='features' value='features'/> <cd:constant name='fieldbackgroundcolor' value='veldachtergrondkleur'/> <cd:constant name='fieldframecolor' value='veldkaderkleur'/> <cd:constant name='fieldlayer' value='veldlaag'/> @@ -718,6 +729,7 @@ <cd:constant name='from' value='van'/> <cd:constant name='get' value='haal'/> <cd:constant name='global' value='globaal'/> + <cd:constant name='goodies' value='goodies'/> <cd:constant name='grid' value='grid'/> <cd:constant name='hang' value='hang'/> <cd:constant name='hcompact' value='hcomprimeer'/> @@ -754,6 +766,8 @@ <cd:constant name='interaction' value='interactie'/> <cd:constant name='interlinespace' value='interlinie'/> <cd:constant name='internalgrid' value='interngrid'/> + <cd:constant name='italicfeatures' value='italicfeatures'/> + <cd:constant name='italicfont' value='italicfont'/> <cd:constant name='itemalign' value='itemuitlijnen'/> <cd:constant name='items' value='items'/> <cd:constant name='juniorsep' value='juniorsep'/> @@ -874,6 +888,7 @@ <cd:constant name='openaction' value='openactie'/> <cd:constant name='openpage' value='openpagina'/> <cd:constant name='openpageaction' value='openpaginaactie'/> + <cd:constant name='opticalsize' value='opticalsize'/> <cd:constant name='option' value='optie'/> <cd:constant name='order' value='volgorde'/> <cd:constant name='orientation' value='orientatie'/> @@ -941,6 +956,8 @@ <cd:constant name='region' value='gebied'/> <cd:constant name='regionin' value='gebiedin'/> <cd:constant name='regionout' value='gebieduit'/> + <cd:constant name='regularfeatures' value='regularfeatures'/> + <cd:constant name='regularfont' value='regularfont'/> <cd:constant name='repeat' value='herhaal'/> <cd:constant name='reset' value='reset'/> <cd:constant name='resetnumber' value='resetnummer'/> @@ -999,7 +1016,11 @@ <cd:constant name='sidespacebefore' value='zijvoorwit'/> <cd:constant name='sign' value='teken'/> <cd:constant name='size' value='formaat'/> + <cd:constant name='slantedfeatures' value='slantedfeatures'/> + <cd:constant name='slantedfont' value='slantedfont'/> <cd:constant name='small' value='klein'/> + <cd:constant name='smallcapsfeatures' value='smallcapsfeatures'/> + <cd:constant name='smallcapsfont' value='smallcapsfont'/> <cd:constant name='solution' value='oplossing'/> <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sortering'/> diff --git a/tex/context/interface/keys-pe.xml b/tex/context/interface/keys-pe.xml index 01b9c64b9..75e3a17c2 100644 --- a/tex/context/interface/keys-pe.xml +++ b/tex/context/interface/keys-pe.xml @@ -284,6 +284,7 @@ <cd:variable name='marginedge' value='لبهحاشیه'/> <cd:variable name='margintitle' value='عنوانحاشیه'/> <cd:variable name='marking' value='نشانهگذاری'/> + <cd:variable name='math' value='math'/> <cd:variable name='mathalignment' value='تنظیمریاضی'/> <cd:variable name='mathcases' value='حالتهایریاضی'/> <cd:variable name='mathematics' value='ریاضی'/> @@ -417,12 +418,14 @@ <cd:variable name='sectionblockenvironment' value='محیطبلوکبخش'/> <cd:variable name='sectionnumber' value='شمارهبخش'/> <cd:variable name='see' value='ببینید'/> + <cd:variable name='selectfont' value='selectfont'/> <cd:variable name='september' value='سپتامبر'/> <cd:variable name='serif' value='سریف'/> <cd:variable name='serried' value='تنگهم'/> <cd:variable name='setups' value='بارگذاریها'/> <cd:variable name='sheet' value='ورقه'/> <cd:variable name='short' value='short'/> + <cd:variable name='simplefonts' value='simplefonts'/> <cd:variable name='singlesided' value='یکرو'/> <cd:variable name='slanted' value='خوابیده'/> <cd:variable name='slantedbold' value='مشکیخوابیده'/> @@ -599,6 +602,12 @@ <cd:constant name='blockway' value='راهبلوک'/> <cd:constant name='bodyfont' value='قلمبدنه'/> <cd:constant name='boffset' value='boffset'/> + <cd:constant name='boldfeatures' value='boldfeatures'/> + <cd:constant name='boldfont' value='boldfont'/> + <cd:constant name='bolditalicfeatures' value='bolditalicfeatures'/> + <cd:constant name='bolditalicfont' value='bolditalicfont'/> + <cd:constant name='boldslantedfeatures' value='boldslantedfeatures'/> + <cd:constant name='boldslantedfont' value='boldslantedfont'/> <cd:constant name='bookmark' value='چوبخط'/> <cd:constant name='bottom' value='پایین'/> <cd:constant name='bottomafter' value='bottomafter'/> @@ -614,6 +623,7 @@ <cd:constant name='calculate' value='محاسبه'/> <cd:constant name='category' value='category'/> <cd:constant name='ccommand' value='فرمان'/> + <cd:constant name='check' value='check'/> <cd:constant name='click' value='فشردن'/> <cd:constant name='clickin' value='فشردنداخل'/> <cd:constant name='clickout' value='فشردنخارج'/> @@ -689,6 +699,7 @@ <cd:constant name='factor' value='عامل'/> <cd:constant name='fallback' value='عقبریختن'/> <cd:constant name='family' value='خانواده'/> + <cd:constant name='features' value='features'/> <cd:constant name='fieldbackgroundcolor' value='رنگپسزمینهمیدان'/> <cd:constant name='fieldframecolor' value='رنگقالبمیدان'/> <cd:constant name='fieldlayer' value='لایهمیدان'/> @@ -718,6 +729,7 @@ <cd:constant name='from' value='از'/> <cd:constant name='get' value='بگیر'/> <cd:constant name='global' value='سراسری'/> + <cd:constant name='goodies' value='goodies'/> <cd:constant name='grid' value='توری'/> <cd:constant name='hang' value='بیاویز'/> <cd:constant name='hcompact' value='hcompact'/> @@ -754,6 +766,8 @@ <cd:constant name='interaction' value='پانل'/> <cd:constant name='interlinespace' value='فضایبینخط'/> <cd:constant name='internalgrid' value='internalgrid'/> + <cd:constant name='italicfeatures' value='italicfeatures'/> + <cd:constant name='italicfont' value='italicfont'/> <cd:constant name='itemalign' value='تنظیمآیتم'/> <cd:constant name='items' value='آیتمها'/> <cd:constant name='juniorsep' value='juniorsep'/> @@ -874,6 +888,7 @@ <cd:constant name='openaction' value='عملباز'/> <cd:constant name='openpage' value='openpage'/> <cd:constant name='openpageaction' value='عملصفحهباز'/> + <cd:constant name='opticalsize' value='opticalsize'/> <cd:constant name='option' value='گزینه'/> <cd:constant name='order' value='order'/> <cd:constant name='orientation' value='جهتدهی'/> @@ -941,6 +956,8 @@ <cd:constant name='region' value='region'/> <cd:constant name='regionin' value='ناحیهدرون'/> <cd:constant name='regionout' value='ناحیهبیرون'/> + <cd:constant name='regularfeatures' value='regularfeatures'/> + <cd:constant name='regularfont' value='regularfont'/> <cd:constant name='repeat' value='تکرار'/> <cd:constant name='reset' value='بازنشانی'/> <cd:constant name='resetnumber' value='بازنشانیشماره'/> @@ -999,7 +1016,11 @@ <cd:constant name='sidespacebefore' value='فضایکناریقبل'/> <cd:constant name='sign' value='علامت'/> <cd:constant name='size' value='اندازه'/> + <cd:constant name='slantedfeatures' value='slantedfeatures'/> + <cd:constant name='slantedfont' value='slantedfont'/> <cd:constant name='small' value='کوچک'/> + <cd:constant name='smallcapsfeatures' value='smallcapsfeatures'/> + <cd:constant name='smallcapsfont' value='smallcapsfont'/> <cd:constant name='solution' value='solution'/> <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='ترتیبتایپ'/> diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index 8bacf6caa..e83d145d0 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -284,6 +284,7 @@ <cd:variable name='marginedge' value='marginebordura'/> <cd:variable name='margintitle' value='titlumarginal'/> <cd:variable name='marking' value='marcaje'/> + <cd:variable name='math' value='math'/> <cd:variable name='mathalignment' value='mathalignment'/> <cd:variable name='mathcases' value='mathcases'/> <cd:variable name='mathematics' value='matematica'/> @@ -417,12 +418,14 @@ <cd:variable name='sectionblockenvironment' value='blocsectiuneambient'/> <cd:variable name='sectionnumber' value='numarsetiune'/> <cd:variable name='see' value='vezi'/> + <cd:variable name='selectfont' value='selectfont'/> <cd:variable name='september' value='septembrie'/> <cd:variable name='serif' value='serif'/> <cd:variable name='serried' value='serried'/> <cd:variable name='setups' value='setari'/> <cd:variable name='sheet' value='sheet'/> <cd:variable name='short' value='short'/> + <cd:variable name='simplefonts' value='simplefonts'/> <cd:variable name='singlesided' value='ofata'/> <cd:variable name='slanted' value='inclinat'/> <cd:variable name='slantedbold' value='inclinataldin'/> @@ -599,6 +602,12 @@ <cd:constant name='blockway' value='blockway'/> <cd:constant name='bodyfont' value='fonttext'/> <cd:constant name='boffset' value='boffset'/> + <cd:constant name='boldfeatures' value='boldfeatures'/> + <cd:constant name='boldfont' value='boldfont'/> + <cd:constant name='bolditalicfeatures' value='bolditalicfeatures'/> + <cd:constant name='bolditalicfont' value='bolditalicfont'/> + <cd:constant name='boldslantedfeatures' value='boldslantedfeatures'/> + <cd:constant name='boldslantedfont' value='boldslantedfont'/> <cd:constant name='bookmark' value='semncarte'/> <cd:constant name='bottom' value='jos'/> <cd:constant name='bottomafter' value='bottomafter'/> @@ -614,6 +623,7 @@ <cd:constant name='calculate' value='calculeaza'/> <cd:constant name='category' value='category'/> <cd:constant name='ccommand' value='comandac'/> + <cd:constant name='check' value='check'/> <cd:constant name='click' value='click'/> <cd:constant name='clickin' value='clickintru'/> <cd:constant name='clickout' value='clickies'/> @@ -689,6 +699,7 @@ <cd:constant name='factor' value='factor'/> <cd:constant name='fallback' value='fallback'/> <cd:constant name='family' value='familie'/> + <cd:constant name='features' value='features'/> <cd:constant name='fieldbackgroundcolor' value='culoarefundalcamp'/> <cd:constant name='fieldframecolor' value='culoareframecamp'/> <cd:constant name='fieldlayer' value='fieldlayer'/> @@ -718,6 +729,7 @@ <cd:constant name='from' value='dela'/> <cd:constant name='get' value='adu'/> <cd:constant name='global' value='global'/> + <cd:constant name='goodies' value='goodies'/> <cd:constant name='grid' value='grid'/> <cd:constant name='hang' value='suspenda'/> <cd:constant name='hcompact' value='hcompact'/> @@ -754,6 +766,8 @@ <cd:constant name='interaction' value='interactiune'/> <cd:constant name='interlinespace' value='spatiereinterliniara'/> <cd:constant name='internalgrid' value='internalgrid'/> + <cd:constant name='italicfeatures' value='italicfeatures'/> + <cd:constant name='italicfont' value='italicfont'/> <cd:constant name='itemalign' value='itemalign'/> <cd:constant name='items' value='elemente'/> <cd:constant name='juniorsep' value='juniorsep'/> @@ -874,6 +888,7 @@ <cd:constant name='openaction' value='actiunedeschidere'/> <cd:constant name='openpage' value='openpage'/> <cd:constant name='openpageaction' value='actiunedeschiderepagina'/> + <cd:constant name='opticalsize' value='opticalsize'/> <cd:constant name='option' value='optiune'/> <cd:constant name='order' value='order'/> <cd:constant name='orientation' value='orientation'/> @@ -941,6 +956,8 @@ <cd:constant name='region' value='region'/> <cd:constant name='regionin' value='regiuneintrare'/> <cd:constant name='regionout' value='regiuneiesire'/> + <cd:constant name='regularfeatures' value='regularfeatures'/> + <cd:constant name='regularfont' value='regularfont'/> <cd:constant name='repeat' value='repeta'/> <cd:constant name='reset' value='reset'/> <cd:constant name='resetnumber' value='resetnumber'/> @@ -999,7 +1016,11 @@ <cd:constant name='sidespacebefore' value='spatiulateralinainte'/> <cd:constant name='sign' value='semn'/> <cd:constant name='size' value='dimensiune'/> + <cd:constant name='slantedfeatures' value='slantedfeatures'/> + <cd:constant name='slantedfont' value='slantedfont'/> <cd:constant name='small' value='mic'/> + <cd:constant name='smallcapsfeatures' value='smallcapsfeatures'/> + <cd:constant name='smallcapsfont' value='smallcapsfont'/> <cd:constant name='solution' value='solution'/> <cd:constant name='sort' value='sort'/> <cd:constant name='sorttype' value='sorttype'/> diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 7cbb28798..90c5725b0 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 : 09/11/13 01:32:13 +-- merge date : 09/11/13 11:46:31 do -- begin closure to overcome local limits and interference |