diff options
Diffstat (limited to 'tex/context/modules/mkiv')
| -rw-r--r-- | tex/context/modules/mkiv/m-zint.mkiv | 33 | ||||
| -rw-r--r-- | tex/context/modules/mkiv/s-math-characters.lua | 35 | ||||
| -rw-r--r-- | tex/context/modules/mkiv/s-math-characters.mkiv | 80 | ||||
| -rw-r--r-- | tex/context/modules/mkiv/s-math-parameters.lua | 22 |
4 files changed, 101 insertions, 69 deletions
diff --git a/tex/context/modules/mkiv/m-zint.mkiv b/tex/context/modules/mkiv/m-zint.mkiv index 7fe9f761c..87e0d382c 100644 --- a/tex/context/modules/mkiv/m-zint.mkiv +++ b/tex/context/modules/mkiv/m-zint.mkiv @@ -68,9 +68,12 @@ function moduledata.zint.generate(code,data,suffix,options) if not lfs.isfile(name) then local temp = file.addsuffix(base,"tmp") local code = numberofcode(code) - logs.simple("using 'zint' to generate '%s'",base) io.savedata(temp,data) - os.execute(format('%s --barcode=%s --output="%s" --input="%s" %s',zint,code,name,temp,options or "")) + local command = format('%s --barcode=%s %s --output="%s" --input="%s"',zint,code,options or "",name,temp) + logs.simple("using 'zint' to generate '%s'",base) + logs.simple("command '%s'",command) + print(command) + os.execute(command) os.remove(temp) end return name @@ -83,10 +86,10 @@ end \unexpanded\def\barcode[#1]% [alternative=,text=] {\bgroup \getdummyparameters - [\c!alternative=,\c!text=,#1]% + [\c!alternative=,\c!text=,\c!suffix=eps,\c!option=,#1]% \externalfigure - [\cldcontext{moduledata.zint.generate("\dummyparameter\c!alternative",\!!bs\dummyparameter\c!text\!!es)}]% - [#1,\c!alternative=,\c!text=]% + [\cldcontext{moduledata.zint.generate("\dummyparameter\c!alternative",\!!bs\dummyparameter\c!text\!!es,"\dummyparameter\c!suffix","\dummyparameter\c!option")}]% + [#1,\c!option=,\c!alternative=,\c!text=]% \egroup} \protect @@ -95,15 +98,17 @@ end \starttext - \externalfigure[\cldcontext{moduledata.zint.generate("PDF417",[[Hans Hagen]])}] - \blank - \externalfigure[\cldcontext{moduledata.zint.generate("PDF417","Ton Otten")}] - \blank - \externalfigure[\cldcontext{moduledata.zint.generate("ISBN","9789490688011")}] - \blank - \barcode[text=Does It Work?,width=\textwidth] - \blank - \barcode[alternative=isbn,text=9789490688011,width=3cm] +% \externalfigure[\cldcontext{moduledata.zint.generate("PDF417",[[Hans Hagen]])}] +% \blank +% \externalfigure[\cldcontext{moduledata.zint.generate("PDF417","Ton Otten")}] +% \blank +% \externalfigure[\cldcontext{moduledata.zint.generate("ISBN","9789490688011")}] +% \blank +% \barcode[text=Does It Work?,width=\textwidth] +% \blank +% \barcode[alternative=isbn,text=9789490688011,width=3cm] +% \blank + \barcode[alternative=datamatrix,text=whatever,width=3cm,option=--square] \stoptext diff --git a/tex/context/modules/mkiv/s-math-characters.lua b/tex/context/modules/mkiv/s-math-characters.lua index fc697cae5..aed3258d2 100644 --- a/tex/context/modules/mkiv/s-math-characters.lua +++ b/tex/context/modules/mkiv/s-math-characters.lua @@ -157,8 +157,8 @@ local alllookups = collectalllookups(tfmdata,"math","dflt") -- skip else local next_sizes = char.next - local vvariants = char.vvariants or char.vert_variants - local hvariants = char.hvariants or char.horiz_variants + local vparts = char.vparts or char.vert_variants + local hparts = char.hparts or char.horiz_variants local mathclass = info.mathclass local mathspec = info.mathspec local mathsymbol = info.mathsymbol @@ -208,32 +208,33 @@ local alllookups = collectalllookups(tfmdata,"math","dflt") done[next_sizes] = true context.showmathcharactersnextentry(n,f_unicode(next_sizes),next_sizes) next_sizes = characters[next_sizes] - vvariants = next_sizes.vvariants or next_sizes.vert_variants or vvariants - hvariants = next_sizes.hvariants or next_sizes.horiz_variants or hvariants + vparts = next_sizes.vparts or next_sizes.vert_variants or vparts + hparts = next_sizes.hparts or next_sizes.horiz_variants or hparts if next_sizes then next_sizes = next_sizes.next end end end context.showmathcharactersstopnext() - if hvariants or vvariants then + if vparts or hparts then context.showmathcharactersbetweennextandvariants() end end - if hvariants then - context.showmathcharactersstarthvariants() - for i=1,#hvariants do -- we might go top-down in the original - local vi = hvariants[i] - context.showmathcharactershvariantsentry(i,f_unicode(vi.glyph),vi.glyph) + if vparts then + context.showmathcharactersstartvparts() + for i=1,#vparts do -- we might go top-down in the original + local vi = vparts[i] + context.showmathcharactersvpartsentry(i,f_unicode(vi.glyph),vi.glyph) end - context.showmathcharactersstophvariants() - elseif vvariants then - context.showmathcharactersstartvvariants() - for i=1,#vvariants do - local vi = vvariants[#vvariants-i+1] - context.showmathcharactersvvariantsentry(i,f_unicode(vi.glyph),vi.glyph) + context.showmathcharactersstopvparts() + end + if hparts then + context.showmathcharactersstarthparts() + for i=1,#hparts do + local hi = hparts[#hparts-i+1] + context.showmathcharactershpartsentry(i,f_unicode(hi.glyph),hi.glyph) end - context.showmathcharactersstopvvariants() + context.showmathcharactersstophparts() end local lookups = alllookups[unicode] if lookups then diff --git a/tex/context/modules/mkiv/s-math-characters.mkiv b/tex/context/modules/mkiv/s-math-characters.mkiv index e5e0d084f..c9011fbe1 100644 --- a/tex/context/modules/mkiv/s-math-characters.mkiv +++ b/tex/context/modules/mkiv/s-math-characters.mkiv @@ -20,33 +20,33 @@ \startsetups s-math-characters:reset - \let\showmathcharactersstart \relax - \let\showmathcharactersstop \relax - \let\showmathcharactersreference \gobbleoneargument - \let\showmathcharactersstartentry \relax - \let\showmathcharactersstopentry \relax - \let\showmathcharactersentryhexdectit \gobblethreearguments - \let\showmathcharactersentrywdhtdpic \gobblefourarguments - \let\showmathcharactersentryresource \gobbleoneargument - \let\showmathcharactersstartnext \relax - \let\showmathcharactersnextentry \gobblethreearguments - \let\showmathcharactersnextcycle \gobbleonearguments - \let\showmathcharactersstopnext \relax - \let\showmathcharactersstarthvariants \relax - \let\showmathcharactershvariantsentry \gobblethreearguments - \let\showmathcharactersstophvariants \relax - \let\showmathcharactersstartvvariants \showmathcharactersstarthvariants - \let\showmathcharactersvvariantsentry \showmathcharactershvariantsentry - \let\showmathcharactersstopvvariants \showmathcharactersstophvariants - \let\showmathcharactersbetweennextandvariants\relax - \let\showmathcharactersstartentryclassspec \relax - \let\showmathcharactersstopentryclassspec \relax - \let\showmathcharactersentryclassname \gobbletwoarguments - \let\showmathcharactersentrysymbol \gobbletwoarguments - \let\showmathcharactersstartlookupvariants \relax - \let\showmathcharacterslookupvariant \gobblefourarguments - \let\showmathcharactersstoplookupvariants \relax - \let\showmathcharacterssetrange \gobblethreearguments + \let\showmathcharactersstart \relax + \let\showmathcharactersstop \relax + \let\showmathcharactersreference \gobbleoneargument + \let\showmathcharactersstartentry \relax + \let\showmathcharactersstopentry \relax + \let\showmathcharactersentryhexdectit \gobblethreearguments + \let\showmathcharactersentrywdhtdpic \gobblefourarguments + \let\showmathcharactersentryresource \gobbleoneargument + \let\showmathcharactersstartnext \relax + \let\showmathcharactersnextentry \gobblethreearguments + \let\showmathcharactersnextcycle \gobbleonearguments + \let\showmathcharactersstopnext \relax + \let\showmathcharactersstarthparts \relax + \let\showmathcharactershpartsentry \gobblethreearguments + \let\showmathcharactersstophparts \relax + \let\showmathcharactersstartvparts \relax + \let\showmathcharactersvpartsentry \gobblethreearguments + \let\showmathcharactersstopvparts \relax + \let\showmathcharactersbetweennextandvparts\relax + \let\showmathcharactersstartentryclassspec \relax + \let\showmathcharactersstopentryclassspec \relax + \let\showmathcharactersentryclassname \gobbletwoarguments + \let\showmathcharactersentrysymbol \gobbletwoarguments + \let\showmathcharactersstartlookupvariants \relax + \let\showmathcharacterslookupvariant \gobblefourarguments + \let\showmathcharactersstoplookupvariants \relax + \let\showmathcharacterssetrange \gobblethreearguments \stopsetups @@ -70,7 +70,7 @@ {virtual:\space##1\par} \def\showmathcharactersstartnext - {\par\begingroup\hangindent\emwidth\hangafter-\plushundred\hskip-\emwidth + {\par\begingroup\hangindent\emwidth\hangafter-\plushundred\hskip-\emwidth\relax next:\space} \def\showmathcharactersnextentry##1##2##3% @@ -82,21 +82,25 @@ \def\showmathcharactersstopnext {\par\endgroup} - \def\showmathcharactersstarthvariants - {\par\begingroup\hangindent\emwidth\hangafter-\plushundred\hskip-\emwidth - variants:\space} + \def\showmathcharactersstartparts + {\par\begingroup\hangindent\emwidth\hangafter-\plushundred\hskip-\emwidth\relax + parts:\space} - \def\showmathcharactershvariantsentry##1##2##3% + \def\showmathcharacterspartsentry##1##2##3% {\ifnum##1>\plusone \space=>\space\fi##2~\ruledhbox{\char##3}} - \def\showmathcharactersstophvariants + \def\showmathcharactersstopparts {\par\endgroup} - \let\showmathcharactersstartvvariants\showmathcharactersstarthvariants - \let\showmathcharactersvvariantsentry\showmathcharactershvariantsentry - \let\showmathcharactersstopvvariants \showmathcharactersstophvariants + \let\showmathcharactersstartvparts\showmathcharactersstartparts + \let\showmathcharactersvpartsentry\showmathcharacterspartsentry + \let\showmathcharactersstopvparts \showmathcharactersstopparts - \def\showmathcharactersbetweennextandvariants + \let\showmathcharactersstarthparts\showmathcharactersstartparts + \let\showmathcharactershpartsentry\showmathcharacterspartsentry + \let\showmathcharactersstophparts \showmathcharactersstopparts + + \def\showmathcharactersbetweennextandparts {}% \space=>\space} \def\showmathcharactersentryclassname##1##2% @@ -106,7 +110,7 @@ {mathsymbol:\space##1~\ruledhbox{\char##2}\par} \def\showmathcharactersstartlookupvariants - {\par\begingroup\hangindent\emwidth\hangafter-\plushundred\hskip-\emwidth + {\par\begingroup\hangindent\emwidth\hangafter-\plushundred\hskip-\emwidth\relax lookupvariants:\space} \def\showmathcharacterslookupvariant##1##2##3##4% diff --git a/tex/context/modules/mkiv/s-math-parameters.lua b/tex/context/modules/mkiv/s-math-parameters.lua index 8e8c15a2d..73d5f4208 100644 --- a/tex/context/modules/mkiv/s-math-parameters.lua +++ b/tex/context/modules/mkiv/s-math-parameters.lua @@ -34,6 +34,28 @@ tables.parameters = { "spaceafterscript", "connectoroverlapmin", } +if CONTEXTLMTXMODE > 0 then + + tables.styleaxis = table.imerged ( tables.styleaxis, { + "frac", "rad", + } ) + + tables.parameters = table.imerged ( tables.parameters, { + "extrasupshift", "extrasubshift", "extrasuppreshift", "extrasubpreshift", + "extrasupspace", "extrasubspace", "extrasupprespace", "extrasubprespace", + -- "overlinevariant", "underlinevariant", + -- "overdelimitervariant", "underdelimitervariant", + -- "delimiterovervariant", "delimiterundervariant", + -- "hextensiblevariant", "vextensiblevariant", + -- "fractionvariant", "radicalvariant", "degreevariant", + -- "accentvariant", "topaccentvariant", "botaccentvariant", "overlayaccentvariant", + -- "numeratorvariant", "denominatorvariant", + -- "superscriptvariant", "subscriptvariant", + -- "stackvariant", + } ) + +end + tables.styles = { "display", "text", |