[groff] 02/02: Adjust `.hy' values.

[Werner LEMBERG]

wl pushed a commit to branch master
in repository groff.

commit bee81ccc5ec464ae46735c4bba837c0edbd27493
Author: Werner Lemberg <address@hidden>
Date:   Thu Mar 1 20:28:34 2018 +0100

    Adjust `.hy' values.
    
    In most cases hyphenation constraints were too strict.  The now
    selected values reflect the parameters used for the generation of
    the (TeX) hyphenation patterns.
    
    * tmac/an-old.tmac, tmac/cs.tmac, tmac/de.tmac, tmac/doc-common-u,
    tmac/e.tmac-u, tmac/fr.tmac, tmac/s.tmac, tmac/sv.tmac: Fix `.hy',
    `\n[HY]', and `\n[doc-hyphen-flags]' values.
    
    * doc/groff.texi, tmac/groff_man.7.man, tmac/groff_ms.7.man, NEWS:
    Updated.
---
 ChangeLog                 | 15 +++++++++++++++
 NEWS                      |  3 +++
 contrib/mm/ChangeLog      |  6 ++++++
 contrib/mm/groff_mm.7.man |  2 +-
 contrib/mm/m.tmac         |  6 +++---
 doc/groff.texi            |  4 ++--
 tmac/an-old.tmac          |  4 ++--
 tmac/cs.tmac              |  6 +++---
 tmac/de.tmac              |  6 +++---
 tmac/doc-common-u         |  2 +-
 tmac/e.tmac-u             |  2 +-
 tmac/fr.tmac              |  6 +++---
 tmac/groff_man.7.man      | 16 ++++++++++------
 tmac/groff_ms.7.man       |  2 +-
 tmac/s.tmac               |  2 +-
 tmac/sv.tmac              |  4 ++--
 16 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9ce1d1d..6b6b717 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2018-03-01  Werner LEMBERG  <address@hidden>
 
+       Adjust `.hy' values.
+
+       In most cases hyphenation constraints were too strict.  The now
+       selected values reflect the parameters used for the generation of
+       the (TeX) hyphenation patterns.
+
+       * tmac/an-old.tmac, tmac/cs.tmac, tmac/de.tmac, tmac/doc-common-u,
+       tmac/e.tmac-u, tmac/fr.tmac, tmac/s.tmac, tmac/sv.tmac: Fix `.hy',
+       `\n[HY]', and `\n[doc-hyphen-flags]' values.
+
+       * doc/groff.texi, tmac/groff_man.7.man, tmac/groff_ms.7.man, NEWS:
+       Updated.
+
+2018-03-01  Werner LEMBERG  <address@hidden>
+
        Fix some problems related to hyphenation.
 
        Introduce values 16 (allow hyphenation before last character) and 32
diff --git a/NEWS b/NEWS
index 10c6550..aba72c0 100644
--- a/NEWS
+++ b/NEWS
@@ -81,6 +81,9 @@ o The pdfroff utility script now activates its 
`--no-toc-relocation' option
 Macro Packages
 --------------
 
+o New default values for hyphenation.  The previous values were too strict,
+  suppressing some hyphenation points unnecessarily.
+
 o The -mom macro package now has full support for eqn, pic, and tbl, as well
   as captioning and labelling of pdf images and preprocessor output.  Lists
   of Figures, Equations, and Tables can now be autogenerated.  PDF_IMAGE has
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index 322ddbd..66c4c49 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-01  Werner LEMBERG  <address@hidden>
+
+       * m.tmac: Fix `.hy' value.
+
+       * groff_mm.7.man: Updated.
+
 2018-02-28  Werner LEMBERG  <address@hidden>
 
        * mm.am (mmroff): Use $(AM_V_GEN) to silence file generation.
diff --git a/contrib/mm/groff_mm.7.man b/contrib/mm/groff_mm.7.man
index 40b1757..4cc7684 100644
--- a/contrib/mm/groff_mm.7.man
+++ b/contrib/mm/groff_mm.7.man
@@ -3594,7 +3594,7 @@ Hyphenation status of text body.
 7tab(@);
 l l.
 address@hidden hyphenation
