From 87909b17157a48b3a373a6b91790f569263a8ae0 Mon Sep 17 00:00:00 2001 From: Werner LEMBERG Date: Sat, 1 Mar 2003 07:34:52 +0000 Subject: [PATCH] * font/devdvi/generate/ec.map: Add some more Unicode entities. * font/devdvi/*EC: Updated. * tmac/composite.tmac, tmac/latin2.tmac, tmac/latin9.tmac: New files. * tmac/latin1 (latin1-tr): Undo any previous mapping. * tmac/troffrc: Load `composite.tmac'. * tmac/Makefile.sub (NORMALFILES): Updated. * NEWS: Updated. --- ChangeLog | 12 ++++ NEWS | 15 +++-- doc/groff.texinfo | 135 +++++++++++++++++++++++++++++++++++--------- font/devdvi/CWEC | 10 +++- font/devdvi/CWIEC | 10 +++- font/devdvi/HBEC | 48 +++++++++++++++- font/devdvi/HBIEC | 48 +++++++++++++++- font/devdvi/HIEC | 48 +++++++++++++++- font/devdvi/HREC | 48 +++++++++++++++- font/devdvi/TBEC | 48 +++++++++++++++- font/devdvi/TBIEC | 48 +++++++++++++++- font/devdvi/TIEC | 48 +++++++++++++++- font/devdvi/TREC | 48 +++++++++++++++- font/devdvi/generate/ec.map | 6 +- tmac/Makefile.sub | 3 +- tmac/composite.tmac | 24 ++++++++ tmac/latin1.tmac | 7 +++ tmac/latin2.tmac | 111 ++++++++++++++++++++++++++++++++++++ tmac/latin9.tmac | 112 ++++++++++++++++++++++++++++++++++++ tmac/troffrc | 3 + 20 files changed, 766 insertions(+), 66 deletions(-) create mode 100644 tmac/composite.tmac create mode 100644 tmac/latin2.tmac create mode 100644 tmac/latin9.tmac diff --git a/ChangeLog b/ChangeLog index 072c98f2..28474cd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2003-02-28 Werner LEMBERG + + * font/devdvi/generate/ec.map: Add some more Unicode entities. + * font/devdvi/*EC: Updated. + + * tmac/composite.tmac, tmac/latin2.tmac, tmac/latin9.tmac: New files. + * tmac/latin1 (latin1-tr): Undo any previous mapping. + * tmac/troffrc: Load `composite.tmac'. + * tmac/Makefile.sub (NORMALFILES): Updated. + + * NEWS: Updated. + 2003-02-27 Werner LEMBERG * doc/texinfo.tex: New version 2003-02-11.06. diff --git a/NEWS b/NEWS index 4a5d3ec6..ad589288 100644 --- a/NEWS +++ b/NEWS @@ -1,18 +1,21 @@ This file describes recent user-visible changes in groff. Bug fixes are not described. There are more details in the man and info pages. -VERSION 1.18.X -============== - -Grops ------ - VERSION 1.18.2 ============== Troff ----- +o Input encoding files for latin-9 (a.k.a. latin-0 and ISO 8859-15) and + latin-2 (ISO 8859-2) have been added. Example use: + + groff -Tdvi -mlatin9 my_file > my_file.dvi + + You still need proper fonts with the necessary glyphs. Out of the box, + the groff package supports latin-9 only for -Tps, -Tdvi, and -Tutf8, + and latin-2 only for -Tdvi and -Tutf8. + o Non-slanted PostScript metrics have been changed again; they no longer contain negative left italic correction values. This assures correct spacing with eqn. diff --git a/doc/groff.texinfo b/doc/groff.texinfo index c4ebb90d..c8de72bd 100644 --- a/doc/groff.texinfo +++ b/doc/groff.texinfo @@ -967,29 +967,35 @@ For a 100@dmn{dpi} X11 previewer with a 12@dmn{pt} base font in the document. @item ascii -@cindex encoding, @acronym{ASCII} -@cindex @acronym{ASCII}, encoding +@cindex encoding, output, @acronym{ASCII} +@cindex @acronym{ASCII}, output encoding +@cindex output encoding, @acronym{ASCII} For typewriter-like devices using the (7-bit) @acronym{ASCII} character set. @item latin1 -@cindex encoding, latin-1 -@cindex latin-1, encoding +@cindex encoding, output, @w{latin-1} (ISO @w{8859-1}) +@cindex @w{latin-1} (ISO @w{8859-1}), output encoding +@cindex ISO @w{8859-1} (@w{latin-1}), output encoding +@cindex output encoding, @w{latin-1} (ISO @w{8859-1}) For typewriter-like devices that support the @w{Latin-1} (ISO@tie{}@w{8859-1}) character set. @item utf8 -@cindex encoding, utf-8 -@cindex utf-8, encoding +@cindex encoding, output, @w{utf-8} +@cindex @w{utf-8}, output encoding +@cindex output encoding, @w{utf-8} For typewriter-like devices which use the Unicode (ISO@tie{}10646) character set with @w{UTF-8} encoding. @item cp1047 -@cindex @acronym{EBCDIC} encoding -@cindex encoding, @acronym{EBCDIC} -@cindex encoding, cp1047 -@cindex cp1047 -@cindex IBM cp1047 +@cindex encoding, output, @acronym{EBCDIC} +@cindex @acronym{EBCDIC}, output encoding +@cindex output encoding, @acronym{EBCDIC} +@cindex encoding, output, cp1047 +@cindex cp1047, output encoding +@cindex output encoding, cp1047 +@cindex IBM cp1047 output encoding For typewriter-like devices which use the @acronym{EBCDIC} encoding IBM cp1047. @@ -1707,7 +1713,6 @@ A variation of this is a bulleted list. is used instead of a real bullet. @endExample - @c --------------------------------------------------------------------- @node Sections and Chapters, Headers and Footers, Paragraphs, Common Features @@ -1957,7 +1962,7 @@ The command line format for using the @file{man} macros with @Example groff -m man [ -rLL=@var{length} ] [ -rLT=@var{length} ] [ -rFT=@var{dist} ] - [ -rcR=1 ] [ -rC1 ] [ -rD1 ] + [ -rcR=1 ] [ -rC1 ] [ -rD1 ] [ -rP@var{nnn} ] [ -rS@var{xx} ] [ -rX@var{nnn} ] [ -rIN=@var{length} ] [ -rSN=@var{length} ] [ @var{files}@dots{} ] @endExample @@ -2291,7 +2296,7 @@ System III System V @end table -An optional second argument @var{release} to @code{AT} specifies the +An optional second argument @var{release} to @code{AT} specifies the release number (such as ``System V Release 3''). @endDefmac @@ -2379,7 +2384,7 @@ and automatically call the right preprocessor(s). @c --------------------------------------------------------------------- -@node Optional man extensions, , Preprocessors in man pages, man +@node Optional man extensions, , Preprocessors in man pages, man @subsection Optional @file{man} extensions @pindex man.local @@ -4096,7 +4101,6 @@ Users of macro packages may skip it if not interested in details. @menu * Text:: -* Input Conventions:: * Measurements:: * Expressions:: * Identifiers:: @@ -4135,7 +4139,7 @@ Users of macro packages may skip it if not interested in details. @c ===================================================================== -@node Text, Input Conventions, gtroff Reference, gtroff Reference +@node Text, Measurements, gtroff Reference, gtroff Reference @section Text @cindex text, @code{gtroff} processing @@ -4163,6 +4167,8 @@ inserting implicit line breaks * Sentences:: * Tab Stops:: * Implicit Line Breaks:: +* Input Conventions:: +* Input Encodings:: @end menu @c --------------------------------------------------------------------- @@ -4293,7 +4299,7 @@ produces @c --------------------------------------------------------------------- -@node Implicit Line Breaks, , Tab Stops, Text +@node Implicit Line Breaks, Input Conventions, Tab Stops, Text @subsection Implicit Line Breaks @cindex implicit line breaks @cindex implicit breaks of lines @@ -4328,11 +4334,10 @@ the document may vanish! Certain requests also cause breaks, implicitly or explicitly. This is discussed in @ref{Manipulating Filling and Adjusting}. +@c --------------------------------------------------------------------- -@c ===================================================================== - -@node Input Conventions, Measurements, Text, gtroff Reference -@section Input Conventions +@node Input Conventions, Input Encodings, Implicit Line Breaks, Text +@subsection Input Conventions @cindex input conventions @cindex conventions for input @@ -4356,10 +4361,90 @@ Do not try to do any formatting in a @acronym{WYSIWYG} manner (i.e., don't try using spaces to get proper indentation). @end itemize +@c --------------------------------------------------------------------- + +@node Input Encodings, , Input Conventions, Text +@subsection Input Encodings + +Currently, the following input encodings are available. + +@table @asis +@item cp1047 +@cindex encoding, input, @acronym{EBCDIC} +@cindex @acronym{EBCDIC}, input encoding +@cindex input encoding, @acronym{EBCDIC} +@cindex encoding, input, cp1047 +@cindex cp1047, input encoding +@cindex input encoding, cp1047 +@cindex IBM cp1047 input encoding +@pindex cp1047.tmac +This input encoding works only on @acronym{EBCDIC} platforms (and vice +versa, the other input encodings don't work with @acronym{EBCDIC}); the +file @file{cp1047.tmac} is by default loaded at start-up. + +@item latin-1 +@cindex encoding, input, @w{latin-1} (ISO @w{8859-1}) +@cindex @w{latin-1} (ISO @w{8859-1}), input encoding +@cindex ISO @w{8859-1} (@w{latin-1}), input encoding +@cindex input encoding, @w{latin-1} (ISO @w{8859-1}) +@pindex latin1.tmac +This is the default input encoding on non-@acronym{EBCDIC} platforms; +the file @file{latin1.tmac} is loaded at start-up. + +@item latin-2 +@cindex encoding, input, @w{latin-2} (ISO @w{8859-2}) +@cindex @w{latin-2} (ISO @w{8859-2}), input encoding +@cindex ISO @w{8859-2} (@w{latin-2}), input encoding +@cindex input encoding, @w{latin-2} (ISO @w{8859-2}) +@pindex latin2.tmac +To use this encoding, either say @w{@samp{.mso latin2.tmac}} at the very +beginning of your document or use @samp{-mlatin2} as a command line +argument for @code{groff}. + +@item latin-9 (latin-0) +@cindex encoding, input, @w{latin-9} (@w{latin-0}, ISO @w{8859-15}) +@cindex @w{latin-9} (@w{latin-0}, ISO @w{8859-15}), input encoding +@cindex ISO @w{8859-15} (@w{latin-9}, @w{latin-0}), input encoding +@cindex input encoding, @w{latin-9} (@w{latin-9}, ISO @w{8859-15}) +@pindex latin9.tmac +This encoding is intended (at least in Europe) to replace @w{latin-1} +encoding. The main difference to @w{latin-1} is that @w{latin-9} +contains the Euro character. To use this encoding, either say +@w{@samp{.mso latin9.tmac}} at the very beginning of your document or +use @samp{-mlatin9} as a command line argument for @code{groff}. +@end table + +Note that it can happen that some input encoding characters are not +available for a particular output device. For example, saying + +@Example +groff -Tlatin1 -mlatin9 ... +@endExample + +@noindent +will fail if you use the Euro character in the input. Usually, this +limitation is present only for devices which have a limited set of +output glyphs (e.g.@: @option{-Tascii} and @option{-Tlatin1}); for other +devices it is usually sufficient to install proper fonts which contain +the necessary glyphs. + +@pindex freeeuro.pfa +@pindex ec.tmac +Due to the importance of the Euro glyph in Europe, the groff package now +comes with a @sc{PostScript} font called @file{freeeuro.pfa} which +provides various glyph shapes for the Euro. With other words, +@w{latin-9} encoding is supported for the @option{-Tps} device out of +the box (@w{latin-2} isn't). + +By its very nature, @option{-Tutf8} supports all input encodings; +@option{-Tdvi} has support for both @w{latin-2} and @w{latin-9} if the +command line @option{-mec} is used also to load the file @file{ec.tmac} +(which flips to the EC fonts). + @c ===================================================================== -@node Measurements, Expressions, Input Conventions, gtroff Reference +@node Measurements, Expressions, Text, gtroff Reference @section Measurements @cindex measurements @@ -9341,7 +9426,6 @@ post-vertical spacing; it is associated with the current environment (@pxref{Environments}). @endDefreq - @c --------------------------------------------------------------------- @node Fractional Type Sizes, , Changing Type Sizes, Sizes @@ -11137,7 +11221,7 @@ only the second call to@tie{}@code{x} is caused by @code{bp}. @Example .de x -\&.pe=\\n[.pe] +\&.pe=\\n[.pe] .br .. .wh 1v x @@ -14593,7 +14677,6 @@ Here a list of obsolete keywords which are recognized by @code{groff} but completely ignored: @code{spare1}, @code{spare2}, @code{biggestfont}. - @c --------------------------------------------------------------------- @node Font File Format, , DESC File Format, Font Files diff --git a/font/devdvi/CWEC b/font/devdvi/CWEC index 07bca605..d7779019 100644 --- a/font/devdvi/CWEC +++ b/font/devdvi/CWEC @@ -37,7 +37,8 @@ fl 550368,640640 2 0035 Fi 550368,640640 2 0036 Fl 550368,640640 2 0037 u2423 550368,451360,116480 1 0040 -! 550368,640640 2 0041 +u01C3 550368,640640 2 0041 +! " dq 550368,640640 2 0042 " " sh 550368,640640 2 0043 @@ -140,7 +141,8 @@ y 550368,451360,232960 1 0171 z 550368,451360 0 0172 lC 550368,728000,87360 3 0173 { " -ba 550368,728000,87360 3 0174 +u01C0 550368,728000,87360 3 0174 +ba " | " rC 550368,728000,87360 3 0175 } " @@ -226,7 +228,9 @@ AE 550368,640640 2 0306 'I 550368,816227 2 0315 ^I 550368,859040 2 0316 :I 550368,859040 2 0317 --D 550368,640640 2 0320 +u0189 550368,640640 2 0320 +u0110 " +-D " ~N 550368,859040 2 0321 `O 550368,816227 2 0322 'O 550368,816227 2 0323 diff --git a/font/devdvi/CWIEC b/font/devdvi/CWIEC index eb94a219..5e2356bd 100644 --- a/font/devdvi/CWIEC +++ b/font/devdvi/CWIEC @@ -38,7 +38,8 @@ fl 550368,640640,232960,182000 3 0035 Fi 550368,640640,232960,182000 3 0036 Fl 550368,640640,232960,182000 3 0037 u2423 550368,451360,116480,182000 1 0040 -! 550368,640640,0,182000 2 0041 +u01C3 550368,640640,0,182000 2 0041 +! " dq 550368,640640,0,182000 2 0042 " " sh 550368,640640,0,182000 2 0043 @@ -141,7 +142,8 @@ y 550368,451360,232960,182000 1 0171 z 550368,451360,0,182000 0 0172 lC 550368,728000,87360,182000 3 0173 { " -ba 550368,728000,87360,182000 3 0174 +u01C0 550368,728000,87360,182000 3 0174 +ba " | " rC 550368,728000,87360,182000 3 0175 } " @@ -227,7 +229,9 @@ AE 550368,640640,0,182000 2 0306 'I 550368,816379,0,182000 2 0315 ^I 550368,859040,0,182000 2 0316 :I 550368,859040,0,182000 2 0317 --D 550368,640640,0,182000 2 0320 +u0189 550368,640640,0,182000 2 0320 +u0110 " +-D " ~N 550368,859040,0,182000 2 0321 `O 550368,816379,0,182000 2 0322 'O 550368,816379,0,182000 2 0323 diff --git a/font/devdvi/HBEC b/font/devdvi/HBEC index 9276339f..83471939 100644 --- a/font/devdvi/HBEC +++ b/font/devdvi/HBEC @@ -84,6 +84,7 @@ ff ` 80080 ff lq 80080 ff rq 80080 ff ? 80080 +ff u01C3 80080 ff ! 80080 ff ) 80080 ff rB 80080 @@ -92,7 +93,9 @@ cq rq 128128 ' rq 128128 cq ? 128128 ' ? 128128 +cq u01C3 128128 cq ! 128128 +' u01C3 128128 ' ! 128128 A y -32032 A :y -32032 @@ -460,7 +463,9 @@ oq lq 128128 ` lq 128128 oq ? 128128 ` ? 128128 +oq u01C3 128128 oq ! 128128 +` u01C3 128128 ` ! 128128 a r -32032 a y -32032 @@ -503,6 +508,7 @@ f ` 80080 f lq 80080 f rq 80080 f ? 80080 +f u01C3 80080 f ! 80080 f ) 80080 f rB 80080 @@ -1394,21 +1400,53 @@ oA :Y -96096 oA 'Y -96096 oA V -128128 oA W -128128 +u0189 X -32032 +u0110 X -32032 -D X -32032 +u0189 W -32032 +u0110 W -32032 -D W -32032 +u0189 A -32032 +u0110 A -32032 -D A -32032 +u0189 u0041_0306 -32032 +u0110 u0041_0306 -32032 -D u0041_0306 -32032 +u0189 u0041_0328 -32032 +u0110 u0041_0328 -32032 -D u0041_0328 -32032 +u0189 `A -32032 +u0110 `A -32032 -D `A -32032 +u0189 'A -32032 +u0110 'A -32032 -D 'A -32032 +u0189 ^A -32032 +u0110 ^A -32032 -D ^A -32032 +u0189 ~A -32032 +u0110 ~A -32032 -D ~A -32032 +u0189 :A -32032 +u0110 :A -32032 -D :A -32032 +u0189 oA -32032 +u0110 oA -32032 -D oA -32032 +u0189 AE -32032 +u0110 AE -32032 -D AE -32032 +u0189 V -32032 +u0110 V -32032 -D V -32032 +u0189 Y -32032 +u0110 Y -32032 -D Y -32032 +u0189 :Y -32032 +u0110 :Y -32032 -D :Y -32032 +u0189 'Y -32032 +u0110 'Y -32032 -D 'Y -32032 `O X -32032 `O W -32032 @@ -1797,7 +1835,8 @@ fl 614432,755976 2 0035 Fi 934752,755976 2 0036 Fl 934752,755976 2 0037 u2423 576576,480480,101920 1 0040 -! 384384,755976 2 0041 +u01C3 384384,755976 2 0041 +! " dq 576576,755976 2 0042 " " sh 960960,755976,232960 3 0043 @@ -1900,7 +1939,8 @@ y 524160,480480,203840,16016 1 0171 z 499408,480480 0 0172 lC 576576,782600,262080 3 0173 { " -ba 320320,782600,262080 3 0174 +u01C0 320320,782600,262080 3 0174 +ba " | " rC 576576,782600,262080 3 0175 } " @@ -1986,7 +2026,9 @@ AE 992992,728000 2 0306 'I 340704,905917,0,85210,0,42605 2 0315 ^I 340704,946400 2 0316 :I 340704,946400 2 0317 --D 832832,728000,0,0,0,-32032 2 0320 +u0189 832832,728000,0,0,0,-32032 2 0320 +u0110 " +-D " ~N 832832,946400 2 0321 `O 832832,905917,0,0,-32032,-32032 2 0322 'O 832832,905917 2 0323 diff --git a/font/devdvi/HBIEC b/font/devdvi/HBIEC index 9bff61b8..a34a04f5 100644 --- a/font/devdvi/HBIEC +++ b/font/devdvi/HBIEC @@ -85,6 +85,7 @@ ff ` 80080 ff lq 80080 ff rq 80080 ff ? 80080 +ff u01C3 80080 ff ! 80080 ff ) 80080 ff rB 80080 @@ -93,7 +94,9 @@ cq rq 128128 ' rq 128128 cq ? 128128 ' ? 128128 +cq u01C3 128128 cq ! 128128 +' u01C3 128128 ' ! 128128 A y -32032 A :y -32032 @@ -461,7 +464,9 @@ oq lq 128128 ` lq 128128 oq ? 128128 ` ? 128128 +oq u01C3 128128 oq ! 128128 +` u01C3 128128 ` ! 128128 a r -32032 a y -32032 @@ -504,6 +509,7 @@ f ` 80080 f lq 80080 f rq 80080 f ? 80080 +f u01C3 80080 f ! 80080 f ) 80080 f rB 80080 @@ -1395,21 +1401,53 @@ oA :Y -96096 oA 'Y -96096 oA V -128128 oA W -128128 +u0189 X -32032 +u0110 X -32032 -D X -32032 +u0189 W -32032 +u0110 W -32032 -D W -32032 +u0189 A -32032 +u0110 A -32032 -D A -32032 +u0189 u0041_0306 -32032 +u0110 u0041_0306 -32032 -D u0041_0306 -32032 +u0189 u0041_0328 -32032 +u0110 u0041_0328 -32032 -D u0041_0328 -32032 +u0189 `A -32032 +u0110 `A -32032 -D `A -32032 +u0189 'A -32032 +u0110 'A -32032 -D 'A -32032 +u0189 ^A -32032 +u0110 ^A -32032 -D ^A -32032 +u0189 ~A -32032 +u0110 ~A -32032 -D ~A -32032 +u0189 :A -32032 +u0110 :A -32032 -D :A -32032 +u0189 oA -32032 +u0110 oA -32032 -D oA -32032 +u0189 AE -32032 +u0110 AE -32032 -D AE -32032 +u0189 V -32032 +u0110 V -32032 -D V -32032 +u0189 Y -32032 +u0110 Y -32032 -D Y -32032 +u0189 :Y -32032 +u0110 :Y -32032 -D :Y -32032 +u0189 'Y -32032 +u0110 'Y -32032 -D 'Y -32032 `O X -32032 `O W -32032 @@ -1798,7 +1836,8 @@ fl 614432,755976,0,130354 2 0035 Fi 934752,755976,0,127442 2 0036 Fl 934752,755976,0,130354 2 0037 u2423 576576,480480,101920,39690 1 0040 -! 384384,755976,0,69202 2 0041 +u01C3 384384,755976,0,69202 2 0041 +! " dq 576576,755976,0,72114 2 0042 " " sh 960960,755976,232960,58491 3 0043 @@ -1901,7 +1940,8 @@ y 524160,480480,203840,118144 1 0171 z 499408,480480,0,96013 0 0172 lC 576576,782600,262080,140910 3 0173 { " -ba 320320,782600,262080,82670 3 0174 +u01C0 320320,782600,262080,82670 3 0174 +ba " | " rC 576576,782600,262080,29498 3 0175 } " @@ -1987,7 +2027,9 @@ AE 992992,728000,0,122707 2 0306 'I 340704,905917,0,138723,0,69362 2 0315 ^I 340704,946400,0,138723,0,69362 2 0316 :I 340704,946400,0,138723,0,69362 2 0317 --D 832832,728000,0,76286,0,44254 2 0320 +u0189 832832,728000,0,76286,0,44254 2 0320 +u0110 " +-D " ~N 832832,946400,0,90675,0,13306 2 0321 `O 832832,905917,0,76286,-78454,44254 2 0322 'O 832832,905917,0,76286 2 0323 diff --git a/font/devdvi/HIEC b/font/devdvi/HIEC index 62062f93..a53f1262 100644 --- a/font/devdvi/HIEC +++ b/font/devdvi/HIEC @@ -85,6 +85,7 @@ ff ` 72800 ff lq 72800 ff rq 72800 ff ? 72800 +ff u01C3 72800 ff ! 72800 ff ) 72800 ff rB 72800 @@ -93,7 +94,9 @@ cq rq 116480 ' rq 116480 cq ? 116480 ' ? 116480 +cq u01C3 116480 cq ! 116480 +' u01C3 116480 ' ! 116480 A y -29120 A :y -29120 @@ -461,7 +464,9 @@ oq lq 116480 ` lq 116480 oq ? 116480 ` ? 116480 +oq u01C3 116480 oq ! 116480 +` u01C3 116480 ` ! 116480 a r -29120 a y -29120 @@ -504,6 +509,7 @@ f ` 72800 f lq 72800 f rq 72800 f ? 72800 +f u01C3 72800 f ! 72800 f ) 72800 f rB 72800 @@ -1395,21 +1401,53 @@ oA :Y -87360 oA 'Y -87360 oA V -116480 oA W -116480 +u0189 X -29120 +u0110 X -29120 -D X -29120 +u0189 W -29120 +u0110 W -29120 -D W -29120 +u0189 A -29120 +u0110 A -29120 -D A -29120 +u0189 u0041_0306 -29120 +u0110 u0041_0306 -29120 -D u0041_0306 -29120 +u0189 u0041_0328 -29120 +u0110 u0041_0328 -29120 -D u0041_0328 -29120 +u0189 `A -29120 +u0110 `A -29120 -D `A -29120 +u0189 'A -29120 +u0110 'A -29120 -D 'A -29120 +u0189 ^A -29120 +u0110 ^A -29120 -D ^A -29120 +u0189 ~A -29120 +u0110 ~A -29120 -D ~A -29120 +u0189 :A -29120 +u0110 :A -29120 -D :A -29120 +u0189 oA -29120 +u0110 oA -29120 -D oA -29120 +u0189 AE -29120 +u0110 AE -29120 -D AE -29120 +u0189 V -29120 +u0110 V -29120 -D V -29120 +u0189 Y -29120 +u0110 Y -29120 -D Y -29120 +u0189 :Y -29120 +u0110 :Y -29120 -D :Y -29120 +u0189 'Y -29120 +u0110 'Y -29120 -D 'Y -29120 `O X -29120 `O W -29120 @@ -1798,7 +1836,8 @@ fl 562016,757120,0,105602 2 0035 Fi 853216,757120,0,108514 2 0036 Fl 853216,757120,0,105602 2 0037 u2423 524160,463008,101920,34338 1 0040 -! 334880,757120,0,66290 2 0041 +u01C3 334880,757120,0,66290 2 0041 +! " dq 524160,757120,0,56098 2 0042 " " sh 873600,757120,232960,53326 3 0043 @@ -1901,7 +1940,8 @@ y 483392,463008,203840,113594 1 0171 z 455728,463008,0,91754 0 0172 lC 524160,782600,262080,140910 3 0173 { " -ba 291200,782600,262080,71610 3 0174 +u01C0 291200,782600,262080,71610 3 0174 +ba " | " rC 524160,782600,262080,29498 3 0175 } " @@ -1987,7 +2027,9 @@ AE 902720,728000,0,125619 2 0306 'I 291200,892202,0,140179,0,70090 2 0315 ^I 291200,931840,0,140179,0,70090 2 0316 :I 291200,931840,0,140179,0,70090 2 0317 --D 757120,728000,0,79198,0,50078 2 0320 +u0189 757120,728000,0,79198,0,50078 2 0320 +u0110 " +-D " ~N 742560,931840,0,84851,0,13306 2 0321 `O 771680,892202,0,79198,-75542,50078 2 0322 'O 771680,892202,0,79198 2 0323 diff --git a/font/devdvi/HREC b/font/devdvi/HREC index 0e0f7ff4..735f2f1a 100644 --- a/font/devdvi/HREC +++ b/font/devdvi/HREC @@ -84,6 +84,7 @@ ff ` 72800 ff lq 72800 ff rq 72800 ff ? 72800 +ff u01C3 72800 ff ! 72800 ff ) 72800 ff rB 72800 @@ -92,7 +93,9 @@ cq rq 116480 ' rq 116480 cq ? 116480 ' ? 116480 +cq u01C3 116480 cq ! 116480 +' u01C3 116480 ' ! 116480 A y -29120 A :y -29120 @@ -460,7 +463,9 @@ oq lq 116480 ` lq 116480 oq ? 116480 ` ? 116480 +oq u01C3 116480 oq ! 116480 +` u01C3 116480 ` ! 116480 a r -29120 a y -29120 @@ -503,6 +508,7 @@ f ` 72800 f lq 72800 f rq 72800 f ? 72800 +f u01C3 72800 f ! 72800 f ) 72800 f rB 72800 @@ -1394,21 +1400,53 @@ oA :Y -87360 oA 'Y -87360 oA V -116480 oA W -116480 +u0189 X -29120 +u0110 X -29120 -D X -29120 +u0189 W -29120 +u0110 W -29120 -D W -29120 +u0189 A -29120 +u0110 A -29120 -D A -29120 +u0189 u0041_0306 -29120 +u0110 u0041_0306 -29120 -D u0041_0306 -29120 +u0189 u0041_0328 -29120 +u0110 u0041_0328 -29120 -D u0041_0328 -29120 +u0189 `A -29120 +u0110 `A -29120 -D `A -29120 +u0189 'A -29120 +u0110 'A -29120 -D 'A -29120 +u0189 ^A -29120 +u0110 ^A -29120 -D ^A -29120 +u0189 ~A -29120 +u0110 ~A -29120 -D ~A -29120 +u0189 :A -29120 +u0110 :A -29120 -D :A -29120 +u0189 oA -29120 +u0110 oA -29120 -D oA -29120 +u0189 AE -29120 +u0110 AE -29120 -D AE -29120 +u0189 V -29120 +u0110 V -29120 -D V -29120 +u0189 Y -29120 +u0110 Y -29120 -D Y -29120 +u0189 :Y -29120 +u0110 :Y -29120 -D :Y -29120 +u0189 'Y -29120 +u0110 'Y -29120 -D 'Y -29120 `O X -29120 `O W -29120 @@ -1797,7 +1835,8 @@ fl 562016,757120 2 0035 Fi 853216,757120 2 0036 Fl 853216,757120 2 0037 u2423 524160,463008,101920 1 0040 -! 334880,757120 2 0041 +u01C3 334880,757120 2 0041 +! " dq 524160,757120 2 0042 " " sh 873600,757120,232960 3 0043 @@ -1900,7 +1939,8 @@ y 483392,463008,203840,14560 1 0171 z 455728,463008 0 0172 lC 524160,782600,262080 3 0173 { " -ba 291200,782600,262080 3 0174 +u01C0 291200,782600,262080 3 0174 +ba " | " rC 524160,782600,262080 3 0175 } " @@ -1986,7 +2026,9 @@ AE 902720,728000 2 0306 'I 291200,892202,0,78541,0,39270 2 0315 ^I 291200,931840 2 0316 :I 291200,931840 2 0317 --D 757120,728000,0,0,0,-29120 2 0320 +u0189 757120,728000,0,0,0,-29120 2 0320 +u0110 " +-D " ~N 742560,931840 2 0321 `O 771680,892202,0,0,-29120,-29120 2 0322 'O 771680,892202 2 0323 diff --git a/font/devdvi/TBEC b/font/devdvi/TBEC index 9cd57a08..7ee1a699 100644 --- a/font/devdvi/TBEC +++ b/font/devdvi/TBEC @@ -84,6 +84,7 @@ ff ` 114296 ff lq 114296 ff rq 114296 ff ? 114296 +ff u01C3 114296 ff ! 114296 ff ) 114296 ff rB 114296 @@ -92,7 +93,9 @@ cq rq 133952 ' rq 133952 cq ? 133952 ' ? 133952 +cq u01C3 133952 cq ! 133952 +' u01C3 133952 ' ! 133952 A y -100464 A :y -100464 @@ -495,7 +498,9 @@ oq lq 133952 ` lq 133952 oq ? 133952 ` ? 133952 +oq u01C3 133952 oq ! 133952 +` u01C3 133952 ` ! 133952 a v -33488 a j 66976 @@ -542,6 +547,7 @@ f ` 114296 f lq 114296 f rq 114296 f ? 114296 +f u01C3 114296 f ! 114296 f ) 114296 f rB 114296 @@ -1596,21 +1602,53 @@ oA :Y -100464 oA 'Y -100464 oA V -133952 oA W -133952 +u0189 X -33488 +u0110 X -33488 -D X -33488 +u0189 W -33488 +u0110 W -33488 -D W -33488 +u0189 A -33488 +u0110 A -33488 -D A -33488 +u0189 u0041_0306 -33488 +u0110 u0041_0306 -33488 -D u0041_0306 -33488 +u0189 u0041_0328 -33488 +u0110 u0041_0328 -33488 -D u0041_0328 -33488 +u0189 `A -33488 +u0110 `A -33488 -D `A -33488 +u0189 'A -33488 +u0110 'A -33488 -D 'A -33488 +u0189 ^A -33488 +u0110 ^A -33488 -D ^A -33488 +u0189 ~A -33488 +u0110 ~A -33488 -D ~A -33488 +u0189 :A -33488 +u0110 :A -33488 -D :A -33488 +u0189 oA -33488 +u0110 oA -33488 -D oA -33488 +u0189 AE -33488 +u0110 AE -33488 -D AE -33488 +u0189 V -33488 +u0110 V -33488 -D V -33488 +u0189 Y -33488 +u0110 Y -33488 -D Y -33488 +u0189 :Y -33488 +u0110 :Y -33488 -D :Y -33488 +u0189 'Y -33488 +u0110 'Y -33488 -D 'Y -33488 `O X -33488 `O W -33488 @@ -2025,7 +2063,8 @@ fl 669760,723632 2 0035 Fi 1004640,723632 2 0036 Fl 1004640,723632 2 0037 u2423 602784,465920,101920 1 0040 -! 366912,723632 2 0041 +u01C3 366912,723632 2 0041 +! " dq 602784,723632 2 0042 " " sh 1004640,723632,203840 3 0043 @@ -2128,7 +2167,8 @@ y 636272,465920,203840,16744 1 0171 z 535808,465920 0 0172 lC 602784,786240,262080 3 0173 { " -ba 334880,786240,262080 3 0174 +u01C0 334880,786240,262080 3 0174 +ba " | " rC 602784,786240,262080 3 0175 } " @@ -2214,7 +2254,9 @@ AE 1092000,723632 2 0306 'I 457184,918813 2 0315 ^I 457184,937664 2 0316 :I 457184,937664 2 0317 --D 924560,723632,0,0,0,-33488 2 0320 +u0189 924560,723632,0,0,0,-33488 2 0320 +u0110 " +-D " ~N 943488,937664 2 0321 `O 905632,918813,0,0,-33488,-33488 2 0322 'O 905632,918813 2 0323 diff --git a/font/devdvi/TBIEC b/font/devdvi/TBIEC index 164ca58a..0bc0973f 100644 --- a/font/devdvi/TBIEC +++ b/font/devdvi/TBIEC @@ -73,6 +73,7 @@ ff ` 111821 ff lq 111821 ff rq 111821 ff ? 111821 +ff u01C3 111821 ff ! 111821 ff ) 111821 ff rB 111821 @@ -81,7 +82,9 @@ cq rq 123469 ' rq 123469 cq ? 123469 ' ? 123469 +cq u01C3 123469 cq ! 123469 +' u01C3 123469 ' ! 123469 A y -30867 A :y -30867 @@ -534,7 +537,9 @@ oq lq 123469 ` lq 123469 oq ? 123469 ` ? 123469 +oq u01C3 123469 oq ! 123469 +` u01C3 123469 ` ! 123469 b e -61734 b u0065_030C -61734 @@ -654,6 +659,7 @@ f ` 111821 f lq 111821 f rq 111821 f ? 111821 +f u01C3 111821 f ! 111821 f ) 111821 f rB 111821 @@ -1963,21 +1969,53 @@ oA ,c -61734 oA g -61734 oA u0067_0306 -61734 oA q -61734 +u0189 X -30867 +u0110 X -30867 -D X -30867 +u0189 W -30867 +u0110 W -30867 -D W -30867 +u0189 A -30867 +u0110 A -30867 -D A -30867 +u0189 u0041_0306 -30867 +u0110 u0041_0306 -30867 -D u0041_0306 -30867 +u0189 u0041_0328 -30867 +u0110 u0041_0328 -30867 -D u0041_0328 -30867 +u0189 `A -30867 +u0110 `A -30867 -D `A -30867 +u0189 'A -30867 +u0110 'A -30867 -D 'A -30867 +u0189 ^A -30867 +u0110 ^A -30867 -D ^A -30867 +u0189 ~A -30867 +u0110 ~A -30867 -D ~A -30867 +u0189 :A -30867 +u0110 :A -30867 -D :A -30867 +u0189 oA -30867 +u0110 oA -30867 -D oA -30867 +u0189 AE -30867 +u0110 AE -30867 -D AE -30867 +u0189 V -30867 +u0110 V -30867 -D V -30867 +u0189 Y -30867 +u0110 Y -30867 -D Y -30867 +u0189 :Y -30867 +u0110 :Y -30867 -D :Y -30867 +u0189 'Y -30867 +u0110 'Y -30867 -D 'Y -30867 `O X -30867 `O W -30867 @@ -2484,7 +2522,8 @@ fl 737901,723632,203840,113859 3 0035 Fi 1095203,723632,203840,113859 3 0036 Fl 1110637,723632,203840,113859 3 0037 u2423 619674,465920,101920,46446,0,23224 1 0040 -! 404768,723632,0,119755 2 0041 +u01C3 404768,723632,0,119755 2 0041 +! " dq 619674,723632,0,88816 2 0042 " " sh 990080,723632,203840,71637 3 0043 @@ -2587,7 +2626,8 @@ y 588806,465920,203840,110074,-17666,71246 1 0171 z 514259,465920,0,145600,0,98814 0 0172 lC 619674,778232,262080,153754 3 0173 { " -ba 372736,778232,262080,104549 3 0174 +u01C0 372736,778232,262080,104549 3 0174 +ba " | " rC 619674,778232,262080,22714 3 0175 } " @@ -2673,7 +2713,9 @@ AE 1072198,723632,0,119755 2 0306 'I 494458,916128,0,164382,0,82192 2 0315 ^I 494458,937664,0,164382,0,82192 2 0316 :I 494458,937664,0,164382,0,82192 2 0317 --D 917862,723632,0,95003,0,64136 2 0320 +u0189 917862,723632,0,95003,0,64136 2 0320 +u0110 " +-D " ~N 939411,937664,0,180398,0,59333 2 0321 `O 896314,916128,0,95003,-84813,64136 2 0322 'O 896314,916128,0,95003 2 0323 diff --git a/font/devdvi/TIEC b/font/devdvi/TIEC index c1108d46..ccf4bec0 100644 --- a/font/devdvi/TIEC +++ b/font/devdvi/TIEC @@ -73,6 +73,7 @@ ff ` 109346 ff lq 109346 ff rq 109346 ff ? 109346 +ff u01C3 109346 ff ! 109346 ff ) 109346 ff rB 109346 @@ -81,7 +82,9 @@ cq rq 107162 ' rq 107162 cq ? 107162 ' ? 107162 +cq u01C3 107162 cq ! 107162 +' u01C3 107162 ' ! 107162 A y -26790 A :y -26790 @@ -534,7 +537,9 @@ oq lq 107162 ` lq 107162 oq ? 107162 ` ? 107162 +oq u01C3 107162 oq ! 107162 +` u01C3 107162 ` ! 107162 b e -53581 b u0065_030C -53581 @@ -654,6 +659,7 @@ f ` 109346 f lq 109346 f rq 109346 f ? 109346 +f u01C3 109346 f ! 109346 f ) 109346 f rB 109346 @@ -1963,21 +1969,53 @@ oA ,c -53581 oA g -53581 oA u0067_0306 -53581 oA q -53581 +u0189 X -26790 +u0110 X -26790 -D X -26790 +u0189 W -26790 +u0110 W -26790 -D W -26790 +u0189 A -26790 +u0110 A -26790 -D A -26790 +u0189 u0041_0306 -26790 +u0110 u0041_0306 -26790 -D u0041_0306 -26790 +u0189 u0041_0328 -26790 +u0110 u0041_0328 -26790 -D u0041_0328 -26790 +u0189 `A -26790 +u0110 `A -26790 -D `A -26790 +u0189 'A -26790 +u0110 'A -26790 -D 'A -26790 +u0189 ^A -26790 +u0110 ^A -26790 -D ^A -26790 +u0189 ~A -26790 +u0110 ~A -26790 -D ~A -26790 +u0189 :A -26790 +u0110 :A -26790 -D :A -26790 +u0189 oA -26790 +u0110 oA -26790 -D oA -26790 +u0189 AE -26790 +u0110 AE -26790 -D AE -26790 +u0189 V -26790 +u0110 V -26790 -D V -26790 +u0189 Y -26790 +u0110 Y -26790 -D Y -26790 +u0189 :Y -26790 +u0110 :Y -26790 -D :Y -26790 +u0189 'Y -26790 +u0110 'Y -26790 -D 'Y -26790 `O X -26790 `O W -26790 @@ -2484,7 +2522,8 @@ fl 616179,722176,203840,108326 3 0035 Fi 924269,722176,203840,108326 3 0036 Fl 937664,722176,203840,108326 3 0037 u2423 535808,451360,101920,49941,0,24971 1 0040 -! 321485,722176,0,130166 2 0041 +u01C3 321485,722176,0,130166 2 0041 +! " dq 535808,722176,0,90272 2 0042 " " sh 857293,722176,203840,69362 3 0043 @@ -2587,7 +2626,8 @@ y 509018,451360,203840,92747,-32421,55134 1 0171 z 428646,451360,0,128856,0,80419 0 0172 lC 535808,786240,262080,154627 3 0173 { " -ba 321485,786240,262080,110370 3 0174 +u01C0 321485,786240,262080,110370 3 0174 +ba " | " rC 535808,786240,262080,23587 3 0175 } " @@ -2673,7 +2713,9 @@ AE 925434,722176,0,126090 2 0306 'I 404186,896954,0,165693,0,82846 2 0315 ^I 404186,934752,0,165693,0,82846 2 0316 :I 404186,934752,0,165693,0,82846 2 0317 --D 791482,722176,0,98571,0,71781 2 0320 +u0189 791482,722176,0,98571,0,71781 2 0320 +u0110 " +-D " ~N 779251,934752,0,171808,0,59114 2 0321 `O 803712,896954,0,98571,-80517,71781 2 0322 'O 803712,896954,0,98571 2 0323 diff --git a/font/devdvi/TREC b/font/devdvi/TREC index 190d7a98..01a391ea 100644 --- a/font/devdvi/TREC +++ b/font/devdvi/TREC @@ -84,6 +84,7 @@ ff ` 81536 ff lq 81536 ff rq 81536 ff ? 81536 +ff u01C3 81536 ff ! 81536 ff ) 81536 ff rB 81536 @@ -92,7 +93,9 @@ cq rq 116480 ' rq 116480 cq ? 116480 ' ? 116480 +cq u01C3 116480 cq ! 116480 +' u01C3 116480 ' ! 116480 A y -87360 A :y -87360 @@ -495,7 +498,9 @@ oq lq 116480 ` lq 116480 oq ? 116480 ` ? 116480 +oq u01C3 116480 oq ! 116480 +` u01C3 116480 ` ! 116480 a v -29120 a j 58240 @@ -542,6 +547,7 @@ f ` 81536 f lq 81536 f rq 81536 f ? 81536 +f u01C3 81536 f ! 81536 f ) 81536 f rB 81536 @@ -1596,21 +1602,53 @@ oA :Y -87360 oA 'Y -87360 oA V -116480 oA W -116480 +u0189 X -29120 +u0110 X -29120 -D X -29120 +u0189 W -29120 +u0110 W -29120 -D W -29120 +u0189 A -29120 +u0110 A -29120 -D A -29120 +u0189 u0041_0306 -29120 +u0110 u0041_0306 -29120 -D u0041_0306 -29120 +u0189 u0041_0328 -29120 +u0110 u0041_0328 -29120 -D u0041_0328 -29120 +u0189 `A -29120 +u0110 `A -29120 -D `A -29120 +u0189 'A -29120 +u0110 'A -29120 -D 'A -29120 +u0189 ^A -29120 +u0110 ^A -29120 -D ^A -29120 +u0189 ~A -29120 +u0110 ~A -29120 -D ~A -29120 +u0189 :A -29120 +u0110 :A -29120 -D :A -29120 +u0189 oA -29120 +u0110 oA -29120 -D oA -29120 +u0189 AE -29120 +u0110 AE -29120 -D AE -29120 +u0189 V -29120 +u0110 V -29120 -D V -29120 +u0189 Y -29120 +u0110 Y -29120 -D Y -29120 +u0189 :Y -29120 +u0110 :Y -29120 -D :Y -29120 +u0189 'Y -29120 +u0110 'Y -29120 -D 'Y -29120 `O X -29120 `O W -29120 @@ -2025,7 +2063,8 @@ fl 582400,722176 2 0035 Fi 873600,722176 2 0036 Fl 873600,722176 2 0037 u2423 524160,451360,101920 1 0040 -! 291200,722176 2 0041 +u01C3 291200,722176 2 0041 +! " dq 524160,722176 2 0042 " " sh 873600,722176,203840 3 0043 @@ -2128,7 +2167,8 @@ y 553280,451360,203840,14560 1 0171 z 465920,451360 0 0172 lC 524160,786240,262080 3 0173 { " -ba 291200,786240,262080 3 0174 +u01C0 291200,786240,262080 3 0174 +ba " | " rC 524160,786240,262080 3 0175 } " @@ -2214,7 +2254,9 @@ AE 946400,722176 2 0306 'I 378560,897976 2 0315 ^I 378560,934752 2 0316 :I 378560,934752 2 0317 --D 800800,722176,0,0,0,-29120 2 0320 +u0189 800800,722176,0,0,0,-29120 2 0320 +u0110 " +-D " ~N 786240,934752 2 0321 `O 815360,897976,0,0,-29120,-29120 2 0322 'O 815360,897976 2 0323 diff --git a/font/devdvi/generate/ec.map b/font/devdvi/generate/ec.map index 0ff743a7..57e6608b 100644 --- a/font/devdvi/generate/ec.map +++ b/font/devdvi/generate/ec.map @@ -31,7 +31,7 @@ 30 Fi 31 Fl 32 u2423 -33 ! +33 ! u01C3 34 " dq 35 # sh 36 $ Do @@ -122,7 +122,7 @@ 121 y 122 z 123 { lC -124 | ba +124 | ba u01C0 125 } rC 126 ~ 127 hy @@ -206,7 +206,7 @@ 205 'I 206 ^I 207 :I -208 -D +208 -D u0110 u0189 209 ~N 210 `O 211 'O diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub index 9f9b6f09..1e128001 100644 --- a/tmac/Makefile.sub +++ b/tmac/Makefile.sub @@ -18,12 +18,13 @@ NORMALFILES=\ ps.tmac psold.tmac pspic.tmac psatk.tmac \ dvi.tmac \ tty.tmac tty-char.tmac \ - latin1.tmac cp1047.tmac \ + latin1.tmac latin2.tmac latin9.tmac cp1047.tmac \ X.tmac Xps.tmac \ lj4.tmac \ lbp.tmac \ html.tmac \ europs.tmac \ + composite.tmac \ eqnrc \ troffrc troffrc-end \ hyphen.us hyphenex.us diff --git a/tmac/composite.tmac b/tmac/composite.tmac new file mode 100644 index 00000000..b6323a19 --- /dev/null +++ b/tmac/composite.tmac @@ -0,0 +1,24 @@ +.\" composite.tmac +. +.composite ga u0300 +.composite ` u0300 +.composite aa u0301 +.composite ' u0301 +.composite a^ u0302 +.composite ^ u0302 +.composite a~ u0303 +.composite ~ u0303 +.composite a- u0304 +.composite - u0304 +.composite ab u0306 +.composite a. u0307 +.composite . u0307 +.composite ad u0308 +.composite ao u030A +.composite a" u030B +.composite " u030B +.composite ah u030C +.composite ac u0327 +.composite ho u0328 +. +.\" EOF diff --git a/tmac/latin1.tmac b/tmac/latin1.tmac index e7f043af..9c3d3722 100644 --- a/tmac/latin1.tmac +++ b/tmac/latin1.tmac @@ -3,9 +3,11 @@ .nr _C \n(.C .cp 0 .de latin1-tr +. trin \\$1\\$1 . if c\\$2 .if !c\\$1 .trin \\$1\\$2 .. . +.\" 0xA1 .latin1-tr \[char161] \[r!] .latin1-tr \[char162] \[ct] .latin1-tr \[char163] \[Po] @@ -22,6 +24,7 @@ .tr \[char173]\% .latin1-tr \[char174] \[rg] .latin1-tr \[char175] \[a-] +.\" 0xB0 .latin1-tr \[char176] \[de] .latin1-tr \[char177] \[t+-] .latin1-tr \[char178] \[S2] @@ -38,6 +41,7 @@ .latin1-tr \[char189] \[12] .latin1-tr \[char190] \[34] .latin1-tr \[char191] \[r?] +.\" 0xC0 .latin1-tr \[char192] \[`A] .latin1-tr \[char193] \['A] .latin1-tr \[char194] \[^A] @@ -54,6 +58,7 @@ .latin1-tr \[char205] \['I] .latin1-tr \[char206] \[^I] .latin1-tr \[char207] \[:I] +.\" 0xD0 .latin1-tr \[char208] \[-D] .latin1-tr \[char209] \[~N] .latin1-tr \[char210] \[`O] @@ -70,6 +75,7 @@ .latin1-tr \[char221] \['Y] .latin1-tr \[char222] \[TP] .latin1-tr \[char223] \[ss] +.\" 0xE0 .latin1-tr \[char224] \[`a] .latin1-tr \[char225] \['a] .latin1-tr \[char226] \[^a] @@ -86,6 +92,7 @@ .latin1-tr \[char237] \['i] .latin1-tr \[char238] \[^i] .latin1-tr \[char239] \[:i] +.\" 0xF0 .latin1-tr \[char240] \[Sd] .latin1-tr \[char241] \[~n] .latin1-tr \[char242] \[`o] diff --git a/tmac/latin2.tmac b/tmac/latin2.tmac new file mode 100644 index 00000000..797d9b37 --- /dev/null +++ b/tmac/latin2.tmac @@ -0,0 +1,111 @@ +.\" latin2.tmac +.\" +.nr _C \n(.C +.cp 0 +.de latin2-tr +. trin \\$1\\$1 +. if c\\$2 .if !c\\$1 .trin \\$1\\$2 +.. +.\" 0xA1 +.latin2-tr \[char161] "\[A ho]" +.latin2-tr \[char162] \[ab] +.latin2-tr \[char163] \[/L] +.latin2-tr \[char164] \[Cs] +.latin2-tr \[char165] "\[L ah]" +.latin2-tr \[char166] "\[S aa]" +.latin2-tr \[char167] \[sc] +.latin2-tr \[char168] \[ad] +.latin2-tr \[char169] \[vS] +.latin2-tr \[char170] "\[S ac]" +.latin2-tr \[char171] "\[T ah]" +.latin2-tr \[char172] "\[Z aa]" +.\" The soft-hyphen character is only an input character +.tr \[char173]\% +.latin2-tr \[char174] \[vZ] +.latin2-tr \[char175] "\[Z a.]" +.\" 0xB0 +.latin2-tr \[char176] \[de] +.latin2-tr \[char177] "\[a ho]" +.latin2-tr \[char178] \[ho] +.latin2-tr \[char179] \[/l] +.latin2-tr \[char180] \[aa] +.latin2-tr \[char181] "\[l ah]" +.latin2-tr \[char182] "\[s aa]" +.latin2-tr \[char183] \[ah] +.latin2-tr \[char184] \[ac] +.latin2-tr \[char185] \[vs] +.latin2-tr \[char186] "\[s ac]" +.latin2-tr \[char187] "\[t ah]" +.latin2-tr \[char188] "\[z aa]" +.latin2-tr \[char189] \[a"] +.latin2-tr \[char190] \[vz] +.latin2-tr \[char191] "\[z a.]" +.\" C0 +.latin2-tr \[char192] "\[R aa]" +.latin2-tr \[char193] \['A] +.latin2-tr \[char194] \[^A] +.latin2-tr \[char195] "\[A ab]" +.latin2-tr \[char196] \[:A] +.latin2-tr \[char197] "\[L aa]" +.latin2-tr \[char198] "\[C aa]" +.latin2-tr \[char199] \[,C] +.latin2-tr \[char200] "\[C ah]" +.latin2-tr \[char201] \['E] +.latin2-tr \[char202] "\[E ho]" +.latin2-tr \[char203] \[:E] +.latin2-tr \[char204] "\[E ah]" +.latin2-tr \[char205] \['I] +.latin2-tr \[char206] \[^I] +.latin2-tr \[char207] "\[D ah]" +.\" 0xD0 +.latin2-tr \[char208] \[u0110] +.latin2-tr \[char209] "\[N aa]" +.latin2-tr \[char210] "\[N ah]" +.latin2-tr \[char211] \['O] +.latin2-tr \[char212] \[^O] +.latin2-tr \[char213] "\[O a""]" +.latin2-tr \[char214] \[:O] +.latin2-tr \[char215] \[tmu] +.latin2-tr \[char216] "\[R ah]" +.latin2-tr \[char217] "\[U ao]" +.latin2-tr \[char218] \['U] +.latin2-tr \[char219] "\[U a""]" +.latin2-tr \[char220] \[:U] +.latin2-tr \[char221] \['Y] +.latin2-tr \[char222] "\[T ac]" +.latin2-tr \[char223] \[ss] +.\" 0xE0 +.latin2-tr \[char224] "\[r aa]" +.latin2-tr \[char225] \['a] +.latin2-tr \[char226] \[^a] +.latin2-tr \[char227] "\[a ab]" +.latin2-tr \[char228] \[:a] +.latin2-tr \[char229] "\[l aa]" +.latin2-tr \[char230] "\[c aa]" +.latin2-tr \[char231] \[,c] +.latin2-tr \[char232] "\[c ah]" +.latin2-tr \[char233] \['e] +.latin2-tr \[char234] "\[e ho]" +.latin2-tr \[char235] \[:e] +.latin2-tr \[char236] "\[e ah]" +.latin2-tr \[char237] \['i] +.latin2-tr \[char238] \[^i] +.latin2-tr \[char239] "\[d ah]" +.\" 0xF0 +.latin2-tr \[char240] \[u0111] +.latin2-tr \[char241] "\[n aa]" +.latin2-tr \[char242] "\[n ah]" +.latin2-tr \[char243] \['o] +.latin2-tr \[char244] \[^o] +.latin2-tr \[char245] "\[o a""]" +.latin2-tr \[char246] \[:o] +.latin2-tr \[char247] \[tdi] +.latin2-tr \[char248] "\[r ah]" +.latin2-tr \[char249] "\[u ao]" +.latin2-tr \[char250] \['u] +.latin2-tr \[char251] "\[u a""]" +.latin2-tr \[char252] \[:u] +.latin2-tr \[char253] \['y] +.latin2-tr \[char254] "\[t ac]" +.latin2-tr \[char255] \[a.] +.cp \n[_C] diff --git a/tmac/latin9.tmac b/tmac/latin9.tmac new file mode 100644 index 00000000..22f0f322 --- /dev/null +++ b/tmac/latin9.tmac @@ -0,0 +1,112 @@ +.\" latin9.tmac +.\" +.nr _C \n(.C +.cp 0 +.de latin9-tr +. trin \\$1\\$1 +. if c\\$2 .if !c\\$1 .trin \\$1\\$2 +.. +. +.\" 0xA1 +.latin9-tr \[char161] \[r!] +.latin9-tr \[char162] \[ct] +.latin9-tr \[char163] \[Po] +.latin9-tr \[char164] \[Eu] +.latin9-tr \[char165] \[Ye] +.latin9-tr \[char166] \[vS] +.latin9-tr \[char167] \[sc] +.latin9-tr \[char168] \[vs] +.latin9-tr \[char169] \[co] +.latin9-tr \[char170] \[Of] +.latin9-tr \[char171] \[Fo] +.latin9-tr \[char172] \[tno] +.\" The soft-hyphen character is only an input character +.tr \[char173]\% +.latin9-tr \[char174] \[rg] +.latin9-tr \[char175] \[a-] +.\" 0xB0 +.latin9-tr \[char176] \[de] +.latin9-tr \[char177] \[t+-] +.latin9-tr \[char178] \[S2] +.latin9-tr \[char179] \[S3] +.latin9-tr \[char180] \[vZ] +.latin9-tr \[char181] \[mc] +.latin9-tr \[char182] \[ps] +.latin9-tr \[char183] \[pc] +.latin9-tr \[char184] \[vz] +.latin9-tr \[char185] \[S1] +.latin9-tr \[char186] \[Om] +.latin9-tr \[char187] \[Fc] +.latin9-tr \[char188] \[OE] +.latin9-tr \[char189] \[oe] +.latin9-tr \[char190] \[:Y] +.latin9-tr \[char191] \[r?] +.\" 0xC0 +.latin9-tr \[char192] \[`A] +.latin9-tr \[char193] \['A] +.latin9-tr \[char194] \[^A] +.latin9-tr \[char195] \[~A] +.latin9-tr \[char196] \[:A] +.latin9-tr \[char197] \[oA] +.latin9-tr \[char198] \[AE] +.latin9-tr \[char199] \[,C] +.latin9-tr \[char200] \[`E] +.latin9-tr \[char201] \['E] +.latin9-tr \[char202] \[^E] +.latin9-tr \[char203] \[:E] +.latin9-tr \[char204] \[`I] +.latin9-tr \[char205] \['I] +.latin9-tr \[char206] \[^I] +.latin9-tr \[char207] \[:I] +.\" 0xD0 +.latin9-tr \[char208] \[-D] +.latin9-tr \[char209] \[~N] +.latin9-tr \[char210] \[`O] +.latin9-tr \[char211] \['O] +.latin9-tr \[char212] \[^O] +.latin9-tr \[char213] \[~O] +.latin9-tr \[char214] \[:O] +.latin9-tr \[char215] \[tmu] +.latin9-tr \[char216] \[/O] +.latin9-tr \[char217] \[`U] +.latin9-tr \[char218] \['U] +.latin9-tr \[char219] \[^U] +.latin9-tr \[char220] \[:U] +.latin9-tr \[char221] \['Y] +.latin9-tr \[char222] \[TP] +.latin9-tr \[char223] \[ss] +.\" 0xE0 +.latin9-tr \[char224] \[`a] +.latin9-tr \[char225] \['a] +.latin9-tr \[char226] \[^a] +.latin9-tr \[char227] \[~a] +.latin9-tr \[char228] \[:a] +.latin9-tr \[char229] \[oa] +.latin9-tr \[char230] \[ae] +.latin9-tr \[char231] \[,c] +.latin9-tr \[char232] \[`e] +.latin9-tr \[char233] \['e] +.latin9-tr \[char234] \[^e] +.latin9-tr \[char235] \[:e] +.latin9-tr \[char236] \[`i] +.latin9-tr \[char237] \['i] +.latin9-tr \[char238] \[^i] +.latin9-tr \[char239] \[:i] +.\" 0xF0 +.latin9-tr \[char240] \[Sd] +.latin9-tr \[char241] \[~n] +.latin9-tr \[char242] \[`o] +.latin9-tr \[char243] \['o] +.latin9-tr \[char244] \[^o] +.latin9-tr \[char245] \[~o] +.latin9-tr \[char246] \[:o] +.latin9-tr \[char247] \[tdi] +.latin9-tr \[char248] \[/o] +.latin9-tr \[char249] \[`u] +.latin9-tr \[char250] \['u] +.latin9-tr \[char251] \[^u] +.latin9-tr \[char252] \[:u] +.latin9-tr \[char253] \['y] +.latin9-tr \[char254] \[Tp] +.latin9-tr \[char255] \[:y] +.cp \n[_C] diff --git a/tmac/troffrc b/tmac/troffrc index 45e4df12..e45be3d1 100644 --- a/tmac/troffrc +++ b/tmac/troffrc @@ -37,4 +37,7 @@ troffrc!X100 troffrc!X100-12 troffrc!lj4 troff!lbp troffrc!html .do hpf hyphen.us .do hpfa hyphenex.us . +.\" Load composite mappings. +.do mso composite.tmac +. .\" Don't let blank lines creep in here. -- 2.11.4.GIT