diff options
| author | Hans Hagen <pragma@wxs.nl> | 2005-10-27 00:00:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2005-10-27 00:00:00 +0200 |
| commit | 28ba5960fc4486f4e667ee0cbd802335483e1c99 (patch) | |
| tree | 364430fa36f4d3b1b254a10874b4ed369469d4c9 | |
| parent | a35805505d72f60e25a5d9b96dcc5c0a83cc1ed0 (diff) | |
| download | context-28ba5960fc4486f4e667ee0cbd802335483e1c99.tar.gz | |
stable 2005.10.27
94 files changed, 3468 insertions, 2713 deletions
diff --git a/context/data/context.properties b/context/data/context.properties index fed77a2cd..6edccaab5 100644 --- a/context/data/context.properties +++ b/context/data/context.properties @@ -66,7 +66,8 @@ if PLAT_GTK name.context.acrobat=acrobat name.context.concheck=texmfstart concheck.rb -name.context.texexec=texmfstart texexec.pl --autopdf +#name.context.texexec=texmfstart texexec.pl --autopdf +name.context.texexec=texmfstart newtexexec.rb --autopdf name.context.texshow=texmfstart texshow.pl name.context.texutil=texmfstart texutil.pl #name.context.examplap=texmfstart --file=examplap.pdf --program=context --browser diff --git a/context/data/type-buy.dat b/context/data/type-buy.dat index 5036a713d..76d4d69ab 100644 --- a/context/data/type-buy.dat +++ b/context/data/type-buy.dat @@ -124,3 +124,18 @@ --en=? --ve=ef --co=swift --re --en=? --ve=ef --co=swift --so=ef/swift --ma --in --pattern=sw* + +# linotype optima-nova + +--en=? --ve=linotype --co=optima-nova --re +--en=? --ve=linotype --co=optima-nova --so=linotype/optima-nova --ma --in + +# linotype palatino-nova + +--en=? --ve=linotype --co=palatino-nova --re +--en=? --ve=linotype --co=palatino-nova --so=linotype/palatino-nova --ma --in + +# linotype syntax + +--en=? --ve=linotype --co=syntax --re +--en=? --ve=linotype --co=syntax --so=linotype/syntax --ma --in diff --git a/fonts/enc/dvips/context/ec-var-lm.enc b/fonts/enc/dvips/context/ec-var-lm.enc deleted file mode 100644 index bc54a41d4..000000000 --- a/fonts/enc/dvips/context/ec-var-lm.enc +++ /dev/null @@ -1,262 +0,0 @@ -% author: Hans Hagen -% -% This enc file defines ec (cork) encoded Latin Modern adapted for umlauts and other variations. - -/encecvarlm[ -/grave -/acute -/circumflex -/tilde -/vardieresis -/hungarumlaut -/ring -/caron -/breve -/macron -/dotaccent -/cedilla -/ogonek -/quotesinglbase -/guilsinglleft -/guilsinglright -/quotedblleft -/quotedblright -/quotedblbase -/guillemotleft -/guillemotright -/endash -/emdash -/cwm -/zeroinferior -/dotlessi -/dotlessj -/ff -/fi -/fl -/ffi -/ffl -/visualspace -/exclam -/quotedbl -/numbersign -/dollar -/percent -/ampersand -/quoteright -/parenleft -/parenright -/asterisk -/plus -/comma -/hyphen -/period -/slash -/zero -/one -/two -/three -/four -/five -/six -/seven -/eight -/nine -/colon -/semicolon -/less -/equal -/greater -/question -/at -/A -/B -/C -/D -/E -/F -/G -/H -/I -/J -/K -/L -/M -/N -/O -/P -/Q -/R -/S -/T -/U -/V -/W -/X -/Y -/Z -/bracketleft -/backslash -/bracketright -/asciicircum -/underscore -/quoteleft -/a -/b -/c -/d -/e -/f -/g -/h -/i -/j -/k -/l -/m -/n -/o -/p -/q -/r -/s -/t -/u -/v -/w -/x -/y -/z -/braceleft -/bar -/braceright -/asciitilde -/hyphen -/Abreve -/Aogonek -/Cacute -/Ccaron -/Dcaron -/Ecaron -/Eogonek -/Gbreve -/Lacute -/Lcaron -/Lslash -/Nacute -/Ncaron -/Ng -/Ohungarumlaut -/Racute -/Rcaron -/Sacute -/Scaron -/Scedilla -/Tcaron -/Tcedilla -/Uhungarumlaut -/Uring -/Yvardieresis -/Zacute -/Zcaron -/Zdotaccent -/IJ -/Idotaccent -/dbar -/section -/abreve -/aogonek -/cacute -/ccaron -/dcaron -/ecaron -/eogonek -/gbreve -/lacute -/lcaron -/lslash -/nacute -/ncaron -/ng -/ohungarumlaut -/racute -/rcaron -/sacute -/scaron -/scedilla -/tquoteright -/tcedilla -/uhungarumlaut -/uring -/yvardieresis -/zacute -/zcaron -/zdotaccent -/ij -/exclamdown -/questiondown -/sterling -/Agrave -/Aacute -/Acircumflex -/Atilde -/Avardieresis -/Aring -/AE -/Ccedilla -/Egrave -/Eacute -/Ecircumflex -/Evardieresis -/Igrave -/Iacute -/Icircumflex -/Ivardieresis -/Eth -/Ntilde -/Ograve -/Oacute -/Ocircumflex -/Otilde -/Ovardieresis -/OE -/Oslash -/Ugrave -/Uacute -/Ucircumflex -/Uvardieresis -/Yacute -/Thorn -/Germandbls -/agrave -/aacute -/acircumflex -/atilde -/avardieresis -/aring -/ae -/ccedilla -/egrave -/eacute -/ecircumflex -/evardieresis -/igrave -/iacute -/icircumflex -/ivardieresis -/eth -/ntilde -/ograve -/oacute -/ocircumflex -/otilde -/ovardieresis -/oe -/oslash -/ugrave -/uacute -/ucircumflex -/uvardieresis -/yacute -/thorn -/germandbls -] def
\ No newline at end of file diff --git a/fonts/enc/dvips/context/ec-os-lm.enc b/fonts/enc/dvips/context/lm-ec-os.enc index d05302a4b..6bb22f319 100644 --- a/fonts/enc/dvips/context/ec-os-lm.enc +++ b/fonts/enc/dvips/context/lm-ec-os.enc @@ -1,4 +1,4 @@ -/enccorklm[ +/enclmec[ /grave /acute /circumflex @@ -47,16 +47,16 @@ /hyphen /period /slash -/zerooldstyle -/oneoldstyle -/twooldstyle -/threeoldstyle -/fouroldstyle -/fiveoldstyle -/sixoldstyle -/sevenoldstyle -/eightoldstyle -/nineoldstyle +/zero.oldstyle +/one.oldstyle +/two.oldstyle +/three.oldstyle +/four.oldstyle +/five.oldstyle +/six.oldstyle +/seven.oldstyle +/eight.oldstyle +/nine.oldstyle /colon /semicolon /less @@ -146,9 +146,9 @@ /Rcaron /Sacute /Scaron -/Scommaaccent +/Scedilla /Tcaron -/Tcommaaccent +/Tcedilla /Uhungarumlaut /Uring /Ydieresis @@ -178,9 +178,9 @@ /rcaron /sacute /scaron -/scommaaccent +/scedilla /tcaron -/tcommaaccent +/tcedilla /uhungarumlaut /uring /ydieresis diff --git a/fonts/enc/dvips/context/qx-os-lm.enc b/fonts/enc/dvips/context/lm-qx-os.enc index 4f6ec0860..6f4fd6bfc 100644 --- a/fonts/enc/dvips/context/qx-os-lm.enc +++ b/fonts/enc/dvips/context/lm-qx-os.enc @@ -1,4 +1,4 @@ -/encqxlm[ +/enclmqx[ /.notdef /Delta /.notdef @@ -47,16 +47,16 @@ /hyphen /period /slash -/zerooldstyle -/oneoldstyle -/twooldstyle -/threeoldstyle -/fouroldstyle -/fiveoldstyle -/sixoldstyle -/sevenoldstyle -/eightoldstyle -/nineoldstyle +/zero.oldstyle +/one.oldstyle +/two.oldstyle +/three.oldstyle +/four.oldstyle +/five.oldstyle +/six.oldstyle +/sevev.oldstyle +/eight.oldstyle +/nine.oldstyle /colon /semicolon /exclamdown diff --git a/fonts/enc/dvips/context/texnansi-var-lm.enc b/fonts/enc/dvips/context/lm-qxtt-os.enc index 8afba5633..905a34fd9 100644 --- a/fonts/enc/dvips/context/texnansi-var-lm.enc +++ b/fonts/enc/dvips/context/lm-qxtt-os.enc @@ -1,24 +1,20 @@ -% author: Hans Hagen -% -% This enc file defines texnansi encoded Latin Modern adapted for umlauts and other variations. - -/enctexnansivarlm[ +/enclmqxtt[ +/.notdef +/Delta +/.notdef +/.notdef +/.notdef +/Pi +/Sigma +/mu +/ellipsis +/.notdef +/Omega /.notdef -/Euro /.notdef /.notdef -/fraction -/dotaccent -/hungarumlaut -/ogonek -/fl /.notdef -/cwm -/ff -/fi /.notdef -/ffi -/ffl /dotlessi /dotlessj /grave @@ -35,7 +31,7 @@ /AE /OE /Oslash -/space +/visiblespace /exclam /quotedbl /numbersign @@ -51,16 +47,16 @@ /hyphen /period /slash -/zero -/one -/two -/three -/four -/five -/six -/seven -/eight -/nine +/zero.oldstyle +/one.oldstyle +/two.oldstyle +/three.oldstyle +/four.oldstyle +/five.oldstyle +/six.oldstyle +/seven.oldstyle +/eight.oldstyle +/nine.oldstyle /colon /semicolon /less @@ -97,7 +93,7 @@ /bracketleft /backslash /bracketright -/circumflex +/asciicircum /underscore /quoteleft /a @@ -129,134 +125,134 @@ /braceleft /bar /braceright -/tilde -/vardieresis +/asciitilde +/dieresis +/Euro +/Aogonek +/Cacute +/.notdef +/.notdef +/.notdef +/Eogonek +/Iogonek +/.notdef +/.notdef /Lslash -/quotesingle -/quotesinglbase -/florin -/quotedblbase -/ellipsis +/Nacute +/.notdef +/.notdef +/.notdef /dagger /daggerdbl -/circumflex.dup -/perthousand +/Sacute /Scaron -/guilsinglleft -/OE.dup +/Scommaaccent +/degree +/Tcommaaccent +/ogonek +/Uogonek +/Ydieresis +/Zacute /Zcaron -/asciicircum -/minus -/lslash -/quoteleft.dup -/quoteright.dup -/quotedblleft -/quotedblright -/bullet -/endash -/emdash -/tilde.dup -/vartrademark -/scaron -/guilsinglright -/oe.dup -/zcaron -/asciitilde -/Yvardieresis -/nbspace -/exclamdown -/cent -/sterling -/currency -/yen -/brokenbar +/Zdotaccent +/.notdef +/.notdef +/.notdef /section -/dieresis.dup -/varcopyright -/ordfeminine -/guillemotleft -/logicalnot -/sfthyphen +/.notdef +/aogonek +/cacute /registered -/macron.dup -/degree +/copyright +/divide +/eogonek +/iogonek +/minus +/multiply +/lslash +/nacute /plusminus -/twosuperior -/threesuperior -/acute.dup -/mu +/.notdef +/guillemotleft +/guillemotright /paragraph +/sacute +/scaron +/scommaaccent +/bullet +/tcommaaccent +/threequartersemdash +/uogonek +/ydieresis +/zacute +/zcaron +/zdotaccent +/.notdef /periodcentered -/cedilla.dup -/onesuperior -/ordmasculine -/guillemotright -/onequarter -/onehalf -/threequarters -/questiondown +/.notdef +/quotesingle /Agrave /Aacute /Acircumflex /Atilde -/Avardieresis +/Adieresis /Aring -/AE.dup +/.notdef /Ccedilla /Egrave /Eacute /Ecircumflex -/Evardieresis +/Edieresis /Igrave /Iacute /Icircumflex -/Ivardieresis +/Idieresis /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde -/Ovardieresis -/multiply -/Oslash.dup +/Odieresis +/currency +/perthousand /Ugrave /Uacute /Ucircumflex -/Uvardieresis +/Udieresis /Yacute /Thorn -/germandbls.dup +/.notdef /agrave /aacute /acircumflex /atilde -/avardieresis +/adieresis /aring -/ae.dup +/.notdef /ccedilla /egrave /eacute /ecircumflex -/evardieresis +/edieresis /igrave /iacute /icircumflex -/ivardieresis +/idieresis /eth /ntilde /ograve /oacute /ocircumflex /otilde -/ovardieresis -/divide -/oslash.dup +/odieresis +/anglearc +/diameter /ugrave /uacute /ucircumflex -/uvardieresis +/udieresis /yacute /thorn -/yvardieresis -] def
\ No newline at end of file +/quotedblbase +] def diff --git a/fonts/enc/dvips/context/lm-t5-os.enc b/fonts/enc/dvips/context/lm-t5-os.enc new file mode 100644 index 000000000..4ff792fb7 --- /dev/null +++ b/fonts/enc/dvips/context/lm-t5-os.enc @@ -0,0 +1,258 @@ +/enclmt5[ +/grave +/acute +/circumflex +/tilde +/dieresis +/dotbelow +/ring +/caron +/breve +/macron +/dotaccent +/cedilla +/hookabove +/quotesinglbase +/guilsinglleft +/guilsinglright +/quotedblleft +/quotedblright +/quotedblbase +/guillemotleft +/guillemotright +/endash +/emdash +/cwm +/perthousandzero +/dotlessi +/Yhookabove +/yhookabove +/Ydotbelow +/ydotbelow +/Dcroat +/dcroat +/visiblespace +/exclam +/quotedbl +/numbersign +/dollar +/percent +/ampersand +/quoteright +/parenleft +/parenright +/asterisk +/plus +/comma +/hyphen +/period +/slash +/zero.oldstyle +/one.oldstyle +/two.oldstyle +/three.oldstyle +/four.oldstyle +/five.oldstyle +/six.oldstyle +/seven.oldstyle +/eight.oldstyle +/nine.oldstyle +/colon +/semicolon +/less +/equal +/greater +/question +/at +/A +/B +/C +/D +/E +/F +/G +/H +/I +/J +/K +/L +/M +/N +/O +/P +/Q +/R +/S +/T +/U +/V +/W +/X +/Y +/Z +/bracketleft +/backslash +/bracketright +/asciicircum +/underscore +/quoteleft +/a +/b +/c +/d +/e +/f +/g +/h +/i +/j +/k +/l +/m +/n +/o +/p +/q +/r +/s +/t +/u +/v +/w +/x +/y +/z +/braceleft +/bar +/braceright +/asciitilde +/sfthyphen +/Agrave +/Aacute +/Atilde +/Ahookabove +/Adotbelow +/Acircumflex +/Acircumflexgrave +/Acircumflexacute +/Acircumflextilde +/Acircumflexhookabove +/Acircumflexdotbelow +/Abreve +/Abrevegrave +/Abreveacute +/Abrevetilde +/Abrevehookabove +/Abrevedotbelow +/Egrave +/Eacute +/Etilde +/Ehookabove +/Edotbelow +/Ecircumflex +/Ecircumflexgrave +/Ecircumflexacute +/Ecircumflextilde +/Ecircumflexhookabove +/Ecircumflexdotbelow +/Igrave +/Iacute +/Itilde +/Ihookabove +/agrave +/aacute +/atilde +/ahookabove +/adotbelow +/acircumflex +/acircumflexgrave +/acircumflexacute +/acircumflextilde +/acircumflexhookabove +/acircumflexdotbelow +/abreve +/abrevegrave +/abreveacute +/abrevetilde +/abrevehookabove +/abrevedotbelow +/egrave +/eacute +/etilde +/ehookabove +/edotbelow +/ecircumflex +/ecircumflexgrave +/ecircumflexacute +/ecircumflextilde +/ecircumflexhookabove +/ecircumflexdotbelow +/igrave +/iacute +/itilde +/ihookabove +/Idotbelow +/Ograve +/Oacute +/Otilde +/Ohookabove +/Odotbelow +/Ocircumflex +/Ocircumflexgrave +/Ocircumflexacute +/Ocircumflextilde +/Ocircumflexhookabove +/Ocircumflexdotbelow +/Ohorn +/Ohorngrave +/Ohornacute +/Ohorntilde +/Ohornhookabove +/Ohorndotbelow +/Ugrave +/Uacute +/Utilde +/Uhookabove +/Udotbelow +/Uhorn +/Uhorngrave +/Uhornacute +/Uhorntilde +/Uhornhookabove +/Uhorndotbelow +/Ygrave +/Yacute +/Ytilde +/idotbelow +/ograve +/oacute +/otilde +/ohookabove +/odotbelow +/ocircumflex +/ocircumflexgrave +/ocircumflexacute +/ocircumflextilde +/ocircumflexhookabove +/ocircumflexdotbelow +/ohorn +/ohorngrave +/ohornacute +/ohorntilde +/ohornhookabove +/ohorndotbelow +/ugrave +/uacute +/utilde +/uhookabove +/udotbelow +/uhorn +/uhorngrave +/uhornacute +/uhorntilde +/uhornhookabove +/uhorndotbelow +/ygrave +/yacute +/ytilde +] def diff --git a/fonts/enc/dvips/context/texnansi-os-lm.enc b/fonts/enc/dvips/context/lm-texnansi-os.enc index 575deb9f7..059dd788b 100644 --- a/fonts/enc/dvips/context/texnansi-os-lm.enc +++ b/fonts/enc/dvips/context/lm-texnansi-os.enc @@ -1,4 +1,4 @@ -/enctexnansilm[ +/enclmtexnansi[ /.notdef /Euro /.notdef @@ -47,16 +47,16 @@ /hyphen /period /slash -/zerooldstyle -/oneoldstyle -/twooldstyle -/threeoldstyle -/fouroldstyle -/fiveoldstyle -/sixoldstyle -/sevenoldstyle -/eightoldstyle -/nineoldstyle +/zero.oldstyle +/one.oldstyle +/two.oldstyle +/three.oldstyle +/four.oldstyle +/five.oldstyle +/six.oldstyle +/seven.oldstyle +/eight.oldstyle +/nine.oldstyle /colon /semicolon /less diff --git a/fonts/enc/dvips/context/texnansi-osfsc.enc b/fonts/enc/dvips/context/lm-texnansi-osfsc.enc index 7a12a83fb..d6c4a812d 100644 --- a/fonts/enc/dvips/context/texnansi-osfsc.enc +++ b/fonts/enc/dvips/context/lm-texnansi-osfsc.enc @@ -53,16 +53,16 @@ /hyphen % 45 /period % 46 /slash % 47 -/zerooldstyle % 48 -/oneoldstyle % 49 -/twooldstyle % 50 -/threeoldstyle % 51 -/fouroldstyle % 52 -/fiveoldstyle % 53 -/sixoldstyle % 54 -/sevenoldstyle % 55 -/eightoldstyle % 56 -/nineoldstyle % 57 +/zero.oldstyle % 48 +/one.oldstyle % 49 +/two.oldstyle % 50 +/three.oldstyle % 51 +/four.oldstyle % 52 +/five.oldstyle % 53 +/six.oldstyle % 54 +/seven.oldstyle % 55 +/eight.oldstyle % 56 +/nine.oldstyle % 57 /colon % 58 /semicolon % 59 /less % 60 /exclamdown in TeX text diff --git a/fonts/map/pdftex/context/context-base.map b/fonts/map/pdftex/context/context-base.map index 3e46c647c..dcb72f69e 100644 --- a/fonts/map/pdftex/context/context-base.map +++ b/fonts/map/pdftex/context/context-base.map @@ -519,63 +519,75 @@ bchri8t CharterBT-Italic <ec.enc <bchri8a.pfb bchbo8t CharterBT-Bold ".167 SlantFont" <ec.enc <bchb8a.pfb bchro8t CharterBT-Roman ".167 SlantFont" <ec.enc <bchr8a.pfb -ec-lmb10 LMRomanDemi10-Regular <ec-lm.enc <lmb10.pfb -ec-lmbo10 LMRomanDemi10-Italic <ec-lm.enc <lmbo10.pfb -ec-lmbx10 LMRoman10-Bold <ec-lm.enc <lmbx10.pfb -ec-lmbx12 LMRoman12-Bold <ec-lm.enc <lmbx12.pfb -ec-lmbx5 LMRoman5-Bold <ec-lm.enc <lmbx5.pfb -ec-lmbx6 LMRoman6-Bold <ec-lm.enc <lmbx6.pfb -ec-lmbx7 LMRoman7-Bold <ec-lm.enc <lmbx7.pfb -ec-lmbx8 LMRoman8-Bold <ec-lm.enc <lmbx8.pfb -ec-lmbx9 LMRoman9-Bold <ec-lm.enc <lmbx9.pfb -ec-lmbxi10 LMRoman10-BoldItalic <ec-lm.enc <lmbxi10.pfb -ec-lmbxo10 LMSlanted10-BoldItalic <ec-lm.enc <lmbxo10.pfb -ec-lmcsc10 LMCaps10-Regular <ec-lm.enc <lmcsc10.pfb -ec-lmcsco10 LMCaps10-Italic <ec-lm.enc <lmcsco10.pfb -ec-lmr10 LMRoman10-Regular <ec-lm.enc <lmr10.pfb -ec-lmr12 LMRoman12-Regular <ec-lm.enc <lmr12.pfb -ec-lmr17 LMRoman17-Regular <ec-lm.enc <lmr17.pfb -ec-lmr5 LMRoman5-Regular <ec-lm.enc <lmr5.pfb -ec-lmr6 LMRoman6-Regular <ec-lm.enc <lmr6.pfb -ec-lmr7 LMRoman7-Regular <ec-lm.enc <lmr7.pfb -ec-lmr8 LMRoman8-Regular <ec-lm.enc <lmr8.pfb -ec-lmr9 LMRoman9-Regular <ec-lm.enc <lmr9.pfb -ec-lmri10 LMRoman10-Italic <ec-lm.enc <lmri10.pfb -ec-lmri12 LMRoman12-Italic <ec-lm.enc <lmri12.pfb -ec-lmri7 LMRoman7-Italic <ec-lm.enc <lmri7.pfb -ec-lmri8 LMRoman8-Italic <ec-lm.enc <lmri8.pfb -ec-lmri9 LMRoman9-Italic <ec-lm.enc <lmri9.pfb -ec-lmro10 LMSlanted10-Italic <ec-lm.enc <lmro10.pfb -ec-lmro12 LMSlanted12-Italic <ec-lm.enc <lmro12.pfb -ec-lmro8 LMSlanted8-Italic <ec-lm.enc <lmro8.pfb -ec-lmro9 LMSlanted9-Italic <ec-lm.enc <lmro9.pfb -ec-lmss10 LMSans10-Regular <ec-lm.enc <lmss10.pfb -ec-lmss12 LMSans12-Regular <ec-lm.enc <lmss12.pfb -ec-lmss17 LMSans17-Regular <ec-lm.enc <lmss17.pfb -ec-lmss8 LMSans8-Regular <ec-lm.enc <lmss8.pfb -ec-lmss9 LMSans9-Regular <ec-lm.enc <lmss9.pfb -ec-lmssbo10 LMSans10-BoldItalic <ec-lm.enc <lmssbo10.pfb -ec-lmssbx10 LMSans10-Bold <ec-lm.enc <lmssbx10.pfb -ec-lmssdc10 LMSansDemiCond10-Regular <ec-lm.enc <lmssdc10.pfb -ec-lmssdo10 LMSansDemiCond10-Italic <ec-lm.enc <lmssdo10.pfb -ec-lmsso10 LMSans10-Italic <ec-lm.enc <lmsso10.pfb -ec-lmsso12 LMSans12-Italic <ec-lm.enc <lmsso12.pfb -ec-lmsso17 LMSans17-Italic <ec-lm.enc <lmsso17.pfb -ec-lmsso8 LMSans8-Italic <ec-lm.enc <lmsso8.pfb -ec-lmsso9 LMSans9-Italic <ec-lm.enc <lmsso9.pfb -ec-lmssq8 LMSansQuotation8-Regular <ec-lm.enc <lmssq8.pfb -ec-lmssqbo8 LMSansQuotation8-BoldItalic <ec-lm.enc <lmssqbo8.pfb -ec-lmssqbx8 LMSansQuotation8-Bold <ec-lm.enc <lmssqbx8.pfb -ec-lmssqo8 LMSansQuotation8-Italic <ec-lm.enc <lmssqo8.pfb -ec-lmtcsc10 LMTypewriterCaps10-Regular <ec-lm.enc <lmtcsc10.pfb -ec-lmtt10 LMTypewriter10-Regular <ec-lm.enc <lmtt10.pfb -ec-lmtt12 LMTypewriter12-Regular <ec-lm.enc <lmtt12.pfb -ec-lmtt8 LMTypewriter8-Regular <ec-lm.enc <lmtt8.pfb -ec-lmtt9 LMTypewriter9-Regular <ec-lm.enc <lmtt9.pfb -ec-lmtti10 LMTypewriter10-Italic <ec-lm.enc <lmtti10.pfb -ec-lmtto10 LMTypewriterSlanted10-Italic <ec-lm.enc <lmtto10.pfb -ec-lmvtt10 LMTypewriterVarWd10-Regular <ec-lm.enc <lmvtt10.pfb -ec-lmvtto10 LMTypewriterVarWd10-Italic <ec-lm.enc <lmvtto10.pfb +ec-lmb10 LMRoman10-Demi "enclmec ReEncodeFont" <lm-ec.enc <lmb10.pfb +ec-lmbo10 LMRoman10-DemiOblique "enclmec ReEncodeFont" <lm-ec.enc <lmbo10.pfb +ec-lmbx10 LMRoman10-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx10.pfb +ec-lmbx12 LMRoman12-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx12.pfb +ec-lmbx5 LMRoman5-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx5.pfb +ec-lmbx6 LMRoman6-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx6.pfb +ec-lmbx7 LMRoman7-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx7.pfb +ec-lmbx8 LMRoman8-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx8.pfb +ec-lmbx9 LMRoman9-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx9.pfb +ec-lmbxi10 LMRoman10-BoldItalic "enclmec ReEncodeFont" <lm-ec.enc <lmbxi10.pfb +ec-lmbxo10 LMRoman10-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmbxo10.pfb +ec-lmcsc10 LMRoman10-CapsRegular "enclmec ReEncodeFont" <lm-ec.enc <lmcsc10.pfb +ec-lmcsco10 LMRoman10-CapsOblique "enclmec ReEncodeFont" <lm-ec.enc <lmcsco10.pfb +ec-lmr10 LMRoman10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr10.pfb +ec-lmr12 LMRoman12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr12.pfb +ec-lmr17 LMRoman17-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr17.pfb +ec-lmr5 LMRoman5-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr5.pfb +ec-lmr6 LMRoman6-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr6.pfb +ec-lmr7 LMRoman7-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr7.pfb +ec-lmr8 LMRoman8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr8.pfb +ec-lmr9 LMRoman9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr9.pfb +ec-lmri10 LMRoman10-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri10.pfb +ec-lmri12 LMRoman12-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri12.pfb +ec-lmri7 LMRoman7-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri7.pfb +ec-lmri8 LMRoman8-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri8.pfb +ec-lmri9 LMRoman9-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri9.pfb +ec-lmro10 LMRoman10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro10.pfb +ec-lmro12 LMRoman12-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro12.pfb +ec-lmro17 LMRoman17-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro17.pfb +ec-lmro8 LMRoman8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro8.pfb +ec-lmro9 LMRoman9-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro9.pfb +ec-lmss10 LMSans10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss10.pfb +ec-lmss12 LMSans12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss12.pfb +ec-lmss17 LMSans17-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss17.pfb +ec-lmss8 LMSans8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss8.pfb +ec-lmss9 LMSans9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss9.pfb +ec-lmssbo10 LMSans10-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssbo10.pfb +ec-lmssbx10 LMSans10-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmssbx10.pfb +ec-lmssdc10 LMSans10-DemiCondensed "enclmec ReEncodeFont" <lm-ec.enc <lmssdc10.pfb +ec-lmssdo10 LMSans10-DemiCondensedOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssdo10.pfb +ec-lmsso10 LMSans10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso10.pfb +ec-lmsso12 LMSans12-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso12.pfb +ec-lmsso17 LMSans17-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso17.pfb +ec-lmsso8 LMSans8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso8.pfb +ec-lmsso9 LMSans9-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso9.pfb +ec-lmssq8 LMSansQuotation8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmssq8.pfb +ec-lmssqbo8 LMSansQuotation8-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssqbo8.pfb +ec-lmssqbx8 LMSansQuotation8-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmssqbx8.pfb +ec-lmssqo8 LMSansQuotation8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmssqo8.pfb +ec-lmtcsc10 LMTypewriter10-CapsRegular "enclmec ReEncodeFont" <lm-ec.enc <lmtcsc10.pfb +ec-lmtcso10 LMTypewriter10-CapsOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtcso10.pfb +ec-lmtl10 LMTypewriter10-Light "enclmec ReEncodeFont" <lm-ec.enc <lmtl10.pfb +ec-lmtlo10 LMTypewriter10-LightOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtlo10.pfb +ec-lmtlc10 LMTypewriter10-LightCondensed "enclmec ReEncodeFont" <lm-ec.enc <lmtlc10.pfb +ec-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtlco10.pfb +ec-lmtk10 LMTypewriter10-Dark "enclmec ReEncodeFont" <lm-ec.enc <lmtk10.pfb +ec-lmtko10 LMTypewriter10-DarkOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtko10.pfb +ec-lmtt10 LMTypewriter10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt10.pfb +ec-lmtt12 LMTypewriter12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt12.pfb +ec-lmtt8 LMTypewriter8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt8.pfb +ec-lmtt9 LMTypewriter9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt9.pfb +ec-lmtti10 LMTypewriter10-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmtti10.pfb +ec-lmtto10 LMTypewriter10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmtto10.pfb +ec-lmvtt10 LMTypewriterVarWd10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmvtt10.pfb +ec-lmvtto10 LMTypewriterVarWd10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtto10.pfb +ec-lmvtl10 LMTypewriterVarWd10-Light "enclmec ReEncodeFont" <lm-ec.enc <lmvtl10.pfb +ec-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtlo10.pfb +ec-lmvtk10 LMTypewriterVarWd10-Dark "enclmec ReEncodeFont" <lm-ec.enc <lmvtk10.pfb +ec-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtko10.pfb % courier / urw @@ -635,64 +647,75 @@ qzcmi <qzc.enc <qzcmi.pfb -qx-lmb10 LMRomanDemi10-Regular <qx-lm.enc <lmb10.pfb -qx-lmbo10 LMRomanDemi10-Italic <qx-lm.enc <lmbo10.pfb -qx-lmbx10 LMRoman10-Bold <qx-lm.enc <lmbx10.pfb -qx-lmbx12 LMRoman12-Bold <qx-lm.enc <lmbx12.pfb -qx-lmbx5 LMRoman5-Bold <qx-lm.enc <lmbx5.pfb -qx-lmbx6 LMRoman6-Bold <qx-lm.enc <lmbx6.pfb -qx-lmbx7 LMRoman7-Bold <qx-lm.enc <lmbx7.pfb -qx-lmbx8 LMRoman8-Bold <qx-lm.enc <lmbx8.pfb -qx-lmbx9 LMRoman9-Bold <qx-lm.enc <lmbx9.pfb -qx-lmbxi10 LMRoman10-BoldItalic <qx-lm.enc <lmbxi10.pfb -qx-lmbxo10 LMSlanted10-BoldItalic <qx-lm.enc <lmbxo10.pfb -qx-lmcsc10 LMCaps10-Regular <qx-lm.enc <lmcsc10.pfb -qx-lmcsco10 LMCaps10-Italic <qx-lm.enc <lmcsco10.pfb -qx-lmr10 LMRoman10-Regular <qx-lm.enc <lmr10.pfb -qx-lmr12 LMRoman12-Regular <qx-lm.enc <lmr12.pfb -qx-lmr17 LMRoman17-Regular <qx-lm.enc <lmr17.pfb -qx-lmr5 LMRoman5-Regular <qx-lm.enc <lmr5.pfb -qx-lmr6 LMRoman6-Regular <qx-lm.enc <lmr6.pfb -qx-lmr7 LMRoman7-Regular <qx-lm.enc <lmr7.pfb -qx-lmr8 LMRoman8-Regular <qx-lm.enc <lmr8.pfb -qx-lmr9 LMRoman9-Regular <qx-lm.enc <lmr9.pfb -qx-lmri10 LMRoman10-Italic <qx-lm.enc <lmri10.pfb -qx-lmri12 LMRoman12-Italic <qx-lm.enc <lmri12.pfb -qx-lmri7 LMRoman7-Italic <qx-lm.enc <lmri7.pfb -qx-lmri8 LMRoman8-Italic <qx-lm.enc <lmri8.pfb -qx-lmri9 LMRoman9-Italic <qx-lm.enc <lmri9.pfb -qx-lmro10 LMSlanted10-Italic <qx-lm.enc <lmro10.pfb -qx-lmro12 LMSlanted12-Italic <qx-lm.enc <lmro12.pfb -qx-lmro8 LMSlanted8-Italic <qx-lm.enc <lmro8.pfb -qx-lmro9 LMSlanted9-Italic <qx-lm.enc <lmro9.pfb -qx-lmss10 LMSans10-Regular <qx-lm.enc <lmss10.pfb -qx-lmss12 LMSans12-Regular <qx-lm.enc <lmss12.pfb -qx-lmss17 LMSans17-Regular <qx-lm.enc <lmss17.pfb -qx-lmss8 LMSans8-Regular <qx-lm.enc <lmss8.pfb -qx-lmss9 LMSans9-Regular <qx-lm.enc <lmss9.pfb -qx-lmssbo10 LMSans10-BoldItalic <qx-lm.enc <lmssbo10.pfb -qx-lmssbx10 LMSans10-Bold <qx-lm.enc <lmssbx10.pfb -qx-lmssdc10 LMSansDemiCond10-Regular <qx-lm.enc <lmssdc10.pfb -qx-lmssdo10 LMSansDemiCond10-Italic <qx-lm.enc <lmssdo10.pfb -qx-lmsso10 LMSans10-Italic <qx-lm.enc <lmsso10.pfb -qx-lmsso12 LMSans12-Italic <qx-lm.enc <lmsso12.pfb -qx-lmsso17 LMSans17-Italic <qx-lm.enc <lmsso17.pfb -qx-lmsso8 LMSans8-Italic <qx-lm.enc <lmsso8.pfb -qx-lmsso9 LMSans9-Italic <qx-lm.enc <lmsso9.pfb -qx-lmssq8 LMSansQuotation8-Regular <qx-lm.enc <lmssq8.pfb -qx-lmssqbo8 LMSansQuotation8-BoldItalic <qx-lm.enc <lmssqbo8.pfb -qx-lmssqbx8 LMSansQuotation8-Bold <qx-lm.enc <lmssqbx8.pfb -qx-lmssqo8 LMSansQuotation8-Italic <qx-lm.enc <lmssqo8.pfb -qx-lmtcsc10 LMTypewriterCaps10-Regular <qx-lmtt.enc <lmtcsc10.pfb -qx-lmtt10 LMTypewriter10-Regular <qx-lmtt.enc <lmtt10.pfb -qx-lmtt12 LMTypewriter12-Regular <qx-lmtt.enc <lmtt12.pfb -qx-lmtt8 LMTypewriter8-Regular <qx-lmtt.enc <lmtt8.pfb -qx-lmtt9 LMTypewriter9-Regular <qx-lmtt.enc <lmtt9.pfb -qx-lmtti10 LMTypewriter10-Italic <qx-lmtt.enc <lmtti10.pfb -qx-lmtto10 LMTypewriterSlanted10-Italic <qx-lmtt.enc <lmtto10.pfb -qx-lmvtt10 LMTypewriterVarWd10-Regular <qx-lm.enc <lmvtt10.pfb -qx-lmvtto10 LMTypewriterVarWd10-Italic <qx-lm.enc <lmvtto10.pfb - +qx-lmb10 LMRoman10-Demi "enclmqx ReEncodeFont" <lm-qx.enc <lmb10.pfb +qx-lmbo10 LMRoman10-DemiOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmbo10.pfb +qx-lmbx10 LMRoman10-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx10.pfb +qx-lmbx12 LMRoman12-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx12.pfb +qx-lmbx5 LMRoman5-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx5.pfb +qx-lmbx6 LMRoman6-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx6.pfb +qx-lmbx7 LMRoman7-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx7.pfb +qx-lmbx8 LMRoman8-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx8.pfb +qx-lmbx9 LMRoman9-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx9.pfb +qx-lmbxi10 LMRoman10-BoldItalic "enclmqx ReEncodeFont" <lm-qx.enc <lmbxi10.pfb +qx-lmbxo10 LMRoman10-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmbxo10.pfb +qx-lmcsc10 LMRoman10-CapsRegular "enclmqx ReEncodeFont" <lm-qx.enc <lmcsc10.pfb +qx-lmcsco10 LMRoman10-CapsOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmcsco10.pfb +qx-lmr10 LMRoman10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr10.pfb +qx-lmr12 LMRoman12-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr12.pfb +qx-lmr17 LMRoman17-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr17.pfb +qx-lmr5 LMRoman5-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr5.pfb +qx-lmr6 LMRoman6-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr6.pfb +qx-lmr7 LMRoman7-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr7.pfb +qx-lmr8 LMRoman8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr8.pfb +qx-lmr9 LMRoman9-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr9.pfb +qx-lmri10 LMRoman10-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri10.pfb +qx-lmri12 LMRoman12-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri12.pfb +qx-lmri7 LMRoman7-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri7.pfb +qx-lmri8 LMRoman8-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri8.pfb +qx-lmri9 LMRoman9-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri9.pfb +qx-lmro10 LMRoman10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro10.pfb +qx-lmro12 LMRoman12-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro12.pfb +qx-lmro17 LMRoman17-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro17.pfb +qx-lmro8 LMRoman8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro8.pfb +qx-lmro9 LMRoman9-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro9.pfb +qx-lmss10 LMSans10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss10.pfb +qx-lmss12 LMSans12-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss12.pfb +qx-lmss17 LMSans17-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss17.pfb +qx-lmss8 LMSans8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss8.pfb +qx-lmss9 LMSans9-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss9.pfb +qx-lmssbo10 LMSans10-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssbo10.pfb +qx-lmssbx10 LMSans10-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmssbx10.pfb +qx-lmssdc10 LMSans10-DemiCondensed "enclmqx ReEncodeFont" <lm-qx.enc <lmssdc10.pfb +qx-lmssdo10 LMSans10-DemiCondensedOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssdo10.pfb +qx-lmsso10 LMSans10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso10.pfb +qx-lmsso12 LMSans12-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso12.pfb +qx-lmsso17 LMSans17-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso17.pfb +qx-lmsso8 LMSans8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso8.pfb +qx-lmsso9 LMSans9-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso9.pfb +qx-lmssq8 LMSansQuotation8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmssq8.pfb +qx-lmssqbo8 LMSansQuotation8-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssqbo8.pfb +qx-lmssqbx8 LMSansQuotation8-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmssqbx8.pfb +qx-lmssqo8 LMSansQuotation8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssqo8.pfb +qx-lmtcsc10 LMTypewriter10-CapsRegular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtcsc10.pfb +qx-lmtcso10 LMTypewriter10-CapsOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtcso10.pfb +qx-lmtl10 LMTypewriter10-Light "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtl10.pfb +qx-lmtlo10 LMTypewriter10-LightOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlo10.pfb +qx-lmtlc10 LMTypewriter10-LightCondensed "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlc10.pfb +qx-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlco10.pfb +qx-lmtk10 LMTypewriter10-Dark "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtk10.pfb +qx-lmtko10 LMTypewriter10-DarkOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtko10.pfb +qx-lmtt10 LMTypewriter10-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt10.pfb +qx-lmtt12 LMTypewriter12-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt12.pfb +qx-lmtt8 LMTypewriter8-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt8.pfb +qx-lmtt9 LMTypewriter9-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt9.pfb +qx-lmtti10 LMTypewriter10-Italic "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtti10.pfb +qx-lmtto10 LMTypewriter10-Oblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtto10.pfb +qx-lmvtt10 LMTypewriterVarWd10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmvtt10.pfb +qx-lmvtto10 LMTypewriterVarWd10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtto10.pfb +qx-lmvtl10 LMTypewriterVarWd10-Light "enclmqx ReEncodeFont" <lm-qx.enc <lmvtl10.pfb +qx-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtlo10.pfb +qx-lmvtk10 LMTypewriterVarWd10-Dark "enclmqx ReEncodeFont" <lm-qx.enc <lmvtk10.pfb +qx-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtko10.pfb % courier / urw @@ -769,228 +792,75 @@ uagd8v VnURWGothicL-Demi "T5Encoding ReEncodeFont" <t5 uagdo8v VnURWGothicL-DemiObli "T5Encoding ReEncodeFont" <t5.enc <uagdo8v.pfb -% LM Support for VN fonts, thanks to Jacko - -vnb10 LMRomanDemi10-Regular <t5-lm.enc <lmb10.pfb -vnbx5 LMRoman5-Bold <t5-lm.enc <lmbx5.pfb -vnbx6 LMRoman6-Bold <t5-lm.enc <lmbx6.pfb -vnbx7 LMRoman7-Bold <t5-lm.enc <lmbx7.pfb -vnbx8 LMRoman8-Bold <t5-lm.enc <lmbx8.pfb -vnbx9 LMRoman9-Bold <t5-lm.enc <lmbx9.pfb -vnbx10 LMRoman10-Bold <t5-lm.enc <lmbx10.pfb -vnbx12 LMRoman12-Bold <t5-lm.enc <lmbx12.pfb -vnbxsl10 LMSlanted10-BoldItalic <t5-lm.enc <lmbxo10.pfb -vnbxti10 LMRoman10-BoldItalic <t5-lm.enc <lmbxi10.pfb -vncsc10 LMCaps10-Regular <t5-lm.enc <lmcsc10.pfb -vnitt10 LMTypewriter10-Italic <t5-lm.enc <lmtti10.pfb -vnr5 LMRoman5-Regular <t5-lm.enc <lmr5.pfb -vnr6 LMRoman6-Regular <t5-lm.enc <lmr6.pfb -vnr7 LMRoman7-Regular <t5-lm.enc <lmr7.pfb -vnr8 LMRoman8-Regular <t5-lm.enc <lmr8.pfb -vnr9 LMRoman9-Regular <t5-lm.enc <lmr9.pfb -vnr10 LMRoman10-Regular <t5-lm.enc <lmr10.pfb -vnr12 LMRoman12-Regular <t5-lm.enc <lmr12.pfb -vnr17 LMRoman17-Regular <t5-lm.enc <lmr17.pfb -vnsl8 LMSlanted8-Italic <t5-lm.enc <lmro8.pfb -vnsl9 LMSlanted9-Italic <t5-lm.enc <lmro9.pfb -vnsl10 LMSlanted10-Italic <t5-lm.enc <lmro10.pfb -vnsl12 LMSlanted12-Italic <t5-lm.enc <lmro12.pfb -vnsltt10 LMTypewriterSlanted10-Italic <t5-lm.enc <lmtto10.pfb -vnss8 LMSans8-Regular <t5-lm.enc <lmss8.pfb -vnss9 LMSans9-Regular <t5-lm.enc <lmss9.pfb -vnss10 LMSans10-Regular <t5-lm.enc <lmss10.pfb -vnss12 LMSans12-Regular <t5-lm.enc <lmss12.pfb -vnss17 LMSans17-Regular <t5-lm.enc <lmss17.pfb -vnssbx10 LMSans10-Bold <t5-lm.enc <lmssbx10.pfb -vnssdc10 LMSansDemiCond10-Regular <t5-lm.enc <lmssdc10.pfb -vnssi8 LMSans8-Italic <t5-lm.enc <lmssi8.pfb -vnssi9 LMSans9-Italic <t5-lm.enc <lmssi9.pfb -vnssi10 LMSans10-Italic <t5-lm.enc <lmssi10.pfb -vnssi12 LMSans12-Italic <t5-lm.enc <lmssi12.pfb -vnssi17 LMSans17-Italic <t5-lm.enc <lmssi17.pfb -vnssq8 LMSansQuotation8-Regular <t5-lm.enc <lmssq8.pfb -vnssqi8 LMSansQuotation8-Italic <t5-lm.enc <lmssqo8.pfb -vntcsc10 LMTypewriterCaps10-Regular <t5-lm.enc <lmtcsc10.pfb -vnti7 LMRoman7-Italic <t5-lm.enc <lmri7.pfb -vnti8 LMRoman8-Italic <t5-lm.enc <lmri8.pfb -vnti9 LMRoman9-Italic <t5-lm.enc <lmri9.pfb -vnti10 LMRoman10-Italic <t5-lm.enc <lmri10.pfb -vnti12 LMRoman12-Italic <t5-lm.enc <lmri12.pfb -vntt8 LMTypewriter8-Regular <t5-lm.enc <lmtt8.pfb -vntt9 LMTypewriter9-Regular <t5-lm.enc <lmtt9.pfb -vntt10 LMTypewriter10-Regular <t5-lm.enc <lmtt10.pfb -vntt12 LMTypewriter12-Regular <t5-lm.enc <lmtt12.pfb -vnvtt10 LMTypewriterVarWd10-Regular <t5-lm.enc <lmvtt10.pfb - -% a weird one, not used in context - -vnu10 LMRoman10-Italic "-0.25 SlantFont" <t5-lm.enc <lmri10.pfb - -% unsupported - -% vndunh10 -% vnff10 -% vnfi10 -% vnfib8 - - -# not yet defined - - -% LM replacement / thanks to Jacko - -csb10 LMRomanDemi10-Regular <csrm.enc <lmb10.pfb -csbx5 LMRoman5-Bold <csrm.enc <lmbx5.pfb -csbx6 LMRoman6-Bold <csrm.enc <lmbx6.pfb -csbx7 LMRoman7-Bold <csrm.enc <lmbx7.pfb -csbx8 LMRoman8-Bold <csrm.enc <lmbx8.pfb -csbx9 LMRoman9-Bold <csrm.enc <lmbx9.pfb -csbx10 LMRoman10-Bold <csrm.enc <lmbx10.pfb -csbx12 LMRoman12-Bold <csrm.enc <lmbx12.pfb -csbxsl10 LMSlanted10-BoldItalic <csrm.enc <lmbxo10.pfb -csbxti10 LMRoman10-BoldItalic <csrm.enc <lmbxi10.pfb -csinch LMSans10-Bold <csin.enc <lmssbx10.pfb -csitt10 LMTypewriter10-Italic <cstt.enc <lmtti10.pfb -cscsc10 LMCaps10-Regular <cssc.enc <lmcsc10.pfb -csr5 LMRoman5-Regular <cssc.enc <lmr5.pfb -csr6 LMRoman6-Regular <csrm.enc <lmr6.pfb -csr7 LMRoman7-Regular <csrm.enc <lmr7.pfb -csr8 LMRoman8-Regular <csrm.enc <lmr8.pfb -csr9 LMRoman9-Regular <csrm.enc <lmr9.pfb -csr10 LMRoman10-Regular <csrm.enc <lmr10.pfb -csr12 LMRoman12-Regular <csrm.enc <lmr12.pfb -csr17 LMRoman17-Regular <csrm.enc <lmr17.pfb -cssl8 LMSlanted8-Italic <csrm.enc <lmro8.pfb -cssl9 LMSlanted9-Italic <csrm.enc <lmro9.pfb -cssl10 LMSlanted10-Italic <csrm.enc <lmro10.pfb -cssl12 LMSlanted12-Italic <csrm.enc <lmro12.pfb -cssltt10 LMTypewriterSlanted10-Italic <cstt.enc <lmtto10.pfb -csss8 LMSans8-Regular <csrm.enc <lmss8.pfb -csss9 LMSans9-Regular <csrm.enc <lmss9.pfb -csss10 LMSans10-Regular <csrm.enc <lmss10.pfb -csss12 LMSans12-Regular <csrm.enc <lmss12.pfb -csss17 LMSans17-Regular <csrm.enc <lmss17.pfb -csssbx10 LMSans10-Bold <csrm.enc <lmssbx10.pfb -csssdc10 LMSansDemiCond10-Regular <csrm.enc <lmssdc10.pfb -csssi8 LMSans8-Italic <csrm.enc <lmsso8.pfb -csssi9 LMSans9-Italic <csrm.enc <lmsso9.pfb -csssi10 LMSans10-Italic <csrm.enc <lmsso10.pfb -csssi12 LMSans12-Italic <csrm.enc <lmsso12.pfb -csssi17 LMSans17-Italic <csrm.enc <lmsso17.pfb -csssq8 LMSansQuotation8-Regular <csrm.enc <lmssq8.pfb -csssqi8 LMSansQuotation8-Italic <csrm.enc <lmssqo8.pfb -cstcsc10 LMTypewriterCaps10-Regular <cstt.enc <lmtcsc10.pfb -csti7 LMRoman7-Italic <csrm.enc <lmri7.pfb -csti8 LMRoman8-Italic <csrm.enc <lmri8.pfb -csti9 LMRoman9-Italic <csrm.enc <lmri9.pfb -csti10 LMRoman10-Italic <csrm.enc <lmri10.pfb -csti12 LMRoman12-Italic <csrm.enc <lmri12.pfb -cstt8 LMTypewriter8-Regular <cstt.enc <lmtt8.pfb -cstt9 LMTypewriter9-Regular <cstt.enc <lmtt9.pfb -cstt10 LMTypewriter10-Regular <cstt.enc <lmtt10.pfb -cstt12 LMTypewriter12-Regular <cstt.enc <lmtt12.pfb -csvtt10 LMTypewriterVarWd10-Regular <cstt.enc <lmvtt10.pfb - -% some originals, not used in context - -csdunh10 csdunh10 <csdunh10.pfb -csff10 csff10 <csff10.pfb -csfib8 csfib8 <csfib8.pfb -csfi10 csfi10 <csfi10.pfb - -% a weird one, not used in context - -csu10 LMRoman10-Italic "-0.25 SlantFont" <csrm.enc <lmri10.pfb - - -# not yet defined - - -% LM replacement, thanks to Jacko - -plb10 LMRomanDemi10-Regular <plrm.enc <lmb10.pfb -plbx5 LMRoman5-Bold <plrm.enc <lmbx5.pfb -plbx6 LMRoman6-Bold <plrm.enc <lmbx6.pfb -plbx7 LMRoman7-Bold <plrm.enc <lmbx7.pfb -plbx8 LMRoman8-Bold <plrm.enc <lmbx8.pfb -plbx9 LMRoman9-Bold <plrm.enc <lmbx9.pfb -plbx10 LMRoman10-Bold <plrm.enc <lmbx10.pfb -plbx12 LMRoman12-Bold <plrm.enc <lmbx12.pfb -plbxsl10 LMSlanted10-BoldItalic <plrm.enc <lmbxo10.pfb -plbxti10 LMRoman10-BoldItalic <plit.enc <lmbxi10.pfb -plcsc10 LMCaps10-Regular <plsc.enc <lmcsc10.pfb -plinch LMSans10-Bold <plin.enc <lmssbx10.pfb -plitt10 LMTypewriter10-Italic <plitt.enc <lmtti10.pfb -plr5 LMRoman5-Regular <plsc.enc <lmr5.pfb -plr6 LMRoman6-Regular <plrm.enc <lmr6.pfb -plr7 LMRoman7-Regular <plrm.enc <lmr7.pfb -plr8 LMRoman8-Regular <plrm.enc <lmr8.pfb -plr9 LMRoman9-Regular <plrm.enc <lmr9.pfb -plr10 LMRoman10-Regular <plrm.enc <lmr10.pfb -plr12 LMRoman12-Regular <plrm.enc <lmr12.pfb -plr17 LMRoman17-Regular <plrm.enc <lmr17.pfb -plsl8 LMSlanted8-Italic <plrm.enc <lmro8.pfb -plsl9 LMSlanted9-Italic <plrm.enc <lmro9.pfb -plsl10 LMSlanted10-Italic <plrm.enc <lmro10.pfb -plsl12 LMSlanted12-Italic <plrm.enc <lmro12.pfb -plsltt10 LMTypewriterSlanted10-Italic <pltt.enc <lmtto10.pfb -plss8 LMSans8-Regular <plrm.enc <lmss8.pfb -plss9 LMSans9-Regular <plrm.enc <lmss9.pfb -plss10 LMSans10-Regular <plrm.enc <lmss10.pfb -plss12 LMSans12-Regular <plrm.enc <lmss12.pfb -plss17 LMSans17-Regular <plrm.enc <lmss17.pfb -plssbi10 LMSans10-BoldItalic <plrm.enc <lmssbo10.pfb -plssbx10 LMSans10-Bold <plrm.enc <lmssbx10.pfb -plssdc10 LMSansDemiCond10-Regular <plrm.enc <lmssdc10.pfb -plssi8 LMSans8-Italic <plrm.enc <lmssi8.pfb -plssi9 LMSans9-Italic <plrm.enc <lmssi9.pfb -plssi10 LMSans10-Italic <plrm.enc <lmssi10.pfb -plssi12 LMSans12-Italic <plrm.enc <lmssi12.pfb -plssi17 LMSans17-Italic <plrm.enc <lmssi17.pfb -plssq8 LMSansQuotation8-Regular <plrm.enc <lmssq8.pfb -plssqi8 LMSansQuotation8-Italic <plrm.enc <lmssqo8.pfb -pltcsc10 LMTypewriterCaps10-Regular <pltt.enc <lmtcsc10.pfb -plti7 LMRoman7-Italic <plit.enc <lmri7.pfb -plti8 LMRoman8-Italic <plit.enc <lmri8.pfb -plti9 LMRoman9-Italic <plit.enc <lmri9.pfb -plti10 LMRoman10-Italic <plit.enc <lmri10.pfb -plti12 LMRoman12-Italic <plit.enc <lmri12.pfb -pltt8 LMTypewriter8-Regular <pltt.enc <lmtt8.pfb -pltt9 LMTypewriter9-Regular <pltt.enc <lmtt9.pfb -pltt10 LMTypewriter10-Regular <pltt.enc <lmtt10.pfb -pltt12 LMTypewriter12-Regular <pltt.enc <lmtt12.pfb -plvtt10 LMTypewriterVarWd10-Regular <plrm.enc <lmvtt10.pfb - -% some originals, not used in context - -pldunh10 PLDunhill10-Regular <plrm.enc <pldunh10.pfb -plbsy10 PLMathSymbols10-BoldItalic <plms.enc <plbsy10.pfb -plex10 PLMathExtension10-Regular <plme.enc <plex10.pfb -plex9 PLMathExtension9-Regular <plme.enc <plex9.pfb -plff10 PLFunny10-Regular <plrm.enc <plff10.pfb -plfi10 PLFunny10-Italic <plit.enc <plfi10.pfb -plfib8 PLFibonacci8-Regular <plrm.enc <plfib8.pfb -plmi10 PLMathItalic10-Italic <plmi.enc <plmi10.pfb -plmi12 PLMathItalic12-Italic <plmi.enc <plmi12.pfb -plmi5 PLMathItalic5-Italic <plmi.enc <plmi5.pfb -plmi6 PLMathItalic6-Italic <plmi.enc <plmi6.pfb -plmi7 PLMathItalic7-Italic <plmi.enc <plmi7.pfb -plmi8 PLMathItalic8-Italic <plmi.enc <plmi8.pfb -plmi9 PLMathItalic9-Italic <plmi.enc <plmi9.pfb -plmib10 PLMathItalic10-BoldItalic <plmi.enc <plmib10.pfb -plsy10 PLMathSymbols10-Italic <plms.enc <plsy10.pfb -plsy5 PLMathSymbols5-Italic <plms.enc <plsy5.pfb -plsy6 PLMathSymbols6-Italic <plms.enc <plsy6.pfb -plsy7 PLMathSymbols7-Italic <plms.enc <plsy7.pfb -plsy8 PLMathSymbols8-Italic <plms.enc <plsy8.pfb -plsy9 PLMathSymbols9-Italic <plms.enc <plsy9.pfb -pltex10 PLTeXExtended10-Regular <plte.enc <pltex10.pfb -pltex8 PLTeXExtended8-Regular <plte.enc <pltex8.pfb -pltex9 PLTeXExtended9-Regular <plte.enc <pltex9.pfb - -% a weird one, not used in context - -plu10 LMRoman10-Italic "-0.25 SlantFont" <plit.enc <lmri10.pfb +t5-lmb10 LMRoman10-Demi "enclmt5 ReEncodeFont" <lm-t5.enc <lmb10.pfb +t5-lmbo10 LMRoman10-DemiOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmbo10.pfb +t5-lmbx10 LMRoman10-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx10.pfb +t5-lmbx12 LMRoman12-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx12.pfb +t5-lmbx5 LMRoman5-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx5.pfb +t5-lmbx6 LMRoman6-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx6.pfb +t5-lmbx7 LMRoman7-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx7.pfb +t5-lmbx8 LMRoman8-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx8.pfb +t5-lmbx9 LMRoman9-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx9.pfb +t5-lmbxi10 LMRoman10-BoldItalic "enclmt5 ReEncodeFont" <lm-t5.enc <lmbxi10.pfb +t5-lmbxo10 LMRoman10-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmbxo10.pfb +t5-lmcsc10 LMRoman10-CapsRegular "enclmt5 ReEncodeFont" <lm-t5.enc <lmcsc10.pfb +t5-lmcsco10 LMRoman10-CapsOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmcsco10.pfb +t5-lmr10 LMRoman10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr10.pfb +t5-lmr12 LMRoman12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr12.pfb +t5-lmr17 LMRoman17-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr17.pfb +t5-lmr5 LMRoman5-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr5.pfb +t5-lmr6 LMRoman6-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr6.pfb +t5-lmr7 LMRoman7-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr7.pfb +t5-lmr8 LMRoman8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr8.pfb +t5-lmr9 LMRoman9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr9.pfb +t5-lmri10 LMRoman10-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri10.pfb +t5-lmri12 LMRoman12-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri12.pfb +t5-lmri7 LMRoman7-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri7.pfb +t5-lmri8 LMRoman8-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri8.pfb +t5-lmri9 LMRoman9-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri9.pfb +t5-lmro10 LMRoman10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro10.pfb +t5-lmro12 LMRoman12-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro12.pfb +t5-lmro17 LMRoman17-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro17.pfb +t5-lmro8 LMRoman8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro8.pfb +t5-lmro9 LMRoman9-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro9.pfb +t5-lmss10 LMSans10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss10.pfb +t5-lmss12 LMSans12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss12.pfb +t5-lmss17 LMSans17-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss17.pfb +t5-lmss8 LMSans8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss8.pfb +t5-lmss9 LMSans9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss9.pfb +t5-lmssbo10 LMSans10-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssbo10.pfb +t5-lmssbx10 LMSans10-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmssbx10.pfb +t5-lmssdc10 LMSans10-DemiCondensed "enclmt5 ReEncodeFont" <lm-t5.enc <lmssdc10.pfb +t5-lmssdo10 LMSans10-DemiCondensedOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssdo10.pfb +t5-lmsso10 LMSans10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso10.pfb +t5-lmsso12 LMSans12-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso12.pfb +t5-lmsso17 LMSans17-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso17.pfb +t5-lmsso8 LMSans8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso8.pfb +t5-lmsso9 LMSans9-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso9.pfb +t5-lmssq8 LMSansQuotation8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmssq8.pfb +t5-lmssqbo8 LMSansQuotation8-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqbo8.pfb +t5-lmssqbx8 LMSansQuotation8-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqbx8.pfb +t5-lmssqo8 LMSansQuotation8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqo8.pfb +t5-lmtcsc10 LMTypewriter10-CapsRegular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtcsc10.pfb +t5-lmtcso10 LMTypewriter10-CapsOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtcso10.pfb +t5-lmtl10 LMTypewriter10-Light "enclmt5 ReEncodeFont" <lm-t5.enc <lmtl10.pfb +t5-lmtlo10 LMTypewriter10-LightOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlo10.pfb +t5-lmtlc10 LMTypewriter10-LightCondensed "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlc10.pfb +t5-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlco10.pfb +t5-lmtk10 LMTypewriter10-Dark "enclmt5 ReEncodeFont" <lm-t5.enc <lmtk10.pfb +t5-lmtko10 LMTypewriter10-DarkOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtko10.pfb +t5-lmtt10 LMTypewriter10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt10.pfb +t5-lmtt12 LMTypewriter12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt12.pfb +t5-lmtt8 LMTypewriter8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt8.pfb +t5-lmtt9 LMTypewriter9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt9.pfb +t5-lmtti10 LMTypewriter10-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmtti10.pfb +t5-lmtto10 LMTypewriter10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtto10.pfb +t5-lmvtt10 LMTypewriterVarWd10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtt10.pfb +t5-lmvtto10 LMTypewriterVarWd10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtto10.pfb +t5-lmvtl10 LMTypewriterVarWd10-Light "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtl10.pfb +t5-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtlo10.pfb +t5-lmvtk10 LMTypewriterVarWd10-Dark "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtk10.pfb +t5-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtko10.pfb % author: Hans Hagen @@ -1136,60 +1006,72 @@ plu10 LMRoman10-Italic "-0.25 SlantFont" <plit.enc <lmri10.pfb % bchbo8y CharterBT-Bold ".167 SlantFont" <texnansi.enc <bchb8a.pfb % bchro8y CharterBT-Roman ".167 SlantFont " <texnansi.enc <bchr8a.pfb -texnansi-lmb10 LMRomanDemi10-Regular <texnansi-lm.enc <lmb10.pfb -texnansi-lmbo10 LMRomanDemi10-Italic <texnansi-lm.enc <lmbo10.pfb -texnansi-lmbx10 LMRoman10-Bold <texnansi-lm.enc <lmbx10.pfb -texnansi-lmbx12 LMRoman12-Bold <texnansi-lm.enc <lmbx12.pfb -texnansi-lmbx5 LMRoman5-Bold <texnansi-lm.enc <lmbx5.pfb -texnansi-lmbx6 LMRoman6-Bold <texnansi-lm.enc <lmbx6.pfb -texnansi-lmbx7 LMRoman7-Bold <texnansi-lm.enc <lmbx7.pfb -texnansi-lmbx8 LMRoman8-Bold <texnansi-lm.enc <lmbx8.pfb -texnansi-lmbx9 LMRoman9-Bold <texnansi-lm.enc <lmbx9.pfb -texnansi-lmbxi10 LMRoman10-BoldItalic <texnansi-lm.enc <lmbxi10.pfb -texnansi-lmbxo10 LMSlanted10-BoldItalic <texnansi-lm.enc <lmbxo10.pfb -texnansi-lmcsc10 LMCaps10-Regular <texnansi-lm.enc <lmcsc10.pfb -texnansi-lmcsco10 LMCaps10-Italic <texnansi-lm.enc <lmcsco10.pfb -texnansi-lmr10 LMRoman10-Regular <texnansi-lm.enc <lmr10.pfb -texnansi-lmr12 LMRoman12-Regular <texnansi-lm.enc <lmr12.pfb -texnansi-lmr17 LMRoman17-Regular <texnansi-lm.enc <lmr17.pfb -texnansi-lmr5 LMRoman5-Regular <texnansi-lm.enc <lmr5.pfb -texnansi-lmr6 LMRoman6-Regular <texnansi-lm.enc <lmr6.pfb -texnansi-lmr7 LMRoman7-Regular <texnansi-lm.enc <lmr7.pfb -texnansi-lmr8 LMRoman8-Regular <texnansi-lm.enc <lmr8.pfb -texnansi-lmr9 LMRoman9-Regular <texnansi-lm.enc <lmr9.pfb -texnansi-lmri10 LMRoman10-Italic <texnansi-lm.enc <lmri10.pfb -texnansi-lmri12 LMRoman12-Italic <texnansi-lm.enc <lmri12.pfb -texnansi-lmri7 LMRoman7-Italic <texnansi-lm.enc <lmri7.pfb -texnansi-lmri8 LMRoman8-Italic <texnansi-lm.enc <lmri8.pfb -texnansi-lmri9 LMRoman9-Italic <texnansi-lm.enc <lmri9.pfb -texnansi-lmro10 LMSlanted10-Italic <texnansi-lm.enc <lmro10.pfb -texnansi-lmro12 LMSlanted12-Italic <texnansi-lm.enc <lmro12.pfb -texnansi-lmro8 LMSlanted8-Italic <texnansi-lm.enc <lmro8.pfb -texnansi-lmro9 LMSlanted9-Italic <texnansi-lm.enc <lmro9.pfb -texnansi-lmss10 LMSans10-Regular <texnansi-lm.enc <lmss10.pfb -texnansi-lmss12 LMSans12-Regular <texnansi-lm.enc <lmss12.pfb -texnansi-lmss17 LMSans17-Regular <texnansi-lm.enc <lmss17.pfb -texnansi-lmss8 LMSans8-Regular <texnansi-lm.enc <lmss8.pfb -texnansi-lmss9 LMSans9-Regular <texnansi-lm.enc <lmss9.pfb -texnansi-lmssbo10 LMSans10-BoldItalic <texnansi-lm.enc <lmssbo10.pfb -texnansi-lmssbx10 LMSans10-Bold <texnansi-lm.enc <lmssbx10.pfb -texnansi-lmssdc10 LMSansDemiCond10-Regular <texnansi-lm.enc <lmssdc10.pfb -texnansi-lmssdo10 LMSansDemiCond10-Italic <texnansi-lm.enc <lmssdo10.pfb -texnansi-lmsso10 LMSans10-Italic <texnansi-lm.enc <lmsso10.pfb -texnansi-lmsso12 LMSans12-Italic <texnansi-lm.enc <lmsso12.pfb -texnansi-lmsso17 LMSans17-Italic <texnansi-lm.enc <lmsso17.pfb -texnansi-lmsso8 LMSans8-Italic <texnansi-lm.enc <lmsso8.pfb -texnansi-lmsso9 LMSans9-Italic <texnansi-lm.enc <lmsso9.pfb -texnansi-lmssq8 LMSansQuotation8-Regular <texnansi-lm.enc <lmssq8.pfb -texnansi-lmssqbo8 LMSansQuotation8-BoldItalic <texnansi-lm.enc <lmssqbo8.pfb -texnansi-lmssqbx8 LMSansQuotation8-Bold <texnansi-lm.enc <lmssqbx8.pfb -texnansi-lmssqo8 LMSansQuotation8-Italic <texnansi-lm.enc <lmssqo8.pfb -texnansi-lmtcsc10 LMTypewriterCaps10-Regular <texnansi-lm.enc <lmtcsc10.pfb -texnansi-lmtt10 LMTypewriter10-Regular <texnansi-lm.enc <lmtt10.pfb -texnansi-lmtt12 LMTypewriter12-Regular <texnansi-lm.enc <lmtt12.pfb -texnansi-lmtt8 LMTypewriter8-Regular <texnansi-lm.enc <lmtt8.pfb -texnansi-lmtt9 LMTypewriter9-Regular <texnansi-lm.enc <lmtt9.pfb -texnansi-lmtti10 LMTypewriter10-Italic <texnansi-lm.enc <lmtti10.pfb -texnansi-lmtto10 LMTypewriterSlanted10-Italic <texnansi-lm.enc <lmtto10.pfb -texnansi-lmvtt10 LMTypewriterVarWd10-Regular <texnansi-lm.enc <lmvtt10.pfb -texnansi-lmvtto10 LMTypewriterVarWd10-Italic <texnansi-lm.enc <lmvtto10.pfb +texnansi-lmb10 LMRoman10-Demi "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmb10.pfb +texnansi-lmbo10 LMRoman10-DemiOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbo10.pfb +texnansi-lmbx10 LMRoman10-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx10.pfb +texnansi-lmbx12 LMRoman12-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx12.pfb +texnansi-lmbx5 LMRoman5-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx5.pfb +texnansi-lmbx6 LMRoman6-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx6.pfb +texnansi-lmbx7 LMRoman7-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx7.pfb +texnansi-lmbx8 LMRoman8-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx8.pfb +texnansi-lmbx9 LMRoman9-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx9.pfb +texnansi-lmbxi10 LMRoman10-BoldItalic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbxi10.pfb +texnansi-lmbxo10 LMRoman10-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbxo10.pfb +texnansi-lmcsc10 LMRoman10-CapsRegular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmcsc10.pfb +texnansi-lmcsco10 LMRoman10-CapsOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmcsco10.pfb +texnansi-lmr10 LMRoman10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr10.pfb +texnansi-lmr12 LMRoman12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr12.pfb +texnansi-lmr17 LMRoman17-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr17.pfb +texnansi-lmr5 LMRoman5-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr5.pfb +texnansi-lmr6 LMRoman6-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr6.pfb +texnansi-lmr7 LMRoman7-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr7.pfb +texnansi-lmr8 LMRoman8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr8.pfb +texnansi-lmr9 LMRoman9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr9.pfb +texnansi-lmri10 LMRoman10-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri10.pfb +texnansi-lmri12 LMRoman12-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri12.pfb +texnansi-lmri7 LMRoman7-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri7.pfb +texnansi-lmri8 LMRoman8-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri8.pfb +texnansi-lmri9 LMRoman9-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri9.pfb +texnansi-lmro10 LMRoman10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro10.pfb +texnansi-lmro12 LMRoman12-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro12.pfb +texnansi-lmro17 LMRoman17-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro17.pfb +texnansi-lmro8 LMRoman8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro8.pfb +texnansi-lmro9 LMRoman9-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro9.pfb +texnansi-lmss10 LMSans10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss10.pfb +texnansi-lmss12 LMSans12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss12.pfb +texnansi-lmss17 LMSans17-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss17.pfb +texnansi-lmss8 LMSans8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss8.pfb +texnansi-lmss9 LMSans9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss9.pfb +texnansi-lmssbo10 LMSans10-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssbo10.pfb +texnansi-lmssbx10 LMSans10-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssbx10.pfb +texnansi-lmssdc10 LMSans10-DemiCondensed "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssdc10.pfb +texnansi-lmssdo10 LMSans10-DemiCondensedOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssdo10.pfb +texnansi-lmsso10 LMSans10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso10.pfb +texnansi-lmsso12 LMSans12-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso12.pfb +texnansi-lmsso17 LMSans17-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso17.pfb +texnansi-lmsso8 LMSans8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso8.pfb +texnansi-lmsso9 LMSans9-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso9.pfb +texnansi-lmssq8 LMSansQuotation8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssq8.pfb +texnansi-lmssqbo8 LMSansQuotation8-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqbo8.pfb +texnansi-lmssqbx8 LMSansQuotation8-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqbx8.pfb +texnansi-lmssqo8 LMSansQuotation8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqo8.pfb +texnansi-lmtcsc10 LMTypewriter10-CapsRegular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtcsc10.pfb +texnansi-lmtcso10 LMTypewriter10-CapsOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtcso10.pfb +texnansi-lmtl10 LMTypewriter10-Light "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtl10.pfb +texnansi-lmtlo10 LMTypewriter10-LightOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlo10.pfb +texnansi-lmtlc10 LMTypewriter10-LightCondensed "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlc10.pfb +texnansi-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlco10.pfb +texnansi-lmtk10 LMTypewriter10-Dark "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtk10.pfb +texnansi-lmtko10 LMTypewriter10-DarkOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtko10.pfb +texnansi-lmtt10 LMTypewriter10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt10.pfb +texnansi-lmtt12 LMTypewriter12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt12.pfb +texnansi-lmtt8 LMTypewriter8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt8.pfb +texnansi-lmtt9 LMTypewriter9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt9.pfb +texnansi-lmtti10 LMTypewriter10-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtti10.pfb +texnansi-lmtto10 LMTypewriter10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtto10.pfb +texnansi-lmvtt10 LMTypewriterVarWd10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtt10.pfb +texnansi-lmvtto10 LMTypewriterVarWd10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtto10.pfb +texnansi-lmvtl10 LMTypewriterVarWd10-Light "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtl10.pfb +texnansi-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtlo10.pfb +texnansi-lmvtk10 LMTypewriterVarWd10-Dark "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtk10.pfb +texnansi-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtko10.pfb diff --git a/fonts/map/pdftex/context/ec-os-public-lm.map b/fonts/map/pdftex/context/ec-os-public-lm.map index 0f6f7082b..d68013c36 100644 --- a/fonts/map/pdftex/context/ec-os-public-lm.map +++ b/fonts/map/pdftex/context/ec-os-public-lm.map @@ -1,57 +1,69 @@ -ec-lmb10 LMRomanDemi10-Regular <ec-os-lm.enc <lmb10.pfb -ec-lmbo10 LMRomanDemi10-Italic <ec-os-lm.enc <lmbo10.pfb -ec-lmbx10 LMRoman10-Bold <ec-os-lm.enc <lmbx10.pfb -ec-lmbx12 LMRoman12-Bold <ec-os-lm.enc <lmbx12.pfb -ec-lmbx5 LMRoman5-Bold <ec-os-lm.enc <lmbx5.pfb -ec-lmbx6 LMRoman6-Bold <ec-os-lm.enc <lmbx6.pfb -ec-lmbx7 LMRoman7-Bold <ec-os-lm.enc <lmbx7.pfb -ec-lmbx8 LMRoman8-Bold <ec-os-lm.enc <lmbx8.pfb -ec-lmbx9 LMRoman9-Bold <ec-os-lm.enc <lmbx9.pfb -ec-lmbxi10 LMRoman10-BoldItalic <ec-os-lm.enc <lmbxi10.pfb -ec-lmbxo10 LMSlanted10-BoldItalic <ec-os-lm.enc <lmbxo10.pfb -ec-lmcsc10 LMCaps10-Regular <ec-os-lm.enc <lmcsc10.pfb -ec-lmcsco10 LMCaps10-Italic <ec-os-lm.enc <lmcsco10.pfb -ec-lmr10 LMRoman10-Regular <ec-os-lm.enc <lmr10.pfb -ec-lmr12 LMRoman12-Regular <ec-os-lm.enc <lmr12.pfb -ec-lmr17 LMRoman17-Regular <ec-os-lm.enc <lmr17.pfb -ec-lmr5 LMRoman5-Regular <ec-os-lm.enc <lmr5.pfb -ec-lmr6 LMRoman6-Regular <ec-os-lm.enc <lmr6.pfb -ec-lmr7 LMRoman7-Regular <ec-os-lm.enc <lmr7.pfb -ec-lmr8 LMRoman8-Regular <ec-os-lm.enc <lmr8.pfb -ec-lmr9 LMRoman9-Regular <ec-os-lm.enc <lmr9.pfb -ec-lmri10 LMRoman10-Italic <ec-os-lm.enc <lmri10.pfb -ec-lmri12 LMRoman12-Italic <ec-os-lm.enc <lmri12.pfb -ec-lmri7 LMRoman7-Italic <ec-os-lm.enc <lmri7.pfb -ec-lmri8 LMRoman8-Italic <ec-os-lm.enc <lmri8.pfb -ec-lmri9 LMRoman9-Italic <ec-os-lm.enc <lmri9.pfb -ec-lmro10 LMSlanted10-Italic <ec-os-lm.enc <lmro10.pfb -ec-lmro12 LMSlanted12-Italic <ec-os-lm.enc <lmro12.pfb -ec-lmro8 LMSlanted8-Italic <ec-os-lm.enc <lmro8.pfb -ec-lmro9 LMSlanted9-Italic <ec-os-lm.enc <lmro9.pfb -ec-lmss10 LMSans10-Regular <ec-os-lm.enc <lmss10.pfb -ec-lmss12 LMSans12-Regular <ec-os-lm.enc <lmss12.pfb -ec-lmss17 LMSans17-Regular <ec-os-lm.enc <lmss17.pfb -ec-lmss8 LMSans8-Regular <ec-os-lm.enc <lmss8.pfb -ec-lmss9 LMSans9-Regular <ec-os-lm.enc <lmss9.pfb -ec-lmssbo10 LMSans10-BoldItalic <ec-os-lm.enc <lmssbo10.pfb -ec-lmssbx10 LMSans10-Bold <ec-os-lm.enc <lmssbx10.pfb -ec-lmssdc10 LMSansDemiCond10-Regular <ec-os-lm.enc <lmssdc10.pfb -ec-lmssdo10 LMSansDemiCond10-Italic <ec-os-lm.enc <lmssdo10.pfb -ec-lmsso10 LMSans10-Italic <ec-os-lm.enc <lmsso10.pfb -ec-lmsso12 LMSans12-Italic <ec-os-lm.enc <lmsso12.pfb -ec-lmsso17 LMSans17-Italic <ec-os-lm.enc <lmsso17.pfb -ec-lmsso8 LMSans8-Italic <ec-os-lm.enc <lmsso8.pfb -ec-lmsso9 LMSans9-Italic <ec-os-lm.enc <lmsso9.pfb -ec-lmssq8 LMSansQuotation8-Regular <ec-os-lm.enc <lmssq8.pfb -ec-lmssqbo8 LMSansQuotation8-BoldItalic <ec-os-lm.enc <lmssqbo8.pfb -ec-lmssqbx8 LMSansQuotation8-Bold <ec-os-lm.enc <lmssqbx8.pfb -ec-lmssqo8 LMSansQuotation8-Italic <ec-os-lm.enc <lmssqo8.pfb -ec-lmtcsc10 LMTypewriterCaps10-Regular <ec-os-lm.enc <lmtcsc10.pfb -ec-lmtt10 LMTypewriter10-Regular <ec-os-lm.enc <lmtt10.pfb -ec-lmtt12 LMTypewriter12-Regular <ec-os-lm.enc <lmtt12.pfb -ec-lmtt8 LMTypewriter8-Regular <ec-os-lm.enc <lmtt8.pfb -ec-lmtt9 LMTypewriter9-Regular <ec-os-lm.enc <lmtt9.pfb -ec-lmtti10 LMTypewriter10-Italic <ec-os-lm.enc <lmtti10.pfb -ec-lmtto10 LMTypewriterSlanted10-Italic <ec-os-lm.enc <lmtto10.pfb -ec-lmvtt10 LMTypewriterVarWd10-Regular <ec-os-lm.enc <lmvtt10.pfb -ec-lmvtto10 LMTypewriterVarWd10-Italic <ec-os-lm.enc <lmvtto10.pfb +ec-lmb10 LMRoman10-Demi "enclmecos ReEncodeFont" <lm-ec-os.enc <lmb10.pfb +ec-lmbo10 LMRoman10-DemiOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbo10.pfb +ec-lmbx10 LMRoman10-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx10.pfb +ec-lmbx12 LMRoman12-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx12.pfb +ec-lmbx5 LMRoman5-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx5.pfb +ec-lmbx6 LMRoman6-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx6.pfb +ec-lmbx7 LMRoman7-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx7.pfb +ec-lmbx8 LMRoman8-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx8.pfb +ec-lmbx9 LMRoman9-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbx9.pfb +ec-lmbxi10 LMRoman10-BoldItalic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbxi10.pfb +ec-lmbxo10 LMRoman10-BoldOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmbxo10.pfb +ec-lmcsc10 LMRoman10-CapsRegular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmcsc10.pfb +ec-lmcsco10 LMRoman10-CapsOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmcsco10.pfb +ec-lmr10 LMRoman10-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr10.pfb +ec-lmr12 LMRoman12-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr12.pfb +ec-lmr17 LMRoman17-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr17.pfb +ec-lmr5 LMRoman5-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr5.pfb +ec-lmr6 LMRoman6-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr6.pfb +ec-lmr7 LMRoman7-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr7.pfb +ec-lmr8 LMRoman8-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr8.pfb +ec-lmr9 LMRoman9-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmr9.pfb +ec-lmri10 LMRoman10-Italic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmri10.pfb +ec-lmri12 LMRoman12-Italic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmri12.pfb +ec-lmri7 LMRoman7-Italic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmri7.pfb +ec-lmri8 LMRoman8-Italic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmri8.pfb +ec-lmri9 LMRoman9-Italic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmri9.pfb +ec-lmro10 LMRoman10-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmro10.pfb +ec-lmro12 LMRoman12-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmro12.pfb +ec-lmro17 LMRoman17-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmro17.pfb +ec-lmro8 LMRoman8-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmro8.pfb +ec-lmro9 LMRoman9-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmro9.pfb +ec-lmss10 LMSans10-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmss10.pfb +ec-lmss12 LMSans12-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmss12.pfb +ec-lmss17 LMSans17-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmss17.pfb +ec-lmss8 LMSans8-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmss8.pfb +ec-lmss9 LMSans9-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmss9.pfb +ec-lmssbo10 LMSans10-BoldOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssbo10.pfb +ec-lmssbx10 LMSans10-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssbx10.pfb +ec-lmssdc10 LMSans10-DemiCondensed "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssdc10.pfb +ec-lmssdo10 LMSans10-DemiCondensedOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssdo10.pfb +ec-lmsso10 LMSans10-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmsso10.pfb +ec-lmsso12 LMSans12-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmsso12.pfb +ec-lmsso17 LMSans17-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmsso17.pfb +ec-lmsso8 LMSans8-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmsso8.pfb +ec-lmsso9 LMSans9-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmsso9.pfb +ec-lmssq8 LMSansQuotation8-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssq8.pfb +ec-lmssqbo8 LMSansQuotation8-BoldOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssqbo8.pfb +ec-lmssqbx8 LMSansQuotation8-Bold "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssqbx8.pfb +ec-lmssqo8 LMSansQuotation8-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmssqo8.pfb +ec-lmtcsc10 LMTypewriter10-CapsRegular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtcsc10.pfb +ec-lmtcso10 LMTypewriter10-CapsOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtcso10.pfb +ec-lmtl10 LMTypewriter10-Light "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtl10.pfb +ec-lmtlo10 LMTypewriter10-LightOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtlo10.pfb +ec-lmtlc10 LMTypewriter10-LightCondensed "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtlc10.pfb +ec-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtlco10.pfb +ec-lmtk10 LMTypewriter10-Dark "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtk10.pfb +ec-lmtko10 LMTypewriter10-DarkOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtko10.pfb +ec-lmtt10 LMTypewriter10-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtt10.pfb +ec-lmtt12 LMTypewriter12-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtt12.pfb +ec-lmtt8 LMTypewriter8-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtt8.pfb +ec-lmtt9 LMTypewriter9-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtt9.pfb +ec-lmtti10 LMTypewriter10-Italic "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtti10.pfb +ec-lmtto10 LMTypewriter10-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmtto10.pfb +ec-lmvtt10 LMTypewriterVarWd10-Regular "enclmecos ReEncodeFont" <lm-ec-os.enc <lmvtt10.pfb +ec-lmvtto10 LMTypewriterVarWd10-Oblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmvtto10.pfb +ec-lmvtl10 LMTypewriterVarWd10-Light "enclmecos ReEncodeFont" <lm-ec-os.enc <lmvtl10.pfb +ec-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmvtlo10.pfb +ec-lmvtk10 LMTypewriterVarWd10-Dark "enclmecos ReEncodeFont" <lm-ec-os.enc <lmvtk10.pfb +ec-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmecos ReEncodeFont" <lm-ec-os.enc <lmvtko10.pfb diff --git a/fonts/map/pdftex/context/ec-public-lm.map b/fonts/map/pdftex/context/ec-public-lm.map index 148444aa7..d4640394f 100644 --- a/fonts/map/pdftex/context/ec-public-lm.map +++ b/fonts/map/pdftex/context/ec-public-lm.map @@ -1,57 +1,69 @@ -ec-lmb10 LMRomanDemi10-Regular <ec-lm.enc <lmb10.pfb -ec-lmbo10 LMRomanDemi10-Italic <ec-lm.enc <lmbo10.pfb -ec-lmbx10 LMRoman10-Bold <ec-lm.enc <lmbx10.pfb -ec-lmbx12 LMRoman12-Bold <ec-lm.enc <lmbx12.pfb -ec-lmbx5 LMRoman5-Bold <ec-lm.enc <lmbx5.pfb -ec-lmbx6 LMRoman6-Bold <ec-lm.enc <lmbx6.pfb -ec-lmbx7 LMRoman7-Bold <ec-lm.enc <lmbx7.pfb -ec-lmbx8 LMRoman8-Bold <ec-lm.enc <lmbx8.pfb -ec-lmbx9 LMRoman9-Bold <ec-lm.enc <lmbx9.pfb -ec-lmbxi10 LMRoman10-BoldItalic <ec-lm.enc <lmbxi10.pfb -ec-lmbxo10 LMSlanted10-BoldItalic <ec-lm.enc <lmbxo10.pfb -ec-lmcsc10 LMCaps10-Regular <ec-lm.enc <lmcsc10.pfb -ec-lmcsco10 LMCaps10-Italic <ec-lm.enc <lmcsco10.pfb -ec-lmr10 LMRoman10-Regular <ec-lm.enc <lmr10.pfb -ec-lmr12 LMRoman12-Regular <ec-lm.enc <lmr12.pfb -ec-lmr17 LMRoman17-Regular <ec-lm.enc <lmr17.pfb -ec-lmr5 LMRoman5-Regular <ec-lm.enc <lmr5.pfb -ec-lmr6 LMRoman6-Regular <ec-lm.enc <lmr6.pfb -ec-lmr7 LMRoman7-Regular <ec-lm.enc <lmr7.pfb -ec-lmr8 LMRoman8-Regular <ec-lm.enc <lmr8.pfb -ec-lmr9 LMRoman9-Regular <ec-lm.enc <lmr9.pfb -ec-lmri10 LMRoman10-Italic <ec-lm.enc <lmri10.pfb -ec-lmri12 LMRoman12-Italic <ec-lm.enc <lmri12.pfb -ec-lmri7 LMRoman7-Italic <ec-lm.enc <lmri7.pfb -ec-lmri8 LMRoman8-Italic <ec-lm.enc <lmri8.pfb -ec-lmri9 LMRoman9-Italic <ec-lm.enc <lmri9.pfb -ec-lmro10 LMSlanted10-Italic <ec-lm.enc <lmro10.pfb -ec-lmro12 LMSlanted12-Italic <ec-lm.enc <lmro12.pfb -ec-lmro8 LMSlanted8-Italic <ec-lm.enc <lmro8.pfb -ec-lmro9 LMSlanted9-Italic <ec-lm.enc <lmro9.pfb -ec-lmss10 LMSans10-Regular <ec-lm.enc <lmss10.pfb -ec-lmss12 LMSans12-Regular <ec-lm.enc <lmss12.pfb -ec-lmss17 LMSans17-Regular <ec-lm.enc <lmss17.pfb -ec-lmss8 LMSans8-Regular <ec-lm.enc <lmss8.pfb -ec-lmss9 LMSans9-Regular <ec-lm.enc <lmss9.pfb -ec-lmssbo10 LMSans10-BoldItalic <ec-lm.enc <lmssbo10.pfb -ec-lmssbx10 LMSans10-Bold <ec-lm.enc <lmssbx10.pfb -ec-lmssdc10 LMSansDemiCond10-Regular <ec-lm.enc <lmssdc10.pfb -ec-lmssdo10 LMSansDemiCond10-Italic <ec-lm.enc <lmssdo10.pfb -ec-lmsso10 LMSans10-Italic <ec-lm.enc <lmsso10.pfb -ec-lmsso12 LMSans12-Italic <ec-lm.enc <lmsso12.pfb -ec-lmsso17 LMSans17-Italic <ec-lm.enc <lmsso17.pfb -ec-lmsso8 LMSans8-Italic <ec-lm.enc <lmsso8.pfb -ec-lmsso9 LMSans9-Italic <ec-lm.enc <lmsso9.pfb -ec-lmssq8 LMSansQuotation8-Regular <ec-lm.enc <lmssq8.pfb -ec-lmssqbo8 LMSansQuotation8-BoldItalic <ec-lm.enc <lmssqbo8.pfb -ec-lmssqbx8 LMSansQuotation8-Bold <ec-lm.enc <lmssqbx8.pfb -ec-lmssqo8 LMSansQuotation8-Italic <ec-lm.enc <lmssqo8.pfb -ec-lmtcsc10 LMTypewriterCaps10-Regular <ec-lm.enc <lmtcsc10.pfb -ec-lmtt10 LMTypewriter10-Regular <ec-lm.enc <lmtt10.pfb -ec-lmtt12 LMTypewriter12-Regular <ec-lm.enc <lmtt12.pfb -ec-lmtt8 LMTypewriter8-Regular <ec-lm.enc <lmtt8.pfb -ec-lmtt9 LMTypewriter9-Regular <ec-lm.enc <lmtt9.pfb -ec-lmtti10 LMTypewriter10-Italic <ec-lm.enc <lmtti10.pfb -ec-lmtto10 LMTypewriterSlanted10-Italic <ec-lm.enc <lmtto10.pfb -ec-lmvtt10 LMTypewriterVarWd10-Regular <ec-lm.enc <lmvtt10.pfb -ec-lmvtto10 LMTypewriterVarWd10-Italic <ec-lm.enc <lmvtto10.pfb +ec-lmb10 LMRoman10-Demi "enclmec ReEncodeFont" <lm-ec.enc <lmb10.pfb +ec-lmbo10 LMRoman10-DemiOblique "enclmec ReEncodeFont" <lm-ec.enc <lmbo10.pfb +ec-lmbx10 LMRoman10-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx10.pfb +ec-lmbx12 LMRoman12-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx12.pfb +ec-lmbx5 LMRoman5-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx5.pfb +ec-lmbx6 LMRoman6-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx6.pfb +ec-lmbx7 LMRoman7-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx7.pfb +ec-lmbx8 LMRoman8-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx8.pfb +ec-lmbx9 LMRoman9-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmbx9.pfb +ec-lmbxi10 LMRoman10-BoldItalic "enclmec ReEncodeFont" <lm-ec.enc <lmbxi10.pfb +ec-lmbxo10 LMRoman10-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmbxo10.pfb +ec-lmcsc10 LMRoman10-CapsRegular "enclmec ReEncodeFont" <lm-ec.enc <lmcsc10.pfb +ec-lmcsco10 LMRoman10-CapsOblique "enclmec ReEncodeFont" <lm-ec.enc <lmcsco10.pfb +ec-lmr10 LMRoman10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr10.pfb +ec-lmr12 LMRoman12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr12.pfb +ec-lmr17 LMRoman17-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr17.pfb +ec-lmr5 LMRoman5-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr5.pfb +ec-lmr6 LMRoman6-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr6.pfb +ec-lmr7 LMRoman7-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr7.pfb +ec-lmr8 LMRoman8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr8.pfb +ec-lmr9 LMRoman9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmr9.pfb +ec-lmri10 LMRoman10-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri10.pfb +ec-lmri12 LMRoman12-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri12.pfb +ec-lmri7 LMRoman7-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri7.pfb +ec-lmri8 LMRoman8-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri8.pfb +ec-lmri9 LMRoman9-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmri9.pfb +ec-lmro10 LMRoman10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro10.pfb +ec-lmro12 LMRoman12-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro12.pfb +ec-lmro17 LMRoman17-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro17.pfb +ec-lmro8 LMRoman8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro8.pfb +ec-lmro9 LMRoman9-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmro9.pfb +ec-lmss10 LMSans10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss10.pfb +ec-lmss12 LMSans12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss12.pfb +ec-lmss17 LMSans17-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss17.pfb +ec-lmss8 LMSans8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss8.pfb +ec-lmss9 LMSans9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmss9.pfb +ec-lmssbo10 LMSans10-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssbo10.pfb +ec-lmssbx10 LMSans10-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmssbx10.pfb +ec-lmssdc10 LMSans10-DemiCondensed "enclmec ReEncodeFont" <lm-ec.enc <lmssdc10.pfb +ec-lmssdo10 LMSans10-DemiCondensedOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssdo10.pfb +ec-lmsso10 LMSans10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso10.pfb +ec-lmsso12 LMSans12-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso12.pfb +ec-lmsso17 LMSans17-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso17.pfb +ec-lmsso8 LMSans8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso8.pfb +ec-lmsso9 LMSans9-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmsso9.pfb +ec-lmssq8 LMSansQuotation8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmssq8.pfb +ec-lmssqbo8 LMSansQuotation8-BoldOblique "enclmec ReEncodeFont" <lm-ec.enc <lmssqbo8.pfb +ec-lmssqbx8 LMSansQuotation8-Bold "enclmec ReEncodeFont" <lm-ec.enc <lmssqbx8.pfb +ec-lmssqo8 LMSansQuotation8-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmssqo8.pfb +ec-lmtcsc10 LMTypewriter10-CapsRegular "enclmec ReEncodeFont" <lm-ec.enc <lmtcsc10.pfb +ec-lmtcso10 LMTypewriter10-CapsOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtcso10.pfb +ec-lmtl10 LMTypewriter10-Light "enclmec ReEncodeFont" <lm-ec.enc <lmtl10.pfb +ec-lmtlo10 LMTypewriter10-LightOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtlo10.pfb +ec-lmtlc10 LMTypewriter10-LightCondensed "enclmec ReEncodeFont" <lm-ec.enc <lmtlc10.pfb +ec-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtlco10.pfb +ec-lmtk10 LMTypewriter10-Dark "enclmec ReEncodeFont" <lm-ec.enc <lmtk10.pfb +ec-lmtko10 LMTypewriter10-DarkOblique "enclmec ReEncodeFont" <lm-ec.enc <lmtko10.pfb +ec-lmtt10 LMTypewriter10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt10.pfb +ec-lmtt12 LMTypewriter12-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt12.pfb +ec-lmtt8 LMTypewriter8-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt8.pfb +ec-lmtt9 LMTypewriter9-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmtt9.pfb +ec-lmtti10 LMTypewriter10-Italic "enclmec ReEncodeFont" <lm-ec.enc <lmtti10.pfb +ec-lmtto10 LMTypewriter10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmtto10.pfb +ec-lmvtt10 LMTypewriterVarWd10-Regular "enclmec ReEncodeFont" <lm-ec.enc <lmvtt10.pfb +ec-lmvtto10 LMTypewriterVarWd10-Oblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtto10.pfb +ec-lmvtl10 LMTypewriterVarWd10-Light "enclmec ReEncodeFont" <lm-ec.enc <lmvtl10.pfb +ec-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtlo10.pfb +ec-lmvtk10 LMTypewriterVarWd10-Dark "enclmec ReEncodeFont" <lm-ec.enc <lmvtk10.pfb +ec-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmec ReEncodeFont" <lm-ec.enc <lmvtko10.pfb diff --git a/fonts/map/pdftex/context/ec-var-exclusive-public-lm.map b/fonts/map/pdftex/context/ec-var-exclusive-public-lm.map deleted file mode 100644 index fb4780374..000000000 --- a/fonts/map/pdftex/context/ec-var-exclusive-public-lm.map +++ /dev/null @@ -1,62 +0,0 @@ -% author: Hans Hagen -% -% This map file remaps ec (cork) encoded Latin Modern adapted for -% umlauts and other variations. - -ec-lmb10 LMRomanDemi10-Regular <ec-var-lm.enc <lmb10.pfb -ec-lmbo10 LMRomanDemi10-Italic <ec-var-lm.enc <lmbo10.pfb -ec-lmbx10 LMRoman10-Bold <ec-var-lm.enc <lmbx10.pfb -ec-lmbx12 LMRoman12-Bold <ec-var-lm.enc <lmbx12.pfb -ec-lmbx5 LMRoman5-Bold <ec-var-lm.enc <lmbx5.pfb -ec-lmbx6 LMRoman6-Bold <ec-var-lm.enc <lmbx6.pfb -ec-lmbx7 LMRoman7-Bold <ec-var-lm.enc <lmbx7.pfb -ec-lmbx8 LMRoman8-Bold <ec-var-lm.enc <lmbx8.pfb -ec-lmbx9 LMRoman9-Bold <ec-var-lm.enc <lmbx9.pfb -ec-lmbxi10 LMRoman10-BoldItalic <ec-var-lm.enc <lmbxi10.pfb -ec-lmbxo10 LMSlanted10-BoldItalic <ec-var-lm.enc <lmbxo10.pfb -ec-lmcsc10 LMCaps10-Regular <ec-var-lm.enc <lmcsc10.pfb -ec-lmcsco10 LMCaps10-Italic <ec-var-lm.enc <lmcsco10.pfb -ec-lmr10 LMRoman10-Regular <ec-var-lm.enc <lmr10.pfb -ec-lmr12 LMRoman12-Regular <ec-var-lm.enc <lmr12.pfb -ec-lmr17 LMRoman17-Regular <ec-var-lm.enc <lmr17.pfb -ec-lmr5 LMRoman5-Regular <ec-var-lm.enc <lmr5.pfb -ec-lmr6 LMRoman6-Regular <ec-var-lm.enc <lmr6.pfb -ec-lmr7 LMRoman7-Regular <ec-var-lm.enc <lmr7.pfb -ec-lmr8 LMRoman8-Regular <ec-var-lm.enc <lmr8.pfb -ec-lmr9 LMRoman9-Regular <ec-var-lm.enc <lmr9.pfb -ec-lmri10 LMRoman10-Italic <ec-var-lm.enc <lmri10.pfb -ec-lmri12 LMRoman12-Italic <ec-var-lm.enc <lmri12.pfb -ec-lmri7 LMRoman7-Italic <ec-var-lm.enc <lmri7.pfb -ec-lmri8 LMRoman8-Italic <ec-var-lm.enc <lmri8.pfb -ec-lmri9 LMRoman9-Italic <ec-var-lm.enc <lmri9.pfb -ec-lmro10 LMSlanted10-Italic <ec-var-lm.enc <lmro10.pfb -ec-lmro12 LMSlanted12-Italic <ec-var-lm.enc <lmro12.pfb -ec-lmro8 LMSlanted8-Italic <ec-var-lm.enc <lmro8.pfb -ec-lmro9 LMSlanted9-Italic <ec-var-lm.enc <lmro9.pfb -ec-lmss10 LMSans10-Regular <ec-var-lm.enc <lmss10.pfb -ec-lmss12 LMSans12-Regular <ec-var-lm.enc <lmss12.pfb -ec-lmss17 LMSans17-Regular <ec-var-lm.enc <lmss17.pfb -ec-lmss8 LMSans8-Regular <ec-var-lm.enc <lmss8.pfb -ec-lmss9 LMSans9-Regular <ec-var-lm.enc <lmss9.pfb -ec-lmssbo10 LMSans10-BoldItalic <ec-var-lm.enc <lmssbo10.pfb -ec-lmssbx10 LMSans10-Bold <ec-var-lm.enc <lmssbx10.pfb -ec-lmssdc10 LMSansDemiCond10-Regular <ec-var-lm.enc <lmssdc10.pfb -ec-lmssdo10 LMSansDemiCond10-Italic <ec-var-lm.enc <lmssdo10.pfb -ec-lmsso10 LMSans10-Italic <ec-var-lm.enc <lmsso10.pfb -ec-lmsso12 LMSans12-Italic <ec-var-lm.enc <lmsso12.pfb -ec-lmsso17 LMSans17-Italic <ec-var-lm.enc <lmsso17.pfb -ec-lmsso8 LMSans8-Italic <ec-var-lm.enc <lmsso8.pfb -ec-lmsso9 LMSans9-Italic <ec-var-lm.enc <lmsso9.pfb -ec-lmssq8 LMSansQuotation8-Regular <ec-var-lm.enc <lmssq8.pfb -ec-lmssqbo8 LMSansQuotation8-BoldItalic <ec-var-lm.enc <lmssqbo8.pfb -ec-lmssqbx8 LMSansQuotation8-Bold <ec-var-lm.enc <lmssqbx8.pfb -ec-lmssqo8 LMSansQuotation8-Italic <ec-var-lm.enc <lmssqo8.pfb -ec-lmtcsc10 LMTypewriterCaps10-Regular <ec-var-lm.enc <lmtcsc10.pfb -ec-lmtt10 LMTypewriter10-Regular <ec-var-lm.enc <lmtt10.pfb -ec-lmtt12 LMTypewriter12-Regular <ec-var-lm.enc <lmtt12.pfb -ec-lmtt8 LMTypewriter8-Regular <ec-var-lm.enc <lmtt8.pfb -ec-lmtt9 LMTypewriter9-Regular <ec-var-lm.enc <lmtt9.pfb -ec-lmtti10 LMTypewriter10-Italic <ec-var-lm.enc <lmtti10.pfb -ec-lmtto10 LMTypewriterSlanted10-Italic <ec-var-lm.enc <lmtto10.pfb -ec-lmvtt10 LMTypewriterVarWd10-Regular <ec-var-lm.enc <lmvtt10.pfb -ec-lmvtto10 LMTypewriterVarWd10-Italic <ec-var-lm.enc <lmvtto10.pfb
\ No newline at end of file diff --git a/fonts/map/pdftex/context/ec-var-public-lm.map b/fonts/map/pdftex/context/ec-var-public-lm.map deleted file mode 100644 index 406136bc9..000000000 --- a/fonts/map/pdftex/context/ec-var-public-lm.map +++ /dev/null @@ -1,62 +0,0 @@ -% author: Hans Hagen -% -% This map file defines ec (cork) encoded Latin Modern adapted for -% umlauts and other variations. - -ec-var-lmb10 LMRomanDemi10-Regular <ec-var-lm.enc <lmb10.pfb -ec-var-lmbo10 LMRomanDemi10-Italic <ec-var-lm.enc <lmbo10.pfb -ec-var-lmbx10 LMRoman10-Bold <ec-var-lm.enc <lmbx10.pfb -ec-var-lmbx12 LMRoman12-Bold <ec-var-lm.enc <lmbx12.pfb -ec-var-lmbx5 LMRoman5-Bold <ec-var-lm.enc <lmbx5.pfb -ec-var-lmbx6 LMRoman6-Bold <ec-var-lm.enc <lmbx6.pfb -ec-var-lmbx7 LMRoman7-Bold <ec-var-lm.enc <lmbx7.pfb -ec-var-lmbx8 LMRoman8-Bold <ec-var-lm.enc <lmbx8.pfb -ec-var-lmbx9 LMRoman9-Bold <ec-var-lm.enc <lmbx9.pfb -ec-var-lmbxi10 LMRoman10-BoldItalic <ec-var-lm.enc <lmbxi10.pfb -ec-var-lmbxo10 LMSlanted10-BoldItalic <ec-var-lm.enc <lmbxo10.pfb -ec-var-lmcsc10 LMCaps10-Regular <ec-var-lm.enc <lmcsc10.pfb -ec-var-lmcsco10 LMCaps10-Italic <ec-var-lm.enc <lmcsco10.pfb -ec-var-lmr10 LMRoman10-Regular <ec-var-lm.enc <lmr10.pfb -ec-var-lmr12 LMRoman12-Regular <ec-var-lm.enc <lmr12.pfb -ec-var-lmr17 LMRoman17-Regular <ec-var-lm.enc <lmr17.pfb -ec-var-lmr5 LMRoman5-Regular <ec-var-lm.enc <lmr5.pfb -ec-var-lmr6 LMRoman6-Regular <ec-var-lm.enc <lmr6.pfb -ec-var-lmr7 LMRoman7-Regular <ec-var-lm.enc <lmr7.pfb -ec-var-lmr8 LMRoman8-Regular <ec-var-lm.enc <lmr8.pfb -ec-var-lmr9 LMRoman9-Regular <ec-var-lm.enc <lmr9.pfb -ec-var-lmri10 LMRoman10-Italic <ec-var-lm.enc <lmri10.pfb -ec-var-lmri12 LMRoman12-Italic <ec-var-lm.enc <lmri12.pfb -ec-var-lmri7 LMRoman7-Italic <ec-var-lm.enc <lmri7.pfb -ec-var-lmri8 LMRoman8-Italic <ec-var-lm.enc <lmri8.pfb -ec-var-lmri9 LMRoman9-Italic <ec-var-lm.enc <lmri9.pfb -ec-var-lmro10 LMSlanted10-Italic <ec-var-lm.enc <lmro10.pfb -ec-var-lmro12 LMSlanted12-Italic <ec-var-lm.enc <lmro12.pfb -ec-var-lmro8 LMSlanted8-Italic <ec-var-lm.enc <lmro8.pfb -ec-var-lmro9 LMSlanted9-Italic <ec-var-lm.enc <lmro9.pfb -ec-var-lmss10 LMSans10-Regular <ec-var-lm.enc <lmss10.pfb -ec-var-lmss12 LMSans12-Regular <ec-var-lm.enc <lmss12.pfb -ec-var-lmss17 LMSans17-Regular <ec-var-lm.enc <lmss17.pfb -ec-var-lmss8 LMSans8-Regular <ec-var-lm.enc <lmss8.pfb -ec-var-lmss9 LMSans9-Regular <ec-var-lm.enc <lmss9.pfb -ec-var-lmssbo10 LMSans10-BoldItalic <ec-var-lm.enc <lmssbo10.pfb -ec-var-lmssbx10 LMSans10-Bold <ec-var-lm.enc <lmssbx10.pfb -ec-var-lmssdc10 LMSansDemiCond10-Regular <ec-var-lm.enc <lmssdc10.pfb -ec-var-lmssdo10 LMSansDemiCond10-Italic <ec-var-lm.enc <lmssdo10.pfb -ec-var-lmsso10 LMSans10-Italic <ec-var-lm.enc <lmsso10.pfb -ec-var-lmsso12 LMSans12-Italic <ec-var-lm.enc <lmsso12.pfb -ec-var-lmsso17 LMSans17-Italic <ec-var-lm.enc <lmsso17.pfb -ec-var-lmsso8 LMSans8-Italic <ec-var-lm.enc <lmsso8.pfb -ec-var-lmsso9 LMSans9-Italic <ec-var-lm.enc <lmsso9.pfb -ec-var-lmssq8 LMSansQuotation8-Regular <ec-var-lm.enc <lmssq8.pfb -ec-var-lmssqbo8 LMSansQuotation8-BoldItalic <ec-var-lm.enc <lmssqbo8.pfb -ec-var-lmssqbx8 LMSansQuotation8-Bold <ec-var-lm.enc <lmssqbx8.pfb -ec-var-lmssqo8 LMSansQuotation8-Italic <ec-var-lm.enc <lmssqo8.pfb -ec-var-lmtcsc10 LMTypewriterCaps10-Regular <ec-var-lm.enc <lmtcsc10.pfb -ec-var-lmtt10 LMTypewriter10-Regular <ec-var-lm.enc <lmtt10.pfb -ec-var-lmtt12 LMTypewriter12-Regular <ec-var-lm.enc <lmtt12.pfb -ec-var-lmtt8 LMTypewriter8-Regular <ec-var-lm.enc <lmtt8.pfb -ec-var-lmtt9 LMTypewriter9-Regular <ec-var-lm.enc <lmtt9.pfb -ec-var-lmtti10 LMTypewriter10-Italic <ec-var-lm.enc <lmtti10.pfb -ec-var-lmtto10 LMTypewriterSlanted10-Italic <ec-var-lm.enc <lmtto10.pfb -ec-var-lmvtt10 LMTypewriterVarWd10-Regular <ec-var-lm.enc <lmvtt10.pfb -ec-var-lmvtto10 LMTypewriterVarWd10-Italic <ec-var-lm.enc <lmvtto10.pfb
\ No newline at end of file diff --git a/fonts/map/pdftex/context/il2-base.map b/fonts/map/pdftex/context/il2-base.map deleted file mode 100644 index 19756645c..000000000 --- a/fonts/map/pdftex/context/il2-base.map +++ /dev/null @@ -1 +0,0 @@ -# not yet defined diff --git a/fonts/map/pdftex/context/il2-public-lm.map b/fonts/map/pdftex/context/il2-public-lm.map deleted file mode 100644 index 150096d29..000000000 --- a/fonts/map/pdftex/context/il2-public-lm.map +++ /dev/null @@ -1,64 +0,0 @@ -% LM replacement / thanks to Jacko - -csb10 LMRomanDemi10-Regular <csrm.enc <lmb10.pfb -csbx5 LMRoman5-Bold <csrm.enc <lmbx5.pfb -csbx6 LMRoman6-Bold <csrm.enc <lmbx6.pfb -csbx7 LMRoman7-Bold <csrm.enc <lmbx7.pfb -csbx8 LMRoman8-Bold <csrm.enc <lmbx8.pfb -csbx9 LMRoman9-Bold <csrm.enc <lmbx9.pfb -csbx10 LMRoman10-Bold <csrm.enc <lmbx10.pfb -csbx12 LMRoman12-Bold <csrm.enc <lmbx12.pfb -csbxsl10 LMSlanted10-BoldItalic <csrm.enc <lmbxo10.pfb -csbxti10 LMRoman10-BoldItalic <csrm.enc <lmbxi10.pfb -csinch LMSans10-Bold <csin.enc <lmssbx10.pfb -csitt10 LMTypewriter10-Italic <cstt.enc <lmtti10.pfb -cscsc10 LMCaps10-Regular <cssc.enc <lmcsc10.pfb -csr5 LMRoman5-Regular <cssc.enc <lmr5.pfb -csr6 LMRoman6-Regular <csrm.enc <lmr6.pfb -csr7 LMRoman7-Regular <csrm.enc <lmr7.pfb -csr8 LMRoman8-Regular <csrm.enc <lmr8.pfb -csr9 LMRoman9-Regular <csrm.enc <lmr9.pfb -csr10 LMRoman10-Regular <csrm.enc <lmr10.pfb -csr12 LMRoman12-Regular <csrm.enc <lmr12.pfb -csr17 LMRoman17-Regular <csrm.enc <lmr17.pfb -cssl8 LMSlanted8-Italic <csrm.enc <lmro8.pfb -cssl9 LMSlanted9-Italic <csrm.enc <lmro9.pfb -cssl10 LMSlanted10-Italic <csrm.enc <lmro10.pfb -cssl12 LMSlanted12-Italic <csrm.enc <lmro12.pfb -cssltt10 LMTypewriterSlanted10-Italic <cstt.enc <lmtto10.pfb -csss8 LMSans8-Regular <csrm.enc <lmss8.pfb -csss9 LMSans9-Regular <csrm.enc <lmss9.pfb -csss10 LMSans10-Regular <csrm.enc <lmss10.pfb -csss12 LMSans12-Regular <csrm.enc <lmss12.pfb -csss17 LMSans17-Regular <csrm.enc <lmss17.pfb -csssbx10 LMSans10-Bold <csrm.enc <lmssbx10.pfb -csssdc10 LMSansDemiCond10-Regular <csrm.enc <lmssdc10.pfb -csssi8 LMSans8-Italic <csrm.enc <lmsso8.pfb -csssi9 LMSans9-Italic <csrm.enc <lmsso9.pfb -csssi10 LMSans10-Italic <csrm.enc <lmsso10.pfb -csssi12 LMSans12-Italic <csrm.enc <lmsso12.pfb -csssi17 LMSans17-Italic <csrm.enc <lmsso17.pfb -csssq8 LMSansQuotation8-Regular <csrm.enc <lmssq8.pfb -csssqi8 LMSansQuotation8-Italic <csrm.enc <lmssqo8.pfb -cstcsc10 LMTypewriterCaps10-Regular <cstt.enc <lmtcsc10.pfb -csti7 LMRoman7-Italic <csrm.enc <lmri7.pfb -csti8 LMRoman8-Italic <csrm.enc <lmri8.pfb -csti9 LMRoman9-Italic <csrm.enc <lmri9.pfb -csti10 LMRoman10-Italic <csrm.enc <lmri10.pfb -csti12 LMRoman12-Italic <csrm.enc <lmri12.pfb -cstt8 LMTypewriter8-Regular <cstt.enc <lmtt8.pfb -cstt9 LMTypewriter9-Regular <cstt.enc <lmtt9.pfb -cstt10 LMTypewriter10-Regular <cstt.enc <lmtt10.pfb -cstt12 LMTypewriter12-Regular <cstt.enc <lmtt12.pfb -csvtt10 LMTypewriterVarWd10-Regular <cstt.enc <lmvtt10.pfb - -% some originals, not used in context - -csdunh10 csdunh10 <csdunh10.pfb -csff10 csff10 <csff10.pfb -csfib8 csfib8 <csfib8.pfb -csfi10 csfi10 <csfi10.pfb - -% a weird one, not used in context - -csu10 LMRoman10-Italic "-0.25 SlantFont" <csrm.enc <lmri10.pfb diff --git a/fonts/map/pdftex/context/il2-var-exclusive-public-lm.map b/fonts/map/pdftex/context/il2-var-exclusive-public-lm.map deleted file mode 100644 index 19756645c..000000000 --- a/fonts/map/pdftex/context/il2-var-exclusive-public-lm.map +++ /dev/null @@ -1 +0,0 @@ -# not yet defined diff --git a/fonts/map/pdftex/context/pl0-base.map b/fonts/map/pdftex/context/pl0-base.map deleted file mode 100644 index 19756645c..000000000 --- a/fonts/map/pdftex/context/pl0-base.map +++ /dev/null @@ -1 +0,0 @@ -# not yet defined diff --git a/fonts/map/pdftex/context/pl0-public-lm.map b/fonts/map/pdftex/context/pl0-public-lm.map deleted file mode 100644 index 427ff8773..000000000 --- a/fonts/map/pdftex/context/pl0-public-lm.map +++ /dev/null @@ -1,85 +0,0 @@ -% LM replacement, thanks to Jacko - -plb10 LMRomanDemi10-Regular <plrm.enc <lmb10.pfb -plbx5 LMRoman5-Bold <plrm.enc <lmbx5.pfb -plbx6 LMRoman6-Bold <plrm.enc <lmbx6.pfb -plbx7 LMRoman7-Bold <plrm.enc <lmbx7.pfb -plbx8 LMRoman8-Bold <plrm.enc <lmbx8.pfb -plbx9 LMRoman9-Bold <plrm.enc <lmbx9.pfb -plbx10 LMRoman10-Bold <plrm.enc <lmbx10.pfb -plbx12 LMRoman12-Bold <plrm.enc <lmbx12.pfb -plbxsl10 LMSlanted10-BoldItalic <plrm.enc <lmbxo10.pfb -plbxti10 LMRoman10-BoldItalic <plit.enc <lmbxi10.pfb -plcsc10 LMCaps10-Regular <plsc.enc <lmcsc10.pfb -plinch LMSans10-Bold <plin.enc <lmssbx10.pfb -plitt10 LMTypewriter10-Italic <plitt.enc <lmtti10.pfb -plr5 LMRoman5-Regular <plsc.enc <lmr5.pfb -plr6 LMRoman6-Regular <plrm.enc <lmr6.pfb -plr7 LMRoman7-Regular <plrm.enc <lmr7.pfb -plr8 LMRoman8-Regular <plrm.enc <lmr8.pfb -plr9 LMRoman9-Regular <plrm.enc <lmr9.pfb -plr10 LMRoman10-Regular <plrm.enc <lmr10.pfb -plr12 LMRoman12-Regular <plrm.enc <lmr12.pfb -plr17 LMRoman17-Regular <plrm.enc <lmr17.pfb -plsl8 LMSlanted8-Italic <plrm.enc <lmro8.pfb -plsl9 LMSlanted9-Italic <plrm.enc <lmro9.pfb -plsl10 LMSlanted10-Italic <plrm.enc <lmro10.pfb -plsl12 LMSlanted12-Italic <plrm.enc <lmro12.pfb -plsltt10 LMTypewriterSlanted10-Italic <pltt.enc <lmtto10.pfb -plss8 LMSans8-Regular <plrm.enc <lmss8.pfb -plss9 LMSans9-Regular <plrm.enc <lmss9.pfb -plss10 LMSans10-Regular <plrm.enc <lmss10.pfb -plss12 LMSans12-Regular <plrm.enc <lmss12.pfb -plss17 LMSans17-Regular <plrm.enc <lmss17.pfb -plssbi10 LMSans10-BoldItalic <plrm.enc <lmssbo10.pfb -plssbx10 LMSans10-Bold <plrm.enc <lmssbx10.pfb -plssdc10 LMSansDemiCond10-Regular <plrm.enc <lmssdc10.pfb -plssi8 LMSans8-Italic <plrm.enc <lmssi8.pfb -plssi9 LMSans9-Italic <plrm.enc <lmssi9.pfb -plssi10 LMSans10-Italic <plrm.enc <lmssi10.pfb -plssi12 LMSans12-Italic <plrm.enc <lmssi12.pfb -plssi17 LMSans17-Italic <plrm.enc <lmssi17.pfb -plssq8 LMSansQuotation8-Regular <plrm.enc <lmssq8.pfb -plssqi8 LMSansQuotation8-Italic <plrm.enc <lmssqo8.pfb -pltcsc10 LMTypewriterCaps10-Regular <pltt.enc <lmtcsc10.pfb -plti7 LMRoman7-Italic <plit.enc <lmri7.pfb -plti8 LMRoman8-Italic <plit.enc <lmri8.pfb -plti9 LMRoman9-Italic <plit.enc <lmri9.pfb -plti10 LMRoman10-Italic <plit.enc <lmri10.pfb -plti12 LMRoman12-Italic <plit.enc <lmri12.pfb -pltt8 LMTypewriter8-Regular <pltt.enc <lmtt8.pfb -pltt9 LMTypewriter9-Regular <pltt.enc <lmtt9.pfb -pltt10 LMTypewriter10-Regular <pltt.enc <lmtt10.pfb -pltt12 LMTypewriter12-Regular <pltt.enc <lmtt12.pfb -plvtt10 LMTypewriterVarWd10-Regular <plrm.enc <lmvtt10.pfb - -% some originals, not used in context - -pldunh10 PLDunhill10-Regular <plrm.enc <pldunh10.pfb -plbsy10 PLMathSymbols10-BoldItalic <plms.enc <plbsy10.pfb -plex10 PLMathExtension10-Regular <plme.enc <plex10.pfb -plex9 PLMathExtension9-Regular <plme.enc <plex9.pfb -plff10 PLFunny10-Regular <plrm.enc <plff10.pfb -plfi10 PLFunny10-Italic <plit.enc <plfi10.pfb -plfib8 PLFibonacci8-Regular <plrm.enc <plfib8.pfb -plmi10 PLMathItalic10-Italic <plmi.enc <plmi10.pfb -plmi12 PLMathItalic12-Italic <plmi.enc <plmi12.pfb -plmi5 PLMathItalic5-Italic <plmi.enc <plmi5.pfb -plmi6 PLMathItalic6-Italic <plmi.enc <plmi6.pfb -plmi7 PLMathItalic7-Italic <plmi.enc <plmi7.pfb -plmi8 PLMathItalic8-Italic <plmi.enc <plmi8.pfb -plmi9 PLMathItalic9-Italic <plmi.enc <plmi9.pfb -plmib10 PLMathItalic10-BoldItalic <plmi.enc <plmib10.pfb -plsy10 PLMathSymbols10-Italic <plms.enc <plsy10.pfb -plsy5 PLMathSymbols5-Italic <plms.enc <plsy5.pfb -plsy6 PLMathSymbols6-Italic <plms.enc <plsy6.pfb -plsy7 PLMathSymbols7-Italic <plms.enc <plsy7.pfb -plsy8 PLMathSymbols8-Italic <plms.enc <plsy8.pfb -plsy9 PLMathSymbols9-Italic <plms.enc <plsy9.pfb -pltex10 PLTeXExtended10-Regular <plte.enc <pltex10.pfb -pltex8 PLTeXExtended8-Regular <plte.enc <pltex8.pfb -pltex9 PLTeXExtended9-Regular <plte.enc <pltex9.pfb - -% a weird one, not used in context - -plu10 LMRoman10-Italic "-0.25 SlantFont" <plit.enc <lmri10.pfb diff --git a/fonts/map/pdftex/context/pl0-var-exclusive-public-lm.map b/fonts/map/pdftex/context/pl0-var-exclusive-public-lm.map deleted file mode 100644 index 19756645c..000000000 --- a/fonts/map/pdftex/context/pl0-var-exclusive-public-lm.map +++ /dev/null @@ -1 +0,0 @@ -# not yet defined diff --git a/fonts/map/pdftex/context/qx-os-public-lm.map b/fonts/map/pdftex/context/qx-os-public-lm.map index 8b940123e..57ddc0ebf 100644 --- a/fonts/map/pdftex/context/qx-os-public-lm.map +++ b/fonts/map/pdftex/context/qx-os-public-lm.map @@ -1,58 +1,69 @@ -qx-lmb10 LMRomanDemi10-Regular <qx-os-lm.enc <lmb10.pfb -qx-lmbo10 LMRomanDemi10-Italic <qx-os-lm.enc <lmbo10.pfb -qx-lmbx10 LMRoman10-Bold <qx-os-lm.enc <lmbx10.pfb -qx-lmbx12 LMRoman12-Bold <qx-os-lm.enc <lmbx12.pfb -qx-lmbx5 LMRoman5-Bold <qx-os-lm.enc <lmbx5.pfb -qx-lmbx6 LMRoman6-Bold <qx-os-lm.enc <lmbx6.pfb -qx-lmbx7 LMRoman7-Bold <qx-os-lm.enc <lmbx7.pfb -qx-lmbx8 LMRoman8-Bold <qx-os-lm.enc <lmbx8.pfb -qx-lmbx9 LMRoman9-Bold <qx-os-lm.enc <lmbx9.pfb -qx-lmbxi10 LMRoman10-BoldItalic <qx-os-lm.enc <lmbxi10.pfb -qx-lmbxo10 LMSlanted10-BoldItalic <qx-os-lm.enc <lmbxo10.pfb -qx-lmcsc10 LMCaps10-Regular <qx-os-lm.enc <lmcsc10.pfb -qx-lmcsco10 LMCaps10-Italic <qx-os-lm.enc <lmcsco10.pfb -qx-lmr10 LMRoman10-Regular <qx-os-lm.enc <lmr10.pfb -qx-lmr12 LMRoman12-Regular <qx-os-lm.enc <lmr12.pfb -qx-lmr17 LMRoman17-Regular <qx-os-lm.enc <lmr17.pfb -qx-lmr5 LMRoman5-Regular <qx-os-lm.enc <lmr5.pfb -qx-lmr6 LMRoman6-Regular <qx-os-lm.enc <lmr6.pfb -qx-lmr7 LMRoman7-Regular <qx-os-lm.enc <lmr7.pfb -qx-lmr8 LMRoman8-Regular <qx-os-lm.enc <lmr8.pfb -qx-lmr9 LMRoman9-Regular <qx-os-lm.enc <lmr9.pfb -qx-lmri10 LMRoman10-Italic <qx-os-lm.enc <lmri10.pfb -qx-lmri12 LMRoman12-Italic <qx-os-lm.enc <lmri12.pfb -qx-lmri7 LMRoman7-Italic <qx-os-lm.enc <lmri7.pfb -qx-lmri8 LMRoman8-Italic <qx-os-lm.enc <lmri8.pfb -qx-lmri9 LMRoman9-Italic <qx-os-lm.enc <lmri9.pfb -qx-lmro10 LMSlanted10-Italic <qx-os-lm.enc <lmro10.pfb -qx-lmro12 LMSlanted12-Italic <qx-os-lm.enc <lmro12.pfb -qx-lmro8 LMSlanted8-Italic <qx-os-lm.enc <lmro8.pfb -qx-lmro9 LMSlanted9-Italic <qx-os-lm.enc <lmro9.pfb -qx-lmss10 LMSans10-Regular <qx-os-lm.enc <lmss10.pfb -qx-lmss12 LMSans12-Regular <qx-os-lm.enc <lmss12.pfb -qx-lmss17 LMSans17-Regular <qx-os-lm.enc <lmss17.pfb -qx-lmss8 LMSans8-Regular <qx-os-lm.enc <lmss8.pfb -qx-lmss9 LMSans9-Regular <qx-os-lm.enc <lmss9.pfb -qx-lmssbo10 LMSans10-BoldItalic <qx-os-lm.enc <lmssbo10.pfb -qx-lmssbx10 LMSans10-Bold <qx-os-lm.enc <lmssbx10.pfb -qx-lmssdc10 LMSansDemiCond10-Regular <qx-os-lm.enc <lmssdc10.pfb -qx-lmssdo10 LMSansDemiCond10-Italic <qx-os-lm.enc <lmssdo10.pfb -qx-lmsso10 LMSans10-Italic <qx-os-lm.enc <lmsso10.pfb -qx-lmsso12 LMSans12-Italic <qx-os-lm.enc <lmsso12.pfb -qx-lmsso17 LMSans17-Italic <qx-os-lm.enc <lmsso17.pfb -qx-lmsso8 LMSans8-Italic <qx-os-lm.enc <lmsso8.pfb -qx-lmsso9 LMSans9-Italic <qx-os-lm.enc <lmsso9.pfb -qx-lmssq8 LMSansQuotation8-Regular <qx-os-lm.enc <lmssq8.pfb -qx-lmssqbo8 LMSansQuotation8-BoldItalic <qx-os-lm.enc <lmssqbo8.pfb -qx-lmssqbx8 LMSansQuotation8-Bold <qx-os-lm.enc <lmssqbx8.pfb -qx-lmssqo8 LMSansQuotation8-Italic <qx-os-lm.enc <lmssqo8.pfb -qx-lmtcsc10 LMTypewriterCaps10-Regular <qx-lmtt.enc <lmtcsc10.pfb -qx-lmtt10 LMTypewriter10-Regular <qx-lmtt.enc <lmtt10.pfb -qx-lmtt12 LMTypewriter12-Regular <qx-lmtt.enc <lmtt12.pfb -qx-lmtt8 LMTypewriter8-Regular <qx-lmtt.enc <lmtt8.pfb -qx-lmtt9 LMTypewriter9-Regular <qx-lmtt.enc <lmtt9.pfb -qx-lmtti10 LMTypewriter10-Italic <qx-lmtt.enc <lmtti10.pfb -qx-lmtto10 LMTypewriterSlanted10-Italic <qx-lmtt.enc <lmtto10.pfb -qx-lmvtt10 LMTypewriterVarWd10-Regular <qx-os-lm.enc <lmvtt10.pfb -qx-lmvtto10 LMTypewriterVarWd10-Italic <qx-os-lm.enc <lmvtto10.pfb - +qx-lmb10 LMRoman10-Demi "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmb10.pfb +qx-lmbo10 LMRoman10-DemiOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbo10.pfb +qx-lmbx10 LMRoman10-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx10.pfb +qx-lmbx12 LMRoman12-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx12.pfb +qx-lmbx5 LMRoman5-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx5.pfb +qx-lmbx6 LMRoman6-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx6.pfb +qx-lmbx7 LMRoman7-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx7.pfb +qx-lmbx8 LMRoman8-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx8.pfb +qx-lmbx9 LMRoman9-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbx9.pfb +qx-lmbxi10 LMRoman10-BoldItalic "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbxi10.pfb +qx-lmbxo10 LMRoman10-BoldOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmbxo10.pfb +qx-lmcsc10 LMRoman10-CapsRegular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmcsc10.pfb +qx-lmcsco10 LMRoman10-CapsOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmcsco10.pfb +qx-lmr10 LMRoman10-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr10.pfb +qx-lmr12 LMRoman12-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr12.pfb +qx-lmr17 LMRoman17-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr17.pfb +qx-lmr5 LMRoman5-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr5.pfb +qx-lmr6 LMRoman6-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr6.pfb +qx-lmr7 LMRoman7-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr7.pfb +qx-lmr8 LMRoman8-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr8.pfb +qx-lmr9 LMRoman9-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmr9.pfb +qx-lmri10 LMRoman10-Italic "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmri10.pfb +qx-lmri12 LMRoman12-Italic "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmri12.pfb +qx-lmri7 LMRoman7-Italic "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmri7.pfb +qx-lmri8 LMRoman8-Italic "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmri8.pfb +qx-lmri9 LMRoman9-Italic "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmri9.pfb +qx-lmro10 LMRoman10-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmro10.pfb +qx-lmro12 LMRoman12-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmro12.pfb +qx-lmro17 LMRoman17-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmro17.pfb +qx-lmro8 LMRoman8-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmro8.pfb +qx-lmro9 LMRoman9-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmro9.pfb +qx-lmss10 LMSans10-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmss10.pfb +qx-lmss12 LMSans12-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmss12.pfb +qx-lmss17 LMSans17-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmss17.pfb +qx-lmss8 LMSans8-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmss8.pfb +qx-lmss9 LMSans9-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmss9.pfb +qx-lmssbo10 LMSans10-BoldOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssbo10.pfb +qx-lmssbx10 LMSans10-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssbx10.pfb +qx-lmssdc10 LMSans10-DemiCondensed "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssdc10.pfb +qx-lmssdo10 LMSans10-DemiCondensedOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssdo10.pfb +qx-lmsso10 LMSans10-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmsso10.pfb +qx-lmsso12 LMSans12-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmsso12.pfb +qx-lmsso17 LMSans17-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmsso17.pfb +qx-lmsso8 LMSans8-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmsso8.pfb +qx-lmsso9 LMSans9-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmsso9.pfb +qx-lmssq8 LMSansQuotation8-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssq8.pfb +qx-lmssqbo8 LMSansQuotation8-BoldOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssqbo8.pfb +qx-lmssqbx8 LMSansQuotation8-Bold "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssqbx8.pfb +qx-lmssqo8 LMSansQuotation8-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmssqo8.pfb +qx-lmtcsc10 LMTypewriter10-CapsRegular "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtcsc10.pfb +qx-lmtcso10 LMTypewriter10-CapsOblique "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtcso10.pfb +qx-lmtl10 LMTypewriter10-Light "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtl10.pfb +qx-lmtlo10 LMTypewriter10-LightOblique "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtlo10.pfb +qx-lmtlc10 LMTypewriter10-LightCondensed "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtlc10.pfb +qx-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtlco10.pfb +qx-lmtk10 LMTypewriter10-Dark "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtk10.pfb +qx-lmtko10 LMTypewriter10-DarkOblique "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtko10.pfb +qx-lmtt10 LMTypewriter10-Regular "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtt10.pfb +qx-lmtt12 LMTypewriter12-Regular "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtt12.pfb +qx-lmtt8 LMTypewriter8-Regular "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtt8.pfb +qx-lmtt9 LMTypewriter9-Regular "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtt9.pfb +qx-lmtti10 LMTypewriter10-Italic "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtti10.pfb +qx-lmtto10 LMTypewriter10-Oblique "enclmqxostt ReEncodeFont" <lm-qxtt.enc <lmtto10.pfb +qx-lmvtt10 LMTypewriterVarWd10-Regular "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmvtt10.pfb +qx-lmvtto10 LMTypewriterVarWd10-Oblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmvtto10.pfb +qx-lmvtl10 LMTypewriterVarWd10-Light "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmvtl10.pfb +qx-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmvtlo10.pfb +qx-lmvtk10 LMTypewriterVarWd10-Dark "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmvtk10.pfb +qx-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmqxos ReEncodeFont" <lm-qx-os.enc <lmvtko10.pfb diff --git a/fonts/map/pdftex/context/qx-public-lm.map b/fonts/map/pdftex/context/qx-public-lm.map index c147fc22a..d69d50d93 100644 --- a/fonts/map/pdftex/context/qx-public-lm.map +++ b/fonts/map/pdftex/context/qx-public-lm.map @@ -1,58 +1,69 @@ -qx-lmb10 LMRomanDemi10-Regular <qx-lm.enc <lmb10.pfb -qx-lmbo10 LMRomanDemi10-Italic <qx-lm.enc <lmbo10.pfb -qx-lmbx10 LMRoman10-Bold <qx-lm.enc <lmbx10.pfb -qx-lmbx12 LMRoman12-Bold <qx-lm.enc <lmbx12.pfb -qx-lmbx5 LMRoman5-Bold <qx-lm.enc <lmbx5.pfb -qx-lmbx6 LMRoman6-Bold <qx-lm.enc <lmbx6.pfb -qx-lmbx7 LMRoman7-Bold <qx-lm.enc <lmbx7.pfb -qx-lmbx8 LMRoman8-Bold <qx-lm.enc <lmbx8.pfb -qx-lmbx9 LMRoman9-Bold <qx-lm.enc <lmbx9.pfb -qx-lmbxi10 LMRoman10-BoldItalic <qx-lm.enc <lmbxi10.pfb -qx-lmbxo10 LMSlanted10-BoldItalic <qx-lm.enc <lmbxo10.pfb -qx-lmcsc10 LMCaps10-Regular <qx-lm.enc <lmcsc10.pfb -qx-lmcsco10 LMCaps10-Italic <qx-lm.enc <lmcsco10.pfb -qx-lmr10 LMRoman10-Regular <qx-lm.enc <lmr10.pfb -qx-lmr12 LMRoman12-Regular <qx-lm.enc <lmr12.pfb -qx-lmr17 LMRoman17-Regular <qx-lm.enc <lmr17.pfb -qx-lmr5 LMRoman5-Regular <qx-lm.enc <lmr5.pfb -qx-lmr6 LMRoman6-Regular <qx-lm.enc <lmr6.pfb -qx-lmr7 LMRoman7-Regular <qx-lm.enc <lmr7.pfb -qx-lmr8 LMRoman8-Regular <qx-lm.enc <lmr8.pfb -qx-lmr9 LMRoman9-Regular <qx-lm.enc <lmr9.pfb -qx-lmri10 LMRoman10-Italic <qx-lm.enc <lmri10.pfb -qx-lmri12 LMRoman12-Italic <qx-lm.enc <lmri12.pfb -qx-lmri7 LMRoman7-Italic <qx-lm.enc <lmri7.pfb -qx-lmri8 LMRoman8-Italic <qx-lm.enc <lmri8.pfb -qx-lmri9 LMRoman9-Italic <qx-lm.enc <lmri9.pfb -qx-lmro10 LMSlanted10-Italic <qx-lm.enc <lmro10.pfb -qx-lmro12 LMSlanted12-Italic <qx-lm.enc <lmro12.pfb -qx-lmro8 LMSlanted8-Italic <qx-lm.enc <lmro8.pfb -qx-lmro9 LMSlanted9-Italic <qx-lm.enc <lmro9.pfb -qx-lmss10 LMSans10-Regular <qx-lm.enc <lmss10.pfb -qx-lmss12 LMSans12-Regular <qx-lm.enc <lmss12.pfb -qx-lmss17 LMSans17-Regular <qx-lm.enc <lmss17.pfb -qx-lmss8 LMSans8-Regular <qx-lm.enc <lmss8.pfb -qx-lmss9 LMSans9-Regular <qx-lm.enc <lmss9.pfb -qx-lmssbo10 LMSans10-BoldItalic <qx-lm.enc <lmssbo10.pfb -qx-lmssbx10 LMSans10-Bold <qx-lm.enc <lmssbx10.pfb -qx-lmssdc10 LMSansDemiCond10-Regular <qx-lm.enc <lmssdc10.pfb -qx-lmssdo10 LMSansDemiCond10-Italic <qx-lm.enc <lmssdo10.pfb -qx-lmsso10 LMSans10-Italic <qx-lm.enc <lmsso10.pfb -qx-lmsso12 LMSans12-Italic <qx-lm.enc <lmsso12.pfb -qx-lmsso17 LMSans17-Italic <qx-lm.enc <lmsso17.pfb -qx-lmsso8 LMSans8-Italic <qx-lm.enc <lmsso8.pfb -qx-lmsso9 LMSans9-Italic <qx-lm.enc <lmsso9.pfb -qx-lmssq8 LMSansQuotation8-Regular <qx-lm.enc <lmssq8.pfb -qx-lmssqbo8 LMSansQuotation8-BoldItalic <qx-lm.enc <lmssqbo8.pfb -qx-lmssqbx8 LMSansQuotation8-Bold <qx-lm.enc <lmssqbx8.pfb -qx-lmssqo8 LMSansQuotation8-Italic <qx-lm.enc <lmssqo8.pfb -qx-lmtcsc10 LMTypewriterCaps10-Regular <qx-lmtt.enc <lmtcsc10.pfb -qx-lmtt10 LMTypewriter10-Regular <qx-lmtt.enc <lmtt10.pfb -qx-lmtt12 LMTypewriter12-Regular <qx-lmtt.enc <lmtt12.pfb -qx-lmtt8 LMTypewriter8-Regular <qx-lmtt.enc <lmtt8.pfb -qx-lmtt9 LMTypewriter9-Regular <qx-lmtt.enc <lmtt9.pfb -qx-lmtti10 LMTypewriter10-Italic <qx-lmtt.enc <lmtti10.pfb -qx-lmtto10 LMTypewriterSlanted10-Italic <qx-lmtt.enc <lmtto10.pfb -qx-lmvtt10 LMTypewriterVarWd10-Regular <qx-lm.enc <lmvtt10.pfb -qx-lmvtto10 LMTypewriterVarWd10-Italic <qx-lm.enc <lmvtto10.pfb - +qx-lmb10 LMRoman10-Demi "enclmqx ReEncodeFont" <lm-qx.enc <lmb10.pfb +qx-lmbo10 LMRoman10-DemiOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmbo10.pfb +qx-lmbx10 LMRoman10-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx10.pfb +qx-lmbx12 LMRoman12-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx12.pfb +qx-lmbx5 LMRoman5-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx5.pfb +qx-lmbx6 LMRoman6-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx6.pfb +qx-lmbx7 LMRoman7-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx7.pfb +qx-lmbx8 LMRoman8-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx8.pfb +qx-lmbx9 LMRoman9-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmbx9.pfb +qx-lmbxi10 LMRoman10-BoldItalic "enclmqx ReEncodeFont" <lm-qx.enc <lmbxi10.pfb +qx-lmbxo10 LMRoman10-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmbxo10.pfb +qx-lmcsc10 LMRoman10-CapsRegular "enclmqx ReEncodeFont" <lm-qx.enc <lmcsc10.pfb +qx-lmcsco10 LMRoman10-CapsOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmcsco10.pfb +qx-lmr10 LMRoman10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr10.pfb +qx-lmr12 LMRoman12-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr12.pfb +qx-lmr17 LMRoman17-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr17.pfb +qx-lmr5 LMRoman5-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr5.pfb +qx-lmr6 LMRoman6-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr6.pfb +qx-lmr7 LMRoman7-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr7.pfb +qx-lmr8 LMRoman8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr8.pfb +qx-lmr9 LMRoman9-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmr9.pfb +qx-lmri10 LMRoman10-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri10.pfb +qx-lmri12 LMRoman12-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri12.pfb +qx-lmri7 LMRoman7-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri7.pfb +qx-lmri8 LMRoman8-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri8.pfb +qx-lmri9 LMRoman9-Italic "enclmqx ReEncodeFont" <lm-qx.enc <lmri9.pfb +qx-lmro10 LMRoman10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro10.pfb +qx-lmro12 LMRoman12-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro12.pfb +qx-lmro17 LMRoman17-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro17.pfb +qx-lmro8 LMRoman8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro8.pfb +qx-lmro9 LMRoman9-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmro9.pfb +qx-lmss10 LMSans10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss10.pfb +qx-lmss12 LMSans12-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss12.pfb +qx-lmss17 LMSans17-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss17.pfb +qx-lmss8 LMSans8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss8.pfb +qx-lmss9 LMSans9-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmss9.pfb +qx-lmssbo10 LMSans10-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssbo10.pfb +qx-lmssbx10 LMSans10-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmssbx10.pfb +qx-lmssdc10 LMSans10-DemiCondensed "enclmqx ReEncodeFont" <lm-qx.enc <lmssdc10.pfb +qx-lmssdo10 LMSans10-DemiCondensedOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssdo10.pfb +qx-lmsso10 LMSans10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso10.pfb +qx-lmsso12 LMSans12-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso12.pfb +qx-lmsso17 LMSans17-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso17.pfb +qx-lmsso8 LMSans8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso8.pfb +qx-lmsso9 LMSans9-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmsso9.pfb +qx-lmssq8 LMSansQuotation8-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmssq8.pfb +qx-lmssqbo8 LMSansQuotation8-BoldOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssqbo8.pfb +qx-lmssqbx8 LMSansQuotation8-Bold "enclmqx ReEncodeFont" <lm-qx.enc <lmssqbx8.pfb +qx-lmssqo8 LMSansQuotation8-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmssqo8.pfb +qx-lmtcsc10 LMTypewriter10-CapsRegular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtcsc10.pfb +qx-lmtcso10 LMTypewriter10-CapsOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtcso10.pfb +qx-lmtl10 LMTypewriter10-Light "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtl10.pfb +qx-lmtlo10 LMTypewriter10-LightOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlo10.pfb +qx-lmtlc10 LMTypewriter10-LightCondensed "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlc10.pfb +qx-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtlco10.pfb +qx-lmtk10 LMTypewriter10-Dark "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtk10.pfb +qx-lmtko10 LMTypewriter10-DarkOblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtko10.pfb +qx-lmtt10 LMTypewriter10-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt10.pfb +qx-lmtt12 LMTypewriter12-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt12.pfb +qx-lmtt8 LMTypewriter8-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt8.pfb +qx-lmtt9 LMTypewriter9-Regular "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtt9.pfb +qx-lmtti10 LMTypewriter10-Italic "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtti10.pfb +qx-lmtto10 LMTypewriter10-Oblique "enclmqxtt ReEncodeFont" <lm-qxtt.enc <lmtto10.pfb +qx-lmvtt10 LMTypewriterVarWd10-Regular "enclmqx ReEncodeFont" <lm-qx.enc <lmvtt10.pfb +qx-lmvtto10 LMTypewriterVarWd10-Oblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtto10.pfb +qx-lmvtl10 LMTypewriterVarWd10-Light "enclmqx ReEncodeFont" <lm-qx.enc <lmvtl10.pfb +qx-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtlo10.pfb +qx-lmvtk10 LMTypewriterVarWd10-Dark "enclmqx ReEncodeFont" <lm-qx.enc <lmvtk10.pfb +qx-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmqx ReEncodeFont" <lm-qx.enc <lmvtko10.pfb diff --git a/fonts/map/pdftex/context/qx-var-exclusive-public-lm.map b/fonts/map/pdftex/context/qx-var-exclusive-public-lm.map deleted file mode 100644 index 19756645c..000000000 --- a/fonts/map/pdftex/context/qx-var-exclusive-public-lm.map +++ /dev/null @@ -1 +0,0 @@ -# not yet defined diff --git a/fonts/map/pdftex/context/t5-os-public-lm.map b/fonts/map/pdftex/context/t5-os-public-lm.map new file mode 100644 index 000000000..c9e3c4dcb --- /dev/null +++ b/fonts/map/pdftex/context/t5-os-public-lm.map @@ -0,0 +1,69 @@ +t5-lmb10 LMRoman10-Demi "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmb10.pfb +t5-lmbo10 LMRoman10-DemiOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbo10.pfb +t5-lmbx10 LMRoman10-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx10.pfb +t5-lmbx12 LMRoman12-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx12.pfb +t5-lmbx5 LMRoman5-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx5.pfb +t5-lmbx6 LMRoman6-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx6.pfb +t5-lmbx7 LMRoman7-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx7.pfb +t5-lmbx8 LMRoman8-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx8.pfb +t5-lmbx9 LMRoman9-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbx9.pfb +t5-lmbxi10 LMRoman10-BoldItalic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbxi10.pfb +t5-lmbxo10 LMRoman10-BoldOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmbxo10.pfb +t5-lmcsc10 LMRoman10-CapsRegular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmcsc10.pfb +t5-lmcsco10 LMRoman10-CapsOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmcsco10.pfb +t5-lmr10 LMRoman10-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr10.pfb +t5-lmr12 LMRoman12-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr12.pfb +t5-lmr17 LMRoman17-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr17.pfb +t5-lmr5 LMRoman5-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr5.pfb +t5-lmr6 LMRoman6-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr6.pfb +t5-lmr7 LMRoman7-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr7.pfb +t5-lmr8 LMRoman8-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr8.pfb +t5-lmr9 LMRoman9-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmr9.pfb +t5-lmri10 LMRoman10-Italic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmri10.pfb +t5-lmri12 LMRoman12-Italic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmri12.pfb +t5-lmri7 LMRoman7-Italic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmri7.pfb +t5-lmri8 LMRoman8-Italic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmri8.pfb +t5-lmri9 LMRoman9-Italic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmri9.pfb +t5-lmro10 LMRoman10-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmro10.pfb +t5-lmro12 LMRoman12-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmro12.pfb +t5-lmro17 LMRoman17-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmro17.pfb +t5-lmro8 LMRoman8-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmro8.pfb +t5-lmro9 LMRoman9-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmro9.pfb +t5-lmss10 LMSans10-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmss10.pfb +t5-lmss12 LMSans12-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmss12.pfb +t5-lmss17 LMSans17-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmss17.pfb +t5-lmss8 LMSans8-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmss8.pfb +t5-lmss9 LMSans9-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmss9.pfb +t5-lmssbo10 LMSans10-BoldOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssbo10.pfb +t5-lmssbx10 LMSans10-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssbx10.pfb +t5-lmssdc10 LMSans10-DemiCondensed "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssdc10.pfb +t5-lmssdo10 LMSans10-DemiCondensedOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssdo10.pfb +t5-lmsso10 LMSans10-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmsso10.pfb +t5-lmsso12 LMSans12-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmsso12.pfb +t5-lmsso17 LMSans17-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmsso17.pfb +t5-lmsso8 LMSans8-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmsso8.pfb +t5-lmsso9 LMSans9-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmsso9.pfb +t5-lmssq8 LMSansQuotation8-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssq8.pfb +t5-lmssqbo8 LMSansQuotation8-BoldOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssqbo8.pfb +t5-lmssqbx8 LMSansQuotation8-Bold "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssqbx8.pfb +t5-lmssqo8 LMSansQuotation8-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmssqo8.pfb +t5-lmtcsc10 LMTypewriter10-CapsRegular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtcsc10.pfb +t5-lmtcso10 LMTypewriter10-CapsOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtcso10.pfb +t5-lmtl10 LMTypewriter10-Light "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtl10.pfb +t5-lmtlo10 LMTypewriter10-LightOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtlo10.pfb +t5-lmtlc10 LMTypewriter10-LightCondensed "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtlc10.pfb +t5-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtlco10.pfb +t5-lmtk10 LMTypewriter10-Dark "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtk10.pfb +t5-lmtko10 LMTypewriter10-DarkOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtko10.pfb +t5-lmtt10 LMTypewriter10-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtt10.pfb +t5-lmtt12 LMTypewriter12-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtt12.pfb +t5-lmtt8 LMTypewriter8-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtt8.pfb +t5-lmtt9 LMTypewriter9-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtt9.pfb +t5-lmtti10 LMTypewriter10-Italic "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtti10.pfb +t5-lmtto10 LMTypewriter10-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmtto10.pfb +t5-lmvtt10 LMTypewriterVarWd10-Regular "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmvtt10.pfb +t5-lmvtto10 LMTypewriterVarWd10-Oblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmvtto10.pfb +t5-lmvtl10 LMTypewriterVarWd10-Light "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmvtl10.pfb +t5-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmvtlo10.pfb +t5-lmvtk10 LMTypewriterVarWd10-Dark "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmvtk10.pfb +t5-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmt5os ReEncodeFont" <lm-t5-os.enc <lmvtko10.pfb diff --git a/fonts/map/pdftex/context/t5-public-lm.map b/fonts/map/pdftex/context/t5-public-lm.map index 793b62238..0e626d7e4 100644 --- a/fonts/map/pdftex/context/t5-public-lm.map +++ b/fonts/map/pdftex/context/t5-public-lm.map @@ -1,63 +1,69 @@ -% LM Support for VN fonts, thanks to Jacko - -vnb10 LMRomanDemi10-Regular <t5-lm.enc <lmb10.pfb -vnbx5 LMRoman5-Bold <t5-lm.enc <lmbx5.pfb -vnbx6 LMRoman6-Bold <t5-lm.enc <lmbx6.pfb -vnbx7 LMRoman7-Bold <t5-lm.enc <lmbx7.pfb -vnbx8 LMRoman8-Bold <t5-lm.enc <lmbx8.pfb -vnbx9 LMRoman9-Bold <t5-lm.enc <lmbx9.pfb -vnbx10 LMRoman10-Bold <t5-lm.enc <lmbx10.pfb -vnbx12 LMRoman12-Bold <t5-lm.enc <lmbx12.pfb -vnbxsl10 LMSlanted10-BoldItalic <t5-lm.enc <lmbxo10.pfb -vnbxti10 LMRoman10-BoldItalic <t5-lm.enc <lmbxi10.pfb -vncsc10 LMCaps10-Regular <t5-lm.enc <lmcsc10.pfb -vnitt10 LMTypewriter10-Italic <t5-lm.enc <lmtti10.pfb -vnr5 LMRoman5-Regular <t5-lm.enc <lmr5.pfb -vnr6 LMRoman6-Regular <t5-lm.enc <lmr6.pfb -vnr7 LMRoman7-Regular <t5-lm.enc <lmr7.pfb -vnr8 LMRoman8-Regular <t5-lm.enc <lmr8.pfb -vnr9 LMRoman9-Regular <t5-lm.enc <lmr9.pfb -vnr10 LMRoman10-Regular <t5-lm.enc <lmr10.pfb -vnr12 LMRoman12-Regular <t5-lm.enc <lmr12.pfb -vnr17 LMRoman17-Regular <t5-lm.enc <lmr17.pfb -vnsl8 LMSlanted8-Italic <t5-lm.enc <lmro8.pfb -vnsl9 LMSlanted9-Italic <t5-lm.enc <lmro9.pfb -vnsl10 LMSlanted10-Italic <t5-lm.enc <lmro10.pfb -vnsl12 LMSlanted12-Italic <t5-lm.enc <lmro12.pfb -vnsltt10 LMTypewriterSlanted10-Italic <t5-lm.enc <lmtto10.pfb -vnss8 LMSans8-Regular <t5-lm.enc <lmss8.pfb -vnss9 LMSans9-Regular <t5-lm.enc <lmss9.pfb -vnss10 LMSans10-Regular <t5-lm.enc <lmss10.pfb -vnss12 LMSans12-Regular <t5-lm.enc <lmss12.pfb -vnss17 LMSans17-Regular <t5-lm.enc <lmss17.pfb -vnssbx10 LMSans10-Bold <t5-lm.enc <lmssbx10.pfb -vnssdc10 LMSansDemiCond10-Regular <t5-lm.enc <lmssdc10.pfb -vnssi8 LMSans8-Italic <t5-lm.enc <lmssi8.pfb -vnssi9 LMSans9-Italic <t5-lm.enc <lmssi9.pfb -vnssi10 LMSans10-Italic <t5-lm.enc <lmssi10.pfb -vnssi12 LMSans12-Italic <t5-lm.enc <lmssi12.pfb -vnssi17 LMSans17-Italic <t5-lm.enc <lmssi17.pfb -vnssq8 LMSansQuotation8-Regular <t5-lm.enc <lmssq8.pfb -vnssqi8 LMSansQuotation8-Italic <t5-lm.enc <lmssqo8.pfb -vntcsc10 LMTypewriterCaps10-Regular <t5-lm.enc <lmtcsc10.pfb -vnti7 LMRoman7-Italic <t5-lm.enc <lmri7.pfb -vnti8 LMRoman8-Italic <t5-lm.enc <lmri8.pfb -vnti9 LMRoman9-Italic <t5-lm.enc <lmri9.pfb -vnti10 LMRoman10-Italic <t5-lm.enc <lmri10.pfb -vnti12 LMRoman12-Italic <t5-lm.enc <lmri12.pfb -vntt8 LMTypewriter8-Regular <t5-lm.enc <lmtt8.pfb -vntt9 LMTypewriter9-Regular <t5-lm.enc <lmtt9.pfb -vntt10 LMTypewriter10-Regular <t5-lm.enc <lmtt10.pfb -vntt12 LMTypewriter12-Regular <t5-lm.enc <lmtt12.pfb -vnvtt10 LMTypewriterVarWd10-Regular <t5-lm.enc <lmvtt10.pfb - -% a weird one, not used in context - -vnu10 LMRoman10-Italic "-0.25 SlantFont" <t5-lm.enc <lmri10.pfb - -% unsupported - -% vndunh10 -% vnff10 -% vnfi10 -% vnfib8 +t5-lmb10 LMRoman10-Demi "enclmt5 ReEncodeFont" <lm-t5.enc <lmb10.pfb +t5-lmbo10 LMRoman10-DemiOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmbo10.pfb +t5-lmbx10 LMRoman10-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx10.pfb +t5-lmbx12 LMRoman12-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx12.pfb +t5-lmbx5 LMRoman5-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx5.pfb +t5-lmbx6 LMRoman6-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx6.pfb +t5-lmbx7 LMRoman7-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx7.pfb +t5-lmbx8 LMRoman8-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx8.pfb +t5-lmbx9 LMRoman9-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmbx9.pfb +t5-lmbxi10 LMRoman10-BoldItalic "enclmt5 ReEncodeFont" <lm-t5.enc <lmbxi10.pfb +t5-lmbxo10 LMRoman10-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmbxo10.pfb +t5-lmcsc10 LMRoman10-CapsRegular "enclmt5 ReEncodeFont" <lm-t5.enc <lmcsc10.pfb +t5-lmcsco10 LMRoman10-CapsOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmcsco10.pfb +t5-lmr10 LMRoman10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr10.pfb +t5-lmr12 LMRoman12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr12.pfb +t5-lmr17 LMRoman17-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr17.pfb +t5-lmr5 LMRoman5-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr5.pfb +t5-lmr6 LMRoman6-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr6.pfb +t5-lmr7 LMRoman7-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr7.pfb +t5-lmr8 LMRoman8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr8.pfb +t5-lmr9 LMRoman9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmr9.pfb +t5-lmri10 LMRoman10-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri10.pfb +t5-lmri12 LMRoman12-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri12.pfb +t5-lmri7 LMRoman7-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri7.pfb +t5-lmri8 LMRoman8-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri8.pfb +t5-lmri9 LMRoman9-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmri9.pfb +t5-lmro10 LMRoman10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro10.pfb +t5-lmro12 LMRoman12-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro12.pfb +t5-lmro17 LMRoman17-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro17.pfb +t5-lmro8 LMRoman8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro8.pfb +t5-lmro9 LMRoman9-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmro9.pfb +t5-lmss10 LMSans10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss10.pfb +t5-lmss12 LMSans12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss12.pfb +t5-lmss17 LMSans17-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss17.pfb +t5-lmss8 LMSans8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss8.pfb +t5-lmss9 LMSans9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmss9.pfb +t5-lmssbo10 LMSans10-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssbo10.pfb +t5-lmssbx10 LMSans10-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmssbx10.pfb +t5-lmssdc10 LMSans10-DemiCondensed "enclmt5 ReEncodeFont" <lm-t5.enc <lmssdc10.pfb +t5-lmssdo10 LMSans10-DemiCondensedOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssdo10.pfb +t5-lmsso10 LMSans10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso10.pfb +t5-lmsso12 LMSans12-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso12.pfb +t5-lmsso17 LMSans17-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso17.pfb +t5-lmsso8 LMSans8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso8.pfb +t5-lmsso9 LMSans9-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmsso9.pfb +t5-lmssq8 LMSansQuotation8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmssq8.pfb +t5-lmssqbo8 LMSansQuotation8-BoldOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqbo8.pfb +t5-lmssqbx8 LMSansQuotation8-Bold "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqbx8.pfb +t5-lmssqo8 LMSansQuotation8-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmssqo8.pfb +t5-lmtcsc10 LMTypewriter10-CapsRegular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtcsc10.pfb +t5-lmtcso10 LMTypewriter10-CapsOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtcso10.pfb +t5-lmtl10 LMTypewriter10-Light "enclmt5 ReEncodeFont" <lm-t5.enc <lmtl10.pfb +t5-lmtlo10 LMTypewriter10-LightOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlo10.pfb +t5-lmtlc10 LMTypewriter10-LightCondensed "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlc10.pfb +t5-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtlco10.pfb +t5-lmtk10 LMTypewriter10-Dark "enclmt5 ReEncodeFont" <lm-t5.enc <lmtk10.pfb +t5-lmtko10 LMTypewriter10-DarkOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtko10.pfb +t5-lmtt10 LMTypewriter10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt10.pfb +t5-lmtt12 LMTypewriter12-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt12.pfb +t5-lmtt8 LMTypewriter8-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt8.pfb +t5-lmtt9 LMTypewriter9-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmtt9.pfb +t5-lmtti10 LMTypewriter10-Italic "enclmt5 ReEncodeFont" <lm-t5.enc <lmtti10.pfb +t5-lmtto10 LMTypewriter10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmtto10.pfb +t5-lmvtt10 LMTypewriterVarWd10-Regular "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtt10.pfb +t5-lmvtto10 LMTypewriterVarWd10-Oblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtto10.pfb +t5-lmvtl10 LMTypewriterVarWd10-Light "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtl10.pfb +t5-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtlo10.pfb +t5-lmvtk10 LMTypewriterVarWd10-Dark "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtk10.pfb +t5-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmt5 ReEncodeFont" <lm-t5.enc <lmvtko10.pfb diff --git a/fonts/map/pdftex/context/t5-var-exclusive-public-lm.map b/fonts/map/pdftex/context/t5-var-exclusive-public-lm.map deleted file mode 100644 index 19756645c..000000000 --- a/fonts/map/pdftex/context/t5-var-exclusive-public-lm.map +++ /dev/null @@ -1 +0,0 @@ -# not yet defined diff --git a/fonts/map/pdftex/context/texnansi-os-public-lm.map b/fonts/map/pdftex/context/texnansi-os-public-lm.map index 9c4bb16de..85ba31a06 100644 --- a/fonts/map/pdftex/context/texnansi-os-public-lm.map +++ b/fonts/map/pdftex/context/texnansi-os-public-lm.map @@ -1,57 +1,69 @@ -texnansi-lmb10 LMRomanDemi10-Regular <texnansi-os-lm.enc <lmb10.pfb -texnansi-lmbo10 LMRomanDemi10-Italic <texnansi-os-lm.enc <lmbo10.pfb -texnansi-lmbx10 LMRoman10-Bold <texnansi-os-lm.enc <lmbx10.pfb -texnansi-lmbx12 LMRoman12-Bold <texnansi-os-lm.enc <lmbx12.pfb -texnansi-lmbx5 LMRoman5-Bold <texnansi-os-lm.enc <lmbx5.pfb -texnansi-lmbx6 LMRoman6-Bold <texnansi-os-lm.enc <lmbx6.pfb -texnansi-lmbx7 LMRoman7-Bold <texnansi-os-lm.enc <lmbx7.pfb -texnansi-lmbx8 LMRoman8-Bold <texnansi-os-lm.enc <lmbx8.pfb -texnansi-lmbx9 LMRoman9-Bold <texnansi-os-lm.enc <lmbx9.pfb -texnansi-lmbxi10 LMRoman10-BoldItalic <texnansi-os-lm.enc <lmbxi10.pfb -texnansi-lmbxo10 LMSlanted10-BoldItalic <texnansi-os-lm.enc <lmbxo10.pfb -texnansi-lmcsc10 LMCaps10-Regular <texnansi-os-lm.enc <lmcsc10.pfb -texnansi-lmcsco10 LMCaps10-Italic <texnansi-os-lm.enc <lmcsco10.pfb -texnansi-lmr10 LMRoman10-Regular <texnansi-os-lm.enc <lmr10.pfb -texnansi-lmr12 LMRoman12-Regular <texnansi-os-lm.enc <lmr12.pfb -texnansi-lmr17 LMRoman17-Regular <texnansi-os-lm.enc <lmr17.pfb -texnansi-lmr5 LMRoman5-Regular <texnansi-os-lm.enc <lmr5.pfb -texnansi-lmr6 LMRoman6-Regular <texnansi-os-lm.enc <lmr6.pfb -texnansi-lmr7 LMRoman7-Regular <texnansi-os-lm.enc <lmr7.pfb -texnansi-lmr8 LMRoman8-Regular <texnansi-os-lm.enc <lmr8.pfb -texnansi-lmr9 LMRoman9-Regular <texnansi-os-lm.enc <lmr9.pfb -texnansi-lmri10 LMRoman10-Italic <texnansi-os-lm.enc <lmri10.pfb -texnansi-lmri12 LMRoman12-Italic <texnansi-os-lm.enc <lmri12.pfb -texnansi-lmri7 LMRoman7-Italic <texnansi-os-lm.enc <lmri7.pfb -texnansi-lmri8 LMRoman8-Italic <texnansi-os-lm.enc <lmri8.pfb -texnansi-lmri9 LMRoman9-Italic <texnansi-os-lm.enc <lmri9.pfb -texnansi-lmro10 LMSlanted10-Italic <texnansi-os-lm.enc <lmro10.pfb -texnansi-lmro12 LMSlanted12-Italic <texnansi-os-lm.enc <lmro12.pfb -texnansi-lmro8 LMSlanted8-Italic <texnansi-os-lm.enc <lmro8.pfb -texnansi-lmro9 LMSlanted9-Italic <texnansi-os-lm.enc <lmro9.pfb -texnansi-lmss10 LMSans10-Regular <texnansi-os-lm.enc <lmss10.pfb -texnansi-lmss12 LMSans12-Regular <texnansi-os-lm.enc <lmss12.pfb -texnansi-lmss17 LMSans17-Regular <texnansi-os-lm.enc <lmss17.pfb -texnansi-lmss8 LMSans8-Regular <texnansi-os-lm.enc <lmss8.pfb -texnansi-lmss9 LMSans9-Regular <texnansi-os-lm.enc <lmss9.pfb -texnansi-lmssbo10 LMSans10-BoldItalic <texnansi-os-lm.enc <lmssbo10.pfb -texnansi-lmssbx10 LMSans10-Bold <texnansi-os-lm.enc <lmssbx10.pfb -texnansi-lmssdc10 LMSansDemiCond10-Regular <texnansi-os-lm.enc <lmssdc10.pfb -texnansi-lmssdo10 LMSansDemiCond10-Italic <texnansi-os-lm.enc <lmssdo10.pfb -texnansi-lmsso10 LMSans10-Italic <texnansi-os-lm.enc <lmsso10.pfb -texnansi-lmsso12 LMSans12-Italic <texnansi-os-lm.enc <lmsso12.pfb -texnansi-lmsso17 LMSans17-Italic <texnansi-os-lm.enc <lmsso17.pfb -texnansi-lmsso8 LMSans8-Italic <texnansi-os-lm.enc <lmsso8.pfb -texnansi-lmsso9 LMSans9-Italic <texnansi-os-lm.enc <lmsso9.pfb -texnansi-lmssq8 LMSansQuotation8-Regular <texnansi-os-lm.enc <lmssq8.pfb -texnansi-lmssqbo8 LMSansQuotation8-BoldItalic <texnansi-os-lm.enc <lmssqbo8.pfb -texnansi-lmssqbx8 LMSansQuotation8-Bold <texnansi-os-lm.enc <lmssqbx8.pfb -texnansi-lmssqo8 LMSansQuotation8-Italic <texnansi-os-lm.enc <lmssqo8.pfb -texnansi-lmtcsc10 LMTypewriterCaps10-Regular <texnansi-os-lm.enc <lmtcsc10.pfb -texnansi-lmtt10 LMTypewriter10-Regular <texnansi-os-lm.enc <lmtt10.pfb -texnansi-lmtt12 LMTypewriter12-Regular <texnansi-os-lm.enc <lmtt12.pfb -texnansi-lmtt8 LMTypewriter8-Regular <texnansi-os-lm.enc <lmtt8.pfb -texnansi-lmtt9 LMTypewriter9-Regular <texnansi-os-lm.enc <lmtt9.pfb -texnansi-lmtti10 LMTypewriter10-Italic <texnansi-os-lm.enc <lmtti10.pfb -texnansi-lmtto10 LMTypewriterSlanted10-Italic <texnansi-os-lm.enc <lmtto10.pfb -texnansi-lmvtt10 LMTypewriterVarWd10-Regular <texnansi-os-lm.enc <lmvtt10.pfb -texnansi-lmvtto10 LMTypewriterVarWd10-Italic <texnansi-os-lm.enc <lmvtto10.pfb +texnansi-lmb10 LMRoman10-Demi "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmb10.pfb +texnansi-lmbo10 LMRoman10-DemiOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbo10.pfb +texnansi-lmbx10 LMRoman10-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx10.pfb +texnansi-lmbx12 LMRoman12-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx12.pfb +texnansi-lmbx5 LMRoman5-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx5.pfb +texnansi-lmbx6 LMRoman6-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx6.pfb +texnansi-lmbx7 LMRoman7-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx7.pfb +texnansi-lmbx8 LMRoman8-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx8.pfb +texnansi-lmbx9 LMRoman9-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbx9.pfb +texnansi-lmbxi10 LMRoman10-BoldItalic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbxi10.pfb +texnansi-lmbxo10 LMRoman10-BoldOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmbxo10.pfb +texnansi-lmcsc10 LMRoman10-CapsRegular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmcsc10.pfb +texnansi-lmcsco10 LMRoman10-CapsOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmcsco10.pfb +texnansi-lmr10 LMRoman10-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr10.pfb +texnansi-lmr12 LMRoman12-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr12.pfb +texnansi-lmr17 LMRoman17-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr17.pfb +texnansi-lmr5 LMRoman5-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr5.pfb +texnansi-lmr6 LMRoman6-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr6.pfb +texnansi-lmr7 LMRoman7-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr7.pfb +texnansi-lmr8 LMRoman8-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr8.pfb +texnansi-lmr9 LMRoman9-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmr9.pfb +texnansi-lmri10 LMRoman10-Italic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmri10.pfb +texnansi-lmri12 LMRoman12-Italic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmri12.pfb +texnansi-lmri7 LMRoman7-Italic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmri7.pfb +texnansi-lmri8 LMRoman8-Italic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmri8.pfb +texnansi-lmri9 LMRoman9-Italic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmri9.pfb +texnansi-lmro10 LMRoman10-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmro10.pfb +texnansi-lmro12 LMRoman12-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmro12.pfb +texnansi-lmro17 LMRoman17-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmro17.pfb +texnansi-lmro8 LMRoman8-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmro8.pfb +texnansi-lmro9 LMRoman9-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmro9.pfb +texnansi-lmss10 LMSans10-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmss10.pfb +texnansi-lmss12 LMSans12-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmss12.pfb +texnansi-lmss17 LMSans17-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmss17.pfb +texnansi-lmss8 LMSans8-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmss8.pfb +texnansi-lmss9 LMSans9-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmss9.pfb +texnansi-lmssbo10 LMSans10-BoldOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssbo10.pfb +texnansi-lmssbx10 LMSans10-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssbx10.pfb +texnansi-lmssdc10 LMSans10-DemiCondensed "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssdc10.pfb +texnansi-lmssdo10 LMSans10-DemiCondensedOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssdo10.pfb +texnansi-lmsso10 LMSans10-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmsso10.pfb +texnansi-lmsso12 LMSans12-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmsso12.pfb +texnansi-lmsso17 LMSans17-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmsso17.pfb +texnansi-lmsso8 LMSans8-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmsso8.pfb +texnansi-lmsso9 LMSans9-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmsso9.pfb +texnansi-lmssq8 LMSansQuotation8-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssq8.pfb +texnansi-lmssqbo8 LMSansQuotation8-BoldOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssqbo8.pfb +texnansi-lmssqbx8 LMSansQuotation8-Bold "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssqbx8.pfb +texnansi-lmssqo8 LMSansQuotation8-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmssqo8.pfb +texnansi-lmtcsc10 LMTypewriter10-CapsRegular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtcsc10.pfb +texnansi-lmtcso10 LMTypewriter10-CapsOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtcso10.pfb +texnansi-lmtl10 LMTypewriter10-Light "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtl10.pfb +texnansi-lmtlo10 LMTypewriter10-LightOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtlo10.pfb +texnansi-lmtlc10 LMTypewriter10-LightCondensed "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtlc10.pfb +texnansi-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtlco10.pfb +texnansi-lmtk10 LMTypewriter10-Dark "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtk10.pfb +texnansi-lmtko10 LMTypewriter10-DarkOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtko10.pfb +texnansi-lmtt10 LMTypewriter10-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtt10.pfb +texnansi-lmtt12 LMTypewriter12-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtt12.pfb +texnansi-lmtt8 LMTypewriter8-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtt8.pfb +texnansi-lmtt9 LMTypewriter9-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtt9.pfb +texnansi-lmtti10 LMTypewriter10-Italic "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtti10.pfb +texnansi-lmtto10 LMTypewriter10-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmtto10.pfb +texnansi-lmvtt10 LMTypewriterVarWd10-Regular "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmvtt10.pfb +texnansi-lmvtto10 LMTypewriterVarWd10-Oblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmvtto10.pfb +texnansi-lmvtl10 LMTypewriterVarWd10-Light "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmvtl10.pfb +texnansi-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmvtlo10.pfb +texnansi-lmvtk10 LMTypewriterVarWd10-Dark "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmvtk10.pfb +texnansi-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmtexnansios ReEncodeFont" <lm-texnansi-os.enc <lmvtko10.pfb diff --git a/fonts/map/pdftex/context/texnansi-public-lm.map b/fonts/map/pdftex/context/texnansi-public-lm.map index 99aee57b8..af8106115 100644 --- a/fonts/map/pdftex/context/texnansi-public-lm.map +++ b/fonts/map/pdftex/context/texnansi-public-lm.map @@ -1,57 +1,69 @@ -texnansi-lmb10 LMRomanDemi10-Regular <texnansi-lm.enc <lmb10.pfb -texnansi-lmbo10 LMRomanDemi10-Italic <texnansi-lm.enc <lmbo10.pfb -texnansi-lmbx10 LMRoman10-Bold <texnansi-lm.enc <lmbx10.pfb -texnansi-lmbx12 LMRoman12-Bold <texnansi-lm.enc <lmbx12.pfb -texnansi-lmbx5 LMRoman5-Bold <texnansi-lm.enc <lmbx5.pfb -texnansi-lmbx6 LMRoman6-Bold <texnansi-lm.enc <lmbx6.pfb -texnansi-lmbx7 LMRoman7-Bold <texnansi-lm.enc <lmbx7.pfb -texnansi-lmbx8 LMRoman8-Bold <texnansi-lm.enc <lmbx8.pfb -texnansi-lmbx9 LMRoman9-Bold <texnansi-lm.enc <lmbx9.pfb -texnansi-lmbxi10 LMRoman10-BoldItalic <texnansi-lm.enc <lmbxi10.pfb -texnansi-lmbxo10 LMSlanted10-BoldItalic <texnansi-lm.enc <lmbxo10.pfb -texnansi-lmcsc10 LMCaps10-Regular <texnansi-lm.enc <lmcsc10.pfb -texnansi-lmcsco10 LMCaps10-Italic <texnansi-lm.enc <lmcsco10.pfb -texnansi-lmr10 LMRoman10-Regular <texnansi-lm.enc <lmr10.pfb -texnansi-lmr12 LMRoman12-Regular <texnansi-lm.enc <lmr12.pfb -texnansi-lmr17 LMRoman17-Regular <texnansi-lm.enc <lmr17.pfb -texnansi-lmr5 LMRoman5-Regular <texnansi-lm.enc <lmr5.pfb -texnansi-lmr6 LMRoman6-Regular <texnansi-lm.enc <lmr6.pfb -texnansi-lmr7 LMRoman7-Regular <texnansi-lm.enc <lmr7.pfb -texnansi-lmr8 LMRoman8-Regular <texnansi-lm.enc <lmr8.pfb -texnansi-lmr9 LMRoman9-Regular <texnansi-lm.enc <lmr9.pfb -texnansi-lmri10 LMRoman10-Italic <texnansi-lm.enc <lmri10.pfb -texnansi-lmri12 LMRoman12-Italic <texnansi-lm.enc <lmri12.pfb -texnansi-lmri7 LMRoman7-Italic <texnansi-lm.enc <lmri7.pfb -texnansi-lmri8 LMRoman8-Italic <texnansi-lm.enc <lmri8.pfb -texnansi-lmri9 LMRoman9-Italic <texnansi-lm.enc <lmri9.pfb -texnansi-lmro10 LMSlanted10-Italic <texnansi-lm.enc <lmro10.pfb -texnansi-lmro12 LMSlanted12-Italic <texnansi-lm.enc <lmro12.pfb -texnansi-lmro8 LMSlanted8-Italic <texnansi-lm.enc <lmro8.pfb -texnansi-lmro9 LMSlanted9-Italic <texnansi-lm.enc <lmro9.pfb -texnansi-lmss10 LMSans10-Regular <texnansi-lm.enc <lmss10.pfb -texnansi-lmss12 LMSans12-Regular <texnansi-lm.enc <lmss12.pfb -texnansi-lmss17 LMSans17-Regular <texnansi-lm.enc <lmss17.pfb -texnansi-lmss8 LMSans8-Regular <texnansi-lm.enc <lmss8.pfb -texnansi-lmss9 LMSans9-Regular <texnansi-lm.enc <lmss9.pfb -texnansi-lmssbo10 LMSans10-BoldItalic <texnansi-lm.enc <lmssbo10.pfb -texnansi-lmssbx10 LMSans10-Bold <texnansi-lm.enc <lmssbx10.pfb -texnansi-lmssdc10 LMSansDemiCond10-Regular <texnansi-lm.enc <lmssdc10.pfb -texnansi-lmssdo10 LMSansDemiCond10-Italic <texnansi-lm.enc <lmssdo10.pfb -texnansi-lmsso10 LMSans10-Italic <texnansi-lm.enc <lmsso10.pfb -texnansi-lmsso12 LMSans12-Italic <texnansi-lm.enc <lmsso12.pfb -texnansi-lmsso17 LMSans17-Italic <texnansi-lm.enc <lmsso17.pfb -texnansi-lmsso8 LMSans8-Italic <texnansi-lm.enc <lmsso8.pfb -texnansi-lmsso9 LMSans9-Italic <texnansi-lm.enc <lmsso9.pfb -texnansi-lmssq8 LMSansQuotation8-Regular <texnansi-lm.enc <lmssq8.pfb -texnansi-lmssqbo8 LMSansQuotation8-BoldItalic <texnansi-lm.enc <lmssqbo8.pfb -texnansi-lmssqbx8 LMSansQuotation8-Bold <texnansi-lm.enc <lmssqbx8.pfb -texnansi-lmssqo8 LMSansQuotation8-Italic <texnansi-lm.enc <lmssqo8.pfb -texnansi-lmtcsc10 LMTypewriterCaps10-Regular <texnansi-lm.enc <lmtcsc10.pfb -texnansi-lmtt10 LMTypewriter10-Regular <texnansi-lm.enc <lmtt10.pfb -texnansi-lmtt12 LMTypewriter12-Regular <texnansi-lm.enc <lmtt12.pfb -texnansi-lmtt8 LMTypewriter8-Regular <texnansi-lm.enc <lmtt8.pfb -texnansi-lmtt9 LMTypewriter9-Regular <texnansi-lm.enc <lmtt9.pfb -texnansi-lmtti10 LMTypewriter10-Italic <texnansi-lm.enc <lmtti10.pfb -texnansi-lmtto10 LMTypewriterSlanted10-Italic <texnansi-lm.enc <lmtto10.pfb -texnansi-lmvtt10 LMTypewriterVarWd10-Regular <texnansi-lm.enc <lmvtt10.pfb -texnansi-lmvtto10 LMTypewriterVarWd10-Italic <texnansi-lm.enc <lmvtto10.pfb +texnansi-lmb10 LMRoman10-Demi "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmb10.pfb +texnansi-lmbo10 LMRoman10-DemiOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbo10.pfb +texnansi-lmbx10 LMRoman10-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx10.pfb +texnansi-lmbx12 LMRoman12-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx12.pfb +texnansi-lmbx5 LMRoman5-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx5.pfb +texnansi-lmbx6 LMRoman6-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx6.pfb +texnansi-lmbx7 LMRoman7-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx7.pfb +texnansi-lmbx8 LMRoman8-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx8.pfb +texnansi-lmbx9 LMRoman9-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbx9.pfb +texnansi-lmbxi10 LMRoman10-BoldItalic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbxi10.pfb +texnansi-lmbxo10 LMRoman10-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmbxo10.pfb +texnansi-lmcsc10 LMRoman10-CapsRegular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmcsc10.pfb +texnansi-lmcsco10 LMRoman10-CapsOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmcsco10.pfb +texnansi-lmr10 LMRoman10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr10.pfb +texnansi-lmr12 LMRoman12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr12.pfb +texnansi-lmr17 LMRoman17-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr17.pfb +texnansi-lmr5 LMRoman5-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr5.pfb +texnansi-lmr6 LMRoman6-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr6.pfb +texnansi-lmr7 LMRoman7-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr7.pfb +texnansi-lmr8 LMRoman8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr8.pfb +texnansi-lmr9 LMRoman9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmr9.pfb +texnansi-lmri10 LMRoman10-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri10.pfb +texnansi-lmri12 LMRoman12-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri12.pfb +texnansi-lmri7 LMRoman7-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri7.pfb +texnansi-lmri8 LMRoman8-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri8.pfb +texnansi-lmri9 LMRoman9-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmri9.pfb +texnansi-lmro10 LMRoman10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro10.pfb +texnansi-lmro12 LMRoman12-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro12.pfb +texnansi-lmro17 LMRoman17-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro17.pfb +texnansi-lmro8 LMRoman8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro8.pfb +texnansi-lmro9 LMRoman9-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmro9.pfb +texnansi-lmss10 LMSans10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss10.pfb +texnansi-lmss12 LMSans12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss12.pfb +texnansi-lmss17 LMSans17-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss17.pfb +texnansi-lmss8 LMSans8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss8.pfb +texnansi-lmss9 LMSans9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmss9.pfb +texnansi-lmssbo10 LMSans10-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssbo10.pfb +texnansi-lmssbx10 LMSans10-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssbx10.pfb +texnansi-lmssdc10 LMSans10-DemiCondensed "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssdc10.pfb +texnansi-lmssdo10 LMSans10-DemiCondensedOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssdo10.pfb +texnansi-lmsso10 LMSans10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso10.pfb +texnansi-lmsso12 LMSans12-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso12.pfb +texnansi-lmsso17 LMSans17-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso17.pfb +texnansi-lmsso8 LMSans8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso8.pfb +texnansi-lmsso9 LMSans9-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmsso9.pfb +texnansi-lmssq8 LMSansQuotation8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssq8.pfb +texnansi-lmssqbo8 LMSansQuotation8-BoldOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqbo8.pfb +texnansi-lmssqbx8 LMSansQuotation8-Bold "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqbx8.pfb +texnansi-lmssqo8 LMSansQuotation8-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmssqo8.pfb +texnansi-lmtcsc10 LMTypewriter10-CapsRegular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtcsc10.pfb +texnansi-lmtcso10 LMTypewriter10-CapsOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtcso10.pfb +texnansi-lmtl10 LMTypewriter10-Light "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtl10.pfb +texnansi-lmtlo10 LMTypewriter10-LightOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlo10.pfb +texnansi-lmtlc10 LMTypewriter10-LightCondensed "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlc10.pfb +texnansi-lmtlco10 LMTypewriter10-LightCondensedOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtlco10.pfb +texnansi-lmtk10 LMTypewriter10-Dark "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtk10.pfb +texnansi-lmtko10 LMTypewriter10-DarkOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtko10.pfb +texnansi-lmtt10 LMTypewriter10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt10.pfb +texnansi-lmtt12 LMTypewriter12-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt12.pfb +texnansi-lmtt8 LMTypewriter8-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt8.pfb +texnansi-lmtt9 LMTypewriter9-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtt9.pfb +texnansi-lmtti10 LMTypewriter10-Italic "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtti10.pfb +texnansi-lmtto10 LMTypewriter10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmtto10.pfb +texnansi-lmvtt10 LMTypewriterVarWd10-Regular "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtt10.pfb +texnansi-lmvtto10 LMTypewriterVarWd10-Oblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtto10.pfb +texnansi-lmvtl10 LMTypewriterVarWd10-Light "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtl10.pfb +texnansi-lmvtlo10 LMTypewriterVarWd10-LightOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtlo10.pfb +texnansi-lmvtk10 LMTypewriterVarWd10-Dark "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtk10.pfb +texnansi-lmvtko10 LMTypewriterVarWd10-DarkOblique "enclmtexnansi ReEncodeFont" <lm-texnansi.enc <lmvtko10.pfb diff --git a/fonts/map/pdftex/context/texnansi-var-exclusive-public-lm.map b/fonts/map/pdftex/context/texnansi-var-exclusive-public-lm.map deleted file mode 100644 index 9e0ee5ea3..000000000 --- a/fonts/map/pdftex/context/texnansi-var-exclusive-public-lm.map +++ /dev/null @@ -1,62 +0,0 @@ -% author: Hans Hagen -% -% This map file remaps texnansi encoded Latin Modern adapted for -% umlauts and other variations. - -texnansi-lmb10 LMRomanDemi10-Regular <texnansi-var-lm.enc <lmb10.pfb -texnansi-lmbo10 LMRomanDemi10-Italic <texnansi-var-lm.enc <lmbo10.pfb -texnansi-lmbx10 LMRoman10-Bold <texnansi-var-lm.enc <lmbx10.pfb -texnansi-lmbx12 LMRoman12-Bold <texnansi-var-lm.enc <lmbx12.pfb -texnansi-lmbx5 LMRoman5-Bold <texnansi-var-lm.enc <lmbx5.pfb -texnansi-lmbx6 LMRoman6-Bold <texnansi-var-lm.enc <lmbx6.pfb -texnansi-lmbx7 LMRoman7-Bold <texnansi-var-lm.enc <lmbx7.pfb -texnansi-lmbx8 LMRoman8-Bold <texnansi-var-lm.enc <lmbx8.pfb -texnansi-lmbx9 LMRoman9-Bold <texnansi-var-lm.enc <lmbx9.pfb -texnansi-lmbxi10 LMRoman10-BoldItalic <texnansi-var-lm.enc <lmbxi10.pfb -texnansi-lmbxo10 LMSlanted10-BoldItalic <texnansi-var-lm.enc <lmbxo10.pfb -texnansi-lmcsc10 LMCaps10-Regular <texnansi-var-lm.enc <lmcsc10.pfb -texnansi-lmcsco10 LMCaps10-Italic <texnansi-var-lm.enc <lmcsco10.pfb -texnansi-lmr10 LMRoman10-Regular <texnansi-var-lm.enc <lmr10.pfb -texnansi-lmr12 LMRoman12-Regular <texnansi-var-lm.enc <lmr12.pfb -texnansi-lmr17 LMRoman17-Regular <texnansi-var-lm.enc <lmr17.pfb -texnansi-lmr5 LMRoman5-Regular <texnansi-var-lm.enc <lmr5.pfb -texnansi-lmr6 LMRoman6-Regular <texnansi-var-lm.enc <lmr6.pfb -texnansi-lmr7 LMRoman7-Regular <texnansi-var-lm.enc <lmr7.pfb -texnansi-lmr8 LMRoman8-Regular <texnansi-var-lm.enc <lmr8.pfb -texnansi-lmr9 LMRoman9-Regular <texnansi-var-lm.enc <lmr9.pfb -texnansi-lmri10 LMRoman10-Italic <texnansi-var-lm.enc <lmri10.pfb -texnansi-lmri12 LMRoman12-Italic <texnansi-var-lm.enc <lmri12.pfb -texnansi-lmri7 LMRoman7-Italic <texnansi-var-lm.enc <lmri7.pfb -texnansi-lmri8 LMRoman8-Italic <texnansi-var-lm.enc <lmri8.pfb -texnansi-lmri9 LMRoman9-Italic <texnansi-var-lm.enc <lmri9.pfb -texnansi-lmro10 LMSlanted10-Italic <texnansi-var-lm.enc <lmro10.pfb -texnansi-lmro12 LMSlanted12-Italic <texnansi-var-lm.enc <lmro12.pfb -texnansi-lmro8 LMSlanted8-Italic <texnansi-var-lm.enc <lmro8.pfb -texnansi-lmro9 LMSlanted9-Italic <texnansi-var-lm.enc <lmro9.pfb -texnansi-lmss10 LMSans10-Regular <texnansi-var-lm.enc <lmss10.pfb -texnansi-lmss12 LMSans12-Regular <texnansi-var-lm.enc <lmss12.pfb -texnansi-lmss17 LMSans17-Regular <texnansi-var-lm.enc <lmss17.pfb -texnansi-lmss8 LMSans8-Regular <texnansi-var-lm.enc <lmss8.pfb -texnansi-lmss9 LMSans9-Regular <texnansi-var-lm.enc <lmss9.pfb -texnansi-lmssbo10 LMSans10-BoldItalic <texnansi-var-lm.enc <lmssbo10.pfb -texnansi-lmssbx10 LMSans10-Bold <texnansi-var-lm.enc <lmssbx10.pfb -texnansi-lmssdc10 LMSansDemiCond10-Regular <texnansi-var-lm.enc <lmssdc10.pfb -texnansi-lmssdo10 LMSansDemiCond10-Italic <texnansi-var-lm.enc <lmssdo10.pfb -texnansi-lmsso10 LMSans10-Italic <texnansi-var-lm.enc <lmsso10.pfb -texnansi-lmsso12 LMSans12-Italic <texnansi-var-lm.enc <lmsso12.pfb -texnansi-lmsso17 LMSans17-Italic <texnansi-var-lm.enc <lmsso17.pfb -texnansi-lmsso8 LMSans8-Italic <texnansi-var-lm.enc <lmsso8.pfb -texnansi-lmsso9 LMSans9-Italic <texnansi-var-lm.enc <lmsso9.pfb -texnansi-lmssq8 LMSansQuotation8-Regular <texnansi-var-lm.enc <lmssq8.pfb -texnansi-lmssqbo8 LMSansQuotation8-BoldItalic <texnansi-var-lm.enc <lmssqbo8.pfb -texnansi-lmssqbx8 LMSansQuotation8-Bold <texnansi-var-lm.enc <lmssqbx8.pfb -texnansi-lmssqo8 LMSansQuotation8-Italic <texnansi-var-lm.enc <lmssqo8.pfb -texnansi-lmtcsc10 LMTypewriterCaps10-Regular <texnansi-var-lm.enc <lmtcsc10.pfb -texnansi-lmtt10 LMTypewriter10-Regular <texnansi-var-lm.enc <lmtt10.pfb -texnansi-lmtt12 LMTypewriter12-Regular <texnansi-var-lm.enc <lmtt12.pfb -texnansi-lmtt8 LMTypewriter8-Regular <texnansi-var-lm.enc <lmtt8.pfb -texnansi-lmtt9 LMTypewriter9-Regular <texnansi-var-lm.enc <lmtt9.pfb -texnansi-lmtti10 LMTypewriter10-Italic <texnansi-var-lm.enc <lmtti10.pfb -texnansi-lmtto10 LMTypewriterSlanted10-Italic <texnansi-var-lm.enc <lmtto10.pfb -texnansi-lmvtt10 LMTypewriterVarWd10-Regular <texnansi-var-lm.enc <lmvtt10.pfb -texnansi-lmvtto10 LMTypewriterVarWd10-Italic <texnansi-var-lm.enc <lmvtto10.pfb
\ No newline at end of file diff --git a/fonts/map/pdftex/context/texnansi-var-public-lm.map b/fonts/map/pdftex/context/texnansi-var-public-lm.map deleted file mode 100644 index f8a669e89..000000000 --- a/fonts/map/pdftex/context/texnansi-var-public-lm.map +++ /dev/null @@ -1,62 +0,0 @@ -% author: Hans Hagen -% -% This map file defines texnansi encoded Latin Modern adapted for -% umlauts and other variations. - -texnansi-var-lmb10 LMRomanDemi10-Regular <texnansi-var-lm.enc <lmb10.pfb -texnansi-var-lmbo10 LMRomanDemi10-Italic <texnansi-var-lm.enc <lmbo10.pfb -texnansi-var-lmbx10 LMRoman10-Bold <texnansi-var-lm.enc <lmbx10.pfb -texnansi-var-lmbx12 LMRoman12-Bold <texnansi-var-lm.enc <lmbx12.pfb -texnansi-var-lmbx5 LMRoman5-Bold <texnansi-var-lm.enc <lmbx5.pfb -texnansi-var-lmbx6 LMRoman6-Bold <texnansi-var-lm.enc <lmbx6.pfb -texnansi-var-lmbx7 LMRoman7-Bold <texnansi-var-lm.enc <lmbx7.pfb -texnansi-var-lmbx8 LMRoman8-Bold <texnansi-var-lm.enc <lmbx8.pfb -texnansi-var-lmbx9 LMRoman9-Bold <texnansi-var-lm.enc <lmbx9.pfb -texnansi-var-lmbxi10 LMRoman10-BoldItalic <texnansi-var-lm.enc <lmbxi10.pfb -texnansi-var-lmbxo10 LMSlanted10-BoldItalic <texnansi-var-lm.enc <lmbxo10.pfb -texnansi-var-lmcsc10 LMCaps10-Regular <texnansi-var-lm.enc <lmcsc10.pfb -texnansi-var-lmcsco10 LMCaps10-Italic <texnansi-var-lm.enc <lmcsco10.pfb -texnansi-var-lmr10 LMRoman10-Regular <texnansi-var-lm.enc <lmr10.pfb -texnansi-var-lmr12 LMRoman12-Regular <texnansi-var-lm.enc <lmr12.pfb -texnansi-var-lmr17 LMRoman17-Regular <texnansi-var-lm.enc <lmr17.pfb -texnansi-var-lmr5 LMRoman5-Regular <texnansi-var-lm.enc <lmr5.pfb -texnansi-var-lmr6 LMRoman6-Regular <texnansi-var-lm.enc <lmr6.pfb -texnansi-var-lmr7 LMRoman7-Regular <texnansi-var-lm.enc <lmr7.pfb -texnansi-var-lmr8 LMRoman8-Regular <texnansi-var-lm.enc <lmr8.pfb -texnansi-var-lmr9 LMRoman9-Regular <texnansi-var-lm.enc <lmr9.pfb -texnansi-var-lmri10 LMRoman10-Italic <texnansi-var-lm.enc <lmri10.pfb -texnansi-var-lmri12 LMRoman12-Italic <texnansi-var-lm.enc <lmri12.pfb -texnansi-var-lmri7 LMRoman7-Italic <texnansi-var-lm.enc <lmri7.pfb -texnansi-var-lmri8 LMRoman8-Italic <texnansi-var-lm.enc <lmri8.pfb -texnansi-var-lmri9 LMRoman9-Italic <texnansi-var-lm.enc <lmri9.pfb -texnansi-var-lmro10 LMSlanted10-Italic <texnansi-var-lm.enc <lmro10.pfb -texnansi-var-lmro12 LMSlanted12-Italic <texnansi-var-lm.enc <lmro12.pfb -texnansi-var-lmro8 LMSlanted8-Italic <texnansi-var-lm.enc <lmro8.pfb -texnansi-var-lmro9 LMSlanted9-Italic <texnansi-var-lm.enc <lmro9.pfb -texnansi-var-lmss10 LMSans10-Regular <texnansi-var-lm.enc <lmss10.pfb -texnansi-var-lmss12 LMSans12-Regular <texnansi-var-lm.enc <lmss12.pfb -texnansi-var-lmss17 LMSans17-Regular <texnansi-var-lm.enc <lmss17.pfb -texnansi-var-lmss8 LMSans8-Regular <texnansi-var-lm.enc <lmss8.pfb -texnansi-var-lmss9 LMSans9-Regular <texnansi-var-lm.enc <lmss9.pfb -texnansi-var-lmssbo10 LMSans10-BoldItalic <texnansi-var-lm.enc <lmssbo10.pfb -texnansi-var-lmssbx10 LMSans10-Bold <texnansi-var-lm.enc <lmssbx10.pfb -texnansi-var-lmssdc10 LMSansDemiCond10-Regular <texnansi-var-lm.enc <lmssdc10.pfb -texnansi-var-lmssdo10 LMSansDemiCond10-Italic <texnansi-var-lm.enc <lmssdo10.pfb -texnansi-var-lmsso10 LMSans10-Italic <texnansi-var-lm.enc <lmsso10.pfb -texnansi-var-lmsso12 LMSans12-Italic <texnansi-var-lm.enc <lmsso12.pfb -texnansi-var-lmsso17 LMSans17-Italic <texnansi-var-lm.enc <lmsso17.pfb -texnansi-var-lmsso8 LMSans8-Italic <texnansi-var-lm.enc <lmsso8.pfb -texnansi-var-lmsso9 LMSans9-Italic <texnansi-var-lm.enc <lmsso9.pfb -texnansi-var-lmssq8 LMSansQuotation8-Regular <texnansi-var-lm.enc <lmssq8.pfb -texnansi-var-lmssqbo8 LMSansQuotation8-BoldItalic <texnansi-var-lm.enc <lmssqbo8.pfb -texnansi-var-lmssqbx8 LMSansQuotation8-Bold <texnansi-var-lm.enc <lmssqbx8.pfb -texnansi-var-lmssqo8 LMSansQuotation8-Italic <texnansi-var-lm.enc <lmssqo8.pfb -texnansi-var-lmtcsc10 LMTypewriterCaps10-Regular <texnansi-var-lm.enc <lmtcsc10.pfb -texnansi-var-lmtt10 LMTypewriter10-Regular <texnansi-var-lm.enc <lmtt10.pfb -texnansi-var-lmtt12 LMTypewriter12-Regular <texnansi-var-lm.enc <lmtt12.pfb -texnansi-var-lmtt8 LMTypewriter8-Regular <texnansi-var-lm.enc <lmtt8.pfb -texnansi-var-lmtt9 LMTypewriter9-Regular <texnansi-var-lm.enc <lmtt9.pfb -texnansi-var-lmtti10 LMTypewriter10-Italic <texnansi-var-lm.enc <lmtti10.pfb -texnansi-var-lmtto10 LMTypewriterSlanted10-Italic <texnansi-var-lm.enc <lmtto10.pfb -texnansi-var-lmvtt10 LMTypewriterVarWd10-Regular <texnansi-var-lm.enc <lmvtt10.pfb -texnansi-var-lmvtto10 LMTypewriterVarWd10-Italic <texnansi-var-lm.enc <lmvtto10.pfb
\ No newline at end of file diff --git a/scripts/context/perl/makempy.pl b/scripts/context/perl/makempy.pl index 5b52ee0bb..49fd9bbd2 100644 --- a/scripts/context/perl/makempy.pl +++ b/scripts/context/perl/makempy.pl @@ -46,7 +46,7 @@ my $format = "plain" ; # can be "context" for plain users too "force" => \$force , "pdftops" => \$pmethod , "xpdf" => \$pmethod , - "acrobat" => \$amethod , +# "acrobat" => \$amethod , # nowadays the reader is not that clear about this being permitted "reader" => \$amethod , "gs" => \$gmethod , "ghostscript" => \$gmethod , diff --git a/scripts/context/perl/mptopdf.pl b/scripts/context/perl/mptopdf.pl index 5b00d4679..7a4ac2f30 100644 --- a/scripts/context/perl/mptopdf.pl +++ b/scripts/context/perl/mptopdf.pl @@ -72,9 +72,9 @@ elsif ($pattern =~ /\.mp$/io) { if ($Latex) { $rest .= " $mplatexswitch" } if ($MetaFun) { - $mpbin = 'mpost --mem=mpost' ; + $mpbin = 'mpost --progname=mpost --mem=metafun' ; } else { - $mpbin = 'mpost --mem=metafun' ; + $mpbin = 'mpost --mem=mpost' ; } } else @@ -99,7 +99,7 @@ foreach my $file (@files) { $_ = $file ; if (s/\.(\d+|mps)$// && -e $file) { if ($miktex) - { $command = "pdfetex -fmt=mptopdf" } + { $command = "pdfetex -undump=mptopdf" } else { $command = "pdfetex -progname=context -fmt=mptopdf" } if ($dosish) diff --git a/scripts/context/perl/texexec.pl b/scripts/context/perl/texexec.pl index d8e26da35..2f3b89e04 100644 --- a/scripts/context/perl/texexec.pl +++ b/scripts/context/perl/texexec.pl @@ -255,7 +255,7 @@ my $MakeMpy = ''; "once" => \$RunOnce, "output=s" => \$OutputFormat, "pages=s" => \$Pages, - "paper=s" => \$PaperFormat, + "paperformat=s" => \$PaperFormat, "passon=s" => \$PassOn, "path=s" => \$InpPath, "autopath" => \$AutoPath, @@ -1207,9 +1207,11 @@ sub MakeOptionFile { $_ = $PaperFormat; #unless (($PdfArrange)||($PdfSelect)||($PdfCombine)||($PdfCopy)) unless ( ($PdfSelect) || ($PdfCombine) || ($PdfCopy) || ($PdfTrim) ) { - if (/.4.3/goi) { print OPT "\\setuppapersize[A4][A3]\n" } - elsif (/.5.4/goi) { print OPT "\\setuppapersize[A5][A4]\n" } - elsif ( !/standard/ ) { + if (/.4.3/goi) { + print OPT "\\setuppapersize[A4][A3]\n" ; + } elsif (/.5.4/goi) { + print OPT "\\setuppapersize[A5][A4]\n" ; + } elsif ( !/standard/ ) { s/x/\*/io; if (/\w+\d+/) { $_ = uc $_ } my ( $from, $to ) = split(/\*/); @@ -1761,9 +1763,7 @@ sub RunConTeXtFile { # scan xml preamble open(XML,"<$JobName.$JobSuffix") ; while (<XML>) { - if (/\<[a-z]+/io) { - last ; - } elsif (/\<\?context\-directive\s+(\S+)\s+(\S+)\s+(\S+)\s*(.*?)\s*\?\>/o) { + if (/\<\?context\-directive\s+(\S+)\s+(\S+)\s+(\S+)\s*(.*?)\s*\?\>/o) { my ($class, $key, $value, $rest) = ($1, $2, $3, $4) ; if ($class eq 'job') { if (($key eq 'mode') || ($key eq 'modes')) { @@ -1778,6 +1778,8 @@ sub RunConTeXtFile { if ($rest == 'purge') { $Purge = 1 } } } + } elsif (/\<[a-z]+/io) { + last ; } } close(XML) ; @@ -2199,18 +2201,23 @@ sub RunSelect { else { print " textwidth : $TextWidth\n" } open( SEL, ">$SelectFile.tex" ); print SEL "% format=english\n"; - - if ( $PaperFormat ne 'standard' ) { + print SEL "\\definepapersize\n"; + print SEL " [offset=$PaperOffset]\n"; + if ($PaperFormat =~ /fit/) { + print SEL "\\getfiguredimensions[$FileName]\n" ; + print SEL "\\expanded{\\definepapersize[fit][width=\\figurewidth,height=\\figureheight]}\n" ; + print SEL "\\setuppapersize[fit][fit]\n"; + $PaperFormat = '' ; # avoid overloading in option file + } elsif ( $PaperFormat ne 'standard' ) { $_ = $PaperFormat; # NO UPPERCASE ! s/x/\*/io; my ( $from, $to ) = split(/\*/); if ( $to eq "" ) { $to = $from } print " papersize : $PaperFormat\n"; print SEL "\\setuppapersize[$from][$to]\n"; + $PaperFormat = '' ; # avoid overloading in option file } # - print SEL "\\definepapersize\n"; - print SEL " [offset=$PaperOffset]\n"; print SEL "\\setuplayout\n"; print SEL " [backspace=$BackSpace,\n"; print SEL " topspace=$TopSpace,\n"; diff --git a/scripts/context/perl/texfont.pl b/scripts/context/perl/texfont.pl index 6a569ddfd..425417374 100644 --- a/scripts/context/perl/texfont.pl +++ b/scripts/context/perl/texfont.pl @@ -587,7 +587,12 @@ foreach my $path ($afmpath, $pfbpath) { print "file = $file\n"; system ("gzip -d $file") } } -system ("mktexlsr $fontroot"); # needed ? +# For gerben, we only generate a new database when an lsr file is present but for +# myself we force this when texmf-fonts is used (else I get compatibility problems). + +if (($fontroot =~ /texmf\-fonts/o) || (-e "$fontroot/ls-R") || (-e "$fontroot/ls-r") || (-e "$fontroot/LS-R")) { + system ("mktexlsr $fontroot") ; +} sub do_make_path { my $str = shift ; @@ -897,7 +902,7 @@ foreach my $file (@files) rename $encout, "$encpath/$use$cleanfont.bak" } UnLink "texfont.map" ; $tfmout = "$use$cleanfont$fontsuffix" ; - my $otfcommand = "otftotfm -a $varstr $encstr $passon $shape --name=\'$tfmout\' --encoding-dir=\'$encpath/\' --tfm-dir=\'$tfmpath/\' --vf-dir=\'$vfpath/\' --no-type1 --map-file=./texfont.map \'$file\'" ; + my $otfcommand = "otftotfm -a $varstr $encstr $passon $shape --name=\"$tfmout\" --encoding-dir=\"$encpath/\" --tfm-dir=\"$tfmpath/\" --vf-dir=\"$vfpath/\" --no-type1 --map-file=./texfont.map \"$file\"" ; print "$otfcommand\n" if $trace ; system("$otfcommand") ; $encfil = $encout } diff --git a/scripts/context/ruby/base/ctx.rb b/scripts/context/ruby/base/ctx.rb new file mode 100644 index 000000000..852c3f704 --- /dev/null +++ b/scripts/context/ruby/base/ctx.rb @@ -0,0 +1,285 @@ +# module : base/ctx +# copyright : PRAGMA Advanced Document Engineering +# version : 2005 +# author : Hans Hagen +# +# project : ConTeXt / eXaMpLe +# concept : Hans Hagen +# info : j.hagen@xs4all.nl +# www : www.pragma-ade.com + +# todo: write systemcall for mpost to file so that it can be run +# faster + +# report ? + +require 'base/system' +require 'base/file' +require 'base/switch' # has needsupdate, bad place + +require 'rexml/document' + +class CtxRunner + + attr_reader :environments, :modules, :filters + + def initialize(jobname=nil,logger=nil) + if @logger = logger then + def report(str='') + @logger.report(str) + end + else + def report(str='') + puts(str) + end + end + @jobname = jobname + @ctxname = nil + @xmldata = nil + @prepfiles = Hash.new + @environments = Array.new + @modules = Array.new + @filters = Array.new + end + + def manipulate(ctxname=nil,defaultname=nil) + + if ctxname then + @ctxname = ctxname + @jobname = File.suffixed(@ctxname,'tex') unless @jobname + else + @ctxname = File.suffixed(@jobname,'ctx') if @jobname + end + + if not @ctxname then + report('provide ctx file') + return + end + + if not FileTest.file?(@ctxname) and defaultname and FileTest.file?(defaultname) then + @ctxname = defaultname + end + + if not FileTest.file?(@ctxname) then + report('provide ctx file') + return + end + + @xmldata = IO.read(@ctxname) + + unless @xmldata =~ /^.*<\?xml.*?\?>/moi then + report("ctx file #{@ctxname} is no xml file, skipping") + return + else + report("loading ctx file #{@ctxname}") + end + + begin + @xmldata = REXML::Document.new(@xmldata) + rescue + report('provide valid ctx file (xml error)') + return + else + include(@xmldata,'ctx:include','name') + end + + begin + variables = Hash.new + if @jobname then + variables['job'] = @jobname + end + REXML::XPath.each(@xmldata.root,"//ctx:value[@name='job']") do |val| + substititute(val,variables['job']) + end + REXML::XPath.each(@xmldata.root,"/ctx:job/ctx:message") do |mes| + report("preprocessing: #{justtext(mes)}") + end + REXML::XPath.each(@xmldata.root,"/ctx:job/ctx:process/ctx:resources/ctx:environment") do |sty| + @environments << justtext(sty) + end + REXML::XPath.each(@xmldata.root,"/ctx:job/ctx:process/ctx:resources/ctx:module") do |mod| + @modules << justtext(mod) + end + REXML::XPath.each(@xmldata.root,"/ctx:job/ctx:process/ctx:resources/ctx:filter") do |fil| + @filters << justtext(mod) + end + REXML::XPath.each(@xmldata.root,"/ctx:job/ctx:preprocess/ctx:files") do |files| + REXML::XPath.each(files,"ctx:file") do |pattern| + preprocessor = pattern.attributes['processor'] + if preprocessor and not preprocessor.empty? then + pattern = justtext(pattern) + Dir.glob(pattern).each do |oldfile| + newfile = "#{oldfile}.prep" + if File.needsupdate(oldfile,newfile) then + begin + File.delete(newfile) + rescue + # hope for the best + end + # there can be a sequence of processors + preprocessor.split(',').each do |pp| + if command = REXML::XPath.first(@xmldata.root,"/ctx:job/ctx:preprocess/ctx:processors/ctx:processor[@name='#{pp}']") then + # a lie: no <?xml ...?> + command = REXML::Document.new(command.to_s) # don't infect original + command = command.elements["ctx:processor"] + report("preprocessing #{oldfile} using #{pp}") + REXML::XPath.each(command,"ctx:old") do |value| replace(value,oldfile) end + REXML::XPath.each(command,"ctx:new") do |value| replace(value,newfile) end + variables['old'] = oldfile + variables['new'] = newfile + REXML::XPath.each(command,"ctx:value") do |value| + if name = value.attributes['name'] then + substititute(value,variables[name.to_s]) + end + end + command = justtext(command) + report(command) + unless ok = System.run(command) then + report("error in preprocessing file #{oldfile}") + end + end + end + if FileTest.file?(newfile) then + File.syncmtimes(oldfile,newfile) + else + report("preprocessing #{oldfile} gave no #{newfile}") + end + else + report("#{oldfile} needs no preprocessing") + end + @prepfiles[oldfile] = FileTest.file?(newfile) + end + end + end + end + rescue + report("fatal error in preprocessing #{@ctxname}: #{$!}") + end + end + + def savelog(ctlname=nil) + unless ctlname then + if @jobname then + ctlname = File.suffixed(@jobname,'ctl') + elsif @ctxname then + ctlname = File.suffixed(@ctxname,'ctl') + else + return + end + end + if @prepfiles.length > 0 then + if log = File.open(ctlname,'w') then + log << "<?xml version='1.0' standalone='yes'?>\n\n" + log << "<ctx:preplist>\n" + @prepfiles.keys.sort.each do |prep| + log << "\t<ctx:prepfile done='#{yes_or_no(@prepfiles[prep])}'>#{File.basename(prep)}</ctx:prepfile>\n" + end + log << "</ctx:preplist>\n" + log.close + end + else + begin + File.delete(ctlname) + rescue + end + end + end + + private + + def include(xmldata,element='ctx:include',attribute='name') + loop do + begin + more = false + REXML::XPath.each(xmldata.root,element) do |e| + begin + name = e.attributes.get_attribute(attribute).to_s + name = e.text.to_s if name.empty? + name.strip! if name + if name and not name.empty? and FileTest.file?(name) then + if f = File.open(name,'r') and i = REXML::Document.new(f) then + report("including ctx file #{name}") + REXML::XPath.each(i.root,"*") do |ii| + xmldata.root.insert_after(e,ii) + more = true + end + end + else + report("no valid ctx inclusion file #{name}") + end + rescue Exception + # skip this file + ensure + xmldata.root.delete(e) + end + end + break unless more + rescue Exception + break # forget about inclusion + end + end + end + + private + + def yes_or_no(b) + if b then 'yes' else 'no' end + end + + private # copied from rlxtools.rb + + def justtext(str) + str = str.to_s + str.gsub!(/<[^>]*?>/o, '') + str.gsub!(/\s+/o, ' ') + str.gsub!(/</o, '<') + str.gsub!(/>/o, '>') + str.gsub!(/&/o, '&') + str.gsub!(/"/o, '"') + str.gsub!(/[\/\\]+/o, '/') + return str.strip + end + + def substititute(value,str) + if str then + begin + if value.attributes.key?('method') then + str = filtered(str.to_s,value.attributes['method'].to_s) + end + if str.empty? && value.attributes.key?('default') then + str = value.attributes['default'].to_s + end + value.insert_after(value,REXML::Text.new(str.to_s)) + rescue Exception + end + end + end + + def replace(value,str) + if str then + begin + value.insert_after(value,REXML::Text.new(str.to_s)) + rescue Exception + end + end + end + + def filtered(str,method) + str = str.to_s # to be sure + case method + when 'name' then # no path, no suffix + case str + when /^.*[\\\/](.+?)\..*?$/o then $1 + when /^.*[\\\/](.+?)$/o then $1 + when /^(.*)\..*?$/o then $1 + else str + end + when 'path' then if str =~ /^(.+)([\\\/])(.*?)$/o then $1 else '' end + when 'suffix' then if str =~ /^.*\.(.*?)$/o then $1 else '' end + when 'nosuffix' then if str =~ /^(.*)\..*?$/o then $1 else str end + when 'nopath' then if str =~ /^.*[\\\/](.*?)$/o then $1 else str end + else str + end + end + +end diff --git a/scripts/context/ruby/base/file.rb b/scripts/context/ruby/base/file.rb index 16a1be09b..42fb346c4 100644 --- a/scripts/context/ruby/base/file.rb +++ b/scripts/context/ruby/base/file.rb @@ -37,7 +37,7 @@ class File end def File.splitname(name,suffix='') - if name =~ /(.*)\.([^\.]*?)$/o then + if name =~ /^(.*)\.([^\.]*?)$/o then [$1, $2] else [name, suffix] diff --git a/scripts/context/ruby/base/kpsefast.rb b/scripts/context/ruby/base/kpsefast.rb index e0204cf13..52ab28d0f 100644 --- a/scripts/context/ruby/base/kpsefast.rb +++ b/scripts/context/ruby/base/kpsefast.rb @@ -716,7 +716,7 @@ class KPSEFAST data << FileData.new(2,filename,File.size(filename),File.mtime(filename)) end else - data << FileData.new(3,filename) + # data << FileData.new(3,filename) end end end @@ -727,7 +727,13 @@ class KPSEFAST # data.each do |d| puts d.report end # puts '' # end - data.sort! do |a,b| b.size <=> a.size end + data.sort! do |a,b| + if a.size and b.size then + b.size <=> a.size + else + 0 + end + end bunch = Array.new done = false data.each do |d| diff --git a/scripts/context/ruby/base/switch.rb b/scripts/context/ruby/base/switch.rb index d011a78ae..64d518bd4 100644 --- a/scripts/context/ruby/base/switch.rb +++ b/scripts/context/ruby/base/switch.rb @@ -141,9 +141,15 @@ module CommandBase version # is nilled when already given @commandline.helpkeys.each do |k| if @commandline.help?(k) then + kstr = ('--'+k).ljust(@commandline.helplength+2) message = @commandline.helptext(k) message = '' if message == CommandLine::NOHELP - report("#{('--'+k).ljust(@commandline.helplength+2)} #{message}") + message = message.split(/\s*\n\s*/) + loop do + report("#{kstr} #{message.shift}") + kstr = ' '*kstr.length + break if message.length == 0 + end end end end diff --git a/scripts/context/ruby/base/tex.rb b/scripts/context/ruby/base/tex.rb index 75970bcd8..2cc9d2542 100644 --- a/scripts/context/ruby/base/tex.rb +++ b/scripts/context/ruby/base/tex.rb @@ -19,6 +19,7 @@ require 'base/system' require 'base/state' require 'base/pdf' require 'base/file' +require 'base/ctx' class String @@ -127,12 +128,13 @@ class TEX 'forcetexutil', 'texutil', 'globalfile', 'autopath', 'purge', 'purgeall', 'autopdf', 'simplerun', 'verbose', + 'nooptionfile' ] @@stringvars = [ 'modefile', 'result', 'suffix', 'response', 'path', 'filters', 'usemodules', 'environments', 'separation', 'setuppath', 'arguments', 'input', 'output', 'randomseed', 'modes', 'filename', - 'modefile', + 'modefile', 'ctxfile' ] @@standardvars = [ 'mainlanguage', 'bodyfont', 'language' @@ -168,7 +170,7 @@ class TEX @@temprunfile = 'texexec' @@temptexfile = 'texexec.tex' - def initialize(logger) + def initialize(logger=nil) if @logger = logger then def report(str='') @logger.report(str) @@ -524,7 +526,7 @@ class TEX # finalize cleanup reportruntime - end + end def checkcontext @@ -660,29 +662,39 @@ class TEX private # will become baee/context @@preamblekeys = [ - ['tex','texengine'],['program','texengine'], - ['ctx','ctxfilter'],['translate','ctxfilter'], - ['output','backend'],['modes','modes'],['version','contextversion'], - ['format','texformat'],['interface','texformat'] + ['tex','texengine'], + ['program','texengine'], + ['translate','tcxfilter'], + ['tcx','tcxfilter'], + ['output','backend'], + ['mode','mode'], + ['ctx','ctxfile'], + ['version','contextversion'], + ['format','texformat'], + ['interface','texformat'] ] def scantexpreamble(filename) - if FileTest.file?(filename) and tex = File.open(filename) then - while str = tex.gets.chomp do - if str =~ /^\%\s*(.*)/o then - vars = Hash.new - $1.split(/\s+/o).each do |s| - k, v = s.split('=') - vars[k] = v - end - @@preamblekeys.each do |v| - setvariable(v[1],vars[v[0]]) if vars.key?(v[0]) + begin + if FileTest.file?(filename) and tex = File.open(filename) then + while str = tex.gets and str.chomp! do + if str =~ /^\%\s*(.*)/o then + vars = Hash.new + $1.split(/\s+/o).each do |s| + k, v = s.split('=') + vars[k] = v + end + @@preamblekeys.each do |v| + setvariable(v[1],vars[v[0]]) if vars.key?(v[0]) + end + else + break end - else - break end + tex.close end - tex.close + rescue + # well, let's not worry too much end end @@ -758,45 +770,46 @@ class TEX end end - def makestubfile(jobname,jobsuffix,forcexml=false) - if tmp = File.open(File.suffixed(jobname,'run'),'w') then - fullname = File.suffixed(jobname,jobsuffix) + def makestubfile(rawname,forcexml=false) + if tmp = File.open(File.suffixed(rawname,'run'),'w') then tmp << "\\starttext\n" if forcexml then - if FileTest.file?(fullname) && (xml = File.open(fullname)) then + if FileTest.file?(rawname) && (xml = File.open(rawname)) then xml.each do |line| - if line =~ /<[a-z]+/io then - break - elsif line =~ /<\?context\-directive\s+(\S+)\s+(\S+)\s+(\S+)\s*(.*?)\s*\?>/o then - category, key, value, rest = $1, $2, $3, $4 - case category - when 'job' then - case key - when 'control' then - setvariable(value,if rest.empty? then true else rest end) - when 'mode', 'modes' then - tmp << "\\enablemode[#{value}]\n" - when 'stylefile', 'environment' then - tmp << "\\environment #{value}\n" - when 'module' then - tmp << "\\usemodule[#{value}]\n" - when 'interface' then - contextinterface = value - end - end + case line + when /<\?context\-directive\s+(\S+)\s+(\S+)\s+(\S+)\s*(.*?)\s*\?>/o then + category, key, value, rest = $1, $2, $3, $4 + case category + when 'job' then + case key + when 'control' then + setvariable(value,if rest.empty? then true else rest end) + when 'mode', 'modes' then + tmp << "\\enablemode[#{value}]\n" + when 'stylefile', 'environment' then + tmp << "\\environment #{value}\n" + when 'module' then + tmp << "\\usemodule[#{value}]\n" + when 'interface' then + contextinterface = value + end + end + when /<[a-z]+/io then # beware of order, first pi test + break end end xml.close end - tmp << "\\processXMLfilegrouped{#{fullname}}\n" + tmp << "\\processXMLfilegrouped{#{rawname}}\n" else - tmp << "\\processfile{#{fullname}}\n" + tmp << "\\processfile{#{rawname}}\n" end tmp << "\\stoptext\n" tmp.close - jobsuffix = "run" + return "run" + else + return File.splitname(rawname)[1] end - return jobsuffix end end @@ -831,13 +844,21 @@ class TEX reportruntime end - def makeoptionfile(jobname, jobsuffix, finalrun, fastdisabled, kindofrun) - if opt = File.open(File.suffixed(jobname,'top'),'w') then + def deleteoptionfile(rawname) + begin + File.delete(File.suffixed(rawname,'top')) + rescue + end + end + + def makeoptionfile(rawname, jobname, jobsuffix, finalrun, fastdisabled, kindofrun) + # jobsuffix = orisuffix + if topname = File.suffixed(rawname,'top') and opt = File.open(topname,'w') then # local handies - opt << "\% $JobName.top\n" + opt << "\% #{topname}\n" opt << "\\unprotect\n" opt << "\\setupsystem[\\c!n=#{kindofrun}]\n" - opt << "\\def\\MPOSTformatswitch\{#{prognameflag('metafun')} #{formatflag('mpost')}=\}" + opt << "\\def\\MPOSTformatswitch\{#{prognameflag('metafun')} #{formatflag('mpost')}=\}\n" if getvariable('batchmode') then opt << "\\batchmode\n" end @@ -853,7 +874,7 @@ class TEX if (str = File.unixfied(getvariable('result'))) && ! str.empty? then opt << "\\setupsystem[file=#{str}]\n" elsif (str = getvariable('suffix')) && ! str.empty? then - opt << "\\setupsystem[file=#{File.suffixed(jobname,str,nil)}]\n" + opt << "\\setupsystem[file=#{jobname}.#{str}]\n" end if (str = File.unixfied(getvariable('path'))) && ! str.empty? then opt << "\\usepath[#{str}]\n" unless str.empty? @@ -930,7 +951,7 @@ class TEX if (str = getvariable('input')) && ! str.empty? then opt << "\\setupsystem[inputfile=#{str}]\n" else - opt << "\\setupsystem[inputfile=#{File.suffixed(jobname,jobsuffix)}]\n" + opt << "\\setupsystem[inputfile=#{rawname}]\n" end if (str = getvariable('pages')) && ! str.empty? then if str.downcase == 'odd' then @@ -953,18 +974,11 @@ class TEX end end opt << "\\protect\n"; - begin - getvariable('filters').split(',').each do |f| opt << "\\useXMLfilter[#{f}]\n" end - rescue - end - begin - getvariable('usemodules').split(',').each do |m| opt << "\\usemodule[#{m}]\n" end - rescue - end - begin - getvariable('environments').split(',').each do |e| opt << "\\usemodule[#{e}]\n" end - rescue - end + begin getvariable('filters' ).split(',').uniq.each do |f| opt << "\\useXMLfilter[#{f}]\n" end ; rescue ; end + begin getvariable('usemodules' ).split(',').uniq.each do |m| opt << "\\usemodule[#{m}]\n" end ; rescue ; end + begin getvariable('environments').split(',').uniq.each do |e| opt << "\\environment #{e}\n" end ; rescue ; end + # this will become: + # begin getvariable('environments').split(',').uniq.each do |e| opt << "\\useenvironment[#{e}]\n" end ; rescue ; end opt << "\\endinput\n" opt.close end @@ -976,12 +990,12 @@ class TEX ENV['SHELL_ESCAPE'] = ENV['SHELL_ESCAPE'] || 'f' ENV['OPENOUT_ANY'] = ENV['OPENOUT_ANY'] || 'p' ENV['OPENIN_ANY'] = ENV['OPENIN_ANY'] || 'p' - else + elsif getvariable('notparanoid') then ENV['SHELL_ESCAPE'] = ENV['SHELL_ESCAPE'] || 't' - ENV['OPENOUT_ANY'] = ENV['OPENOUT_ANY'] || 'p' + ENV['OPENOUT_ANY'] = ENV['OPENOUT_ANY'] || 'a' ENV['OPENIN_ANY'] = ENV['OPENIN_ANY'] || 'a' end - if (ENV['OPENIN_ANY'] == 'p') || (ENV['OPENOUT_ANY'] == 'p') then + if ENV['OPENIN_ANY'] && (ENV['OPENIN_ANY'] == 'p') then # first test redundant setvariable('paranoid', true) end if ENV.key?('SHELL_ESCAPE') && (ENV['SHELL_ESCAPE'] == 'f') then @@ -1115,19 +1129,19 @@ class TEX ENV['TEXFONTMAPS'] = ".;\$TEXMF/fonts/map/{#{backend},pdftex,dvips,}//" end - def runbackend(jobname) + def runbackend(rawname) case validbackend(getvariable('backend')) when 'dvipdfmx' then fixbackendvars('dvipdfm') - system("dvipdfmx -d 4 #{File.unsuffixed(jobname)}") + system("dvipdfmx -d 4 #{File.unsuffixed(rawname)}") when 'xetex' then fixbackendvars('xetex') - system("xdv2pdf #{File.suffixed(jobname,'xdv')}") + system("xdv2pdf #{File.suffixed(jrawname,'xdv')}") when 'dvips' then fixbackendvars('dvips') mapfiles = '' begin - if tuifile = File.suffixed(jobname,'tui') and FileTest.file?(tuifile) then + if tuifile = File.suffixed(rawname,'tui') and FileTest.file?(tuifile) then IO.read(tuifile).scan(/^c \\usedmapfile\{.\}\{(.*?)\}\s*$/o) do mapfiles += "-u +#{$1} " ; end @@ -1135,7 +1149,7 @@ class TEX rescue mapfiles = '' end - system("dvips #{mapfiles} #{File.unsuffixed(jobname)}") + system("dvips #{mapfiles} #{File.unsuffixed(rawname)}") when 'pdftex' then # no need for postprocessing else @@ -1147,6 +1161,8 @@ class TEX takeprecautions + rawname = getvariable('filename') + jobname = getvariable('filename') suffix = getvariable('suffix') result = getvariable('result') @@ -1181,23 +1197,63 @@ class TEX # fuzzy code snippet: (we kunnen kpse: prefix gebruiken) unless FileTest.file?(File.suffixed(jobname,jobsuffix)) then + if FileTest.file?(rawname + '.tex') then + jobname = rawname.dup + jobsuffix = 'tex' + end + end + + # we can have funny names, like 2005.10.10 (given without suffix) + + rawname = jobname + '.' + jobsuffix + + unless FileTest.file?(rawname) then inppath.split(',').each do |ip| - break if dummyfile = FileTest.file?(File.join(ip,File.suffixed(jobname,jobsuffix))) + break if dummyfile = FileTest.file?(File.join(ip,rawname)) end end - jobsuffix = makestubfile(jobname,jobsuffix,forcexml) if dummyfile || forcexml + # preprocess files - if globalfile || FileTest.file?(File.suffixed(jobname,jobsuffix)) then + ctx = CtxRunner.new(rawname,@logger) + if getvariable('ctxfile').empty? then + ctx.manipulate(File.suffixed(rawname,'ctx'),'jobname.ctx') + else + ctx.manipulate(File.suffixed(getvariable('ctxfile'),'ctx')) + end + ctx.savelog(File.suffixed(rawname,'ctl')) + + envs = ctx.environments + mods = ctx.modules + + # merge environment and module specs + + envs << getvariable('environments') unless getvariable('environments').empty? + mods << getvariable('modules') unless getvariable('modules') .empty? + + envs = envs.uniq.join(',') + mods = mods.uniq.join(',') + + report("using environments #{envs}") if envs.length > 0 + report("using modules #{mods}") if mods.length > 0 + + setvariable('environments', envs) + setvariable('modules', mods) + + # end of preprocessing and merging + + jobsuffix = makestubfile(rawname,forcexml) if dummyfile || forcexml + + if globalfile || FileTest.file?(rawname) then if not dummyfile and not globalfile then - scantexpreamble(File.suffixed(jobname,jobsuffix)) - scantexcontent(File.suffixed(jobname,jobsuffix)) if getvariable('texformats').standard? + scantexpreamble(rawname) + scantexcontent(rawname) if getvariable('texformats').standard? end - result = File.suffixed(jobname,suffix) unless suffix.empty? + result = File.suffixed(rawname,suffix) unless suffix.empty? - pushresult(jobname,result) + pushresult(rawname,result) method = validtexmethod(validtexformat(getvariable('texformats'))) @@ -1206,87 +1262,86 @@ class TEX case method when 'context' then - if getvariable('simplerun') || runonce then - makeoptionfile(jobname,orisuffix,true,true,3) - ok = runtex(File.suffixed(jobname,jobsuffix)) + makeoptionfile(rawname,jobname,orisuffix,true,true,3) unless getvariable('nooptionfile') + ok = runtex(rawname) if ok then - ok = runtexutil(jobname) if getvariable('texutil') || getvariable('forcetexutil') - runbackend(jobname) - popresult(jobname,result) + ok = runtexutil(rawname) if getvariable('texutil') || getvariable('forcetexutil') + runbackend(rawname) + popresult(rawname,result) end - File.silentrename(File.suffixed(jobname,'top'),File.suffixed(jobname,'tmp')) + File.silentdelete(File.suffixed(rawname,'tmp')) + File.silentrename(File.suffixed(rawname,'top'),File.suffixed(rawname,'tmp')) else mprundone, ok, stoprunning = false, true, false texruns, nofruns = 0, getvariable('runs').to_i state = FileState.new ['tub','tuo'].each do |s| - state.register(File.suffixed(jobname,s)) + state.register(File.suffixed(rawname,s)) end if getvariable('automprun') then # check this ['mprun','mpgraph'].each do |s| - state.register(File.suffixed(jobname,s,'mp'),'randomseed') - # state.register(File.suffixed(jobname,s,'mpo')) + state.register(File.suffixed(rawname,s,'mp'),'randomseed') end end while ! stoprunning && (texruns < nofruns) && ok do texruns += 1 report("TeX run #{texruns}") if texruns == 1 then - makeoptionfile(jobname,orisuffix,false,false,1) + makeoptionfile(rawname,jobname,orisuffix,false,false,1) unless getvariable('nooptionfile') else - makeoptionfile(jobname,orisuffix,false,false,2) + makeoptionfile(rawname,jobname,orisuffix,false,false,2) unless getvariable('nooptionfile') end - ok = runtex(File.suffixed(jobname,jobsuffix)) + ok = runtex(File.suffixed(rawname,jobsuffix)) if ok && (nofruns > 1) then unless getvariable('nompmode') then - mprundone = runtexmpjob(jobname, "mpgraph") - mprundone = runtexmpjob(jobname, "mprun") + mprundone = runtexmpjob(rawname, "mpgraph") + mprundone = runtexmpjob(rawname, "mprun") end - ok = runtexutil(jobname) + ok = runtexutil(rawname) state.update stoprunning = state.stable? end end - ok = runtexutil(jobname) if (nofruns == 1) && getvariable('texutil') + ok = runtexutil(rawname) if (nofruns == 1) && getvariable('texutil') if ok && finalrun && (nofruns > 1) then - makeoptionfile(jobname,orisuffix,true,finalrun,4) + makeoptionfile(rawname,jobname,orisuffix,true,finalrun,4) unless getvariable('nooptionfile') report("final TeX run #{texruns}") - ok = runtex(File.suffixed(jobname,jobsuffix)) + ok = runtex(File.suffixed(rawname,jobsuffix)) end - File.silentcopy(File.suffixed(jobname,'top'),File.suffixed(jobname,'tmp')) - ['tup','top'].each do |s| # previous tuo file / runtime option file - File.silentdelete(File.suffixed(jobname,s)) + ['tmp','top'].each do |s| # previous tuo file / runtime option file + File.silentdelete(File.suffixed(rawname,s)) end + File.silentrename(File.suffixed(rawname,'top'),File.suffixed(rawname,'tmp')) if ok then - runbackend(jobname) - popresult(jobname,result) + runbackend(rawname) + popresult(rawname,result) end end - Kpse.runscript('ctxtools',jobname,'--purge') if getvariable('purge') - Kpse.runscript('ctxtools',jobname,'--purgeall') if getvariable('purgeall') + Kpse.runscript('ctxtools',rawname,'--purge') if getvariable('purge') + Kpse.runscript('ctxtools',rawname,'--purgeall') if getvariable('purgeall') when 'latex' then - ok = runtex(File.suffixed(jobname,jobsuffix)) + ok = runtex(rawname) else - ok = runtex(File.suffixed(jobname,jobsuffix)) + ok = runtex(rawname) end - if (dummyfile or forcexml) and FileTest.file?(File.suffixed(jobname,jobsuffix)) then + if (dummyfile or forcexml) and FileTest.file?(rawname) then begin - File.delete(File.suffixed(jobname,jobsuffix)) + File.delete(File.suffixed(rawname,'run')) rescue report("unable to delete stub file") end end if ok and getvariable('autopdf') then - PDFview.open(File.suffixed(if result.empty? then jobname else result end,'pdf')) + PDFview.open(File.suffixed(if result.empty? then rawname else result end,'pdf')) end end diff --git a/scripts/context/ruby/ctxtools.rb b/scripts/context/ruby/ctxtools.rb index 75720d8b8..94e6e735a 100644 --- a/scripts/context/ruby/ctxtools.rb +++ b/scripts/context/ruby/ctxtools.rb @@ -379,6 +379,7 @@ class Commands pattern = @commandline.arguments purgeall = @commandline.option("all") || all + recurse = @commandline.option("recurse") $dontaskprefixes.push(Dir.glob("mpx-*")) $dontaskprefixes.flatten! @@ -391,14 +392,14 @@ class Commands end if ! pattern || pattern.empty? then - globbed = "*.*" + globbed = if recurse then "**/*.*" else "*.*" end files = Dir.glob(globbed) report("purging files : #{globbed}") else pattern.each do |pat| - globbed = "#{pat}-*.*" + globbed = if recurse then "**/#{pat}-*.*" else "#{pat}-*.*" end files = Dir.glob(globbed) - globbed = "#{pat}.*" + globbed = if recurse then "**/#{pat}.*" else "#{pat}.*" end files.push(Dir.glob(globbed)) end report("purging files : #{pattern.join(' ')}") @@ -1313,6 +1314,53 @@ class Commands end +class Commands + + include CommandBase + + # usage : ctxtools --listentities entities.xml + # document: <!DOCTYPE something SYSTEM "entities.xml"> + + def flushentities(handle,entities,doctype=nil) # 'stylesheet' + tab = if doctype then "\t" else "" end + handle.puts("<!DOCTYPE #{doctype} [") if doctype + entities.keys.sort.each do |k| + handle.puts("#{tab}<!ENTITY #{k} \"\&\##{entities[k]};\">") + end + handle.puts("]>") if doctype + end + + def listentities + + # filename = `texmfstart tmftools.rb --progname=context enco-uc.tex`.chomp + filename = `kpsewhich --progname=context enco-uc.tex`.chomp + outputname = @commandline.argument('first') + + if filename and not filename.empty? and FileTest.file?(filename) then + entities = Hash.new + IO.readlines(filename).each do |line| + if line =~ /\\definecharacter\s+([a-zA-Z]+)\s+\{\\uchar\{*(\d+)\}*\{(\d+)\}\}/o then + name, low, high = $1, $2.to_i, $3.to_i + entities[name] = low*256 + high + end + end + if outputname and not outputname.empty? then + if f = File.open(outputname,'w') then + flushentities(f,entities) + f.close + else + flushentities($stdout,entities) + end + else + flushentities($stdout,entities) + end + end + + end + +end + + logger = Logger.new(banner.shift) commandline = CommandLine.new @@ -1325,7 +1373,7 @@ commandline.registeraction('sciteinterface', 'generate scite syntax files [--pip commandline.registeraction('rawinterface', 'generate raw syntax files [--pipe]') commandline.registeraction('translateinterface', 'generate interface files (xml) [nl de ..]') -commandline.registeraction('purgefiles', 'remove temporary files [--all] [basename]') +commandline.registeraction('purgefiles', 'remove temporary files [--all --recurse] [basename]') commandline.registeraction('documentation', 'generate documentation [--type=] [filename]') @@ -1335,6 +1383,7 @@ commandline.registeraction('purgeallfiles') # no help, compatibility feature commandline.registeraction('patternfiles', 'generate pattern files [--all --xml --utf8] [languagecode]') commandline.registeraction('dpxmapfiles', 'convert pdftex mapfiles to dvipdfmx [--force] [texmfroot]') +commandline.registeraction('listentities', 'create doctype entity definition from enco-uc.tex') commandline.registervalue('type','') diff --git a/scripts/context/ruby/fcd_start.rb b/scripts/context/ruby/fcd_start.rb index 4f8019416..8ac48f79e 100644 --- a/scripts/context/ruby/fcd_start.rb +++ b/scripts/context/ruby/fcd_start.rb @@ -28,6 +28,15 @@ # You can create a stub with: # # ruby fcd_start.rb --stub --verbose +# +# usage: +# +# fcd --make t:\ +# fcd --add f:\project +# fcd [--find] whatever +# fcd [--find] whatever c (c being a list entry) +# fcd [--find] whatever . (last choice with this pattern) +# fcd --list require 'rbconfig' @@ -87,13 +96,16 @@ class FastCD @@selfpath = File.dirname($0) @@datafile = File.join(@@rootpath,'fcd_state.dat') + @@histfile = File.join(@@rootpath,'fcd_state.his') @@cdirfile = File.join(@@rootpath,if @@mswindows then 'fcd_stage.cmd' else 'fcd_stage.sh' end) @@stubfile = File.join(@@selfpath,if @@mswindows then 'fcd.cmd' else 'fcd' end) def initialize(verbose=false) @list = Array.new + @hist = Hash.new @result = Array.new @pattern = '' + @result = '' @verbose = verbose if f = File.open(@@cdirfile,'w') then f << "#{if @@mswindows then 'rem' else '#' end} no dir to change to" @@ -115,6 +127,20 @@ class FastCD print(str) if verbose end + def clear + if FileTest.file?(@@histfile) + begin + File.delete(@@histfile) + rescue + report("error in deleting history file '#{@histfile}'") + else + report("history file '#{@histfile}' is deleted") + end + else + report("no history file '#{@histfile}'") + end + end + def scan(dir='.') begin [dir].flatten.sort.uniq.each do |dir| @@ -147,13 +173,36 @@ class FastCD f.puts(l) end f.close + report("#{@list.size} status bytes saved in #{@@datafile}") + else + report("unable to save status in #{@@datafile}") end - report("#{@list.size} status bytes saved in #{@@datafile}") rescue report("error in saving status in #{@@datafile}") end end + def remember + if @hist[@pattern] == @result then + # no need to save result + else + begin + if f = File.open(@@histfile,'w') then + @hist[@pattern] = @result + @hist.keys.each do |k| + f.puts("#{k} #{@hist[k]}") + end + f.close + report("#{@hist.size} history entries saved in #{@@histfile}") + else + report("unable to save history in #{@@histfile}") + end + rescue + report("error in saving history in #{@@histfile}") + end + end + end + def load begin @list = IO.read(@@datafile).split("\n") @@ -161,12 +210,38 @@ class FastCD rescue report("error in loading status from #{@@datafile}") end + begin + IO.readlines(@@histfile).each do |line| + if line =~ /^(.*?)\s+(.*)$/i then + @hist[$1] = $2 + end + end + report("#{@hist.length} history entries loaded from #{@@histfile}") + rescue + report("error in loading history from #{@@histfile}") + end end def show begin - @list.each do |l| - puts(l) + puts("directories:") + puts("\n") + if @list.length > 0 then + @list.each do |l| + puts(l) + end + else + puts("no entries") + end + puts("\n") + puts("history:") + puts("\n") + if @hist.length > 0 then + @hist.keys.sort.each do |h| + puts("#{h} >> #{@hist[h]}") + end + else + puts("no entries") end rescue end @@ -196,6 +271,7 @@ class FastCD f.puts("cd #{dir.gsub("\\",'/')}") end end + @result = dir report("changing to #{dir}",true) else report("not changing dir") @@ -215,11 +291,19 @@ class FastCD else list = @result.dup begin - if answer = args[1] then - index = answer[0] - ?a - if dir = list[index] then - chdir(dir) - return + if answer = args[1] then # assignment & test + if answer == '.' and @hist.key?(@pattern) then + if FileTest.directory?(@hist[@pattern]) then + print("last choice ") + chdir(@hist[@pattern]) + return + end + else + index = answer[0] - ?a + if dir = list[index] then + chdir(dir) + return + end end end rescue @@ -241,6 +325,9 @@ class FastCD if dir = list[index] then print("#{answer.chr} ") chdir(dir) + elsif @hist.key?(@pattern) and FileTest.directory?(@hist[@pattern]) then + print("last choice ") + chdir(@hist[@pattern]) else print("quit\n") end @@ -249,6 +336,10 @@ class FastCD @@maxlength.times do |i| list.shift end print("next set") print("\n") + elsif @hist.key?(@pattern) and FileTest.directory?(@hist[@pattern]) then + print("last choice ") + chdir(@hist[@pattern]) + break else print("quit\n") break @@ -312,19 +403,20 @@ class FastCD end -verbose, action, args = false, 30, Array.new +verbose, action, args = false, :find, Array.new usage = "fcd [--make|add|show|find] [--verbose] [pattern]" ARGV.each do |a| case a when '-v', '--verbose' then verbose = true - when '-m', '--make' then action = 10 - when '-a', '--add' then action = 11 - when '-s', '--show' then action = 20 - when '-l', '--list' then action = 20 - when '-f', '--find' then action = 30 - when '--stub' then action = 40 + when '-m', '--make' then action = :make + when '-c', '--clear' then action = :clear + when '-a', '--add' then action = :add + when '-s', '--show' then action = :show + when '-l', '--list' then action = :show + when '-f', '--find' then action = :find + when '--stub' then action = :stub when '-h', '--help' then puts "usage: #{usage}" ; exit when /^\-\-.*/ then puts "unknown switch: #{a}" + "\n" + "usage: #{usage}" ; exit else args << a @@ -338,20 +430,24 @@ fcd = FastCD.new(verbose) fcd.report("Fast Change Dir / version 1.0") case action - when 10 then + when :make then + fcd.clear fcd.scan(args) fcd.save - when 11 then + when :clear then + fcd.clear + when :add then fcd.load fcd.scan(args) fcd.save - when 20 then + when :show then fcd.load fcd.show - when 30 then + when :find then fcd.load fcd.find(args) fcd.choose(args) - when 40 + fcd.remember + when :stub fcd.check end diff --git a/scripts/context/ruby/newtexexec.rb b/scripts/context/ruby/newtexexec.rb index 9f0084efe..27f8eeed9 100644 --- a/scripts/context/ruby/newtexexec.rb +++ b/scripts/context/ruby/newtexexec.rb @@ -117,6 +117,7 @@ class Commands f.close job.setvariable('interface','english') job.setvariable('simplerun',true) + # job.setvariable('nooptionfile',true) job.setvariable('files',[job.tempfilename]) job.processtex else @@ -161,6 +162,7 @@ class Commands f.close job.setvariable('interface','english') job.setvariable('simplerun',true) + # job.setvariable('nooptionfile',true) job.setvariable('files',[job.tempfilename]) job.processtex File.silentdelete('texutil.tuf') @@ -215,6 +217,7 @@ class Commands mod.close job.setvariable('interface','english') # redundant job.setvariable('simplerun',true) + # job.setvariable('nooptionfile',true) job.setvariable('files',[job.tempfilename]) job.processtex ["dvi", "pdf","tuo"].each do |s| @@ -239,10 +242,10 @@ class Commands if files.length > 0 then if f = File.open(job.tempfilename('tex'),'w') then emptypages = @commandline.checkedoption('addempty', '') - paperoffset = @commandline.checkedoption('paperoffset', '1cm') + paperoffset = @commandline.checkedoption('paperoffset', '0cm') textwidth = @commandline.checkedoption('textwidth', '0cm') - backspace = @commandline.checkedoption('backspace', '1.5cm') - topspace = @commandline.checkedoption('topspace', '1.5cm') + backspace = @commandline.checkedoption('backspace', '0cm') + topspace = @commandline.checkedoption('topspace', '0cm') f << "\\definepapersize\n" f << " [offset=#{paperoffset}]\n" f << "\\setuplayout\n" @@ -270,6 +273,7 @@ class Commands f.close job.setvariable('interface','english') job.setvariable('simplerun',true) + # job.setvariable('nooptionfile',true) job.setvariable('files',[job.tempfilename]) job.processtex else @@ -290,12 +294,24 @@ class Commands if files.length > 0 then if f = File.open(job.tempfilename('tex'),'w') then selection = @commandline.checkedoption('selection', '') - paperoffset = @commandline.checkedoption('paperoffset', '1cm') + paperoffset = @commandline.checkedoption('paperoffset', '0cm') textwidth = @commandline.checkedoption('textwidth', '0cm') - backspace = @commandline.checkedoption('backspace', '1.5cm') - topspace = @commandline.checkedoption('topspace', '1.5cm') - paperformat = @commandline.checkedoption('paperoffset', 'A4*A4').split(/[\*x]/o) + backspace = @commandline.checkedoption('backspace', '0cm') + topspace = @commandline.checkedoption('topspace', '0cm') + paperformat = @commandline.checkedoption('paperformat', 'A4*A4').split(/[\*x]/o) from, to = paperformat[0] || 'A4', paperformat[1] || paperformat[0] || 'A4' + if from == 'fit' or to == 'fit' then + f << "\\getfiguredimensions[#{files.first}]\n" + if from == 'fit' then + f << "\\expanded{\\definepapersize[from-fit][width=\\figurewidth,height=\\figureheight]}\n" + from = 'from-fit' + end + if to == 'fit' then + f << "\\expanded{\\definepapersize[to-fit][width=\\figurewidth,height=\\figureheight]}\n" + to = 'to-fit' + end + end + job.setvariable('paperformat','') # else overloaded later on f << "\\setuppapersize[#{from}][#{to}]\n" f << "\\definepapersize\n"; f << " [offset=#{paperoffset}]\n"; @@ -319,6 +335,7 @@ class Commands f.close job.setvariable('interface','english') job.setvariable('simplerun',true) + # job.setvariable('nooptionfile',true) job.setvariable('files',[job.tempfilename]) job.processtex else @@ -348,7 +365,7 @@ class Commands if f = File.open(job.tempfilename('tex'),'w') then scale = @commandline.checkedoption('scale') scale = (scale * 1000).to_i if scale < 10 - paperoffset = @commandline.checkedoption('paperoffset', '1cm') + paperoffset = @commandline.checkedoption('paperoffset', '0cm') f << "\\starttext\n" files.each do |filename| result = @commandline.checkedoption('result','texexec') @@ -381,6 +398,7 @@ class Commands f.close job.setvariable('interface','english') job.setvariable('simplerun',true) + # job.setvariable('nooptionfile',true) job.setvariable('files',[job.tempfilename]) job.processtex else @@ -400,7 +418,7 @@ class Commands files = @commandline.arguments.sort if files.length > 0 then if f = File.open(job.tempfilename('tex'),'w') then - paperoffset = @commandline.checkedoption('paperoffset', '1cm') + paperoffset = @commandline.checkedoption('paperoffset', '0cm') combination = @commandline.checkedoption('combination','2*2').split(/[\*x]/o) paperformat = @commandline.checkedoption('paperoffset', 'A4*A4').split(/[\*x]/o) nx, ny = combination[0] || '2', combination[1] || combination[0] || '2' @@ -435,6 +453,7 @@ class Commands f.close job.setvariable('interface','english') job.setvariable('simplerun',true) + # job.setvariable('nooptionfile',true) job.setvariable('files',[job.tempfilename]) job.processtex else diff --git a/scripts/context/ruby/rlxtools.rb b/scripts/context/ruby/rlxtools.rb index a3f41b06b..7962474eb 100644 --- a/scripts/context/ruby/rlxtools.rb +++ b/scripts/context/ruby/rlxtools.rb @@ -197,6 +197,7 @@ class Commands str.gsub!(/</o, '<') str.gsub!(/>/o, '>') str.gsub!(/&/o, '&') + str.gsub!(/"/o, '"') str.gsub!(/[\/\\]+/o, '/') return str.strip end diff --git a/scripts/context/ruby/texmfstart.rb b/scripts/context/ruby/texmfstart.rb index 887139061..dc166bf92 100644 --- a/scripts/context/ruby/texmfstart.rb +++ b/scripts/context/ruby/texmfstart.rb @@ -703,6 +703,49 @@ def process(&block) end +def checktree(tree) + unless tree.empty? then + begin + setuptex = File.join(tree,'setuptex.tmf') + if FileTest.file?(setuptex) then + report('') + report("tex tree : #{setuptex}") + ENV['TEXPATH'] = tree.sub(/\/+$/,'') # + '/' + ENV['TMP'] = ENV['TMP'] || ENV['TEMP'] || ENV['TMPDIR'] || ENV['HOME'] + case RUBY_PLATFORM + when /(mswin|bccwin|mingw|cygwin)/i then ENV['TEXOS'] = ENV['TEXOS'] || 'texmf-mswin' + when /(linux)/i then ENV['TEXOS'] = ENV['TEXOS'] || 'texmf-linux' + when /(darwin|rhapsody|nextstep)/i then ENV['TEXOS'] = ENV['TEXOS'] || 'texmf-macosx' + # when /(netbsd|unix)/i then # todo + else # todo + end + ENV['TEXMFOS'] = "#{ENV['TEXPATH']}/#{ENV['TEXOS']}" + report('') + report("preset : TEXPATH => #{ENV['TEXPATH']}") + report("preset : TEXOS => #{ENV['TEXOS']}") + report("preset : TEXMFOS => #{ENV['TEXMFOS']}") + report("preset : TMP => #{ENV['TMP']}") + report('') + IO.readlines(File.join(tree,'setuptex.tmf')).each do |line| + case line + when /^[\#\%]/ then + # comment + when /^(.*?)\s+\=\s+(.*)\s*$/ then + k, v = $1, $2 + ENV[k] = v.gsub(/\%(.*?)\%/) do + ENV[$1] || '' + end + report("user set : #{k} => #{ENV[k]}") + end + end + else + report("no setup file '#{setuptex}'") + end + rescue + end + end +end + def execute(arguments) arguments = arguments.split(/\s+/) if arguments.class == String @@ -724,6 +767,8 @@ def execute(arguments) $locate = $directives['locate'] || false $path = $directives['path'] || '' + $tree = $directives['tree'] || '' + $make = $directives['make'] || false $unix = $directives['unix'] || false @@ -762,10 +807,12 @@ def execute(arguments) if $help || ! $filename || $filename.empty? then usage + checktree($tree) elsif $batch && $filename && ! $filename.empty? then # todo, take commands from file and avoid multiple starts and checks else report("texmfstart version #{$version}") + checktree($tree) if $make then if $windows then make($filename,true,false) diff --git a/scripts/context/ruby/textools.rb b/scripts/context/ruby/textools.rb index bf0639328..78982f175 100644 --- a/scripts/context/ruby/textools.rb +++ b/scripts/context/ruby/textools.rb @@ -736,7 +736,7 @@ class Commands report("scanning #{root}") rootfiles = Dir.glob("#{root}/**/*") else - report("provide sourse root") + report("provide source root") return end if rootfiles.size > 0 then diff --git a/scripts/context/ruby/tmftools.rb b/scripts/context/ruby/tmftools.rb index 305a52370..d125c5cae 100644 --- a/scripts/context/ruby/tmftools.rb +++ b/scripts/context/ruby/tmftools.rb @@ -13,6 +13,8 @@ # The script based alternative is not slower than the kpse one. # Loading is a bit faster when the log file is used. +# todo: create database + # tmftools [some of the kpsewhich switches] # tmftools --analyze @@ -118,7 +120,7 @@ commandline.registerflag('strict') commandline.registerflag('delete') commandline.registerflag('force') -commandline.registeraction('analyze') +commandline.registeraction('analyze', "[--strict --sort --rootpath --treepath]\n[--delete [--force]] [pattern]") # general purpose options diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index c8c84b4c8..87d53cb68 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -24,103 +24,160 @@ \writestatus{\m!systems}{beware: some patches loaded from cont-new.tex} -\def\headparameter#1% to do: everywhere in core-sec - {\csname\??ko\currenthead#1\endcsname} - -% supp-fil.tex - -% <?xml version='1.0' standalone='yes'?> -% <ctx:job> -% <ctx:message>loading preprocessor definition</ctx:message> -% <ctx:preprocessor>texmfstart --direct iconv "--binary -f CP1250 -t UTF-8 kpse:&ctx:oldfilename; > &ctx:newfilename;"</ctx:preprocessor> -% </ctx:job> - -\let\preprocessfile\gobbleoneargument - -\def\dodoreadfile % we provide hooks, for instance for \enableXML - {\ifconditional\trackfilenames - \setxvalue{fn..\trackedfilename}{\readfilename}% - \fi - \preprocessfile\readfilename % new - \the\everybeforereadfile - \normalinput\readfilename\relax - \the\everyafterreadfile} - -% core-fil.tex - -% \let\checkpreprocessor\relax +% \tracefilestrue % -% \appendtoks\relax{\appendtoks \checkpreprocessor \to \everyjob}\to\everydump - -% core-job.tex +% \unexpanded\def\readfile#1#2#3% +% {\readlocfile{#1}{#2} +% {\readjobfile{#1}{#2} +% {\readsysfile{#1}{#2}{#3}}}} -\definesystemvariable {fz} % file preprocessing - -\definefileconstant {prepprefix} {prep-} - -\chardef\preprocessmode\zerocount +\unexpanded\def\readfile#1#2#3% + {\readlocfile{#1}{#2}{\readsysfile{#1}{#2}{#3}}} + +\chardef\preprocessmethod 2 % 0=no check 1=present_check 2=log_check +\chardef\preprocessstate 0 % 1=found 2=not_present (skip) +\def \preprocesssuffix {.prep} -\def\processlocalfile#1#2% - {% #1=\readlocfile|\readsetfile{dir} #2=filename - % #1{#2}\donothing\donothing - \chardef\preprocessmode\plusone - #1{#2}\donothing{\readfile{#2}\donothing\donothing}} +\def\loadctxpreplist + {\ifcase\preprocessmethod + % no checking + \or + % simple checking + \or + \doiffileexistselse{./\jobname.ctl} + {\bgroup + \defineXMLenvironment[ctx:preplist] + {\writestatus\m!systems{loading ctx log file}} + {}% + \defineXMLenvironmentsave[ctx:prepfile][done=no] + {} + {\writestatus\m!systems{registering \XMLflush{ctx:prepfile} -> \XMLop{done}}% + \setxvalue{fp..\XMLflush{ctx:prepfile}}{\XMLop{done}}}% + \processXMLfile{./\jobname.ctl}% + \egroup}% + {\global\chardef\preprocessmode\plusone}% + \fi + \global\let\loadctxpreplist\relax} -\beginETEX +\appendtoks\loadctxpreplist\to\everystarttext % will become: \prependtoks\loadctxpreplist\to\everyjob -\let\oldfilename\empty -\let\newfilename\empty - -\def\preprocessfile#1% - {\ifcase\preprocessmode\else - \chardef\preprocessmode\zerocount % one time shot - \doifsomething{\filepreprocessor} - {\def\oldfilename{#1}% - \splitfilename\oldfilename % whatever path - \ifx\splitofftype\empty - \let\splitofftype\c!tex - \edef\oldfilename{\oldfilename.\splitofftype}% - \fi - \edef\newfilename{\f!prepprefix\splitoffname.\splitofftype}% local path - \doifundefined{fp..\oldfilename} - {\doifmode{\systemmodeprefix\v!first} - {\bgroup - \enableXML - \let\executeXMLentity\expandedXMLentity - \defineXMLentity[gt]\lettermore - \defineXMLentity[lt]\letterless - \writestatus\m!systems{\filepreprocessor}% - \executesystemcommand{\filepreprocessor}% - \egroup}% - \setxvalue{fp..\oldfilename}{\newfilename}}% - \let#1\newfilename}% +\def\docheckprepfile + {\ifcase\preprocessmethod + % no preprocessing + \or + % only check for existence + \doiffileexistselse{\readfilename\preprocesssuffix} + {\chardef\preprocessstate\plusone} + \donothing + \or + % check when in list, otherwise assume normal file + \bgroup + \splitfilename\readfilename + \ifx\splitofftype\empty + % saveguard and speed up + \egroup + \else + \doifdefinedelse{fp..\splitoffname.\splitofftype} + {\egroup + \doiffileexistselse{\readfilename\preprocesssuffix} + {\chardef\preprocessstate\plusone} + {\chardef\preprocessstate\plustwo}}% + {\egroup}% + \fi \fi} -\def\filepreprocessor{\XMLflush{ctx:preprocessor}} - -\defineXMLenvironment[ctx:job] \startXMLignore \stopXMLignore -\defineXMLgsave [ctx:preprocessor] -\defineXMLargument [ctx:message] {\writestatus\m!systems} -\defineXMLentity [ctx:oldfilename] \oldfilename -\defineXMLentity [ctx:newfilename] \newfilename +% beware, \readfilename keeps the original one, but we load and store the +% suffixed with .prep file (if present) -\def\checkpreprocessor - {\global\let\checkpreprocessor\empty - \processXMLfilegrouped{./\jobname.ctx}% - \doifsomething\filepreprocessor - {\chardef\preprocessmode\plusone - \preprocessfile\inputfilename - \endinput - \normalinput\inputfilename\relax}} - -\endETEX - -\beginTEX +\def\doreadfile#1#2#3#4% beware, this one already works at format generation time! + {\sanitizefilename#2\to\readfilename + \ifx\readfilename\empty + % silently ignore + \else + \let\trackedfilename\readfilename + \chardef\preprocessstate\zerocount + \ifconditional\trackfilenames + \doifundefinedelse{fn..\trackedfilename}\donetrue\donefalse + \else + \donetrue + \fi + \ifdone + \checkfilename\readfilename + \ifcase\kindoffile + % not a full path or url, check for existence + \doifelsenothing{#1} + {\iftracefiles\writestatus\m!systems{searching for \readfilename\space on tex path}\fi + \def\next{\redoreadfile\readfilename{#3}{#4}}}% + {\iftracefiles\writestatus\m!systems{searching for \readfilename\space on #1}\fi + \def\next{\redoreadfile{\pathplusfile{#1}{\readfilename}}{#3}{#4}}}% + \else + % a full path or url, no further checking done + \docheckprepfile + \ifcase\preprocessstate + \doiffileexistselse\readfilename + {\iftracefiles\writestatus\m!systems{located \readfilename}\fi + \def\next{#3\dodoreadfile}}% + {\iftracefiles\writestatus\m!systems{not found \readfilename}\fi + \def\next{#4}}% + \or + \iftracefiles\writestatus\m!systems{located \readfilename\preprocesssuffix}\fi + \def\next{#3\dodoreadfile}% + \or + \iftracefiles\writestatus\m!systems{not found \readfilename\preprocesssuffix}\fi + \def\next{#4}% + \fi + \fi + \else + \edef\readfilename{\getvalue{fn..\readfilename}}% + \iftracefiles\writestatus\m!systems{already located \readfilename}\fi + \def\next{#3\dodoreadfile}% + \fi + \expandafter\next + \fi} -\def\preprocessfile#1% - {\chardef\preprocessmode\zerocount} +\def\redoreadfile#1#2#3% + {\docheckprepfile + \ifcase\preprocessstate + \doiffileexistselse{#1}% + {\edef\readfilename{#1}% + \iftracefiles\writestatus\m!systems{#1 located}\fi + \def\next{#2\dodoreadfile}}% + {\iftracefiles\writestatus\m!systems{cannot locate #1}\fi + \decrement\readlevel\relax + \ifnum\readlevel>\zerocount + \edef\readfilename{\pathplusfile{\f!parentpath}{\readfilename}}% + \def\next{\redoreadfile\readfilename{#2}{#3}}% + \else + \def\next{#3}% + \fi}% + \or + \edef\readfilename{#1}% + \iftracefiles\writestatus\m!systems{#1\preprocesssuffix\space located}\fi + \def\next{#2\dodoreadfile}% + \or + \def\next{#3}% + \fi + \next} -\endTEX +\def\dodoreadfile % we provide hooks, for instance for \enableXML + {\ifconditional\trackfilenames + \setxvalue{fn..\trackedfilename}{\readfilename\ifcase\preprocessstate\or\preprocesssuffix\fi}% + \fi + \the\everybeforereadfile + \ifcase\preprocessstate + % no checking or not found when using method 1 + \normalinput\readfilename + \or + % found when using method 1 or 2 + \normalinput\readfilename\preprocesssuffix + \or + % not found when using method 2 + \fi + \relax + \the\everyafterreadfile} + +\def\headparameter#1% to do: everywhere in core-sec + {\csname\??ko\currenthead#1\endcsname} % The following may be a solution for the fact that one cannot % change catcodes of characters like : and ; inside an environment. diff --git a/tex/context/base/cont-sys.ori b/tex/context/base/cont-sys.ori index ee54a99b7..a74614bd1 100644 --- a/tex/context/base/cont-sys.ori +++ b/tex/context/base/cont-sys.ori @@ -109,8 +109,8 @@ \loadmapfile[ec-public-lm.map] \loadmapfile[qx-public-lm.map] \loadmapfile[t5-public-lm.map] - \loadmapfile[pl0-public-lm.map] - \loadmapfile[il2-public-lm.map] + %loadmapfile[pl0-public-lm.map] + %loadmapfile[il2-public-lm.map] \fi diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 105fffb18..0d67d6746 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -31,7 +31,7 @@ %D 2004.8.30 the low level interface is english. Watch out and adapt %D your styles an modules. -\def\contextversion{2005.08.31} +\def\contextversion{2005.10.27} %D Welcome to the main module. When this module is ran through %D \type{initex} or \type {tex -i} or \type {whatevertex} using diff --git a/tex/context/base/core-box.tex b/tex/context/base/core-box.tex index fa576b5cb..8875cfe5f 100644 --- a/tex/context/base/core-box.tex +++ b/tex/context/base/core-box.tex @@ -703,22 +703,22 @@ \executeifdefined{\??ab\??ab\serializedcommalist}\middlebox{\flushnextbox}% \egroup}#1} -\setvalue{\??ab\??ab }{\middlebox} -\setvalue{\??ab\??ab\v!middle}{\middlebox} -\setvalue{\??ab\??ab\v!left }{\leftbox } -\setvalue{\??ab\??ab\v!right}{\rightbox } +\setvalue{\??ab\??ab }{\middlebox} +\setvalue{\??ab\??ab\v!middle }{\middlebox} +\setvalue{\??ab\??ab\v!left }{\leftbox } +\setvalue{\??ab\??ab\v!right }{\rightbox } \setvalue{\??ab\??ab\v!bottom }{\bottombox} -\setvalue{\??ab\??ab\v!top }{\topbox } +\setvalue{\??ab\??ab\v!top }{\topbox } \setvalue{\??ab\??ab\v!middle\v!middle}{\middlebox} -\setvalue{\??ab\??ab\v!left \v!top }{\lefttopbox} -\setvalue{\??ab\??ab\v!left \v!bottom }{\leftbottombox} -\setvalue{\??ab\??ab\v!right\v!top }{\righttopbox} -\setvalue{\??ab\??ab\v!right\v!bottom }{\rightbottombox} -\setvalue{\??ab\??ab\v!top \v!left }{\topleftbox} -\setvalue{\??ab\??ab\v!bottom \v!left }{\bottomleftbox} -\setvalue{\??ab\??ab\v!top \v!right}{\toprightbox} -\setvalue{\??ab\??ab\v!bottom \v!right}{\bottomrightbox} +\setvalue{\??ab\??ab\v!left \v!top }{\lefttopbox} +\setvalue{\??ab\??ab\v!left \v!bottom}{\leftbottombox} +\setvalue{\??ab\??ab\v!right \v!top }{\righttopbox} +\setvalue{\??ab\??ab\v!right \v!bottom}{\rightbottombox} +\setvalue{\??ab\??ab\v!top \v!left }{\topleftbox} +\setvalue{\??ab\??ab\v!bottom\v!left }{\bottomleftbox} +\setvalue{\??ab\??ab\v!top \v!right }{\toprightbox} +\setvalue{\??ab\??ab\v!bottom\v!right }{\bottomrightbox} \setvalue{\??ab\??ab c}{\middlebox} \setvalue{\??ab\??ab l}{\leftbox} diff --git a/tex/context/base/core-fig.tex b/tex/context/base/core-fig.tex index ed0a87d2e..572500bbd 100644 --- a/tex/context/base/core-fig.tex +++ b/tex/context/base/core-fig.tex @@ -1052,10 +1052,10 @@ \doif\@@effiletype\c!svg\presetfiguresvg}% #1[#4][#5][#6]% % prefix in runs > 1 - % prefix in runs > 1 - \doifnotmode{\systemmodeprefix\v!first} - {\doifsomething\@@efprefix{\edef\@@effilename{\@@efprefix\@@effilename}}% - \let\@@effiletype\empty}% beware, walks over the whole suffixlist + \doifsomething\@@efconversion % added, forgotten + {\doifnotmode{\systemmodeprefix\v!first} + {\doifsomething\@@efprefix{\edef\@@effilename{\@@efprefix\@@effilename}}% + \let\@@effiletype\empty}}% beware, walks over the whole suffixlist % new, somehow needed when \textwidth is used: \doifsomething\@@efmaxwidth {\freezedimenmacro\@@efmaxwidth }% \doifsomething\@@efmaxheight{\freezedimenmacro\@@efmaxheight}% @@ -1420,6 +1420,7 @@ % begin force convertable image into file \doifmode{\systemmodeprefix\v!first}{\doifsomething\@@efconversion {% needs to be sorted out + \ifx\@@efconversionpath\undefined\else\let\figurefilepath\@@efconversionpath\fi % needed for welzorg etc \ifx\@@efconversionfile\undefined\else\let\figurefilename\@@efconversionfile\fi \ifx\@@efconversiontype\undefined\else\let\figurefiletype\@@efconversiontype\fi}}% % end diff --git a/tex/context/base/core-fil.tex b/tex/context/base/core-fil.tex index b6d535b11..5820798cd 100644 --- a/tex/context/base/core-fil.tex +++ b/tex/context/base/core-fil.tex @@ -261,7 +261,8 @@ \let\checkpreprocessor\relax -\appendtoks\relax{\appendtoks \checkpreprocessor \to \everyjob}\to\everydump +% \appendtoks\relax{\appendtoks \checkpreprocessor \to \everyjob}\to\everydump +\appendtoks\everyjob\expandafter{\the\everyjob\checkpreprocessor}\to\everydump %D To be documented and probably moved diff --git a/tex/context/base/core-job.tex b/tex/context/base/core-job.tex index b7e203240..0a398f462 100644 --- a/tex/context/base/core-job.tex +++ b/tex/context/base/core-job.tex @@ -290,14 +290,20 @@ \def\verwerkfile#1 % {\doexecutefile{#1}} +\def\useenvironment[#1]% maybe commalist + {\environment #1 } + \def\environment #1 % at outermost level only {\def\startenvironment ##1 {}% \let\stopenvironment\relax + % why not \doexecutefile ? + \registerfileinfo[begin]{#1}% \dostarttextfile{#1}% \startreadingfile \processfile{#1}% was : \readlocfile{#1}{}{} \stopreadingfile - \dostoptextfile} + \dostoptextfile + \registerfileinfo[end]{#1}} \def\component #1 % at outermost level only {\dostarttextfile{#1}% diff --git a/tex/context/base/core-mis.tex b/tex/context/base/core-mis.tex index 00d2a3ee8..acd84554e 100644 --- a/tex/context/base/core-mis.tex +++ b/tex/context/base/core-mis.tex @@ -546,7 +546,7 @@ \begingroup \scratchdimen\periodswidth \hbox to \iffirstargument#1\else\periodsdefault\fi \scratchdimen - {\leaders\hbox to \scratchdimen{\hss.\hss}\hss} + {\leaders\hbox to \scratchdimen{\hss.\hss}\hss}% \endgroup} \unexpanded\def\unknown @@ -2477,8 +2477,9 @@ \dowithnextbox {\dontshowcomposition \scratchdimen\nextboxwd - \setbox\nextbox\vbox - {\dostartmirroring\hskip-\nextboxwd\flushnextbox\dostopmirroring}% + % better use an hbox (if no \forgetall, leftskip etc may creep in) + %\setbox\nextbox\vbox{\forgetall\dostartmirroring\hskip-\nextboxwd\flushnextbox\dostopmirroring}% + \setbox\nextbox\hbox{\dostartmirroring\hskip-\nextboxwd\flushnextbox\dostopmirroring}% \nextboxwd\scratchdimen \flushnextbox \egroup}} diff --git a/tex/context/base/core-not.tex b/tex/context/base/core-not.tex index f3f696a56..73c5c2555 100644 --- a/tex/context/base/core-not.tex +++ b/tex/context/base/core-not.tex @@ -704,17 +704,30 @@ \def\dodonotesymbol#1% {\noteparameter\c!textcommand{\doattributes{\??vn\currentnote}\c!textstyle\c!textcolor{#1}}} +% \def\donotesymbol[#1][#2]% +% {\bgroup +% \ifnotesenabled +% \def\currentnote{#1}% +% \ifsecondargument +% \ifx\lastnotesymbol\relax % bugged +% \unskip +% \gotobox{\dodonotesymbol\currenttextreference}[#2]% +% \else +% \lastnotesymbol +% \fi +% \else +% \lastnotesymbol +% \fi +% \fi +% \egroup} + \def\donotesymbol[#1][#2]% {\bgroup \ifnotesenabled \def\currentnote{#1}% \ifsecondargument - \ifx\lastnotesymbol\relax - \unskip - \gotobox{\dodonotesymbol\currenttextreference}[#2]% - \else - \lastnotesymbol - \fi + \unskip + \gotobox{\dodonotesymbol\currenttextreference}[#2]% \else \lastnotesymbol \fi diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex index 6ee5df55d..cb3363f8c 100644 --- a/tex/context/base/core-spa.tex +++ b/tex/context/base/core-spa.tex @@ -41,6 +41,8 @@ \appendtoks \simplesetupspacing \to \everydefinedfont +% if you want to hyphenate the first word of a paragraph ... \appendtoks\hskip0pt\to\everypar + \def\stelfactorenin {\simplesetupwhitespace \simplesetupblank @@ -1199,7 +1201,8 @@ \def\presetindentation {\doifoutervmode{\ifindentfirstparagraph\else\noindentation\fi}} -%D This sets up the indentation method as well as the amounts. +%D This sets up the (normally) global indentation behavior as well +%D as the amounts. \definecomplexorsimple\setupindenting @@ -1209,12 +1212,13 @@ \parindent\ctxparindent \chardef\indentingtoggle\zerocount \processcommalist[#1]\docomplexsetupindenting + \ifindentfirstparagraph\else\noindentation\fi % added \toggleindentation} -\def\docomplexsetupindenting#1% - {\edef\!!stringa{#1}% catch #1=\somedimen - \convertcommand\!!stringa\to\!!stringa - \executeifdefined{\??in:\!!stringa}{\edef\currentindentation{#1}\simplesetupindenting}} +% \def\docomplexsetupindenting#1% +% {\edef\!!stringa{#1}% catch #1=\somedimen +% \convertcommand\!!stringa\to\!!stringa +% \executeifdefined{\??in:\!!stringa}{\edef\currentindentation{#1}\simplesetupindenting}} \def\docomplexsetupindenting#1% {\edef\!!stringa{#1}% catch #1=\somedimen @@ -1254,8 +1258,8 @@ \simplesetupindenting \fi} -\def\noindenting{\indenting[\v!no, \v!next ]} % was \nietinspringen -\def\doindenting{\indenting[\v!yes,\v!first]} % was \welinspringen +\def\noindenting{\indenting[\v!no, \v!next ]} +\def\doindenting{\indenting[\v!yes,\v!first]} %D This one sets up the local indentation behaviour (i.e. either or not %D a next paragraph will be indented). diff --git a/tex/context/base/core-tab.tex b/tex/context/base/core-tab.tex index 73850e5af..51404e689 100644 --- a/tex/context/base/core-tab.tex +++ b/tex/context/base/core-tab.tex @@ -371,6 +371,39 @@ \newif\ifForgetTableBarAndQuote \ForgetTableBarAndQuotetrue +% Old crappy code (live has changed): +% +% \bgroup +% +% \catcode`\|=\@@active +% \catcode`\"=\@@active +% +% \gdef\pushouterbarandquote +% {\ifForgetTableBarAndQuote +% \ifnum\catcode`\|=\@@active \else +% \catcode`\|=\@@active +% \def|{\ifmmode\vert\else\char`\|\fi}% +% \fi +% \let\outertablebar=|% +% \ifnum\catcode`\"=\@@active \else +% \catcode`\"=\@@active +% \def"{\char`\"}% +% \fi +% \let\outertablequote="% +% \fi} +% +% \gdef\popouterbarandquote +% {\ifForgetTableBarAndQuote +% \let|\outertablebar +% \let"\outertablequote +% \else +% \redefinetablebarandquote +% \fi} +% +% \egroup +% +% probably better (untested): + \bgroup \catcode`\|=\@@active @@ -378,34 +411,34 @@ \gdef\pushouterbarandquote {\ifForgetTableBarAndQuote - \ifnum\catcode`\|=\@@active \else - \catcode`\|=\@@active - \def|{\ifmmode\vert\else\char`\|\fi}% + \ifnum\catcode`\|=\@@active + \let\outertablebar|% + \else + \let\outertablebar\relax \fi - \let\outertablebar=|% - \ifnum\catcode`\"=\@@active \else - \catcode`\"=\@@active - \def"{\char`\"}% + \ifnum\catcode`\"=\@@active + \let\outertablequote"% + \else + \let\outertablequote\relax \fi - \let\outertablequote="% \fi} \gdef\popouterbarandquote {\ifForgetTableBarAndQuote - \let|\outertablebar - \let"\outertablequote + \ifx\outertablebar \relax\else\let|\outertablebar \fi + \ifx\outertablequote\relax\else\let"\outertablequote\fi \else \redefinetablebarandquote \fi} -\gdef\ObeyTableBarAndQuote +\egroup + +\def\ObeyTableBarAndQuote {\ForgetTableBarAndQuotefalse \ifintable \redefinetablebarandquote \fi} -\egroup - %D \macros %D {ObeyTableBarAndQuote} %D @@ -790,6 +823,12 @@ \ReadFormatKeys \LeftGlue\hfil \RightGlue\empty} \appendtoks \TABLEparalignment \to \EveryTableParBox + +\def\!tfReFormat#1% + {\the \!taLeftGlue + \vbox{\forgetall\ialign{\span\the\!taDataColumnTemplate\cr#1\cr}}% + \the \!taRightGlue + \kern\zeropoint} % prevents \unskip / really needed %D Later on, we're going to implement multiple page table %D support, therefore the next \TABLE\ macro needs to be @@ -2461,7 +2500,7 @@ [ \v!none=>\OpenUp00\def\LOW{\Lower6 }, \v!small=>\OpenUp00\def\LOW{\Lower6 }, % == baseline \v!medium=>\OpenUp11\def\LOW{\Lower7 }, - \v!big=>\OpenUp22\def\LOW{\Lower8 }]% + \v!big=>\OpenUp22\def\LOW{\Lower8 }]% \doifelse\@@tidistance\v!none {\chardef\TABLErowfactor\zerocount} {\chardef\TABLErowfactor\plustwo }} diff --git a/tex/context/base/core-ver.tex b/tex/context/base/core-ver.tex index 507480f1f..eb8363cf0 100644 --- a/tex/context/base/core-ver.tex +++ b/tex/context/base/core-ver.tex @@ -463,6 +463,11 @@ {\setupgroupedtype \slantedtypepermittedtrue} +% the next one was \string, but this prevents coloring, one can make +% it \string again if needed + +\let\protectedfirsttype\relax + \bgroup \catcode`\<=\active \catcode`\>=\active @@ -476,7 +481,7 @@ \else\ifx\next\activeleftargument \let\next\relax \else - \let\next\string + \let\next\protectedfirsttype \fi\fi\fi\fi \next} \egroup diff --git a/tex/context/base/enco-cas.tex b/tex/context/base/enco-cas.tex index 032b71786..61155ee5c 100644 --- a/tex/context/base/enco-cas.tex +++ b/tex/context/base/enco-cas.tex @@ -1,6 +1,6 @@ %D \module %D [ file=enco-cas, -%D version=2000.20.12, +%D version=2005.08.23, %D title=\CONTEXT\ Encoding Macros, %D subtitle=Named Glyph Case Mapping, %D author=Hans Hagen, @@ -41,8 +41,8 @@ \defineULcharacter Atilde atilde \defineULcharacter Itilde itilde \defineULcharacter Otilde otilde -\defineULcharacter Utilde utilde \defineULcharacter Ntilde ntilde +\defineULcharacter Utilde utilde \defineULcharacter Adiaeresis adiaeresis \defineULcharacter Ediaeresis ediaeresis @@ -61,11 +61,14 @@ \defineULcharacter Racute racute \defineULcharacter Sacute sacute \defineULcharacter Uacute uacute -\defineULcharacter Zacute zacute \defineULcharacter Yacute yacute +\defineULcharacter Zacute zacute \defineULcharacter Dstroke dstroke \defineULcharacter Hstroke hstroke +\defineULcharacter Lstroke lstroke +\defineULcharacter Lslash lslash % = lstroke +\defineULcharacter Ostroke ostroke \defineULcharacter Tstroke tstroke \defineULcharacter Cdotaccent cdotaccent @@ -80,14 +83,23 @@ \defineULcharacter Omacron omacron \defineULcharacter Umacron umacron -\defineULcharacter Kcedilla kcedilla -\defineULcharacter Lcedilla lcedilla -\defineULcharacter Ncedilla ncedilla -\defineULcharacter Rcedilla rcedilla +\defineULcharacter Ccedilla ccedilla +\defineULcharacter Gcedilla gcedilla % = gcommaaccent +\defineULcharacter Kcedilla kcedilla % = kcommaaccent +\defineULcharacter Lcedilla lcedilla % = lcommaaccent +\defineULcharacter Ncedilla ncedilla % = ncommaaccent +\defineULcharacter Rcedilla rcedilla % = rcommaaccent \defineULcharacter Scedilla scedilla \defineULcharacter Tcedilla tcedilla -\defineULcharacter Ccedilla ccedilla -\defineULcharacter Gcedilla gcedilla + +\defineULcharacter Ccommaaccent ccommaaccent +\defineULcharacter Gcommaaccent gcommaaccent +\defineULcharacter Kcommaaccent kcommaaccent +\defineULcharacter Lcommaaccent lcommaaccent +\defineULcharacter Ncommaaccent ncommaaccent +\defineULcharacter Rcommaaccent rcommaaccent +\defineULcharacter Scommaaccent scommaaccent +\defineULcharacter Tcommaaccent tcommaaccent \defineULcharacter Ohungarumlaut ohungarumlaut \defineULcharacter Uhungarumlaut uhungarumlaut @@ -122,16 +134,10 @@ \defineULcharacter AEligature aeligature \defineULcharacter OEligature oeligature -\defineULcharacter Ostroke ostroke \defineULcharacter Ssharp ssharp \defineULcharacter IJligature ijligature -\defineULcharacter Scommaaccent scommaaccent -\defineULcharacter Tcommaaccent tcommaaccent - -\defineULcharacter Thorn thorn -\defineULcharacter Eth eth - -\defineULcharacter Lslash lslash +\defineULcharacter Eth eth +\defineULcharacter Thorn thorn \endinput diff --git a/tex/context/base/enco-el.tex b/tex/context/base/enco-el.tex new file mode 100644 index 000000000..24729967b --- /dev/null +++ b/tex/context/base/enco-el.tex @@ -0,0 +1,272 @@ +%D \module +%D [ file=enco-el, +%D version=2005.08.24, +%D title=\CONTEXT\ Encoding Macros, +%D subtitle=EuroLetter, +%D author={Several Users}, +%D date=\currentdate, +%D copyright=PRAGMA-ADE] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D This EuroLetter encoding vector, also known as Dense Encoding is +%D the result of discussion among users, most noticably Adam Lindsay, +%D Mojka Miklavec, Patrick Gundlach, Taco Hoekwater and \unknown. +%D It was a follow up of a thread started long ago where we +%D discussed an encoding without the weird, never used symbols, but +%D with as many characters as possible in order to support the utf-8 +%D input regime. + +\startencoding[el] + +\definecasemaps 1 to 15 lc +16 uc 0 +\definecasemaps 17 to 31 lc 0 uc -16 + +\definecasemaps 128 to 159 lc +32 uc 0 +\definecasemaps 160 to 191 lc 0 uc -32 + +\definecasemaps 192 to 223 lc +32 uc 0 +\definecasemaps 224 to 255 lc 0 uc -32 + +\definecasemap 92 92 124 +\definecasemap 92 124 92 + +\definecharacter dotlessi 160 +\definecharacter endash 32 +\definecharacter emdash 16 + +\definecharacter aeligature 230 +\definecharacter AEligature 198 +\definecharacter oeligature 247 +\definecharacter OEligature 215 + +\definecharacter ssharp 38 + +\definecharacter thorn 254 +\definecharacter Thorn 222 + +\definecharacter eth 240 +\definecharacter Eth 208 + +\definecharacter exclamdown 42 +\definecharacter questiondown 43 + +\definecharacter quotedbl 35 +\definecharacter quotedblbase 36 +\definecharacter quotedblleft 34 +\definecharacter quotedblright 35 + +\definecharacter quotesingle 39 +\definecharacter quotesinglebase 0 + +\definecharacter quoteleft 96 +\definecharacter quoteright 39 + +\definecharacter guilsingleleft 60 +\definecharacter guilsingleright 62 + +\definecharacter leftguillemot 123 +\definecharacter rightguillemot 125 + +\definecharacter Acircumflex 194 +\definecharacter acircumflex 226 +%definecharacter Ccircumflex {\buildtextaccent\textcircumflex C} +%definecharacter ccircumflex {\buildtextaccent\textcircumflex c} +\definecharacter Ecircumflex 202 +\definecharacter ecircumflex 234 +%definecharacter Gcircumflex {\buildtextaccent\textcircumflex G} +%definecharacter gcircumflex {\buildtextaccent\textcircumflex g} +%definecharacter Hcircumflex {\buildtextaccent\textcircumflex H} +%definecharacter hcircumflex {\buildtextaccent\textcircumflex h} +\definecharacter Icircumflex 206 +\definecharacter icircumflex 238 +%definecharacter Jcircumflex {\buildtextaccent\textcircumflex \dotlessJ} +%definecharacter jcircumflex {\buildtextaccent\textcircumflex \dotlessj} +\definecharacter Ocircumflex 212 +\definecharacter ocircumflex 244 +%definecharacter Scircumflex {\buildtextaccent\textcircumflex S} +%definecharacter scircumflex {\buildtextaccent\textcircumflex s} +\definecharacter Ucircumflex 219 +\definecharacter ucircumflex 251 +\definecharacter Wcircumflex 154 +\definecharacter wcircumflex 186 +\definecharacter Ycircumflex 156 +\definecharacter ycircumflex 188 + +\definecharacter Agrave 192 +\definecharacter agrave 224 +\definecharacter Egrave 200 +\definecharacter egrave 232 +\definecharacter Igrave 204 +\definecharacter igrave 236 +\definecharacter Ograve 210 +\definecharacter ograve 242 +\definecharacter Ugrave 217 +\definecharacter ugrave 249 +\definecharacter Ygrave 155 +\definecharacter ygrave 187 + +\definecharacter Atilde 195 +\definecharacter atilde 227 +%definecharacter Itilde {\buildtextaccent\texttilde \dotlessI} +%definecharacter itilde {\buildtextaccent\texttilde \dotlessi} +\definecharacter Ntilde 209 +\definecharacter ntilde 241 +\definecharacter Otilde 213 +\definecharacter otilde 245 +%definecharacter Utilde {\buildtextaccent\texttilde U} +%definecharacter utilde {\buildtextaccent\texttilde u} +%definecharacter Ytilde {\buildtextaccent\texttilde Y} +%definecharacter ytilde {\buildtextaccent\texttilde y} + +\definecharacter Adiaeresis 196 +\definecharacter adiaeresis 228 +\definecharacter Ediaeresis 203 +\definecharacter ediaeresis 235 +\definecharacter Idiaeresis 207 +\definecharacter idiaeresis 239 +\definecharacter Odiaeresis 214 +\definecharacter odiaeresis 246 +\definecharacter Udiaeresis 220 +\definecharacter udiaeresis 252 +\definecharacter Ydiaeresis 223 +\definecharacter ydiaeresis 255 + +\definecharacter Aacute 193 +\definecharacter aacute 225 +\definecharacter Cacute 4 +\definecharacter cacute 20 +\definecharacter Eacute 201 +\definecharacter eacute 233 +\definecharacter Iacute 205 +\definecharacter iacute 237 +\definecharacter Lacute 132 +\definecharacter lacute 164 +\definecharacter Nacute 136 +\definecharacter nacute 168 +\definecharacter Oacute 211 +\definecharacter oacute 243 +\definecharacter Racute 141 +\definecharacter racute 173 +\definecharacter Sacute 144 +\definecharacter sacute 176 +\definecharacter Uacute 218 +\definecharacter uacute 250 +\definecharacter Yacute 221 +\definecharacter yacute 253 +\definecharacter Zacute 157 +\definecharacter zacute 189 + +\definecharacter Dstroke 8 +\definecharacter dstroke 24 +\definecharacter Hstroke 92 +\definecharacter hstroke 124 +%definecharacter Tstroke {T} +%definecharacter tstroke {t} + +\definecharacter Cdotaccent 6 +\definecharacter cdotaccent 22 +\definecharacter Edotaccent 10 +\definecharacter edotaccent 26 +\definecharacter Gdotaccent 15 +\definecharacter gdotaccent 31 +\definecharacter Idotaccent 128 +%definecharacter idotaccent {\buildtextaccent\textdotaccent \dotlessi} +\definecharacter Zdotaccent 159 +\definecharacter zdotaccent 191 + +\definecharacter Amacron 2 +\definecharacter amacron 18 +\definecharacter Emacron 11 +\definecharacter emacron 27 +\definecharacter Imacron 129 +\definecharacter imacron 161 +\definecharacter Omacron 140 +\definecharacter omacron 172 +\definecharacter Umacron 152 +\definecharacter umacron 184 + +\definecharacter Ccedilla 199 +\definecharacter ccedilla 231 +\definecharacter Scedilla 146 +\definecharacter scedilla 178 + +\definecharacter Gcommaaccent 14 +\definecharacter gcommaaccent 30 +\definecharacter Kcommaaccent 131 +\definecharacter kcommaaccent 163 +\definecharacter Lcommaaccent 135 +\definecharacter lcommaaccent 167 +\definecharacter Ncommaaccent 138 +\definecharacter ncommaaccent 170 +\definecharacter Rcommaaccent 143 +\definecharacter rcommaaccent 175 +%definecharacter Tcedilla 149 % there is no tcedilla in encoding +%definecharacter tcedilla 181 + +\definecharacter Scommaaccent 147 +\definecharacter scommaaccent 179 +\definecharacter Tcommaaccent 149 +\definecharacter tcommaaccent 181 + +\definecharacter Ohungarumlaut 139 +\definecharacter ohungarumlaut 171 +\definecharacter Uhungarumlaut 150 +\definecharacter uhungarumlaut 182 + +\definecharacter Aogonek 3 +\definecharacter aogonek 19 +\definecharacter Eogonek 12 +\definecharacter eogonek 28 +\definecharacter Iogonek 130 +\definecharacter iogonek 162 +\definecharacter Uogonek 153 +\definecharacter uogonek 185 + +\definecharacter Aring 197 +\definecharacter aring 229 +\definecharacter Uring 151 +\definecharacter uring 183 + +\definecharacter Abreve 1 +\definecharacter abreve 17 +%definecharacter Ebreve {\buildtextaccent\textbreve E} +%definecharacter ebreve {\buildtextaccent\textbreve e} +\definecharacter Gbreve 13 +\definecharacter gbreve 29 +%definecharacter Ibreve {\buildtextaccent\textbreve \dotlessI} +%definecharacter ibreve {\buildtextaccent\textbreve \dotlessi} +%definecharacter Obreve {\buildtextaccent\textbreve O} +%definecharacter obreve {\buildtextaccent\textbreve o} +%definecharacter Ubreve {\buildtextaccent\textbreve U} +%definecharacter ubreve {\buildtextaccent\textbreve u} + +\definecharacter Ccaron 5 +\definecharacter ccaron 21 +\definecharacter Dcaron 7 +\definecharacter dcaron 23 +\definecharacter Ecaron 9 +\definecharacter ecaron 25 +\definecharacter Lcaron 133 +\definecharacter lcaron 165 +\definecharacter Ncaron 137 +\definecharacter ncaron 169 +\definecharacter Rcaron 142 +\definecharacter rcaron 174 +\definecharacter Scaron 145 +\definecharacter scaron 177 +\definecharacter Tcaron 148 +\definecharacter tcaron 180 +%definecharacter Ycaron {\buildtextaccent\textcaron Y} +%definecharacter ycaron {\buildtextaccent\textcaron y} +\definecharacter Zcaron 158 +\definecharacter zcaron 190 + +\definecharacter Lstroke 134 +\definecharacter lstroke 166 +\definecharacter Ostroke 216 +\definecharacter ostroke 248 + +\stopencoding diff --git a/tex/context/base/enco-il2.tex b/tex/context/base/enco-il2.tex index 6f1ce351f..9fb87b2fd 100644 --- a/tex/context/base/enco-il2.tex +++ b/tex/context/base/enco-il2.tex @@ -11,6 +11,8 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +% This encoding will go but the regime will remain. + %D This Czech/Slovak encoding is dedicated to Han The Thanh. %D The numbers are derived from some files he sent me. This %D definition file is (still) sort of beta. @@ -45,7 +47,7 @@ \stopmapping -\startcoding[il2][il2] +\startencoding[il2][il2] \definecharacter textgrave 18 \definecharacter textacute 19 @@ -133,21 +135,23 @@ \definecharacter Lstroke {\ilencodedL} \definecharacter lstroke {\ilencodedl} -\def\ilencodedrA% - {\leavevmode\hbox\bgroup +\def\ilencodedrA + {\dontleavehmode\hbox\bgroup \setbox0\hbox{h}% \dimen0=\ht0 \advance\dimen0 by -1ex \rlap{\raise.67\dimen0\hbox{\char'27}}A% \egroup} -\def\ilencodedl% - {{\char32l}} +\def\ilencodedl + {\dontleavehmode{\char32l}} -\def\ilencodedL% I don't like the \leavevmode here, better \enterhmode - {\leavevmode\hbox\bgroup +\def\ilencodedL + {\dontleavehmode\hbox\bgroup \setbox0\hbox{L}% \hbox to\wd0{\hss\char32L}% \egroup} -\stopcoding +\stopencoding + +\endinput diff --git a/tex/context/base/enco-pfr.tex b/tex/context/base/enco-pfr.tex index aba9bac88..9507d9e4e 100644 --- a/tex/context/base/enco-pfr.tex +++ b/tex/context/base/enco-pfr.tex @@ -123,10 +123,10 @@ %D This macro is defined as follows. \def\usepdffontresource #1 % - {\doifundefinedelse{\pdffontfileresource} % okay, undefined, so either - {\setxvalue{\pdffontfileresource}{#1}} % brand new, or not yet loaded - {\doifvaluesomething{\pdffontfileresource} % only if not loaded in which - {\setxvalue{\pdffontfileresource}{#1}}}} % case it's made empty + {\doifundefinedelse\pdffontfileresource % okay, undefined, so either + {\setxvalue\pdffontfileresource{#1}} % brand new, or not yet loaded + {\doifvaluesomething\pdffontfileresource % only if not loaded in which + {\setxvalue\pdffontfileresource{#1}}}} % case it's made empty %D Watch how we check for duplicated loading. The resource %D itself, when asked for, is included immediately, after which @@ -165,10 +165,11 @@ \def\dododoincludepdffontresource#1% encoding {\bgroup \def\currentencoding{#1}% - \startreadingfile - \readsysfile{pdfr-\getvalue\pdffontfileresource}\donothing\donothing - \stopreadingfile - \letgvalue\pdffontfileresource\empty + \doifvaluesomething\pdffontfileresource + {\startreadingfile + \readsysfile{pdfr-\getvalue\pdffontfileresource}\donothing\donothing + \stopreadingfile + \letgvalue\pdffontfileresource\empty}% \egroup} \beginETEX diff --git a/tex/context/base/enco-pol.tex b/tex/context/base/enco-pol.tex index 57355019e..d9f49a2dc 100644 --- a/tex/context/base/enco-pol.tex +++ b/tex/context/base/enco-pol.tex @@ -11,6 +11,8 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +% This encoding will go but the regime will remain. + %D Polish native encoding; normally polish users will use %D translate=cp1250pl in combination with ec encoding. @@ -64,7 +66,7 @@ \stopmapping -\startencoding[pl0] +\startencoding[pl0][pl0] \definecharacter Aogonek 129 \definecharacter Cacute 130 @@ -87,7 +89,7 @@ \stopencoding -\startencoding[pl0] +\startencoding[pl0][pl0] \definecharacter leftguillemot 174 \definecharacter rightguillemot 175 diff --git a/tex/context/base/enco-uc.tex b/tex/context/base/enco-uc.tex index 36e611542..fb709c82d 100644 --- a/tex/context/base/enco-uc.tex +++ b/tex/context/base/enco-uc.tex @@ -33,7 +33,7 @@ \definecharacter Iacute {\uchar0{205}} \definecharacter Icircumflex {\uchar0{206}} \definecharacter Idiaeresis {\uchar0{207}} -%definecharacter Dstroke {\uchar0{208}} +\definecharacter Eth {\uchar0{208}} \definecharacter Ntilde {\uchar0{209}} \definecharacter Ograve {\uchar0{210}} \definecharacter Oacute {\uchar0{211}} @@ -65,7 +65,7 @@ \definecharacter iacute {\uchar0{237}} \definecharacter icircumflex {\uchar0{238}} \definecharacter idiaeresis {\uchar0{239}} -%definecharacter dmacron {\uchar0{240}} +\definecharacter eth {\uchar0{240}} \definecharacter ntilde {\uchar0{241}} \definecharacter ograve {\uchar0{242}} \definecharacter oacute {\uchar0{243}} @@ -116,8 +116,8 @@ \definecharacter gbreve {\uchar1{31}} \definecharacter Gdotaccent {\uchar1{32}} \definecharacter gdotaccent {\uchar1{33}} -%definecharacter Gdotaccent {\uchar1{34}} -%definecharacter gdotaccent {\uchar1{35}} +\definecharacter Gcommaaccent {\uchar1{34}} +\definecharacter gcommaaccent {\uchar1{35}} \definecharacter Hcircumflex {\uchar1{36}} \definecharacter hcircumflex {\uchar1{37}} \definecharacter Hstroke {\uchar1{38}} @@ -136,13 +136,13 @@ \definecharacter ijligature {\uchar1{51}} \definecharacter Jcircumflex {\uchar1{52}} \definecharacter jcircumflex {\uchar1{53}} -\definecharacter Kcedilla {\uchar1{54}} -\definecharacter kcedilla {\uchar1{55}} +\definecharacter Kcommaaccent {\uchar1{54}} +\definecharacter kcommaaccent {\uchar1{55}} \definecharacter kkra {\uchar1{56}} \definecharacter Lacute {\uchar1{57}} \definecharacter lacute {\uchar1{58}} -\definecharacter Lcedilla {\uchar1{59}} -\definecharacter lcedilla {\uchar1{60}} +\definecharacter Lcommaaccent {\uchar1{59}} +\definecharacter lcommaaccent {\uchar1{60}} \definecharacter Lcaron {\uchar1{61}} \definecharacter lcaron {\uchar1{62}} \definecharacter Ldotmiddle {\uchar1{63}} @@ -151,8 +151,8 @@ \definecharacter lstroke {\uchar1{66}} \definecharacter Nacute {\uchar1{67}} \definecharacter nacute {\uchar1{68}} -\definecharacter Ncedilla {\uchar1{69}} -\definecharacter ncedilla {\uchar1{70}} +\definecharacter Ncommaaccent {\uchar1{69}} +\definecharacter ncommaaccent {\uchar1{70}} \definecharacter Ncaron {\uchar1{71}} \definecharacter ncaron {\uchar1{72}} \definecharacter napostrophe {\uchar1{73}} @@ -168,8 +168,8 @@ \definecharacter oeligature {\uchar1{83}} \definecharacter Racute {\uchar1{84}} \definecharacter racute {\uchar1{85}} -\definecharacter Rcedilla {\uchar1{86}} -\definecharacter rcedilla {\uchar1{87}} +\definecharacter Rcommaaccent {\uchar1{86}} +\definecharacter rcommaaccent {\uchar1{87}} \definecharacter Rcaron {\uchar1{88}} \definecharacter rcaron {\uchar1{89}} \definecharacter Sacute {\uchar1{90}} @@ -295,10 +295,11 @@ \definecharacter textellipsis {\uchar{32}{38}} \definecharacter perthousand {\uchar{32}{48}} -\definecharacter Gcedilla {\uchar1{34}} -\definecharacter gcedilla {\uchar1{35}} -\definecharacter Eth {\uchar0{208}} -\definecharacter eth {\uchar0{240}} +%new: +\definecharacter Scommaaccent {\uchar2{24}} +\definecharacter scommaaccent {\uchar2{25}} +\definecharacter Tcommaaccent {\uchar2{26}} +\definecharacter tcommaaccent {\uchar2{27}} \stopencoding diff --git a/tex/context/base/lang-ctx.tex b/tex/context/base/lang-ctx.tex index 30de62fb5..b3a2e020f 100644 --- a/tex/context/base/lang-ctx.tex +++ b/tex/context/base/lang-ctx.tex @@ -37,10 +37,10 @@ \installlanguage [\s!hr] [\s!mapping=ec,\s!encoding=ec] % no il2, misses cacute characters -\installlanguage [\s!pl] [\s!mapping={pl0,ec},\s!encoding={pl0,ec}] % maybe also qx -\installlanguage [\s!cz] [\s!mapping={il2,ec},\s!encoding={il2,ec}] -\installlanguage [\s!sk] [\s!mapping={il2,ec},\s!encoding={il2,ec}] -\installlanguage [\s!sl] [\s!mapping={il2,ec},\s!encoding={il2,ec}] +\installlanguage [\s!pl] [\s!mapping={pl0,ec,qx},\s!encoding={pl0,ec,qx}] % pl0 may go +\installlanguage [\s!cz] [\s!mapping={il2,ec},\s!encoding={il2,ec}] % il2 may go +\installlanguage [\s!sk] [\s!mapping={il2,ec},\s!encoding={il2,ec}] % il2 may go +\installlanguage [\s!sl] [\s!mapping={il2,ec},\s!encoding={il2,ec}] % il2 may go \installlanguage [\s!vn] [\s!mapping=t5,\s!encoding=t5] diff --git a/tex/context/base/lang-ini.tex b/tex/context/base/lang-ini.tex index 4615920a8..e435c2420 100644 --- a/tex/context/base/lang-ini.tex +++ b/tex/context/base/lang-ini.tex @@ -222,12 +222,14 @@ \let\preloadedpatterns\empty \let\preloadedpmessage\empty -\def\showpatterns#1#2#3#4% language number encoding mapping +\def\doshowpatterns#1#2#3#4% language number encoding mapping {#1->#3:#4->#2->\xxlanguageparameter{#1}\s!lefthyphenmin:\xxlanguageparameter{#1}\s!righthyphenmin\space} \def\preloadlanguages {\doifsomething\preloadedpmessage{\showmessage\m!linguals{10}\preloadedpmessage}} +\fetchruntimecommand \showpatterns {\f!languageprefix\s!run} + \let\installedlanguages\empty \def\doiflanguageelse#1{\doifdefinedelse{\??la#1\c!state}} @@ -318,7 +320,7 @@ % \enableregime[utf]% % \ifundefined{\??la\??la:\currentencoding:\currentmapping:#2}% - \let\showpatterns\relax + \let\doshowpatterns\relax \edef\alreadyloadedlanguage {\executeifdefined{\??la\??la:\currentencoding:\currentmapping:\truefilename{\f!languageprefix#2.\f!patternsextension}}\empty}% \edef\alreadyloadedlanguage @@ -330,7 +332,7 @@ \readsysfile{\truefilename{\f!languageprefix#2.\f!patternsextension}} {\setxvalue{\??la#1\s!patterns}{#2}% \setxvalue{\??la\??la:\currentencoding:\currentmapping:\truefilename{\f!languageprefix#2.\f!patternsextension}}{\number\loadedlanguage}% - \xdef\preloadedpmessage{\preloadedpmessage\showpatterns{#2}{\number\normallanguage}{\currentencoding}{\currentmapping}}% + \xdef\preloadedpmessage{\preloadedpmessage\doshowpatterns{#2}{\number\normallanguage}{\currentencoding}{\currentmapping}}% \doglobal\addtocommalist{#2}\preloadedpatterns \showmessage\m!linguals1{#2,#1,\loadedlanguage,\currentencoding,\currentmapping}} {\showmessage\m!linguals2{#2,#1,\loadedlanguage,\currentencoding,\currentmapping,\f!languageprefix#2.\f!patternsextension,\truefilename{\f!languageprefix#2.\f!patternsextension}}}% @@ -346,7 +348,7 @@ \letgvalue{\??la\??la:\currentencoding:\currentmapping:#2}\alreadyloadedlanguage \doifundefined{\??la\??la:\s!default:\s!default:#2}{\letgvalue{\??la\??la:\s!default:\s!default:#2}\loadedlanguage}% fall back \setxvalue{\??la#1\s!patterns}{#2}% - \xdef\preloadedpmessage{\preloadedpmessage\showpatterns{#2}{[\number\alreadyloadedlanguage]}{\currentencoding}{\currentmapping}}% + \xdef\preloadedpmessage{\preloadedpmessage\doshowpatterns{#2}{[\number\alreadyloadedlanguage]}{\currentencoding}{\currentmapping}}% \doglobal\addtocommalist{#2}\preloadedpatterns \showmessage\m!linguals1{#2,#1,[\alreadyloadedlanguage],\currentencoding,\currentmapping}% \fi diff --git a/tex/context/base/lang-run.tex b/tex/context/base/lang-run.tex new file mode 100644 index 000000000..76e38e4c5 --- /dev/null +++ b/tex/context/base/lang-run.tex @@ -0,0 +1,34 @@ +%D \module +%D [ file=lang-run, +%D version=2005.09.08, +%D title=\CONTEXT\ Language Macros, +%D subtitle=Runtime Macros, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D [This code is hooked into the core macros and saves some +%D format space.] + +\unprotect + +\gdef\showpatterns + {\bgroup + \def\doshowpatterns##1##2##3##4% language number encoding mapping + {\NC##1\NC##3\NC##4\NC##2\NC + \xxlanguageparameter{##1}\s!lefthyphenmin\NC\xxlanguageparameter{##1}\s!righthyphenmin\NC\NR}% + \starttabulate[|c|c|c|c|c|c|] + \HL + \NC \bf language \NC \bf encoding \NC \bf mapping \NC \bf number \NC + \bf left\low{min} \NC \bf right\low{min} \NC \NR + \HL + \preloadedpmessage + \HL + \stoptabulate + \egroup} + +\protect \endinput diff --git a/tex/context/base/lang-sla.tex b/tex/context/base/lang-sla.tex index 96d537909..428796e8a 100644 --- a/tex/context/base/lang-sla.tex +++ b/tex/context/base/lang-sla.tex @@ -35,6 +35,35 @@ \unprotect +% \unexpanded\def\textormathglue#1#2#3% submitted original +% {\begingroup +% \scratchdimen=#1\hspaceamount\empty{#3}% +% \scratchskip=\zeropoint\!!plus.5\scratchdimen\!!minus.3\scratchdimen\relax +% \ifmmode +% \mskip#1#2% +% \else +% \kern#1\hspaceamount\empty{#3}% +% \hskip\scratchskip +% \fi +% \endgroup} + +% actually we could use the new pdftex features + +\unexpanded\def\textormathglue#1#2#3% cleaned up one + {\begingroup + \ifmmode + \mskip#1#2% + \else + \scratchdimen#1\hspaceamount\empty{#3}% + \scratchskip\scratchdimen\!!plus.5\scratchdimen\!!minus.3\scratchdimen + \hskip\scratchskip + \fi + \endgroup} + +\def\thinglue {\textormathglue+\thinmuskip 1} +\def\medglue {\textormathglue+\medmuskip 2} +\def\thickglue{\textormathglue+\thickmuskip3} + \installlanguage [\s!pl] [\c!spacing=\v!packed, @@ -52,10 +81,10 @@ \installlanguage [\s!cz] [\c!spacing=\v!packed, - \c!leftsentence=---, - \c!rightsentence=---, - \c!leftsubsentence=---, - \c!rightsubsentence=---, + \c!leftsentence=\thickglue--\thickglue\penalty-20\relax, % hh, \relax added + \c!rightsentence=\thickglue--\thickglue\penalty-20\relax, + \c!leftsubsentence=~---~\penalty-20\relax, + \c!rightsubsentence=~---~\penalty-20\relax, \c!leftquote=\lowerleftsingleninequote, \c!rightquote=\upperrightsinglesixquote, \c!leftquotation=\lowerleftdoubleninequote, @@ -229,13 +258,13 @@ \setupheadtext [\s!sl] [\v!figures=Slike] \setupheadtext [\s!pl] [\v!graphics=Grafika] -\setupheadtext [\s!cz] [\v!graphics=...] +\setupheadtext [\s!cz] [\v!graphics=Grafika] % new \setupheadtext [\s!sk] [\v!graphics=...] \setupheadtext [\s!hr] [\v!graphics=Slike] \setupheadtext [\s!sl] [\v!graphics=Slike] \setupheadtext [\s!pl] [\v!intermezzi=Intermezza] -\setupheadtext [\s!cz] [\v!intermezzi=...] +\setupheadtext [\s!cz] [\v!intermezzi=Intermezza] \setupheadtext [\s!sk] [\v!intermezzi=...] \setupheadtext [\s!hr] [\v!intermezzi=Intermezza] \setupheadtext [\s!sl] [\v!intermezzi=Intermezzi] @@ -247,19 +276,19 @@ \setupheadtext [\s!sl] [\v!index=Kazalo] \setupheadtext [\s!pl] [\v!abbreviations=Skr\oacute cenie] -\setupheadtext [\s!cz] [\v!abbreviations=...] +\setupheadtext [\s!cz] [\v!abbreviations=Zkratky] % new \setupheadtext [\s!sk] [\v!abbreviations=...] \setupheadtext [\s!hr] [\v!abbreviations=Kratice] \setupheadtext [\s!sl] [\v!abbreviations=Kratice] \setupheadtext [\s!pl] [\v!logos=Znaki] -\setupheadtext [\s!cz] [\v!logos=...] +\setupheadtext [\s!cz] [\v!logos=Loga] % new \setupheadtext [\s!sk] [\v!logos=...] \setupheadtext [\s!hr] [\v!logos=Znakovi] \setupheadtext [\s!sl] [\v!logos=Logotipi] \setupheadtext [\s!pl] [\v!units=Jednostki] -\setupheadtext [\s!cz] [\v!units=...] +\setupheadtext [\s!cz] [\v!units=Jednotky] % new \setupheadtext [\s!sk] [\v!units=...] \setupheadtext [\s!hr] [\v!units=Jednostki] \setupheadtext [\s!sl] [\v!units=Enote] @@ -277,7 +306,7 @@ \setuplabeltext [\s!sl] [\v!figure=Slika ] \setuplabeltext [\s!pl] [\v!intermezzo=Intermezzo ] -\setuplabeltext [\s!cz] [\v!intermezzo=... ] +\setuplabeltext [\s!cz] [\v!intermezzo=Intermezzo ] \setuplabeltext [\s!sk] [\v!intermezzo=... ] \setuplabeltext [\s!hr] [\v!intermezzo=Intermezzo ] \setuplabeltext [\s!sl] [\v!intermezzo=Intermezzo ] @@ -295,31 +324,31 @@ \setuplabeltext [\s!sl] [\v!chapter=] % Poglavje \setuplabeltext [\s!pl] [\v!section=] % Podrozdzia\l -\setuplabeltext [\s!cz] [\v!section=] +\setuplabeltext [\s!cz] [\v!section=] % Sekce % new \setuplabeltext [\s!sk] [\v!section=] \setuplabeltext [\s!hr] [\v!section=] % Podrozdzia\l \setuplabeltext [\s!sl] [\v!section=] \setuplabeltext [\s!pl] [\v!subsection=] -\setuplabeltext [\s!cz] [\v!subsection=] +\setuplabeltext [\s!cz] [\v!subsection=] % Podsekce % new \setuplabeltext [\s!sk] [\v!subsection=] \setuplabeltext [\s!hr] [\v!subsection=] \setuplabeltext [\s!sl] [\v!subsection=] \setuplabeltext [\s!pl] [\v!subsubsection=] -\setuplabeltext [\s!cz] [\v!subsubsection=] +\setuplabeltext [\s!cz] [\v!subsubsection=] % Podpodsekce % new \setuplabeltext [\s!sk] [\v!subsubsection=] \setuplabeltext [\s!hr] [\v!subsubsection=] \setuplabeltext [\s!sl] [\v!subsubsection=] \setuplabeltext [\s!pl] [\v!subsubsubsection=] -\setuplabeltext [\s!cz] [\v!subsubsubsection=] +\setuplabeltext [\s!cz] [\v!subsubsubsection=] % Podpodpodsekce % new \setuplabeltext [\s!sk] [\v!subsubsubsection=] \setuplabeltext [\s!hr] [\v!subsubsubsection=] \setuplabeltext [\s!sl] [\v!subsubsubsection=] \setuplabeltext [\s!pl] [\v!appendix=] % Dodatek -\setuplabeltext [\s!cz] [\v!appendix=] +\setuplabeltext [\s!cz] [\v!appendix=P\rcaron\iacute loha] % new \setuplabeltext [\s!sk] [\v!appendix=] \setuplabeltext [\s!hr] [\v!appendix=Dodatak ] \setuplabeltext [\s!sl] [\v!appendix=Dodatek ] @@ -331,13 +360,13 @@ \setuplabeltext [\s!sl] [\v!part=Del ] \setuplabeltext [\s!pl] [\v!line=wiersz ] -\setuplabeltext [\s!cz] [\v!line=... ] +\setuplabeltext [\s!cz] [\v!line=\rcaron\aacute dek] % new \setuplabeltext [\s!sk] [\v!line=... ] \setuplabeltext [\s!hr] [\v!line=red ] \setuplabeltext [\s!sl] [\v!line=vrstica ] \setuplabeltext [\s!pl] [\v!lines=wiersze ] -\setuplabeltext [\s!cz] [\v!lines=... ] +\setuplabeltext [\s!cz] [\v!lines=\rcaron\aacute dky] % new \setuplabeltext [\s!sk] [\v!lines=... ] \setuplabeltext [\s!hr] [\v!lines=redovi ] \setuplabeltext [\s!sl] [\v!lines=vrstice ] @@ -415,6 +444,15 @@ \setuplabeltext [\s!pl] [\v!friday=pi\aogonek tek] \setuplabeltext [\s!pl] [\v!saturday=sobota] +% new +\setuplabeltext [\s!cz] [\v!sunday=ned\ecaron le] +\setuplabeltext [\s!cz] [\v!monday=pond\ecaron l\iacute] +\setuplabeltext [\s!cz] [\v!tuesday=\uacute ter\yacute] +\setuplabeltext [\s!cz] [\v!wednesday=st\rcaron eda] +\setuplabeltext [\s!cz] [\v!thursday=\ccaron tvrtek] +\setuplabeltext [\s!cz] [\v!friday=p\aacute tek] +\setuplabeltext [\s!cz] [\v!saturday=sobota] + \setuplabeltext [\s!hr] [\v!sunday=nedjelja] \setuplabeltext [\s!hr] [\v!monday=ponedjeljak] \setuplabeltext [\s!hr] [\v!tuesday=utorak] @@ -432,6 +470,20 @@ \setuplabeltext [\s!sl] [\v!saturday=sobota] %D Rather new ... +%\installlanguage +% [\s!cz] +% [\c!spacing=\v!packed, +% \c!leftsentence=---, +% \c!rightsentence=---, +% \c!leftsubsentence=---, +% \c!rightsubsentence=---, +% \c!leftquote=\lowerleftsingleninequote, +% \c!rightquote=\upperrightsinglesixquote, +% \c!leftquotation=\lowerleftdoubleninequote, +% \c!rightquotation=\upperrightdoublesixquote, +% \c!date={\v!day,\ ,\v!month,\ ,\v!year}, +% \c!state=\v!stop] + \setuplabeltext [\s!sl] [\v!page=stran ] \setuplabeltext [\s!sl] [\v!atpage=na strani ] @@ -439,6 +491,13 @@ \setuplabeltext [\s!sl] [\v!hereafter=glej spodaj] \setuplabeltext [\s!sl] [\v!see=glej ] +% new +\setuplabeltext [\s!cz] [\v!page=strna ] +\setuplabeltext [\s!cz] [\v!atpage=na stran\ecaron\ ] +\setuplabeltext [\s!cz] [\v!hencefore=viz v\yacute\scaron e ] +\setuplabeltext [\s!cz] [\v!hereafter=viz n\iacute\zcaron e ] +\setuplabeltext [\s!cz] [\v!see=viz ] + %D \ShowAllLanguageValues [\s!pl] [polish] {Polish} {furniture} %D \ShowAllLanguageValues [\s!cz] [czech] {Czech} {mate} %D \ShowAllLanguageValues [\s!sk] [slovak] {Slovakian} {face} diff --git a/tex/context/base/m-narrowtt.tex b/tex/context/base/m-narrowtt.tex new file mode 100644 index 000000000..3a83b7d94 --- /dev/null +++ b/tex/context/base/m-narrowtt.tex @@ -0,0 +1,38 @@ +%D \module +%D [ file=m-narrowtt, +%D version=2005.09.08, +%D title=\CONTEXT\ Modules, +%D subtitle=Narrow Verbatim, +%D author={Hans Hagen \& Ton Otten}, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +%D Test file +%D +%D \starttyping +%D \usemodule[narrowtt] +%D \starttext +%D \starttyping +%D Test test test. +%D \stoptyping +%D test \type {test} test \ntype{test} test +%D \startntyping +%D Test test test. +%D \stopntyping +%D \stoptext +%D \stoptyping + +\unprotect + +\definetypeface + [narrowtt] [tt] + [mono] [modern-cond] [default] [encoding=\defaultencoding] + +\definetyping[n\v!typing][\v!typing] \setuptyping[n\v!typing][style=\narrowtt] +\definetype [n\v!type] [\v!type] \setuptype [n\v!type] [style=\narrowtt] + +\protect \endinput diff --git a/tex/context/base/math-tex.tex b/tex/context/base/math-tex.tex index 5df4d0c9a..8b547d000 100644 --- a/tex/context/base/math-tex.tex +++ b/tex/context/base/math-tex.tex @@ -462,8 +462,9 @@ %D $\sqrt[3]{10}$ %D \stoptyping -\let\normalsqrt \sqrt % just set to: \dohandlemathtoken {sqrt} -\def\notsosqrt [#1]{\root#1\of} +\ifx\normalsqrt\undefined \let\normalsqrt\sqrt \fi % just set to: \dohandlemathtoken {sqrt} + +\def\notsosqrt[#1]{\root#1\of} \def\sqrt{\doifnextcharelse[\notsosqrt\normalsqrt} diff --git a/tex/context/base/s-abr-01.tex b/tex/context/base/s-abr-01.tex index 573b1cec2..3c45346ea 100644 --- a/tex/context/base/s-abr-01.tex +++ b/tex/context/base/s-abr-01.tex @@ -181,6 +181,9 @@ \logo [TEXTOOLS] {textools} \logo [XMLTOOLS] {xmltools} \logo [PDFTOOLS] {pdftools} +\logo [RLXTOOLS] {rlxtools} +\logo [CTXTOOLS] {ctxtools} +\logo [TMFTOOLS] {tmftools} \logo [TEXMFSTART] {texmfstart} \logo [TEXSYNC] {texsync} \logo [TEX] {\TeX} diff --git a/tex/context/base/s-pre-61.tex b/tex/context/base/s-pre-61.tex index 4e772a0ce..fd30624c3 100644 --- a/tex/context/base/s-pre-61.tex +++ b/tex/context/base/s-pre-61.tex @@ -257,11 +257,11 @@ \StartSteps \startitemize -\item Mark Hollis \FlushStep -\item Roger Waters \FlushStep +\item Mark Hollis \FlushStep +\item Roger Waters \FlushStep \item David Gilmore \FlushStep \item Peter Gabriel \FlushStep -\item Randy Newman \FlushStep +\item Randy Newman \FlushStep \stopitemize \StopSteps diff --git a/tex/context/base/spec-dpx.tex b/tex/context/base/spec-dpx.tex index 0feffbf0b..161cee303 100644 --- a/tex/context/base/spec-dpx.tex +++ b/tex/context/base/spec-dpx.tex @@ -421,8 +421,7 @@ \hbox to #3{\hss\lower.5\scratchdimen\box\nextbox\hss}% \ifx\currentPDFresources\empty \else - \special{pdf:put @resources - <<\currentPDFresources\the\pdfpageresources>>}% + \special{pdf:put @resources <<\currentPDFresources\the\pdfpageresources>>}% \global\let\currentPDFresources\empty \fi \special{pdf:exobj}}% diff --git a/tex/context/base/supp-box.tex b/tex/context/base/supp-box.tex index 7680eb6af..4b451a6bf 100644 --- a/tex/context/base/supp-box.tex +++ b/tex/context/base/supp-box.tex @@ -1295,6 +1295,39 @@ \else \speciallimitatetext{#1}\leftlimit\rightlimit{#3}% \fi} + +%D Undocumented bonus (see wiki): +%D +%D \starttyping +%D \limitatefirstline{\input tufte\relax}{10cm}{\unknown} +%D \stoptyping + +\def\limitatefirstline#1#2#3% + {\hbox\bgroup\strut + \setbox\scratchbox\hbox{\begstrut#1\endstrut}% + \ifdim\wd\scratchbox>#2\relax + \setbox\scratchbox\hbox{#3}% + \hsize#2\relax + \advance\hsize-\wd\scratchbox + \setbox\scratchbox\vbox{\forgetall\veryraggedright#1}% + \setbox\scratchbox\vsplit\scratchbox to \lineheight + \vbox + {\unvbox\scratchbox + \global\setbox\plusone\lastbox + \global\setbox\plusone\hbox{\strut\unhbox\plusone}% + \hbox % to #2 + {\ifx\clip\undefined + \box\plusone + \else\ifdim\wd\plusone>\hsize + \lower\strutdepth\hbox{\clip[\c!width=\hsize,\c!height=\lineheight]{\hbox{\raise\strutdepth\box\plusone}}}% + \else + \box\plusone + \fi\fi + \removeunwantedspaces#3}}% \removeunwantedspaces\hss#3}}% + \else + #1% + \fi + \egroup} %D \macros %D {processisolatedwords, diff --git a/tex/context/base/syst-pln.tex b/tex/context/base/syst-pln.tex index 67482a48e..e60a73644 100644 --- a/tex/context/base/syst-pln.tex +++ b/tex/context/base/syst-pln.tex @@ -148,7 +148,7 @@ %D occur. %D \stopnarrower %D -%D We well overload some macros in \ETEX\ mode. +%D We will overload some macros in \ETEX\ mode. \count10 = 22 % allocates \count registers 23, 24, ... \count11 = 9 % allocates \dimen registers 10, 11, ... @@ -507,6 +507,8 @@ \omit \advance\mscount\m@ne} +% begin of tab code + \def\cleartabs {\global\setbox\tabsyet\null \setbox\tabs\null} @@ -524,30 +526,30 @@ \let\next\relax \nxt} -\def\s@tt@b% +\def\s@tt@b {\let\nxt\relax \us@false\m@ketabbox} -\def\tabalign% +\def\tabalign {\us@true\m@ketabbox} \let\+\tabalign % no outer here -\def\s@tcols#1\columns% +\def\s@tcols#1\columns {\count@#1% \dimen@\hsize \loop \ifnum\count@>\z@ \@nother \repeat} -\def\@nother% +\def\@nother {\dimen@ii\dimen@ \divide\dimen@ii\count@ \setbox\tabs\hbox{\hbox to\dimen@ii{}\unhbox\tabs}% \advance\dimen@-\dimen@ii \advance\count@\m@ne} -\def\m@ketabbox% +\def\m@ketabbox {\begingroup \global\setbox\tabsyet\copy\tabs \global\setbox\tabsdone\null @@ -577,6 +579,8 @@ \fi \box\z@} +% end to tab code + %D Users are advised not to use the following macros: \def\hang @@ -587,7 +591,7 @@ \llap{#1\enspace}% \ignorespaces} -\def\narrower% +\def\narrower {\advance\leftskip \parindent \advance\rightskip\parindent} diff --git a/tex/context/base/type-buy.tex b/tex/context/base/type-buy.tex index 9bc16c079..53a178d6e 100644 --- a/tex/context/base/type-buy.tex +++ b/tex/context/base/type-buy.tex @@ -861,6 +861,33 @@ \stoptypescript +% linotype syntax + +\starttypescript [sans] [syntax] [ec,texnansi] + + \loadmapfile[\typescriptthree-linotype-syntax.map] + + \definefontsynonym [SyntaxLT-Roman] [\typescriptthree-lte50617] [encoding=\typescriptthree] + \definefontsynonym [SyntaxLT-Italic] [\typescriptthree-lte50618] [encoding=\typescriptthree] + \definefontsynonym [SyntaxLT-Bold] [\typescriptthree-lte50619] [encoding=\typescriptthree] + \definefontsynonym [SyntaxLT-Black] [\typescriptthree-lte50620] [encoding=\typescriptthree] + \definefontsynonym [SyntaxLT-UltraBlack] [\typescriptthree-lte50621] [encoding=\typescriptthree] + +\stoptypescript + +\starttypescript [sans] [syntax] [name] + + \loadmapfile[\typescriptthree-linotype-syntax.map] + + \definefontsynonym [Sans] [SyntaxLT-Roman] + \definefontsynonym [SansItalic] [SyntaxLT-Italic] + \definefontsynonym [SansSlanted] [SyntaxLT-Italic] + \definefontsynonym [SansBold] [SyntaxLT-Black] + \definefontsynonym [SansBoldItalic] [SyntaxLT-Black] + +\stoptypescript + + \stoptypescriptcollection \endinput diff --git a/tex/context/base/type-dis.tex b/tex/context/base/type-dis.tex index 2511d9682..c4cbd6f96 100644 --- a/tex/context/base/type-dis.tex +++ b/tex/context/base/type-dis.tex @@ -17,202 +17,6 @@ \starttypescriptcollection[distributed fonts] -% obsolete: cork- is now ec- in latin modern -% -% \starttypescript[all][modern,latin-modern,computer-modern][ec] -% -% \definefontsynonym[ec-lmb10] [cork-lmb10] [encoding=ec] -% -% \stoptypescript - -\starttypescript[all][modern,latin-modern,computer-modern][pl0] - - \definefontsynonym[pl0-lmb10] [plb10] [encoding=pl0] - \definefontsynonym[pl0-lmbo10] [plbsl10] [encoding=pl0] - \definefontsynonym[pl0-lmbx10] [plbx10] [encoding=pl0] - \definefontsynonym[pl0-lmbx12] [plbx12] [encoding=pl0] - \definefontsynonym[pl0-lmbx5] [plbx5] [encoding=pl0] - \definefontsynonym[pl0-lmbx6] [plbx6] [encoding=pl0] - \definefontsynonym[pl0-lmbx7] [plbx7] [encoding=pl0] - \definefontsynonym[pl0-lmbx8] [plbx8] [encoding=pl0] - \definefontsynonym[pl0-lmbx9] [plbx9] [encoding=pl0] - \definefontsynonym[pl0-lmbxi10] [plbxti10] [encoding=pl0] - \definefontsynonym[pl0-lmbxo10] [plbxsl10] [encoding=pl0] - \definefontsynonym[pl0-lmcsc10] [plcsc10] [encoding=pl0] - \definefontsynonym[pl0-lmcsco10][plcscsl10][encoding=pl0] - \definefontsynonym[pl0-lmr10] [plr10] [encoding=pl0] - \definefontsynonym[pl0-lmr12] [plr12] [encoding=pl0] - \definefontsynonym[pl0-lmr17] [plr17] [encoding=pl0] - \definefontsynonym[pl0-lmr5] [plr5] [encoding=pl0] - \definefontsynonym[pl0-lmr6] [plr6] [encoding=pl0] - \definefontsynonym[pl0-lmr7] [plr7] [encoding=pl0] - \definefontsynonym[pl0-lmr8] [plr8] [encoding=pl0] - \definefontsynonym[pl0-lmr9] [plr9] [encoding=pl0] - \definefontsynonym[pl0-lmri10] [plti10] [encoding=pl0] - \definefontsynonym[pl0-lmri12] [plti12] [encoding=pl0] - \definefontsynonym[pl0-lmri7] [plti7] [encoding=pl0] - \definefontsynonym[pl0-lmri8] [plti8] [encoding=pl0] - \definefontsynonym[pl0-lmri9] [plti9] [encoding=pl0] - \definefontsynonym[pl0-lmro10] [plsl10] [encoding=pl0] - \definefontsynonym[pl0-lmro12] [plsl12] [encoding=pl0] - \definefontsynonym[pl0-lmro8] [plsl8] [encoding=pl0] - \definefontsynonym[pl0-lmro9] [plsl9] [encoding=pl0] - \definefontsynonym[pl0-lmss10] [plss10] [encoding=pl0] - \definefontsynonym[pl0-lmss12] [plss12] [encoding=pl0] - \definefontsynonym[pl0-lmss17] [plss17] [encoding=pl0] - \definefontsynonym[pl0-lmss8] [plss8] [encoding=pl0] - \definefontsynonym[pl0-lmss9] [plss9] [encoding=pl0] - \definefontsynonym[pl0-lmssbo10][plssbi10] [encoding=pl0] - \definefontsynonym[pl0-lmssbx10][plssbx10] [encoding=pl0] - \definefontsynonym[pl0-lmssdc10][plssdc10] [encoding=pl0] - \definefontsynonym[pl0-lmssdo10][plssdi10] [encoding=pl0] - \definefontsynonym[pl0-lmsso10] [plssi10] [encoding=pl0] - \definefontsynonym[pl0-lmsso12] [plssi12] [encoding=pl0] - \definefontsynonym[pl0-lmsso17] [plssi17] [encoding=pl0] - \definefontsynonym[pl0-lmsso8] [plssi8] [encoding=pl0] - \definefontsynonym[pl0-lmsso9] [plssi9] [encoding=pl0] - \definefontsynonym[pl0-lmssq8] [plssq8] [encoding=pl0] - \definefontsynonym[pl0-lmssqbo8][plssqbi8] [encoding=pl0] - \definefontsynonym[pl0-lmssqbx8][plssqb8] [encoding=pl0] - \definefontsynonym[pl0-lmssqo8] [plssqi8] [encoding=pl0] - \definefontsynonym[pl0-lmtcsc10][pltcsc10] [encoding=pl0] - \definefontsynonym[pl0-lmtt10] [pltt10] [encoding=pl0] - \definefontsynonym[pl0-lmtt12] [pltt12] [encoding=pl0] - \definefontsynonym[pl0-lmtt8] [pltt8] [encoding=pl0] - \definefontsynonym[pl0-lmtt9] [pltt9] [encoding=pl0] - \definefontsynonym[pl0-lmtti10] [pltti10] [encoding=pl0] - \definefontsynonym[pl0-lmtto10] [plsltt10] [encoding=pl0] - \definefontsynonym[pl0-lmvtt10] [plvtt10] [encoding=pl0] - \definefontsynonym[pl0-lmvtto10][plvtti10] [encoding=pl0] - -\stoptypescript - -\starttypescript[all][modern,latin-modern,computer-modern][il2] - - \definefontsynonym[il2-lmb10] [csb10] [encoding=il2] - \definefontsynonym[il2-lmbo10] [csbsl10] [encoding=il2] - \definefontsynonym[il2-lmbx10] [csbx10] [encoding=il2] - \definefontsynonym[il2-lmbx12] [csbx12] [encoding=il2] - \definefontsynonym[il2-lmbx5] [csbx5] [encoding=il2] - \definefontsynonym[il2-lmbx6] [csbx6] [encoding=il2] - \definefontsynonym[il2-lmbx7] [csbx7] [encoding=il2] - \definefontsynonym[il2-lmbx8] [csbx8] [encoding=il2] - \definefontsynonym[il2-lmbx9] [csbx9] [encoding=il2] - \definefontsynonym[il2-lmbxi10] [csbxti10] [encoding=il2] - \definefontsynonym[il2-lmbxo10] [csbxsl10] [encoding=il2] - \definefontsynonym[il2-lmcsc10] [cscsc10] [encoding=il2] - \definefontsynonym[il2-lmcsco10][cscscls10][encoding=il2] - \definefontsynonym[il2-lmr10] [csr10] [encoding=il2] - \definefontsynonym[il2-lmr12] [csr12] [encoding=il2] - \definefontsynonym[il2-lmr17] [csr17] [encoding=il2] - \definefontsynonym[il2-lmr5] [csr5] [encoding=il2] - \definefontsynonym[il2-lmr6] [csr6] [encoding=il2] - \definefontsynonym[il2-lmr7] [csr7] [encoding=il2] - \definefontsynonym[il2-lmr8] [csr8] [encoding=il2] - \definefontsynonym[il2-lmr9] [csr9] [encoding=il2] - \definefontsynonym[il2-lmri10] [csti10] [encoding=il2] - \definefontsynonym[il2-lmri12] [csti12] [encoding=il2] - \definefontsynonym[il2-lmri7] [csti7] [encoding=il2] - \definefontsynonym[il2-lmri8] [csti8] [encoding=il2] - \definefontsynonym[il2-lmri9] [csti9] [encoding=il2] - \definefontsynonym[il2-lmro10] [cssl10] [encoding=il2] - \definefontsynonym[il2-lmro12] [cssl12] [encoding=il2] - \definefontsynonym[il2-lmro8] [cssl8] [encoding=il2] - \definefontsynonym[il2-lmro9] [cssl9] [encoding=il2] - \definefontsynonym[il2-lmss10] [csss10] [encoding=il2] - \definefontsynonym[il2-lmss12] [csss12] [encoding=il2] - \definefontsynonym[il2-lmss17] [csss17] [encoding=il2] - \definefontsynonym[il2-lmss8] [csss8] [encoding=il2] - \definefontsynonym[il2-lmss9] [csss9] [encoding=il2] - \definefontsynonym[il2-lmssbo10][csssbi10] [encoding=il2] - \definefontsynonym[il2-lmssbx10][csssbx10] [encoding=il2] - \definefontsynonym[il2-lmssdc10][csssdc10] [encoding=il2] - \definefontsynonym[il2-lmssdo10][csssdi10] [encoding=il2] - \definefontsynonym[il2-lmsso10] [csssi10] [encoding=il2] - \definefontsynonym[il2-lmsso12] [csssi12] [encoding=il2] - \definefontsynonym[il2-lmsso17] [csssi17] [encoding=il2] - \definefontsynonym[il2-lmsso8] [csssi8] [encoding=il2] - \definefontsynonym[il2-lmsso9] [csssi9] [encoding=il2] - \definefontsynonym[il2-lmssq8] [csssq8] [encoding=il2] - \definefontsynonym[il2-lmssqbo8][csssqbi8] [encoding=il2] - \definefontsynonym[il2-lmssqbx8][csssqb8] [encoding=il2] - \definefontsynonym[il2-lmssqo8] [csssqi8] [encoding=il2] - \definefontsynonym[il2-lmtcsc10][cstcsc10] [encoding=il2] - \definefontsynonym[il2-lmtt10] [cstt10] [encoding=il2] - \definefontsynonym[il2-lmtt12] [cstt12] [encoding=il2] - \definefontsynonym[il2-lmtt8] [cstt8] [encoding=il2] - \definefontsynonym[il2-lmtt9] [cstt9] [encoding=il2] - \definefontsynonym[il2-lmtti10] [cstti10] [encoding=il2] - \definefontsynonym[il2-lmtto10] [cssltt10] [encoding=il2] - \definefontsynonym[il2-lmvtt10] [csvtt10] [encoding=il2] - \definefontsynonym[il2-lmvtto10][csvtti10] [encoding=il2] - -\stoptypescript - -% we have two sets of tfm files - -\starttypescript[all][modern,latin-modern,computer-modern][t5] - - \definefontsynonym[t5-lmb10] [vnb10] [encoding=t5] - \definefontsynonym[t5-lmbo10] [vnbsl10] [encoding=t5] - \definefontsynonym[t5-lmbx10] [vnbx10] [encoding=t5] - \definefontsynonym[t5-lmbx12] [vnbx12] [encoding=t5] - \definefontsynonym[t5-lmbx5] [vnbx5] [encoding=t5] - \definefontsynonym[t5-lmbx6] [vnbx6] [encoding=t5] - \definefontsynonym[t5-lmbx7] [vnbx7] [encoding=t5] - \definefontsynonym[t5-lmbx8] [vnbx8] [encoding=t5] - \definefontsynonym[t5-lmbx9] [vnbx9] [encoding=t5] - \definefontsynonym[t5-lmbxi10] [vnbxti10] [encoding=t5] - \definefontsynonym[t5-lmbxo10] [vnbxsl10] [encoding=t5] - \definefontsynonym[t5-lmcsc10] [vncsc10] [encoding=t5] - \definefontsynonym[t5-lmcsco10][vncscsl10][encoding=t5] - \definefontsynonym[t5-lmr10] [vnr10] [encoding=t5] - \definefontsynonym[t5-lmr12] [vnr12] [encoding=t5] - \definefontsynonym[t5-lmr17] [vnr17] [encoding=t5] - \definefontsynonym[t5-lmr5] [vnr5] [encoding=t5] - \definefontsynonym[t5-lmr6] [vnr6] [encoding=t5] - \definefontsynonym[t5-lmr7] [vnr7] [encoding=t5] - \definefontsynonym[t5-lmr8] [vnr8] [encoding=t5] - \definefontsynonym[t5-lmr9] [vnr9] [encoding=t5] - \definefontsynonym[t5-lmri10] [vnti10] [encoding=t5] - \definefontsynonym[t5-lmri12] [vnti12] [encoding=t5] - \definefontsynonym[t5-lmri7] [vnti7] [encoding=t5] - \definefontsynonym[t5-lmri8] [vnti8] [encoding=t5] - \definefontsynonym[t5-lmri9] [vnti9] [encoding=t5] - \definefontsynonym[t5-lmro10] [vnsl10] [encoding=t5] - \definefontsynonym[t5-lmro12] [vnsl12] [encoding=t5] - \definefontsynonym[t5-lmro8] [vnsl8] [encoding=t5] - \definefontsynonym[t5-lmro9] [vnsl9] [encoding=t5] - \definefontsynonym[t5-lmss10] [vnss10] [encoding=t5] - \definefontsynonym[t5-lmss12] [vnss12] [encoding=t5] - \definefontsynonym[t5-lmss17] [vnss17] [encoding=t5] - \definefontsynonym[t5-lmss8] [vnss8] [encoding=t5] - \definefontsynonym[t5-lmss9] [vnss9] [encoding=t5] - \definefontsynonym[t5-lmssbo10][vnssbi10] [encoding=t5] - \definefontsynonym[t5-lmssbx10][vnssbx10] [encoding=t5] - \definefontsynonym[t5-lmssdc10][vnssdc10] [encoding=t5] - \definefontsynonym[t5-lmssdo10][vnssdi10] [encoding=t5] - \definefontsynonym[t5-lmsso10] [vnssi10] [encoding=t5] - \definefontsynonym[t5-lmsso12] [vnssi12] [encoding=t5] - \definefontsynonym[t5-lmsso17] [vnssi17] [encoding=t5] - \definefontsynonym[t5-lmsso8] [vnssi8] [encoding=t5] - \definefontsynonym[t5-lmsso9] [vnssi9] [encoding=t5] - \definefontsynonym[t5-lmssq8] [vnssq8] [encoding=t5] - \definefontsynonym[t5-lmssqbo8][vnssqbi8] [encoding=t5] - \definefontsynonym[t5-lmssqbx8][vnssqb8] [encoding=t5] - \definefontsynonym[t5-lmssqo8] [vnssqi8] [encoding=t5] - \definefontsynonym[t5-lmtcsc10][vntcsc10] [encoding=t5] - \definefontsynonym[t5-lmtt10] [vntt10] [encoding=t5] - \definefontsynonym[t5-lmtt12] [vntt12] [encoding=t5] - \definefontsynonym[t5-lmtt8] [vntt8] [encoding=t5] - \definefontsynonym[t5-lmtt9] [vntt9] [encoding=t5] - \definefontsynonym[t5-lmtti10] [vntti10] [encoding=t5] - \definefontsynonym[t5-lmtto10] [vnsltt10] [encoding=t5] - \definefontsynonym[t5-lmvtt10] [vnvtt10] [encoding=t5] - \definefontsynonym[t5-lmvtto10][vnvtti10] [encoding=t5] - -\stoptypescript - \starttypescript[all][modern,latin-modern][all] % fallbacks, no math in latin modern diff --git a/tex/context/base/type-enc.tex b/tex/context/base/type-enc.tex index 8ba9156e4..af6c69746 100644 --- a/tex/context/base/type-enc.tex +++ b/tex/context/base/type-enc.tex @@ -26,7 +26,172 @@ \starttypescriptcollection[encodings] -\starttypescript [serif] [modern,latin-modern,computer-modern] [texnansi,ec,qx,pl0,il2,t5] +\starttypescript[all][modern,latin-modern][all] + + % fallbacks, no math in latin modern + + \definefontsynonym[lmbsy10] [cmbsy10] + \definefontsynonym[lmbsy5] [cmbsy5] + \definefontsynonym[lmbsy6] [cmbsy7] + \definefontsynonym[lmbsy7] [cmbsy7] + \definefontsynonym[lmbsy8] [cmbsy7] + \definefontsynonym[lmbsy9] [cmbsy10] + \definefontsynonym[lmdunh10][cmdunh10] + \definefontsynonym[lmex10] [cmex10] + \definefontsynonym[lmex7] [cmex10] + \definefontsynonym[lmex8] [cmex10] + \definefontsynonym[lmex9] [cmex10] + \definefontsynonym[lmff10] [cmff10] + \definefontsynonym[lmfi10] [cmfi10] + \definefontsynonym[lmfib8] [cmfib8] + \definefontsynonym[lmmi10] [cmmi10] + \definefontsynonym[lmmi12] [cmmi12] + \definefontsynonym[lmmi5] [cmmi5] + \definefontsynonym[lmmi6] [cmmi6] + \definefontsynonym[lmmi7] [cmmi7] + \definefontsynonym[lmmi8] [cmmi8] + \definefontsynonym[lmmi9] [cmmi9] + \definefontsynonym[lmmib10] [cmmib10] + \definefontsynonym[lmmib5] [cmmib5] + \definefontsynonym[lmmib6] [cmmib7] + \definefontsynonym[lmmib7] [cmmib7] + \definefontsynonym[lmmib8] [cmmib7] + \definefontsynonym[lmmib9] [cmmib10] + \definefontsynonym[lmsy10] [cmsy10] + \definefontsynonym[lmsy5] [cmsy5] + \definefontsynonym[lmsy6] [cmsy6] + \definefontsynonym[lmsy7] [cmsy7] + \definefontsynonym[lmsy8] [cmsy8] + \definefontsynonym[lmsy9] [cmsy9] + \definefontsynonym[lmtex10] [cmtex10] + \definefontsynonym[lmtex8] [cmtex8] + \definefontsynonym[lmtex9] [cmtex9] + +\stoptypescript + +\starttypescript [serif] [modern,latin-modern] [texnansi,ec,qx,t5] + + \definefontsynonym [LMRoman10-DemiOblique] [\typescriptthree-lmbo10] [encoding=\typescriptthree] + \definefontsynonym [LMRoman10-Bold] [\typescriptthree-lmbx10] [encoding=\typescriptthree] + \definefontsynonym [LMRoman12-Bold] [\typescriptthree-lmbx12] [encoding=\typescriptthree] + \definefontsynonym [LMRoman5-Bold] [\typescriptthree-lmbx5] [encoding=\typescriptthree] + \definefontsynonym [LMRoman6-Bold] [\typescriptthree-lmbx6] [encoding=\typescriptthree] + \definefontsynonym [LMRoman7-Bold] [\typescriptthree-lmbx7] [encoding=\typescriptthree] + \definefontsynonym [LMRoman8-Bold] [\typescriptthree-lmbx8] [encoding=\typescriptthree] + \definefontsynonym [LMRoman9-Bold] [\typescriptthree-lmbx9] [encoding=\typescriptthree] + \definefontsynonym [LMRoman10-BoldItalic] [\typescriptthree-lmbxi10] [encoding=\typescriptthree] + \definefontsynonym [LMRoman10-BoldOblique] [\typescriptthree-lmbxo10] [encoding=\typescriptthree] + \definefontsynonym [LMRoman10-CapsRegular] [\typescriptthree-lmcsc10] [encoding=\typescriptthree] + \definefontsynonym [LMRoman10-CapsOblique] [\typescriptthree-lmcsco10] [encoding=\typescriptthree] + \definefontsynonym [LMRoman10-Regular] [\typescriptthree-lmr10] [encoding=\typescriptthree] + \definefontsynonym [LMRoman12-Regular] [\typescriptthree-lmr12] [encoding=\typescriptthree] + \definefontsynonym [LMRoman17-Regular] [\typescriptthree-lmr17] [encoding=\typescriptthree] + \definefontsynonym [LMRoman5-Regular] [\typescriptthree-lmr5] [encoding=\typescriptthree] + \definefontsynonym [LMRoman6-Regular] [\typescriptthree-lmr6] [encoding=\typescriptthree] + \definefontsynonym [LMRoman7-Regular] [\typescriptthree-lmr7] [encoding=\typescriptthree] + \definefontsynonym [LMRoman8-Regular] [\typescriptthree-lmr8] [encoding=\typescriptthree] + \definefontsynonym [LMRoman9-Regular] [\typescriptthree-lmr9] [encoding=\typescriptthree] + \definefontsynonym [LMRoman10-Italic] [\typescriptthree-lmri10] [encoding=\typescriptthree] + \definefontsynonym [LMRoman12-Italic] [\typescriptthree-lmri12] [encoding=\typescriptthree] + \definefontsynonym [LMRoman7-Italic] [\typescriptthree-lmri7] [encoding=\typescriptthree] + \definefontsynonym [LMRoman8-Italic] [\typescriptthree-lmri8] [encoding=\typescriptthree] + \definefontsynonym [LMRoman9-Italic] [\typescriptthree-lmri9] [encoding=\typescriptthree] + \definefontsynonym [LMRoman10-Oblique] [\typescriptthree-lmro10] [encoding=\typescriptthree] + \definefontsynonym [LMRoman12-Oblique] [\typescriptthree-lmro12] [encoding=\typescriptthree] + \definefontsynonym [LMRoman17-Oblique] [\typescriptthree-lmro17] [encoding=\typescriptthree] + \definefontsynonym [LMRoman8-Oblique] [\typescriptthree-lmro8] [encoding=\typescriptthree] + \definefontsynonym [LMRoman9-Oblique] [\typescriptthree-lmro9] [encoding=\typescriptthree] + + \definefontsynonym [LMRoman-DemiOblique] [LMRoman10-DemiOblique] [encoding=\typescriptthree] + \definefontsynonym [LMRoman-Bold] [LMRoman10-Bold] [encoding=\typescriptthree] + \definefontsynonym [LMRoman-BoldItalic] [LMRoman10-BoldItalic] [encoding=\typescriptthree] + \definefontsynonym [LMRoman-BoldOblique] [LMRoman10-BoldOblique] [encoding=\typescriptthree] + \definefontsynonym [LMRoman-CapsRegular] [LMRoman10-CapsRegular] [encoding=\typescriptthree] + \definefontsynonym [LMRoman-CapsOblique] [LMRoman10-CapsOblique] [encoding=\typescriptthree] + \definefontsynonym [LMRoman-Regular] [LMRoman10-Regular] [encoding=\typescriptthree] + \definefontsynonym [LMRoman-Italic] [LMRoman10-Italic] [encoding=\typescriptthree] + \definefontsynonym [LMRoman-Oblique] [LMRoman10-Oblique] [encoding=\typescriptthree] + +\stoptypescript + +\starttypescript [sans] [modern,latin-modern] [texnansi,ec,qx,t5] + + \definefontsynonym [LMSans10-Regular] [\typescriptthree-lmss10] [encoding=\typescriptthree] + \definefontsynonym [LMSans12-Regular] [\typescriptthree-lmss12] [encoding=\typescriptthree] + \definefontsynonym [LMSans17-Regular] [\typescriptthree-lmss17] [encoding=\typescriptthree] + \definefontsynonym [LMSans8-Regular] [\typescriptthree-lmss8] [encoding=\typescriptthree] + \definefontsynonym [LMSans9-Regular] [\typescriptthree-lmss9] [encoding=\typescriptthree] + \definefontsynonym [LMSans10-BoldOblique] [\typescriptthree-lmssbo10] [encoding=\typescriptthree] + \definefontsynonym [LMSans10-Bold] [\typescriptthree-lmssbx10] [encoding=\typescriptthree] + \definefontsynonym [LMSans10-DemiCondensed] [\typescriptthree-lmssdc10] [encoding=\typescriptthree] + \definefontsynonym [LMSans10-DemiCondensedOblique] [\typescriptthree-lmssdo10] [encoding=\typescriptthree] + \definefontsynonym [LMSans10-Oblique] [\typescriptthree-lmsso10] [encoding=\typescriptthree] + \definefontsynonym [LMSans12-Oblique] [\typescriptthree-lmsso12] [encoding=\typescriptthree] + \definefontsynonym [LMSans17-Oblique] [\typescriptthree-lmsso17] [encoding=\typescriptthree] + \definefontsynonym [LMSans8-Oblique] [\typescriptthree-lmsso8] [encoding=\typescriptthree] + \definefontsynonym [LMSans9-Oblique] [\typescriptthree-lmsso9] [encoding=\typescriptthree] + \definefontsynonym [LMSansQuotation8-Regular] [\typescriptthree-lmssq8] [encoding=\typescriptthree] + \definefontsynonym [LMSansQuotation8-BoldOblique] [\typescriptthree-lmssqbo8] [encoding=\typescriptthree] + \definefontsynonym [LMSansQuotation8-Bold] [\typescriptthree-lmssqbx8] [encoding=\typescriptthree] + \definefontsynonym [LMSansQuotation8-Oblique] [\typescriptthree-lmssqo8] [encoding=\typescriptthree] + + \definefontsynonym [LMSans-Regular] [LMSans10-Regular] [encoding=\typescriptthree] + \definefontsynonym [LMSans-BoldOblique] [LMSans10-BoldOblique] [encoding=\typescriptthree] + \definefontsynonym [LMSans-Bold] [LMSans10-Bold] [encoding=\typescriptthree] + \definefontsynonym [LMSans-DemiCondensed] [LMSans10-DemiCondensed] [encoding=\typescriptthree] + \definefontsynonym [LMSans-DemiCondensedOblique] [LMSans10-DemiCondensedOblique] [encoding=\typescriptthree] + \definefontsynonym [LMSans-Oblique] [LMSans10-Oblique] [encoding=\typescriptthree] + +\stoptypescript + +\starttypescript [mono] [modern,latin-modern,modern-vari,latin-modern-vari,modern-cond,latin-modern-cond] [texnansi,ec,qx,t5] + + \definefontsynonym [LMTypewriter10-CapsRegular] [\typescriptthree-lmtcsc10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter10-CapsOblique] [\typescriptthree-lmtcso10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter10-Light] [\typescriptthree-lmtl10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter10-LightOblique] [\typescriptthree-lmtlo10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter10-LightCondensed] [\typescriptthree-lmtlc10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter10-LightCondensedOblique] [\typescriptthree-lmtlco10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter10-Dark] [\typescriptthree-lmtk10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter10-DarkOblique] [\typescriptthree-lmtko10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter10-Regular] [\typescriptthree-lmtt10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter12-Regular] [\typescriptthree-lmtt12] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter8-Regular] [\typescriptthree-lmtt8] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter9-Regular] [\typescriptthree-lmtt9] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter10-Italic] [\typescriptthree-lmtti10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter10-Oblique] [\typescriptthree-lmtto10] [encoding=\typescriptthree] + + \definefontsynonym [LMTypewriterVarWd10-Regular] [\typescriptthree-lmvtt10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriterVarWd10-Oblique] [\typescriptthree-lmvtto10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriterVarWd10-Light] [\typescriptthree-lmvtl10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriterVarWd10-LightOblique] [\typescriptthree-lmvtlo10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriterVarWd10-Dark] [\typescriptthree-lmvtk10] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriterVarWd10-DarkOblique] [\typescriptthree-lmvtko10] [encoding=\typescriptthree] + + \definefontsynonym [LMTypewriter-CapsRegular] [LMTypewriter10-CapsRegular] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter-CapsOblique] [LMTypewriter10-CapsOblique] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter-Light] [LMTypewriter10-Light] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter-LightOblique] [LMTypewriter10-LightOblique] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter-LightCondensed] [LMTypewriter10-LightCondensed] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter-LightCondensedOblique] [LMTypewriter10-LightCondensedOblique][encoding=\typescriptthree] + \definefontsynonym [LMTypewriter-Dark] [LMTypewriter10-Dark] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter-DarkOblique] [LMTypewriter10-DarkOblique] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter-Regular] [LMTypewriter10-Regular] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter-Italic] [LMTypewriter10-Italic] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriter-Oblique] [LMTypewriter10-Oblique] [encoding=\typescriptthree] + + \definefontsynonym [LMTypewriterVarWd-Regular] [LMTypewriterVarWd10-Regular] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriterVarWd-Oblique] [LMTypewriterVarWd10-Oblique] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriterVarWd-Light] [LMTypewriterVarWd10-Light] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriterVarWd-LightOblique] [LMTypewriterVarWd10-LightOblique] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriterVarWd-Dark] [LMTypewriterVarWd10-Dark] [encoding=\typescriptthree] + \definefontsynonym [LMTypewriterVarWd-DarkOblique] [LMTypewriterVarWd10-DarkOblique] [encoding=\typescriptthree] + +\stoptypescript + +% todo: map these onto verbose names + +\starttypescript [serif] [modern,latin-modern,computer-modern] [texnansi,ec,qx,t5] \definefontsynonym [cmr5] [\typescriptthree-lmr5] [encoding=\typescriptthree] \definefontsynonym [cmr6] [\typescriptthree-lmr6] [encoding=\typescriptthree] @@ -66,7 +231,7 @@ \stoptypescript -\starttypescript [sans] [modern,latin-modern,computer-modern] [texnansi,ec,qx,pl0,il2,t5] +\starttypescript [sans] [modern,latin-modern,computer-modern] [texnansi,ec,qx,t5] \definefontsynonym [cmss8] [\typescriptthree-lmss8] [encoding=\typescriptthree] \definefontsynonym [cmss9] [\typescriptthree-lmss9] [encoding=\typescriptthree] @@ -92,7 +257,7 @@ \stoptypescript -\starttypescript [mono] [modern,latin-modern,computer-modern] [texnansi,ec,qx,pl0,il2,t5] +\starttypescript [mono] [modern,latin-modern,computer-modern] [texnansi,ec,qx,t5] \definefontsynonym [cmtt8] [\typescriptthree-lmtt8] [encoding=\typescriptthree] \definefontsynonym [cmtt9] [\typescriptthree-lmtt9] [encoding=\typescriptthree] @@ -109,313 +274,6 @@ \stoptypescript -% \starttypescript [all] [computer-modern] [ec] % will become ae -% \definefontsynonym [cmb10] [aeb10] [encoding=ec,handling=glm] -% \definefontsynonym [cmbx10] [aebx10] [encoding=ec,handling=glm] -% \definefontsynonym [cmbx12] [aebx12] [encoding=ec,handling=glm] -% \definefontsynonym [cmbx5] [aebx5] [encoding=ec,handling=glm] -% \definefontsynonym [cmbx6] [aebx6] [encoding=ec,handling=glm] -% \definefontsynonym [cmbx7] [aebx7] [encoding=ec,handling=glm] -% \definefontsynonym [cmbx8] [aebx8] [encoding=ec,handling=glm] -% \definefontsynonym [cmbx9] [aebx9] [encoding=ec,handling=glm] -% \definefontsynonym [cmbxsl10] [aebxsl10] [encoding=ec,handling=glm] -% \definefontsynonym [cmbxti10] [aebxti10] [encoding=ec,handling=glm] -% \definefontsynonym [cmcsc10] [aecsc10] [encoding=ec,handling=glm] -% \definefontsynonym [cmitt10] [aeitt10] [encoding=ec,handling=glm] -% \definefontsynonym [cmr10] [aer10] [encoding=ec,handling=glm] -% \definefontsynonym [cmr12] [aer12] [encoding=ec,handling=glm] -% \definefontsynonym [cmr17] [aer17] [encoding=ec,handling=glm] -% \definefontsynonym [cmr5] [aer5] [encoding=ec,handling=glm] -% \definefontsynonym [cmr6] [aer6] [encoding=ec,handling=glm] -% \definefontsynonym [cmr7] [aer7] [encoding=ec,handling=glm] -% \definefontsynonym [cmr8] [aer8] [encoding=ec,handling=glm] -% \definefontsynonym [cmr9] [aer9] [encoding=ec,handling=glm] -% \definefontsynonym [cmsl10] [aesl10] [encoding=ec,handling=glm] -% \definefontsynonym [cmsl12] [aesl12] [encoding=ec,handling=glm] -% \definefontsynonym [cmsl8] [aesl8] [encoding=ec,handling=glm] -% \definefontsynonym [cmsl9] [aesl9] [encoding=ec,handling=glm] -% \definefontsynonym [cmsltt10] [aesltt10] [encoding=ec,handling=glm] -% \definefontsynonym [cmss10] [aess10] [encoding=ec,handling=glm] -% \definefontsynonym [cmss12] [aess12] [encoding=ec,handling=glm] -% \definefontsynonym [cmss17] [aess17] [encoding=ec,handling=glm] -% \definefontsynonym [cmss8] [aess8] [encoding=ec,handling=glm] -% \definefontsynonym [cmss9] [aess9] [encoding=ec,handling=glm] -% \definefontsynonym [cmssbx10] [aessbx10] [encoding=ec,handling=glm] -% \definefontsynonym [cmssdc10] [aessdc10] [encoding=ec,handling=glm] -% \definefontsynonym [cmssi10] [aessi10] [encoding=ec,handling=glm] -% \definefontsynonym [cmssi12] [aessi12] [encoding=ec,handling=glm] -% \definefontsynonym [cmssi17] [aessi17] [encoding=ec,handling=glm] -% \definefontsynonym [cmssi8] [aessi8] [encoding=ec,handling=glm] -% \definefontsynonym [cmssi9] [aessi9] [encoding=ec,handling=glm] -% \definefontsynonym [cmtcsc10] [aetcsc10] [encoding=ec,handling=glm] -% \definefontsynonym [cmti10] [aeti10] [encoding=ec,handling=glm] -% \definefontsynonym [cmti12] [aeti12] [encoding=ec,handling=glm] -% \definefontsynonym [cmti7] [aeti7] [encoding=ec,handling=glm] -% \definefontsynonym [cmti8] [aeti8] [encoding=ec,handling=glm] -% \definefontsynonym [cmti9] [aeti9] [encoding=ec,handling=glm] -% \definefontsynonym [cmtt10] [aett10] [encoding=ec,handling=glm] -% \definefontsynonym [cmtt12] [aett12] [encoding=ec,handling=glm] -% \definefontsynonym [cmtt8] [aett8] [encoding=ec,handling=glm] -% \definefontsynonym [cmtt9] [aett9] [encoding=ec,handling=glm] -% \stoptypescript - -% \starttypescript [all] [computer-modern] [il2] -% \definefontsynonym [cmb10] [csb10] [encoding=il2] -% \definefontsynonym [cmbx10] [csbx10] [encoding=il2] -% \definefontsynonym [cmbx12] [csbx12] [encoding=il2] -% \definefontsynonym [cmbx5] [csbx5] [encoding=il2] -% \definefontsynonym [cmbx6] [csbx6] [encoding=il2] -% \definefontsynonym [cmbx7] [csbx7] [encoding=il2] -% \definefontsynonym [cmbx8] [csbx8] [encoding=il2] -% \definefontsynonym [cmbx9] [csbx9] [encoding=il2] -% \definefontsynonym [cmbxsl10] [csbxsl10] [encoding=il2] -% \definefontsynonym [cmbxti10] [csbxti10] [encoding=il2] -% \definefontsynonym [cmcsc10] [cscsc10] [encoding=il2] -% \definefontsynonym [cmdunh10] [csdunh10] [encoding=il2] -% \definefontsynonym [cmff10] [csff10] [encoding=il2] -% \definefontsynonym [cmfi10] [csfi10] [encoding=il2] -% \definefontsynonym [cmfib8] [csfib8] [encoding=il2] -% \definefontsynonym [cminch] [csinch] [encoding=il2] -% \definefontsynonym [cmitt10] [csitt10] [encoding=il2] -% \definefontsynonym [cmr10] [csr10] [encoding=il2] -% \definefontsynonym [cmr12] [csr12] [encoding=il2] -% \definefontsynonym [cmr17] [csr17] [encoding=il2] -% \definefontsynonym [cmr5] [csr5] [encoding=il2] -% \definefontsynonym [cmr6] [csr6] [encoding=il2] -% \definefontsynonym [cmr7] [csr7] [encoding=il2] -% \definefontsynonym [cmr8] [csr8] [encoding=il2] -% \definefontsynonym [cmr9] [csr9] [encoding=il2] -% \definefontsynonym [cmsl10] [cssl10] [encoding=il2] -% \definefontsynonym [cmsl12] [cssl12] [encoding=il2] -% \definefontsynonym [cmsl8] [cssl8] [encoding=il2] -% \definefontsynonym [cmsl9] [cssl9] [encoding=il2] -% \definefontsynonym [cmsltt10] [cssltt10] [encoding=il2] -% \definefontsynonym [cmss10] [csss10] [encoding=il2] -% \definefontsynonym [cmss12] [csss12] [encoding=il2] -% \definefontsynonym [cmss17] [csss17] [encoding=il2] -% \definefontsynonym [cmss8] [csss8] [encoding=il2] -% \definefontsynonym [cmss9] [csss9] [encoding=il2] -% \definefontsynonym [cmssbx10] [csssbx10] [encoding=il2] -% \definefontsynonym [cmssdc10] [csssdc10] [encoding=il2] -% \definefontsynonym [cmssi10] [csssi10] [encoding=il2] -% \definefontsynonym [cmssi12] [csssi12] [encoding=il2] -% \definefontsynonym [cmssi17] [csssi17] [encoding=il2] -% \definefontsynonym [cmssi8] [csssi8] [encoding=il2] -% \definefontsynonym [cmssi9] [csssi9] [encoding=il2] -% \definefontsynonym [cmssq8] [csssq8] [encoding=il2] -% \definefontsynonym [cmssqi8] [csssqi8] [encoding=il2] -% \definefontsynonym [cmtcsc10] [cstcsc10] [encoding=il2] -% \definefontsynonym [cmti10] [csti10] [encoding=il2] -% \definefontsynonym [cmti12] [csti12] [encoding=il2] -% \definefontsynonym [cmti7] [csti7] [encoding=il2] -% \definefontsynonym [cmti8] [csti8] [encoding=il2] -% \definefontsynonym [cmti9] [csti9] [encoding=il2] -% \definefontsynonym [cmtt10] [cstt10] [encoding=il2] -% \definefontsynonym [cmtt12] [cstt12] [encoding=il2] -% \definefontsynonym [cmtt8] [cstt8] [encoding=il2] -% \definefontsynonym [cmtt9] [cstt9] [encoding=il2] -% \definefontsynonym [cmu10] [csu10] [encoding=il2] -% \definefontsynonym [cmvtt10] [csvtt10] [encoding=il2] -% \stoptypescript - -% \starttypescript [all] [computer-modern] [pl0] -% \definefontsynonym [cmb10] [plb10] [encoding=pl0] -% \definefontsynonym [cmbsy10] [plbsy10] [encoding=pl0] -% \definefontsynonym [cmbx10] [plbx10] [encoding=pl0] -% \definefontsynonym [cmbx12] [plbx12] [encoding=pl0] -% \definefontsynonym [cmbx5] [plbx5] [encoding=pl0] -% \definefontsynonym [cmbx6] [plbx6] [encoding=pl0] -% \definefontsynonym [cmbx7] [plbx7] [encoding=pl0] -% \definefontsynonym [cmbx8] [plbx8] [encoding=pl0] -% \definefontsynonym [cmbx9] [plbx9] [encoding=pl0] -% \definefontsynonym [cmbxsl10] [plbxsl10] [encoding=pl0] -% \definefontsynonym [cmbxti10] [plbxti10] [encoding=pl0] -% \definefontsynonym [cmcsc10] [plcsc10] [encoding=pl0] -% \definefontsynonym [cmdunh10] [pldunh10] [encoding=pl0] -% \definefontsynonym [cmex10] [plex10] [encoding=pl0] -% \definefontsynonym [cmex9] [plex9] [encoding=pl0] -% \definefontsynonym [cmff10] [plff10] [encoding=pl0] -% \definefontsynonym [cmfi10] [plfi10] [encoding=pl0] -% \definefontsynonym [cmfib8] [plfib8] [encoding=pl0] -% \definefontsynonym [cminch] [plinch] [encoding=pl0] -% \definefontsynonym [cmitt10] [plitt10] [encoding=pl0] -% \definefontsynonym [cmmi10] [plmi10] [encoding=pl0] -% \definefontsynonym [cmmi12] [plmi12] [encoding=pl0] -% \definefontsynonym [cmmi5] [plmi5] [encoding=pl0] -% \definefontsynonym [cmmi6] [plmi6] [encoding=pl0] -% \definefontsynonym [cmmi7] [plmi7] [encoding=pl0] -% \definefontsynonym [cmmi8] [plmi8] [encoding=pl0] -% \definefontsynonym [cmmi9] [plmi9] [encoding=pl0] -% \definefontsynonym [cmmib10] [plmib10] [encoding=pl0] -% \definefontsynonym [cmr10] [plr10] [encoding=pl0] -% \definefontsynonym [cmr12] [plr12] [encoding=pl0] -% \definefontsynonym [cmr17] [plr17] [encoding=pl0] -% \definefontsynonym [cmr5] [plr5] [encoding=pl0] -% \definefontsynonym [cmr6] [plr6] [encoding=pl0] -% \definefontsynonym [cmr7] [plr7] [encoding=pl0] -% \definefontsynonym [cmr8] [plr8] [encoding=pl0] -% \definefontsynonym [cmr9] [plr9] [encoding=pl0] -% \definefontsynonym [cmsl10] [plsl10] [encoding=pl0] -% \definefontsynonym [cmsl12] [plsl12] [encoding=pl0] -% \definefontsynonym [cmsl8] [plsl8] [encoding=pl0] -% \definefontsynonym [cmsl9] [plsl9] [encoding=pl0] -% \definefontsynonym [cmsltt10] [plsltt10] [encoding=pl0] -% \definefontsynonym [cmss10] [plss10] [encoding=pl0] -% \definefontsynonym [cmss12] [plss12] [encoding=pl0] -% \definefontsynonym [cmss17] [plss17] [encoding=pl0] -% \definefontsynonym [cmss8] [plss8] [encoding=pl0] -% \definefontsynonym [cmss9] [plss9] [encoding=pl0] -% \definefontsynonym [cmssbi10] [plssbi10] [encoding=pl0] -% \definefontsynonym [cmssbx10] [plssbx10] [encoding=pl0] -% \definefontsynonym [cmssdc10] [plssdc10] [encoding=pl0] -% \definefontsynonym [cmssi10] [plssi10] [encoding=pl0] -% \definefontsynonym [cmssi12] [plssi12] [encoding=pl0] -% \definefontsynonym [cmssi17] [plssi17] [encoding=pl0] -% \definefontsynonym [cmssi8] [plssi8] [encoding=pl0] -% \definefontsynonym [cmssi9] [plssi9] [encoding=pl0] -% \definefontsynonym [cmssq8] [plssq8] [encoding=pl0] -% \definefontsynonym [cmssqi8] [plssqi8] [encoding=pl0] -% \definefontsynonym [cmsy10] [plsy10] [encoding=pl0] -% \definefontsynonym [cmsy5] [plsy5] [encoding=pl0] -% \definefontsynonym [cmsy6] [plsy6] [encoding=pl0] -% \definefontsynonym [cmsy7] [plsy7] [encoding=pl0] -% \definefontsynonym [cmsy8] [plsy8] [encoding=pl0] -% \definefontsynonym [cmsy9] [plsy9] [encoding=pl0] -% \definefontsynonym [cmtcsc10] [pltcsc10] [encoding=pl0] -% \definefontsynonym [cmtex10] [pltex10] [encoding=pl0] -% \definefontsynonym [cmtex8] [pltex8] [encoding=pl0] -% \definefontsynonym [cmtex9] [pltex9] [encoding=pl0] -% \definefontsynonym [cmti10] [plti10] [encoding=pl0] -% \definefontsynonym [cmti12] [plti12] [encoding=pl0] -% \definefontsynonym [cmti7] [plti7] [encoding=pl0] -% \definefontsynonym [cmti8] [plti8] [encoding=pl0] -% \definefontsynonym [cmti9] [plti9] [encoding=pl0] -% \definefontsynonym [cmtt10] [pltt10] [encoding=pl0] -% \definefontsynonym [cmtt12] [pltt12] [encoding=pl0] -% \definefontsynonym [cmtt8] [pltt8] [encoding=pl0] -% \definefontsynonym [cmtt9] [pltt9] [encoding=pl0] -% \definefontsynonym [cmu10] [plu10] [encoding=pl0] -% \definefontsynonym [cmvtt10] [plvtt10] [encoding=pl0] -% \stoptypescript - -% \starttypescript [all] [computer-modern] [t5] -% \definefontsynonym [cmb10] [vnb10] [encoding=t5] -% \definefontsynonym [cmbx10] [vnbx10] [encoding=t5] -% \definefontsynonym [cmbx12] [vnbx12] [encoding=t5] -% \definefontsynonym [cmbx5] [vnbx5] [encoding=t5] -% \definefontsynonym [cmbx6] [vnbx6] [encoding=t5] -% \definefontsynonym [cmbx7] [vnbx7] [encoding=t5] -% \definefontsynonym [cmbx8] [vnbx8] [encoding=t5] -% \definefontsynonym [cmbx9] [vnbx9] [encoding=t5] -% \definefontsynonym [cmbxsl10] [vnbxsl10] [encoding=t5] -% \definefontsynonym [cmbxti10] [vnbxti10] [encoding=t5] -% \definefontsynonym [cmcsc10] [vncsc10] [encoding=t5] -% \definefontsynonym [cmdunh10] [vndunh10] [encoding=t5] -% \definefontsynonym [cmff10] [vnff10] [encoding=t5] -% \definefontsynonym [cmfi10] [vnfi10] [encoding=t5] -% \definefontsynonym [cmfib8] [vnfib8] [encoding=t5] -% \definefontsynonym [cminch] [vninch] [encoding=t5] -% \definefontsynonym [cmitt10] [vnitt10] [encoding=t5] -% \definefontsynonym [cmr10] [vnr10] [encoding=t5] -% \definefontsynonym [cmr12] [vnr12] [encoding=t5] -% \definefontsynonym [cmr17] [vnr17] [encoding=t5] -% \definefontsynonym [cmr5] [vnr5] [encoding=t5] -% \definefontsynonym [cmr6] [vnr6] [encoding=t5] -% \definefontsynonym [cmr7] [vnr7] [encoding=t5] -% \definefontsynonym [cmr8] [vnr8] [encoding=t5] -% \definefontsynonym [cmr9] [vnr9] [encoding=t5] -% \definefontsynonym [cmsl10] [vnsl10] [encoding=t5] -% \definefontsynonym [cmsl12] [vnsl12] [encoding=t5] -% \definefontsynonym [cmsl8] [vnsl8] [encoding=t5] -% \definefontsynonym [cmsl9] [vnsl9] [encoding=t5] -% \definefontsynonym [cmsltt10] [vnsltt10] [encoding=t5] -% \definefontsynonym [cmss10] [vnss10] [encoding=t5] -% \definefontsynonym [cmss12] [vnss12] [encoding=t5] -% \definefontsynonym [cmss17] [vnss17] [encoding=t5] -% \definefontsynonym [cmss8] [vnss8] [encoding=t5] -% \definefontsynonym [cmss9] [vnss9] [encoding=t5] -% \definefontsynonym [cmssbx10] [vnssbx10] [encoding=t5] -% \definefontsynonym [cmssdc10] [vnssdc10] [encoding=t5] -% \definefontsynonym [cmssi10] [vnssi10] [encoding=t5] -% \definefontsynonym [cmssi12] [vnssi12] [encoding=t5] -% \definefontsynonym [cmssi17] [vnssi17] [encoding=t5] -% \definefontsynonym [cmssi8] [vnssi8] [encoding=t5] -% \definefontsynonym [cmssi9] [vnssi9] [encoding=t5] -% \definefontsynonym [cmssq8] [vnssq8] [encoding=t5] -% \definefontsynonym [cmssqi8] [vnssqi8] [encoding=t5] -% \definefontsynonym [cmtcsc10] [vntcsc10] [encoding=t5] -% \definefontsynonym [cmti10] [vnti10] [encoding=t5] -% \definefontsynonym [cmti12] [vnti12] [encoding=t5] -% \definefontsynonym [cmti7] [vnti7] [encoding=t5] -% \definefontsynonym [cmti8] [vnti8] [encoding=t5] -% \definefontsynonym [cmti9] [vnti9] [encoding=t5] -% \definefontsynonym [cmtt10] [vntt10] [encoding=t5] -% \definefontsynonym [cmtt12] [vntt12] [encoding=t5] -% \definefontsynonym [cmtt8] [vntt8] [encoding=t5] -% \definefontsynonym [cmtt9] [vntt9] [encoding=t5] -% \definefontsynonym [cmu10] [vnu10] [encoding=t5] -% \definefontsynonym [cmvtt10] [vnvtt10] [encoding=t5] -% \stoptypescript - -% \starttypescript [all] [computer-modern] [ec] -% \definefontsynonym [cmb10] [ecrb1000] [encoding=ec] -% \definefontsynonym [cmbx10] [ecbx1000] [encoding=ec] -% \definefontsynonym [cmbx12] [ecbx1200] [encoding=ec] -% \definefontsynonym [cmbx5] [ecbx0500] [encoding=ec] -% \definefontsynonym [cmbx6] [ecbx0600] [encoding=ec] -% \definefontsynonym [cmbx7] [ecbx0700] [encoding=ec] -% \definefontsynonym [cmbx8] [ecbx0800] [encoding=ec] -% \definefontsynonym [cmbx9] [ecbx0900] [encoding=ec] -% \definefontsynonym [cmbxsl10] [ecbl1000] [encoding=ec] -% \definefontsynonym [cmbxti10] [ecbi1000] [encoding=ec] -% \definefontsynonym [cmcsc10] [eccc1000] [encoding=ec] -% \definefontsynonym [cmdunh10] [ecdh1000] [encoding=ec] -% \definefontsynonym [cmff10] [ecff1000] [encoding=ec] -% \definefontsynonym [cmfi10] [ecfi1000] [encoding=ec] -% \definefontsynonym [cmfib8] [ecfb0800] [encoding=ec] -% %\definefontsynonym [cminch] [ecinch00] [encoding=ec] -% \definefontsynonym [cmitt10] [ecit1000] [encoding=ec] -% \definefontsynonym [cmr10] [ecrm1000] [encoding=ec] -% \definefontsynonym [cmr12] [ecrm1200] [encoding=ec] -% \definefontsynonym [cmr17] [ecrm1700] [encoding=ec] -% \definefontsynonym [cmr5] [ecrm0500] [encoding=ec] -% \definefontsynonym [cmr6] [ecrm0600] [encoding=ec] -% \definefontsynonym [cmr7] [ecrm0700] [encoding=ec] -% \definefontsynonym [cmr8] [ecrm0800] [encoding=ec] -% \definefontsynonym [cmr9] [ecrm0900] [encoding=ec] -% \definefontsynonym [cmsl10] [ecsl1000] [encoding=ec] -% \definefontsynonym [cmsl12] [ecsl1200] [encoding=ec] -% \definefontsynonym [cmsl8] [ecsl0800] [encoding=ec] -% \definefontsynonym [cmsl9] [ecsl0900] [encoding=ec] -% \definefontsynonym [cmsltt10] [ecst1000] [encoding=ec] -% \definefontsynonym [cmss10] [ecss1000] [encoding=ec] -% \definefontsynonym [cmss12] [ecss1200] [encoding=ec] -% \definefontsynonym [cmss17] [ecss1700] [encoding=ec] -% \definefontsynonym [cmss8] [ecss0800] [encoding=ec] -% \definefontsynonym [cmss9] [ecss0900] [encoding=ec] -% \definefontsynonym [cmssbx10] [ecsx1000] [encoding=ec] -% %\definefontsynonym [cmssdc10] [ecssdc1000] [encoding=ec] -% \definefontsynonym [cmssi10] [ecsi1000] [encoding=ec] -% \definefontsynonym [cmssi12] [ecsi1200] [encoding=ec] -% \definefontsynonym [cmssi17] [ecsi1700] [encoding=ec] -% \definefontsynonym [cmssi8] [ecsi0800] [encoding=ec] -% \definefontsynonym [cmssi9] [ecsi0900] [encoding=ec] -% \definefontsynonym [cmssq8] [ecss0800] [encoding=ec] % ssq->ss -% \definefontsynonym [cmssqi8] [ecsi0800] [encoding=ec] % ssq->ss -% \definefontsynonym [cmtcsc10] [ectc1000] [encoding=ec] -% \definefontsynonym [cmti10] [ecti1000] [encoding=ec] -% \definefontsynonym [cmti12] [ecti1200] [encoding=ec] -% \definefontsynonym [cmti7] [ecti0700] [encoding=ec] -% \definefontsynonym [cmti8] [ecti0800] [encoding=ec] -% \definefontsynonym [cmti9] [ecti0900] [encoding=ec] -% \definefontsynonym [cmtt10] [ectt1000] [encoding=ec] -% \definefontsynonym [cmtt12] [ectt1200] [encoding=ec] -% \definefontsynonym [cmtt8] [ectt0800] [encoding=ec] -% \definefontsynonym [cmtt9] [ectt0900] [encoding=ec] -% \definefontsynonym [cmu10] [ecui1000] [encoding=ec] -% \definefontsynonym [cmvtt10] [ecvt1000] [encoding=ec] -% \stoptypescript - %D {\em Comments by Victor Figurnov:} the wcmb10, wcmbx10, %D \unknown\ fonts below are taken from the Paradissa %D collection by Basil Malyshev. These fonts don't conform t2a @@ -637,37 +495,51 @@ \stoptypescript \starttypescript [serif] [modern,computer-modern,latin-modern] [default] - \definefontsynonym [ComputerModern] [cmr10] - \definefontsynonym [ComputerModern-Italic] [cmti10] - \definefontsynonym [ComputerModern-Slanted] [cmsl10] - \definefontsynonym [ComputerModern-Bold] [cmbx10] - \definefontsynonym [ComputerModern-BoldItalic] [cmbxti10] - \definefontsynonym [ComputerModern-BoldSlanted] [cmbxsl10] - \definefontsynonym [ComputerModern-Caps] [cmcsc10] -\stoptypescript - -\starttypescript [sans] [modern,computer-modern,latin-modern] [default] - \definefontsynonym [ComputerModernSans] [cmss10] - \definefontsynonym [ComputerModernSans-Italic] [cmssi10] - \definefontsynonym [ComputerModernSans-Slanted] [cmssi10] - \definefontsynonym [ComputerModernSans-Bold] [cmssbx10] - \definefontsynonym [ComputerModernSans-BoldItalic] [cmssbx10] - \definefontsynonym [ComputerModernSans-BoldSlanted] [cmssbx10] - \definefontsynonym [ComputerModernSans-Caps] [cmss10] -\stoptypescript - -\starttypescript [mono] [modern,computer-modern,latin-modern] [default] - \definefontsynonym [ComputerModernMono] [cmtt10] - \definefontsynonym [ComputerModernMono-Italic] [cmitt10] - \definefontsynonym [ComputerModernMono-Slanted] [cmsltt10] - \definefontsynonym [ComputerModernMono-Bold] [cmtt10] - \definefontsynonym [ComputerModernMono-BoldItalic] [cmtt10] - \definefontsynonym [ComputerModernMono-BoldSlanted] [cmtt10] - \definefontsynonym [ComputerModernMono-Caps] [cmtt10] - \definefontsynonym [ComputerModernMono-Variable] [cmvtt10] -\stoptypescript - -\starttypescript [math] [modern,computer-modern,latin-modern] [default] + \definefontsynonym [ComputerModern] [LMRoman-Regular] + \definefontsynonym [ComputerModern-Italic] [LMRoman-Italic] + \definefontsynonym [ComputerModern-Slanted] [LMRoman-Oblique] + \definefontsynonym [ComputerModern-Bold] [LMRoman-Bold] + \definefontsynonym [ComputerModern-BoldItalic] [LMRoman-BoldItalic] + \definefontsynonym [ComputerModern-BoldSlanted] [LMRoman-BoldOblique] + \definefontsynonym [ComputerModern-Caps] [LMRoman-CapsRegular] + \definefontsynonym [ComputerModern-CapsSlanted] [LMRoman-CapsOblique] +\stoptypescript + +\starttypescript [sans] [modern,computer-modern,latin-modern] % [default] + \definefontsynonym [ComputerModernSans] [LMSans-Regular] + \definefontsynonym [ComputerModernSans-Italic] [LMSans-Italic] + \definefontsynonym [ComputerModernSans-Slanted] [LMSans-Oblique] + \definefontsynonym [ComputerModernSans-Bold] [LMSans-Bold] + \definefontsynonym [ComputerModernSans-BoldItalic] [LMSans-BoldItalic] + \definefontsynonym [ComputerModernSans-BoldSlanted] [LMSans-BoldOblique] + \definefontsynonym [ComputerModernSans-Caps] [LMSans-Regular] % [LMSans-CapsRegular] + \definefontsynonym [ComputerModernSans-CapsSlanted] [LMSans-Oblique] % [LMSans-CapsOblique] +\stoptypescript + +\starttypescript [mono] [modern,computer-modern,latin-modern] % [default] + \definefontsynonym [ComputerModernMono] [LMTypewriter-Regular] + \definefontsynonym [ComputerModernMono-Italic] [LMTypewriter-Italic] + \definefontsynonym [ComputerModernMono-Slanted] [LMTypewriter-Oblique] + \definefontsynonym [ComputerModernMono-Bold] [LMTypewriter-Dark] + \definefontsynonym [ComputerModernMono-BoldItalic] [LMTypewriter-DarkOblique] % ! + \definefontsynonym [ComputerModernMono-BoldSlanted] [LMTypewriter-DarkOblique] + \definefontsynonym [ComputerModernMono-Caps] [LMTypewriter-CapsRegular] + \definefontsynonym [ComputerModernMono-CapsSlanted] [LMTypewriter-CapsOblique] + \definefontsynonym [ComputerModernMono-Variable] [LMTypewriterVarWd-Regular] +\stoptypescript + +\starttypescript [serif] [modern-vari,computer-modern-vari,latin-modern-vari] % [default] + \definefontsynonym [ComputerModernVariable] [LMTypewriterVarWd-Regular] + \definefontsynonym [ComputerModernVariable-Italic] [LMTypewriterVarWd-Oblique] + \definefontsynonym [ComputerModernVariable-Slanted] [LMTypewriterVarWd-Oblique] + \definefontsynonym [ComputerModernVariable-Bold] [LMTypewriterVarWd-Dark] + \definefontsynonym [ComputerModernVariable-BoldItalic] [LMTypewriterVarWd-DarkOblique] + \definefontsynonym [ComputerModernVariable-BoldSlanted] [LMTypewriterVarWd-DarkOblique] + \definefontsynonym [ComputerModernVariable-Caps] [LMTypewriterVarWd-Regular] + \definefontsynonym [ComputerModernVariable-CapsSlanted] [LMTypewriterVarWd-Oblique] +\stoptypescript + +\starttypescript [math] [modern,computer-modern,latin-modern] % [default] % watch the space, it prevents remapping \definefontsynonym [ComputerModernMath-Roman] [cmr10 ] \definefontsynonym [ComputerModernMath-Extension] [cmex10] @@ -675,7 +547,7 @@ \definefontsynonym [ComputerModernMath-Symbol] [cmsy10] \stoptypescript -\starttypescript [boldmath,bfmath] [modern,computer-modern,latin-modern] [default] +\starttypescript [boldmath,bfmath] [modern,computer-modern,latin-modern] % [default] % watch the space, it prevents remapping \definefontsynonym [ComputerModernMath-Roman-Bold] [cmb10 ] \definefontsynonym [ComputerModernMath-Extension] [cmex10] diff --git a/tex/context/base/type-exa.tex b/tex/context/base/type-exa.tex index ee9e01954..d08b565f4 100644 --- a/tex/context/base/type-exa.tex +++ b/tex/context/base/type-exa.tex @@ -15,7 +15,7 @@ \starttypescriptcollection[examples] -\starttypescript [fallback] [texnansi,ec,qx,il2,pl0,t5,default] +\starttypescript [fallback] [texnansi,ec,qx,t5,default] % no fontclass, so this is the fall back @@ -28,7 +28,7 @@ \stoptypescript -\starttypescript [modern] [texnansi,ec,qx,il2,pl0,t5,default] +\starttypescript [modern] [texnansi,ec,qx,t5,default] \definetypeface [modern] [rm] [serif] [modern] [computer-modern] [encoding=\typescripttwo] \definetypeface [modern] [ss] [sans] [modern] [computer-modern] [encoding=\typescripttwo] @@ -39,7 +39,7 @@ \stoptypescript -\starttypescript [modern-base] [texnansi,ec,qx,pl0,il2,t5,default] +\starttypescript [modern-base] [texnansi,ec,qx,t5,default] \definetypeface [modern] [rm] [serif] [modern] [default] [encoding=\typescripttwo] \definetypeface [modern] [ss] [sans] [modern] [default] [encoding=\typescripttwo] @@ -61,7 +61,16 @@ \stoptypescript -\starttypescript [postscript] [texnansi,ec,qx,8r,t5,uc] +\starttypescript [fallback,modern,modern-base] [il2] + \usetypescript[\typescriptone][ec] + \enableregime[il2] +\stoptypescript +\starttypescript [fallback,modern,modern-base] [pl0] + \usetypescript[\typescriptone][qx] + \enableregime[pl0] +\stoptypescript + +\starttypescript [postscript] [texnansi,ec,qx,t5,uc,8r] \definetypeface [postscript] [rm] [serif] [times] [default] [encoding=\typescripttwo] \definetypeface [postscript] [ss] [sans] [helvetica] [default] [rscale=.9,encoding=\typescripttwo] diff --git a/tex/context/base/type-ghz.tex b/tex/context/base/type-ghz.tex index 1551fe895..23f71d583 100644 --- a/tex/context/base/type-ghz.tex +++ b/tex/context/base/type-ghz.tex @@ -32,9 +32,9 @@ \definefontsynonym [SansItalic] [OptimaLT-Italic] \definefontsynonym [SansBold] [OptimaLT-Bold] \definefontsynonym [SansBoldItalic] [OptimaLT-BoldItalic] - \definefontsynonym [SansSlanted] [SansItalic] \definefontsynonym [SansBoldSlanted] [SansBoldItalic] + \definefontsynonym [SansCaps] [Sans] \stoptypescript @@ -72,9 +72,9 @@ \definefontsynonym [SansItalic] [OptimaNovaLT-Italic] \definefontsynonym [SansBold] [OptimaLT-Bold] \definefontsynonym [SansBoldItalic] [OptimaLT-BoldItalic] - \definefontsynonym [SansSlanted] [SansItalic] \definefontsynonym [SansBoldSlanted] [SansBoldItalic] + \definefontsynonym [SansCaps] [Sans] \stoptypescript diff --git a/tex/context/base/type-ini.tex b/tex/context/base/type-ini.tex index a70042448..f551c8861 100644 --- a/tex/context/base/type-ini.tex +++ b/tex/context/base/type-ini.tex @@ -25,8 +25,6 @@ % \usetypescript[modern][texnansi] texnansi: \setupbodyfont[modern] \eacute \eogonek \zcaron \acircumflexgrave % \usetypescript[modern][ec] ec: \setupbodyfont[modern] \eacute \eogonek \zcaron \acircumflexgrave % \usetypescript[modern][qx] qx: \setupbodyfont[modern] \eacute \eogonek \zcaron \acircumflexgrave -% \usetypescript[modern][il2] il2: \setupbodyfont[modern] \eacute \eogonek \zcaron \acircumflexgrave -% \usetypescript[modern][pl0] pl0: \setupbodyfont[modern] \eacute \eogonek \zcaron \acircumflexgrave % \usetypescript[modern][t5] t5: \setupbodyfont[modern] \eacute \eogonek \zcaron \acircumflexgrave % \stoptext % diff --git a/tex/context/base/type-map.tex b/tex/context/base/type-map.tex index d2485baa1..2c87d8ad2 100644 --- a/tex/context/base/type-map.tex +++ b/tex/context/base/type-map.tex @@ -31,17 +31,9 @@ \loadmapfile[original-public-lm.map] \stoptypescript -% per 20050201 we moved to latin modern for plr/csr/vnr -% -% \starttypescript [map] [base] [all] -% \loadmapfile[original-public-plr.map] -% \loadmapfile[original-public-csr.map] -% \loadmapfile[original-public-vnr.map] -% \stoptypescript - % This is the base map file, load it to be sure. -\starttypescript [map] [all] [ec,8r,texnansi,qx,t5,pl0,il2] +\starttypescript [map] [all] [ec,8r,texnansi,qx,t5] \loadmapfile[original-base.map] \loadmapfile[\typescriptthree-base.map] \stoptypescript @@ -54,47 +46,12 @@ % cmr and related -% \starttypescript [map] [cmr] -% \loadmapfile[original-ams-cmr.map] -% \loadmapfile[original-ams-euler.map] -% \stoptypescript -% -% \starttypescript [map] [lm,lmr] -% \loadmapfile[original-public-lm.map] -% \stoptypescript - \starttypescript [map] [cmr,lm,lmr] \loadmapfile[original-public-lm.map] \loadmapfile[original-ams-base.map] \loadmapfile[original-ams-euler.map] \stoptypescript -% per 20050201 we moved to latin modern for plr/csr/vnr -% -% \starttypescript [map] [il2,csr] -% \loadmapfile[original-public-csr.map] -% \stoptypescript -% -% \starttypescript [map] [pl0,plr] -% \loadmapfile[original-public-plr.map] -% \stoptypescript -% -% \starttypescript [map] [vnr] -% \loadmapfile[original-public-vnr.map] -% \stoptypescript - -\starttypescript [map] [il2,csr] - \loadmapfile[il2-public-lm.map] -\stoptypescript - -\starttypescript [map] [pl0,plr] - \loadmapfile[pl0-public-lm.map] -\stoptypescript - -\starttypescript [map] [t5,vnr] - \loadmapfile[t5-public-lm.map] -\stoptypescript - % cyrillic \starttypescript [map] [computer-modern] [t2a,t2b,t2c,x2] @@ -102,26 +59,20 @@ \loadmapfile[cm-super-\typescriptthree.map] \stoptypescript -% latin modern +% latin modern (watch the unfortunate \quote {lm-encoding} order +% in the name; for the moment we ship copies of the map files. -\starttypescript [map] [modern,computer-modern,latin-modern] [ec,texnansi,qx,t5,pl0,il2] +\starttypescript [map] [modern,modern-vari,modern-cond,computer-modern,latin-modern,latin-modern-vari,latin-modern-cond,] [ec,texnansi,qx,t5] +% \loadmapfile[lm-\typescriptthree.map] % maybe some day \loadmapfile[\typescriptthree-public-lm.map] \stoptypescript -% \usetypescript [map] [latin-modern-var] [\defaultencoding] -% -% example: -% % \usetypescript [map] [latin-modern-os] [ec] % lm is loaded under ec regime % \starttext % Is onze Frans nu 41, 52, 63, 74, 85 of 96 jaar \quote {old}? % \stoptext -\starttypescript [map] [latin-modern-var] [ec,texnansi,qx,t5,pl0,il2] - \loadmapfile[\typescriptthree-var-exclusive-public-lm.map] -\stoptypescript - -\starttypescript [map] [latin-modern-os] [ec,texnansi,qx,t5,pl0,il2] +\starttypescript [map] [latin-modern-os] [ec,texnansi,qx,t5] \loadmapfile[\typescriptthree-os-public-lm.map] \stoptypescript @@ -147,12 +98,6 @@ \loadmapfile[ex-antt.map] \stoptypescript -% obsolete -% -% \starttypescript [map] [antykwa-torunska,antykwa-torunska-light,antykwa-torunska-cond,antykwa-torunska-lightcond] [ec] -% \loadmapfile[cork-antt.map] -% \stoptypescript - \starttypescript [map] [antykwa-poltawskiego] [ec,texnansi,qx,t5] \loadmapfile[\typescriptthree-public-antp.map] \stoptypescript diff --git a/tex/context/base/type-old.tex b/tex/context/base/type-old.tex new file mode 100644 index 000000000..881deeefe --- /dev/null +++ b/tex/context/base/type-old.tex @@ -0,0 +1,320 @@ +%D \module +%D [ file=type-old, +%D version=2005.09.07, % moved from type-*.tex +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Ghosts from the Past, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\endinput + +% \starttypescript[all][modern,latin-modern,computer-modern][pl0] +% +% \definefontsynonym[pl0-lmb10] [plb10] [encoding=pl0] +% \definefontsynonym[pl0-lmbo10] [plbsl10] [encoding=pl0] +% \definefontsynonym[pl0-lmbx10] [plbx10] [encoding=pl0] +% \definefontsynonym[pl0-lmbx12] [plbx12] [encoding=pl0] +% \definefontsynonym[pl0-lmbx5] [plbx5] [encoding=pl0] +% \definefontsynonym[pl0-lmbx6] [plbx6] [encoding=pl0] +% \definefontsynonym[pl0-lmbx7] [plbx7] [encoding=pl0] +% \definefontsynonym[pl0-lmbx8] [plbx8] [encoding=pl0] +% \definefontsynonym[pl0-lmbx9] [plbx9] [encoding=pl0] +% \definefontsynonym[pl0-lmbxi10] [plbxti10] [encoding=pl0] +% \definefontsynonym[pl0-lmbxo10] [plbxsl10] [encoding=pl0] +% \definefontsynonym[pl0-lmcsc10] [plcsc10] [encoding=pl0] +% \definefontsynonym[pl0-lmcsco10][plcscsl10][encoding=pl0] +% \definefontsynonym[pl0-lmr10] [plr10] [encoding=pl0] +% \definefontsynonym[pl0-lmr12] [plr12] [encoding=pl0] +% \definefontsynonym[pl0-lmr17] [plr17] [encoding=pl0] +% \definefontsynonym[pl0-lmr5] [plr5] [encoding=pl0] +% \definefontsynonym[pl0-lmr6] [plr6] [encoding=pl0] +% \definefontsynonym[pl0-lmr7] [plr7] [encoding=pl0] +% \definefontsynonym[pl0-lmr8] [plr8] [encoding=pl0] +% \definefontsynonym[pl0-lmr9] [plr9] [encoding=pl0] +% \definefontsynonym[pl0-lmri10] [plti10] [encoding=pl0] +% \definefontsynonym[pl0-lmri12] [plti12] [encoding=pl0] +% \definefontsynonym[pl0-lmri7] [plti7] [encoding=pl0] +% \definefontsynonym[pl0-lmri8] [plti8] [encoding=pl0] +% \definefontsynonym[pl0-lmri9] [plti9] [encoding=pl0] +% \definefontsynonym[pl0-lmro10] [plsl10] [encoding=pl0] +% \definefontsynonym[pl0-lmro12] [plsl12] [encoding=pl0] +% \definefontsynonym[pl0-lmro8] [plsl8] [encoding=pl0] +% \definefontsynonym[pl0-lmro9] [plsl9] [encoding=pl0] +% \definefontsynonym[pl0-lmss10] [plss10] [encoding=pl0] +% \definefontsynonym[pl0-lmss12] [plss12] [encoding=pl0] +% \definefontsynonym[pl0-lmss17] [plss17] [encoding=pl0] +% \definefontsynonym[pl0-lmss8] [plss8] [encoding=pl0] +% \definefontsynonym[pl0-lmss9] [plss9] [encoding=pl0] +% \definefontsynonym[pl0-lmssbo10][plssbi10] [encoding=pl0] +% \definefontsynonym[pl0-lmssbx10][plssbx10] [encoding=pl0] +% \definefontsynonym[pl0-lmssdc10][plssdc10] [encoding=pl0] +% \definefontsynonym[pl0-lmssdo10][plssdi10] [encoding=pl0] +% \definefontsynonym[pl0-lmsso10] [plssi10] [encoding=pl0] +% \definefontsynonym[pl0-lmsso12] [plssi12] [encoding=pl0] +% \definefontsynonym[pl0-lmsso17] [plssi17] [encoding=pl0] +% \definefontsynonym[pl0-lmsso8] [plssi8] [encoding=pl0] +% \definefontsynonym[pl0-lmsso9] [plssi9] [encoding=pl0] +% \definefontsynonym[pl0-lmssq8] [plssq8] [encoding=pl0] +% \definefontsynonym[pl0-lmssqbo8][plssqbi8] [encoding=pl0] +% \definefontsynonym[pl0-lmssqbx8][plssqb8] [encoding=pl0] +% \definefontsynonym[pl0-lmssqo8] [plssqi8] [encoding=pl0] +% \definefontsynonym[pl0-lmtcsc10][pltcsc10] [encoding=pl0] +% \definefontsynonym[pl0-lmtt10] [pltt10] [encoding=pl0] +% \definefontsynonym[pl0-lmtt12] [pltt12] [encoding=pl0] +% \definefontsynonym[pl0-lmtt8] [pltt8] [encoding=pl0] +% \definefontsynonym[pl0-lmtt9] [pltt9] [encoding=pl0] +% \definefontsynonym[pl0-lmtti10] [pltti10] [encoding=pl0] +% \definefontsynonym[pl0-lmtto10] [plsltt10] [encoding=pl0] +% \definefontsynonym[pl0-lmvtt10] [plvtt10] [encoding=pl0] +% \definefontsynonym[pl0-lmvtto10][plvtti10] [encoding=pl0] +% +% \stoptypescript + +% \starttypescript[all][modern,latin-modern,computer-modern][il2] +% +% \definefontsynonym[il2-lmb10] [csb10] [encoding=il2] +% \definefontsynonym[il2-lmbo10] [csbsl10] [encoding=il2] +% \definefontsynonym[il2-lmbx10] [csbx10] [encoding=il2] +% \definefontsynonym[il2-lmbx12] [csbx12] [encoding=il2] +% \definefontsynonym[il2-lmbx5] [csbx5] [encoding=il2] +% \definefontsynonym[il2-lmbx6] [csbx6] [encoding=il2] +% \definefontsynonym[il2-lmbx7] [csbx7] [encoding=il2] +% \definefontsynonym[il2-lmbx8] [csbx8] [encoding=il2] +% \definefontsynonym[il2-lmbx9] [csbx9] [encoding=il2] +% \definefontsynonym[il2-lmbxi10] [csbxti10] [encoding=il2] +% \definefontsynonym[il2-lmbxo10] [csbxsl10] [encoding=il2] +% \definefontsynonym[il2-lmcsc10] [cscsc10] [encoding=il2] +% \definefontsynonym[il2-lmcsco10][cscscls10][encoding=il2] +% \definefontsynonym[il2-lmr10] [csr10] [encoding=il2] +% \definefontsynonym[il2-lmr12] [csr12] [encoding=il2] +% \definefontsynonym[il2-lmr17] [csr17] [encoding=il2] +% \definefontsynonym[il2-lmr5] [csr5] [encoding=il2] +% \definefontsynonym[il2-lmr6] [csr6] [encoding=il2] +% \definefontsynonym[il2-lmr7] [csr7] [encoding=il2] +% \definefontsynonym[il2-lmr8] [csr8] [encoding=il2] +% \definefontsynonym[il2-lmr9] [csr9] [encoding=il2] +% \definefontsynonym[il2-lmri10] [csti10] [encoding=il2] +% \definefontsynonym[il2-lmri12] [csti12] [encoding=il2] +% \definefontsynonym[il2-lmri7] [csti7] [encoding=il2] +% \definefontsynonym[il2-lmri8] [csti8] [encoding=il2] +% \definefontsynonym[il2-lmri9] [csti9] [encoding=il2] +% \definefontsynonym[il2-lmro10] [cssl10] [encoding=il2] +% \definefontsynonym[il2-lmro12] [cssl12] [encoding=il2] +% \definefontsynonym[il2-lmro8] [cssl8] [encoding=il2] +% \definefontsynonym[il2-lmro9] [cssl9] [encoding=il2] +% \definefontsynonym[il2-lmss10] [csss10] [encoding=il2] +% \definefontsynonym[il2-lmss12] [csss12] [encoding=il2] +% \definefontsynonym[il2-lmss17] [csss17] [encoding=il2] +% \definefontsynonym[il2-lmss8] [csss8] [encoding=il2] +% \definefontsynonym[il2-lmss9] [csss9] [encoding=il2] +% \definefontsynonym[il2-lmssbo10][csssbi10] [encoding=il2] +% \definefontsynonym[il2-lmssbx10][csssbx10] [encoding=il2] +% \definefontsynonym[il2-lmssdc10][csssdc10] [encoding=il2] +% \definefontsynonym[il2-lmssdo10][csssdi10] [encoding=il2] +% \definefontsynonym[il2-lmsso10] [csssi10] [encoding=il2] +% \definefontsynonym[il2-lmsso12] [csssi12] [encoding=il2] +% \definefontsynonym[il2-lmsso17] [csssi17] [encoding=il2] +% \definefontsynonym[il2-lmsso8] [csssi8] [encoding=il2] +% \definefontsynonym[il2-lmsso9] [csssi9] [encoding=il2] +% \definefontsynonym[il2-lmssq8] [csssq8] [encoding=il2] +% \definefontsynonym[il2-lmssqbo8][csssqbi8] [encoding=il2] +% \definefontsynonym[il2-lmssqbx8][csssqb8] [encoding=il2] +% \definefontsynonym[il2-lmssqo8] [csssqi8] [encoding=il2] +% \definefontsynonym[il2-lmtcsc10][cstcsc10] [encoding=il2] +% \definefontsynonym[il2-lmtt10] [cstt10] [encoding=il2] +% \definefontsynonym[il2-lmtt12] [cstt12] [encoding=il2] +% \definefontsynonym[il2-lmtt8] [cstt8] [encoding=il2] +% \definefontsynonym[il2-lmtt9] [cstt9] [encoding=il2] +% \definefontsynonym[il2-lmtti10] [cstti10] [encoding=il2] +% \definefontsynonym[il2-lmtto10] [cssltt10] [encoding=il2] +% \definefontsynonym[il2-lmvtt10] [csvtt10] [encoding=il2] +% \definefontsynonym[il2-lmvtto10][csvtti10] [encoding=il2] +% +% \stoptypescript + +% \starttypescript[all][modern,latin-modern,computer-modern][t5] +% +% \definefontsynonym[t5-lmb10] [vnb10] [encoding=t5] +% \definefontsynonym[t5-lmbo10] [vnbsl10] [encoding=t5] +% \definefontsynonym[t5-lmbx10] [vnbx10] [encoding=t5] +% \definefontsynonym[t5-lmbx12] [vnbx12] [encoding=t5] +% \definefontsynonym[t5-lmbx5] [vnbx5] [encoding=t5] +% \definefontsynonym[t5-lmbx6] [vnbx6] [encoding=t5] +% \definefontsynonym[t5-lmbx7] [vnbx7] [encoding=t5] +% \definefontsynonym[t5-lmbx8] [vnbx8] [encoding=t5] +% \definefontsynonym[t5-lmbx9] [vnbx9] [encoding=t5] +% \definefontsynonym[t5-lmbxi10] [vnbxti10] [encoding=t5] +% \definefontsynonym[t5-lmbxo10] [vnbxsl10] [encoding=t5] +% \definefontsynonym[t5-lmcsc10] [vncsc10] [encoding=t5] +% \definefontsynonym[t5-lmcsco10][vncscsl10][encoding=t5] +% \definefontsynonym[t5-lmr10] [vnr10] [encoding=t5] +% \definefontsynonym[t5-lmr12] [vnr12] [encoding=t5] +% \definefontsynonym[t5-lmr17] [vnr17] [encoding=t5] +% \definefontsynonym[t5-lmr5] [vnr5] [encoding=t5] +% \definefontsynonym[t5-lmr6] [vnr6] [encoding=t5] +% \definefontsynonym[t5-lmr7] [vnr7] [encoding=t5] +% \definefontsynonym[t5-lmr8] [vnr8] [encoding=t5] +% \definefontsynonym[t5-lmr9] [vnr9] [encoding=t5] +% \definefontsynonym[t5-lmri10] [vnti10] [encoding=t5] +% \definefontsynonym[t5-lmri12] [vnti12] [encoding=t5] +% \definefontsynonym[t5-lmri7] [vnti7] [encoding=t5] +% \definefontsynonym[t5-lmri8] [vnti8] [encoding=t5] +% \definefontsynonym[t5-lmri9] [vnti9] [encoding=t5] +% \definefontsynonym[t5-lmro10] [vnsl10] [encoding=t5] +% \definefontsynonym[t5-lmro12] [vnsl12] [encoding=t5] +% \definefontsynonym[t5-lmro8] [vnsl8] [encoding=t5] +% \definefontsynonym[t5-lmro9] [vnsl9] [encoding=t5] +% \definefontsynonym[t5-lmss10] [vnss10] [encoding=t5] +% \definefontsynonym[t5-lmss12] [vnss12] [encoding=t5] +% \definefontsynonym[t5-lmss17] [vnss17] [encoding=t5] +% \definefontsynonym[t5-lmss8] [vnss8] [encoding=t5] +% \definefontsynonym[t5-lmss9] [vnss9] [encoding=t5] +% \definefontsynonym[t5-lmssbo10][vnssbi10] [encoding=t5] +% \definefontsynonym[t5-lmssbx10][vnssbx10] [encoding=t5] +% \definefontsynonym[t5-lmssdc10][vnssdc10] [encoding=t5] +% \definefontsynonym[t5-lmssdo10][vnssdi10] [encoding=t5] +% \definefontsynonym[t5-lmsso10] [vnssi10] [encoding=t5] +% \definefontsynonym[t5-lmsso12] [vnssi12] [encoding=t5] +% \definefontsynonym[t5-lmsso17] [vnssi17] [encoding=t5] +% \definefontsynonym[t5-lmsso8] [vnssi8] [encoding=t5] +% \definefontsynonym[t5-lmsso9] [vnssi9] [encoding=t5] +% \definefontsynonym[t5-lmssq8] [vnssq8] [encoding=t5] +% \definefontsynonym[t5-lmssqbo8][vnssqbi8] [encoding=t5] +% \definefontsynonym[t5-lmssqbx8][vnssqb8] [encoding=t5] +% \definefontsynonym[t5-lmssqo8] [vnssqi8] [encoding=t5] +% \definefontsynonym[t5-lmtcsc10][vntcsc10] [encoding=t5] +% \definefontsynonym[t5-lmtt10] [vntt10] [encoding=t5] +% \definefontsynonym[t5-lmtt12] [vntt12] [encoding=t5] +% \definefontsynonym[t5-lmtt8] [vntt8] [encoding=t5] +% \definefontsynonym[t5-lmtt9] [vntt9] [encoding=t5] +% \definefontsynonym[t5-lmtti10] [vntti10] [encoding=t5] +% \definefontsynonym[t5-lmtto10] [vnsltt10] [encoding=t5] +% \definefontsynonym[t5-lmvtt10] [vnvtt10] [encoding=t5] +% \definefontsynonym[t5-lmvtto10][vnvtti10] [encoding=t5] +% +% \stoptypescript + +% \starttypescript [cmr] +% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size] +% \usemathcollection[default] +% \stoptypescript + +% \starttypescript [aer] +% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,ec] +% \usemathcollection[default] +% \stoptypescript + +% \starttypescript [csr] +% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,il2] +% \usemathcollection[default] +% \stoptypescript + +% \starttypescript [plr] +% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,pl0] +% \usemathcollection[default] +% \stoptypescript + +% \starttypescript [vnr] +% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,t5] +% \usemathcollection[default] +% \stoptypescript + +% \starttypescript [map] [il2,csr] +% \loadmapfile[original-public-csr.map] +% \stoptypescript + +% \starttypescript [map] [pl0,plr] +% \loadmapfile[original-public-plr.map] +% \stoptypescript + +% \starttypescript [map] [vnr] +% \loadmapfile[original-public-vnr.map] +% \stoptypescript + +% \starttypescript [map] [il2,csr] +% \loadmapfile[il2-public-lm.map] +% \stoptypescript + +% \starttypescript [map] [pl0,plr] +% \loadmapfile[pl0-public-lm.map] +% \stoptypescript + +% \starttypescript [map] [t5,vnr] +% \loadmapfile[t5-public-lm.map] +% \stoptypescript + +% support for alternative shapes has been removed from latin modern +% +% \starttypescript [map] [latin-modern-var] [ec,texnansi,qx,t5,pl0,il2] +% \loadmapfile[\typescriptthree-var-exclusive-public-lm.map] +% \stoptypescript + +% \starttypescript [map] [cmr] +% \loadmapfile[original-ams-cmr.map] +% \loadmapfile[original-ams-euler.map] +% \stoptypescript +% \starttypescript [map] [lm,lmr] +% \loadmapfile[original-public-lm.map] +% \stoptypescript + +% per 20050201 we moved to latin modern for plr/csr/vnr +% +% \starttypescript [map] [base] [all] +% \loadmapfile[original-public-plr.map] +% \loadmapfile[original-public-csr.map] +% \loadmapfile[original-public-vnr.map] +% \stoptypescript + +% \starttypescript [cmr] +% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size] +% \usemathcollection[default] +% \stoptypescript + +% \starttypescript [plr] +% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,pl0] +% \usemathcollection[default] +% \stoptypescript + +% \starttypescript [csr] +% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,il2] +% \usemathcollection[default] +% \stoptypescript + +% \starttypescript [aer] +% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,ec] +% \usemathcollection[default] +% \stoptypescript + +% \starttypescript [vnr] +% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,t5] +% \usemathcollection[default] +% \stoptypescript + +% \starttypescript [ant] +% \usetypescript [serif] [antykwa-torunska] [name,\defaultencoding] +% \usetypescript [serif] [default] [size] +% \usetypescript [all] [antykwa-torunska] [\defaultencoding] +% \stoptypescript + +% \starttypescript [ppl] +% \usetypescript [serif] [palatino] [name,\defaultencoding] +% \usetypescript [serif] [default] [size] +% \usetypescript [all] [palatino] [\defaultencoding] +% \stoptypescript + +% %D With thanks to Berthold Horn from YandY for providing me +% %D evaluation copies of the MathTimePlus fonts. +% +% \starttypescript [tim] +% \usetypescript [math] [times] [all] +% \usetypescript [math] [default] [size] +% \usemathcollection[tim] +% \usetypescript [all] [times] [\defaultencoding] +% \stoptypescript + +\endinput diff --git a/tex/context/base/type-pre.tex b/tex/context/base/type-pre.tex index 05742dd22..dd7feb443 100644 --- a/tex/context/base/type-pre.tex +++ b/tex/context/base/type-pre.tex @@ -14,8 +14,6 @@ %D This file is obsolete. We now have latin modern and proper %D typescripts. Forget about this file. -% alas, i'd love to do: \endinput - %D This file defines some typescripts that simulate the pre-typescript way %D of defining fonts. This file will not be extended. @@ -25,11 +23,6 @@ %D Times Roman. In this module, that is loaded by default, we %D define all relevant alternatives. -% \starttypescript [cmr] -% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size] -% \usemathcollection[default] -% \stoptypescript - \starttypescript [cmr] \usetypescript[modern][default] \setupbodyfont[modern] @@ -39,49 +32,32 @@ %D onto the EC ones, so that hyphenations work well. (The proper %D latin modern ec variants have replaed the ae ones.) -% \starttypescript [aer] -% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,ec] -% \usemathcollection[default] -% \stoptypescript - \starttypescript [aer] \usetypescript[modern][ec] \setupbodyfont[modern] + %\enableregime[ec] \stoptypescript -%D This script defines the Computer Modern Roman with iso -%D latin 2 encoding, as needed for Czech and other languages. - -% \starttypescript [csr] -% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,il2] -% \usemathcollection[default] -% \stoptypescript +%D This script defines the Computer Modern Roman with a pseudo kind +%D of iso latin 2 encoding. \starttypescript [csr] - \usetypescript[modern][il2] + \usetypescript[modern][ec] \setupbodyfont[modern] + \enableregime[il2] \stoptypescript %D This script defines the Computer Modern Roman with a -%D polish encoding, as needed for Czech and other languages. - -% \starttypescript [plr] -% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,pl0] -% \usemathcollection[default] -% \stoptypescript +%D polish encoding. \starttypescript [plr] \usetypescript[modern][qx] \setupbodyfont[modern] + \enableregime[pl0] \stoptypescript %D Vietnamese. -% \starttypescript [vnr] -% \usetypescript [serif,sans,mono,math] [computer-modern,latin-modern] [default,name,size,t5] -% \usemathcollection[default] -% \stoptypescript - \starttypescript [vnr] \usetypescript[modern][t5] \setupbodyfont[modern] @@ -165,18 +141,10 @@ % \stoptypescript \starttypescript [lbr] - \usetypescript[lucida][\defaultencoding] + \usetypescript[lucida][\defaultencoding] \stoptypescript -% %D With thanks to Berthold Horn from YandY for providing me -% %D evaluation copies of the MathTimePlus fonts. - -% \starttypescript [tim] -% \usetypescript [math] [times] [all] -% \usetypescript [math] [default] [size] -% \usemathcollection[tim] -% \usetypescript [all] [times] [\defaultencoding] -% \stoptypescript +%D Times \starttypescript [tim] \usetypescript [times] [\defaultencoding] @@ -187,12 +155,6 @@ %D and subtle one. Although primary meant for the polish %D language, it can be used for other languages as well. -% \starttypescript [ant] -% \usetypescript [serif] [antykwa-torunska] [name,\defaultencoding] -% \usetypescript [serif] [default] [size] -% \usetypescript [all] [antykwa-torunska] [\defaultencoding] -% \stoptypescript - \starttypescript [ant] \usetypescript [antykwa-torunska] [\defaultencoding] \setupbodyfont [antykwa,rm] @@ -255,12 +217,6 @@ %D This script defines the Palatino font. -% \starttypescript [ppl] -% \usetypescript [serif] [palatino] [name,\defaultencoding] -% \usetypescript [serif] [default] [size] -% \usetypescript [all] [palatino] [\defaultencoding] -% \stoptypescript - \starttypescript [ppl] \usetypescript [palatino] [\defaultencoding] \setupbodyfont [palatino] diff --git a/tex/context/base/type-syn.tex b/tex/context/base/type-syn.tex index 16d0c0a83..3f642e4bf 100644 --- a/tex/context/base/type-syn.tex +++ b/tex/context/base/type-syn.tex @@ -55,6 +55,7 @@ \definefontsynonym [SerifBoldItalic] [ComputerModern-BoldItalic] \definefontsynonym [SerifBoldSlanted] [ComputerModern-BoldSlanted] \definefontsynonym [SerifCaps] [ComputerModern-Caps] + \definefontsynonym [SerifCapsSlanted] [ComputerModern-CapsSlanted] \stoptypescript \starttypescript [sans] [modern,computer-modern,latin-modern] [name] @@ -65,6 +66,7 @@ \definefontsynonym [SansBoldItalic] [ComputerModernSans-BoldItalic] \definefontsynonym [SansBoldSlanted] [ComputerModernSans-BoldSlanted] \definefontsynonym [SansCaps] [ComputerModernSans-Caps] + \definefontsynonym [SansCapsSlanted] [ComputerModernSans-CapsSlanted] \stoptypescript \starttypescript [mono] [modern,computer-modern,latin-modern] [name] @@ -75,6 +77,7 @@ \definefontsynonym [MonoBoldItalic] [ComputerModernMono-BoldItalic] \definefontsynonym [MonoBoldSlanted] [ComputerModernMono-BoldSlanted] \definefontsynonym [MonoCaps] [ComputerModernMono-Caps] + \definefontsynonym [MonoCapsSlanted] [ComputerModernMono-CapsSlanted] \stoptypescript \starttypescript [math] [modern,computer-modern,latin-modern] [name] @@ -99,13 +102,36 @@ \stoptypescript \starttypescript [serif] [modern-vari,computer-modern-vari,latin-modern-vari] [name] - \definefontsynonym [Serif] [ComputerModernMono-Variable] - \definefontsynonym [SerifBold] [Serif] - \definefontsynonym [SerifItalic] [Serif] - \definefontsynonym [SerifSlanted] [SerifItalic] - \definefontsynonym [SerifBoldItalic] [SerifItalic] - \definefontsynonym [SerifBoldSlanted] [SerifSlanted] - \definefontsynonym [SerifCaps] [Serif] + \definefontsynonym [Serif] [LMTypewriterVarWd-Regular] + \definefontsynonym [SerifBold] [LMTypewriterVarWd-Oblique] + \definefontsynonym [SerifItalic] [LMTypewriterVarWd-Oblique] + \definefontsynonym [SerifSlanted] [LMTypewriterVarWd-Dark] + \definefontsynonym [SerifBoldItalic] [LMTypewriterVarWd-DarkOblique] + \definefontsynonym [SerifBoldSlanted] [LMTypewriterVarWd-DarkOblique] + \definefontsynonym [SerifCaps] [LMTypewriterVarWd-Regular] + \definefontsynonym [SerifCapsSlanted] [LMTypewriterVarWd-Oblique] +\stoptypescript + +\starttypescript [mono] [modern-cond,computer-modern-cond,latin-modern-cond,modern-lightcond,computer-modern-lightcond,latin-modern-lightcond] [name] + \definefontsynonym [Mono] [LMTypewriter-LightCondensed] + \definefontsynonym [MonoBold] [LMTypewriter-LightCondensed] + \definefontsynonym [MonoItalic] [LMTypewriter-LightCondensedOblique] + \definefontsynonym [MonoSlanted] [LMTypewriter-LightCondensedOblique] + \definefontsynonym [MonoBoldItalic] [LMTypewriter-LightCondensed] + \definefontsynonym [MonoBoldSlanted] [LMTypewriter-LightCondensed] + \definefontsynonym [MonoCaps] [LMTypewriter-LightCondensed] + \definefontsynonym [MonoCapsSlanted] [LMTypewriter-LightCondensed] +\stoptypescript + +\starttypescript [mono] [modern-light,computer-modern-light,latin-modern-light] [name] + \definefontsynonym [Mono] [LMTypewriter-Light] + \definefontsynonym [MonoBold] [LMTypewriter-Light] + \definefontsynonym [MonoItalic] [LMTypewriter-LightOblique] + \definefontsynonym [MonoSlanted] [LMTypewriter-LightOblique] + \definefontsynonym [MonoBoldItalic] [LMTypewriter-Light] + \definefontsynonym [MonoBoldSlanted] [LMTypewriter-Light] + \definefontsynonym [MonoCaps] [LMTypewriter-Light] + \definefontsynonym [MonoCapsSlanted] [LMTypewriter-Light] \stoptypescript % This will change some day. @@ -134,21 +160,21 @@ \starttypescript [math] [euler] [name] \definefontsynonym [MathRoman] [Euler-Roman] % mr - \definefontsynonym [MathItalic] [Euler-Fraktur] % mi + \definefontsynonym [MathItalic] [Euler-Fraktur] % mi \definefontsynonym [MathExtension] [Euler-Extension] % ex \definefontsynonym [MathSymbol] [Euler-Symbol] % sy \stoptypescript \starttypescript [boldmath] [euler] [name] \definefontsynonym [MathRoman] [Euler-Roman-Bold] % mr - \definefontsynonym [MathItalic] [Euler-Fraktur-Bold] % mi + \definefontsynonym [MathItalic] [Euler-Fraktur-Bold] % mi \definefontsynonym [MathExtension] [Euler-Extension] % ex \definefontsynonym [MathSymbol] [Euler-Symbol-Bold] % sy \stoptypescript \starttypescript [bfmath] [euler] [name] \definefontsynonym [MathRomanBold] [Euler-Roman-Bold] % mr - \definefontsynonym [MathItalicBold] [Euler-Fraktur-Bold] % mi + \definefontsynonym [MathItalicBold] [Euler-Fraktur-Bold] % mi \definefontsynonym [MathExtension] [Euler-Extension] % ex \definefontsynonym [MathSymbolBold] [Euler-Symbol-Bold] % sy \stoptypescript @@ -176,16 +202,6 @@ % Antykwa Torunska : -% \starttypescript [serif] [antykwa-torunska] [name] -% \definefontsynonym [Serif] [AntykwaTorunska-Regular] -% \definefontsynonym [SerifBold] [AntykwaTorunska-Bold] -% \definefontsynonym [SerifItalic] [AntykwaTorunska-Italic] -% \definefontsynonym [SerifSlanted] [AntykwaTorunska-Italic] -% \definefontsynonym [SerifBoldItalic] [AntykwaTorunska-Bold] -% \definefontsynonym [SerifBoldSlanted] [AntykwaTorunska-Bold] -% \definefontsynonym [SerifCaps] [AntykwaTorunska-Regular] -% \stoptypescript - \starttypescript [serif] [antykwa-torunska] [name] \definefontsynonym [Serif] [AntykwaTorunska-Regular] \definefontsynonym [SerifBold] [AntykwaTorunska-Bold] @@ -435,6 +451,7 @@ % Iwona \starttypescript [sans] [iwona-light] [name] + \setups[font:fallback:sans] \definefontsynonym [Sans] [Iwona-Light] [encoding=\typescriptthree] \definefontsynonym [SansItalic] [Iwona-LightItalic] [encoding=\typescriptthree] \definefontsynonym [SansBold] [Iwona-Medium] [encoding=\typescriptthree] @@ -442,6 +459,7 @@ \stoptypescript \starttypescript [sans] [iwona] [name] + \setups[font:fallback:sans] \definefontsynonym [Sans] [Iwona-Regular] [encoding=\typescriptthree] \definefontsynonym [SansItalic] [Iwona-RegularItalic] [encoding=\typescriptthree] \definefontsynonym [SansBold] [Iwona-Bold] [encoding=\typescriptthree] @@ -449,6 +467,7 @@ \stoptypescript \starttypescript [sans] [iwona-medium] [name] + \setups[font:fallback:sans] \definefontsynonym [Sans] [Iwona-Medium] [encoding=\typescriptthree] \definefontsynonym [SansItalic] [Iwona-MediumItalic] [encoding=\typescriptthree] \definefontsynonym [SansBold] [Iwona-Heavy] [encoding=\typescriptthree] @@ -479,6 +498,7 @@ % Kurier \starttypescript [sans] [kurier-light] [name] + \setups[font:fallback:sans] \definefontsynonym [Sans] [Kurier-Light] [encoding=\typescriptthree] \definefontsynonym [SansItalic] [Kurier-LightItalic] [encoding=\typescriptthree] \definefontsynonym [SansBold] [Kurier-Medium] [encoding=\typescriptthree] @@ -486,6 +506,7 @@ \stoptypescript \starttypescript [sans] [kurier] [name] + \setups[font:fallback:sans] \definefontsynonym [Sans] [Kurier-Regular] [encoding=\typescriptthree] \definefontsynonym [SansItalic] [Kurier-RegularItalic] [encoding=\typescriptthree] \definefontsynonym [SansBold] [Kurier-Bold] [encoding=\typescriptthree] @@ -493,6 +514,7 @@ \stoptypescript \starttypescript [sans] [kurier-medium] [name] + \setups[font:fallback:sans] \definefontsynonym [Sans] [Kurier-Medium] [encoding=\typescriptthree] \definefontsynonym [SansItalic] [Kurier-MediumItalic] [encoding=\typescriptthree] \definefontsynonym [SansBold] [Kurier-Heavy] [encoding=\typescriptthree] diff --git a/tex/context/base/unic-001.tex b/tex/context/base/unic-001.tex index 0c53fbcd6..6c6af6f4c 100644 --- a/tex/context/base/unic-001.tex +++ b/tex/context/base/unic-001.tex @@ -26,6 +26,12 @@ %D But we can speed things up, watch how we avoid zero and \TEX's %D automatically added \type {\relax}. +% remark: +% - gcommaaccent, kcomaaccent, lcomaaccent, ncomaaccent, rcomaaccent +% bear the name "WITH CEDILLA" in Unicode +% - scomaaccent and tcomaaccent point to the "WITH CEDILLA" in the +% Adobe Glyph List + \startunicodevector 1 \expandafter\strippedcsname \ifcase\numexpr#1\relax @@ -63,8 +69,8 @@ \gbreve \or \Gdotaccent \or \gdotaccent \or - \Gcedilla \or % \Gcedilla \or - \gcedilla \or % \gcedilla \or + \Gcommaaccent \or % WITH CEDILLA + \gcommaaccent \or % WITH CEDILLA \Hcircumflex \or \hcircumflex \or \Hstroke \or @@ -83,13 +89,13 @@ \ijligature \or \Jcircumflex \or \jcircumflex \or - \Kcedilla \or - \kcedilla \or + \Kcommaaccent \or % WITH CEDILLA + \kcommaaccent \or % WITH CEDILLA \kkra \or % \kkra \or \Lacute \or \lacute \or - \Lcedilla \or - \lcedilla \or + \Lcommaaccent \or % WITH CEDILLA + \lcommaaccent \or % WITH CEDILLA \Lcaron \or \lcaron \or \Ldotmiddle \or % \Ldotmiddle \or @@ -98,8 +104,8 @@ \lstroke \or \Nacute \or \nacute \or - \Ncedilla \or - \ncedilla \or + \Ncommaaccent \or % WITH CEDILLA + \ncommaaccent \or % WITH CEDILLA \Ncaron \or \ncaron \or \napostrophe \or @@ -115,8 +121,8 @@ \oeligature \or \Racute \or \racute \or - \Rcedilla \or - \rcedilla \or + \Rcommaaccent \or % WITH CEDILLA + \rcommaaccent \or % WITH CEDILLA \Rcaron \or \rcaron \or \Sacute \or diff --git a/tex/context/base/unic-030.tex b/tex/context/base/unic-030.tex index 387ddeb4e..ef42c807a 100644 --- a/tex/context/base/unic-030.tex +++ b/tex/context/base/unic-030.tex @@ -15,7 +15,7 @@ \startunicodevector 30 \expandafter\strippedcsname - \ifcase\numexpr#1-158\relax + \ifcase\numexpr#1-160\relax \Adotbelow \or \adotbelow \or \Ahook \or diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index c09234e18..e0e1423d9 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2005.08.31"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2005.10.27"> <cd:variables> <cd:variable name="one" value="jedna"/> diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index ebd9e6708..831fd37c1 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2005.08.31"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2005.10.27"> <cd:variables> <cd:variable name="one" value="eins"/> diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index b2d780965..d913ebe67 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2005.08.31"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2005.10.27"> <cd:variables> <cd:variable name="one" value="one"/> diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index c3ffeeda0..63f45e6dc 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2005.08.31"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2005.10.27"> <cd:variables> <cd:variable name="one" value="uno"/> diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index 8342f0530..ee84ea394 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2005.08.31"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2005.10.27"> <cd:variables> <cd:variable name="one" value="een"/> diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index c9de476a0..5e86b26db 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2005.08.31"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2005.10.27"> <cd:variables> <cd:variable name="one" value="unu"/> diff --git a/tex/context/user/cont-sys.rme b/tex/context/user/cont-sys.rme index ee54a99b7..a74614bd1 100644 --- a/tex/context/user/cont-sys.rme +++ b/tex/context/user/cont-sys.rme @@ -109,8 +109,8 @@ \loadmapfile[ec-public-lm.map] \loadmapfile[qx-public-lm.map] \loadmapfile[t5-public-lm.map] - \loadmapfile[pl0-public-lm.map] - \loadmapfile[il2-public-lm.map] + %loadmapfile[pl0-public-lm.map] + %loadmapfile[il2-public-lm.map] \fi |