address@hidden on, set to value\~14
address@hidden on, set to value\~6
 .TE
 .RE
 .
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index 9b2df0c..3da120e 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -1604,7 +1604,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .fam \\*[pg*mul-fam]
 .ft \\n[pg*mul-font]
 .fi
-.hy 14
+.hy 6
 .di pg*mul-div
 .MULN
 ..
@@ -1665,7 +1665,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 'fi
 .ie \\n[ft*adjust] 'ad
 .el 'na
-.ie \\n[ft*hyphen] 'hy 14
+.ie \\n[ft*hyphen] 'hy 6
 .el 'hy 0
 .ll address@hidden
 .lt address@hidden
@@ -1684,7 +1684,7 @@ in=\\n[.i] fi=\\n[.u] .d=\\n[.d] nl=\\n[nl] pg=\\n[%]
 .      ie \\$1>11 .nr ft*format 0
 .      el .nr ft*format \\$1
 .      \"
-.      nr ft*hyphen (\\n[ft*format]%2)*14
+.      nr ft*hyphen (\\n[ft*format]%2)*6
 .      nr ft*format \\n[ft*format]/2
 .      \"
 .      nr ft*adjust 1-(\\n[ft*format]%2)
diff --git a/doc/groff.texi b/doc/groff.texi
index fc3abd0..c4af28f 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -2284,7 +2284,7 @@ Set hyphenation flags.  Possible values are 
address@hidden hyphenate without
 restrictions, address@hidden not hyphenate the last word on a page, 
address@hidden
 not hyphenate the last two characters of a word, and address@hidden not
 hyphenate the first two characters of a word.  These values are
-additive; the default address@hidden
+additive; the default address@hidden
 
 @item address@hidden
 Set the body text indentation to @var{length}.  If not specified, the
@@ -3065,7 +3065,7 @@ is equivalent to using the @code{nh} request.
 
 Effective: next paragraph.
 
-Default: 14.
+Default: 6.
 @endDefmpreg
 
 @Defmpreg {FAM, ms}
diff --git a/tmac/an-old.tmac b/tmac/an-old.tmac
index 4c515cd..0135c63 100644
--- a/tmac/an-old.tmac
+++ b/tmac/an-old.tmac
@@ -666,9 +666,9 @@
 .if !\n[an-html] \{\
 .  if !rHY \{\
 .    ie \n[cR] \
-.      nr HY 12
+.      nr HY 4
 .    el \
-.      nr HY 14
+.      nr HY 6
 .  \}
 .  hy \n[HY]
 .\}
diff --git a/tmac/cs.tmac b/tmac/cs.tmac
index 93f96c9..3722378 100644
--- a/tmac/cs.tmac
+++ b/tmac/cs.tmac
@@ -108,7 +108,7 @@
 .      \" update the date
 .      ds DY \n[dy] \*[MO] \n[year]
 .      \" set hyphenation flags
-.      nr HY 12
+.      nr HY 1
 .\}
 .
 .
@@ -144,9 +144,9 @@
 .mso latin2.tmac
 .
 .
-.\" Czech hyphenation
+.\" Czech hyphenation (\lefthyphenmin=2, \righthyphenmin=2)
 .ss 12 0
-.hy 12
+.hy 1
 .hcode � �  � �
 .hcode � �  � �
 .hcode � �  � �
diff --git a/tmac/de.tmac b/tmac/de.tmac
index ab48ed5..adfd097 100644
--- a/tmac/de.tmac
+++ b/tmac/de.tmac
@@ -108,7 +108,7 @@
 .      \" update the date
 .      ds DY \n[dy].\~\*[MO] \n[year]
 .      \" set hyphenation flags
-.      nr HY 12
+.      nr HY 1
 .\}
 .
 .
@@ -144,9 +144,9 @@
 .mso latin1.tmac
 .
 .
-.\" German hyphenation
+.\" German hyphenation (\lefthyphenmin=2, \righthyphenmin=2)
 .ss 12 0
-.hy 12
+.hy 1
 .
 .hcode � �  � �  � �  � �  � �  � �  � �
 .hcode � �
