keithmarshall pushed a commit to branch dev-gropdf-boxes in repository groff.
commit 48e1b7c0b372bcb88caf84046c25db67ed13eceb Author: G. Branden Robinson <g.branden.robin...@gmail.com> AuthorDate: Tue Apr 13 19:14:31 2021 +1000 groff(7), groff_diff(7): Resync with Texinfo. Also drop an example. --- man/groff.7.man | 24 ++++++++------- man/groff_diff.7.man | 83 ++++++++++++++++++---------------------------------- 2 files changed, 43 insertions(+), 64 deletions(-) diff --git a/man/groff.7.man b/man/groff.7.man index 0a826c4..7ba98aa 100644 --- a/man/groff.7.man +++ b/man/groff.7.man @@ -4896,10 +4896,13 @@ The current year minus 1900. .SH Hyphenation .\" ==================================================================== . -Explicitly hyphenated words such as \[lq]mother-in-law\[rq] are eligible -for breaking after each of their hyphens when +When filling, .I groff -fills lines. +hyphenates words as needed at user-specified and automatically +determined hyphenation points. +. +Explicitly hyphenated words such as \[lq]mother-in-law\[rq] are eligible +for breaking after each of their hyphens. . The hyphenation .RB character\~ \[rs]% @@ -4922,7 +4925,7 @@ determines hyphenation points automatically by default. Several requests influence automatic hyphenation. . Because conventions vary, -a variety of hyphenation modes are available to the +a variety of hyphenation modes is available to the .B .hy request; these determine whether hyphenation will apply to a word prior to @@ -4966,16 +4969,16 @@ and then apply or lift restrictions relative to that basis. disables hyphenation of the last word on a page. . (Technically, -this value prevents hyphenation if the next page position trap is closer -than the next line of text would be. +hyphenation is prevented if the next page position trap is closer than +the next line of text would be. . .I groff automatically inserts an implicit page position trap at the end of each page to cause a page transition. . -This value can be used in traps planted by users or macro packages to -prevent hyphenation of the last word in a column in multi-column page -layouts or before floating figures or tables. +Users or macro packages can set such traps explicitly to prevent +hyphenation of the last word in a column in multi-column page layouts or +before floating figures or tables. . See section \[lq]Traps\[rq] below.) . @@ -5001,7 +5004,8 @@ enables hyphenation after the first character of a word. . . .P -Note that any restrictions imposed by the hyphenation mode are +Apart from value\~2, +restrictions imposed by the hyphenation mode are .I not respected for words whose hyphenations have been explicitly specified with the hyphenation character diff --git a/man/groff_diff.7.man b/man/groff_diff.7.man index 1a56f78..1184adf 100644 --- a/man/groff_diff.7.man +++ b/man/groff_diff.7.man @@ -2068,9 +2068,9 @@ hyphenation codes must be set up. At start-up, .I groff assigns hyphenation codes to the letters \[lq]a\[en]z\[rq] -(mapped to themselves) -and to the letters \[lq]A\[en]Z\[rq] -(mapped to \[lq]a\[en]z\[rq]) +(mapped to themselves), +to the letters \[lq]A\[en]Z\[rq] +(mapped to \[lq]a\[en]z\[rq]), and zero to all other characters. . Normally, @@ -2089,42 +2089,6 @@ without it, words containing such letters won't be hyphenated properly even if the corresponding hyphenation patterns contain them. . -For example, -the following -.B .hcode -requests are necessary to assign hyphenation codes to the letters -\[lq]\[:A]\[:a]\[:O]\[:o]\[:U]\[:u]\[ss]\[rq] -(needed for German): -. -. -.RS -.IP -.EX -\&.hcode \[:a] \[:a] \[:A] \[:a] -\&.hcode \[:o] \[:o] \[:O] \[:o] -\&.hcode \[:u] \[:u] \[:U] \[:u] -\&.hcode \[ss] \[ss] -.EE -.RE -. -. -.IP -Without those assignments, -.I groff -treats German words like \[lq]Kinderg\[:a]rten\[rq] -(the plural form of \[lq]kindergarten\[rq]) -as two substrings \[lq]kinderg\[rq] and \[lq]rten\[rq]) because the -hyphenation code of the umlaut\~a is zero by default. -. -There is a German hyphenation pattern that covers \[lq]kinder\[rq], -so -.I groff -finds the hyphenation \[lq]kin-der\[rq]. -. -The other two hyphenation points -(\[lq]kin-der-gär-ten\[rq]) -are missed. -. . .TP .BI .hla\~ lang @@ -2152,7 +2116,7 @@ sets the default language to \[lq]us\[rq] . . .IP -The hyphenation language is associated with the current environment. +The hyphenation language is associated with the environment. . . .TP @@ -2170,14 +2134,15 @@ If omitted, .I n is\~\-1. . -This value is associated with the current environment. +This value is associated with the environment. . -Only lines output from an environment count towards the maximum +Only lines output from a given environment count towards the maximum associated with that environment. . Hyphens resulting from .B \[rs]% -are counted; explicit hyphens are not. +are counted; +explicit hyphens are not. . . .TP @@ -2346,22 +2311,32 @@ of the environment. .TP .BI .hpfcode\~ "a b"\c .RI \~[ "c d" "] .\|.\|." -Define mapping values for character codes in pattern files; -after reading a pattern file with the +Define mapping values for character codes in pattern files. +. +This is an older mechanism no longer used by +.IR groff 's +own macro files; +for its successor, +see +.B .hcode +above. +. .B .hpf or .B .hpfa -request, -convert all characters with character +aplly the mapping +after reading or appending to the active list of patterns. +. +Its arguments are pairs of character codes\[em]integers from 0 to\~255. +. +The request maps character .RI code\~ a -in the recently read patterns to character +to .RI code\~ b , .RI code\~ c -.RI to\~ d , -and so on, -before replacing or appending to the active list of patterns. -. -Each argument must be an integer in the range 0 to\~255. +to +.RI code\~ d , +and so on. . Character codes that would otherwise be invalid in .I groff @@ -2393,7 +2368,7 @@ the default hyphenation margin is reset to its default value, The default scaling indicator .RB is\~\[lq] m \[rq]. . -The hyphenation margin is associated with the current environment. +The hyphenation margin is associated with the environment. . . .IP _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit