From 4c8d84baf49a2f1547a8cf437ed9005677f99bb0 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 17 Nov 2006 19:52:00 +0100 Subject: stable 2006.11.17 19:52 --- fonts/enc/dvips/context/cmin.enc | 258 +++++++++++++++++++ fonts/enc/dvips/context/cmit.enc | 258 +++++++++++++++++++ fonts/enc/dvips/context/cmitt.enc | 258 +++++++++++++++++++ fonts/enc/dvips/context/cmrm.enc | 258 +++++++++++++++++++ fonts/enc/dvips/context/cmsc.enc | 258 +++++++++++++++++++ fonts/enc/dvips/context/cmtt.enc | 258 +++++++++++++++++++ fonts/enc/dvips/context/ec-sc.enc | 84 ------- fonts/enc/dvips/context/lm-texnansi-osfsc.enc | 264 -------------------- fonts/enc/dvips/context/texnansi-sc.enc | 319 ------------------------ fonts/enc/dvips/jmn/hans.enc | 258 +++++++++++++++++++ fonts/enc/dvips/lm/cmin.enc | 258 ------------------- fonts/enc/dvips/lm/cmit.enc | 258 ------------------- fonts/enc/dvips/lm/cmitt.enc | 258 ------------------- fonts/enc/dvips/lm/cmrm.enc | 258 ------------------- fonts/enc/dvips/lm/cmsc.enc | 258 ------------------- fonts/enc/dvips/lm/cmtt.enc | 258 ------------------- fonts/enc/dvips/lm/csin.enc | 258 ------------------- fonts/enc/dvips/lm/csrm.enc | 258 ------------------- fonts/enc/dvips/lm/cssc.enc | 258 ------------------- fonts/enc/dvips/lm/cstt.enc | 261 ------------------- fonts/enc/dvips/lm/ec-lm.enc | 258 ------------------- fonts/enc/dvips/lm/plin.enc | 258 ------------------- fonts/enc/dvips/lm/plit.enc | 258 ------------------- fonts/enc/dvips/lm/plitt.enc | 258 ------------------- fonts/enc/dvips/lm/plrm.enc | 258 ------------------- fonts/enc/dvips/lm/plsc.enc | 258 ------------------- fonts/enc/dvips/lm/pltt.enc | 258 ------------------- fonts/enc/dvips/lm/qx-lm.enc | 258 ------------------- fonts/enc/dvips/lm/qx-lmtt.enc | 258 ------------------- fonts/enc/dvips/lm/t5-lm.enc | 258 ------------------- fonts/enc/dvips/lm/texnansi-lm.enc | 258 ------------------- fonts/enc/dvips/lm/ts1-lm.enc | 258 ------------------- fonts/map/dvips/context/ec-lm.map | 69 ----- fonts/map/dvips/context/el-lm.map | 69 ----- fonts/map/dvips/context/qx-lm.map | 69 ----- fonts/map/dvips/context/t5-lm.map | 69 ----- fonts/map/dvips/context/texnansi-lm.map | 69 ----- fonts/map/dvips/context/ts1-lm.map | 69 ----- fonts/map/pdftex/context/ec-public-lm.map | 72 +----- fonts/map/pdftex/context/el-public-lm.map | 72 +----- fonts/map/pdftex/context/qx-public-lm.map | 72 +----- fonts/map/pdftex/context/t5-public-lm.map | 72 +----- fonts/map/pdftex/context/texnansi-public-lm.map | 72 +----- scripts/context/ruby/base/tool.rb | 36 +-- scripts/context/ruby/texexec.rb | 6 +- tex/context/base/cont-new.tex | 2 +- tex/context/base/context.tex | 2 +- tex/context/base/core-mat.tex | 33 +-- tex/context/base/core-spa.tex | 37 +-- tex/context/base/spec-pdf.lua | 21 -- tex/context/base/type-gyr.tex | 61 +++-- tex/context/base/type-map.tex | 4 +- tex/context/base/verb-sql.tex | 66 ++--- tex/context/interface/keys-cz.xml | 2 +- tex/context/interface/keys-de.xml | 2 +- tex/context/interface/keys-en.xml | 2 +- tex/context/interface/keys-fr.xml | 2 +- tex/context/interface/keys-it.xml | 2 +- tex/context/interface/keys-nl.xml | 2 +- tex/context/interface/keys-ro.xml | 2 +- 60 files changed, 1961 insertions(+), 7247 deletions(-) create mode 100644 fonts/enc/dvips/context/cmin.enc create mode 100644 fonts/enc/dvips/context/cmit.enc create mode 100644 fonts/enc/dvips/context/cmitt.enc create mode 100644 fonts/enc/dvips/context/cmrm.enc create mode 100644 fonts/enc/dvips/context/cmsc.enc create mode 100644 fonts/enc/dvips/context/cmtt.enc delete mode 100644 fonts/enc/dvips/context/ec-sc.enc delete mode 100644 fonts/enc/dvips/context/lm-texnansi-osfsc.enc delete mode 100644 fonts/enc/dvips/context/texnansi-sc.enc create mode 100644 fonts/enc/dvips/jmn/hans.enc delete mode 100644 fonts/enc/dvips/lm/cmin.enc delete mode 100644 fonts/enc/dvips/lm/cmit.enc delete mode 100644 fonts/enc/dvips/lm/cmitt.enc delete mode 100644 fonts/enc/dvips/lm/cmrm.enc delete mode 100644 fonts/enc/dvips/lm/cmsc.enc delete mode 100644 fonts/enc/dvips/lm/cmtt.enc delete mode 100644 fonts/enc/dvips/lm/csin.enc delete mode 100644 fonts/enc/dvips/lm/csrm.enc delete mode 100644 fonts/enc/dvips/lm/cssc.enc delete mode 100644 fonts/enc/dvips/lm/cstt.enc delete mode 100644 fonts/enc/dvips/lm/ec-lm.enc delete mode 100644 fonts/enc/dvips/lm/plin.enc delete mode 100644 fonts/enc/dvips/lm/plit.enc delete mode 100644 fonts/enc/dvips/lm/plitt.enc delete mode 100644 fonts/enc/dvips/lm/plrm.enc delete mode 100644 fonts/enc/dvips/lm/plsc.enc delete mode 100644 fonts/enc/dvips/lm/pltt.enc delete mode 100644 fonts/enc/dvips/lm/qx-lm.enc delete mode 100644 fonts/enc/dvips/lm/qx-lmtt.enc delete mode 100644 fonts/enc/dvips/lm/t5-lm.enc delete mode 100644 fonts/enc/dvips/lm/texnansi-lm.enc delete mode 100644 fonts/enc/dvips/lm/ts1-lm.enc delete mode 100644 fonts/map/dvips/context/ec-lm.map delete mode 100644 fonts/map/dvips/context/el-lm.map delete mode 100644 fonts/map/dvips/context/qx-lm.map delete mode 100644 fonts/map/dvips/context/t5-lm.map delete mode 100644 fonts/map/dvips/context/texnansi-lm.map delete mode 100644 fonts/map/dvips/context/ts1-lm.map delete mode 100644 tex/context/base/spec-pdf.lua diff --git a/fonts/enc/dvips/context/cmin.enc b/fonts/enc/dvips/context/cmin.enc new file mode 100644 index 000000000..dc2b063a6 --- /dev/null +++ b/fonts/enc/dvips/context/cmin.enc @@ -0,0 +1,258 @@ +/enccmin[ +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/space +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/zero +/one +/two +/three +/four +/five +/six +/seven +/eight +/nine +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/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 +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +] def diff --git a/fonts/enc/dvips/context/cmit.enc b/fonts/enc/dvips/context/cmit.enc new file mode 100644 index 000000000..40fd82f77 --- /dev/null +++ b/fonts/enc/dvips/context/cmit.enc @@ -0,0 +1,258 @@ +/enccmit[ +/Gamma +/Delta +/Theta +/Lambda +/Xi +/Pi +/Sigma +/Upsilon +/Phi +/Psi +/Omega +/ff +/fi +/fl +/ffi +/ffl +/dotlessi +/dotlessj +/grave +/acute +/caron +/breve +/macron +/ring +/cedilla +/germandbls +/ae +/oe +/oslash +/AE +/OE +/Oslash +/suppress +/exclam +/quotedblright +/numbersign +/sterling +/percent +/ampersand +/quoteright +/parenleft +/parenright +/asterisk +/plus +/comma +/hyphen +/period +/slash +/zero +/one +/two +/three +/four +/five +/six +/seven +/eight +/nine +/colon +/semicolon +/exclamdown +/equal +/questiondown +/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 +/quotedblleft +/bracketright +/circumflex +/dotaccent +/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 +/endash +/emdash +/hungarumlaut +/tilde +/dieresis +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +] def diff --git a/fonts/enc/dvips/context/cmitt.enc b/fonts/enc/dvips/context/cmitt.enc new file mode 100644 index 000000000..971187c32 --- /dev/null +++ b/fonts/enc/dvips/context/cmitt.enc @@ -0,0 +1,258 @@ +/enccmitt[ +/Gamma +/Delta +/Theta +/Lambda +/Xi +/Pi +/Sigma +/Upsilon +/Phi +/Psi +/Omega +/arrowup +/arrowdown +/quotesingle +/exclamdown +/questiondown +/dotlessi +/dotlessj +/grave +/acute +/caron +/breve +/macron +/ring +/cedilla +/germandbls +/ae +/oe +/oslash +/AE +/OE +/Oslash +/visiblespace +/exclam +/quotedbl +/numbersign +/sterling +/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 +/dieresis +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +] def diff --git a/fonts/enc/dvips/context/cmrm.enc b/fonts/enc/dvips/context/cmrm.enc new file mode 100644 index 000000000..3a1ab23dd --- /dev/null +++ b/fonts/enc/dvips/context/cmrm.enc @@ -0,0 +1,258 @@ +/enccmrm[ +/Gamma +/Delta +/Theta +/Lambda +/Xi +/Pi +/Sigma +/Upsilon +/Phi +/Psi +/Omega +/ff +/fi +/fl +/ffi +/ffl +/dotlessi +/dotlessj +/grave +/acute +/caron +/breve +/macron +/ring +/cedilla +/germandbls +/ae +/oe +/oslash +/AE +/OE +/Oslash +/suppress +/exclam +/quotedblright +/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 +/exclamdown +/equal +/questiondown +/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 +/quotedblleft +/bracketright +/circumflex +/dotaccent +/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 +/endash +/emdash +/hungarumlaut +/tilde +/dieresis +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +] def diff --git a/fonts/enc/dvips/context/cmsc.enc b/fonts/enc/dvips/context/cmsc.enc new file mode 100644 index 000000000..b8ab09121 --- /dev/null +++ b/fonts/enc/dvips/context/cmsc.enc @@ -0,0 +1,258 @@ +/enccmsc[ +/Gamma +/Delta +/Theta +/Lambda +/Xi +/Pi +/Sigma +/Upsilon +/Phi +/Psi +/Omega +/arrowup +/arrowdown +/quotesingle +/exclamdown +/questiondown +/dotlessi +/dotlessj +/grave +/acute +/caron +/breve +/macron +/ring +/cedilla +/germandbls +/ae +/oe +/oslash +/AE +/OE +/Oslash +/suppress +/exclam +/quotedblright +/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 +/quotedblleft +/bracketright +/circumflex +/dotaccent +/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 +/endash +/emdash +/hungarumlaut +/tilde +/dieresis +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +] def diff --git a/fonts/enc/dvips/context/cmtt.enc b/fonts/enc/dvips/context/cmtt.enc new file mode 100644 index 000000000..3c3a9f74b --- /dev/null +++ b/fonts/enc/dvips/context/cmtt.enc @@ -0,0 +1,258 @@ +/enccmtt[ +/Gamma +/Delta +/Theta +/Lambda +/Xi +/Pi +/Sigma +/Upsilon +/Phi +/Psi +/Omega +/arrowup +/arrowdown +/quotesingle +/exclamdown +/questiondown +/dotlessi +/dotlessj +/grave +/acute +/caron +/breve +/macron +/ring +/cedilla +/germandbls +/ae +/oe +/oslash +/AE +/OE +/Oslash +/visiblespace +/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 +/dieresis +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +] def diff --git a/fonts/enc/dvips/context/ec-sc.enc b/fonts/enc/dvips/context/ec-sc.enc deleted file mode 100644 index 77357c9f3..000000000 --- a/fonts/enc/dvips/context/ec-sc.enc +++ /dev/null @@ -1,84 +0,0 @@ -% This version is sc extended by Hans Hagen using PalatinoNova-Regular.afm. -% -% -% This is the EC encoding. -% -% These are the ligs and kerns in addition to those found in the -% AFM file. (The only ligs in the Times-Roman.afm file are the -% fi and fl ligatures.) -% -% LIGKERN space l =: lslash ; space L =: Lslash ; -% LIGKERN question quoteleft =: questiondown ; exclam quoteleft =: exclamdown ; -% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ; -% LIGKERN quoteleft quoteleft =: quotedblleft ; -% LIGKERN quoteright quoteright =: quotedblright ; -% -% We blow away kerns to and from spaces (TeX doesn't have a -% space) and also remove any kerns from the numbers (although -% the only kern pair that mentions a number in Times-Roman.afm -% is one one.) -% -% LIGKERN space {} * ; * {} space ; zero {} * ; * {} zero ; -% LIGKERN one {} * ; * {} one ; two {} * ; * {} two ; -% LIGKERN three {} * ; * {} three ; four {} * ; * {} four ; -% LIGKERN five {} * ; * {} five ; six {} * ; * {} six ; -% LIGKERN seven {} * ; * {} seven ; eight {} * ; * {} eight ; -% LIGKERN nine {} * ; * {} nine ; -% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ; -% LIGKERN greater greater =: guillemotright ; -% -/ECEncoding [ % now 256 chars follow -% 0x00 - /grave.sc /acute.sc /circumflex.sc /tilde.sc /dieresis.sc /hungarumlaut.sc /ring.sc /caron.sc - /breve.sc /macron.sc /dotaccent.sc /cedilla - /ogonek /quotesinglbase /guilsinglleft /guilsinglright -% 0x10 - /quotedblleft /quotedblright /quotedblbase /guillemotleft - /guillemotright /endash /emdash /cwm - /zeroinferior /dotlessi /dotlessj /ff /fi.sc /fl.sc /ffi /ffl -% 0x20 - /visualspace /exclam.sc /quotedbl /numbersign - /dollar.sc /percent.sc /ampersand.sc /quoteright - /parenleft /parenright /asterisk /plus /comma /hyphen /period /slash -% 0x30 - /zero.sc /one.sc /two.sc /three.sc /four.sc /five.sc /six.sc /seven.sc - /eight.sc /nine.sc /colon /semicolon /less /equal /greater /question.sc -% 0x40 - /at /A /B /C /D /E /F /G /H /I /J /K /L /M /N /O -% 0x50 - /P /Q /R /S /T /U /V /W - /X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore -% 0x60 - /quoteleft /a.sc /b.sc /c.sc /d.sc /e.sc /f.sc /g.sc /h.sc /i.sc /j.sc /k.sc /l.sc /m.sc /n.sc /o.sc -% 0x70 - /p.sc /q.sc /r.sc /s.sc /t.sc /u.sc /v.sc /w.sc - /x.sc /y.sc /z.sc /braceleft /bar /braceright /asciitilde /hyphen -% 0x80 - /Abreve /Aogonek /Cacute /Ccaron /Dcaron /Ecaron /Eogonek /Gbreve - /Lacute /Lcaron /Lslash /Nacute /Ncaron /Ng /Ohungarumlaut /Racute -% 0x90 - /Rcaron /Sacute /Scaron /Scedilla - /Tcaron /Tcedilla /Uhungarumlaut /Uring - /Ydieresis /Zacute /Zcaron /Zdotaccent /IJ /Idotaccent /dbar /section -% 0xA0 - /abreve.sc /aogonek.sc /cacute.sc /ccaron.sc /dcaron.sc /ecaron.sc /eogonek.sc /gbreve.sc - /lacute.sc /lcaron.sc /lslash.sc /nacute.sc /ncaron.sc /ng /ohungarumlaut.sc /racute.sc -% 0xB0 - /rcaron.sc /sacute.sc /scaron.sc /scedilla.sc - /tquoteright /tcedilla /uhungarumlaut.sc /uring.sc - /ldot.sc /zacute.sc /zcaron.sc /zdotaccent.sc /ij.sc /exclamdown.sc /questiondown.sc /sterling.sc -% 0xC0 - /Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla - /Egrave /Eacute /Ecircumflex /Edieresis - /Igrave /Iacute /Icircumflex /Idieresis -% 0xD0 - /Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /OE - /Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /Germandbls -% 0xE0 - /agrave.sc /aacute.sc /acircumflex.sc /atilde.sc /adieresis.sc /aring.sc /ae.sc /ccedilla.sc - /egrave.sc /eacute.sc /ecircumflex.sc /edieresis.sc - /igrave.sc /iacute.sc /icircumflex.sc /idieresis.sc -% 0xF0 - /eth.sc /ntilde.sc /ograve.sc /oacute.sc /ocircumflex.sc /otilde.sc /odieresis.sc /oe.sc - /oslash.sc /ugrave.sc /uacute.sc /ucircumflex.sc /udieresis.sc /yacute.sc /thorn.sc /germandbls.sc -] def diff --git a/fonts/enc/dvips/context/lm-texnansi-osfsc.enc b/fonts/enc/dvips/context/lm-texnansi-osfsc.enc deleted file mode 100644 index d6c4a812d..000000000 --- a/fonts/enc/dvips/context/lm-texnansi-osfsc.enc +++ /dev/null @@ -1,264 +0,0 @@ -% Old Style with Small Caps by thomas.schmitz@uni-bonn.de -% -% generate metrics using: -% -% texfont --encoding=texnansi --variant=osfsc --[other options] - -/TeXnANSIOSFSCEncoding [ -/.notdef % 0 -/Euro % 1 /Uni20AC -/.notdef % 2 -/.notdef % 3 -/fraction % 4 -/dotaccent % 5 -/hungarumlaut % 6 -/ogonek % 7 -/fl % 8 -/.notdef % 9 /fraction not used (see 4), backward compatability only -/cwm % 10 not used, except boundary char internally maybe -/ff % 11 -/fi % 12 -/.notdef % 13 /fl not used (see 8), backward compatability only -/ffi % 14 -/ffl % 15 -/dotlessi % 16 -/dotlessj % 17 -/grave % 18 -/acute % 19 -/caron % 20 -/breve % 21 -/macron % 22 -/ring % 23 -/cedilla % 24 -/germandbls % 25 -/AEsmall % 26 -/OEsmall % 27 -/Oslashsmall % 28 -/AE % 29 -/OE % 30 -/Oslash % 31 -/space % 32 /suppress in TeX text -/exclam % 33 -/quotedbl % 34 /quotedblright in TeX text -/numbersign % 35 -/dollar % 36 -/percent % 37 -/ampersand % 38 -/quoteright % 39 /quotesingle in ANSI -/parenleft % 40 -/parenright % 41 -/asterisk % 42 -/plus % 43 -/comma % 44 -/hyphen % 45 -/period % 46 -/slash % 47 -/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 -/equal % 61 -/greater % 62 /questiondown in TeX text -/question % 63 -/at % 64 -/A % 65 -/B % 66 -/C % 67 -/D % 68 -/E % 69 -/F % 70 -/G % 71 -/H % 72 -/I % 73 -/J % 74 -/K % 75 -/L % 76 -/M % 77 -/N % 78 -/O % 79 -/P % 80 -/Q % 81 -/R % 82 -/S % 83 -/T % 84 -/U % 85 -/V % 86 -/W % 87 -/X % 88 -/Y % 89 -/Z % 90 -/bracketleft % 91 -/backslash % 92 /quotedblleft in TeX text -/bracketright % 93 -/circumflex % 94 /asciicircum in ASCII -/underscore % 95 /dotaccent in TeX text -/quoteleft % 96 /grave accent in ANSI -/Asmall % 97 -/Bsmall % 98 -/Csmall % 99 -/Dsmall % 100 -/Esmall % 101 -/Fsmall % 102 -/Gsmall % 103 -/Hsmall % 104 -/Ismall % 105 -/Jsmall % 106 -/Ksmall % 107 -/Lsmall % 108 -/Msmall % 109 -/Nsmall % 110 -/Osmall % 111 -/Psmall % 112 -/Qsmall % 113 -/Rsmall % 114 -/Ssmall % 115 -/Tsmall % 116 -/Usmall % 117 -/Vsmall % 118 -/Wsmall % 119 -/Xsmall % 120 -/Ysmall % 121 -/Zsmall % 122 -/braceleft % 123 /endash in TeX text -/bar % 124 /emdash in TeX test -/braceright % 125 /hungarumlaut in TeX text -/tilde % 126 /asciitilde in ASCII -/dieresis % 127 not used (see 168), use higher up instead -/Lslash % 128 this position is unfortunate, but now too late to fix -/quotesingle % 129 -/quotesinglbase % 130 -/florin % 131 -/quotedblbase % 132 -/ellipsis % 133 -/dagger % 134 -/daggerdbl % 135 -/circumflex % 136 -/perthousand % 137 -/Scaron % 138 -/guilsinglleft % 139 -/OE % 140 -/Zcaron % 141 -/asciicircum % 142 -/minus % 143 -/lslash % 144 -/quoteleft % 145 -/quoteright % 146 -/quotedblleft % 147 -/quotedblright % 148 -/bullet % 149 -/endash % 150 -/emdash % 151 -/tilde % 152 -/trademark % 153 -/scaron % 154 -/guilsinglright % 155 -/oe % 156 -/zcaron % 157 -/asciitilde % 158 -/Ydieresis % 159 -/nbspace % 160 /space (no break space) -/exclamdown % 161 -/cent % 162 -/sterling % 163 -/currency % 164 -/yen % 165 -/brokenbar % 166 -/section % 167 -/dieresis % 168 -/copyright % 169 -/ordfeminine % 170 -/guillemotleft % 171 -/logicalnot % 172 -/sfthyphen % 173 /hyphen (hanging hyphen) -/registered % 174 -/macron % 175 -/degree % 176 -/plusminus % 177 -/twosuperior % 178 -/threesuperior % 179 -/acute % 180 -/mu % 181 -/paragraph % 182 -/periodcentered % 183 -/cedilla % 184 -/onesuperior % 185 -/ordmasculine % 186 -/guillemotright % 187 -/onequarter % 188 -/onehalf % 189 -/threequarters % 190 -/questiondown % 191 -/Agrave % 192 -/Aacute % 193 -/Acircumflex % 194 -/Atilde % 195 -/Adieresis % 196 -/Aring % 197 -/AE % 198 -/Ccedilla % 199 -/Egrave % 200 -/Eacute % 201 -/Ecircumflex % 202 -/Edieresis % 203 -/Igrave % 204 -/Iacute % 205 -/Icircumflex % 206 -/Idieresis % 207 -/Eth % 208 -/Ntilde % 209 -/Ograve % 210 -/Oacute % 211 -/Ocircumflex % 212 -/Otilde % 213 -/Odieresis % 214 -/multiply % 215 OE in T1 -/Oslash % 216 -/Ugrave % 217 -/Uacute % 218 -/Ucircumflex % 219 -/Udieresis % 220 -/Yacute % 221 -/Thorn % 222 -/germandbls % 223 -/Agravesmall % 224 -/Aacutesmall % 225 -/Acircumflexsmall % 226 -/Atildesmall % 227 -/Adieresissmall % 228 -/Aringsmall % 229 -/AEsmall % 230 -/Ccedillasmall % 231 -/Egravesmall % 232 -/Eacutesmall % 233 -/Ecircumflexsmall % 234 -/Edieresissmall % 235 -/Igravesmall % 236 -/Iacutesmall % 237 -/Icircumflexsmall % 238 -/Idieresissmall % 239 -/eth % 240 -/Ntildesmall % 241 -/Ogravesmall % 242 -/Oacutesmall % 243 -/Ocircumflexsmall % 244 -/Otildesmall % 245 -/Odieresissmall % 246 -/divide % 247 oe in T1 -/Oslashsmall % 248 -/Ugravesmall % 249 -/Uacutesmall % 250 -/Ucircumflexsmall % 251 -/Udieresissmall % 252 -/Yacutesmall % 253 -/Thornsmall % 254 -/Ydieresissmall % 255 germandbls in T1 -] def diff --git a/fonts/enc/dvips/context/texnansi-sc.enc b/fonts/enc/dvips/context/texnansi-sc.enc deleted file mode 100644 index 553a74d88..000000000 --- a/fonts/enc/dvips/context/texnansi-sc.enc +++ /dev/null @@ -1,319 +0,0 @@ -% This version is sc extended by Hans Hagen using PalatinoNova-Regular.afm. -% -% @psencodingfile{ -% author = "Y&Y, Inc.", -% version = "1.1", -% date = "1 December 1996", -% filename = "texnansi.enc", -% email = "help@YandY.com", -% address = "45 Walden Street // Concord, MA 01742, USA", -% codetable = "ISO/ASCII", -% checksum = "xx", -% docstring = "Encoding for fonts in Adobe Type 1 format for use with TeX." -% } -% -% The idea is to have all 228 characters normally included in Type 1 text -% fonts (plus a few more) available for typesetting. This is effectively -% the character set in Adobe Standard Encoding, ISO Latin 1, plus a few more. -% -% Character code assignments were made as follows: -% -% (1) The character layout largely matches `ASCII' in the 32 -- 126 range, -% except for `circumflex' in 94 and `tilde' in 126, to match `TeX text' -% (`asciicircumflex' and `asciitilde' appear in 158 and 142 instead). -% -% (2) The character layout matches `Windows ANSI' in almost all places, -% except for `quoteright' in 39 and `quoteleft' in 96 to match ASCII -% (`quotesingle' and `grave' appear in 129 and 18 instead). -% -% (3) The character layout matches `TeX typewriter' used by CM text fonts -% in most places (except for discordant positions such as hungarumlaut -% (instead of braceright), dotaccent (instead of underscore) etc. -% -% (4) Remaining characters are assigned arbitrarily to the `control character' -% range (0 -- 31), avoiding 0, 9, 10 and 13 in case we meet dumb software -% - similarly one should really avoid 127 and 128 if possible. -% In addition, the 8 open slots in Windows ANSI between 128 and 159 are used. -% -% (5) Y&Y Lucida Bright includes some extra ligatures and such; ff, ffi, ffl, -% and `dotlessj,' these are included 11 -- 15, and 17. -% -% (6) Hyphen appears both at 45 and 173 for compatibility with both ASCII -% and Windows ANSI. -% -% (7) It doesn't really matter where ligatures appear (both real, such as ffi, -% and pseudo such as ---) since these should not be accessed directly, only -% via ligature information in the TFM file. -% -% SAMPLE USAGE (in `psfonts.map' file for DVIPS): -% -% lbr LucidaBright "TeXnANSIEncoding ReEncodeFont" 0 then + if fast or (files.length > 0) then if f = File.open(job.tempfilename('tex'),'w') then - Kpse.runscript('rlxtools', ['--identify','--collect'], files.join(' ')) + files.delete("texexec.pdf") + Kpse.runscript('rlxtools', ['--identify','--collect'], files.join(' ')) unless fast figures = @commandline.checkedoption('method', 'a').downcase paperoffset = @commandline.checkedoption('paperoffset', '0pt') backspace = @commandline.checkedoption('backspace', '1.5cm') diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index bd56ee258..daaeb5782 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -13,7 +13,7 @@ % it's about time to clean up this file ... -\newcontextversion{2006.11.16 12:02} +\newcontextversion{2006.11.17 19:52} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index 290f15efa..d8736992b 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -42,7 +42,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2006.11.16 12:02} +\edef\contextversion{2006.11.17 19:52} %D For those who want to use this: diff --git a/tex/context/base/core-mat.tex b/tex/context/base/core-mat.tex index 21498b0a2..0a75bfcf6 100644 --- a/tex/context/base/core-mat.tex +++ b/tex/context/base/core-mat.tex @@ -2535,26 +2535,31 @@ \def\dofrac#1#2#3{\relax\mathematics{{{#1{#2}}\over{#1{#3}}}}} -\def\frac {\dofrac\mathstyle} -\def\xfrac #1#2{\begingroup - \let\xfrac\xxfrac - \dofrac\scriptstyle{#1}{#2}% - \endgroup} -\def\xxfrac#1#2{\begingroup - \dofrac\scriptscriptstyle{#1}{#2}% - \endgroup} +\unexpanded\def\frac + {\dofrac\mathstyle} + +\unexpanded\def\xfrac#1#2% + {\begingroup + \let\xfrac\xxfrac + \dofrac\scriptstyle{#1}{#2}% + \endgroup} + +\unexpanded\def\xxfrac#1#2% + {\begingroup + \dofrac\scriptscriptstyle{#1}{#2}% + \endgroup} %D The \type {xx} variant looks still ugly, so maybe it's %D best to say: -\def\xxfrac#1#2{\begingroup - \dofrac\scriptscriptstyle - {#1}{\raise.25ex\hbox{$\scriptscriptstyle#2$}}% - \endgroup} +\unexpanded\def\xxfrac#1#2% + {\begingroup + \dofrac\scriptscriptstyle{#1}{\raise.25ex\hbox{$\scriptscriptstyle#2$}}% + \endgroup} %D Something low level for scientific calculator notation: -\def\scinot#1#2% +\unexpanded\def\scinot#1#2% {#1\times10^{#2}} %D The next macro, \type {\ch}, is \PPCHTEX\ aware. In @@ -2565,7 +2570,7 @@ \let\mathstyle\relax \fi -\def\ch#1% +\unexpanded\def\ch#1% {\ifx\@@chemicalletter\undefined \mathstyle{\rm#1}% \else diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex index dd24b3097..fa6e24a5b 100644 --- a/tex/context/base/core-spa.tex +++ b/tex/context/base/core-spa.tex @@ -2729,23 +2729,26 @@ \newskip\ctxrightskip \newskip\ctxmidskip -\def\dosinglenarrower#1% - {\processaction - [#1] - [ \v!left=>\global\advance\ctxleftskip \@@slleft, - \v!middle=>\global\advance\ctxmidskip \@@slmiddle, - \v!right=>\global\advance\ctxrightskip \@@slright, - \v!none=>, - \s!unknown=>\global\advance\ctxmidskip \commalistelement]} - -\def\donarrower[#1]% - {\processaction - [#1] - [ \v!left=>\global\advance\ctxleftskip \@@slleft, - \v!middle=>\global\advance\ctxmidskip \@@slmiddle, - \v!right=>\global\advance\ctxrightskip \@@slright, - \v!none=>,% handy for delimitedtexts - \s!unknown=>{\dorepeatwithcommand[#1]\dosinglenarrower}]} +% \def\dosinglenarrower#1% +% {\processaction +% [#1] +% [ \v!left=>\global\advance\ctxleftskip \@@slleft, +% \v!middle=>\global\advance\ctxmidskip \@@slmiddle, +% \v!right=>\global\advance\ctxrightskip \@@slright, +% \v!none=>, +% \s!unknown=>\global\advance\ctxmidskip \commalistelement]} + +% \def\donarrower[#1]% hm, can be dorepeat directly +% {\processaction +% [#1] +% [ \v!left=>\global\advance\ctxleftskip \@@slleft, +% \v!middle=>\global\advance\ctxmidskip \@@slmiddle, +% \v!right=>\global\advance\ctxrightskip \@@slright, +% \v!none=>,% handy for delimitedtexts +% \s!unknown=>{\dorepeatwithcommand[#1]\dosinglenarrower}]} + +\def\donarrower[#1]% hm, can be dorepeat directly + {\dorepeatwithcommand[#1]\dosinglenarrower} \def\complexstartnarrower[#1]% {\@@slbefore % was hard coded \par diff --git a/tex/context/base/spec-pdf.lua b/tex/context/base/spec-pdf.lua deleted file mode 100644 index f831fac1c..000000000 --- a/tex/context/base/spec-pdf.lua +++ /dev/null @@ -1,21 +0,0 @@ --- filename : spec-pdf.lua --- comment : companion to spec-fdf.tex --- author : Hans Hagen, PRAGMA-ADE, Hasselt NL --- copyright: PRAGMA ADE / ConTeXt Development Team --- license : see context related readme files - -if not pdf then pdf = { } end - -function pdf.cleandestination(str) - tex.sprint((string.gsub(str,"[%/%#%<%>%[%]%(%)%-%s]+","-"))) -end - -if not pdf then pdf = { } end - -function pdf.cleandestination(str) - tex.sprint((string.gsub(str,"[%/%#%<%>%[%]%(%)%-%s]+","-"))) -end - -function pdf.santizedstring(str) - tex.sprint((string.gsub(str,"([\\/#<>%[%]%(%)])","\\%1"))) -end diff --git a/tex/context/base/type-gyr.tex b/tex/context/base/type-gyr.tex index e5075de58..07b9b3111 100644 --- a/tex/context/base/type-gyr.tex +++ b/tex/context/base/type-gyr.tex @@ -11,6 +11,21 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +% \usetypescriptfile[type-gyr] +% \definetypeface[pagella][rm][serif][pagella][default][encoding=t5] +% \setupbodyfont[pagella] +% \starttext +% \startlines +% hello world 123 +% {hello \Var[sc] world 123} +% {\it hello \Var[sc]world \Var[reset] 123} +% {\bf hello \Var[osf] {\Var[reset] world} 123} +% {\bi hello world \Var[osf]123} +% {\sc hello \Var[sc] world \Var[reset] 123} +% \stoplines +% \showfont[SerifItalicCaps] +% \stoptext + \starttypescriptcollection[gyre] %D First we define the new ones. Watch how we use the systematic name composition. @@ -26,24 +41,40 @@ \starttypescript [serif] [pagella,termes,bonum] [texnansi,ec,8r,t5,qx] \loadmapfile[\typescriptthree-q\typescriptprefix{f:\typescripttwo}.map] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}r] [encoding=\typescriptthree] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}ri] [encoding=\typescriptthree] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}b] [encoding=\typescriptthree] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}bi] [encoding=\typescriptthree] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Caps] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}r-sc] [encoding=\typescriptthree] - - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Slanted] [\typescriptprefix{n:\typescripttwo}-Italic] - \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldSlanted] [\typescriptprefix{n:\typescripttwo}-BoldItalic] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}r] [encoding=\typescriptthree] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Italic] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}ri] [encoding=\typescriptthree] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Bold] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}b] [encoding=\typescriptthree] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalic] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}bi] [encoding=\typescriptthree] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Caps] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}r-sc] [encoding=\typescriptthree] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-ItalicCaps] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}ri-sc] [encoding=\typescriptthree] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldCaps] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}b-sc] [encoding=\typescriptthree] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldItalicCaps] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}bi-sc] [encoding=\typescriptthree] + + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Slanted] [\typescriptprefix{n:\typescripttwo}-Italic] + \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldSlanted] [\typescriptprefix{n:\typescripttwo}-BoldItalic] \stoptypescript \starttypescript [serif] [pagella,termes,bonum] [name] - \definefontsynonym [Serif] [\typescriptprefix{n:\typescripttwo}-Regular] - \definefontsynonym [SerifItalic] [\typescriptprefix{n:\typescripttwo}-Italic] - \definefontsynonym [SerifBold] [\typescriptprefix{n:\typescripttwo}-Bold] - \definefontsynonym [SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] - \definefontsynonym [SerifCaps] [\typescriptprefix{n:\typescripttwo}-Caps] - \definefontsynonym [SerifSlanted] [\typescriptprefix{n:\typescripttwo}-Slanted] - \definefontsynonym [SerifBoldSlanted] [\typescriptprefix{n:\typescripttwo}-BoldSlanted] + \definefontsynonym [Serif] [\typescriptprefix{n:\typescripttwo}-Regular] + \definefontsynonym [SerifItalic] [\typescriptprefix{n:\typescripttwo}-Italic] + \definefontsynonym [SerifBold] [\typescriptprefix{n:\typescripttwo}-Bold] + \definefontsynonym [SerifBoldItalic] [\typescriptprefix{n:\typescripttwo}-BoldItalic] + \definefontsynonym [SerifCaps] [\typescriptprefix{n:\typescripttwo}-Caps] + \definefontsynonym [SerifSlanted] [\typescriptprefix{n:\typescripttwo}-Slanted] + \definefontsynonym [SerifBoldSlanted] [\typescriptprefix{n:\typescripttwo}-BoldSlanted] + + \definefontvariant [Serif][osf][Caps] + \definefontvariant [Serif][sc] [Caps] + + \definefontsynonym [SerifRegular] [\typescriptprefix{n:\typescripttwo}-Regular] + \definefontsynonym [SerifRegularCaps] [\typescriptprefix{n:\typescripttwo}-Caps] + \definefontsynonym [SerifItalicCaps] [\typescriptprefix{n:\typescripttwo}-ItalicCaps] + \definefontsynonym [SerifBoldCaps] [\typescriptprefix{n:\typescripttwo}-BoldCaps] + \definefontsynonym [SerifBoldItalicCaps] [\typescriptprefix{n:\typescripttwo}-BoldItalicCaps] + \definefontsynonym [SerifCapsCaps] [\typescriptprefix{n:\typescripttwo}-Caps] + \definefontsynonym [SerifSlantedCaps] [\typescriptprefix{n:\typescripttwo}-ItalicCaps] + \definefontsynonym [SerifBoldSlantedCaps] [\typescriptprefix{n:\typescripttwo}-BoldItalicCaps] + \stoptypescript \starttypescript [map] [pagella,termes,bonum] [ec,texnansi,t5,8r] diff --git a/tex/context/base/type-map.tex b/tex/context/base/type-map.tex index d6d8e2fcb..968e42511 100644 --- a/tex/context/base/type-map.tex +++ b/tex/context/base/type-map.tex @@ -65,11 +65,11 @@ \starttypescript [map] [modern,modern-vari,modern-cond,computer-modern,latin-modern,latin-modern-vari,latin-modern-cond,] [ec,texnansi,qx,t5] % this was what we had at the start and what fits best into our naming scheme % well, all those changes in lm gave too many user problem reports so i revert to: - \loadmapfile[\typescriptthree-public-lm.map] + % \loadmapfile[\typescriptthree-public-lm.map] % this one also fits into the naming scheme but has been dropped by the distributers % \loadmapfile[\typescriptthree-lm.map] % this is what the latest distributions provide - % \loadmapfile[lm-\typescriptthree.map] % maybe some day + \loadmapfile[lm-\typescriptthree.map] % maybe some day \stoptypescript % \usetypescript [map] [latin-modern-os] [ec] % lm is loaded under ec regime diff --git a/tex/context/base/verb-sql.tex b/tex/context/base/verb-sql.tex index 555ba304b..ddac5cd25 100644 --- a/tex/context/base/verb-sql.tex +++ b/tex/context/base/verb-sql.tex @@ -8,61 +8,61 @@ %D copyright={Berend de Boer \& Hans Hagen}] %C %C This module is part of the \CONTEXT\ macro||package and is -%C therefore copyrighted by \PRAGMA. See mreadme.pdf for -%C details. +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. \writestatus{loading}{Context Support Macros / Pretty SQL Verbatim} %D \quotation {He, I want pretty pretting too!}, Berend cried out -%D one day, \quotation {But now for \SQL.}. This query language -%D shows code like: -%D +%D one day, \quotation {But now for \SQL.}. This query language +%D shows code like: +%D %D \startbuffer %D \startSQL -%D select * -- some comment +%D select * -- some comment %D from tableA %D where 1 = 2 %D \stopSQL -%D \stopbuffer +%D \stopbuffer %D -%D \typebuffer +%D \typebuffer %D %D and this should become something pretty like: %D %D \getbuffer %D -%D or, with Berend's preferences: +%D or, with Berend's preferences: %D %D \startbuffer[setup] %D \setuptyping %D [SQL] %D [text=yes,palet=,icommand=\bf,vcommand=,ccommand=\it] -%D \stopbuffer +%D \stopbuffer %D %D \getbuffer[setup] %D \getbuffer %D -%D This kind of pretty printing is accomplished by: +%D This kind of pretty printing is accomplished by: %D -%D \typebuffer - -%D Like we did with the \JAVASCRIPT\ driver, we will borrow +%D \typebuffer + +%D Like we did with the \JAVASCRIPT\ driver, we will borrow %D most of the macros from the \PERL\ driver. \ifx\undefined\setupprettyPLtype \input verb-pl \relax \fi \unprotect -%D \SQL\ has the one line comment sequence \type{--} and the -%D multi line comment delimiters \type{/*} and \type{*/}. The +%D \SQL\ has the one line comment sequence \type{--} and the +%D multi line comment delimiters \type{/*} and \type{*/}. The %D next counter keeps track of multi line comment nesting. \newcount\SQLcommentlevel -%D We need to handle \type{%}, \type{#} and \type{-} a bit -%D different than in the \PERL\ driver. Compared to the -%D \JAVASCRIPT\ driver |<|we copied most of the code from -%D that one|>|, we now also have type~45. +%D We need to handle \type{%}, \type{#} and \type{-} a bit +%D different than in the \PERL\ driver. Compared to the +%D \JAVASCRIPT\ driver |<|we copied most of the code from +%D that one|>|, we now also have type~45. \gdef\SQLsetspecials% {\PLsetspecials @@ -73,7 +73,7 @@ \setpretty`\*=44 \setpretty`\-=45 } -%D We need three additional handlers: +%D We need three additional handlers: \gdef\SQLsethandlers% {\PLsethandlers @@ -81,14 +81,14 @@ \installprettyhandler 44 \SQLtypefourfour \installprettyhandler 45 \SQLtypefourfive } -%D Next we have to do some general housekeeping. +%D Next we have to do some general housekeeping. \gdef\SQLsetcontrols% {\PLsetcontrols \def\flushrestofverbatimline% {\endPLtypesix - \ifcase\SQLcommentlevel - \inPLcommentfalse + \ifcase\SQLcommentlevel + \inPLcommentfalse \verbatimfont \fi \PLverbosefalse @@ -108,8 +108,8 @@ \SQLsetspecials \PLsetdiagnostics} -%D We have to look upto four characters ahead. If you don't -%D grab the picture, just skip reading these macros. +%D We have to look upto four characters ahead. If you don't +%D grab the picture, just skip reading these macros. \gdef\SQLtypefourthree% {\handlenextnextpretty\doSQLtypefourthree\PLtypefourtwo} @@ -160,8 +160,8 @@ \ifnum\prettytype=43 \SQLtogglecomment{#1}#2% \global\advance\SQLcommentlevel by -1 - \ifcase\SQLcommentlevel - \global\inPLcommentfalse + \ifcase\SQLcommentlevel + \global\inPLcommentfalse \prettyverbatimfont \fi \else @@ -170,8 +170,8 @@ \expandafter#2% \fi} -%D Much of the indirect calls (\type {dodo..}) is due to -%D looking ahead as well as midway pretty print changing. +%D Much of the indirect calls (\type {dodo..}) is due to +%D looking ahead as well as midway pretty print changing. \gdef\SQLtypefourfive% {\handlenextnextpretty\doSQLtypefourfive\PLtypefourtwo} @@ -207,7 +207,7 @@ \expandafter\next \fi} -%D We need a different list of reserved words. This list +%D We need a different list of reserved words. This list %D replaces the \PERL\ one. \useprettyidentifiers \SQLidentifiers \SQLsetspecials @@ -222,9 +222,9 @@ references return revoce right rollback rule select set sum table then to tran transaction trigger truncate uncommited union unique update use values varying view - when where while with work + when where while with work primary \useprettyidentifiers \SQLvariables \SQLsetspecials not-yet-defined -\protect \endinput +\protect \endinput diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index df1480294..2ff97c876 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index ecdba4f82..fb1e35eaf 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 258d50e37..f515dffa8 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml index e94ebeec7..0c332407a 100644 --- a/tex/context/interface/keys-fr.xml +++ b/tex/context/interface/keys-fr.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index 5392b29f3..6091fe8ee 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index cd94cf859..7f238cdf6 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@ - + diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index b6d43b0dc..80a061a17 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ - + -- cgit v1.2.3