From ef74f4c8971ee4f04aab12a859806c9d03f8f394 Mon Sep 17 00:00:00 2001 From: Werner LEMBERG Date: Mon, 25 Feb 2002 14:53:40 +0000 Subject: [PATCH] * man/groff_char.man: Added some missing PS glyph names (from the Adobe Glyph List). * font/devps/generate/textmap, font/devps/symbolmap: Add `arrowupdn'. * doc/groff.texinfo: Minor additions and fixes. * man/groff_diff.man: Remove documentation of fp request. This is already covered in the original troff manual. Updated to be consistent with other doc files. * NEWS: Updated. --- ChangeLog | 13 +++++ NEWS | 14 +++-- doc/groff.texinfo | 11 ++-- font/devps/generate/textmap | 1 + font/devps/symbolmap | 1 + man/groff_char.man | 118 ++++++++++++++++++++++++++--------------- man/groff_diff.man | 126 ++++++++++++++++++++++---------------------- 7 files changed, 172 insertions(+), 112 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3766b024..f0e01eab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2002-02-25 Werner LEMBERG + + * man/groff_char.man: Added some missing PS glyph names (from the + Adobe Glyph List). + * font/devps/generate/textmap, font/devps/symbolmap: Add + `arrowupdn'. + + * doc/groff.texinfo: Minor additions and fixes. + * man/groff_diff.man: Remove documentation of fp request. This + is already covered in the original troff manual. + Updated to be consistent with other doc files. + * NEWS: Updated. + 2002-02-24 Werner LEMBERG * aclocal.m4 (GROFF_EBCDIC): Don't include `font/devutf8' in diff --git a/NEWS b/NEWS index a73e3fc7..f91694b1 100644 --- a/NEWS +++ b/NEWS @@ -19,11 +19,17 @@ o Color support has been added to troff and pic (and to the device drivers `\m' sets the drawing color, the escape sequence `\M' specifies the background color for closed objects created with \D'...' commands. Similar to fonts, `\mP' and `\MP' switch back to the previous color. `\m' - and `\M' correspond to the new troff output commands `m' and `DF'. The - device-specific default color is called `default' and can't be redefined. + and `\M' correspond to the new troff output command sets starting with `m' + and `DF'. The device-specific default color is called `default' and can't + be redefined. + + The old `Df' output command is mapped onto `DFg'; all color output + commands don't change the current font position (consequently, `Df' + doesn't either). Outputting color can be disabled in troff and groff with the option -c - (it is always disabled in compatibility mode). + (it is always disabled in compatibility mode). See the section on grotty + for the GROFF_NO_SGR environment variable also. For defining color components as fractions between 0 and 1, a new scaling indicator `f' has been introduced: 1f = 65536u. For testing whether a @@ -108,7 +114,7 @@ o Changes in www.tmac: that both macro names and macro syntax will change. Some of the macros mentioned below aren't really new but haven't been documented properly before. - + The following macros have been renamed: MAILTO -> MTO diff --git a/doc/groff.texinfo b/doc/groff.texinfo index a54743d3..7daf3b37 100644 --- a/doc/groff.texinfo +++ b/doc/groff.texinfo @@ -6713,6 +6713,10 @@ moment immediately before the character is appended to an output character list, either by direct output, in a macro, diversion, or string), it is no longer affected by @code{tr}. +@item +Translating undefined characters is possible also; @code{tr} does not +check whether the characters in its argument are defined. + @c XXX xref @item @@ -7322,9 +7326,10 @@ different font family on the command line (@pxref{Groff Options}). @DefreqList {fam, [@Var{family}]} @DefregListEnd {.fam} Switch font family to @var{family}. If no argument is given, switch -back to the previous font family. The current font family is available -in the read-only number register @samp{.fam} (this is a string-valued -register); it is associated with the current environment. +back to the previous font family. The value at start-up is @samp{T}. +The current font family is available in the read-only number register +@samp{.fam} (this is a string-valued register); it is associated with +the current environment. @Example spam, diff --git a/font/devps/generate/textmap b/font/devps/generate/textmap index 78451ac2..139f4be5 100644 --- a/font/devps/generate/textmap +++ b/font/devps/generate/textmap @@ -113,6 +113,7 @@ arrowdown da arrowleft <- arrowright -> arrowup ua +arrowupdn va asciicircum ha asciitilde ti asterisk * diff --git a/font/devps/symbolmap b/font/devps/symbolmap index 1eed596d..6e5f5216 100644 --- a/font/devps/symbolmap +++ b/font/devps/symbolmap @@ -113,6 +113,7 @@ arrowdown da arrowleft <- arrowright -> arrowup ua +arrowupdn va asciicircum ha asciitilde ti asterisk * diff --git a/man/groff_char.man b/man/groff_char.man index 2ce693d3..4f8dbcc9 100644 --- a/man/groff_char.man +++ b/man/groff_char.man @@ -16,30 +16,48 @@ versions, except that this permission notice may be included in translations approved by the Free Software Foundation instead of in the original English. .. +. .\" For best results, print this with groff. +. .ds aq \(aq -.ie !\n(.g .if '\(aq'' .ds aq \' +.ie !\n(.g \ +. if '\(aq'' .ds aq \' .el \{\ -. tr \(aq\(aq -. if !c\(aq .ds aq \' +. tr \[aq]\[aq] +. if !c\[aq] .ds aq \' +. \" This is very special. The standard devdvi fonts don't have a +. \" real `aq' glyph; it is defined with .char to be ' instead. The +. \" tr request below in the definition of the C macro maps ' onto +. \" the `aq' glyph which would cause a recursive loop. gtroff +. \" prevents this within the char request, trying to access glyph +. \" `aq' directly from the font. Consequently, we get a warning, +. \" and nothing is printed. +. \" +. \" The following line prevents this. +. if '\*[.T]'dvi' .if '\n[.fam]'T' .ds aq \' .\} +. .if !\n(.g .ig .\" .Ac accented-char accent char .de Ac -.char \\$1 \\$3\ +. char \\$1 \\$3\ \k[acc]\ \h'(u;-\w'\\$2'-\w'\\$3'/2+\\\\n[skw]+(\w'x'*0)-\\\\n[skw])'\ \v'(u;\w'x'*0+\\\\n[rst]+(\w'\\$3'*0)-\\\\n[rst])'\ \\$2\ \v'(u;\w'x'*0-\\\\n[rst]+(\w'\\$3'*0)+\\\\n[rst])'\ \h'|\\\\n[acc]u' -.hcode \\$1\\$3 +. hcode \\$1\\$3 .. +. .Ac \(vc \(ah c .Ac \(vC \(ah C +. .TH GROFF_CHAR @MAN7EXT@ "@MDATE@" "Groff Version @VERSION@" .SH NAME groff_char \- groff character names +. +. .SH DESCRIPTION This manual page lists the standard .B groff @@ -80,71 +98,83 @@ a larger glyph can be obtained with .BR \e(ha . .sp 'nf +. .nr Sp 3n .ta \w'\fIOutput'u+\n(Spu +\w'\fIInput'u+\n(Spu +\w'\fIInput'u+\n(Spu \ +\w'periodcentered'u+\n(Spu +. .de C0 -.C \\$1 "" \\$1 \\$2 "\\$3" +. C \\$1 "" \\$1 \\$2 "\\$3" .. +. .de C1 -.C \e\\$1 "" \\\\\\$1 \\$2 "\\$3" +. C \e\\$1 "" \\\\\\$1 \\$2 "\\$3" .. +. .de C2 -.C \e(\\$1 "" \\(\\$1 \\$2 "\\$3" +. C \e(\\$1 "" \\(\\$1 \\$2 "\\$3" .. +. .if !\n(.g .ig .de CD -.C \[char\\$1] \\$1 \[char\\$1] \\$2 "\\$3" +. C \[char\\$1] \\$1 \[char\\$1] \\$2 "\\$3" .. +. .do fspecial CR R +. .\" input-name decimal-code output-name ps-name description .if !\n(.g .ig .de C -.if c\\$3 \{\ -.ft CR -.tr `\`'\*(aq -.in 0 -.di CH -\&\\$1 -.br -.di -.in -.ft -.ds CH \\*(CH\ -.tr ``'' -\&\\$3\t\\*(CH\t\\$2\t\\$4\t\\$5 -.\} +. if c\\$3 \{\ +. ft CR +. tr `\`'\*[aq] +. in 0 +. di CH +. nop \&\\$1 +. br +. di +. in +. ft +. ds CH \\*[CH]\ +. tr ``'' +. nop \&\\$3\t\\*[CH]\t\\$2\t\\$4\t\\$5 +. \} .. +. .if \n(.g .ig .de C -.if !'\\$3'' \{\ -.ft B -.tr `\`'\*(aq -.in 0 -.di CH +. if !'\\$3'' \{\ +. ft B +. tr `\`'\*(aq +. in 0 +. di CH \&\\$1 -.br -.di -.in -.ft -.ds CH \\*(CH\ -.tr ``'' +. br +. di +. in +. ft +. ds CH \\*(CH\ +. tr ``'' \&\\$3\t\\*(CH\t\\$2\t\\$4\t\\$5 -.\} +. \} .. +. .if !\n[cR] .wh \n(nlu+\n(.tu-\n(.Vu Fo +. .de Fo -'bp -.He +' bp +. He .. +. .de He -.ft I +. ft I Output Input Input PostScript Notes name code name -.ft -.LP -'nf +. ft +. LP +' nf .. +. .He .CD 33 exclam .CD 34 quotedbl @@ -380,7 +410,7 @@ Output Input Input PostScript Notes .C2 fl fl "fl ligature" .C2 Fi ffi "ffi ligature" .C2 Fl ffl "ffl ligature" -.C2 OK \& "check mark, tick" +.C2 OK a19 "check mark, tick" .C2 Of ordfeminine .C2 Om ordmasculine .C2 pc periodcentered @@ -392,7 +422,7 @@ Output Input Input PostScript Notes .C2 <> arrowboth "horizontal double-headed arrow" .C2 da arrowdown .C2 ua arrowup -.C2 va \& "vertical double-headed arrow" +.C2 va arrowupdn "vertical double-headed arrow" .C2 lA arrowdblleft .C2 rA arrowdblright .C2 hA arrowdblboth "horizontal double-headed double arrow" @@ -568,6 +598,8 @@ Output Input Input PostScript Notes .C2 eu \& "official Euro symbol" .C2 Eu Euro "font-specific Euro glyph variant" .ch Fo +. +. .SH "SEE ALSO" .BR groff (@MAN1EXT@) .br diff --git a/man/groff_diff.man b/man/groff_diff.man index 36b04f78..abf0d768 100644 --- a/man/groff_diff.man +++ b/man/groff_diff.man @@ -302,7 +302,7 @@ Spaces are permitted in a number expression within parentheses. indicates a scale of 100ths of an em. .B f indicates a scale of 65536 units, providing fractions for color -definitions with +definitions with the .B defcolor request. . @@ -774,7 +774,7 @@ This causes the insertion of a zero-width break point. . It is equal to .B \[rs]% -but without insertion of a soft hyphen character. +within a word but without insertion of a soft hyphen character. . .TP .B \[rs]# @@ -1005,12 +1005,12 @@ hyphenation codes. .IP 8 The character overlaps horizontally (initially characters .B \[rs](ul\[rs](rn\[rs](ru -have this property); +have this property). . .IP 16 The character overlaps vertically (initially character .B \[rs](br -has this property); +has this property). . .IP 32 An end-of-sentence character followed by any number of characters with @@ -1292,6 +1292,8 @@ If .I xx is missing, switch back to previous font family. . +The value at start-up is `T'. +. See the description of the .B sty request for more information on font families. @@ -1376,7 +1378,7 @@ character) other than a digit or a space. . Initially each lower-case letter has a hyphenation code, which is itself, and each upper-case letter has a hyphenation code which is the -lower case version of itself. +lower-case version of itself. . See also the .B hpf @@ -1794,7 +1796,9 @@ The default family can be set with the .B \-f option. . -The styles command in the +The +.B styles +command in the .SM DESC file controls which font positions (if any) are initially associated with styles rather than fonts. @@ -2093,24 +2097,6 @@ There is no limit on the number of named environments; they will be created the first time that they are referenced. . .TP -.BI .fp\ n\ f1\ f2 -The -.B fp -request has an optional third argument. -. -This argument gives the external name of the font, which is used for -finding the font description file. -. -The second argument gives the internal name of the font which is used -to refer to the font in troff after it has been mounted. -. -If there is no third argument then the internal name will be used as -the external name. -. -This feature allows you to use fonts with long names in compatibility -mode. -. -.TP .BI .ss\ m\ n When two arguments are given to the .B ss @@ -2575,6 +2561,18 @@ escape sequence, a character that appears at a different input level to the starting delimiter character will not be recognised as the closing delimiter character. . +The same is true for +.BR \[rs]A , +.BR \[rs]b , +.BR \[rs]B , +.BR \[rs]C , +.BR \[rs]l , +.BR \[rs]L , +.BR \[rs]o , +.BR \[rs]X , +and +.BR \[rs]Z . +. When decoding a macro argument that is delimited by double quotes, a character that appears at a different input level to the starting delimiter character will not be recognised as the closing delimiter @@ -2591,6 +2589,7 @@ In a long escape name will not be recognized as a closing delimiter except when it occurs at the same input level as the opening .BR ] . +. In compatibility mode, no attention is paid to the input-level. . .P @@ -2674,7 +2673,6 @@ Only the differences are documented here. .SS "Units" .\" -------------------------------------------------------------------- . -.P The argument to the .B s command is in scaled points (units of @@ -2694,6 +2692,12 @@ command is also in scaled points. .SS "Text Commands" .\" -------------------------------------------------------------------- . +.TP +.BI N n +Print character with index\~\c +.I n +(a non-negative integer) of the current font. +. .P If the .B tcommand @@ -2739,32 +2743,25 @@ Unlike device-independent troff, it is not necessary for drivers to search special fonts to find a character. . .P -For color support, a new command has been added: +For color support, some new commands have been added: . .TP -.Text \f[B]m \f[I]r g b\f[R] +.Text \f[B]mc \f[I]cyan magenta yellow\f[R] .TQ -.Text \f[B]m #\f[I]rrggbb\f[R] +.Text \f[B]md\f[R] .TQ -.Text \f[B]m ##\f[I]rrrrggggbbbb\f[R] -Set the red, green, and blue components of the current drawing color to -.IR r , -.IR g , -and -.I b -(to be specified as fractions in the range 0 to 1), or -.IR rr , -.IR gg , -and -.I bb -(to be specified as hexadecimal values in the range 0 to 0xff), or -.IR rrrr , -.IR gggg , -and -.I bbbb -(to be specified as hexadecimal values in the range 0 to 0xffff). -.B troff -emits only the latest form. +.Text \f[B]mg \f[I]gray\f[R] +.TQ +.Text \f[B]mk \f[I]cyan magenta yellow black\f[R] +.TQ +.Text \f[B]mr \f[I]red green blue\f[R] +Set the color components of the current drawing color, using various +color schemes. +. +.B md +resets the drawing color to the default value. +. +The arguments are integers in the range 0 to 65536. . .P The @@ -2840,8 +2837,7 @@ delim $$ .EN . .TP -.Text \f[B]Dp\f[R] $dx sub 1$ $dy sub 1$ $dx sub 2$ $dy sub 2$ $...$ \c -.Text $dx sub n$ $dy sub n$\[rs]n +.Text \f[B]Dp\f[R] $dx sub 1$ $dy sub 1$ $dx sub 2$ $dy sub 2$ $...$ $dx sub n$ $dy sub n$\[rs]n Draw a polygon with, for $i = 1 ,..., n+1$, the .IR i -th vertex at the current position @@ -2852,8 +2848,7 @@ At the moment, GNU pic only uses this command to generate triangles and rectangles. . .TP -.Text \f[B]DP\f[R] $dx sub 1$ $dy sub 1$ $dx sub 2$ $dy sub 2$ $...$ \c -.Text $dx sub n$ $dy sub n$\[rs]n +.Text \f[B]DP\f[R] $dx sub 1$ $dy sub 1$ $dx sub 2$ $dy sub 2$ $...$ $dx sub n$ $dy sub n$\[rs]n . Like .B Dp @@ -2885,8 +2880,7 @@ does not depend on this. . Given a drawing command of the form .IP -\f[B]\[rs]D\[fm]\f[I]c\f[R] $x sub 1$ $y sub 1$ $x sub 2$ $y sub 2$ $...$ \ -$x sub n$ $y sub n$\[fm] +\f[B]\[rs]D\[fm]\f[I]c\f[R] $x sub 1$ $y sub 1$ $x sub 2$ $y sub 2$ $...$ $x sub n$ $y sub n$\[fm] . .P where @@ -2916,7 +2910,6 @@ exception of .BR De . For the sake of compatibility GNU troff also follows this rule, even though it produces an ugly result in the case of the -.BR Df , .BR Dt , and, to a lesser extent, .B DE @@ -2935,17 +2928,28 @@ the current position should be increased by $( sum from i=1 to n x sub i , sum from i=1 to n y sub i )$. . .P -Another extension is +Another set of extensions is . .TP -.Text \f[B]DF \f[I]r g b\f[R]\*[ic]\[rs]n +.Text \f[B]DFc \f[I]cyan magenta yellow\f[R]\*[ic]\[rs]n +.TQ +.Text \f[B]DFd\f[R]\*[ic]\[rs]n .TQ -.Text \f[B]DF #\f[I]rrggbb\f[R]\*[ic]\[rs]n +.Text \f[B]DFg \f[I]gray\f[R]\*[ic]\[rs]n .TQ -.Text \f[B]DF ##\f[I]rrrrggggbbbb\f[R]\*[ic]\[rs]n -Set the RGB components of the filling color similar to the +.Text \f[B]DFk \f[I]cyan magenta yellow black\f[R]\*[ic]\[rs]n +.TQ +.Text \f[B]DFr \f[I]red green blue\f[R]\*[ic]\[rs]n +Set the color components of the filling color similar to the .B m -command above. +commands above. +. +.P +Note that +.B Df +is now mapped onto +.BR DFg . +The current position isn't changed by those colour commands. . . .\" -------------------------------------------------------------------- @@ -3001,7 +3005,6 @@ for groff. .SS "Groff Language" .\" -------------------------------------------------------------------- . -.P .I groff provides a .B compatibility mode @@ -3275,7 +3278,6 @@ command line options and warnings are still documented in .SH "SEE ALSO" .\" -------------------------------------------------------------------- . -.P The .I groff info .IR file , -- 2.11.4.GIT