diff options
Diffstat (limited to 'Master/texmf-dist')
| -rw-r--r-- | Master/texmf-dist/doc/fontname/ChangeLog | 23 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/fontname/fontname.html | 715 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/fontname/fontname.pdf | bin | 607601 -> 623364 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/fontname/fontname.texi | 30 | ||||
| -rw-r--r-- | Master/texmf-dist/fonts/enc/dvips/base/6w.enc | 99 | ||||
| -rw-r--r-- | Master/texmf-dist/fonts/enc/dvips/base/8r.enc | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/fonts/enc/dvips/base/ansinew.enc | 253 | ||||
| -rw-r--r-- | Master/texmf-dist/fonts/map/fontname/supplier.map | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/fonts/map/fontname/typeface.map | 17 | ||||
| -rw-r--r-- | Master/texmf-dist/fonts/map/fontname/variant.map | 11 | ||||
| -rw-r--r-- | Master/texmf-dist/fonts/map/fontname/width.map | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/texinfo/texinfo.tex | 762 |
12 files changed, 1694 insertions, 230 deletions
diff --git a/Master/texmf-dist/doc/fontname/ChangeLog b/Master/texmf-dist/doc/fontname/ChangeLog index adcf063edbe..e9a778d8bb8 100644 --- a/Master/texmf-dist/doc/fontname/ChangeLog +++ b/Master/texmf-dist/doc/fontname/ChangeLog @@ -1,3 +1,26 @@ +2006-11-27 Karl Berry <karl@tug.org> + + * fontname.texi: add 6w. + +2006-11-01 Karl Berry <karl@tug.org> + + * variant.map (2): proportional digits. + Plamen Tanovski tex-fonts mail, 27oct06. + +2006-05-11 Karl Berry <karl@tug.org> + + * typeface.map (wp): warnock pro. From John Owens. + +2006-02-05 Karl Berry <karl@tug.org> + + * width.map (n): add Semicondensed, for Myriad Pro. + (y) = Semiexpanded. + From John Owens. + +2005-12-23 Karl Berry <karl@tug.org> + + * typeface.map (gn): gentium. + 2005-10-25 Karl Berry <karl@tug.org> * typeface.map (w9): Wastrel, for Michael Peters, diff --git a/Master/texmf-dist/doc/fontname/fontname.html b/Master/texmf-dist/doc/fontname/fontname.html index 047501fc665..c36ad0fbd2b 100644 --- a/Master/texmf-dist/doc/fontname/fontname.html +++ b/Master/texmf-dist/doc/fontname/fontname.html @@ -59,19 +59,21 @@ This document is in the public domain and may be used freely.--> </li></ul> <li><a name="toc_Encodings" href="#Encodings">Appendix B Encodings</a> <ul> -<li><a href="#8a">B.1 `<samp><span class="samp">8a.enc</span></samp>': Adobe standard encoding</a> -<li><a href="#8r">B.2 `<samp><span class="samp">8r.enc</span></samp>': TeX base encoding</a> -<li><a href="#cork">B.3 `<samp><span class="samp">cork.enc</span></samp>': Cork encoding</a> -<li><a href="#dvips">B.4 `<samp><span class="samp">dvips.enc</span></samp>': Dvips encoding</a> -<li><a href="#t5">B.5 `<samp><span class="samp">t5.enc</span></samp>': T5 encoding</a> -<li><a href="#qx">B.6 `<samp><span class="samp">qx.enc</span></samp>'</a> -<li><a href="#texmext">B.7 `<samp><span class="samp">texmext.enc</span></samp>': TeX math extension encoding</a> -<li><a href="#texmsym">B.8 `<samp><span class="samp">texmsym.enc</span></samp>': TeX math symbol encoding</a> -<li><a href="#texmital">B.9 `<samp><span class="samp">texmital.enc</span></samp>': TeX math italic encoding</a> -<li><a href="#texnansi">B.10 `<samp><span class="samp">texnansi.enc</span></samp>'</a> -<li><a href="#texnansx">B.11 `<samp><span class="samp">texnansx.enc</span></samp>'</a> -<li><a href="#xl2">B.12 `<samp><span class="samp">xl2.enc</span></samp>': OT1 + ISO Latin 2 extended</a> -<li><a href="#xt2">B.13 `<samp><span class="samp">xt2.enc</span></samp>': typewriter OT1 + ISO Latin 2 extended</a> +<li><a href="#6w">B.1 `<samp><span class="samp">6w.enc</span></samp>': Cyrillic CP-1251</a> +<li><a href="#8a">B.2 `<samp><span class="samp">8a.enc</span></samp>': Adobe standard encoding</a> +<li><a href="#8r">B.3 `<samp><span class="samp">8r.enc</span></samp>': TeX base encoding</a> +<li><a href="#cork">B.4 `<samp><span class="samp">cork.enc</span></samp>': Cork encoding</a> +<li><a href="#dvips">B.5 `<samp><span class="samp">dvips.enc</span></samp>': Dvips encoding</a> +<li><a href="#groff">B.6 `<samp><span class="samp">groff.enc</span></samp>': groff encoding</a> +<li><a href="#t5">B.7 `<samp><span class="samp">t5.enc</span></samp>': T5 encoding</a> +<li><a href="#qx">B.8 `<samp><span class="samp">qx.enc</span></samp>'</a> +<li><a href="#texmext">B.9 `<samp><span class="samp">texmext.enc</span></samp>': TeX math extension encoding</a> +<li><a href="#texmsym">B.10 `<samp><span class="samp">texmsym.enc</span></samp>': TeX math symbol encoding</a> +<li><a href="#texmital">B.11 `<samp><span class="samp">texmital.enc</span></samp>': TeX math italic encoding</a> +<li><a href="#texnansi">B.12 `<samp><span class="samp">texnansi.enc</span></samp>'</a> +<li><a href="#texnansx">B.13 `<samp><span class="samp">texnansx.enc</span></samp>'</a> +<li><a href="#xl2">B.14 `<samp><span class="samp">xl2.enc</span></samp>': OT1 + ISO Latin 2 extended</a> +<li><a href="#xt2">B.15 `<samp><span class="samp">xt2.enc</span></samp>': typewriter OT1 + ISO Latin 2 extended</a> </li></ul> <li><a name="toc_Font-legalities" href="#Font-legalities">Appendix C Font legalities</a> <li><a name="toc_General-index" href="#General-index">General index</a> @@ -396,7 +398,7 @@ directory name, and comment. <pre class="example"> <!-- @mapfile{ --> <!-- license = "public domain", --> <!-- email = "tex-fonts@tug.org", --> - <!-- date = "1apr04", --> + <!-- date = "2jun06", --> <!-- url = "http://tug.org/fontname/supplier.map", --> <!-- supported = "yes", --> <!-- docstring = "Typeface supplier (foundry) abbreviations and --> @@ -422,10 +424,12 @@ directory name, and comment. n ibm <span class="roman">IBM</span> o corel <span class="roman">Corel</span> p adobe <span class="roman">Adobe (`<samp>p</samp>' for PostScript)</span> + q texgyre <span class="roman">TeX Gyre fonts from GUST Typefoundry</span> r - <span class="roman">raw (for [obsolete] use with virtual fonts)</span> s sun <span class="roman">Storm Type</span> t paragrap <span class="roman">ParaGraph</span> u urw <span class="roman">URW</span> + v sil <span class="roman">SIL</span> w wolfram <span class="roman">Wolfram</span> z - <span class="roman">bizarre (fontname is nonstandard)</span> - autofont <span class="roman">Eddie Kohler's </span><tt>autofont</tt><span class="roman"> program</span> @@ -490,12 +494,13 @@ the given `<samp><span class="samp">FontName</span></samp>' from that supplier. <pre class="example"> <!-- @mapfile{ --> <!-- email = "tex-fonts@tug.org", --> - <!-- date = "25oct05", --> + <!-- date = "13nov06", --> <!-- url = "http://tug.org/fontname/typeface.map", --> <!-- supported = "yes", --> <!-- docstring = "Typeface abbreviations for the TeX Fontname scheme.", --> <!-- license = "public domain", --> <!-- } --> + a0 arnopro ArnoPro a1 arial Arial a2 amasis Amasis a3 adlib AdLib @@ -581,6 +586,7 @@ the given `<samp><span class="samp">FontName</span></samp>' from that supplier. cg charlema Charlemagne ch charter Charter ci candida Candida + cj charis SILCharis TeXChariot ck caslonbe CaslonBookBE cl cloister Cloister cm cm <span class="roman">Computer Modern</span> @@ -673,6 +679,7 @@ the given `<samp><span class="samp">FontName</span></samp>' from that supplier. gj granjon Granjon b:ElegantGaramondBT gl galliard Galliard gm garamond Garamond u:URWGaramond + gn gentium Gentium go gyoldsty GoudyOldStyle gp glypha Glypha gq grotesq Grotesque u:URWGrotesk @@ -704,6 +711,7 @@ the given `<samp><span class="samp">FontName</span></samp>' from that supplier. i1 impress Impress i2 impuls Impuls i3 imperial Imperial u:URWImperial + i4 inconsol Inconsolata ia insignia Insignia ib ibycus Ibycus ic impact Impact @@ -725,6 +733,12 @@ the given `<samp><span class="samp">FontName</span></samp>' from that supplier. jn janson Janson jo joanna Joanna jp juniper Juniper + k0 calibri Calibri + k1 cambria Cambria + k2 candara Candara + k3 consolas Consolas + k4 constant Constantia + k5 corbel Corbel kb kabel Kabel kg bankgoth BankGothic kl klang Klang @@ -814,6 +828,7 @@ the given `<samp><span class="samp">FontName</span></samp>' from that supplier. nv novarese Novarese nw neueunzi NeueHammerUnziale nx nyx Nyx + ny nyala Nyala nz neuzeits NeuzeitS o0 oldreadf OldDreadfulNo7 o1 oranda Oranda @@ -907,6 +922,7 @@ the given `<samp><span class="samp">FontName</span></samp>' from that supplier. s6 stuyvesa Stuyvesant s7 sassoon Sassoon s8 stonesan StoneSans + s9 segoescr SegoeScript sa scala Scala sb sabon Sabon b:ClassicalGaramondBT sc slimbach Slimbach @@ -945,6 +961,7 @@ the given `<samp><span class="samp">FontName</span></samp>' from that supplier. to torino Torino b:Industrial736BT tp tempo Tempo tr trebuche Trebuchet + tu doulos SILDoulos TeXToulouse tv trumpmed TrumpMediaeval b:Kuenstler480BT tw twentyc TwentiethCentury ty typewrit Typewriter u:URWTypewriter @@ -985,11 +1002,13 @@ the given `<samp><span class="samp">FontName</span></samp>' from that supplier. wi wingding Wingdings wk wilke Wilke wn windsor Windsor + wp warnockp WarnockPro wr wittenbe WitternbergerFrakt ws weiss Weiss wt watertit WatersTitling ww willow Willow xc eccentri Eccentric + xl linuxlib LinuxLibertine xp exponto ExPonto yg centuryg CenturyGothic yh strayhor Strayhorn @@ -1283,7 +1302,7 @@ PostScript `<samp><span class="samp">Encoding</span></samp>' name. <pre class="example"> <!-- @mapfile{ --> <!-- license = "public domain", --> <!-- email = "tex-fonts@@tug.org", --> - <!-- date = "3jul05", --> + <!-- date = "27nov06", --> <!-- url = "http://tug.org/fontname/variant.map", --> <!-- supported = "yes", --> <!-- docstring = "Variant abbreviations for TeX font names, unfortunately --> @@ -1291,7 +1310,7 @@ PostScript `<samp><span class="samp">Encoding</span></samp>' name. <!-- } --> 0 inferior 1 superior - <span class="roman">obsolete [2=>7c] Fraktur encoding</span> + 2 <span class="roman">proportional digits, not tabular</span> <span class="roman">obsolete [3=>7f] Fraction</span> <span class="roman">obsolete [4 fax; now typeface `<samp>lx</samp>', Lucida Fax]</span> 5 <span class="roman">escape for (presently) phonetic encodings</span> @@ -1305,7 +1324,7 @@ PostScript `<samp><span class="samp">Encoding</span></samp>' name. d Display Titling Caption Headline TallCaps SwashCaps LombardicCaps Festive e Engraved Copperplate Elite f Fraktur Gothic OldEnglish Handtooled <span class="roman">(`gothic' can also be sans)</span> - g SmallText <span class="roman">designed for small sizes [was grooved, as in the IBM logo]</span> + g SmallText <span class="roman">lc only, or designed for small sizes [was grooved, as in the IBM logo]</span> h Shadow i Italic Kursiv Ital <span class="roman">text italic</span> j <span class="roman">old-style digits [was invisible]</span> @@ -1319,7 +1338,7 @@ PostScript `<samp><span class="samp">Encoding</span></samp>' name. r <span class="roman">roman or sans; often omitted, see text</span> s Gothic <span class="roman">sans serif</span> t Monospace <span class="roman">fixed-width typewriter</span> - u <span class="roman">unslanted italic</span> + u <span class="roman">underline or unslanted italic</span> v MathExtension w Script Handwritten Swash Calligraphy Cursive Tango x <span class="roman">built with Adobe expert encoding [was expert-encoded]</span> @@ -1361,6 +1380,7 @@ PostScript `<samp><span class="samp">Encoding</span></samp>' name. 8c TeXTextCompanion <span class="roman">LaTeX TS1</span> 8e CE <span class="roman">Adobe CE</span> 8f TeXAfricanLatin <span class="roman">LaTeX T4</span> + 8g groff 8i TS0 <span class="roman">Intersection of TS1/Adobe Standard</span> 8m <span class="roman">Macintosh standard encoding</span> 8n LM1 <span class="roman">Textures</span> @@ -1368,7 +1388,7 @@ PostScript `<samp><span class="samp">Encoding</span></samp>' name. 8r TeXBase1Encoding <span class="roman">(see <a href="#g_t8r">8r</a>)</span> 8t CorkEncoding <span class="roman">(see <a href="#cork">cork</a>), aka tex256.enc</span> 8u XT2Encoding <span class="roman">cmtt + Latin 2, see <samp>xl2.enc</samp></span> - 8v TeXVietnamese <span class="roman">to be defined</span> + 8v TeXVietnamese <span class="roman">T5</span> 8w <span class="roman">Windows 3.1 ANSI encoding</span> 8x Expert <span class="roman">expert encoding</span> 8y LY1 <span class="roman">texnansi</span> @@ -1401,7 +1421,7 @@ font. Arranged from narrowest to widest (more or less): <pre class="display"> ultra compressed, extra condensed, compressed, condensed, narrow regular - extended, expanded, wide + semiextended, extended, expanded, wide </pre> <p><a name="index-automatic-expansion-106"></a><a name="index-character-scaling_002c-automatic-107"></a>Expansion or compression of fonts is sometimes done automatically (as by the PostScript <code>scale</code> operator), and sometimes done by humans. In @@ -1420,15 +1440,14 @@ abbreviation. <pre class="example"> <!-- @mapfile{ --> <!-- license = "public domain", --> <!-- email = "tex-fonts@tug.org", --> - <!-- version = "2.2", --> - <!-- date = "1 July 1998", --> + <!-- date = "5 February 2006", --> <!-- url = "http://tug.org/fontname/width.map", --> <!-- supported = "yes", --> <!-- docstring = "Width abbreviations for TeX font names." --> <!-- } --> c Condensed Cond e Expanded - n Narrow + n Narrow Semicondensed o UltraCondensed p Compressed Compact q ExtraCompressed ExtraCondensed @@ -1438,6 +1457,7 @@ abbreviation. v ExtraExpanded <span class="roman">more than </span><tt>Expanded</tt><span class="roman">, less than </span><tt>Wide</tt> w Wide x Extended Elongated + y Semiexpanded </pre> <div class="node"> <p><hr> @@ -11842,6 +11862,9 @@ font (see <a href="dvips.html#Changing-font-encodings">Changing font encodings</ ones for use with <samp><span class="command">fontinst</span></samp> in particular, see <a href="http://www.ctan.org/tex-archive/fonts/utilities/fontinst/doc/encspecs">http://www.ctan.org/tex-archive/fonts/utilities/fontinst/doc/encspecs</a>. + <p>A tutorial on character code issues in general is available at +<a href="http://www.cs.tut.fi/~jkorpela/chars.html">http://www.cs.tut.fi/~jkorpela/chars.html</a>. + <p>Naming specific characters is a tangled and difficult area. Here are some links to character tables for Unicode, Adobe, and WGL4, for your researching pleasure (thanks to Boguslaw Jackowski for the list): @@ -11856,15 +11879,17 @@ researching pleasure (thanks to Boguslaw Jackowski for the list): </ul> <ul class="menu"> -<li><a accesskey="1" href="#g_t8a">8a</a>: Adobe standard. -<li><a accesskey="2" href="#g_t8r">8r</a>: TeX base. -<li><a accesskey="3" href="#cork">cork</a>: Cork (aka EC, TeX Latin 1, tex256). -<li><a accesskey="4" href="#dvips">dvips</a>: Dvips. -<li><a accesskey="5" href="#t5">t5</a>: Vietnamese, from vntex. -<li><a accesskey="6" href="#qx">qx</a>: QX, from GUST. -<li><a accesskey="7" href="#texmext">texmext</a>: TeX math extension. -<li><a accesskey="8" href="#texmsym">texmsym</a>: TeX math symbol. -<li><a accesskey="9" href="#texmital">texmital</a>: TeX math italic. +<li><a accesskey="1" href="#g_t6w">6w</a>: CP-1251 (Cyrillic). +<li><a accesskey="2" href="#g_t8a">8a</a>: Adobe standard. +<li><a accesskey="3" href="#g_t8r">8r</a>: TeX base. +<li><a accesskey="4" href="#cork">cork</a>: Cork (aka EC, TeX Latin 1, tex256). +<li><a accesskey="5" href="#dvips">dvips</a>: Dvips. +<li><a accesskey="6" href="#groff">groff</a>: 8g. +<li><a accesskey="7" href="#t5">t5</a>: Vietnamese, from vntex. +<li><a accesskey="8" href="#qx">qx</a>: QX, from GUST. +<li><a accesskey="9" href="#texmext">texmext</a>: TeX math extension. +<li><a href="#texmsym">texmsym</a>: TeX math symbol. +<li><a href="#texmital">texmital</a>: TeX math italic. <li><a href="#texnansi">texnansi</a>: From Y&Y. <li><a href="#texnansx">texnansx</a>: From Y&Y. <li><a href="#xl2">xl2</a>: OT1 + ISO Latin 2 (extended). @@ -11873,15 +11898,299 @@ researching pleasure (thanks to Boguslaw Jackowski for the list): <div class="node"> <p><hr> +<a name="g_t6w"></a> +Next: <a rel="next" accesskey="n" href="#g_t8a">8a</a>, +Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> + +</div> + +<h3 class="section">B.1 `<samp><span class="samp">6w.enc</span></samp>': Cyrillic CP-1251</h3> + +<p><a name="index-g_t62_002eenc-133"></a><a name="index-Cyrillic-encoding-134"></a><a name="index-CP_002d1251-encoding-135"></a><a name="index-encodings_002c-Cyrillic-CP_002d1251-136"></a> + +<pre class="verbatim">% @psencodingfile{ +% author = "Adobe", +% version = "1.1", +% date = "12jun05", +% filename = "8a.enc", +% license = "public domain", +% email = "tex-fonts@tug.org", +% codetable = "ISO/ASCII", +% docstring = "Adobe StandardEncoding as an afm2tfm/dvips .enc file." +% } +% 12jun05 - comment changes only. +/StandardEncoding [ +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.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 +/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 +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/exclamdown +/cent +/sterling +/fraction +/yen +/florin +/section +/currency +/quotesingle +/quotedblleft +/guillemotleft +/guilsinglleft +/guilsinglright +/fi +/fl +/.notdef +/endash +/dagger +/daggerdbl +/periodcentered +/.notdef +/paragraph +/bullet +/quotesinglbase +/quotedblbase +/quotedblright +/guillemotright +/ellipsis +/perthousand +/.notdef +/questiondown +/.notdef +/grave +/acute +/circumflex +/tilde +/macron +/breve +/dotaccent +/dieresis +/.notdef +/ring +/cedilla +/.notdef +/hungarumlaut +/ogonek +/caron +/emdash +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/AE +/.notdef +/ordfeminine +/.notdef +/.notdef +/.notdef +/.notdef +/Lslash +/Oslash +/OE +/ordmasculine +/.notdef +/.notdef +/.notdef +/.notdef +/.notdef +/ae +/.notdef +/.notdef +/.notdef +/dotlessi +/.notdef +/.notdef +/lslash +/oslash +/oe +/germandbls +/.notdef +/.notdef +/.notdef +/.notdef +] def +</pre> + +<div class="node"> +<p><hr> <a name="g_t8a"></a> Next: <a rel="next" accesskey="n" href="#g_t8r">8r</a>, +Previous: <a rel="previous" accesskey="p" href="#g_t6w">6w</a>, Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.1 `<samp><span class="samp">8a.enc</span></samp>': Adobe standard encoding</h3> +<h3 class="section">B.2 `<samp><span class="samp">8a.enc</span></samp>': Adobe standard encoding</h3> -<p><a name="index-g_t8a_002eenc-133"></a><a name="index-Adobe-standard-encoding-134"></a><a name="index-encodings_002c-Adobe-standard-135"></a> +<p><a name="index-g_t8a_002eenc-137"></a><a name="index-Adobe-standard-encoding-138"></a><a name="index-encodings_002c-Adobe-standard-139"></a> <pre class="verbatim">% @psencodingfile{ % author = "Adobe", @@ -12163,9 +12472,9 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.2 `<samp><span class="samp">8r.enc</span></samp>': TeX base encoding</h3> +<h3 class="section">B.3 `<samp><span class="samp">8r.enc</span></samp>': TeX base encoding</h3> -<p><a name="index-g_t8r_002eenc-136"></a><a name="index-g_t_0040TeX_007b_007d-base-encoding-137"></a><a name="index-base-encoding_002c-for-_0040TeX_007b_007d-138"></a><a name="index-encodings_002c-_0040TeX_007b_007d-base-139"></a><a name="index-Windows-ANSI-140"></a><a name="index-Lucida-Bright-141"></a> +<p><a name="index-g_t8r_002eenc-140"></a><a name="index-g_t_0040TeX_007b_007d-base-encoding-141"></a><a name="index-base-encoding_002c-for-_0040TeX_007b_007d-142"></a><a name="index-encodings_002c-_0040TeX_007b_007d-base-143"></a><a name="index-Windows-ANSI-144"></a><a name="index-Lucida-Bright-145"></a> <pre class="verbatim">% File 8r.enc TeX Base 1 Encoding Revision 2.0 2002-10-30 % @@ -12173,7 +12482,7 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> % author = "S. Rahtz, P. MacKay, Alan Jeffrey, B. Horn, K. Berry, % W. Schmidt, P. Lehman", % version = "2.0", -% date = "30 October 2002", +% date = "27nov06", % filename = "8r.enc", % email = "tex-fonts@@tug.org", % docstring = "This is the encoding vector for Type1 and TrueType @@ -12283,7 +12592,7 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> /currency /yen /brokenbar /section /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron -% 0xD0 +% 0xB0 /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered /cedilla /onesuperior /ordmasculine /guillemotright @@ -12320,9 +12629,9 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.3 `<samp><span class="samp">cork.enc</span></samp>': Cork encoding</h3> +<h3 class="section">B.4 `<samp><span class="samp">cork.enc</span></samp>': Cork encoding</h3> -<p><a name="index-cork_002eenc-142"></a><a name="index-Cork-encoding-143"></a><a name="index-EC-encoding-144"></a><a name="index-g_t_0040TeX_007b_007d-Latin-1-encoding-145"></a><a name="index-encodings_002c-Cork-146"></a><a name="index-encodings_002c-EC-147"></a><a name="index-encodings_002c-_0040TeX_007b_007d-Latin-1-148"></a> +<p><a name="index-cork_002eenc-146"></a><a name="index-Cork-encoding-147"></a><a name="index-EC-encoding-148"></a><a name="index-g_t_0040TeX_007b_007d-Latin-1-encoding-149"></a><a name="index-encodings_002c-Cork-150"></a><a name="index-encodings_002c-EC-151"></a><a name="index-encodings_002c-_0040TeX_007b_007d-Latin-1-152"></a> <pre class="verbatim">% @psencodingfile{ % version = "1.0", @@ -12423,15 +12732,15 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> <div class="node"> <p><hr> <a name="dvips"></a> -Next: <a rel="next" accesskey="n" href="#t5">t5</a>, +Next: <a rel="next" accesskey="n" href="#groff">groff</a>, Previous: <a rel="previous" accesskey="p" href="#cork">cork</a>, Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.4 `<samp><span class="samp">dvips.enc</span></samp>': Dvips encoding</h3> +<h3 class="section">B.5 `<samp><span class="samp">dvips.enc</span></samp>': Dvips encoding</h3> -<p><a name="index-dvips_002eenc-149"></a><a name="index-Dvips-encoding-150"></a><a name="index-encoding_002c-Dvips-151"></a> +<p><a name="index-dvips_002eenc-153"></a><a name="index-Dvips-encoding-154"></a><a name="index-encoding_002c-Dvips-155"></a> <pre class="verbatim">% @psencodingfile{ % author = "T. Rokicki, K. Berry", @@ -12512,16 +12821,129 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> <div class="node"> <p><hr> +<a name="groff"></a> +Next: <a rel="next" accesskey="n" href="#t5">t5</a>, +Previous: <a rel="previous" accesskey="p" href="#dvips">dvips</a>, +Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> + +</div> + +<h3 class="section">B.6 `<samp><span class="samp">groff.enc</span></samp>': groff encoding</h3> + +<p><a name="index-groff_002eenc-156"></a><a name="index-Groff-encoding-157"></a><a name="index-encoding_002c-Groff-158"></a> + +<pre class="verbatim">%!PS-Adobe-3.0 Resource-Encoding +% +% @psencodingfile{ +% author = "Werner Lemberg, Michail Vidiassov", +% version = "1.0", +% date = "2006-Feb-03", +% filename = "groff.enc", +% license = "public domain", +% email = "groff@gnu.org", +% docstring = "Groff default text encoding. Used with MetaPost." +% } + +%%BeginResource: encoding groffEncoding +/groffEncoding [ +% 0x00 | 0 + /asciicircum /asciitilde /Scaron /Zcaron + /scaron /zcaron /Ydieresis /trademark + /quotesingle /Euro /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x10 | 16 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x20 | 32 + /space /exclam /quotedbl /numbersign + /dollar /percent /ampersand /quoteright + /parenleft /parenright /asterisk /plus + /comma /hyphen /period /slash +% 0x30 | 48 + /zero /one /two /three + /four /five /six /seven + /eight /nine /colon /semicolon + /less /equal /greater /question +% 0x40 | 64 + /at /A /B /C + /D /E /F /G + /H /I /J /K + /L /M /N /O +% 0x50 | 80 + /P /Q /R /S + /T /U /V /W + /X /Y /Z /bracketleft + /backslash /bracketright /circumflex /underscore +% 0x60 | 96 + /quoteleft /a /b /c + /d /e /f /g + /h /i /j /k + /l /m /n /o +% 0x70 | 112 + /p /q /r /s + /t /u /v /w + /x /y /z /braceleft + /bar /braceright /tilde /.notdef +% 0x80 | 128 + /quotesinglbase /guillemotleft /guillemotright /bullet + /florin /fraction /perthousand /dagger + /daggerdbl /endash /emdash /ff + /fi /fl /ffi /ffl +% 0x90 | 144 + /dotlessi /dotlessj /grave /hungarumlaut + /dotaccent /breve /caron /ring + /ogonek /quotedblleft /quotedblright /oe + /lslash /quotedblbase /OE /Lslash +% 0xA0 | 160 + /.notdef /exclamdown /cent /sterling + /currency /yen /brokenbar /section + /dieresis /copyright /ordfeminine /guilsinglleft + /logicalnot /minus /registered /macron +% 0xB0 | 176 + /degree /plusminus /twosuperior /threesuperior + /acute /mu /paragraph /periodcentered + /cedilla /onesuperior /ordmasculine /guilsinglright + /onequarter /onehalf /threequarters /questiondown +% 0xC0 | 192 + /Agrave /Aacute /Acircumflex /Atilde + /Adieresis /Aring /AE /Ccedilla + /Egrave /Eacute /Ecircumflex /Edieresis + /Igrave /Iacute /Icircumflex /Idieresis +% 0xD0 | 208 + /Eth /Ntilde /Ograve /Oacute + /Ocircumflex /Otilde /Odieresis /multiply + /Oslash /Ugrave /Uacute /Ucircumflex + /Udieresis /Yacute /Thorn /germandbls +% 0xE0 | 224 + /agrave /aacute /acircumflex /atilde + /adieresis /aring /ae /ccedilla + /egrave /eacute /ecircumflex /edieresis + /igrave /iacute /icircumflex /idieresis +% 0xF0 | 240 + /eth /ntilde /ograve /oacute + /ocircumflex /otilde /odieresis /divide + /oslash /ugrave /uacute /ucircumflex + /udieresis /yacute /thorn /ydieresis +] def +%%EndResource + +% eof +</pre> + +<div class="node"> +<p><hr> <a name="t5"></a> Next: <a rel="next" accesskey="n" href="#qx">qx</a>, -Previous: <a rel="previous" accesskey="p" href="#dvips">dvips</a>, +Previous: <a rel="previous" accesskey="p" href="#groff">groff</a>, Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.5 `<samp><span class="samp">t5.enc</span></samp>': T5 encoding</h3> +<h3 class="section">B.7 `<samp><span class="samp">t5.enc</span></samp>': T5 encoding</h3> -<p><a name="index-t5_002eenc-152"></a><a name="index-T5-encoding-153"></a><a name="index-Vietnamese-encoding-154"></a><a name="index-encoding_002c-T5-155"></a> +<p><a name="index-t5_002eenc-159"></a><a name="index-T5-encoding-160"></a><a name="index-Vietnamese-encoding-161"></a><a name="index-encoding_002c-T5-162"></a> <pre class="verbatim">% Copyright 2000-2005 Werner Lemberg <wl@gnu.org>. % This file is part of vntex. License: LPPL, version 1.3 or newer, @@ -12792,9 +13214,9 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.6 `<samp><span class="samp">qx.enc</span></samp>'</h3> +<h3 class="section">B.8 `<samp><span class="samp">qx.enc</span></samp>'</h3> -<p><a name="index-qx_002eenc-156"></a><a name="index-encodings_002c-qx-157"></a><a name="index-qx-encoding-158"></a> +<p><a name="index-qx_002eenc-163"></a><a name="index-encodings_002c-qx-164"></a><a name="index-qx-encoding-165"></a> From GUST. <pre class="verbatim">% ========================================================================= @@ -13651,9 +14073,9 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.7 `<samp><span class="samp">texmext.enc</span></samp>': TeX math extension encoding</h3> +<h3 class="section">B.9 `<samp><span class="samp">texmext.enc</span></samp>': TeX math extension encoding</h3> -<p><a name="index-texmext_002eenc-159"></a><a name="index-g_t_0040TeX_007b_007d-math-extension-encoding-160"></a><a name="index-math-extension_002c-_0040TeX_007b_007d-encoding-161"></a><a name="index-extension_002c-_0040TeX_007b_007d-math-encoding-162"></a><a name="index-encodings_002c-_0040TeX_007b_007d-math-symbol-163"></a> +<p><a name="index-texmext_002eenc-166"></a><a name="index-g_t_0040TeX_007b_007d-math-extension-encoding-167"></a><a name="index-math-extension_002c-_0040TeX_007b_007d-encoding-168"></a><a name="index-extension_002c-_0040TeX_007b_007d-math-encoding-169"></a><a name="index-encodings_002c-_0040TeX_007b_007d-math-symbol-170"></a> <pre class="verbatim">% @psencodingfile{ % author = "Donald Knuth", @@ -13862,9 +14284,9 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.8 `<samp><span class="samp">texmsym.enc</span></samp>': TeX math symbol encoding</h3> +<h3 class="section">B.10 `<samp><span class="samp">texmsym.enc</span></samp>': TeX math symbol encoding</h3> -<p><a name="index-texmsym_002eenc-164"></a><a name="index-g_t_0040TeX_007b_007d-math-symbol-encoding-165"></a><a name="index-math-symbol_002c-_0040TeX_007b_007d-encoding-166"></a><a name="index-symbol_002c-_0040TeX_007b_007d-math-encoding-167"></a><a name="index-encodings_002c-_0040TeX_007b_007d-math-symbol-168"></a> +<p><a name="index-texmsym_002eenc-171"></a><a name="index-g_t_0040TeX_007b_007d-math-symbol-encoding-172"></a><a name="index-math-symbol_002c-_0040TeX_007b_007d-encoding-173"></a><a name="index-symbol_002c-_0040TeX_007b_007d-math-encoding-174"></a><a name="index-encodings_002c-_0040TeX_007b_007d-math-symbol-175"></a> <pre class="verbatim">% @psencodingfile{ % author = "Donald Knuth", @@ -14071,9 +14493,9 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.9 `<samp><span class="samp">texmital.enc</span></samp>': TeX math italic encoding</h3> +<h3 class="section">B.11 `<samp><span class="samp">texmital.enc</span></samp>': TeX math italic encoding</h3> -<p><a name="index-texmital_002eenc-169"></a><a name="index-g_t_0040TeX_007b_007d-math-italic-encoding-170"></a><a name="index-math-italic_002c-_0040TeX_007b_007d-encoding-171"></a><a name="index-italic_002c-_0040TeX_007b_007d-math-encoding-172"></a><a name="index-encodings_002c-_0040TeX_007b_007d-math-italic-173"></a> +<p><a name="index-texmital_002eenc-176"></a><a name="index-g_t_0040TeX_007b_007d-math-italic-encoding-177"></a><a name="index-math-italic_002c-_0040TeX_007b_007d-encoding-178"></a><a name="index-italic_002c-_0040TeX_007b_007d-math-encoding-179"></a><a name="index-encodings_002c-_0040TeX_007b_007d-math-italic-180"></a> <pre class="verbatim">% @psencodingfile{ % author = "Donald Knuth", @@ -14281,9 +14703,9 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.10 `<samp><span class="samp">texnansi.enc</span></samp>'</h3> +<h3 class="section">B.12 `<samp><span class="samp">texnansi.enc</span></samp>'</h3> -<p><a name="index-texnansi_002eenc-174"></a><a name="index-encodings_002c-texnansi-175"></a><a name="index-texnansi-encoding-176"></a> +<p><a name="index-texnansi_002eenc-181"></a><a name="index-encodings_002c-texnansi-182"></a><a name="index-texnansi-encoding-183"></a> From Y&Y. <pre class="verbatim">% @psencodingfile{ @@ -14614,9 +15036,9 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.11 `<samp><span class="samp">texnansx.enc</span></samp>'</h3> +<h3 class="section">B.13 `<samp><span class="samp">texnansx.enc</span></samp>'</h3> -<p><a name="index-texnansx_002eenc-177"></a><a name="index-encodings_002c-texnansx-178"></a><a name="index-texnansx-encoding-179"></a> +<p><a name="index-texnansx_002eenc-184"></a><a name="index-encodings_002c-texnansx-185"></a><a name="index-texnansx-encoding-186"></a> From Y&Y. `<samp><span class="samp">texnansi</span></samp>' without repeats. <pre class="verbatim">% @psencodingfile{ @@ -14903,9 +15325,9 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.12 `<samp><span class="samp">xl2.enc</span></samp>': OT1 + ISO Latin 2 extended</h3> +<h3 class="section">B.14 `<samp><span class="samp">xl2.enc</span></samp>': OT1 + ISO Latin 2 extended</h3> -<p><a name="index-xl2_002eenc-180"></a><a name="index-ISO-Latin-2-extended_002c-_0040TeX_007b_007d-encoding-181"></a> +<p><a name="index-xl2_002eenc-187"></a><a name="index-ISO-Latin-2-extended_002c-_0040TeX_007b_007d-encoding-188"></a> <pre class="verbatim">% @psencodingfile{ % author = "Petr Olsak, Zdenek Wagner", @@ -15244,9 +15666,9 @@ Up: <a rel="up" accesskey="u" href="#Encodings">Encodings</a> </div> -<h3 class="section">B.13 `<samp><span class="samp">xt2.enc</span></samp>': typewriter OT1 + ISO Latin 2 extended</h3> +<h3 class="section">B.15 `<samp><span class="samp">xt2.enc</span></samp>': typewriter OT1 + ISO Latin 2 extended</h3> -<p><a name="index-xt2_002eenc-182"></a><a name="index-ISO-Latin-2-extended-and-typewriter_002c-_0040TeX_007b_007d-encoding-183"></a> +<p><a name="index-xt2_002eenc-189"></a><a name="index-ISO-Latin-2-extended-and-typewriter_002c-_0040TeX_007b_007d-encoding-190"></a> <pre class="verbatim">% @psencodingfile{ % author = "Petr Olsak, Zdenek Wagner", @@ -15580,8 +16002,8 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a> <h2 class="appendix">Appendix C Font legalities</h2> -<p><a name="index-legalisms-184"></a><a name="index-typeface-design-protection-185"></a><a name="index-copyright-on-fonts-186"></a><a name="index-font-copyrighting-187"></a><a name="index-patenting-of-fonts-188"></a> -<a name="index-Bigelow_002c-Charles-189"></a><a name="index-Holmes_002c-Kris-190"></a>This section owes a great deal to Charles Bigelow (co-designer with Kris +<p><a name="index-legalisms-191"></a><a name="index-typeface-design-protection-192"></a><a name="index-copyright-on-fonts-193"></a><a name="index-font-copyrighting-194"></a><a name="index-patenting-of-fonts-195"></a> +<a name="index-Bigelow_002c-Charles-196"></a><a name="index-Holmes_002c-Kris-197"></a>This section owes a great deal to Charles Bigelow (co-designer with Kris Holmes of the Lucida typeface family, among others), who has generously answered our many queries about fonts and the law around the world with remarkable patience and understanding. (But he is naturally not @@ -15601,9 +16023,9 @@ software patents, among other things, but I lack specific information to include. -<a name="index-United-States_002c-font-design-protection-law-191"></a> -<a name="index-Lucida_002c-protection-of-192"></a> -<a name="index-Stone_002c-protection-of-193"></a> +<a name="index-United-States_002c-font-design-protection-law-198"></a> +<a name="index-Lucida_002c-protection-of-199"></a> +<a name="index-Stone_002c-protection-of-200"></a> <dl><dt>United States<dd>Typeface designs can be patented, but not copyrighted. Only a few designs have been patented. (Lucida and Stone are the only ones I know of. I don't know what the grounds were for patenting Stone, but Lucida @@ -15619,7 +16041,7 @@ right, not in making the computer program right, so it would seem that to be consistent, the copyright laws should protect the design, not the program—the opposite of the current situation. - <p><a name="index-Germany_002c-font-design-protection-law-194"></a><a name="index-Renner_002c-Paul-195"></a><a name="index-Futura-196"></a><br><dt>Germany<dd>Typeface designs have been copyrightable as original works of art since + <p><a name="index-Germany_002c-font-design-protection-law-201"></a><a name="index-Renner_002c-Paul-202"></a><a name="index-Futura-203"></a><br><dt>Germany<dd>Typeface designs have been copyrightable as original works of art since 1981. As a result, many (perhaps most) designs have been copyrighted there. The law is not retroactive, but German courts have upheld the intellectual property rights of designers of earlier fonts as well: In @@ -15627,7 +16049,7 @@ one case the heirs of Paul Renner (designer of Futura) won a suit against the Bauer foundry for arbitrarily discontinuing a portion of their royalties. - <p><a name="index-England_002c-font-design-protection-law-197"></a><a name="index-Times-Roman_002c-protection-of-198"></a><a name="index-Morison_002c-Stanley-199"></a><br><dt>England<dd>A copyright law passed in 1989 covers typeface designs first published + <p><a name="index-England_002c-font-design-protection-law-204"></a><a name="index-Times-Roman_002c-protection-of-205"></a><a name="index-Morison_002c-Stanley-206"></a><br><dt>England<dd>A copyright law passed in 1989 covers typeface designs first published in England (or published in Britain within 30 days of its publication elsewhere), and it <em>is</em> retroactive. It's unclear how far back the law extends, but Times Roman, designed in the late 1920's and @@ -15636,13 +16058,13 @@ the law extends, but Times Roman, designed in the late 1920's and with an English version, as the law does not forbid importing foreign versions of English typefaces. - <p><a name="index-France_002c-font-design-protection-law-200"></a><a name="index-romain-du-roi-201"></a><a name="index-Grandjean_002c-Philippe-202"></a><br><dt>France<dd>The Romain du Roi typeface designed by Philippe Grandjean in 1702 for + <p><a name="index-France_002c-font-design-protection-law-207"></a><a name="index-romain-du-roi-208"></a><a name="index-Grandjean_002c-Philippe-209"></a><br><dt>France<dd>The Romain du Roi typeface designed by Philippe Grandjean in 1702 for the French royal family is protected, and perhaps other such “royal” designs. There is no protection for designs in general. </dl> - <p><a name="index-Vienna-treaty-203"></a>In 1973 the international Vienna treaty on typeface design protection + <p><a name="index-Vienna-treaty-210"></a>In 1973 the international Vienna treaty on typeface design protection was proposed. France ratified it in 1974 or 1975, and Germany in 1981. The English law might constitute ratification, but this has not been settled. In any case, since at least four countries have to ratify it @@ -15661,23 +16083,24 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a> <ul class="index-cp" compact> <li><a href="#index-g_t35-standard-PostScript-fonts-118">35 standard PostScript fonts</a>: <a href="#Standard-PostScript-fonts">Standard PostScript fonts</a></li> +<li><a href="#index-g_t62_002eenc-133"><code>62.enc</code></a>: <a href="#g_t6w">6w</a></li> <li><a href="#index-g_t7_002dbit-encodings-78">7-bit encodings</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-g_t8_002dbit-encodings-79">8-bit encodings</a>: <a href="#Variants">Variants</a></li> -<li><a href="#index-g_t8a_002eenc-133"><code>8a.enc</code></a>: <a href="#g_t8a">8a</a></li> -<li><a href="#index-g_t8r_002eenc-136"><code>8r.enc</code></a>: <a href="#g_t8r">8r</a></li> +<li><a href="#index-g_t8a_002eenc-137"><code>8a.enc</code></a>: <a href="#g_t8a">8a</a></li> +<li><a href="#index-g_t8r_002eenc-140"><code>8r.enc</code></a>: <a href="#g_t8r">8r</a></li> <li><a href="#index-g_t9s-_0040r_007bvariant_007d-82"><code>9s </code><span class="roman">variant</span></a>: <a href="#Variants">Variants</a></li> -<li><a href="#index-Adobe-standard-encoding-134">Adobe standard encoding</a>: <a href="#g_t8a">8a</a></li> +<li><a href="#index-Adobe-standard-encoding-138">Adobe standard encoding</a>: <a href="#g_t8a">8a</a></li> <li><a href="#index-adobe_002emap-121"><code>adobe.map</code></a>: <a href="#Adobe-fonts">Adobe fonts</a></li> <li><a href="#index-Afm2tfm-encoding-88">Afm2tfm encoding</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-apple_002emap-122"><code>apple.map</code></a>: <a href="#Apple-fonts">Apple fonts</a></li> <li><a href="#index-attribution-of-fonts_002c-missing-54">attribution of fonts, missing</a>: <a href="#Suppliers">Suppliers</a></li> <li><a href="#index-automatic-expansion-106">automatic expansion</a>: <a href="#Widths">Widths</a></li> <li><a href="#index-Avant-Garde-50">Avant Garde</a>: <a href="#Suppliers">Suppliers</a></li> -<li><a href="#index-base-encoding_002c-for-_0040TeX_007b_007d-138">base encoding, for TeX</a>: <a href="#g_t8r">8r</a></li> +<li><a href="#index-base-encoding_002c-for-_0040TeX_007b_007d-142">base encoding, for TeX</a>: <a href="#g_t8r">8r</a></li> <li><a href="#index-Beebe_002c-Nelson-14">Beebe, Nelson</a>: <a href="#History">History</a></li> <li><a href="#index-Beeton_002c-Barbara-15">Beeton, Barbara</a>: <a href="#History">History</a></li> <li><a href="#index-Bernstein_002c-Rocky-16">Bernstein, Rocky</a>: <a href="#History">History</a></li> -<li><a href="#index-Bigelow_002c-Charles-189">Bigelow, Charles</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-Bigelow_002c-Charles-196">Bigelow, Charles</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-bitstrea_002emap-123"><code>bitstrea.map</code></a>: <a href="#Bitstream-fonts">Bitstream fonts</a></li> <li><a href="#index-bizarre-font-names-57">bizarre font names</a>: <a href="#Suppliers">Suppliers</a></li> <li><a href="#index-Bouche_002c-Thierry-17">Bouche, Thierry</a>: <a href="#History">History</a></li> @@ -15688,10 +16111,12 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a> <li><a href="#index-character-scaling_002c-automatic-107">character scaling, automatic</a>: <a href="#Widths">Widths</a></li> <li><a href="#index-compression-104">compression</a>: <a href="#Widths">Widths</a></li> <li><a href="#index-contributors-13">contributors</a>: <a href="#History">History</a></li> -<li><a href="#index-copyright-on-fonts-186">copyright on fonts</a>: <a href="#Font-legalities">Font legalities</a></li> -<li><a href="#index-Cork-encoding-143">Cork encoding</a>: <a href="#cork">cork</a></li> -<li><a href="#index-cork_002eenc-142"><code>cork.enc</code></a>: <a href="#cork">cork</a></li> +<li><a href="#index-copyright-on-fonts-193">copyright on fonts</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-Cork-encoding-147">Cork encoding</a>: <a href="#cork">cork</a></li> +<li><a href="#index-cork_002eenc-146"><code>cork.enc</code></a>: <a href="#cork">cork</a></li> +<li><a href="#index-CP_002d1251-encoding-135">CP-1251 encoding</a>: <a href="#g_t6w">6w</a></li> <li><a href="#index-Cugley_002c-Damian-18">Cugley, Damian</a>: <a href="#History">History</a></li> +<li><a href="#index-Cyrillic-encoding-134">Cyrillic encoding</a>: <a href="#g_t6w">6w</a></li> <li><a href="#index-Cyrillic-encodings-77">Cyrillic encodings</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-Cyrillic-fonts-92">Cyrillic fonts</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-design-size-specification-43">design size specification</a>: <a href="#Filenames-for-fonts">Filenames for fonts</a></li> @@ -15699,38 +16124,40 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a> <li><a href="#index-DOS-filesystems-39">DOS filesystems</a>: <a href="#Filenames-for-fonts">Filenames for fonts</a></li> <li><a href="#index-dtc_002emap-124"><code>dtc.map</code></a>: <a href="#DTC-fonts">DTC fonts</a></li> <li><a href="#index-Dviljk-translator-34">Dviljk translator</a>: <a href="#References">References</a></li> -<li><a href="#index-Dvips-encoding-150">Dvips encoding</a>: <a href="#dvips">dvips</a></li> +<li><a href="#index-Dvips-encoding-154">Dvips encoding</a>: <a href="#dvips">dvips</a></li> <li><a href="#index-Dvips-translator-33">Dvips translator</a>: <a href="#References">References</a></li> -<li><a href="#index-dvips_002eenc-149"><code>dvips.enc</code></a>: <a href="#dvips">dvips</a></li> -<li><a href="#index-EC-encoding-144">EC encoding</a>: <a href="#cork">cork</a></li> +<li><a href="#index-dvips_002eenc-153"><code>dvips.enc</code></a>: <a href="#dvips">dvips</a></li> +<li><a href="#index-EC-encoding-148">EC encoding</a>: <a href="#cork">cork</a></li> <li><a href="#index-eight_002dcharacter-limitation-38">eight-character limitation</a>: <a href="#Filenames-for-fonts">Filenames for fonts</a></li> <li><a href="#index-encoding-files-6">encoding files</a>: <a href="#Introduction">Introduction</a></li> <li><a href="#index-encoding-vectors-132">encoding vectors</a>: <a href="#Encodings">Encodings</a></li> -<li><a href="#index-encoding_002c-Dvips-151">encoding, Dvips</a>: <a href="#dvips">dvips</a></li> -<li><a href="#index-encoding_002c-T5-155">encoding, T5</a>: <a href="#t5">t5</a></li> -<li><a href="#index-encodings_002c-Adobe-standard-135">encodings, Adobe standard</a>: <a href="#g_t8a">8a</a></li> -<li><a href="#index-encodings_002c-Cork-146">encodings, Cork</a>: <a href="#cork">cork</a></li> -<li><a href="#index-encodings_002c-EC-147">encodings, EC</a>: <a href="#cork">cork</a></li> -<li><a href="#index-encodings_002c-qx-157">encodings, qx</a>: <a href="#qx">qx</a></li> -<li><a href="#index-encodings_002c-_0040TeX_007b_007d-base-139">encodings, TeX base</a>: <a href="#g_t8r">8r</a></li> -<li><a href="#index-encodings_002c-_0040TeX_007b_007d-Latin-1-148">encodings, TeX Latin 1</a>: <a href="#cork">cork</a></li> -<li><a href="#index-encodings_002c-_0040TeX_007b_007d-math-italic-173">encodings, TeX math italic</a>: <a href="#texmital">texmital</a></li> -<li><a href="#index-encodings_002c-_0040TeX_007b_007d-math-symbol-168">encodings, TeX math symbol</a>: <a href="#texmsym">texmsym</a></li> -<li><a href="#index-encodings_002c-_0040TeX_007b_007d-math-symbol-163">encodings, TeX math symbol</a>: <a href="#texmext">texmext</a></li> -<li><a href="#index-encodings_002c-texnansi-175">encodings, texnansi</a>: <a href="#texnansi">texnansi</a></li> -<li><a href="#index-encodings_002c-texnansx-178">encodings, texnansx</a>: <a href="#texnansx">texnansx</a></li> +<li><a href="#index-encoding_002c-Dvips-155">encoding, Dvips</a>: <a href="#dvips">dvips</a></li> +<li><a href="#index-encoding_002c-Groff-158">encoding, Groff</a>: <a href="#groff">groff</a></li> +<li><a href="#index-encoding_002c-T5-162">encoding, T5</a>: <a href="#t5">t5</a></li> +<li><a href="#index-encodings_002c-Adobe-standard-139">encodings, Adobe standard</a>: <a href="#g_t8a">8a</a></li> +<li><a href="#index-encodings_002c-Cork-150">encodings, Cork</a>: <a href="#cork">cork</a></li> +<li><a href="#index-encodings_002c-Cyrillic-CP_002d1251-136">encodings, Cyrillic CP-1251</a>: <a href="#g_t6w">6w</a></li> +<li><a href="#index-encodings_002c-EC-151">encodings, EC</a>: <a href="#cork">cork</a></li> +<li><a href="#index-encodings_002c-qx-164">encodings, qx</a>: <a href="#qx">qx</a></li> +<li><a href="#index-encodings_002c-_0040TeX_007b_007d-base-143">encodings, TeX base</a>: <a href="#g_t8r">8r</a></li> +<li><a href="#index-encodings_002c-_0040TeX_007b_007d-Latin-1-152">encodings, TeX Latin 1</a>: <a href="#cork">cork</a></li> +<li><a href="#index-encodings_002c-_0040TeX_007b_007d-math-italic-180">encodings, TeX math italic</a>: <a href="#texmital">texmital</a></li> +<li><a href="#index-encodings_002c-_0040TeX_007b_007d-math-symbol-175">encodings, TeX math symbol</a>: <a href="#texmsym">texmsym</a></li> +<li><a href="#index-encodings_002c-_0040TeX_007b_007d-math-symbol-170">encodings, TeX math symbol</a>: <a href="#texmext">texmext</a></li> +<li><a href="#index-encodings_002c-texnansi-182">encodings, texnansi</a>: <a href="#texnansi">texnansi</a></li> +<li><a href="#index-encodings_002c-texnansx-185">encodings, texnansx</a>: <a href="#texnansx">texnansx</a></li> <li><a href="#index-encodings_002c-unspecified-87">encodings, unspecified</a>: <a href="#Variants">Variants</a></li> -<li><a href="#index-England_002c-font-design-protection-law-197">England, font design protection law</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-England_002c-font-design-protection-law-204">England, font design protection law</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-Ertner_002c-Vincent-129">Ertner, Vincent</a>: <a href="#URW-fonts">URW fonts</a></li> <li><a href="#index-escape-for-nonstandard-names-59">escape for nonstandard names</a>: <a href="#Suppliers">Suppliers</a></li> <li><a href="#index-expansion-105">expansion</a>: <a href="#Widths">Widths</a></li> <li><a href="#index-expert-encoding-100">expert encoding</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-expertised-encodings-80">expertised encodings</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-expertised-font-101">expertised font</a>: <a href="#Variants">Variants</a></li> -<li><a href="#index-extension_002c-_0040TeX_007b_007d-math-encoding-162">extension, TeX math encoding</a>: <a href="#texmext">texmext</a></li> +<li><a href="#index-extension_002c-_0040TeX_007b_007d-math-encoding-169">extension, TeX math encoding</a>: <a href="#texmext">texmext</a></li> <li><a href="#index-fax-variant-74">fax variant</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-filenames_002c-basics-42">filenames, basics</a>: <a href="#Filenames-for-fonts">Filenames for fonts</a></li> -<li><a href="#index-font-copyrighting-187">font copyrighting</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-font-copyrighting-194">font copyrighting</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-font-scaling-45">font scaling</a>: <a href="#Filenames-for-fonts">Filenames for fonts</a></li> <li><a href="#index-font_005fcoding_005fscheme-116"><code>font_coding_scheme</code></a>: <a href="#Long-naming-scheme">Long naming scheme</a></li> <li><a href="#index-Fontinst-distribution-32">Fontinst distribution</a>: <a href="#References">References</a></li> @@ -15738,29 +16165,31 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a> <li><a href="#index-fontname-mapping-file-110">fontname mapping file</a>: <a href="#Name-mapping-file">Name mapping file</a></li> <li><a href="#index-Fontname-version-2-12">Fontname version 2</a>: <a href="#History">History</a></li> <li><a href="#index-foundries-48">foundries</a>: <a href="#Suppliers">Suppliers</a></li> -<li><a href="#index-France_002c-font-design-protection-law-200">France, font design protection law</a>: <a href="#Font-legalities">Font legalities</a></li> -<li><a href="#index-Futura-196">Futura</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-France_002c-font-design-protection-law-207">France, font design protection law</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-Futura-203">Futura</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-Garamond_002c-versions-of-62">Garamond, versions of</a>: <a href="#Typefaces">Typefaces</a></li> -<li><a href="#index-Germany_002c-font-design-protection-law-194">Germany, font design protection law</a>: <a href="#Font-legalities">Font legalities</a></li> -<li><a href="#index-Grandjean_002c-Philippe-202">Grandjean, Philippe</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-Germany_002c-font-design-protection-law-201">Germany, font design protection law</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-Grandjean_002c-Philippe-209">Grandjean, Philippe</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-Greek-fonts-91">Greek fonts</a>: <a href="#Variants">Variants</a></li> +<li><a href="#index-Groff-encoding-157">Groff encoding</a>: <a href="#groff">groff</a></li> +<li><a href="#index-groff_002eenc-156"><code>groff.enc</code></a>: <a href="#groff">groff</a></li> <li><a href="#index-hexadecimal-design-size-44">hexadecimal design size</a>: <a href="#Filenames-for-fonts">Filenames for fonts</a></li> <li><a href="#index-history-9">history</a>: <a href="#History">History</a></li> -<li><a href="#index-Holmes_002c-Kris-190">Holmes, Kris</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-Holmes_002c-Kris-197">Holmes, Kris</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-Horn_002c-Berthol-19">Horn, Berthol</a>: <a href="#History">History</a></li> <li><a href="#index-individual-font-designers-52">individual font designers</a>: <a href="#Suppliers">Suppliers</a></li> <li><a href="#index-informal-variant-94">informal variant</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-introduction-1">introduction</a>: <a href="#Introduction">Introduction</a></li> <li><a href="#index-ISO-9660-40">ISO 9660</a>: <a href="#Filenames-for-fonts">Filenames for fonts</a></li> -<li><a href="#index-ISO-Latin-2-extended-and-typewriter_002c-_0040TeX_007b_007d-encoding-183">ISO Latin 2 extended and typewriter, TeX encoding</a>: <a href="#xt2">xt2</a></li> -<li><a href="#index-ISO-Latin-2-extended_002c-_0040TeX_007b_007d-encoding-181">ISO Latin 2 extended, TeX encoding</a>: <a href="#xl2">xl2</a></li> -<li><a href="#index-italic_002c-_0040TeX_007b_007d-math-encoding-172">italic, TeX math encoding</a>: <a href="#texmital">texmital</a></li> +<li><a href="#index-ISO-Latin-2-extended-and-typewriter_002c-_0040TeX_007b_007d-encoding-190">ISO Latin 2 extended and typewriter, TeX encoding</a>: <a href="#xt2">xt2</a></li> +<li><a href="#index-ISO-Latin-2-extended_002c-_0040TeX_007b_007d-encoding-188">ISO Latin 2 extended, TeX encoding</a>: <a href="#xl2">xl2</a></li> +<li><a href="#index-italic_002c-_0040TeX_007b_007d-math-encoding-179">italic, TeX math encoding</a>: <a href="#texmital">texmital</a></li> <li><a href="#index-itc_002emap-125"><code>itc.map</code></a>: <a href="#ITC-fonts">ITC fonts</a></li> <li><a href="#index-Jeffrey_002c-Alan-20">Jeffrey, Alan</a>: <a href="#History">History</a></li> <li><a href="#index-Knuth_002c-Donald-E_002e-113">Knuth, Donald E.</a>: <a href="#Name-mapping-file">Name mapping file</a></li> <li><a href="#index-Lang_002c-Russell-21">Lang, Russell</a>: <a href="#History">History</a></li> <li><a href="#index-LaserJet-4-fonts-89">LaserJet 4 fonts</a>: <a href="#Variants">Variants</a></li> -<li><a href="#index-legalisms-184">legalisms</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-legalisms-191">legalisms</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-letterspacing-70">letterspacing</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-ligatures-and-encodings-83">ligatures and encodings</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-limitations-37">limitations</a>: <a href="#Filenames-for-fonts">Filenames for fonts</a></li> @@ -15770,40 +16199,40 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a> <li><a href="#index-lslash-85"><code>lslash</code></a>: <a href="#Variants">Variants</a></li> <li><a href="#index-Lslash-84"><code>Lslash</code></a>: <a href="#Variants">Variants</a></li> <li><a href="#index-Lubalin_002c-Herb-51">Lubalin, Herb</a>: <a href="#Suppliers">Suppliers</a></li> -<li><a href="#index-Lucida-Bright-141">Lucida Bright</a>: <a href="#g_t8r">8r</a></li> -<li><a href="#index-Lucida_002c-protection-of-192">Lucida, protection of</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-Lucida-Bright-145">Lucida Bright</a>: <a href="#g_t8r">8r</a></li> +<li><a href="#index-Lucida_002c-protection-of-199">Lucida, protection of</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-MacKay_002c-Pierre-22">MacKay, Pierre</a>: <a href="#History">History</a></li> <li><a href="#index-mapping-file-111">mapping file</a>: <a href="#Name-mapping-file">Name mapping file</a></li> <li><a href="#index-mapping-files-7">mapping files</a>: <a href="#Introduction">Introduction</a></li> -<li><a href="#index-math-extension_002c-_0040TeX_007b_007d-encoding-161">math extension, TeX encoding</a>: <a href="#texmext">texmext</a></li> -<li><a href="#index-math-italic_002c-_0040TeX_007b_007d-encoding-171">math italic, TeX encoding</a>: <a href="#texmital">texmital</a></li> -<li><a href="#index-math-symbol_002c-_0040TeX_007b_007d-encoding-166">math symbol, TeX encoding</a>: <a href="#texmsym">texmsym</a></li> +<li><a href="#index-math-extension_002c-_0040TeX_007b_007d-encoding-168">math extension, TeX encoding</a>: <a href="#texmext">texmext</a></li> +<li><a href="#index-math-italic_002c-_0040TeX_007b_007d-encoding-178">math italic, TeX encoding</a>: <a href="#texmital">texmital</a></li> +<li><a href="#index-math-symbol_002c-_0040TeX_007b_007d-encoding-173">math symbol, TeX encoding</a>: <a href="#texmsym">texmsym</a></li> <li><a href="#index-math-variants-93">math variants</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-Mittelbach_002c-Frank-99">Mittelbach, Frank</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-Mittelbach_002c-Frank-46">Mittelbach, Frank</a>: <a href="#Filenames-for-fonts">Filenames for fonts</a></li> <li><a href="#index-Mittelbach_002c-Frank-10">Mittelbach, Frank</a>: <a href="#History">History</a></li> <li><a href="#index-modes_002emf-30"><code>modes.mf</code></a>: <a href="#References">References</a></li> <li><a href="#index-monotype_002emap-127"><code>monotype.map</code></a>: <a href="#Monotype-fonts">Monotype fonts</a></li> -<li><a href="#index-Morison_002c-Stanley-199">Morison, Stanley</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-Morison_002c-Stanley-206">Morison, Stanley</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-multiple-variants-69">multiple variants</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-nonstandard-names_002c-escape-for-58">nonstandard names, escape for</a>: <a href="#Suppliers">Suppliers</a></li> -<li><a href="#index-patenting-of-fonts-188">patenting of fonts</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-patenting-of-fonts-195">patenting of fonts</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-phonetic-encodings-76">phonetic encodings</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-pi-fonts-63">pi fonts</a>: <a href="#Typefaces">Typefaces</a></li> <li><a href="#index-PostScript-encoding-vectors-131">PostScript encoding vectors</a>: <a href="#Encodings">Encodings</a></li> <li><a href="#index-PostScript-fonts_002c-standard-120">PostScript fonts, standard</a>: <a href="#Standard-PostScript-fonts">Standard PostScript fonts</a></li> <li><a href="#index-PSfonts-distribution-31">PSfonts distribution</a>: <a href="#References">References</a></li> -<li><a href="#index-qx-encoding-158">qx encoding</a>: <a href="#qx">qx</a></li> -<li><a href="#index-qx_002eenc-156"><code>qx.enc</code></a>: <a href="#qx">qx</a></li> +<li><a href="#index-qx-encoding-165">qx encoding</a>: <a href="#qx">qx</a></li> +<li><a href="#index-qx_002eenc-163"><code>qx.enc</code></a>: <a href="#qx">qx</a></li> <li><a href="#index-Rahtz_002c-Sebastian-23">Rahtz, Sebastian</a>: <a href="#History">History</a></li> <li><a href="#index-raw-fonts-56">raw fonts</a>: <a href="#Suppliers">Suppliers</a></li> <li><a href="#index-references-26">references</a>: <a href="#References">References</a></li> <li><a href="#index-related-files-27">related files</a>: <a href="#References">References</a></li> -<li><a href="#index-Renner_002c-Paul-195">Renner, Paul</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-Renner_002c-Paul-202">Renner, Paul</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-reporting-bugs-3">reporting bugs</a>: <a href="#Introduction">Introduction</a></li> <li><a href="#index-Rivlin_002c-Jean-24">Rivlin, Jean</a>: <a href="#History">History</a></li> <li><a href="#index-Rokicki_002c-Tom-25">Rokicki, Tom</a>: <a href="#History">History</a></li> -<li><a href="#index-romain-du-roi-201">romain du roi</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-romain-du-roi-208">romain du roi</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-sans-variant-98">sans variant</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-Schoepf_002c-Rainer-11">Schoepf, Rainer</a>: <a href="#History">History</a></li> <li><a href="#index-schoolbook-variant-95">schoolbook variant</a>: <a href="#Variants">Variants</a></li> @@ -15815,53 +16244,53 @@ Up: <a rel="up" accesskey="u" href="#Top">Top</a> <li><a href="#index-Southall_002c-Richard-36">Southall, Richard</a>: <a href="#References">References</a></li> <li><a href="#index-standard-PostScript-fonts-119">standard PostScript fonts</a>: <a href="#Standard-PostScript-fonts">Standard PostScript fonts</a></li> <li><a href="#index-Stone-Informal-96">Stone Informal</a>: <a href="#Variants">Variants</a></li> -<li><a href="#index-Stone_002c-protection-of-193">Stone, protection of</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-Stone_002c-protection-of-200">Stone, protection of</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-SuperFont-81"><code>SuperFont</code></a>: <a href="#Variants">Variants</a></li> <li><a href="#index-supplier_002emap-60"><code>supplier.map</code></a>: <a href="#Suppliers">Suppliers</a></li> <li><a href="#index-suppliers-47">suppliers</a>: <a href="#Suppliers">Suppliers</a></li> -<li><a href="#index-symbol_002c-_0040TeX_007b_007d-math-encoding-167">symbol, TeX math encoding</a>: <a href="#texmsym">texmsym</a></li> +<li><a href="#index-symbol_002c-_0040TeX_007b_007d-math-encoding-174">symbol, TeX math encoding</a>: <a href="#texmsym">texmsym</a></li> <li><a href="#index-T1_002eetx-86"><code>T1.etx</code></a>: <a href="#Variants">Variants</a></li> -<li><a href="#index-T5-encoding-153">T5 encoding</a>: <a href="#t5">t5</a></li> -<li><a href="#index-t5_002eenc-152"><code>t5.enc</code></a>: <a href="#t5">t5</a></li> +<li><a href="#index-T5-encoding-160">T5 encoding</a>: <a href="#t5">t5</a></li> +<li><a href="#index-t5_002eenc-159"><code>t5.enc</code></a>: <a href="#t5">t5</a></li> <li><a href="#index-TDS-standard-29">TDS standard</a>: <a href="#References">References</a></li> <li><a href="#index-terminology-35">terminology</a>: <a href="#References">References</a></li> -<li><a href="#index-g_t_0040TeX_007b_007d-base-encoding-137">TeX base encoding</a>: <a href="#g_t8r">8r</a></li> +<li><a href="#index-g_t_0040TeX_007b_007d-base-encoding-141">TeX base encoding</a>: <a href="#g_t8r">8r</a></li> <li><a href="#index-g_t_0040TeX_007b_007d-Directory-Structure-standard-28">TeX Directory Structure standard</a>: <a href="#References">References</a></li> -<li><a href="#index-g_t_0040TeX_007b_007d-Latin-1-encoding-145">TeX Latin 1 encoding</a>: <a href="#cork">cork</a></li> -<li><a href="#index-g_t_0040TeX_007b_007d-math-extension-encoding-160">TeX math extension encoding</a>: <a href="#texmext">texmext</a></li> -<li><a href="#index-g_t_0040TeX_007b_007d-math-italic-encoding-170">TeX math italic encoding</a>: <a href="#texmital">texmital</a></li> -<li><a href="#index-g_t_0040TeX_007b_007d-math-symbol-encoding-165">TeX math symbol encoding</a>: <a href="#texmsym">texmsym</a></li> +<li><a href="#index-g_t_0040TeX_007b_007d-Latin-1-encoding-149">TeX Latin 1 encoding</a>: <a href="#cork">cork</a></li> +<li><a href="#index-g_t_0040TeX_007b_007d-math-extension-encoding-167">TeX math extension encoding</a>: <a href="#texmext">texmext</a></li> +<li><a href="#index-g_t_0040TeX_007b_007d-math-italic-encoding-177">TeX math italic encoding</a>: <a href="#texmital">texmital</a></li> +<li><a href="#index-g_t_0040TeX_007b_007d-math-symbol-encoding-172">TeX math symbol encoding</a>: <a href="#texmsym">texmsym</a></li> <li><a href="#index-tex_002dfonts_0040_0040tug_002eorg-4"><code>tex-fonts@tug.org</code></a>: <a href="#Introduction">Introduction</a></li> <li><a href="#index-texfonts_002emap-112"><code>texfonts.map</code></a>: <a href="#Name-mapping-file">Name mapping file</a></li> -<li><a href="#index-texmext_002eenc-159"><code>texmext.enc</code></a>: <a href="#texmext">texmext</a></li> -<li><a href="#index-texmital_002eenc-169"><code>texmital.enc</code></a>: <a href="#texmital">texmital</a></li> -<li><a href="#index-texmsym_002eenc-164"><code>texmsym.enc</code></a>: <a href="#texmsym">texmsym</a></li> -<li><a href="#index-texnansi-encoding-176">texnansi encoding</a>: <a href="#texnansi">texnansi</a></li> -<li><a href="#index-texnansi_002eenc-174"><code>texnansi.enc</code></a>: <a href="#texnansi">texnansi</a></li> -<li><a href="#index-texnansx-encoding-179">texnansx encoding</a>: <a href="#texnansx">texnansx</a></li> -<li><a href="#index-texnansx_002eenc-177"><code>texnansx.enc</code></a>: <a href="#texnansx">texnansx</a></li> -<li><a href="#index-Times-Roman_002c-protection-of-198">Times Roman, protection of</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-texmext_002eenc-166"><code>texmext.enc</code></a>: <a href="#texmext">texmext</a></li> +<li><a href="#index-texmital_002eenc-176"><code>texmital.enc</code></a>: <a href="#texmital">texmital</a></li> +<li><a href="#index-texmsym_002eenc-171"><code>texmsym.enc</code></a>: <a href="#texmsym">texmsym</a></li> +<li><a href="#index-texnansi-encoding-183">texnansi encoding</a>: <a href="#texnansi">texnansi</a></li> +<li><a href="#index-texnansi_002eenc-181"><code>texnansi.enc</code></a>: <a href="#texnansi">texnansi</a></li> +<li><a href="#index-texnansx-encoding-186">texnansx encoding</a>: <a href="#texnansx">texnansx</a></li> +<li><a href="#index-texnansx_002eenc-184"><code>texnansx.enc</code></a>: <a href="#texnansx">texnansx</a></li> +<li><a href="#index-Times-Roman_002c-protection-of-205">Times Roman, protection of</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-type-foundries-49">type foundries</a>: <a href="#Suppliers">Suppliers</a></li> -<li><a href="#index-typeface-design-protection-185">typeface design protection</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-typeface-design-protection-192">typeface design protection</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-typeface_002emap-64"><code>typeface.map</code></a>: <a href="#Typefaces">Typefaces</a></li> <li><a href="#index-typefaces-61">typefaces</a>: <a href="#Typefaces">Typefaces</a></li> <li><a href="#index-typewriter-variant-97">typewriter variant</a>: <a href="#Variants">Variants</a></li> <li><a href="#index-unattributed-fonts-55">unattributed fonts</a>: <a href="#Suppliers">Suppliers</a></li> -<li><a href="#index-United-States_002c-font-design-protection-law-191">United States, font design protection law</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-United-States_002c-font-design-protection-law-198">United States, font design protection law</a>: <a href="#Font-legalities">Font legalities</a></li> <li><a href="#index-URW-fonts-128">URW fonts</a>: <a href="#URW-fonts">URW fonts</a></li> <li><a href="#index-urw_002emap-130"><code>urw.map</code></a>: <a href="#URW-fonts">URW fonts</a></li> <li><a href="#index-utilities-8">utilities</a>: <a href="#Introduction">Introduction</a></li> <li><a href="#index-variant_002emap-102"><code>variant.map</code></a>: <a href="#Variants">Variants</a></li> <li><a href="#index-variants-68">variants</a>: <a href="#Variants">Variants</a></li> -<li><a href="#index-Vienna-treaty-203">Vienna treaty</a>: <a href="#Font-legalities">Font legalities</a></li> -<li><a href="#index-Vietnamese-encoding-154">Vietnamese encoding</a>: <a href="#t5">t5</a></li> +<li><a href="#index-Vienna-treaty-210">Vienna treaty</a>: <a href="#Font-legalities">Font legalities</a></li> +<li><a href="#index-Vietnamese-encoding-161">Vietnamese encoding</a>: <a href="#t5">t5</a></li> <li><a href="#index-weight-66">weight</a>: <a href="#Weights">Weights</a></li> <li><a href="#index-weight_002emap-67"><code>weight.map</code></a>: <a href="#Weights">Weights</a></li> <li><a href="#index-width_002emap-108"><code>width.map</code></a>: <a href="#Widths">Widths</a></li> <li><a href="#index-widths-103">widths</a>: <a href="#Widths">Widths</a></li> -<li><a href="#index-Windows-ANSI-140">Windows ANSI</a>: <a href="#g_t8r">8r</a></li> +<li><a href="#index-Windows-ANSI-144">Windows ANSI</a>: <a href="#g_t8r">8r</a></li> <li><a href="#index-X-Window-System-font-names-115">X Window System font names</a>: <a href="#Long-naming-scheme">Long naming scheme</a></li> -<li><a href="#index-xl2_002eenc-180"><code>xl2.enc</code></a>: <a href="#xl2">xl2</a></li> -<li><a href="#index-xt2_002eenc-182"><code>xt2.enc</code></a>: <a href="#xt2">xt2</a></li> +<li><a href="#index-xl2_002eenc-187"><code>xl2.enc</code></a>: <a href="#xl2">xl2</a></li> +<li><a href="#index-xt2_002eenc-189"><code>xt2.enc</code></a>: <a href="#xt2">xt2</a></li> </ul></body></html> diff --git a/Master/texmf-dist/doc/fontname/fontname.pdf b/Master/texmf-dist/doc/fontname/fontname.pdf Binary files differindex a0c18389311..2dd210328e1 100644 --- a/Master/texmf-dist/doc/fontname/fontname.pdf +++ b/Master/texmf-dist/doc/fontname/fontname.pdf diff --git a/Master/texmf-dist/doc/fontname/fontname.texi b/Master/texmf-dist/doc/fontname/fontname.texi index ec8a17036c9..4f5fde56e50 100644 --- a/Master/texmf-dist/doc/fontname/fontname.texi +++ b/Master/texmf-dist/doc/fontname/fontname.texi @@ -3,7 +3,7 @@ @c @c @texinfofile{ @c author = "Karl Berry", -@c date = "10sep05", +@c date = "27nov06", @c filename = "fontname.texi", @c email = "tex-fonts@@math.utah.edu", @c url = "http://tug.org/fontname/", @@ -678,7 +678,7 @@ font. Arranged from narrowest to widest (more or less): @display ultra compressed, extra condensed, compressed, condensed, narrow regular -extended, expanded, wide +semiextended, extended, expanded, wide @end display @cindex automatic expansion @@ -1062,6 +1062,9 @@ For a discussion of @TeX{} font encodings in general, and defining new ones for use with @command{fontinst} in particular, see @uref{http://www.ctan.org/tex-archive/fonts/utilities/fontinst/doc/encspecs}. +A tutorial on character code issues in general is available at +@url{http://www.cs.tut.fi/~jkorpela/chars.html}. + Naming specific characters is a tangled and difficult area. Here are some links to character tables for Unicode, Adobe, and WGL4, for your researching pleasure (thanks to Boguslaw Jackowski for the list): @@ -1076,10 +1079,12 @@ researching pleasure (thanks to Boguslaw Jackowski for the list): @end itemize @menu +* 6w:: CP-1251 (Cyrillic). * 8a:: Adobe standard. * 8r:: TeX base. * cork:: Cork (aka EC, TeX Latin 1, tex256). * dvips:: Dvips. +* groff:: 8g. * t5:: Vietnamese, from vntex. * qx:: QX, from GUST. * texmext:: TeX math extension. @@ -1092,6 +1097,17 @@ researching pleasure (thanks to Boguslaw Jackowski for the list): @end menu +@node 6w +@section @samp{6w.enc}: Cyrillic CP-1251 + +@flindex 62.enc +@cindex Cyrillic encoding +@cindex CP-1251 encoding +@cindex encodings, Cyrillic CP-1251 + +@verbatiminclude 8a.enc + + @node 8a @section @samp{8a.enc}: Adobe standard encoding @@ -1138,6 +1154,16 @@ researching pleasure (thanks to Boguslaw Jackowski for the list): @verbatiminclude dvips.enc +@node groff +@section @samp{groff.enc}: groff encoding + +@flindex groff.enc +@cindex Groff encoding +@cindex encoding, Groff + +@verbatiminclude groff.enc + + @node t5 @section @samp{t5.enc}: T5 encoding diff --git a/Master/texmf-dist/fonts/enc/dvips/base/6w.enc b/Master/texmf-dist/fonts/enc/dvips/base/6w.enc new file mode 100644 index 00000000000..94e6843843e --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/base/6w.enc @@ -0,0 +1,99 @@ +%!PS-Adobe-3.0 Resource-Encoding +% +% @psencodingfile{ +% author = "Michail Vidiassov", +% version = "1.0", +% date = "2006-Dec-01", +% filename = "6w.enc", +% license = "public domain", +% email = "tex-fonts@@tug.org", +% docstring = "Cyrillic Windows Encoding CP1251. Consult Adobe doc +% 5013_Cyrillic_Font_Spec.pdf for detail." +% } + +%%BeginResource: encoding StandardCyrillicEncoding +/StandardCyrillicEncoding [ +% 0x00 | 0 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x10 | 16 + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef + /.notdef /.notdef /.notdef /.notdef +% 0x20 | 32 + /space /exclam /quotedbl /numbersign + /dollar /percent /ampersand /quotesingle + /parenleft /parenright /asterisk /plus + /comma /hyphen /period /slas +% 0x30 | 48 + /zero /one /two /three + /four /five /six /seven + /eight /nine /colon /semicolon + /less /equal /greater /question +% 0x40 | 64 + /at /A /B /C + /D /E /F /G + /H /I /J /K + /L /M /N /O +% 0x50 | 80 + /P /Q /R /S + /T /U /V /W + /X /Y /Z /bracketleft + /backslash /bracketright /asciicircum /underscore +% 0x60 | 96 + /grave /a /b /c + /d /e /f /g + /h /i /j /k + /l /m /n /o +% 0x70 | 112 + /p /q /r /s + /t /u /v /w + /x /y /z /braceleft + /bar /braceright /asciitilde /.notdef +% 0x80 | 128 + /afii10051 /afii10052 /quotesinglbase /afii10100 + /quotedblbase /ellipsis /dagger /daggerdbl + /Euro /perthousand /afii10058 /guilsinglleft + /afii10059 /afii10061 /afii10060 /afii10145 +% 0x90 | 144 + /afii10099 /quoteleft /quoteright /quotedblleft + /quotedblright /bullet /endash /emdash + /.notdef /trademark /afii10106 /guilsinglright + /afii10107 /afii10109 /afii10108 /afii10193 +% 0xA0 | 160 + /space /afii10062 /afii10110 /afii10057 + /currency /afii10050 /brokenbar /section + /afii10023 /copyright /afii10053 /guillemotleft + /logicalnot /hyphen /registered /afii10056 +% 0xB0 | 176 + /degree /plusminus /afii10055 /afii10103 + /afii10098 /mu /paragraph /periodcentered + /afii10071 /afii61352 /afii10101 /guillemotright + /afii10105 /afii10054 /afii10102 /afii10104 +% 0xC0 | 192 + /afii10017 /afii10018 /afii10019 /afii10020 + /afii10021 /afii10022 /afii10024 /afii10025 + /afii10026 /afii10027 /afii10028 /afii10029 + /afii10030 /afii10031 /afii10032 /afii10033 +% 0xD0 | 208 + /afii10034 /afii10035 /afii10036 /afii10037 + /afii10038 /afii10039 /afii10040 /afii10041 + /afii10042 /afii10043 /afii10044 /afii10045 + /afii10046 /afii10047 /afii10048 /afii10049 +% 0xE0 | 224 + /afii10065 /afii10066 /afii10067 /afii10068 + /afii10069 /afii10070 /afii10072 /afii10073 + /afii10074 /afii10075 /afii10076 /afii10077 + /afii10078 /afii10079 /afii10080 /afii10081 +% 0xF0 | 240 + /afii10082 /afii10083 /afii10084 /afii10085 + /afii10086 /afii10087 /afii10088 /afii10089 + /afii10090 /afii10091 /afii10092 /afii10093 + /afii10094 /afii10095 /afii10096 /afii10097 +] def +%%EndResource + +% eof diff --git a/Master/texmf-dist/fonts/enc/dvips/base/8r.enc b/Master/texmf-dist/fonts/enc/dvips/base/8r.enc index 40dbe904190..665fc82831c 100644 --- a/Master/texmf-dist/fonts/enc/dvips/base/8r.enc +++ b/Master/texmf-dist/fonts/enc/dvips/base/8r.enc @@ -4,7 +4,7 @@ % author = "S. Rahtz, P. MacKay, Alan Jeffrey, B. Horn, K. Berry, % W. Schmidt, P. Lehman", % version = "2.0", -% date = "30 October 2002", +% date = "27nov06", % filename = "8r.enc", % email = "tex-fonts@@tug.org", % docstring = "This is the encoding vector for Type1 and TrueType @@ -114,7 +114,7 @@ /currency /yen /brokenbar /section /dieresis /copyright /ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron -% 0xD0 +% 0xB0 /degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered /cedilla /onesuperior /ordmasculine /guillemotright diff --git a/Master/texmf-dist/fonts/enc/dvips/base/ansinew.enc b/Master/texmf-dist/fonts/enc/dvips/base/ansinew.enc new file mode 100644 index 00000000000..1b7c2f66c56 --- /dev/null +++ b/Master/texmf-dist/fonts/enc/dvips/base/ansinew.enc @@ -0,0 +1,253 @@ +% @psencodingfile{ +% author = "Y&Y, Inc.", +% version = "1.0", +% date = "1 April 1995", +% filename = "ansinew.enc", +% email = "tech-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." +% } +% +% Character code assignments are those in Windows ANSI (for Windows 3.1) +% +% SAMPLE USAGE (in `psfonts.map' file for DVIPS): +% +% lbr LucidaBright "WindowsANSIEncoding ReEncodeFont" <ansinew.enc <lbr.pfb +% +% This tells DVIPS that the font called `lbr' in TeX has PostScript +% FontName `LucidaBright.' It asks DVIPS to expand the file `lbr.pfb' +% into PFA form, to include the attached `ansinew.enc' encoding vector, +% and to actually reencode the font based on that encoding vector. +% +/WindowsANSIEncoding [ +/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/.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 % 32 +/exclam % 33 +/quotedbl % 34 +/numbersign % 35 +/dollar % 36 +/percent % 37 +/ampersand % 38 +/quotesingle % 39 % not quoteright +/parenleft % 40 +/parenright % 41 +/asterisk % 42 +/plus % 43 +/comma % 44 +/hyphen % 45 +/period % 46 +/slash % 47 +/zero % 48 +/one % 49 +/two % 50 +/three % 51 +/four % 52 +/five % 53 +/six % 54 +/seven % 55 +/eight % 56 +/nine % 57 +/colon % 58 +/semicolon % 59 +/less % 60 +/equal % 61 +/greater % 62 +/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 +/bracketright % 93 +/asciicircum % 94 % not circumflex +/underscore % 95 +/grave % 96 % not quoteleft +/a % 97 +/b % 98 +/c % 99 +/d % 100 +/e % 101 +/f % 102 +/g % 103 +/h % 104 +/i % 105 +/j % 106 +/k % 107 +/l % 108 +/m % 109 +/n % 110 +/o % 111 +/p % 112 +/q % 113 +/r % 114 +/s % 115 +/t % 116 +/u % 117 +/v % 118 +/w % 119 +/x % 120 +/y % 121 +/z % 122 +/braceleft % 123 +/bar % 124 +/braceright % 125 +/asciitilde % 126 % not tilde +/.notdef % 127 +/.notdef % 128 +/.notdef % 129 +/quotesinglbase % 130 +/florin % 131 +/quotedblbase % 132 +/ellipsis % 133 +/dagger % 134 +/daggerdbl % 135 +/circumflex % 136 +/perthousand % 137 +/Scaron % 138 +/guilsinglleft % 139 +/OE % 140 +/.notdef % 141 +/.notdef % 142 +/.notdef % 143 +/.notdef % 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 +/.notdef % 157 +/.notdef % 158 +/Ydieresis % 159 +/space % 160 +/exclamdown % 161 +/cent % 162 +/sterling % 163 +/currency % 164 +/yen % 165 +/brokenbar % 166 +/section % 167 +/dieresis % 168 +/copyright % 169 +/ordfeminine % 170 +/guillemotleft % 171 +/logicalnot % 172 +/hyphen % 173 +/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 +/Oslash % 216 +/Ugrave % 217 +/Uacute % 218 +/Ucircumflex % 219 +/Udieresis % 220 +/Yacute % 221 +/Thorn % 222 +/germandbls % 223 +/agrave % 224 +/aacute % 225 +/acircumflex % 226 +/atilde % 227 +/adieresis % 228 +/aring % 229 +/ae % 230 +/ccedilla % 231 +/egrave % 232 +/eacute % 233 +/ecircumflex % 234 +/edieresis % 235 +/igrave % 236 +/iacute % 237 +/icircumflex % 238 +/idieresis % 239 +/eth % 240 +/ntilde % 241 +/ograve % 242 +/oacute % 243 +/ocircumflex % 244 +/otilde % 245 +/odieresis % 246 +/divide % 247 +/oslash % 248 +/ugrave % 249 +/uacute % 250 +/ucircumflex % 251 +/udieresis % 252 +/yacute % 253 +/thorn % 254 +/ydieresis % 255 +] def diff --git a/Master/texmf-dist/fonts/map/fontname/supplier.map b/Master/texmf-dist/fonts/map/fontname/supplier.map index 3df8eeff382..f22e5b8a052 100644 --- a/Master/texmf-dist/fonts/map/fontname/supplier.map +++ b/Master/texmf-dist/fonts/map/fontname/supplier.map @@ -1,7 +1,7 @@ @c @mapfile{ @c license = "public domain", @c email = "tex-fonts@tug.org", -@c date = "1apr04", +@c date = "2jun06", @c url = "http://tug.org/fontname/supplier.map", @c supported = "yes", @c docstring = "Typeface supplier (foundry) abbreviations and @@ -28,10 +28,12 @@ m monotype @r{Monotype} n ibm @r{IBM} o corel @r{Corel} p adobe @r{Adobe (@samp{p} for PostScript)} +q texgyre @r{@TeX{} Gyre fonts from GUST Typefoundry} r - @r{raw (for [obsolete] use with virtual fonts)} s sun @r{Storm Type} t paragrap @r{ParaGraph} u urw @r{URW} +v sil @r{SIL} w wolfram @r{Wolfram} z - @r{bizarre (fontname is nonstandard)} - autofont @r{Eddie Kohler's @t{autofont} program} diff --git a/Master/texmf-dist/fonts/map/fontname/typeface.map b/Master/texmf-dist/fonts/map/fontname/typeface.map index e3e4a800069..ecebb98b853 100644 --- a/Master/texmf-dist/fonts/map/fontname/typeface.map +++ b/Master/texmf-dist/fonts/map/fontname/typeface.map @@ -1,6 +1,6 @@ @c @mapfile{ @c email = "tex-fonts@tug.org", -@c date = "25oct05", +@c date = "13nov06", @c url = "http://tug.org/fontname/typeface.map", @c supported = "yes", @c docstring = "Typeface abbreviations for the TeX Fontname scheme.", @@ -8,6 +8,7 @@ @c } @c @c +a0 arnopro ArnoPro a1 arial Arial a2 amasis Amasis a3 adlib AdLib @@ -93,6 +94,7 @@ cf clearfac Clearface cg charlema Charlemagne ch charter Charter ci candida Candida +cj charis SILCharis TeXChariot ck caslonbe CaslonBookBE cl cloister Cloister cm cm @r{Computer Modern} @@ -185,6 +187,7 @@ gi georgia Georgia gj granjon Granjon b:ElegantGaramondBT gl galliard Galliard gm garamond Garamond u:URWGaramond +gn gentium Gentium go gyoldsty GoudyOldStyle gp glypha Glypha gq grotesq Grotesque u:URWGrotesk @@ -216,6 +219,7 @@ i0 commscr CommercialScript i1 impress Impress i2 impuls Impuls i3 imperial Imperial u:URWImperial +i4 inconsol Inconsolata ia insignia Insignia ib ibycus Ibycus ic impact Impact @@ -237,6 +241,12 @@ jf jeffersn Jefferson b:Freehand575BT jn janson Janson jo joanna Joanna jp juniper Juniper +k0 calibri Calibri +k1 cambria Cambria +k2 candara Candara +k3 consolas Consolas +k4 constant Constantia +k5 corbel Corbel kb kabel Kabel kg bankgoth BankGothic kl klang Klang @@ -326,6 +336,7 @@ nu nuptial Nuptial nv novarese Novarese nw neueunzi NeueHammerUnziale nx nyx Nyx +ny nyala Nyala nz neuzeits NeuzeitS o0 oldreadf OldDreadfulNo7 o1 oranda Oranda @@ -419,6 +430,7 @@ s5 snell Snell s6 stuyvesa Stuyvesant s7 sassoon Sassoon s8 stonesan StoneSans +s9 segoescr SegoeScript sa scala Scala sb sabon Sabon b:ClassicalGaramondBT sc slimbach Slimbach @@ -457,6 +469,7 @@ tn norasi Norasi to torino Torino b:Industrial736BT tp tempo Tempo tr trebuche Trebuchet +tu doulos SILDoulos TeXToulouse tv trumpmed TrumpMediaeval b:Kuenstler480BT tw twentyc TwentiethCentury ty typewrit Typewriter u:URWTypewriter @@ -497,11 +510,13 @@ wh wendy Wendy wi wingding Wingdings wk wilke Wilke wn windsor Windsor +wp warnockp WarnockPro wr wittenbe WitternbergerFrakt ws weiss Weiss wt watertit WatersTitling ww willow Willow xc eccentri Eccentric +xl linuxlib LinuxLibertine xp exponto ExPonto yg centuryg CenturyGothic yh strayhor Strayhorn diff --git a/Master/texmf-dist/fonts/map/fontname/variant.map b/Master/texmf-dist/fonts/map/fontname/variant.map index a25438d0a65..965a141c7e5 100644 --- a/Master/texmf-dist/fonts/map/fontname/variant.map +++ b/Master/texmf-dist/fonts/map/fontname/variant.map @@ -1,7 +1,7 @@ @c @mapfile{ @c license = "public domain", @c email = "tex-fonts@@tug.org", -@c date = "3jul05", +@c date = "27nov06", @c url = "http://tug.org/fontname/variant.map", @c supported = "yes", @c docstring = "Variant abbreviations for TeX font names, unfortunately @@ -10,7 +10,7 @@ @c 0 inferior 1 superior -@r{obsolete [2=>7c] Fraktur encoding} +2 @r{proportional digits, not tabular} @r{obsolete [3=>7f] Fraction} @r{obsolete [4 fax; now typeface @samp{lx}, Lucida Fax]} 5 @r{escape for (presently) phonetic encodings} @@ -24,7 +24,7 @@ c SmallCaps d Display Titling Caption Headline TallCaps SwashCaps LombardicCaps Festive e Engraved Copperplate Elite f Fraktur Gothic OldEnglish Handtooled @r{(`gothic' can also be sans)} -g SmallText @r{designed for small sizes [was grooved, as in the IBM logo]} +g SmallText @r{lc only, or designed for small sizes [was grooved, as in the IBM logo]} h Shadow i Italic Kursiv Ital @r{text italic} j @r{old-style digits [was invisible]} @@ -38,7 +38,7 @@ p Ornaments r @r{roman or sans; often omitted, see text} s Gothic @r{sans serif} t Monospace @r{fixed-width typewriter} -u @r{unslanted italic} +u @r{underline or unslanted italic} v MathExtension w Script Handwritten Swash Calligraphy Cursive Tango x @r{built with Adobe expert encoding [was expert-encoded]} @@ -80,6 +80,7 @@ z Cyrillic @r{font-dependent Cyrillic} 8c TeXTextCompanion @r{La@TeX{} TS1} 8e CE @r{Adobe CE} 8f TeXAfricanLatin @r{La@TeX{} T4} +8g groff 8i TS0 @r{Intersection of TS1/Adobe Standard} 8m @r{Macintosh standard encoding} 8n LM1 @r{Textures} @@ -87,7 +88,7 @@ z Cyrillic @r{font-dependent Cyrillic} 8r TeXBase1Encoding @r{(@pxref{8r})} 8t CorkEncoding @r{(@pxref{cork}), aka tex256.enc} 8u XT2Encoding @r{cmtt + Latin 2, see @file{xl2.enc}} -8v TeXVietnamese @r{to be defined} +8v TeXVietnamese @r{T5} 8w @r{Windows 3.1 ANSI encoding} 8x Expert @r{expert encoding} 8y LY1 @r{texnansi} diff --git a/Master/texmf-dist/fonts/map/fontname/width.map b/Master/texmf-dist/fonts/map/fontname/width.map index 2fee4399306..def4001d36d 100644 --- a/Master/texmf-dist/fonts/map/fontname/width.map +++ b/Master/texmf-dist/fonts/map/fontname/width.map @@ -1,8 +1,7 @@ @c @mapfile{ @c license = "public domain", @c email = "tex-fonts@tug.org", -@c version = "2.2", -@c date = "1 July 1998", +@c date = "5 February 2006", @c url = "http://tug.org/fontname/width.map", @c supported = "yes", @c docstring = "Width abbreviations for TeX font names." @@ -10,7 +9,7 @@ @c c Condensed Cond e Expanded -n Narrow +n Narrow Semicondensed o UltraCondensed p Compressed Compact q ExtraCompressed ExtraCondensed @@ -20,3 +19,4 @@ u UltraCompressed v ExtraExpanded @r{more than @t{Expanded}, less than @t{Wide}} w Wide x Extended Elongated +y Semiexpanded diff --git a/Master/texmf-dist/tex/texinfo/texinfo.tex b/Master/texmf-dist/tex/texinfo/texinfo.tex index da2d3a82909..5aadf1cb92f 100644 --- a/Master/texmf-dist/tex/texinfo/texinfo.tex +++ b/Master/texmf-dist/tex/texinfo/texinfo.tex @@ -3,11 +3,11 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2005-10-10.17} +\def\texinfoversion{2006-12-05.11} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, -% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software -% Foundation, Inc. +% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free +% Software Foundation, Inc. % % This texinfo.tex file is free software; you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -157,6 +157,18 @@ \chardef\spacecat = 10 \def\spaceisspace{\catcode`\ =\spacecat} +% sometimes characters are active, so we need control sequences. +\chardef\colonChar = `\: +\chardef\commaChar = `\, +\chardef\dashChar = `\- +\chardef\dotChar = `\. +\chardef\exclamChar= `\! +\chardef\lquoteChar= `\` +\chardef\questChar = `\? +\chardef\rquoteChar= `\' +\chardef\semiChar = `\; +\chardef\underChar = `\_ + % Ignore a token. % \def\gobble#1{} @@ -293,6 +305,13 @@ % before the \shipout runs. % \indexdummies % don't expand commands in the output. + \normalturnoffactive % \ in index entries must not stay \, e.g., if + % the page break happens to be in the middle of an example. + % We don't want .vr (or whatever) entries like this: + % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}} + % "\acronym" won't work when it's read back in; + % it needs to be + % {\code {{\tt \backslashcurfont }acronym} \shipout\vbox{% % Do this early so pdf references go to the beginning of the page. \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi @@ -320,9 +339,9 @@ \pagebody{#1}% \ifdim\ht\footlinebox > 0pt % Only leave this space if the footline is nonempty. - % (We lessened \vsize for it in \oddfootingxxx.) + % (We lessened \vsize for it in \oddfootingyyy.) % The \baselineskip=24pt in plain's \makefootline has no effect. - \vskip 2\baselineskip + \vskip 24pt \unvbox\footlinebox \fi % @@ -378,7 +397,7 @@ % \def\parsearg{\parseargusing{}} \def\parseargusing#1#2{% - \def\next{#2}% + \def\argtorun{#2}% \begingroup \obeylines \spaceisspace @@ -409,8 +428,7 @@ \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{% \def\temp{#3}% \ifx\temp\empty - % We cannot use \next here, as it holds the macro to run; - % thus we reuse \temp. + % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp: \let\temp\finishparsearg \else \let\temp\argcheckspaces @@ -422,14 +440,14 @@ % If a _delimited_ argument is enclosed in braces, they get stripped; so % to get _exactly_ the rest of the line, we had to prevent such situation. % We prepended an \empty token at the very beginning and we expand it now, -% just before passing the control to \next. +% just before passing the control to \argtorun. % (Similarily, we have to think about #3 of \argcheckspacesY above: it is % either the null string, or it ends with \^^M---thus there is no danger % that a pair of braces would be stripped. % % But first, we have to remove the trailing space token. % -\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}} +\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}} % \parseargdef\foo{...} % is roughly equivalent to @@ -1078,15 +1096,24 @@ where each line of input produces a line of output.} \def\minus{$-$} % @dots{} outputs an ellipsis using the current font. -% We do .5em per period so that it has the same spacing in a typewriter -% font as three actual period characters. +% We do .5em per period so that it has the same spacing in the cm +% typewriter fonts as three actual period characters; on the other hand, +% in other typewriter fonts three periods are wider than 1.5em. So do +% whichever is larger. % \def\dots{% \leavevmode - \hbox to 1.5em{% - \hskip 0pt plus 0.25fil - .\hfil.\hfil.% - \hskip 0pt plus 0.5fil + \setbox0=\hbox{...}% get width of three periods + \ifdim\wd0 > 1.5em + \dimen0 = \wd0 + \else + \dimen0 = 1.5em + \fi + \hbox to \dimen0{% + \hskip 0pt plus.25fil + .\hskip 0pt plus1fil + .\hskip 0pt plus1fil + .\hskip 0pt plus.5fil }% } @@ -1228,12 +1255,48 @@ where each line of input produces a line of output.} \HyPsdSubst{)}{\realbackslash)}{#1}% } +\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images +with PDF output, and none of those formats could be found. (.eps cannot +be supported due to the design of the PDF format; use regular TeX (DVI +output) for that.)} + \ifpdf \input pdfcolor \pdfcatalog{/PageMode /UseOutlines}% + % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto). \def\dopdfimage#1#2#3{% - \def\imagewidth{#2}% - \def\imageheight{#3}% + \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}% + \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}% + % + % pdftex (and the PDF format) support .png, .jpg, .pdf (among + % others). Let's try in that order. + \let\pdfimgext=\empty + \begingroup + \openin 1 #1.png \ifeof 1 + \openin 1 #1.jpg \ifeof 1 + \openin 1 #1.jpeg \ifeof 1 + \openin 1 #1.JPG \ifeof 1 + \openin 1 #1.pdf \ifeof 1 + \errhelp = \nopdfimagehelp + \errmessage{Could not find image file #1 for pdf}% + \else + \gdef\pdfimgext{pdf}% + \fi + \else + \gdef\pdfimgext{JPG}% + \fi + \else + \gdef\pdfimgext{jpeg}% + \fi + \else + \gdef\pdfimgext{jpg}% + \fi + \else + \gdef\pdfimgext{png}% + \fi + \closein 1 + \endgroup + % % without \immediate, pdftex seg faults when the same image is % included twice. (Version 3.14159-pre-1.0-unofficial-20010704.) \ifnum\pdftexversion < 14 @@ -1241,12 +1304,12 @@ where each line of input produces a line of output.} \else \immediate\pdfximage \fi - \ifx\empty\imagewidth\else width \imagewidth \fi - \ifx\empty\imageheight\else height \imageheight \fi + \ifdim \wd0 >0pt width \imagewidth \fi + \ifdim \wd2 >0pt height \imageheight \fi \ifnum\pdftexversion<13 - #1.pdf% + #1.\pdfimgext \else - {#1.pdf}% + {#1.\pdfimgext}% \fi \ifnum\pdftexversion < 14 \else \pdfrefximage \pdflastximage @@ -1385,9 +1448,17 @@ where each line of input produces a line of output.} \else \let \startlink \pdfstartlink \fi + % make a live url in pdf output. \def\pdfurl#1{% \begingroup - \normalturnoffactive\def\@{@}% + % it seems we really need yet another set of dummies; have not + % tried to figure out what each command should do in the context + % of @url. for now, just make @/ a no-op, that's the only one + % people have actually reported a problem with. + % + \normalturnoffactive + \def\@{@}% + \let\/=\empty \makevalueexpandable \leavevmode\Red \startlink attr{/Border [0 0 0]}% @@ -1457,6 +1528,7 @@ where each line of input produces a line of output.} % We don't need math for this font style. \def\ttsl{\setfontstyle{ttsl}} + % Default leading. \newdimen\textleading \textleading = 13.2pt @@ -1478,11 +1550,13 @@ where each line of input produces a line of output.} }% } + % Set the font macro #1 to the font named #2, adding on the % specified font prefix (normally `cm'). % #3 is the font's design size, #4 is a scale factor \def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4} + % Use cm as the default font prefix. % To specify the font prefix, you must define \fontprefix % before you read in texinfo.tex. @@ -1506,6 +1580,10 @@ where each line of input produces a line of output.} \def\scshape{csc} \def\scbshape{csc} +% Definitions for a main text size of 11pt. This is the default in +% Texinfo. +% +\def\definetextfontsizexi{ % Text fonts (11.2pt, magstep1). \def\textnominalsize{11pt} \edef\mainmagstep{\magstephalf} @@ -1619,6 +1697,165 @@ where each line of input produces a line of output.} \font\reducedi=cmmi10 \font\reducedsy=cmsy10 +% reset the current fonts +\textfonts +\rm +} % end of 11pt text font size definitions + + +% Definitions to make the main text be 10pt Computer Modern, with +% section, chapter, etc., sizes following suit. This is for the GNU +% Press printing of the Emacs 22 manual. Maybe other manuals in the +% future. Used with @smallbook, which sets the leading to 12pt. +% +\def\definetextfontsizex{% +% Text fonts (10pt). +\def\textnominalsize{10pt} +\edef\mainmagstep{1000} +\setfont\textrm\rmshape{10}{\mainmagstep} +\setfont\texttt\ttshape{10}{\mainmagstep} +\setfont\textbf\bfshape{10}{\mainmagstep} +\setfont\textit\itshape{10}{\mainmagstep} +\setfont\textsl\slshape{10}{\mainmagstep} +\setfont\textsf\sfshape{10}{\mainmagstep} +\setfont\textsc\scshape{10}{\mainmagstep} +\setfont\textttsl\ttslshape{10}{\mainmagstep} +\font\texti=cmmi10 scaled \mainmagstep +\font\textsy=cmsy10 scaled \mainmagstep + +% A few fonts for @defun names and args. +\setfont\defbf\bfshape{10}{\magstephalf} +\setfont\deftt\ttshape{10}{\magstephalf} +\setfont\defttsl\ttslshape{10}{\magstephalf} +\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf} + +% Fonts for indices, footnotes, small examples (9pt). +\def\smallnominalsize{9pt} +\setfont\smallrm\rmshape{9}{1000} +\setfont\smalltt\ttshape{9}{1000} +\setfont\smallbf\bfshape{10}{900} +\setfont\smallit\itshape{9}{1000} +\setfont\smallsl\slshape{9}{1000} +\setfont\smallsf\sfshape{9}{1000} +\setfont\smallsc\scshape{10}{900} +\setfont\smallttsl\ttslshape{10}{900} +\font\smalli=cmmi9 +\font\smallsy=cmsy9 + +% Fonts for small examples (8pt). +\def\smallernominalsize{8pt} +\setfont\smallerrm\rmshape{8}{1000} +\setfont\smallertt\ttshape{8}{1000} +\setfont\smallerbf\bfshape{10}{800} +\setfont\smallerit\itshape{8}{1000} +\setfont\smallersl\slshape{8}{1000} +\setfont\smallersf\sfshape{8}{1000} +\setfont\smallersc\scshape{10}{800} +\setfont\smallerttsl\ttslshape{10}{800} +\font\smalleri=cmmi8 +\font\smallersy=cmsy8 + +% Fonts for title page (20.4pt): +\def\titlenominalsize{20pt} +\setfont\titlerm\rmbshape{12}{\magstep3} +\setfont\titleit\itbshape{10}{\magstep4} +\setfont\titlesl\slbshape{10}{\magstep4} +\setfont\titlett\ttbshape{12}{\magstep3} +\setfont\titlettsl\ttslshape{10}{\magstep4} +\setfont\titlesf\sfbshape{17}{\magstep1} +\let\titlebf=\titlerm +\setfont\titlesc\scbshape{10}{\magstep4} +\font\titlei=cmmi12 scaled \magstep3 +\font\titlesy=cmsy10 scaled \magstep4 +\def\authorrm{\secrm} +\def\authortt{\sectt} + +% Chapter fonts (14.4pt). +\def\chapnominalsize{14pt} +\setfont\chaprm\rmbshape{12}{\magstep1} +\setfont\chapit\itbshape{10}{\magstep2} +\setfont\chapsl\slbshape{10}{\magstep2} +\setfont\chaptt\ttbshape{12}{\magstep1} +\setfont\chapttsl\ttslshape{10}{\magstep2} +\setfont\chapsf\sfbshape{12}{\magstep1} +\let\chapbf\chaprm +\setfont\chapsc\scbshape{10}{\magstep2} +\font\chapi=cmmi12 scaled \magstep1 +\font\chapsy=cmsy10 scaled \magstep2 + +% Section fonts (12pt). +\def\secnominalsize{12pt} +\setfont\secrm\rmbshape{12}{1000} +\setfont\secit\itbshape{10}{\magstep1} +\setfont\secsl\slbshape{10}{\magstep1} +\setfont\sectt\ttbshape{12}{1000} +\setfont\secttsl\ttslshape{10}{\magstep1} +\setfont\secsf\sfbshape{12}{1000} +\let\secbf\secrm +\setfont\secsc\scbshape{10}{\magstep1} +\font\seci=cmmi12 +\font\secsy=cmsy10 scaled \magstep1 + +% Subsection fonts (10pt). +\def\ssecnominalsize{10pt} +\setfont\ssecrm\rmbshape{10}{1000} +\setfont\ssecit\itbshape{10}{1000} +\setfont\ssecsl\slbshape{10}{1000} +\setfont\ssectt\ttbshape{10}{1000} +\setfont\ssecttsl\ttslshape{10}{1000} +\setfont\ssecsf\sfbshape{10}{1000} +\let\ssecbf\ssecrm +\setfont\ssecsc\scbshape{10}{1000} +\font\sseci=cmmi10 +\font\ssecsy=cmsy10 + +% Reduced fonts for @acro in text (9pt). +\def\reducednominalsize{9pt} +\setfont\reducedrm\rmshape{9}{1000} +\setfont\reducedtt\ttshape{9}{1000} +\setfont\reducedbf\bfshape{10}{900} +\setfont\reducedit\itshape{9}{1000} +\setfont\reducedsl\slshape{9}{1000} +\setfont\reducedsf\sfshape{9}{1000} +\setfont\reducedsc\scshape{10}{900} +\setfont\reducedttsl\ttslshape{10}{900} +\font\reducedi=cmmi9 +\font\reducedsy=cmsy9 + +% reduce space between paragraphs +\divide\parskip by 2 + +% reset the current fonts +\textfonts +\rm +} % end of 10pt text font size definitions + + +% We provide the user-level command +% @fonttextsize 10 +% (or 11) to redefine the text font size. pt is assumed. +% +\def\xword{10} +\def\xiword{11} +% +\parseargdef\fonttextsize{% + \def\textsizearg{#1}% + \wlog{doing @fonttextsize \textsizearg}% + % + % Set \globaldefs so that documents can use this inside @tex, since + % makeinfo 4.8 does not support it, but we need it nonetheless. + % + \begingroup \globaldefs=1 + \ifx\textsizearg\xword \definetextfontsizex + \else \ifx\textsizearg\xiword \definetextfontsizexi + \else + \errhelp=\EMsimple + \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'} + \fi\fi + \endgroup +} + + % In order for the font changes to affect most math symbols and letters, % we have to define the \textfont of the standard families. Since % texinfo doesn't allow for producing subscripts and superscripts except @@ -1729,7 +1966,7 @@ where each line of input produces a line of output.} % Set up the default fonts, so we can use them for creating boxes. % -\textfonts \rm +\definetextfontsizexi % Define these so they can be easily changed for other fonts. \def\angleleft{$\langle$} @@ -1786,13 +2023,6 @@ where each line of input produces a line of output.} % Can't use plain's \frenchspacing because it uses the `\x notation, and % sometimes \x has an active definition that messes things up. % -\chardef\colonChar = `\: -\chardef\commaChar = `\, -\chardef\dotChar = `\. -\chardef\exclamChar= `\! -\chardef\questChar = `\? -\chardef\semiChar = `\; -% \catcode`@=11 \def\plainfrenchspacing{% \sfcode\dotChar =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m @@ -1820,6 +2050,7 @@ where each line of input produces a line of output.} \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}% \kern-0.4pt\hrule}% \kern-.06em\raise0.4pt\hbox{\angleright}}}} +\def\key #1{{\nohyphenation \uppercase{#1}}\null} % The old definition, with no lozenge: %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null} \def\ctrl #1{{\tt \rawbackslash \hat}#1} @@ -1861,11 +2092,14 @@ where each line of input produces a line of output.} % and arrange explicitly to hyphenate at a dash. % -- rms. { - \catcode`\-=\active - \catcode`\_=\active + \catcode`\-=\active \catcode`\_=\active + \catcode`\'=\active \catcode`\`=\active % \global\def\code{\begingroup - \catcode`\-=\active \catcode`\_=\active + \catcode\rquoteChar=\active \catcode\lquoteChar=\active + \let'\codequoteright \let`\codequoteleft + % + \catcode\dashChar=\active \catcode\underChar=\active \ifallowcodebreaks \let-\codedash \let_\codeunder @@ -2111,6 +2345,10 @@ where each line of input produces a line of output.} }$% } +% @textdegree - the normal degrees sign. +% +\def\textdegree{$^\circ$} + % Laurent Siebenmann reports \Orb undefined with: % Textures 1.7.7 (preloaded format=plain 93.10.14) (68K) 16 APR 2004 02:38 % so we'll define it if necessary. @@ -2282,8 +2520,8 @@ where each line of input produces a line of output.} % % Leave some space for the footline. Hopefully ok to assume % @evenfooting will not be used by itself. - \global\advance\pageheight by -\baselineskip - \global\advance\vsize by -\baselineskip + \global\advance\pageheight by -12pt + \global\advance\vsize by -12pt } \parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}} @@ -2942,6 +3180,7 @@ where each line of input produces a line of output.} \def\doignore#1{\begingroup % Scan in ``verbatim'' mode: + \obeylines \catcode`\@ = \other \catcode`\{ = \other \catcode`\} = \other @@ -2962,16 +3201,16 @@ where each line of input produces a line of output.} \gdef\dodoignore#1{% % #1 contains the command name as a string, e.g., `ifinfo'. % - % Define a command to find the next `@end #1', which must be on a line - % by itself. - \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}% + % Define a command to find the next `@end #1'. + \long\def\doignoretext##1^^M@end #1{% + \doignoretextyyy##1^^M@#1\_STOP_}% + % % And this command to find another #1 command, at the beginning of a % line. (Otherwise, we would consider a line `@c @ifset', for % example, to count as an @ifset for nesting.) \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}% % % And now expand that command. - \obeylines % \doignoretext ^^M% }% } @@ -3001,7 +3240,12 @@ where each line of input produces a line of output.} } % Finish off ignored text. -\def\enddoignore{\endgroup\ignorespaces} +{ \obeylines% + % Ignore anything after the last `@end #1'; this matters in verbatim + % environments, where otherwise the newline after an ignored conditional + % would result in a blank line in the output. + \gdef\enddoignore#1^^M{\endgroup\ignorespaces}% +} % @set VAR sets the variable VAR to an empty value. @@ -3204,12 +3448,39 @@ where each line of input produces a line of output.} \escapechar = `\\ % use backslash in output files. \def\@{@}% change to @@ when we switch to @ as escape char in index files. \def\ {\realbackslash\space }% + % % Need these in case \tex is in effect and \{ is a \delimiter again. % But can't use \lbracecmd and \rbracecmd because texindex assumes % braces and backslashes are used only as delimiters. \let\{ = \mylbrace \let\} = \myrbrace % + % I don't entirely understand this, but when an index entry is + % generated from a macro call, the \endinput which \scanmacro inserts + % causes processing to be prematurely terminated. This is, + % apparently, because \indexsorttmp is fully expanded, and \endinput + % is an expandable command. The redefinition below makes \endinput + % disappear altogether for that purpose -- although logging shows that + % processing continues to some further point. On the other hand, it + % seems \endinput does not hurt in the printed index arg, since that + % is still getting written without apparent harm. + % + % Sample source (mac-idx3.tex, reported by Graham Percival to + % help-texinfo, 22may06): + % @macro funindex {WORD} + % @findex xyz + % @end macro + % ... + % @funindex commtest + % + % The above is not enough to reproduce the bug, but it gives the flavor. + % + % Sample whatsit resulting: + % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} + % + % So: + \let\endinput = \empty + % % Do the redefinitions. \commondummies } @@ -3301,6 +3572,7 @@ where each line of input produces a line of output.} \definedummyword\point \definedummyword\print \definedummyword\result + \definedummyword\textdegree % % We want to disable all macros so that they are not expanded by \write. \macrolist @@ -3434,6 +3706,7 @@ where each line of input produces a line of output.} \def\point{.}% \def\print{-|}% \def\result{=>}% + \def\textdegree{degrees}% % % We need to get rid of all macros, leaving only the arguments (if present). % Of course this is not nearly correct, but it is the best we can do for now. @@ -3782,9 +4055,9 @@ where each line of input produces a line of output.} \endgroup } -% Like \dotfill except takes at least 1 em. +% Like plain.tex's \dotfill, except uses up at least 1 em. \def\indexdotfill{\cleaders - \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill} + \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill} \def\primary #1{\line{#1\hfil}} @@ -4358,14 +4631,17 @@ where each line of input produces a line of output.} \ifx\temptype\Ynothingkeyword \setbox0 = \hbox{}% \def\toctype{unnchap}% + \gdef\thischapternum{}% \gdef\thischapter{#1}% \else\ifx\temptype\Yomitfromtockeyword \setbox0 = \hbox{}% contents like unnumbered, but no toc entry \def\toctype{omit}% + \gdef\thischapternum{}% \gdef\thischapter{}% \else\ifx\temptype\Yappendixkeyword \setbox0 = \hbox{\putwordAppendix{} #3\enspace}% \def\toctype{app}% + \xdef\thischapternum{\appendixletter}% % We don't substitute the actual chapter name into \thischapter % because we don't want its macros evaluated now. And we don't % use \thissection because that changes with each section. @@ -4375,6 +4651,7 @@ where each line of input produces a line of output.} \else \setbox0 = \hbox{#3\enspace}% \def\toctype{numchap}% + \xdef\thischapternum{\the\chapno}% \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}% \fi\fi\fi @@ -4486,13 +4763,21 @@ where each line of input produces a line of output.} \gdef\thissection{#1}% \fi\fi\fi % - % Write the toc entry (before \donoderef). See comments in \chfplain. + % Write the toc entry (before \donoderef). See comments in \chapmacro. \writetocentry{\toctype\sectionlevel}{#1}{#4}% % % Write the node reference (= pdf destination for pdftex). - % Again, see comments in \chfplain. + % Again, see comments in \chapmacro. \donoderef{#3}% % + % Interline glue will be inserted when the vbox is completed. + % That glue will be a valid breakpoint for the page, since it'll be + % preceded by a whatsit (usually from the \donoderef, or from the + % \writetocentry if there was no node). We don't want to allow that + % break, since then the whatsits could end up on page n while the + % section is on page n+1, thus toc/etc. are wrong. Debian bug 276000. + \nobreak + % % Output the actual section heading. \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright \hangindent=\wd0 % zero if no section number @@ -4555,7 +4840,7 @@ where each line of input produces a line of output.} \edef\temp{% \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}% \temp - } + }% \fi \fi % @@ -4807,7 +5092,7 @@ where each line of input produces a line of output.} {\tentt \global\dimen0 = 3em}% Width of the box. \dimen2 = .55pt % Thickness of rules % The text. (`r' is open on the right, `e' somewhat less so on the left.) -\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt} +\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt} % \setbox\errorbox=\hbox to \dimen0{\hfil \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. @@ -5030,11 +5315,10 @@ where each line of input produces a line of output.} % \maketwodispenvs {lisp}{example}{% \nonfillstart - \tt + \tt\quoteexpand \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. \gobble % eat return } - % @display/@smalldisplay: same as @lisp except keep current font. % \makedispenv {display}{% @@ -5162,6 +5446,34 @@ where each line of input produces a line of output.} \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount % \def\starttabbox{\setbox0=\hbox\bgroup} + +% Allow an option to not replace quotes with a regular directed right +% quote/apostrophe (char 0x27), but instead use the undirected quote +% from cmtt (char 0x0d). The undirected quote is ugly, so don't make it +% the default, but it works for pasting with more pdf viewers (at least +% evince), the lilypond developers report. xpdf does work with the +% regular 0x27. +% +\def\codequoteright{% + \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax + '% + \else + \char'15 + \fi +} +% +% and a similar option for the left quote char vs. a grave accent. +% Modern fonts display ASCII 0x60 as a grave accent, so some people like +% the code environments to do likewise. +% +\def\codequoteleft{% + \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax + `% + \else + \char'22 + \fi +} +% \begingroup \catcode`\^^I=\active \gdef\tabexpand{% @@ -5174,7 +5486,16 @@ where each line of input produces a line of output.} \wd0=\dimen0 \box0 \starttabbox }% } + \catcode`\'=\active + \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}% + % + \catcode`\`=\active + \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}% + % + \gdef\quoteexpand{\rquoteexpand \lquoteexpand}% \endgroup + +% start the verbatim environment. \def\setupverbatim{% \let\nonarrowing = t% \nonfillstart @@ -5183,6 +5504,7 @@ where each line of input produces a line of output.} \def\par{\leavevmode\egroup\box0\endgraf}% \catcode`\`=\active \tabexpand + \quoteexpand % Respect line breaks, % print special symbols as themselves, and % make each space count @@ -5632,7 +5954,6 @@ where each line of input produces a line of output.} \spaceisspace % % Append \endinput to make sure that TeX does not see the ending newline. - % % I've verified that it is necessary both for e-TeX and for ordinary TeX % --kasal, 29nov03 \scantokens{#1\endinput}% @@ -5899,11 +6220,11 @@ where each line of input produces a line of output.} % {. If so it reads up to the closing }, if not, it reads the whole % line. Whatever was read is then fed to the next control sequence % as an argument (by \parsebrace or \parsearg) -\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx} +\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} \def\braceorlinexxx{% \ifx\nchar\bgroup\else \expandafter\parsearg - \fi \next} + \fi \macnamexxx} % @alias. @@ -6498,7 +6819,7 @@ where each line of input produces a line of output.} % above and below. \nobreak\vskip\parskip \nobreak - \line\bgroup\hss + \line\bgroup \fi % % Output the image. @@ -6511,7 +6832,7 @@ where each line of input produces a line of output.} \epsfbox{#1.eps}% \fi % - \ifimagevmode \hss \egroup \bigbreak \fi % space after the image + \ifimagevmode \egroup \bigbreak \fi % space after the image \endgroup} @@ -6805,11 +7126,305 @@ where each line of input produces a line of output.} is empty. Maybe you need to install it? In the current directory should work if nowhere else does.} +% Set the catcode of characters 128 through 255 to the specified number. +% +\def\setnonasciicharscatcode#1{ + \count255=128 + \loop\ifnum\count255<256 + \global\catcode\count255=#1 + \advance\count255 by 1 + \repeat +} -% @documentencoding should change something in TeX eventually, most -% likely, but for now just recognize it. -\let\documentencoding = \comment +% @documentencoding sets the definition of non-ASCII characters +% according to the specified encoding. +% +\parseargdef\documentencoding{% + % Encoding being declared for the document. + \def\declaredencoding{\csname #1.enc\endcsname}% + % + % Supported encodings: names converted to tokens in order to be able + % to compare them with \ifx. + \def\latone{\csname ISO-8859-1.enc\endcsname}% + \def\latnine{\csname ISO-8859-15.enc\endcsname}% + \def\lattwo{\csname ISO-8859-2.enc\endcsname}% + \def\ascii{\csname US-ASCII.enc\endcsname}% + % + \ifx \declaredencoding \ascii + \asciichardefs + % + \else \ifx \declaredencoding \lattwo + \setnonasciicharscatcode\active + \lattwochardefs + % + \else \ifx \declaredencoding \latone + \setnonasciicharscatcode\active + \latonechardefs + % + \else \ifx \declaredencoding \latnine + \setnonasciicharscatcode\active + \latninechardefs + % + \else + \message{Unknown document encoding #1, ignoring.}% + % + \fi % latnine + \fi % latone + \fi % lattwo + \fi % ascii +} +% A message to be logged when using a character that isn't available +% the default font encoding (OT1). +% +\def\missingcharmsg#1{\message{Character missing in OT1 encoding: #1.}} + +% Take account of \c (plain) vs. \, (Texinfo) difference. +\def\cedilla#1{\ifx\c\ptexc\c{#1}\else\,{#1}\fi} + +% First, make active non-ASCII characters in order for them to be +% correctly categorized when TeX reads the replacement text of +% macros containing the character definitions. +\setnonasciicharscatcode\active +% +% Latin1 (ISO-8859-1) character definitions. +\def\latonechardefs{% + \gdef^^a0{~} + \gdef^^a1{\exclamdown} + \gdef^^a2{\missingcharmsg{CENT SIGN}} + \gdef^^a3{{\pounds}} + \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} + \gdef^^a5{\missingcharmsg{YEN SIGN}} + \gdef^^a6{\missingcharmsg{BROKEN BAR}} + \gdef^^a7{\S} + \gdef^^a8{\"{}} + \gdef^^a9{\copyright} + \gdef^^aa{\ordf} + \gdef^^ab{\missingcharmsg{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}} + \gdef^^ac{$\lnot$} + \gdef^^ad{\-} + \gdef^^ae{\registeredsymbol} + \gdef^^af{\={}} + % + \gdef^^b0{\textdegree} + \gdef^^b1{$\pm$} + \gdef^^b2{$^2$} + \gdef^^b3{$^3$} + \gdef^^b4{\'{}} + \gdef^^b5{$\mu$} + \gdef^^b6{\P} + % + \gdef^^b7{$^.$} + \gdef^^b8{\cedilla\ } + \gdef^^b9{$^1$} + \gdef^^ba{\ordm} + % + \gdef^^bb{\missingcharmsg{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}} + \gdef^^bc{$1\over4$} + \gdef^^bd{$1\over2$} + \gdef^^be{$3\over4$} + \gdef^^bf{\questiondown} + % + \gdef^^c0{\`A} + \gdef^^c1{\'A} + \gdef^^c2{\^A} + \gdef^^c3{\~A} + \gdef^^c4{\"A} + \gdef^^c5{\ringaccent A} + \gdef^^c6{\AE} + \gdef^^c7{\cedilla C} + \gdef^^c8{\`E} + \gdef^^c9{\'E} + \gdef^^ca{\^E} + \gdef^^cb{\"E} + \gdef^^cc{\`I} + \gdef^^cd{\'I} + \gdef^^ce{\^I} + \gdef^^cf{\"I} + % + \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER ETH}} + \gdef^^d1{\~N} + \gdef^^d2{\`O} + \gdef^^d3{\'O} + \gdef^^d4{\^O} + \gdef^^d5{\~O} + \gdef^^d6{\"O} + \gdef^^d7{$\times$} + \gdef^^d8{\O} + \gdef^^d9{\`U} + \gdef^^da{\'U} + \gdef^^db{\^U} + \gdef^^dc{\"U} + \gdef^^dd{\'Y} + \gdef^^de{\missingcharmsg{LATIN CAPITAL LETTER THORN}} + \gdef^^df{\ss} + % + \gdef^^e0{\`a} + \gdef^^e1{\'a} + \gdef^^e2{\^a} + \gdef^^e3{\~a} + \gdef^^e4{\"a} + \gdef^^e5{\ringaccent a} + \gdef^^e6{\ae} + \gdef^^e7{\cedilla c} + \gdef^^e8{\`e} + \gdef^^e9{\'e} + \gdef^^ea{\^e} + \gdef^^eb{\"e} + \gdef^^ec{\`{\dotless i}} + \gdef^^ed{\'{\dotless i}} + \gdef^^ee{\^{\dotless i}} + \gdef^^ef{\"{\dotless i}} + % + \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER ETH}} + \gdef^^f1{\~n} + \gdef^^f2{\`o} + \gdef^^f3{\'o} + \gdef^^f4{\^o} + \gdef^^f5{\~o} + \gdef^^f6{\"o} + \gdef^^f7{$\div$} + \gdef^^f8{\o} + \gdef^^f9{\`u} + \gdef^^fa{\'u} + \gdef^^fb{\^u} + \gdef^^fc{\"u} + \gdef^^fd{\'y} + \gdef^^fe{\missingcharmsg{LATIN SMALL LETTER THORN}} + \gdef^^ff{\"y} +} + +% Latin9 (ISO-8859-15) encoding character definitions. +\def\latninechardefs{% + % Encoding is almost identical to Latin1. + \latonechardefs + % + \gdef^^a4{\euro} + \gdef^^a6{\v S} + \gdef^^a8{\v s} + \gdef^^b4{\v Z} + \gdef^^b8{\v z} + \gdef^^bc{\OE} + \gdef^^bd{\oe} + \gdef^^be{\"Y} +} + +% Latin2 (ISO-8859-2) character definitions. +\def\lattwochardefs{% + \gdef^^a0{~} + \gdef^^a1{\missingcharmsg{LATIN CAPITAL LETTER A WITH OGONEK}} + \gdef^^a2{\u{}} + \gdef^^a3{\L} + \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} + \gdef^^a5{\v L} + \gdef^^a6{\'S} + \gdef^^a7{\S} + \gdef^^a8{\"{}} + \gdef^^a9{\v S} + \gdef^^aa{\cedilla S} + \gdef^^ab{\v T} + \gdef^^ac{\'Z} + \gdef^^ad{\-} + \gdef^^ae{\v Z} + \gdef^^af{\dotaccent Z} + % + \gdef^^b0{\textdegree} + \gdef^^b1{\missingcharmsg{LATIN SMALL LETTER A WITH OGONEK}} + \gdef^^b2{\missingcharmsg{OGONEK}} + \gdef^^b3{\l} + \gdef^^b4{\'{}} + \gdef^^b5{\v l} + \gdef^^b6{\'s} + \gdef^^b7{\v{}} + \gdef^^b8{\cedilla\ } + \gdef^^b9{\v s} + \gdef^^ba{\cedilla s} + \gdef^^bb{\v t} + \gdef^^bc{\'z} + \gdef^^bd{\H{}} + \gdef^^be{\v z} + \gdef^^bf{\dotaccent z} + % + \gdef^^c0{\'R} + \gdef^^c1{\'A} + \gdef^^c2{\^A} + \gdef^^c3{\u A} + \gdef^^c4{\"A} + \gdef^^c5{\'L} + \gdef^^c6{\'C} + \gdef^^c7{\cedilla C} + \gdef^^c8{\v C} + \gdef^^c9{\'E} + \gdef^^ca{\missingcharmsg{LATIN CAPITAL LETTER E WITH OGONEK}} + \gdef^^cb{\"E} + \gdef^^cc{\v E} + \gdef^^cd{\'I} + \gdef^^ce{\^I} + \gdef^^cf{\v D} + % + \gdef^^d0{\missingcharmsg{LATIN CAPITAL LETTER D WITH STROKE}} + \gdef^^d1{\'N} + \gdef^^d2{\v N} + \gdef^^d3{\'O} + \gdef^^d4{\^O} + \gdef^^d5{\H O} + \gdef^^d6{\"O} + \gdef^^d7{$\times$} + \gdef^^d8{\v R} + \gdef^^d9{\ringaccent U} + \gdef^^da{\'U} + \gdef^^db{\H U} + \gdef^^dc{\"U} + \gdef^^dd{\'Y} + \gdef^^de{\cedilla T} + \gdef^^df{\ss} + % + \gdef^^e0{\'r} + \gdef^^e1{\'a} + \gdef^^e2{\^a} + \gdef^^e3{\u a} + \gdef^^e4{\"a} + \gdef^^e5{\'l} + \gdef^^e6{\'c} + \gdef^^e7{\cedilla c} + \gdef^^e8{\v c} + \gdef^^e9{\'e} + \gdef^^ea{\missingcharmsg{LATIN SMALL LETTER E WITH OGONEK}} + \gdef^^eb{\"e} + \gdef^^ec{\v e} + \gdef^^ed{\'\i} + \gdef^^ee{\^\i} + \gdef^^ef{\v d} + % + \gdef^^f0{\missingcharmsg{LATIN SMALL LETTER D WITH STROKE}} + \gdef^^f1{\'n} + \gdef^^f2{\v n} + \gdef^^f3{\'o} + \gdef^^f4{\^o} + \gdef^^f5{\H o} + \gdef^^f6{\"o} + \gdef^^f7{$\div$} + \gdef^^f8{\v r} + \gdef^^f9{\ringaccent u} + \gdef^^fa{\'u} + \gdef^^fb{\H u} + \gdef^^fc{\"u} + \gdef^^fd{\'y} + \gdef^^fe{\cedilla t} + \gdef^^ff{\dotaccent{}} +} + +% US-ASCII character definitions. +\def\asciichardefs{% + % Nothing needs to be done + \relax +} + +% Make non-ASCII characters printable again for compatibility with +% existing Texinfo documents that may use them, even without declaring a +% document encoding. +% +\setnonasciicharscatcode \other % Page size parameters. % @@ -7102,22 +7717,6 @@ should work if nowhere else does.} % \otherifyactive is called near the end of this file. \def\otherifyactive{\catcode`+=\other \catcode`\_=\other} -% Same as @turnoffactive below, but backslash retains it's normal definition. -% (Before 2005-08-15, this macro explicitly assigned @let\=@normalbackslash, -% but it doesn't seem to be necessary. --kasal) -\def\normalturnoffactive{% - \let"=\normaldoublequote - \let~=\normaltilde - \let^=\normalcaret - \let_=\normalunderscore - \let|=\normalverticalbar - \let<=\normalless - \let>=\normalgreater - \let+=\normalplus - \let$=\normaldollar %$ font-lock fix - \unsepspaces -} - % Used sometimes to turn off (effectively) the active characters even after % parsing them. \def\turnoffactive{% @@ -7149,6 +7748,23 @@ should work if nowhere else does.} @gdef@rawbackslash{@let\=@backslashcurfont} @gdef@otherbackslash{@let\=@realbackslash} +% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of +% the literal character `\'. +% +@def@normalturnoffactive{% + @let\=@normalbackslash + @let"=@normaldoublequote + @let~=@normaltilde + @let^=@normalcaret + @let_=@normalunderscore + @let|=@normalverticalbar + @let<=@normalless + @let>=@normalgreater + @let+=@normalplus + @let$=@normaldollar %$ font-lock fix + @unsepspaces +} + % Make _ and + \other characters, temporarily. % This is canceled by @fixbackslash. @otherifyactive |