diff --git a/tmac/doc-common-u b/tmac/doc-common-u
index 0c76381..0d2e418 100644
--- a/tmac/doc-common-u
+++ b/tmac/doc-common-u
@@ -819,7 +819,7 @@
 .\" NS
 .\" NS override this in 'mdoc.local', if necessary.
 .
-.nr doc-hyphen-flags 12
+.nr doc-hyphen-flags 4
 .
 .
 .\" NS doc-header macro
diff --git a/tmac/e.tmac-u b/tmac/e.tmac-u
index c1f7f31..e5c0291 100644
--- a/tmac/e.tmac-u
+++ b/tmac/e.tmac-u
@@ -1919,7 +1919,7 @@
 .nr fm 3v                      \" footer margin
 .nr tf 3                       \" title font: (real) Times Bold
 .nr tp 10                      \" title point size
-.hy 14
+.hy 6
 .nr bi 4m                      \" indent for blocks
 .nr pi 5n                      \" indent for paragraphs
 .nr pf 1                       \" normal text font
diff --git a/tmac/fr.tmac b/tmac/fr.tmac
index f67f8e2..17bdcc7 100644
--- a/tmac/fr.tmac
+++ b/tmac/fr.tmac
@@ -108,7 +108,7 @@
 .      \" update the date
 .      ds DY \n[dy] \*[MO] \n[year]
 .      \" set hyphenation flags
-.      nr HY 12
+.      nr HY 4
 .\}
 .
 .
@@ -165,9 +165,9 @@
 .mso latin9.tmac
 .
 .
-.\" French hyphenation
+.\" French hyphenation (\lefthyphenmin=2, \righthyphenmin=3)
 .ss 12 0
-.hy 12
+.hy 4
 .hcode � �  � �
 .hcode � �  � �
 .hcode � �  � �
diff --git a/tmac/groff_man.7.man b/tmac/groff_man.7.man
index 15a3141..a72e955 100644
--- a/tmac/groff_man.7.man
+++ b/tmac/groff_man.7.man
@@ -109,12 +109,16 @@ The default is \-0.5i.
 .BI \-rHY= flags
 Set hyphenation flags.
 .
-Possible values are 1\~to hyphenate without restrictions, 2\~to not
-hyphenate the last word on a page, 4\~to not hyphenate the last two
-characters of a word, and 8\~to not hyphenate the first two characters
-of a word.
-.
-These values are additive; the default is\~14.
+Possible values are 1\~to not hyphenate the first and last character
+of a word, 2\~to not hyphenate the last word on a page, 4\~to not
+hyphenate the last two characters of a word, 8\~to not hyphenate the
+first two characters of a word, 16\~to enable hyphenation before the
+last character of a word, and 32 to enable hyphenation after the
+first character of a word.
+.
+These values are additive; the default is\~6.  Using values 4 and\~16
+can't be used together since they contradict each other; the same
+holds for values 8 and\~32.
 .
 .
 .TP
diff --git a/tmac/groff_ms.7.man b/tmac/groff_ms.7.man
index ecd9959..106826d 100644
--- a/tmac/groff_ms.7.man
+++ b/tmac/groff_ms.7.man
@@ -1681,7 +1681,7 @@ The hyphenation flags (as set by the
 request) are set from the
 .B HY
 register;
-the default is\~14.
+the default is\~6.
 .
 .
 .PP
diff --git a/tmac/s.tmac b/tmac/s.tmac
index 71bb37e..31e5ebe 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -1051,7 +1051,7 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .              par*vs "(\\n[PS] + 2)"
 .\}
 .if dFAM .fam \\*[FAM]
-.if !rHY .nr HY 14
+.if !rHY .nr HY 6
 .hy \\n[HY]
 .TA
 .CHECK-FOOTER-AND-KEEP
diff --git a/tmac/sv.tmac b/tmac/sv.tmac
index 48d0dc8..e0b7805 100644
--- a/tmac/sv.tmac
+++ b/tmac/sv.tmac
@@ -126,9 +126,9 @@
 .mso latin1.tmac
 .
 .
-.\" Swedish hyphenation
+.\" Swedish hyphenation (\lefthyphenmin=1, \righthyphenmin=2)
 .ss 12 0
-.hy 4
+.hy 33
 .hcode � �  � �
 .hcode � �  � �
 .hcode � �  � �