diff options
author | Karl Berry <karl@freefriends.org> | 2009-09-17 00:16:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2009-09-17 00:16:26 +0000 |
commit | 04f8338df406e38f73934b6d0f025e3ebcebca91 (patch) | |
tree | b5b547300b5b42fbf9050d9b6c6612f1184258b3 /Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.lua | |
parent | 7c712eff353dad0f5de9c8318d941ad890b9b014 (diff) |
context-simplefonts update (15sep09)
git-svn-id: svn://tug.org/texlive/trunk@15324 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.lua')
-rw-r--r-- | Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.lua | 156 |
1 files changed, 7 insertions, 149 deletions
diff --git a/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.lua b/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.lua index d920fe4242d..8c86cc779a5 100644 --- a/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.lua +++ b/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.lua @@ -142,151 +142,9 @@ simplefonts.fontlist = { } , } ---~ for k,v in next, global.fonts.otf.tables.features do ---~ v = lower(gsub(gsub(gsub(v,"#",""),"-","")," ","")) ---~ simplefonts.features[v] = lower(gsub(k," ","")) ---~ end - -simplefonts.features = { - ['accessallalternates'] = 'aalt', - ['abovebaseforms'] = 'abvf', - ['abovebasemarkpositioning'] = 'abvm', - ['abovebasesubstitutions'] = 'abvs', - ['alternativefractions'] = 'afrc', - ['akhands'] = 'akhn', - ['belowbaseforms' ] = 'blwf', - ['belowbasemarkpositioning'] = 'blwm', - ['belowbasesubstitutions'] = 'blws', - ['petitecapitalsfromcapitals'] = 'c2pc', - ['smallcapitalsfromcapitals'] = 'c2sc', - ['contextualalternates'] = 'calt', - ['casesensitiveforms'] = 'case', - ['glyphcompositiondecomposition'] = 'ccmp', - ['conjunctforms'] = 'cjct', - ['contextualligatures'] = 'clig', - ['capitalspacing'] = 'cpsp', - ['contextualswash'] = 'cswh', - ['cursivepositioning'] = 'curs', - ['defaultprocessing'] = 'dflt', - ['distances'] = 'dist', - ['discretionaryligatures'] = 'dlig', - ['denominators'] = 'dnom', - ['dotlessforms'] = 'dtls', - ['expertforms'] = 'expt', - ['finalglyphalternates'] = 'falt', - ['terminalforms2'] = 'fin2', - ['terminalforms3'] = 'fin3', - ['terminalforms'] = 'fina', - ['flattenedaccentsovercapitals'] = 'flac', - ['fractions'] = 'frac', - ['fullwidth'] = 'fwid', - ['halfforms'] = 'half', - ['halantforms'] = 'haln', - ['alternatehalfwidth'] = 'halt', - ['historicalforms'] = 'hist', - ['horizontalkanaalternates'] = 'hkna', - ['historicalligatures'] = 'hlig', - ['hangul'] = 'hngl', - ['hojokanjiforms'] = 'hojo', - ['halfwidth'] = 'hwid', - ['initialforms'] = 'init', - ['isolatedforms'] = 'isol', - ['italics'] = 'ital', - ['justificationalternatives'] = 'jalt', - ['jis2004forms'] = 'jp04', - ['jis78forms'] = 'jp78', - ['jis83forms'] = 'jp83', - ['jis90forms'] = 'jp90', - ['kerning'] = 'kern', - ['leftbounds'] = 'lfbd', - ['standardligatures'] = 'liga', - ['leadingjamoforms'] = 'ljmo', - ['liningfigures'] = 'lnum', - ['localizedforms'] = 'locl', - ['markpositioning'] = 'mark', - ['medialforms2'] = 'med2', - ['medialforms'] = 'medi', - ['mathematicalgreek'] = 'mgrk', - ['marktomarkpositioning'] = 'mkmk', - ['markpositioningviasubstitution'] = 'mset', - ['alternateannotationforms'] = 'nalt', - ['nlckanjiforms'] = 'nlck', - ['nuktaforms'] = 'nukt', - ['numerators'] = 'numr', - ['oldstylefigures'] = 'onum', - ['opticalbounds'] = 'opbd', - ['ordinals'] = 'ordn', - ['ornaments'] = 'ornm', - ['proportionalalternatewidth'] = 'palt', - ['petitecapitals'] = 'pcap', - ['proportionalfigures'] = 'pnum', - ['prebaseforms'] = 'pref', - ['prebasesubstitutions'] = 'pres', - ['postbaseforms'] = 'pstf', - ['postbasesubstitutions'] = 'psts', - ['proportionalwidths'] = 'pwid', - ['quarterwidths'] = 'qwid', - ['randomize'] = 'rand', - ['rakarforms'] = 'rkrf', - ['requiredligatures'] = 'rlig', - ['rephform'] = 'rphf', - ['rightbounds'] = 'rtbd', - ['righttoleftalternates'] = 'rtla', - ['rubynotationforms'] = 'ruby', - ['stylisticalternates'] = 'salt', - ['scientificinferiors'] = 'sinf', - ['opticalsize'] = 'size', - ['smallcapitals'] = 'smcp', - ['simplifiedforms'] = 'smpl', - ['stylisticset1'] = 'ss01', - ['stylisticset2'] = 'ss02', - ['stylisticset3'] = 'ss03', - ['stylisticset4'] = 'ss04', - ['stylisticset5'] = 'ss05', - ['stylisticset6'] = 'ss06', - ['stylisticset7'] = 'ss07', - ['stylisticset8'] = 'ss08', - ['stylisticset9'] = 'ss09', - ['stylisticset10'] = 'ss10', - ['stylisticset11'] = 'ss11', - ['stylisticset12'] = 'ss12', - ['stylisticset13'] = 'ss13', - ['stylisticset14'] = 'ss14', - ['stylisticset15'] = 'ss15', - ['stylisticset16'] = 'ss16', - ['stylisticset17'] = 'ss17', - ['stylisticset18'] = 'ss18', - ['stylisticset19'] = 'ss19', - ['stylisticset20'] = 'ss20', - ['scriptstyle'] = 'ssty', - ['subscript'] = 'subs', - ['superscript'] = 'sups', - ['swash'] = 'swsh', - ['titling'] = 'titl', - ['trailingjamoforms'] = 'tjmo', - ['traditionalnameforms'] = 'tnam', - ['tabularfigures'] = 'tnum', - ['traditionalforms'] = 'trad', - ['thirdeidths'] = 'twid', - ['unicase'] = 'unic', - ['alternateverticalmetrics'] = 'valt', - ['vattuvariants'] = 'vatu', - ['verticalwriting'] = 'vert', - ['alternateverticalhalfmetrics'] = 'vhal', - ['voweljamoforms'] = 'vjmo', - ['verticalkanaalternates'] = 'vkna', - ['verticalkerning'] = 'vkrn', - ['proportionalalternateverticalmetrics'] = 'vpal', - ['verticalrotation'] = 'vrt2', - ['slashedzero'] = 'zero', - -- context only features - ['traditionaltexreplacements'] = 'trep', - ['traditionaltexligatures'] = 'tlig', -} - function simplefonts.selectfont(font,name,extension,style,weight) local fontname = {} - local name = lower(gsub(gsub(name," ",""),"-","")) + local name = lower(gsub(name,"[^a-zA-Z0-9]","")) if extension ~= "" then ext = find(extension,"*") if ext ~= nil then @@ -294,7 +152,7 @@ function simplefonts.selectfont(font,name,extension,style,weight) else fontname = extension end - fontname = "name:" .. lower(gsub(fontname," ","")) + fontname = "name:" .. lower(gsub(fontname,"[^a-zA-Z0-9]","")) else if simplefonts.fontlist[name] then if simplefonts.fontlist[name][weight] then @@ -319,7 +177,7 @@ function simplefonts.selectfont(font,name,extension,style,weight) fontname = "name:" .. fontname break else - --~ texsprint(prtcatcodes,format("\\showmessage\\m!simplefonts{1}{%s}",fontname)) + --~ interfaces.showmessage("simplefonts","1",fontname) -- wrong place fontname = "DefaultFont" -- no font is found end end @@ -327,25 +185,25 @@ function simplefonts.selectfont(font,name,extension,style,weight) end --~ print(fontname) if fontname == "DefaultFont" then - texsprint(prtcatcodes,format("\\showmessage\\m!simplefonts{1}{%s}",name)) + interfaces.showmessage("simplefonts","1",name) end texsprint(prtcatcodes,format("\\setvalue{\\????sf %s%s}{%s}",font,style,fontname)) end function simplefonts.normalizefontname(name) - local fontname = lower(gsub(gsub(name," ",""),"-","")) -- remove spaces and hyphens from the user specified name + local fontname = lower(gsub(name,"[^a-zA-Z0-9]","")) -- remove spaces and hyphens etc. from the user specified name texsprint(ctxcatcodes,fontname) end function simplefonts.parameter(key,value,list) - local features = simplefonts.features[key] + local features = fonts.otf.tables.to_features[key] local parameters = simplefonts.parameters[key] if features then texsprint(format("\\addvalue{%s}{%s=%s}",list,features,value)) --~ print(features .. "=" .. value) else if not parameters then - texsprint(prtcatcodes,format("\\showmessage\\m!simplefonts{2}{%s}",key)) + interfaces.showmessage("simplefonts","2",key) end end end |