[groff] 01/01: [mom]: Fix trivial typos in copyright example files

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit e3824d611be904bad22176f4f4eb282a5352509d
Author: Peter Schaffter 
AuthorDate: Fri Mar 31 12:06:01 2023 -0400

[mom]: Fix trivial typos in copyright example files
---
 contrib/mom/examples/copyright-chapter.mom | 2 +-
 contrib/mom/examples/copyright-default.mom | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/examples/copyright-chapter.mom 
b/contrib/mom/examples/copyright-chapter.mom
index fa537d88a..261c7122d 100644
--- a/contrib/mom/examples/copyright-chapter.mom
+++ b/contrib/mom/examples/copyright-chapter.mom
@@ -14,7 +14,7 @@ the START macro to begin each chapter, and the COLLATE macro 
to join
 it to the subsequent chapter.
 .
 A copyright page (also called an edition page), which is not a
-chapter, should be be treated as a DOCTYPE DEFAULT.  The text of
+chapter, should be treated as a DOCTYPE DEFAULT.  The text of
 the copyright page is entered after START and joined to the first
 chapter (DOCTYPE CHAPTER) with COLLATE.
 .
diff --git a/contrib/mom/examples/copyright-default.mom 
b/contrib/mom/examples/copyright-default.mom
index 9fbea09f0..25a428fbb 100644
--- a/contrib/mom/examples/copyright-default.mom
+++ b/contrib/mom/examples/copyright-default.mom
@@ -14,7 +14,7 @@ Mom documents comprised of titled sections using DOCTYPE 
DEFAULT
 different authors) require the START macro to begin each new
 section, and the COLLATE macro to join it to the subsequent section.
 .
-A copyright page (also called an edition page) should be be treated
+A copyright page (also called an edition page) should be treated
 as a titled section.  The text of the copyright page is entered
 after START and joined to the next major section (i.e. the beginning
 of a document's content) with COLLATE.

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 21/48: [andoc]: Improve test sensitivity.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 6f6615f151a28d11932ed0134797508c8a3f2b66
Author: G. Branden Robinson 
AuthorDate: Wed Mar 22 18:19:45 2023 -0500

[andoc]: Improve test sensitivity.

Also migrate to more recent test conventions, emitting the formatted
output and updating the style of shell usage.
---
 tmac/tests/andoc_clear-doc-traps.sh | 29 +++--
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/tmac/tests/andoc_clear-doc-traps.sh 
b/tmac/tests/andoc_clear-doc-traps.sh
index 9a754e631..ef0e8a579 100755
--- a/tmac/tests/andoc_clear-doc-traps.sh
+++ b/tmac/tests/andoc_clear-doc-traps.sh
@@ -20,13 +20,22 @@
 
 groff="${abs_top_builddir:-.}/test-groff"
 
+fail=
+
+wail () {
+echo ...FAILED >&2
+fail=YES
+}
+
 # Regression-test Savannah #59246.
 #
 # andoc should remove mdoc(7) traps before rendering a man(7) page.
 # Continuous rendering has to be _off_ to catch this.
+#
+# We also deliberately omit a fourth argument to the man(7) TH call to
+# sniff out a stale footer component from mdoc(7).
 
-EXAMPLE=\
-'.Dd October 11, 2020
+input='.Dd October 11, 2020
 .Dt mdoc\-test 7
 .Os
 .Sh Name
@@ -34,14 +43,22 @@ EXAMPLE=\
 .Nd lay mine
 .Sh Description
 Just testing.
-.TH man\-test 7 2020-10-11
+.TH man\-test 7 2020-10-12
 .SH Name
 man-test \- drive sheep across minefield
 .SH Description
 \[lq]doc\-footer\[rq] should definitely not be sprung by this document.'
 
-! printf "%s\n" "$EXAMPLE" \
-| "$groff" -Tascii -P-cbou -mandoc -rcR=0 \
-| grep -E '^BSD +October 11, 2020 +3$'
+output=$(printf "%s\n" "$input" \
+| "$groff" -Tascii -P-cbou -rC1 -rcR=0 -mandoc)
+echo "$output"
+
+echo 'checking for correct mdoc(7) footer on first document' >&2
+echo "$output" | grep -Eqx 'GNU +October 11, 2020 +1' || wail
+
+echo 'checking for correct man(7) footer on second document' >&2
+echo "$output" | grep -Eqx ' +2020-10-12 +2' || wail
+
+test -z "$fail"
 
 # vim:set ai et sw=4 ts=4 tw=72:

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 23/48: doc/doc.am: Fix repo builds' install-doc targets.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 90ef148bf602df0a0628f2509f706f680cd29871
Author: G. Branden Robinson 
AuthorDate: Fri Mar 10 18:03:15 2023 -0600

doc/doc.am: Fix repo builds' install-doc targets.

* doc/doc.am (install-txt): Look for "groff.txt" in the source and build
  directories in sequence; it could be in either place depending on
  whether the build is from the Git repository or from a distribution
  archive.  Annotate this.  Fixes "install-doc" target when building
  from Git repository.  Thanks to Nikita Ivanov for the report.

  (install-pdf-local, install-html-local): Similar.

I wasn't getting problems in my builds even with "make distcheck" (which
performs a build from a distribution archive in a remote out-of-tree
location), but changing $(top_srcdir)/doc to $(doc_builddir) revealed
problems with repo builds.
---
 ChangeLog  | 11 +++
 doc/doc.am | 33 +++--
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6a8202dda..5a2b85ee5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2023-03-11  G. Branden Robinson 
+
+   * doc/doc.am (install-txt): Look for "groff.txt" in the source
+   and build directories in sequence; it could be in either place
+   depending on whether the build is from the Git repository or
+   from a distribution archive.  Annotate this.  Fixes
+   "install-doc" target when building from Git repository.  Problem
+   introduced by me in commit 691fc70108, 22 February.  Thanks to
+   Nikita Ivanov for the report.
+   (install-pdf-local, install-html-local): Similar.
+
 2023-03-10  G. Branden Robinson 
 
* doc/doc.am (maintainer-clean-local): Remove temporary "*.t2d"
diff --git a/doc/doc.am b/doc/doc.am
index 20e222881..7b6e8f5b9 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -621,11 +621,20 @@ maintainer-clean-local:
$(RM) -r $(doc_builddir)/groff.html.*
$(RM) -r $(doc_builddir)/*.t2d $(doc_builddir)/*.t2p
 
+# Generated forms of the groff Texinfo manual might be in the source
+# directory (distribution archive build) or in the build directory (Git
+# repository build).
+
 install-data-local: install-txt
 install-txt:
-test -d $(DESTDIR)$(docdir) \
  || $(mkinstalldirs) $(DESTDIR)$(docdir)
-   cp $(top_srcdir)/doc/groff.txt $(DESTDIR)$(docdir)
+   for d in $(doc_builddir) $(doc_srcdir); do \
+ if [ -f "$$d"/groff.txt ]; then \
+   cp "$$d"/groff.txt $(DESTDIR)$(docdir); \
+   break; \
+ fi; \
+   done
 
 install-data-local: install_infodoc
 install_infodoc: doc/groff.info
@@ -640,17 +649,29 @@ install_infodoc: doc/groff.info
break; \
  fi; \
done
+
 install-pdf-local: doc/groff.pdf
-test -d $(DESTDIR)$(pdfdocdir) \
  || $(mkinstalldirs) $(DESTDIR)$(pdfdocdir)
-   cp $(top_srcdir)/doc/groff.pdf $(DESTDIR)$(pdfdocdir)
+   for d in $(doc_builddir) $(doc_srcdir); do \
+ if [ -f "$$d"/groff.pdf ]; then \
+   cp "$$d"/groff.pdf $(DESTDIR)$(pdfdocdir); \
+   break; \
+ fi; \
+   done
+
 install-html-local: doc/groff.html
-test -d $(DESTDIR)$(htmldocdir)/groff.html.mono \
  || $(mkinstalldirs) $(DESTDIR)$(htmldocdir)/groff.html.mono
-   cp -r $(top_srcdir)/doc/groff.html \
- $(DESTDIR)$(htmldocdir)/groff.html.mono
-   cp -r $(top_srcdir)/doc/groff.html.node \
- $(DESTDIR)$(htmldocdir)
+   for d in $(doc_builddir) $(doc_srcdir); do \
+ if [ -f "$$d"/groff.html ]; then \
+   cp -r "$$d"/groff.html \
+ $(DESTDIR)$(htmldocdir)/groff.html.mono; \
+   cp -r "$$d"/groff.html.node \
+ $(DESTDIR)$(htmldocdir); \
+   break; \
+ fi; \
+   done
 
 uninstall-local: uninstall_infodoc uninstall-pdf uninstall-html \
   uninstall-txt

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 20/48: tmac/tests/e_ld-works.sh: Fix Swedish test case.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 121eedba5e11cf78ebb7ed8a42bfcc3007badb9f
Author: G. Branden Robinson 
AuthorDate: Thu Mar 9 11:49:45 2023 -0600

tmac/tests/e_ld-works.sh: Fix Swedish test case.

We weren't failing the test if the beginning of the translated date
string was incorrect.
---
 tmac/tests/e_ld-works.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmac/tests/e_ld-works.sh b/tmac/tests/e_ld-works.sh
index 1c315a857..f3327a817 100755
--- a/tmac/tests/e_ld-works.sh
+++ b/tmac/tests/e_ld-works.sh
@@ -115,7 +115,7 @@ echo "$output_it" | grep -Eqx ' +Appendice A' || wail
 
 # Swedish localization
 echo 'checking that `td` string updated correctly for Swedish (1)' >&2
-echo "$output_sv" | grep -q 'The day was m'
+echo "$output_sv" | grep -q 'The day was m' || wail
 
 echo 'checking that `td` string updated correctly for Swedish (2)' >&2
 echo "$output_sv" | grep -q 'ndag, 15 december 2008\.$' || wail

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 24/48: m4/groff.m4 (GROFF_TMAC): Fix code style nits.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 1962e8105f245920412e9660b3a79e4c7b2bd6b7
Author: G. Branden Robinson 
AuthorDate: Mon Mar 13 22:15:16 2023 -0500

m4/groff.m4 (GROFF_TMAC): Fix code style nits.

Update indentation and "brace style" to match recent practice.
---
 m4/groff.m4 | 81 +++--
 1 file changed, 46 insertions(+), 35 deletions(-)

diff --git a/m4/groff.m4 b/m4/groff.m4
index 19bf7f980..0dde04991 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1121,63 +1121,73 @@ AC_DEFUN([GROFF_TMAC],
   [AC_MSG_CHECKING([for prefix of system macro packages])
sys_tmac_prefix=
sys_tmac_file_prefix=
-   for d in /usr/share/lib/tmac /usr/lib/tmac; do
- for t in "" tmac.; do
-   for m in an s m; do
-f=$d/$t$m
-if test -z "$sys_tmac_prefix" \
-   && test -f $f \
-   && grep '^\.if' $f >/dev/null 2>&1; then
-  sys_tmac_prefix=$d/$t
-  sys_tmac_file_prefix=$t
-fi
+   for d in /usr/share/lib/tmac /usr/lib/tmac
+   do
+ for t in "" tmac.
+ do
+   for m in an s m
+   do
+ f=$d/$t$m
+ if test -z "$sys_tmac_prefix" \
+&& test -f $f \
+&& grep '^\.if' $f >/dev/null 2>&1
+ then
+   sys_tmac_prefix=$d/$t
+   sys_tmac_file_prefix=$t
+ fi
done
  done
done
sys_tmac_prefix_result=none
test -z "$sys_tmac_prefix" \
-   || sys_tmac_prefix_result="$sys_tmac_prefix"
+ || sys_tmac_prefix_result="$sys_tmac_prefix"
AC_MSG_RESULT([$sys_tmac_prefix_result])
AC_SUBST([sys_tmac_prefix])
 
AC_MSG_CHECKING([which system macro packages should be made available])
tmac_wrap=
-   if test "$sys_tmac_file_prefix" = tmac.; then
- for f in $sys_tmac_prefix*; do
+   if test "$sys_tmac_file_prefix" = tmac.
+   then
+ for f in $sys_tmac_prefix*
+ do
suff=`echo $f | sed -e "s;$sys_tmac_prefix;;"`
case "$suff" in
e)
-;;
+ ;;
*)
-grep "Copyright.*Free Software Foundation" $f >/dev/null \
- || tmac_wrap="$tmac_wrap $suff" ;;
+ grep "Copyright.*Free Software Foundation" $f >/dev/null \
+  || tmac_wrap="$tmac_wrap $suff" ;;
esac
  done
-   elif test -n "$sys_tmac_prefix"; then
+   elif test -n "$sys_tmac_prefix"
+   then
  files=`echo $sys_tmac_prefix*`
  grep "\\.so" $files >conftest.sol
- for f in $files; do
+ for f in $files
+ do
case "$f" in
${sys_tmac_prefix}e)
-;;
+ ;;
*.me)
-;;
+ ;;
*/ms.*)
-;;
+ ;;
*)
-b=`basename $f`
-if grep "\\.so.*/$b\$" conftest.sol >/dev/null \
-   || grep -l "Copyright.*Free Software Foundation" $f >/dev/null; then
-  :
-else
-  suff=`echo $f | sed -e "s;$sys_tmac_prefix;;"`
-  case "$suff" in
-  tmac.*)
-;;
-  *)
-tmac_wrap="$tmac_wrap $suff" ;;
-  esac
-fi
+ b=`basename $f`
+ if grep "\\.so.*/$b\$" conftest.sol >/dev/null \
+|| grep -l "Copyright.*Free Software Foundation" $f \
+   >/dev/null
+ then
+   :
+ else
+   suff=`echo $f | sed -e "s;$sys_tmac_prefix;;"`
+   case "$suff" in
+   tmac.*)
+ ;;
+   *)
+ tmac_wrap="$tmac_wrap $suff" ;;
+   esac
+ fi
esac
  done
  rm -f conftest.sol
@@ -1185,7 +1195,8 @@ AC_DEFUN([GROFF_TMAC],
tmac_wrap_result="none found"
test -z "$tmac_wrap" || tmac_wrap_result="$tmac_wrap"
AC_MSG_RESULT([$tmac_wrap_result])
-   AC_SUBST([tmac_wrap])])
+   AC_SUBST([tmac_wrap])
+])
 
 
 # Searching if a non-GNU Troff is installed.  The built-in register

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 13/48: eqn(1): Hyphen-protect macro, primitive names.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 0218853d07f44eceefd9c85ef0b33c696a6ce62a
Author: G. Branden Robinson 
AuthorDate: Mon Mar 27 07:41:46 2023 -0500

eqn(1): Hyphen-protect macro, primitive names.

Also drop needless quotation of a lone macro argument.
---
 src/preproc/eqn/eqn.1.man | 58 +++
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/preproc/eqn/eqn.1.man b/src/preproc/eqn/eqn.1.man
index c6b5d3c78..c4beca978 100644
--- a/src/preproc/eqn/eqn.1.man
+++ b/src/preproc/eqn/eqn.1.man
@@ -223,7 +223,7 @@ AT
 .
 To get three centered dots,
 write
-.B "cdots"
+.B cdots
 or
 .RB \[lq] "cdot cdot cdot" \[rq].
 .
@@ -340,7 +340,7 @@ primitives
 .BR back ,
 .BR bar ,
 .BR bold ,
-.BR define ,
+.BR \%define ,
 .BR down ,
 .BR fat ,
 .BR font ,
@@ -352,8 +352,8 @@ primitives
 .BR left ,
 .BR lineup ,
 .BR mark ,
-.BR matrix ,
-.BR ndefine ,
+.BR \%matrix ,
+.BR \%ndefine ,
 .BR over ,
 .BR right ,
 .BR roman ,
@@ -361,9 +361,9 @@ primitives
 .BR sqrt ,
 .BR sub ,
 .BR sup ,
-.BR tdefine ,
+.BR \%tdefine ,
 .BR to ,
-.BR under ,
+.BR \%under ,
 and
 .BR up .
 .
@@ -480,7 +480,7 @@ accent { "\[ha]" }
 and
 .B dyad
 are also defined using the
-.B accent
+.B \%accent
 primitive.
 .
 .
@@ -559,7 +559,7 @@ It produces a different result from
 in a case such as
 .RB \[lq] "A opprime sub 1" \[rq]:
 with
-.B opprime
+.B \%opprime
 the\~\[lq]1\[rq] is tucked under the prime as a subscript to
 the\~\[lq]A\[rq]
 (as is conventional in mathematical typesetting),
@@ -568,13 +568,13 @@ whereas with
 the\~\[lq]1\[rq] is a subscript to the prime character.
 .
 The precedence of
-.B opprime
+.B \%opprime
 is the same as that of
 .B bar
 and
-.BR under ,
+.BR \%under ,
 which is higher than that of everything except
-.B accent
+.B \%accent
 and
 .BR uaccent .
 .
@@ -582,7 +582,7 @@ In unquoted text,
 a neutral apostrophe
 .RB ( \[aq] )
 that is not the first character on the input line is treated like
-.BR opprime .
+.BR \%opprime .
 .
 .
 .TP
@@ -902,14 +902,14 @@ it overhangs the numerator and denominator by at least 
this amount.
 When
 .B bar
 or
-.B under
+.B \%under
 is applied to a single character,
 the line is this long.
 .
 Normally,
 .B bar
 or
-.B under
+.B \%under
 produces a line whose length is the width of the object to which it
 applies;
 in the case of a single character,
@@ -1163,18 +1163,18 @@ The default value is 35.
 .B nroff
 If this is non-zero,
 then
-.B ndefine
+.B \%ndefine
 behaves like
-.B define
+.B \%define
 and
-.B tdefine
+.B \%tdefine
 is ignored,
 otherwise
-.B tdefine
+.B \%tdefine
 behaves like
-.B define
+.B \%define
 and
-.B ndefine
+.B \%ndefine
 is ignored.
 .
 The default value is\~0;
@@ -1219,7 +1219,7 @@ it is replaced by nothing.
 .
 A word containing a left parenthesis where the part of the word before
 the left parenthesis has been defined using the
-.B define
+.B \%define
 primitive is recognized as a macro call with arguments;
 characters following the left parenthesis up to a matching right
 parenthesis are treated as comma-separated arguments.
@@ -1235,7 +1235,7 @@ can be any character not appearing in the parameter thus 
bracketed.
 .TP
 .BI sdefine\~ "name X anything X"
 This is like the
-.B define
+.B \%define
 primitive,
 but
 .I name
@@ -1263,7 +1263,7 @@ are ignored.
 If
 .I name
 has been defined by
-.B define
+.B \%define
 (or has been automatically defined because
 .I name
 is the output driver)
@@ -1289,14 +1289,14 @@ GNU
 supports the predefined macros offered by AT
 .IR eqn : \" AT
 .BR and ,
-.BR approx ,
+.BR \%approx ,
 .BR arc ,
 .BR cos ,
 .BR cosh ,
 .BR del ,
 .BR det ,
 .BR dot ,
-.BR dotdot ,
+.BR \%dotdot ,
 .BR dyad ,
 .BR exp ,
 .BR for ,
@@ -1304,7 +1304,7 @@ supports the predefined macros offered by AT
 .BR half ,
 .BR hat ,
 .BR if ,
-.BR inter ,
+.BR \%inter ,
 .BR Im ,
 .BR inf ,
 .BR int ,
@@ -1313,8 +1313,8 @@ supports the predefined macros offered by AT
 .BR log ,
 .BR max ,
 .BR min ,
-.BR nothing ,
-.BR partial ,
+.BR \%nothing ,
+.BR \%partial ,
 .BR prime ,
 .BR prod ,
 .BR Re ,
@@ -1381,7 +1381,7 @@ further defines the macros
 and
 .B utilde
 (all discussed above),
-.BR dollar ,
+.BR \%dollar ,
 which sets a dollar sign,
 and
 .BR ldots ,

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 17/48: NEWS, pic(1): Clarify and tighten wording.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 4c7e5257ff6d6a9e128a1bcdd808395707e752f1
Author: G. Branden Robinson 
AuthorDate: Mon Mar 27 08:29:25 2023 -0500

NEWS, pic(1): Clarify and tighten wording.
---
 NEWS  | 10 +-
 src/preproc/pic/pic.1.man |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 9a9cf3b88..3cf0b8ed8 100644
--- a/NEWS
+++ b/NEWS
@@ -132,11 +132,11 @@ pic
 ---
 
 o The token `.PY` is now recognized as a synonym of `.PF` to work around
-  a name space collision with the m (mm) macro package, which uses the
-  same name for a page footer management macro.  (This problem dates
-  back at least to Unix System V Release 2, 1983.)  You should continue
-  to use `.PF` to end pictures with flyback unless a similar problem
-  faces your document.
+  a name space collision with the m (mm) macro package, which defines
+  `PF` as a page footer management macro.  (This problem dates back at
+  least to Unix System V Release 2, 1983.)  You should continue to use
+  `.PF` to end pictures with flyback unless a similar problem faces your
+  document.
 
 tbl
 ---
diff --git a/src/preproc/pic/pic.1.man b/src/preproc/pic/pic.1.man
index 8c9a62665..727cbc347 100644
--- a/src/preproc/pic/pic.1.man
+++ b/src/preproc/pic/pic.1.man
@@ -185,7 +185,9 @@ as a synonym of
 to work around a name space collision with the
 .I mm
 macro package,
-which uses the same name for a page footer management macro.
+which defines
+.B PF
+as a page footer management macro.
 .
 Use
 .B PF

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 18/48: groff_mdoc(7): Fix doubled word.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 8cf787baabd2af4b68710edac9e2ec1598c8838a
Author: G. Branden Robinson 
AuthorDate: Thu Mar 30 11:41:51 2023 -0500

groff_mdoc(7): Fix doubled word.
---
 tmac/groff_mdoc.7.man | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tmac/groff_mdoc.7.man b/tmac/groff_mdoc.7.man
index 709832fd5..ac6c72fb1 100644
--- a/tmac/groff_mdoc.7.man
+++ b/tmac/groff_mdoc.7.man
@@ -4883,7 +4883,7 @@ and
 Historically, \" (\[ti]1989)
 .Xr mdoc
 configured the string definitions to fit the capabilities expected of
-the the output device.
+the output device.
 .
 Old typesetters \" like the C/A/T
 lacked directional double quotes,

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 22/48: doc/doc.am: Clean better in maintainer mode.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit b3966687fcd7e35dc67ffa880f989ce27552f90d
Author: G. Branden Robinson 
AuthorDate: Fri Mar 10 17:31:26 2023 -0600

doc/doc.am: Clean better in maintainer mode.

* doc/doc.am (maintainer-clean-local): Remove temporary "*.t2d" and
  "*.t2p" directories created by texi2dvi.
---
 ChangeLog  | 5 +
 doc/doc.am | 1 +
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9ce442ae0..6a8202dda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-03-10  G. Branden Robinson 
+
+   * doc/doc.am (maintainer-clean-local): Remove temporary "*.t2d"
+   and "*.t2p" directories created by texi2dvi.
+
 2023-03-07  G. Branden Robinson 
 
* doc/groff.texi (Operators in Conditionals):
diff --git a/doc/doc.am b/doc/doc.am
index cddc51907..20e222881 100644
--- a/doc/doc.am
+++ b/doc/doc.am
@@ -619,6 +619,7 @@ maintainer-clean-local:
$(RM) $(doc_builddir)/groff.dvi
$(RM) $(doc_builddir)/groff.txt
$(RM) -r $(doc_builddir)/groff.html.*
+   $(RM) -r $(doc_builddir)/*.t2d $(doc_builddir)/*.t2p
 
 install-data-local: install-txt
 install-txt:

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 33/48: [tmac]: Add Russian language support (1/7).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 3dd54234710629e1e5cef90abc3bb06011b1059a
Author: Nikita Ivanov 
AuthorDate: Wed Mar 8 20:54:47 2023 +

[tmac]: Add Russian language support (1/7).

* tmac/hyphen.ru: Add hyphenation patterns (encoded in KOI8-R).
* tmac/koi8-ru.tmac: Add character encoding support.
* tmac/ru.tmac: Add groff locale for Russian.
---
 ChangeLog |8 +
 tmac/hyphen.ru| 4695 +
 tmac/koi8-ru.tmac |   78 +
 tmac/ru.tmac  |  232 +++
 4 files changed, 5013 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 0462e2ec2..853cafa06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-03-08  Nikita Ivanov 
+
+   [tmac]: Add Russian language support (1/7).
+
+   * tmac/hyphen.ru: Add hyphenation patterns (encoded in KOI8-R).
+   * tmac/koi8-ru.tmac: Add character encoding support.
+   * tmac/ru.tmac: Add groff locale for Russian.
+
 2023-03-24  G. Branden Robinson 
 
* tmac/mdoc/doc-common (Sh): Restore hyphenation configured with
diff --git a/tmac/hyphen.ru b/tmac/hyphen.ru
new file mode 100644
index 0..a801de2e0
--- /dev/null
+++ b/tmac/hyphen.ru
@@ -0,0 +1,4695 @@
+% ruhyphal.tex:  Russian hyphenation patterns, version 2003/03/10
+% Copyright 1999-2003 Alexander I. Lebedev 
+%
+% This program may be distributed and/or modified under the conditions
+% of the LaTeX Project Public License, either version 1.2 or any later
+% version.
+%
+% Patterns were generated with patgen from a 990,000-word list and then
+% manually corrected.
+%
+% The program consists of the files ruhyphal.tex, cyryoal.tex and two
+% document files README.ruhyphal and hyphen.rules.  The file cyryoal.tex
+% can be regenerated using mkcyryo script (a part of ruhyphen package)
+% and the latest release of rus-ispell dictionaries
+% .
+\patterns{
+.��1�
+.��1��
+.���2
+.��2
+.��1�
+.���3�
+.��2�1�2
+.��1��
+.���1�
+.��2
+.��2�
+.��2�3�
+.��3�2�
+.��2�
+.���2
+.��1��
+.��2��
+.��1�
+.��3�
+.��3�2
+.���3
+.���2�
+.��3�2�
+.��3�
+.��1�
+.���2
+.��3�
+.��2
+.��1�
+.��2
+.��4��
+.��3
+.��2�
+.��2�3�
+.���1�
+.��2
+.1
+.��2�1�2
+.��1��
+.��2�1
+.��2��1
+.��1�
+.��3�
+.��3�2
+.��3��
+.��1��
+.��1�2
+.��1��
+.��1�2�
+.��3�
+.���1�
+.���1�
+.���3�2
+.���1
+.��3�
+.��4
+.��2��
+.��2�
+.��3��
+.��1�
+.��1��
+.��1��
+.��1��
+.��3�2
+.��3�2
+.���2�
+.2
+.��2�3�
+.��2��
+.��2�3�
+.��2��
+.��2�
+.��2�3�
+.��2�3�
+.��2�
+.2
+.��2
+.��2
+.��2�
+.��2�3
+.���3
+.��2�
+.���1�
+.��2�
+.��2
+.��2
+.��2
+.��2��
+.��2
+.��2�
+.��3
+.��2
+.��2�
+.��2
+.��2�
+.��2
+.��2�3�
+.��2�1�
+.��1
+4�3�
+��2�
+��2�
+��2�
+�1�
+���3��
+�3���
+��2��
+��1��
+�3��
+��1�
+�1��
+��3��
+�1��
+���2�
+�1��
+���1�
+�2���
+��1��
+��2��
+�2��
+�1��
+�2��
+�3�2��
+2���
+���1�2
+�2��
+�2
+�2���
+��2��
+�2
+��2���
+2���
+�3��
+�1�
+2���
+�2���
+��2��
+���2��
+�2��
+�2�1���
+��1��
+�2�1��
+���3�
+��2�
+�2���
+�1�
+��2��
+��2��
+��2�
+�2��
+��2��
+��2�
+���4�3
+���2
+��3���
+��1��
+���2
+��1��
+��1��
+��2�1��
+�2
+�2
+�1
+��2�1�
+��1�
+�1�
+��2�1
+��3��
+�2��
+�1�
+��1�
+1���
+��2�
+��3���
+���1�2
+2�
+���3�
+2
+��1�
+�1��
+�3���
+�1��
+2
+�3��
+���1�
+�1��
+���2�
+1�
+�1��
+�2���
+�1��
+2���
+���4
+2
+�2
+��2���
+2���
+���1�2
+2
+�2��
+���2��
+�2�1�2��
+�2���
+��2���
+�2�1�2�
+��1�2��
+��1�
+��2��
+���1�
+��2���
+�2�1��
+�1��
+2�1�
+��2�
+��2�
+��2�
+��2�
+1
+�3���
+��2���
+2���
+���4��
+���3�2�
+��2��
+��1���
+�1��
+���2��
+��2���
+��2���
+1
+�1��
+���1��
+���1��
+��2��
+�1��
+�1��
+��2���
+��2�1�
+�1��
+��1�
+�1��
+�1��
+�1��
+2��1�
+��3��
+��3��
+1�
+���1��
+��3���
+��2���
+��2���
+��1���
+��1���
+�1
+��2���
+��2���
+�1���
+�1��
+1
+��3��
+��1��
+��1��
+2
+�1��
+�1��
+��1���
+�2
+���2�
+��1���
+��1��
+�1��
+��2�
+�1��
+�1���
+�3���
+�3���
+�1��
+�1��
+�1�
+�2��
+��2�
+��3��
+�2���
+���1�
+��2�
+��2�
+��3��
+���1
+�2�1�
+��2�
+2
+��3�
+�1�
+2���
+�2��
+��1�
+�2��
+��2��
+�2��
+��1��
+�1�
+��2�
+��2�
+��2�
+1��
+��2��
+��2�1�
+��2��
+��1�
+��3��
+1
+��2�
+���3�
+��1��
+��1��
+2�1�
+�1�
+���2
+��2
+2�1�
+1��
+3���
+��2��
+��2��
+��2�1�
+3���
+3��2�
+���1�2
+���5�4
+��3��
+���3�
+���1�2
+���1�
+��2�1�
+���3�
+��2�1�
+���3��
+���3��
+3���
+2���
+2��
+�1�2
+1�2�
+3���
+��2�
+2���
+3���
+3�2
+3���
+��2��
+��2��
+��2��
+��2��
+��2��
+��1�
+2�3�
+�1�
+1
+1�2���
+�3
+�2���
+1�2���
+�3���
+�2���1�
+1�2���
+�2���
+1�2���
+2���
+2�2��
+2�3��.
+�2���
+�2���
+�2���
+2�3
+2���
+2�3�
+1��
+��1���
+��3��
+��2��
+��1���
+��1�2
+��1�2�
+��1���
+��3�2�
+��2��
+��3��
+1
+��1��
+��2��
+��1��
+��3���
+��3���
+3���
+��2��
+���2�
+���2�
+2��.
+�3���
+�2���
+���1��
+1�2���
+2�1���
+�2���
+1
+�2
+�1���
+1�2���
+2�3���
+1�2���
+�1���
+�1���
+�2���
+�2���
+�2���
+�2
+�2
+1�2
+�1���
+�1���.
+1�2
+���2�1�
+2���
+�1��
+3�
+2���
+1�2��
+2�3��.

[groff] 14/48: afmtodit(1): Document "--help" option.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 310662e59dc91214c3628c7622cce90d309b1afa
Author: G. Branden Robinson 
AuthorDate: Mon Mar 27 07:49:26 2023 -0500

afmtodit(1): Document "--help" option.
---
 src/utils/afmtodit/afmtodit.1.man | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/utils/afmtodit/afmtodit.1.man 
b/src/utils/afmtodit/afmtodit.1.man
index e1e69b261..809b4fe48 100644
--- a/src/utils/afmtodit/afmtodit.1.man
+++ b/src/utils/afmtodit/afmtodit.1.man
@@ -74,6 +74,11 @@ PostScript and PDF output
 .
 .
 .SY afmtodit
+.B \-\-help
+.YS
+.
+.
+.SY afmtodit
 .B \-v
 .
 .SY afmtodit
@@ -292,10 +297,14 @@ will automatically mount it when it is first used.
 .SH Options
 .\" 
 .
+.B \-\-help
+displays a usage message,
+while
 .B \-v
 and
 .B \-\-version
-show version information and exit afterward.
+show version information;
+all exit afterward.
 .
 .
 .TP

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 09/48: doc/groff.texi (Requests and Macros): Clarify.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit ac1d513ff010a4836295f6b0b17144e1d5c4f79d
Author: G. Branden Robinson 
AuthorDate: Wed Mar 22 17:29:01 2023 -0500

doc/groff.texi (Requests and Macros): Clarify.
---
 doc/groff.texi | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/groff.texi b/doc/groff.texi
index ce5f7cdfd..ac045b0da 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -464,7 +464,7 @@ Documentation License''.
 @title groff
 @subtitle The GNU implementation of @code{troff}
 @subtitle Edition 1.23.0
-@subtitle February 2023
+@subtitle March 2023
 @author Trent@tie{}A.@: Fisher
 @author Werner Lemberg
 @author G.@tie{}Branden Robinson
@@ -5338,9 +5338,9 @@ Heywood Jabuzzoff
 .ENDNAME
 @endExample
 
-In fact, the ending marker is itself the name of a macro that will be
-called if it is defined by that time (or the name of a request to be
-invoked).
+In fact, the ending marker is itself the name of a macro to be
+called, or a request to be invoked, if it is defined at the time its
+contol line is read.
 
 @Example
 .de END

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 27/48: Stop shipping "FOR-RELEASE" in dist archives.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 4616b4a6d64cbc06b616130feb79b64ce60761d6
Author: G. Branden Robinson 
AuthorDate: Tue Mar 28 08:02:33 2023 -0500

Stop shipping "FOR-RELEASE" in dist archives.

* Makefile.am (EXTRA_DIST): Do it.
* MANIFEST: De-document file.
---
 MANIFEST| 1 -
 Makefile.am | 1 -
 2 files changed, 2 deletions(-)

diff --git a/MANIFEST b/MANIFEST
index 15849ca42..13a070bb2 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -14,7 +14,6 @@ This file summarizes the structure of the groff source 
distribution.
   ChangeLog.*   Log of changes in past groff versions.
   COPYING   The GNU General Public License (GPL).
   FDL   The GNU Free Documentation License (FDL).
-  FOR-RELEASE   Release procedures for groff maintainer(s) to follow.
   HACKING   Advice for contributors to groff.
   INSTALL   Generic information on configuration and compiling.
   INSTALL.extra How to install groff from a distribution archive.
diff --git a/Makefile.am b/Makefile.am
index f7ab4107e..d201a1ce0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -808,7 +808,6 @@ EXTRA_DIST += \
   ChangeLog.121 \
   ChangeLog.122 \
   FDL \
-  FOR-RELEASE \
   gendef.sh \
   HACKING \
   INSTALL.REPO \

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 35/48: [tmac]: Add Russian language support (3/7).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit c37c8a7a97d03ded698b70b1ddaf521962325782
Author: G. Branden Robinson 
AuthorDate: Wed Mar 8 04:28:27 2023 -0600

[tmac]: Add Russian language support (3/7).

* tmac/hyphen.ru:
* tmac/ru.tmac: Update editor aids so these files can be edited more
  intelligibly using GNU Emacs.  Annotate apparent problem with Vim's
  KOI8-R support.
---
 ChangeLog  | 9 +
 tmac/hyphen.ru | 8 
 tmac/ru.tmac   | 3 ++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 6fb5948f9..f81674002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-03-08  G. Branden Robinson 
+
+   [tmac]: Add Russian language support (3/7).
+
+   * tmac/hyphen.ru:
+   * tmac/ru.tmac: Update editor aids so these files can be edited
+   more intelligibly using GNU Emacs.  Annotate apparent problem
+   with Vim's KOI8-R support.
+
 2023-03-08  G. Branden Robinson 
 
Add Russian language support (2/7).
diff --git a/tmac/hyphen.ru b/tmac/hyphen.ru
index a801de2e0..22008f2f7 100644
--- a/tmac/hyphen.ru
+++ b/tmac/hyphen.ru
@@ -4693,3 +4693,11 @@
 ���-��-��
 -��-��
 }
+
+% Local Variables:
+% mode: tex
+% coding: cyrillic-koi8
+% fill-column: 72
+% End:
+% XXX: Vim 8.2 does not handle koi8-r correctly.
+% vim: set filetype=tex textwidth=72:
diff --git a/tmac/ru.tmac b/tmac/ru.tmac
index def6c0bec..7e4984c70 100644
--- a/tmac/ru.tmac
+++ b/tmac/ru.tmac
@@ -226,7 +226,8 @@
 .
 .\" Local Variables:
 .\" mode: nroff
-.\" coding: koi8-ru
+.\" coding: cyrillic-koi8
 .\" fill-column: 72
 .\" End:
+.\" XXX: Vim 8.2 does not handle koi8-r correctly.
 .\" vim: set filetype=groff textwidth=72:

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 28/48: [gropdf]: Make pdfmom more versatile.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 04eedeb5192d8a07345c9ce1cf7bda82f718f019
Author: Deri James 
AuthorDate: Thu Mar 9 17:39:07 2023 +

[gropdf]: Make pdfmom more versatile.

* src/devices/gropdf/pdfmom.pl: Add flag --roff which severs hardcoded
  link to the mom macros.

* src/devices/gropdf/pdfmom.1.man: Document changes.
---
 ChangeLog   |  8 
 src/devices/gropdf/pdfmom.1.man | 16 
 src/devices/gropdf/pdfmom.pl| 34 +-
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7e06d54ec..0a7993a0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-03-14  Deri James  
+
+   [gropdf]: Make pdfmom more versatile.
+
+   * src/devices/gropdf/pdfmom.pl: Add flag --roff which severs
+   hardcoded link to the mom macros.
+   * src/devices/gropdf/pdfmom.1.man: Document changes.
+
 2023-03-13  G. Branden Robinson 
 
m4/groff.m4 (GROFF_TMAC): Eliminate garbage leading space from
diff --git a/src/devices/gropdf/pdfmom.1.man b/src/devices/gropdf/pdfmom.1.man
index 1b3dc014a..64176cd03 100644
--- a/src/devices/gropdf/pdfmom.1.man
+++ b/src/devices/gropdf/pdfmom.1.man
@@ -54,6 +54,7 @@ macro package for
 .
 .SY pdfmom
 .RB [ \-Tpdf ]
+.RB [ \-roff ]
 .RI [ groff-options ]
 .RI [ file\~ .\|.\|.]
 .YS
@@ -89,6 +90,21 @@ macros.
 .
 .
 .P
+If the
+.B \-roff
+option is used the link to
+.I mom
+is severed and the wrapper can be used with other macro sets.
+This is also true if the wrapper is renamed or linked as a
+pseudonym, so creating a link called
+.I pdfms
+which targets pdfmom will create a wrapper for creating pdfs
+with the
+.I ms
+macro.
+.
+.
+.P
 .I pdfmom
 prints to the standard output,
 so output must usually be redirected to a destination file.
diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl
index 89977d496..3a410d8ad 100644
--- a/src/devices/gropdf/pdfmom.pl
+++ b/src/devices/gropdf/pdfmom.pl
@@ -1,6 +1,6 @@
 #!@PERL@
 #
-#  pdfmom  : Frontend to run groff -mom to produce PDFs
+#  pdfmom  : Frontend to run groff to produce PDFs
 #  Deri James  : Friday 16 Mar 2012
 #
 
@@ -29,6 +29,19 @@ my @cmd;
 my $dev='pdf';
 my $preconv='';
 my $readstdin=1;
+my $mom='-mom';
+if ($0=~m/pdf(\w+)$/)
+{
+my $m=$1;
+if ($m=~m/^(mom|mm|ms|me|man|mandoc)$/)
+{
+$mom="-".$m;
+}
+else
+{
+$mom='';
+}
+}
 my $RT_SEP='@RT_SEP@';
 
 $ENV{PATH}=$ENV{GROFF_BIN_PATH}.$RT_SEP.$ENV{PATH} if 
exists($ENV{GROFF_BIN_PATH});
@@ -73,6 +86,10 @@ while (my $c=shift)
$dev=$c;
next;
 }
+elsif ($c eq '-roff' or $c eq '--roff')
+{
+$mom='';
+}
 elsif ($c eq '-v' or $c eq '--version')
 {
print "GNU pdfmom (groff) version @VERSION@\n";
@@ -123,19 +140,26 @@ if ($readstdin)
 
 if ($dev eq 'pdf')
 {
-system("groff -Tpdf -dLABEL.REFS=1 -mom -z $cmdstring 2>&1 | LC_ALL=C grep 
'^\\. *ds' | groff -Tpdf -dPDF.EXPORT=1 -dLABEL.REFS=1 -mom -z - $cmdstring 
2>&1 | LC_ALL=C grep '^\\. *ds' | groff -Tpdf -mom $preconv - $cmdstring");
+if ($mom)
+{
+system("groff -Tpdf -dLABEL.REFS=1 $mom -z $cmdstring 2>&1 | LC_ALL=C 
grep '^\\. *ds' | groff -Tpdf -dPDF.EXPORT=1 -dLABEL.REFS=1 $mom -z - 
$cmdstring 2>&1 | LC_ALL=C grep '^\\. *ds' | groff -Tpdf $mom $preconv - 
$cmdstring");
+}
+else
+{
+system("groff -Tpdf -dPDF.EXPORT=1 -z $cmdstring 2>&1 | LC_ALL=C grep 
'^\\. *ds' | groff -Tpdf $preconv - $cmdstring");
+}
 }
 elsif ($dev eq 'ps')
 {
-system("groff -Tpdf -dLABEL.REFS=1 -mom -z $cmdstring 2>&1 | LC_ALL=C grep 
'^\\. *ds' | pdfroff -mpdfmark -mom --no-toc - $preconv $cmdstring");
+system("groff -Tpdf -dLABEL.REFS=1 $mom -z $cmdstring 2>&1 | LC_ALL=C grep 
'^\\. *ds' | pdfroff -mpdfmark $mom --no-toc - $preconv $cmdstring");
 }
 elsif ($dev eq '-z') # pseudo dev - just compile for warnings
 {
-system("groff -Tpdf -mom -z $cmdstring");
+system("groff -Tpdf $mom -z $cmdstring");
 }
 elsif ($dev eq '-Z') # pseudo dev - produce troff output
 {
-system("groff -Tpdf -mom -Z $cmdstring");
+system("groff -Tpdf $mom -Z $cmdstring");
 }
 else
 {

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 31/48: [mdoc]: Regression-test Savannah #63957.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 9cb8fa8b4f286040e32b3996b4183907d893a1ef
Author: G. Branden Robinson 
AuthorDate: Fri Mar 24 03:17:41 2023 -0500

[mdoc]: Regression-test Savannah #63957.

* tmac/tests/doc_synopsis_is_not_adjusted.sh: Do it.
* tmac/tmac.am (tmac_TESTS): Run test.

Test fails at this commit.
---
 ChangeLog  |  7 +
 tmac/tests/doc_synopsis_is_not_adjusted.sh | 49 ++
 tmac/tmac.am   |  1 +
 3 files changed, 57 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1d65e465d..618ea12fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-03-24  G. Branden Robinson 
+
+   [mdoc]: Regression-test Savannah #63957.
+
+   * tmac/tests/doc_synopsis_is_not_adjusted.sh: Do it.
+   * tmac/tmac.am (tmac_TESTS): Run test.
+
 2023-03-14  G. Branden Robinson 
 
* tmac/tmac.am (tmac/stamp-wrap): Stop prepending groff's man(7)
diff --git a/tmac/tests/doc_synopsis_is_not_adjusted.sh 
b/tmac/tests/doc_synopsis_is_not_adjusted.sh
new file mode 100755
index 0..e5ddde6ea
--- /dev/null
+++ b/tmac/tests/doc_synopsis_is_not_adjusted.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# Copyright (C) 2023 Free Software Foundation, Inc.
+#
+# This file is part of groff.
+#
+# groff is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# groff is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+groff="${abs_top_builddir:-.}/test-groff"
+
+input='.Dd June 6, 1944
+.Dt timerdday 3bsd
+.Os
+.Sh Name
+.Nm timerdday
+.Nd compute time of launch operation within window
+.Sh Synopsis
+.Ft void
+.Fn timerdday "\%struct-timespec *earliest" \
+"\%struct-timespec *latest" "\%struct-timespec *resolution"
+.Sh Description
+Compute the optimal start time for a desired event to occur between
+times
+.Va earliest No and Va latest
+to within a granularity of
+.Va resolution .'
+
+# Regression-test Savannah #63957.
+#
+# Adjustment should be disabled in Synopsis sections.
+
+output=$(echo "$input" | "$groff" -Tascii -mdoc -P-cbou)
+echo "$output"
+
+str=' {7}timerdday\(struct-timespec \*earliest, struct-timespec \*latest,'
+echo "$output" | grep -Eqx "$str"
+
+# vim:set ai et sw=4 ts=4 tw=72:
diff --git a/tmac/tmac.am b/tmac/tmac.am
index fce4d894c..d7f67d2f6 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -206,6 +206,7 @@ tmac_TESTS = \
   tmac/tests/doc_indents-correctly.sh \
   tmac/tests/doc_output-footer-when-continuously-rendering.sh \
   tmac/tests/doc_smoke-test.sh \
+  tmac/tests/doc_synopsis_is_not_adjusted.sh \
   tmac/tests/e_chapter-titles-work.sh \
   tmac/tests/e_columns-work-on-long-pages.sh \
   tmac/tests/e_delayed-text-marks-work.sh \

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 32/48: [mdoc]: Fix Savannah #63957.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 71d1a02f09889284ea324399df2b0af552a676a4
Author: G. Branden Robinson 
AuthorDate: Fri Mar 24 03:24:54 2023 -0500

[mdoc]: Fix Savannah #63957.

* tmac/mdoc/doc-common (Sh): Restore hyphenation configured with `HY`
  register upon entry to any new section.  Disable adjustment and
  hyphenation when in the "Synopsis" section.

Fixes .  Thanks to Alex Colomar
for reporting an issue that brought this one to light.
---
 ChangeLog| 9 +
 tmac/mdoc/doc-common | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 618ea12fd..0462e2ec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-03-24  G. Branden Robinson 
+
+   * tmac/mdoc/doc-common (Sh): Restore hyphenation configured with
+   `HY` register upon entry to any new section.  Disable adjustment
+   and hyphenation when in the "Synopsis" section.
+
+   Fixes .  Thanks to Alex
+   Colomar for reporting an issue that brought this one to light.
+
 2023-03-24  G. Branden Robinson 
 
[mdoc]: Regression-test Savannah #63957.
diff --git a/tmac/mdoc/doc-common b/tmac/mdoc/doc-common
index 53a25659f..d37b4c001 100644
--- a/tmac/mdoc/doc-common
+++ b/tmac/mdoc/doc-common
@@ -1410,6 +1410,7 @@
 .doc-parse-args \$@
 .
 .ad \*[AD]
+.hy \n[HY]
 .
 .ie "\*[doc-sec-head]"\*[doc-section-name]" \{\
 .  doc-set-up-titles
@@ -1424,8 +1425,8 @@
 .  nr doc-in-authors-section 0
 .
 .  ie"\*[doc-sec-head]"\*[doc-section-synopsis]" \{\
-.if t \
-.  na
+.na
+.nh
 .nr doc-in-synopsis-section 1
 .nr doc-indent-synopsis 0
 .nr doc-indent-synopsis-active 0

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 16/48: pic(1), tbl(1): Parallelize wording with eqn(1).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit da14c1495742f5ee2e9f92b9c85c4dbb7b2b8403
Author: G. Branden Robinson 
AuthorDate: Mon Mar 27 08:26:45 2023 -0500

pic(1), tbl(1): Parallelize wording with eqn(1).

This tightens pic(1)'s claim regarding what can accept its output; it no
longer implies that any troff can interpret it.  The output does seem to
largely avoid groff-specific syntax or extensions, apart from stroke and
fill color selection.  It's not clear to me if that defeats the
processing of GNU pic output by, say, DWB or Plan 9 troff, so until we
know, make the narrower claim.
---
 src/preproc/pic/pic.1.man | 6 +++---
 src/preproc/tbl/tbl.1.man | 7 +++
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/preproc/pic/pic.1.man b/src/preproc/pic/pic.1.man
index b422b3e76..8c9a62665 100644
--- a/src/preproc/pic/pic.1.man
+++ b/src/preproc/pic/pic.1.man
@@ -107,11 +107,11 @@ document formatting system.
 .I @g@pic
 is a
 .MR @g@troff @MAN1EXT@
-preprocessor that compiles descriptions of diagrammatic pictures
+preprocessor that translates descriptions of diagrammatic pictures
 embedded in
-.I troff \" generic
+.MR roff @MAN7EXT@
 or \*[tx] input files into the language understood by \*[tx] or
-.IR troff . \" generic
+.IR @g@troff .
 .
 It copies the contents of each
 .I file
diff --git a/src/preproc/tbl/tbl.1.man b/src/preproc/tbl/tbl.1.man
index c0d7f5220..e13aef97b 100644
--- a/src/preproc/tbl/tbl.1.man
+++ b/src/preproc/tbl/tbl.1.man
@@ -84,10 +84,9 @@ document formatting system.
 .I @g@tbl
 is a
 .MR @g@troff @MAN1EXT@
-preprocessor that translates descriptions of tables embedded in its
-input into the language,
-.MR groff @MAN7EXT@ ,
-understood by
+preprocessor that translates descriptions of tables embedded in
+.MR roff @MAN7EXT@
+input files into the language understood by
 .IR @g@troff .
 .
 It copies the contents of each

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 25/48: [build]: Clarify GROFF_TMAC Autoconf test output.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 3138955926180f538844b17f35aa3f2be7aa2e67
Author: G. Branden Robinson 
AuthorDate: Mon Mar 13 22:23:02 2023 -0500

[build]: Clarify GROFF_TMAC Autoconf test output.

* configure.ac: Correct characterization of the list of macro packages
  reported.  It is not the list of macro packages receiving a "g"
  prefix, but the list of macro packages reciving a wrapper macro file
  in groff's macro directory, each of which source the corresponding
  system (likely AT troff) macro package.  Fixes wording I
  introduced in commit 4d30dd7424, 31 May.

* m4/groff.m4 (GROFF_TMAC): Clarify first "checking" message: we are
  looking for a file name prefix on existing system macro packages (like
  "tmac.").  This has nothing to do with the prefix applied to groff
  commands, or the "g" prefixed to groff implementations of the man, mm,
  and ms packages.  Tighten wording of second "checking" message.
  Consistently say "(none)" instead of "none" or "none found".
---
 ChangeLog| 21 +
 configure.ac |  2 +-
 m4/groff.m4  |  8 
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5a2b85ee5..9c9cc02f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2023-03-13  G. Branden Robinson 
+
+   [build]: Clarify output of `GROFF_TMAC` Autoconf test.
+
+   * configure.ac: Correct characterization of the list of macro
+   packages reported.  It is not the list of macro packages
+   receiving a "g" prefix, but the list of macro packages reciving
+   a wrapper macro file in groff's macro directory, each of which
+   source the corresponding system (likely AT troff)
+   macro package.  Fixes wording I introduced in commit 4d30dd7424,
+   31 May.
+   * m4/groff.m4 (GROFF_TMAC): Clarify first "checking" message:
+   we are looking for a file name prefix on existing system macro
+   packages (like "tmac.").  This has nothing to do with the prefix
+   applied to groff commands, or the "g" prefixed to groff
+   implementations of the man, mm, and ms packages.  Tighten
+   wording of second "checking" message.  Consistently say "(none)"
+   instead of "none" or "none found".
+
+   Fixes .
+
 2023-03-11  G. Branden Robinson 
 
* doc/doc.am (install-txt): Look for "groff.txt" in the source
diff --git a/configure.ac b/configure.ac
index 4b1e92fb1..6baeaaf53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -222,7 +222,7 @@ then
   if test -n "$tmac_wrap"
   then
   echo "\
- prefix used for macro packages   : $tmac_wrap"
+ wrappers used for macro packages : $tmac_wrap"
   fi
 fi
 echo "\
diff --git a/m4/groff.m4 b/m4/groff.m4
index 0dde04991..4ad3a2679 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1118,7 +1118,7 @@ fopen(0, 0);
 
 
 AC_DEFUN([GROFF_TMAC],
-  [AC_MSG_CHECKING([for prefix of system macro packages])
+  [AC_MSG_CHECKING([file name prefix of system macro packages])
sys_tmac_prefix=
sys_tmac_file_prefix=
for d in /usr/share/lib/tmac /usr/lib/tmac
@@ -1138,13 +1138,13 @@ AC_DEFUN([GROFF_TMAC],
done
  done
done
-   sys_tmac_prefix_result=none
+   sys_tmac_prefix_result='(none)'
test -z "$sys_tmac_prefix" \
  || sys_tmac_prefix_result="$sys_tmac_prefix"
AC_MSG_RESULT([$sys_tmac_prefix_result])
AC_SUBST([sys_tmac_prefix])
 
-   AC_MSG_CHECKING([which system macro packages should be made available])
+   AC_MSG_CHECKING([for system macro packages to make available])
tmac_wrap=
if test "$sys_tmac_file_prefix" = tmac.
then
@@ -1192,7 +1192,7 @@ AC_DEFUN([GROFF_TMAC],
  done
  rm -f conftest.sol
fi
-   tmac_wrap_result="none found"
+   tmac_wrap_result='(none)'
test -z "$tmac_wrap" || tmac_wrap_result="$tmac_wrap"
AC_MSG_RESULT([$tmac_wrap_result])
AC_SUBST([tmac_wrap])

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 12/48: tbl(1): Clarify 'w' and 'z' modifier behavior.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit f3c54a15567bcab924ed91b0100f111cbe9ea6f4
Author: G. Branden Robinson 
AuthorDate: Tue Mar 28 07:39:25 2023 -0500

tbl(1): Clarify 'w' and 'z' modifier behavior.
---
 src/preproc/tbl/tbl.1.man | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/preproc/tbl/tbl.1.man b/src/preproc/tbl/tbl.1.man
index 15a3c7638..c0d7f5220 100644
--- a/src/preproc/tbl/tbl.1.man
+++ b/src/preproc/tbl/tbl.1.man
@@ -1041,14 +1041,14 @@ or populated with additional inter-sentence space.
 measures each table entry as it occurs in the input,
 updating the width required by its corresponding column.
 .
-The
-.B x
-modifier makes this width a minimum,
-and the modifiers
-.B w
-or
+If the
 .B z
-override it entirely.
+modifier applies to the column,
+this measurement is ignored;
+if
+.B w
+applies and its argument is larger than this width,
+that argument is used instead.
 .
 In contrast to conventional
 .I roff

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 15/48: pic(1): Protect keywords from hyphenation.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 6212f0c231ad96a3eba2e2ee9030c0cf5f125ade
Author: G. Branden Robinson 
AuthorDate: Mon Mar 27 08:25:34 2023 -0500

pic(1): Protect keywords from hyphenation.
---
 src/preproc/pic/pic.1.man | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/preproc/pic/pic.1.man b/src/preproc/pic/pic.1.man
index ac2864189..b422b3e76 100644
--- a/src/preproc/pic/pic.1.man
+++ b/src/preproc/pic/pic.1.man
@@ -1161,7 +1161,7 @@ but output devices may provide a mechanism for changing 
this.
 .
 Without an argument,
 then the value of the variable
-.B fillval
+.B \%fillval
 will be used.
 .
 Initially,
@@ -1176,7 +1176,7 @@ so that the text will not be obscured by the filling.
 .
 .P
 Additional modifiers are available to draw colored objects:
-.BR outline [ d ]
+.BR \%outline [ d ]
 sets the color of the outline,
 .B shaded
 the fill color,
@@ -1198,7 +1198,7 @@ Device macro files like
 .I ps.tmac
 declare color names;
 you can define additional ones with the
-.B defcolor
+.B \%defcolor
 request
 (see
 .MR groff @MAN7EXT@ ).
@@ -1207,7 +1207,7 @@ request
 .LP
 To change the name of the vbox in \*[tx] mode,
 set the pseudo-variable
-.B figname
+.B \%figname
 (which is actually a specially parsed command)
 within a picture.
 .
@@ -1486,7 +1486,7 @@ are rejected even in \*[tx] mode.
 .
 .LP
 The interpretation of
-.B fillval
+.B \%fillval
 is incompatible with the
 .I pic \" AT
 in Tenth Edition Research Unix,

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 07/48: groff(7): Fix goof in list.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit b86d22e00a7c5eef0ea30371bf00f83f8c0446e5
Author: G. Branden Robinson 
AuthorDate: Thu Mar 9 11:53:15 2023 -0600

groff(7): Fix goof in list.
---
 man/groff.7.man | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/groff.7.man b/man/groff.7.man
index e16ec458f..2326b9c3a 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -6374,9 +6374,9 @@ English
 .RI ( en ),
 French
 .RI ( fr ),
-Japanese
-.RI ( it ),
 Italian
+.RI ( it ),
+Japanese
 .RI ( ja ),
 Swedish
 .RI ( sv ),

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 34/48: LICENSES: Add Russian language support (2/7).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 73cacef9d6ea34e024f5af1a69d0e11df1b368e6
Author: G. Branden Robinson 
AuthorDate: Thu Mar 9 10:01:28 2023 -0600

LICENSES: Add Russian language support (2/7).
---
 ChangeLog |  6 ++
 LICENSES  | 10 ++
 2 files changed, 16 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 853cafa06..6fb5948f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-03-08  G. Branden Robinson 
+
+   Add Russian language support (2/7).
+
+   LICENSES: Update for CTAN Russian hyphenation patterns.
+
 2023-03-08  Nikita Ivanov 
 
[tmac]: Add Russian language support (1/7).
diff --git a/LICENSES b/LICENSES
index 160cf5fd3..504a817a2 100644
--- a/LICENSES
+++ b/LICENSES
@@ -203,6 +203,16 @@ TeX-related projects.
   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   OTHER DEALINGS IN THE SOFTWARE.
 
+* "tmac/hyphen.ru" is renamed from "ruhyphal.tex", obtained from
+  .
+
+  Copyright 1999-2003 Alexander I. Lebedev 
+
+  This program may be distributed and/or modified under the conditions
+  of the LaTeX Project Public License, either version 1.2 or any later
+  version.
+
 * "tmac/hyphen.sv" is renamed from "svhyph.tex", obtained from
   .
 

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 48/48: README.branch: Describe purpose of branch.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 5bd671f7f788f6e4f7de7fb50ee4f7953df8630d
Author: G. Branden Robinson 
AuthorDate: Fri Mar 31 07:29:09 2023 -0500

README.branch: Describe purpose of branch.
---
 README.branch | 29 +
 1 file changed, 29 insertions(+)

diff --git a/README.branch b/README.branch
new file mode 100644
index 0..e539fa251
--- /dev/null
+++ b/README.branch
@@ -0,0 +1,29 @@
+This branch is a staging ground for commits intended for cherry-picking
+to the master branch in preparation for the tagging of groff 1.23.0.rc4.
+
+The commits are not in chronological order of development, but in a
+subjective ordering of risk to release stability, with the earlier
+commits being less risky and the more recent ones more so.  The idea
+is to make it easy to merge many of them, or to simply choose a point
+within the series for merge and tagging as rc4.
+
+I'm happy to perform merge or cherry-pick operations as directed by
+Bertrand, who as maintainer may then perform the tag operation and
+distribution archive generation.
+
+Here are the risk categories as I conceive them.  As you read down a
+plain "git log" command from this branch, you will see the commits
+appear in the foregoing order.
+
+Level 6: Changes to installed, compiled code.
+Level 5: Changes to installed macro packages.
+Level 4: Changes to installed scripts.
+Level 3: Changes to build scripts.
+Level 2: Changes to test scripts.
+Level 1: Changes to documentation.
+
+The branch point from master is at the bottom.
+
+The commit creating this file should of course not be merged.
+
+--GBR

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 45/48: Fix Savannah #63831.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 27f50c753f5679456a292f0758adb9c4f3a2189c
Author: G. Branden Robinson 
AuthorDate: Thu Mar 16 18:28:16 2023 -0500

Fix Savannah #63831.

* src/libs/libxutil/XFontName.c (utoa): Rename function from this...

  (xu_utoa): ...to this, to avoid name collision when using "newlib"
  portability library.

  (XFormatFontName): Update call site.

* PROBLEMS: Drop item.

Fixes .  Thanks to Brian Inglis
for the report.
---
 ChangeLog | 12 
 PROBLEMS  | 15 ---
 src/libs/libxutil/XFontName.c |  4 ++--
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3c3522ddf..a2d7fbb71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-03-16  G. Branden Robinson 
+
+   * src/libs/libxutil/XFontName.c (utoa): Rename function from
+   this...
+   (xu_utoa): ...to this, to avoid name collision when using
+   "newlib" portability library.
+   (XFormatFontName): Update call site.
+   * PROBLEMS: Drop item.
+
+   Fixes .  Thanks to Brian
+   Inglis for the report.
+
 2023-03-13  G. Branden Robinson 
 
[tests]: Add Spanish language support (5/5).
diff --git a/PROBLEMS b/PROBLEMS
index 102d85024..7b99dbb1c 100644
--- a/PROBLEMS
+++ b/PROBLEMS
@@ -922,21 +922,6 @@ Some test failures remain expected on Solaris 10.
 
 --
 
-* I get a build failure on Cygwin / a system using newlib and GCC 11.
-
-  "newlib" defines a function called "utoa" which conflicts with a
-  static (file scope-local) function in src/libs/libxutil/XFontName.c.
-
-  We expect to fix this in the near future; in the meantime, you can
-  patch the file to rename the function (and update its call sites) or,
-  if you don't require the "gxditview" output previewer or "xtotroff"
-  utility, you can build groff without X11 support.
-
-  $ make distclean
-  $ ./configure --without-x
-
---
-
 * I am building from the Git repository, using 'autoreconf' from a GNU
   Autoconf release earlier than 2.69, and I get this.
 
diff --git a/src/libs/libxutil/XFontName.c b/src/libs/libxutil/XFontName.c
index 81ccdaab2..fd31b6f14 100644
--- a/src/libs/libxutil/XFontName.c
+++ b/src/libs/libxutil/XFontName.c
@@ -119,7 +119,7 @@ XParseFontName (XFontNameString fontNameString, XFontName 
*fontName,
 }
 
 static char *
-utoa (unsigned int u, char *s, int size)
+xu_utoa (unsigned int u, char *s, int size)
 {
char*t;
 
@@ -156,7 +156,7 @@ XFormatFontName (XFontName *fontName, unsigned int 
fontNameAttributes,
 
 #define PutUnsigned(field, bit) \
f = (fontNameAttributes & bit) ? \
-   utoa (fontName->field, number, sizeof (number)) \
+   xu_utoa (fontName->field, number, sizeof (number)) \
: (char *)"*"; \
if ((left -= strlen (f)) < 0) \
return False; \

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 10/48: doc/groff.texi (Input Encodings): Tighten wording.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit fdb69f81473eb9df093dc17814047f2def9455a1
Author: G. Branden Robinson 
AuthorDate: Wed Mar 22 17:37:04 2023 -0500

doc/groff.texi (Input Encodings): Tighten wording.

Also annotate a future direction for development of this document.
---
 doc/groff.texi | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/groff.texi b/doc/groff.texi
index ac045b0da..70f0481e0 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -5452,6 +5452,11 @@ load it with the @code{mso} (``macro source'') request.
 
 @c -
 
+@c TODO: Move a lot of this node to the "Invoking groff" chapter.  Some
+@c of the discussion is better placed in discussion of output drivers
+@c (e.g., what character encodings _they_ support for output and their
+@c responsibility for converting to them) as well.
+
 @node Input Encodings, Input Conventions, Macro Packages, Text
 @subsection Input Encodings
 
@@ -5495,8 +5500,7 @@ are interchangeable in their first 128 code 
points.@footnote{The
 with the successive standards, a cause of some frustration among man
 page writers; see the @cite{groff_char@r{(7)}} man page.}
 
-The remaining encodings require support that is not built-in to the GNU
-@code{troff} executable; instead, they use macro packages.
+Other encodings are supported by means of macro packages.
 
 @table @code
 @item latin2

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 42/48: [tmac]: Add Spanish language support (3/5).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 71d52c45ccf18f2f9aa619dc5ddb0c4ba0e6cb6b
Author: G. Branden Robinson 
AuthorDate: Mon Mar 13 13:38:57 2023 -0500

[tmac]: Add Spanish language support (3/5).

* tmac/hyphen.es:
* tmac/es.tmac: Update editor aids.

It doesn't seem to be necessary to specify the file encoding for these
files; GNU Emacs and Vim have no trouble figuring it out.  It helps that
(unlike the French localization files), these use no code points that
differ between Latin-1 and Latin-9, so an assumption of either encoding
works out fine.
---
 ChangeLog  | 7 +++
 tmac/es.tmac   | 3 +--
 tmac/hyphen.es | 6 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c47cade70..cb26cd28e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-03-13  G. Branden Robinson 
+
+   [tmac]: Add Spanish language support (3/5).
+
+   * tmac/hyphen.es:
+   * tmac/es.tmac: Update editor aids.
+
 2023-03-13  G. Branden Robinson 
 
[tmac]: Add Spanish language support (2/5).
diff --git a/tmac/es.tmac b/tmac/es.tmac
index 42c22b1bd..0a3e1fef5 100644
--- a/tmac/es.tmac
+++ b/tmac/es.tmac
@@ -199,7 +199,6 @@
 .
 .\" Local Variables:
 .\" mode: nroff
-.\" coding: latin-9
 .\" fill-column: 72
 .\" End:
-.\" vim: set fileencoding=iso-8859-15 filetype=groff textwidth=72:
+.\" vim: set filetype=groff textwidth=72:
diff --git a/tmac/hyphen.es b/tmac/hyphen.es
index 943841424..abfe2760f 100644
--- a/tmac/hyphen.es
+++ b/tmac/hyphen.es
@@ -2173,3 +2173,9 @@ di4e5léc
 7u4niversid
 5u4niversit
 }
+
+% Local Variables:
+% mode: tex
+% fill-column: 72
+% End:
+% vim: set filetype=tex textwidth=72:

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 01/48: ChangeLog: Annotate regression fix.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 2dbc06bc28b1f1df5deb6b9534c2231b0d17d2b4
Author: G. Branden Robinson 
AuthorDate: Mon Mar 20 17:41:16 2023 -0500

ChangeLog: Annotate regression fix.
---
 ChangeLog | 4 
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c29e8579c..9ce442ae0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -180,6 +180,10 @@
* doc/doc.am (uninstall-html): Uninstall HTML version of our
Texinfo manual more reliably.
 
+   Fixes a regression introduced by me in commit c2698aade, 6 April
+   {my claim "we're only deleting files with this command, not
+   directories" was not correct}.
+
 2023-02-22  G. Branden Robinson 
 
[doc]: Handle output formats of our Texinfo manual more

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 37/48: [tmac]: Add Russian language support (5/7).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 3b117979b4458cdc18ca7cc327181934b55c73fe
Author: G. Branden Robinson 
AuthorDate: Wed Mar 8 04:40:33 2023 -0600

[tmac]: Add Russian language support (5/7).

* tmac/tmac.am (TMACNORMALFILES): Ship new Russian language support
  files.
---
 ChangeLog| 7 +++
 tmac/tmac.am | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7280d46e0..cc60fb8fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-03-08  G. Branden Robinson 
+
+   [tmac]: Add Russian language support (5/7).
+
+   * tmac/tmac.am (TMACNORMALFILES): Ship new Russian language
+   support files.
+
 2023-03-08  G. Branden Robinson 
 
[tmac]: Add Russian language support (4/7).
diff --git a/tmac/tmac.am b/tmac/tmac.am
index d7f67d2f6..d44eac4c0 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -61,6 +61,7 @@ TMACNORMALFILES = \
   tmac/latin5.tmac \
   tmac/latin9.tmac \
   tmac/cp1047.tmac \
+  tmac/koi8-r.tmac \
   tmac/X.tmac \
   tmac/Xps.tmac \
   tmac/lj4.tmac \
@@ -85,6 +86,8 @@ TMACNORMALFILES = \
   tmac/hyphen.fr \
   tmac/it.tmac \
   tmac/hyphen.it \
+  tmac/ru.tmac \
+  tmac/hyphen.ru \
   tmac/sv.tmac \
   tmac/hyphen.sv \
   tmac/de.tmac \

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 04/48: NEWS: Clarify.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit b38df1b9b3f6cd5d98e8d0dd9b5b558efb5a38b5
Author: G. Branden Robinson 
AuthorDate: Mon Mar 27 11:09:29 2023 -0500

NEWS: Clarify.

Thanks to Ralph Corderoy for the suggestion.
---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 3259c7101..9a9cf3b88 100644
--- a/NEWS
+++ b/NEWS
@@ -104,7 +104,7 @@ o nroff now recognizes the -b, -E, -k, -K, -R, and -z 
options and passes
   them through to groff.
 
 o nroff now supports spaces and tabs between option flag letters and
-  option arguments, like groff and troff themselves.
+  arguments to options, like groff and troff themselves.
 
 groff
 -

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 44/48: [tests]: Add Spanish language support (5/5).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit ea4835e8844303b41905d421b812e78fcb329ba1
Author: G. Branden Robinson 
AuthorDate: Mon Mar 13 14:22:03 2023 -0500

[tests]: Add Spanish language support (5/5).

* src/roff/groff/tests/localization_works.sh:
* tmac/tests/e_ld-works.sh: Test it.

Fixes .  Thanks to Eloi Montañés.

Also thanks to Dave Kemper, who has been patiently offering me a tall
glass labelled "use 'groff -a' to regression-test formatter output" for
years, and from which I have been slow to drink.
---
 ChangeLog  | 10 ++
 src/roff/groff/tests/localization_works.sh |  4 
 tmac/tests/e_ld-works.sh   | 14 ++
 3 files changed, 28 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 49e211228..3c3522ddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-03-13  G. Branden Robinson 
+
+   [tests]: Add Spanish language support (5/5).
+
+   * src/roff/groff/tests/localization_works.sh:
+   * tmac/tests/e_ld-works.sh: Test it.
+
+   Fixes .  Thanks to Eloi
+   Montañés.
+
 2023-03-13  G. Branden Robinson 
 
[docs]: Add Spanish language support (4/5).
diff --git a/src/roff/groff/tests/localization_works.sh 
b/src/roff/groff/tests/localization_works.sh
index 24cc6dcb0..a6f68b672 100755
--- a/src/roff/groff/tests/localization_works.sh
+++ b/src/roff/groff/tests/localization_works.sh
@@ -40,6 +40,10 @@ echo "testing English localization" >&2
 OUTPUT=$(echo "$DOC" | "$groff" -Tascii -m en)
 echo "$OUTPUT" | grep -qx english
 
+echo "testing Spanish localization" >&2
+OUTPUT=$(echo "$DOC" | "$groff" -Tascii -m es)
+echo "$OUTPUT" | grep -qx spanish
+
 echo "testing French localization" >&2
 OUTPUT=$(echo "$DOC" | "$groff" -Tascii -m fr)
 echo "$OUTPUT" | grep -qx french
diff --git a/tmac/tests/e_ld-works.sh b/tmac/tests/e_ld-works.sh
index 4af1f5f76..06e833008 100755
--- a/tmac/tests/e_ld-works.sh
+++ b/tmac/tests/e_ld-works.sh
@@ -46,6 +46,8 @@ wail () {
 output=$(printf "%s\n" "$input" | "$groff" -Tascii -P-cbou -me)
 output_cs=$(printf "%s\n" "$input" | "$groff" -Tutf8 -P-cbou -me -mcs)
 output_de=$(printf "%s\n" "$input" | "$groff" -Tutf8 -P-cbou -me -mde)
+output_es=$(printf "%s\n" "$input" \
+| "$groff" -Tutf8 -P-cbou -me -mes -a)
 output_fr=$(printf "%s\n" "$input" | "$groff" -Tutf8 -P-cbou -me -mfr)
 output_it=$(printf "%s\n" "$input" | "$groff" -Tutf8 -P-cbou -me -mit)
 output_ru=$(printf "%s\n" "$input" \
@@ -92,6 +94,18 @@ echo "$output_de" | grep -Eqx ' +Kapitel 1' || wail
 echo 'checking for correct German "Appendix" string' >&2
 echo "$output_de" | grep -Eqx ' +Anhang A' || wail
 
+# Spanish localization
+echo "$output_es"
+echo 'checking that `td` string updated correctly for Spanish' >&2
+echo "$output_es" \
+| grep -q 'The day was lunes, 15 de diciembre de 2008\.$' || wail
+
+echo 'checking for correct Spanish "Chapter" string' >&2
+echo "$output_es" | grep -Eqx " +Cap<'i>tulo 1" || wail
+
+echo 'checking for correct Spanish "Appendix" string' >&2
+echo "$output_es" | grep -Eqx ' +Anexo A' || wail
+
 # French localization
 echo 'checking that `td` string updated correctly for French (1)' >&2
 echo "$output_fr" | grep -q 'The day was Lundi, 15 D'

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 29/48: [gropdf]: Drop pdfmom's new '-roff' option.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit bea402e2c4254e1eedfae510d6b54e5ca61b6fa0
Author: G. Branden Robinson 
AuthorDate: Thu Mar 16 22:15:03 2023 -0500

[gropdf]: Drop pdfmom's new '-roff' option.

...retaining '--roff'.

'-roff' syntactically collides with the groff option '-roff', which
creates a register named 'o' with the value 'ff' (which is rejected
because it is not in a numeric format).  While the two uses can be
distinguished on this basis alone, in my opinion it makes the waters too
murky.  (In the event GNU troff learned to interpret hexadecimal number
format, it would then be a serious collision.)

* src/devices/gropdf/pdfmom.pl: Do it.
* src/devices/gropdf/pdfmom.1.man: Document the double-dash form
  exclusively.

Also fix style and content nits in the explanation of this mode of
operation in pdfmom(1).
---
 ChangeLog   | 16 
 src/devices/gropdf/pdfmom.1.man | 25 +++--
 src/devices/gropdf/pdfmom.pl|  2 +-
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a7993a0e..cf20cce12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2023-03-16  G. Branden Robinson 
+
+   [gropdf]: Drop pdfmom's new '-roff' option, retaining '--roff'.
+
+   '-roff' syntactically collides with the groff option '-roff',
+   which creates a register named 'o' with the value 'ff' (which is
+   rejected because it is not in a numeric format).  While the two
+   uses can be distinguished on this basis alone, in my opinion it
+   makes the waters too murky.  (In the event GNU troff learned to
+   interpret hexadecimal number format, it would then be a serious
+   collision.)
+
+   * src/devices/gropdf/pdfmom.pl: Do it.
+   * src/devices/gropdf/pdfmom.1.man: Document the double-dash form
+   exclusively.
+
 2023-03-14  Deri James  
 
[gropdf]: Make pdfmom more versatile.
diff --git a/src/devices/gropdf/pdfmom.1.man b/src/devices/gropdf/pdfmom.1.man
index 64176cd03..1bbaaaf70 100644
--- a/src/devices/gropdf/pdfmom.1.man
+++ b/src/devices/gropdf/pdfmom.1.man
@@ -10,7 +10,7 @@ macro package for
 .\" Legal Terms
 .\" 
 .\"
-.\" Copyright (C) 2012-2020 Free Software Foundation, Inc.
+.\" Copyright (C) 2012-2023 Free Software Foundation, Inc.
 .\"
 .\" Permission is granted to make and distribute verbatim copies of this
 .\" manual provided the copyright notice and this permission notice are
@@ -53,14 +53,15 @@ macro package for
 .\" 
 .
 .SY pdfmom
+.RB [ \-\-roff ]
 .RB [ \-Tpdf ]
-.RB [ \-roff ]
 .RI [ groff-options ]
 .RI [ file\~ .\|.\|.]
 .YS
 .
 .
 .SY pdfmom
+.RB [ \-\-roff ]
 .B \-Tps
 .RI [ pdfroff-options ]
 .RI [ groff-options ]
@@ -91,17 +92,21 @@ macros.
 .
 .P
 If the
-.B \-roff
-option is used the link to
-.I mom
-is severed and the wrapper can be used with other macro sets.
+.B \-\-roff
+option is used,
+the wrapper can be used with macro packages other than
+.MR groff_mom @MAN7EXT@ .
+.
 This is also true if the wrapper is renamed or linked as a
-pseudonym, so creating a link called
+pseudonym;
+for example,
+creating a
 .I pdfms
-which targets pdfmom will create a wrapper for creating pdfs
-with the
+link pointing to the
+.I pdfmom
+executable makes a wrapper for producing PDFs with the
 .I ms
-macro.
+package.
 .
 .
 .P
diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl
index 3a410d8ad..93a04410f 100644
--- a/src/devices/gropdf/pdfmom.pl
+++ b/src/devices/gropdf/pdfmom.pl
@@ -86,7 +86,7 @@ while (my $c=shift)
$dev=$c;
next;
 }
-elsif ($c eq '-roff' or $c eq '--roff')
+elsif ($c eq '--roff')
 {
 $mom='';
 }

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 02/48: PROBLEMS: Fix typo.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 003a1823f9193892b8325b53c452a43cb446d160
Author: G. Branden Robinson 
AuthorDate: Tue Mar 14 18:50:32 2023 -0500

PROBLEMS: Fix typo.
---
 PROBLEMS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PROBLEMS b/PROBLEMS
index 0aa428f09..102d85024 100644
--- a/PROBLEMS
+++ b/PROBLEMS
@@ -917,7 +917,7 @@ Some test failures remain expected on Solaris 10.
 1
 
 You may disregard these failures, edit the test scripts to append
-"|| true" to the "unset" commends, or change the scripts to use GNU
+"|| true" to the "unset" commands, or change the scripts to use GNU
 Bash or some other POSIX-conforming shell as illustrated above.
 
 --

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 38/48: [docs]: Add Russian language support (6/7).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 605d9bbbe1fdc7f971427af6737ed2338b427dbc
Author: G. Branden Robinson 
AuthorDate: Wed Mar 8 05:04:42 2023 -0600

[docs]: Add Russian language support (6/7).

* doc/groff.texi (Input Encodings, Manipulating Hyphenation):
* doc/ms.ms:
* man/groff_tmac.5.man (Localization packages, Input encodings):
  Document support for KOI8-R encoding and Russian language.
---
 ChangeLog|  9 +
 doc/groff.texi   | 20 
 doc/ms.ms|  3 ++-
 man/groff_tmac.5.man | 32 
 4 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cc60fb8fc..20016ac0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-03-08  G. Branden Robinson 
+
+   [docs]: Add Russian language support (6/7).
+
+   * doc/groff.texi (Input Encodings, Manipulating Hyphenation):
+   * doc/ms.ms:
+   * man/groff_tmac.5.man (Localization packages, Input encodings):
+   Document support for KOI8-R encoding and Russian language.
+
 2023-03-08  G. Branden Robinson 
 
[tmac]: Add Russian language support (5/7).
diff --git a/doc/groff.texi b/doc/groff.texi
index 70f0481e0..8bb46544a 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -5503,6 +5503,23 @@ page writers; see the @cite{groff_char@r{(7)}} man page.}
 Other encodings are supported by means of macro packages.
 
 @table @code
+@item koi8-r
+@cindex encoding, input, @w{KOI8-R}
+@cindex @w{KOI8-R}, input encoding
+@cindex input encoding, @w{KOI8-R}
+@pindex koi8-r.tmac
+To use @w{KOI8-R}, an encoding for the Russian language, either place
+@w{@samp{.mso koi8-r.tmac}} at the very beginning of your document or
+supply @samp{-mkoi8-r} as a command-line argument to @code{groff}.  The
+localization file @file{ru.tmac} takes care of this automatically; see
+@ref{Manipulating Hyphenation}.@footnote{KOI8-R code points in the range
+@code{0x80}--@code{0x9F} are not valid input on systems using ISO
+character codings natively; see @code{Identifiers}.  This should be no
+impediment to practical documents, as these KOI8-R code points do not
+encode letters, but box-drawing symbols and characters that are better
+obtained via special character escape sequences; see the
+@cite{groff_char@r{(7)}} man page.}
+
 @item latin2
 @cindex encoding, input, @w{Latin-2} (ISO @w{8859-2})
 @cindex @w{Latin-2} (ISO @w{8859-2}), input encoding
@@ -8511,6 +8528,7 @@ together because they contradict; for instance, values 4 
and@tie{}16,
 and values 8 and@tie{}32.  As noted, it is superfluous to add 1 to any
 nonzero even mode.
 
+@c TODO: Add @pindex for hyphenation pattern and exception files.
 @cindex hyphenation pattern files
 @cindex pattern files, for hyphenation
 The automatic placement of hyphens in words is determined by
@@ -8558,6 +8576,7 @@ the @cite{groff_tmac@r{(5)}} man page for more 
information on GNU
 @itemGerman traditional @tab det  @tab 2@tab 2
 @itemGerman reformed@tab den  @tab 2@tab 2
 @itemItalian@tab it   @tab 2@tab 2
+@itemRussian@tab ru   @tab 2@tab 2
 @itemSwedish@tab sv   @tab 1@tab 2
 @end multitable
 
@@ -8641,6 +8660,7 @@ be used.  By default, every code maps to itself except 
those for letters
 @pindex fr.tmac
 @pindex it.tmac
 @pindex ja.tmac
+@pindex ru.tmac
 @pindex sv.tmac
 @pindex zh.tmac
 The set of hyphenation patterns is associated with the language set by
diff --git a/doc/ms.ms b/doc/ms.ms
index a3573e6b4..e532f7356 100644
--- a/doc/ms.ms
+++ b/doc/ms.ms
@@ -3006,11 +3006,12 @@ provides several strings that you can customize for 
your own purposes,
 or redefine to adapt the macro package to languages other than English.
 .
 It is already localized for
-.\" cs, de, fr, it, sv
+.\" cs, de, fr, it, ru, sv
 Czech,
 German,
 French,
 Italian,
+Russian,
 and
 Swedish.
 .
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.5.man
index df9ad639b..bc46cc539 100644
--- a/man/groff_tmac.5.man
+++ b/man/groff_tmac.5.man
@@ -395,6 +395,21 @@ Japanese.
 .
 .
 .TP
+.I ru
+Russian;
+localizes
+.IR man ,
+.IR me ,
+.IR mm ,
+.IR mom ,
+and
+.IR ms .
+.
+Sets the input encoding to KOI8-R by loading
+.IR koi8-r.tmac .
+.
+.
+.TP
 .I sv
 Swedish;
 localizes
@@ -458,6 +473,23 @@ loads
 automatically at startup.
 .
 .
+.TP
+.I koi8\-r
+provides support for the KOI8-R encoding.
+.
+KOI8-R code points in the range 0x80\[en]0x9F are not valid input on
+systems using ISO character codings natively;
+see section \[lq]Identifiers\[rq] in
+.MR groff @MAN7EXT@ .
+.
+This should be no impediment to practical documents,
+as these KOI8-R code points do not encode letters,
+but box-drawing symbols and characters that are better obtained via
+special character escape sequences;
+see
+.MR groff_char @MAN7EXT@ .
+.
+.
 .P
 

[groff] 03/48: HACKING: Stop saying automake.pdf isn't installed.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit dd3bb3cddbb0950a7babddccc97accc17d76
Author: G. Branden Robinson 
AuthorDate: Sun Mar 19 02:34:03 2023 -0500

HACKING: Stop saying automake.pdf isn't installed.

...because it is.
---
 HACKING | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/HACKING b/HACKING
index b0e78e679..f34c71a1f 100644
--- a/HACKING
+++ b/HACKING
@@ -14,8 +14,7 @@ Automake
 
 
 A document explaining the basics of GNU Automake and its usage in groff
-is available in 'doc/automake.mom'; a PDF rendering is built but not
-installed, since it is a developer-facing discussion.  Peruse it in
+is available in 'doc/automake.mom'; peruse a PDF rendering in
 'doc/automake.pdf' in your build tree.
 
 

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 19/48: [mom]: Fix doubled words in documentation.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit eda08b00b4fe1df30a9c8ae74b4e7173c3f6fab3
Author: G. Branden Robinson 
AuthorDate: Thu Mar 30 11:44:06 2023 -0500

[mom]: Fix doubled words in documentation.
---
 contrib/mom/examples/copyright-chapter.mom | 2 +-
 contrib/mom/examples/copyright-default.mom | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/mom/examples/copyright-chapter.mom 
b/contrib/mom/examples/copyright-chapter.mom
index fa537d88a..261c7122d 100644
--- a/contrib/mom/examples/copyright-chapter.mom
+++ b/contrib/mom/examples/copyright-chapter.mom
@@ -14,7 +14,7 @@ the START macro to begin each chapter, and the COLLATE macro 
to join
 it to the subsequent chapter.
 .
 A copyright page (also called an edition page), which is not a
-chapter, should be be treated as a DOCTYPE DEFAULT.  The text of
+chapter, should be treated as a DOCTYPE DEFAULT.  The text of
 the copyright page is entered after START and joined to the first
 chapter (DOCTYPE CHAPTER) with COLLATE.
 .
diff --git a/contrib/mom/examples/copyright-default.mom 
b/contrib/mom/examples/copyright-default.mom
index 9fbea09f0..25a428fbb 100644
--- a/contrib/mom/examples/copyright-default.mom
+++ b/contrib/mom/examples/copyright-default.mom
@@ -14,7 +14,7 @@ Mom documents comprised of titled sections using DOCTYPE 
DEFAULT
 different authors) require the START macro to begin each new
 section, and the COLLATE macro to join it to the subsequent section.
 .
-A copyright page (also called an edition page) should be be treated
+A copyright page (also called an edition page) should be treated
 as a titled section.  The text of the copyright page is entered
 after START and joined to the next major section (i.e. the beginning
 of a document's content) with COLLATE.

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 39/48: [tests]: Add Russian language support (7/7).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 7c39d39b8c320b73f35d3ee68346945065e8a052
Author: G. Branden Robinson 
AuthorDate: Thu Mar 9 11:48:42 2023 -0600

[tests]: Add Russian language support (7/7).

* src/roff/groff/tests/localization_works.sh:
* tmac/tests/e_ld-works.sh: Test it.

Fixes .  Thanks to Nikita Ivanov.
---
 ChangeLog  | 10 ++
 src/roff/groff/tests/localization_works.sh |  4 
 tmac/tests/e_ld-works.sh   | 19 ++-
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 20016ac0e..c3f7ff171 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2023-03-09  G. Branden Robinson 
+
+   [tests]: Add Russian language support (7/7).
+
+   * src/roff/groff/tests/localization_works.sh:
+   * tmac/tests/e_ld-works.sh: Test it.
+
+   Fixes .  Thanks to Nikita
+   Ivanov.
+
 2023-03-08  G. Branden Robinson 
 
[docs]: Add Russian language support (6/7).
diff --git a/src/roff/groff/tests/localization_works.sh 
b/src/roff/groff/tests/localization_works.sh
index 0585259b0..24cc6dcb0 100755
--- a/src/roff/groff/tests/localization_works.sh
+++ b/src/roff/groff/tests/localization_works.sh
@@ -52,6 +52,10 @@ echo "testing Japanese localization" >&2
 OUTPUT=$(echo "$DOC" | "$groff" -Tascii -m ja)
 echo "$OUTPUT" | grep -qx japanese
 
+echo "testing Russian localization" >&2
+OUTPUT=$(echo "$DOC" | "$groff" -Tascii -m ru)
+echo "$OUTPUT" | grep -qx russian
+
 echo "testing Swedish localization" >&2
 OUTPUT=$(echo "$DOC" | "$groff" -Tascii -m sv)
 echo "$OUTPUT" | grep -qx swedish
diff --git a/tmac/tests/e_ld-works.sh b/tmac/tests/e_ld-works.sh
index f3327a817..4af1f5f76 100755
--- a/tmac/tests/e_ld-works.sh
+++ b/tmac/tests/e_ld-works.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2021 Free Software Foundation, Inc.
+# Copyright (C) 2021-2023 Free Software Foundation, Inc.
 #
 # This file is part of groff.
 #
@@ -48,6 +48,8 @@ output_cs=$(printf "%s\n" "$input" | "$groff" -Tutf8 -P-cbou 
-me -mcs)
 output_de=$(printf "%s\n" "$input" | "$groff" -Tutf8 -P-cbou -me -mde)
 output_fr=$(printf "%s\n" "$input" | "$groff" -Tutf8 -P-cbou -me -mfr)
 output_it=$(printf "%s\n" "$input" | "$groff" -Tutf8 -P-cbou -me -mit)
+output_ru=$(printf "%s\n" "$input" \
+| "$groff" -Tutf8 -P-cbou -me -mru -a)
 output_sv=$(printf "%s\n" "$input" | "$groff" -Tutf8 -P-cbou -me -msv)
 
 echo 'checking that `td` string updated correctly for English' >&2
@@ -113,6 +115,21 @@ echo "$output_it" | grep -Eqx ' +Capitolo 1' || wail
 echo 'checking for correct Italian "Appendix" string' >&2
 echo "$output_it" | grep -Eqx ' +Appendice A' || wail
 
+# Russian localization
+echo 'checking that `td` string updated correctly for Russian' >&2
+echo "$output_ru" | sed -n '4p' \
+| grep -Fqx ' The day was 
, 
15  2008.' \
+|| wail
+
+echo 'checking for correct Russian "Chapter" string' >&2
+echo "$output_ru" | sed -n '2p' \
+| grep -Fqx '  1' || wail
+
+echo 'checking for correct Russian "Appendix" string' >&2
+echo "$output_ru" | sed -n '6p' \
+| grep -Fqx ' 
 A' \
+|| wail
+
 # Swedish localization
 echo 'checking that `td` string updated correctly for Swedish (1)' >&2
 echo "$output_sv" | grep -q 'The day was m' || wail

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 30/48: [build, man]: Fix Savannah #63924.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit ae292ea796883234b48012a30c59370aee016581
Author: G. Branden Robinson 
AuthorDate: Tue Mar 14 18:57:37 2023 -0500

[build, man]: Fix Savannah #63924.

* tmac/tmac.am (tmac/stamp-wrap): Stop prepending groff's man(7) package
  wrapper ("-man") on hosts with a system man package with a request to
  source itself; this was search-and-replace damage from resolving
  Savannah #60789.  The wrapper still worked, but reported any errors
  inside the wrapped macro package many times until the process ran out
  of file descriptors.  Problem introduced by me in commit fdac25937f,
  2021-07-05.

Fixes .

Discovered while testing on Solaris 10.
---
 ChangeLog| 12 
 tmac/tmac.am |  3 ---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf20cce12..1d65e465d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-03-14  G. Branden Robinson 
+
+   * tmac/tmac.am (tmac/stamp-wrap): Stop prepending groff's man(7)
+   package wrapper ("-man") on hosts with a system man package with
+   a request to source itself; this was search-and-replace damage
+   from resolving Savannah #60789.  The wrapper still worked, but
+   reported any errors inside the wrapped macro package many times
+   until the process ran out of file descriptors.  Problem
+   introduced by me in commit fdac25937f, 2021-07-05.
+
+   Fixes .
+
 2023-03-16  G. Branden Robinson 
 
[gropdf]: Drop pdfmom's new '-roff' option, retaining '--roff'.
diff --git a/tmac/tmac.am b/tmac/tmac.am
index 437297acb..fce4d894c 100644
--- a/tmac/tmac.am
+++ b/tmac/tmac.am
@@ -305,9 +305,6 @@ tmac/stamp-wrap:
$(AM_V_at)if test -n "$(tmac_wrap)"; then \
  for m in ""$(tmac_wrap); do \
$(RM) $(top_builddir)/tmac/$$m-wrap; \
-   if test "$$m" = an; then \
- echo .do mso an.tmac >>$(top_builddir)/tmac/$$m-wrap; \
-   fi; \
echo .cp 1 >>$(top_builddir)/tmac/$$m-wrap; \
echo .so $(sys_tmac_prefix)$$m \
  >>$(top_builddir)/tmac/$$m-wrap; \

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 47/48: [tbl]: Trivially refactor ("line" -> "rule").

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 059068a7a2f3f8ebfcad4e87f68a61231b55aa89
Author: G. Branden Robinson 
AuthorDate: Sat Feb 4 01:20:08 2023 -0600

[tbl]: Trivially refactor ("line" -> "rule").

[tbl]: Trivially refactor.  Rename variables and functions to
use the term "rule" rather than "line".  The value of the term
"rule" is that it is not confusable with "lines" of (text) input
or output.

* src/preproc/tbl/main.cpp
  (struct format) :
  (format::format) :
  (format::add_rows) :
  (format::~format) :
  (struct input_entry_format) :
  (input_entry_format::input_entry_format) :
  (input_entry_format::debug_print) :
  (process_format) :
  (process_data) ([anonymous] enum) :
* src/preproc/tbl/table.cpp:
* src/preproc/tbl/table.h
  (enum format_type) 
  (class table) , add_single_hline,
  add_double_hline, add_vlines, print_single_hline, print_double_hline:
  Rename these...

* src/preproc/tbl/main.cpp
  (struct format) :
  (format::format) :
  (format::add_rows) :
  (format::~format) :
  (struct input_entry_format) :
  (input_entry_format::input_entry_format) :
  (input_entry_format::debug_print) :
  (process_format) :
  (process_data) ([anonymous] enum) :
* src/preproc/tbl/table.cpp:
* src/preproc/tbl/table.h
  (enum format_type) 
  (class table) , add_single_hrule,
  add_double_hrule, add_vrules, print_single_hrule,
  print_double_hrule: ...to these.
---
 ChangeLog |  41 +
 src/preproc/tbl/main.cpp  | 108 +--
 src/preproc/tbl/table.cpp | 114 +++---
 src/preproc/tbl/table.h   |  22 -
 4 files changed, 163 insertions(+), 122 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 234973970..a6286cad9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+2023-03-07  G. Branden Robinson 
+
+   [tbl]: Trivially refactor.  Rename variables and functions to
+   use the term "rule" rather than "line".  The value of the term
+   "rule" is that it is not confusable with "lines" of (text) input
+   or output.
+
+   * src/preproc/tbl/main.cpp (struct format) :
+   (format::format) :
+   (format::add_rows) :
+   (format::~format) :
+   (struct input_entry_format) :
+   (input_entry_format::input_entry_format) :
+   (input_entry_format::debug_print) :
+   (process_format) :
+   (process_data) ([anonymous] enum) :
+   * src/preproc/tbl/table.cpp:
+   * src/preproc/tbl/table.h (enum format_type) 
+   (class table) , add_single_hline,
+   add_double_hline, add_vlines, print_single_hline,
+   print_double_hline: Rename these...
+
+   * src/preproc/tbl/main.cpp (struct format) :
+   (format::format) :
+   (format::add_rows) :
+   (format::~format) :
+   (struct input_entry_format) :
+   (input_entry_format::input_entry_format) :
+   (input_entry_format::debug_print) :
+   (process_format) :
+   (process_data) ([anonymous] enum) :
+   * src/preproc/tbl/table.cpp:
+   * src/preproc/tbl/table.h (enum format_type) 
+   (class table) , add_single_hrule,
+   add_double_hrule, add_vrules, print_single_hrule,
+   print_double_hrule: ...to these.
+
 2023-02-25  G. Branden Robinson 
 
[tbl]: Fix Savannah #63838.
diff --git a/src/preproc/tbl/main.cpp b/src/preproc/tbl/main.cpp
index db105c217..61265538d 100644
--- a/src/preproc/tbl/main.cpp
+++ b/src/preproc/tbl/main.cpp
@@ -575,10 +575,10 @@ void entry_format::debug_print() const
   case FORMAT_VSPAN:
 putc('^', stderr);
 break;
-  case FORMAT_HLINE:
+  case FORMAT_HRULE:
 putc('_', stderr);
 break;
-  case FORMAT_DOUBLE_HLINE:
+  case FORMAT_DOUBLE_HRULE:
 putc('=', stderr);
 break;
   default:
@@ -635,7 +635,7 @@ struct format {
   char *equal;
   char *expand;
   entry_format **entry;
-  char **vline;
+  char **vrule;
 
   format(int nr, int nc);
   ~format();
@@ -658,26 +658,26 @@ format::format(int nr, int nc) : nrows(nr), ncolumns(nc)
   entry = new entry_format *[nrows];
   for (i = 0; i < nrows; i++)
 entry[i] = new entry_format[ncolumns];
-  vline = new char*[nrows];
+  vrule = new char*[nrows];
   for (i = 0; i < nrows; i++) {
-vline[i] = new char[ncolumns+1];
+vrule[i] = new char[ncolumns+1];
 for (int j = 0; j < ncolumns+1; j++)
-  vline[i][j] = 0;
+  vrule[i][j] = 0;
   }
 }
 
 void format::add_rows(int n)
 {
   int i;
-  char **old_vline = vline;
-  vline = new char*[nrows + n];
+  char **old_vrule = vrule;
+  vrule = new char*[nrows + n];
   for (i = 0; i < nrows; i++)
-vline[i] = old_vline[i];
-  delete[] old_vline;
+vrule[i] = old_vrule[i];
+  delete[] old_vrule;
   for (i = 0; i < n; i++) {
-vline[nrows + i] = new char[ncolumns + 1];
+

[groff] 26/48: m4/groff.m4: Drop garbage space from variable.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 6ef4e1c1a81b5332a281970ea64c6d78f071c5e1
Author: G. Branden Robinson 
AuthorDate: Mon Mar 13 22:31:57 2023 -0500

m4/groff.m4: Drop garbage space from variable.

* m4/groff.m4 (GROFF_TMAC): Eliminate garbage leading space from
  contents of `tmac_wrap` shell variable.
---
 ChangeLog   |  5 +
 m4/groff.m4 | 11 ---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c9cc02f1..7e06d54ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2023-03-13  G. Branden Robinson 
+
+   m4/groff.m4 (GROFF_TMAC): Eliminate garbage leading space from
+   contents of `tmac_wrap` shell variable.
+
 2023-03-13  G. Branden Robinson 
 
[build]: Clarify output of `GROFF_TMAC` Autoconf test.
diff --git a/m4/groff.m4 b/m4/groff.m4
index 4ad3a2679..01c8578d0 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1146,6 +1146,7 @@ AC_DEFUN([GROFF_TMAC],
 
AC_MSG_CHECKING([for system macro packages to make available])
tmac_wrap=
+   space=
if test "$sys_tmac_file_prefix" = tmac.
then
  for f in $sys_tmac_prefix*
@@ -1155,8 +1156,11 @@ AC_DEFUN([GROFF_TMAC],
e)
  ;;
*)
- grep "Copyright.*Free Software Foundation" $f >/dev/null \
-  || tmac_wrap="$tmac_wrap $suff" ;;
+ if ! grep "Copyright.*Free Software Foundation" $f >/dev/null
+ then
+   tmac_wrap="$tmac_wrap$space$suff"
+   space=' '
+ fi ;;
esac
  done
elif test -n "$sys_tmac_prefix"
@@ -1185,7 +1189,8 @@ AC_DEFUN([GROFF_TMAC],
tmac.*)
  ;;
*)
- tmac_wrap="$tmac_wrap $suff" ;;
+ tmac_wrap="$tmac_wrap$space$suff"
+ space=' ' ;;
esac
  fi
esac

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 40/48: [tmac]: Add Spanish language support (1/5).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 4d086da7e189e290d761c9f6904519d7869d9bfe
Author: Eloi Montañés 
AuthorDate: Mon Mar 13 12:03:02 2023 +0100

[tmac]: Add Spanish language support (1/5).

* tmac/hyphen.es: Add hyphenation patterns (encoded in Latin-9).
* tmac/es.tmac: Add groff locale for Spanish.
* tmac/tmac.am (TMACNORMALFILES): Ship new files.
* doc/groff.texi (Manipulating Hyphenation): Add file/package index
  entry for "es.tmac".
* LICENSES: Update for CTAN Spanish hyphenation patterns.
---
 ChangeLog  |   11 +
 LICENSES   |   12 +
 doc/groff.texi |1 +
 tmac/es.tmac   |  205 ++
 tmac/hyphen.es | 2175 
 tmac/tmac.am   |2 +
 6 files changed, 2406 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index c3f7ff171..2102843ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2023-03-13  Eloi Montañés 
+
+   [tmac]: Add Spanish language support (1/5).
+
+   * tmac/hyphen.es: Add hyphenation patterns (encoded in Latin-9).
+   * tmac/es.tmac: Add groff locale for Spanish.
+   * tmac/tmac.am (TMACNORMALFILES): Ship new files.
+   * doc/groff.texi (Manipulating Hyphenation): Add file/package
+ index entry for "es.tmac".
+   * LICENSES: Update for CTAN Spanish hyphenation patterns.
+
 2023-03-09  G. Branden Robinson 
 
[tests]: Add Russian language support (7/7).
diff --git a/LICENSES b/LICENSES
index 504a817a2..9c12ee195 100644
--- a/LICENSES
+++ b/LICENSES
@@ -156,6 +156,18 @@ TeX-related projects.
   are permitted in any medium without royalty provided the copyright
   notice and this notice are preserved.
 
+* "tmac/hyphen.es" is renamed from "hyph-es.tex", obtained from
+  
+
+  Copyright (C) 1993, 1997 Javier Bezos, 2001-2019 Javier Bezos,
+  CervanTeX
+
+  Licensed under the MIT license. Full license text available from
+
+http://opensource.org/licenses/mit-license.php
+
 * "tmac/hyphen.fr" is renamed from "frhyph.tex", obtained from
   .
 
diff --git a/doc/groff.texi b/doc/groff.texi
index 8bb46544a..42ad748ba 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -8657,6 +8657,7 @@ be used.  By default, every code maps to itself except 
those for letters
 @pindex cs.tmac
 @pindex de.tmac
 @pindex en.tmac
+@pindex es.tmac
 @pindex fr.tmac
 @pindex it.tmac
 @pindex ja.tmac
diff --git a/tmac/es.tmac b/tmac/es.tmac
new file mode 100644
index 0..b5eb7fc42
--- /dev/null
+++ b/tmac/es.tmac
@@ -0,0 +1,205 @@
+.\" Spanish localization for groff
+.\"
+.\" Copyright (C) 2023 Free Software Foundation, Inc.
+.\"   Written by Eloi Monta��s (e...@ilsrv.com)
+.\"
+.\" This file is part of groff.
+.\"
+.\" groff is free software; you can redistribute it and/or modify it
+.\" under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation, either version 3 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" groff is distributed in the hope that it will be useful, but WITHOUT
+.\" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+.\" or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+.\" License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see
+.\" .
+.\"
+.\" Please send comments to e...@ilsrv.com.
+.
+.do nr *groff_es_tmac_C \n[.cp]
+.cp 0
+.
+.
+.\" If changing from an existing locale, we need to preserve the state
+.\" of the "suppress hyphenation before a page location trap" bit.
+.nr locale*use-trap-hyphenation-mode 0
+.if d locale \
+.  if \n[.hy]=\n[\*[locale]*hyphenation-mode-trap] \
+.nr locale*use-trap-hyphenation-mode 1
+.
+.
+.ds locale spanish\"
+.
+.
+.\" Predefined text translations
+.
+.ds \*[locale]-abstract SINOPSIS\"
+.ds \*[locale]-app ANEXO\"
+.ds \*[locale]-appendix_string Anexo\"
+.ds \*[locale]-april Abril\"
+.ds \*[locale]-attribute_string por\"
+.ds \*[locale]-august Agosto\"
+.ds \*[locale]-chapter_string Cap\[' i]tulo\"
+.ds \*[locale]-december Diciembre\"
+.ds \*[locale]-draft_string Borrador\"
+.ds \*[locale]-endnote_string NOTAS\"
+.ds \*[locale]-february Febrero\"
+.ds \*[locale]-finis_string FIN\"
+.ds \*[locale]-friday Viernes\"
+.ds \*[locale]-january Enero\"
+.ds \*[locale]-july Julio\"
+.ds \*[locale]-june Junio\"
+.ds \*[locale]-le LISTA DE ECUACIONES\"
+.ds \*[locale]-letapp LE\[' I]DO Y APROVADO\"
+.ds \*[locale]-letat A LA ATENCI\[' O]N DE:\"
+.ds \*[locale]-letcn CONFIDENCIAL\"
+.ds \*[locale]-letdate Fecha\"
+.ds \*[locale]-letfc Por favor acepte, Excelencia, mis mejores saludos.\"
+.ds \*[locale]-letns!0 Copia a\"
+.ds \*[locale]-letns!1 Copia (con 

[groff] 08/48: [docs]: Revise localization discussion.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 2685ecf8213e48bf4f6e27fb77ddbaae6b879b5c
Author: G. Branden Robinson 
AuthorDate: Thu Mar 23 23:36:05 2023 -0500

[docs]: Revise localization discussion.

* doc/groff.texi: Drop staleness-prone material about localization setup
  and specific languages supported; replace with cross reference to
  groff_tmac(5).  This material also doesn't document the formatter per
  se, and so is inappropriate for the "GNU troff reference" chapter.

* man/groff_tmac.5.man (Localization files): Add introductory sentence
  summarizing their purpose.  Add advice regarding the order of their
  loading; thanks to Nikita Ivanov for reporting this omission.

* man/groff_tmac.5.man (Localization files):
* man/groff.7.man (Localization): Improve robustness to future
  development by reorganizing and dropping version number references.

In both documents, refer to "localization files" rather than
"localization packages".
---
 doc/groff.texi   | 13 -
 man/groff.7.man  | 34 +++---
 man/groff_tmac.5.man |  4 +---
 3 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/doc/groff.texi b/doc/groff.texi
index 7e300dbef..ce5f7cdfd 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -8437,7 +8437,7 @@ Set automatic hyphenation mode to @var{mode}, an integer 
encoding
 conditions for hyphenation; if omitted, @samp{1} is implied.  The
 hyphenation mode is available in the read-only register @samp{.hy}; it
 is associated with the environment (@pxref{Environments}).  The default
-hyphenation mode depends on the localization package loaded when GNU
+hyphenation mode depends on the localization file loaded when GNU
 @code{troff} starts up; see the @code{hpf} request below.
 
 Typesetting practice generally does not avail itself of every
@@ -8641,14 +8641,9 @@ be used.  By default, every code maps to itself except 
those for letters
 @pindex zh.tmac
 The set of hyphenation patterns is associated with the language set by
 the @code{hla} request (see below).  The @code{hpf} request is usually
-invoked by a localization file loaded by the @file{troffrc} file.  By
-default, @file{troffrc} loads the localization file for
-English.@footnote{As of @code{groff} 1.23.0, localization files for
-Czech (@code{cs}), German (@code{de}), English (@code{en}), French
-(@code{fr}), Italian (@code{it}), Japanese (@code{ja}), Swedish
-(@code{sv}), and Chinese (@code{zh}) exist.}  For Western languages, the
-localization file sets the hyphenation mode and loads hyphenation
-patterns and exceptions.
+invoked by a localization file loaded by the @file{troffrc}
+file.@footnote{For more on localization, see the
+@cite{groff_tmac@r{(5)}} man page.}
 
 A second call to @code{hpf} (for the same language) replaces the
 hyphenation patterns with the new ones.  Invoking @code{hpf} or
diff --git a/man/groff.7.man b/man/groff.7.man
index 2326b9c3a..b4497330a 100644
--- a/man/groff.7.man
+++ b/man/groff.7.man
@@ -6359,38 +6359,10 @@ request is usually invoked by a localization file 
loaded by the
 .I troffrc
 file.
 .
-By default,
-.I troffrc
-loads the localization file for English.
-.
-(As of
 .I groff
-1.23.0,
-localization files for Czech
-.RI ( cs ),
-German
-.RI ( de ),
-English
-.RI ( en ),
-French
-.RI ( fr ),
-Italian
-.RI ( it ),
-Japanese
-.RI ( ja ),
-Swedish
-.RI ( sv ),
-and Chinese
-.RI ( zh )
-exist.)
-.
-For Western languages,
-the localization file sets the hyphenation mode and loads hyphenation
-patterns and exceptions.
-.
-It also (re-)defines translatable strings and macros that packages use
-to handle localization tasks,
-such as formatting the calendar date.
+provides localization files for several languages;
+see
+.MR groff_tmac @MAN5EXT@ .
 .
 .
 .\" 
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.5.man
index 8126e594f..df9ad639b 100644
--- a/man/groff_tmac.5.man
+++ b/man/groff_tmac.5.man
@@ -312,10 +312,8 @@ localized forms have been prepared by a localization macro 
file.
 .
 .
 .P
-As of
 .I groff
-1.23.0,
-the following localization files exist.
+provides the following localization files.
 .
 .
 .TP

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 43/48: [docs]: Add Spanish language support (4/5).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 3e1d81dc801d4c044e75d5b4425a66a3e7727d1a
Author: G. Branden Robinson 
AuthorDate: Mon Mar 13 13:53:57 2023 -0500

[docs]: Add Spanish language support (4/5).

* doc/groff.texi (Manipulating Hyphenation):
* doc/ms.ms (Language and localization):
* man/groff_tmac.5.man (Localization files): Document it.
---
 ChangeLog|  8 
 doc/groff.texi   |  1 +
 doc/ms.ms|  3 ++-
 man/groff_tmac.5.man | 15 +++
 4 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index cb26cd28e..49e211228 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-03-13  G. Branden Robinson 
+
+   [docs]: Add Spanish language support (4/5).
+
+   * doc/groff.texi (Manipulating Hyphenation):
+   * doc/ms.ms (Language and localization):
+   * man/groff_tmac.5.man (Localization files): Document it.
+
 2023-03-13  G. Branden Robinson 
 
[tmac]: Add Spanish language support (3/5).
diff --git a/doc/groff.texi b/doc/groff.texi
index 42ad748ba..795d91ced 100644
--- a/doc/groff.texi
+++ b/doc/groff.texi
@@ -8577,6 +8577,7 @@ the @cite{groff_tmac@r{(5)}} man page for more 
information on GNU
 @itemGerman reformed@tab den  @tab 2@tab 2
 @itemItalian@tab it   @tab 2@tab 2
 @itemRussian@tab ru   @tab 2@tab 2
+@itemSpanish@tab es   @tab 2@tab 2
 @itemSwedish@tab sv   @tab 1@tab 2
 @end multitable
 
diff --git a/doc/ms.ms b/doc/ms.ms
index e532f7356..8376a71ed 100644
--- a/doc/ms.ms
+++ b/doc/ms.ms
@@ -3006,12 +3006,13 @@ provides several strings that you can customize for 
your own purposes,
 or redefine to adapt the macro package to languages other than English.
 .
 It is already localized for
-.\" cs, de, fr, it, ru, sv
+.\" cs, de, fr, it, ru, es, sv
 Czech,
 German,
 French,
 Italian,
 Russian,
+Spanish,
 and
 Swedish.
 .
diff --git a/man/groff_tmac.5.man b/man/groff_tmac.5.man
index bc46cc539..4a56d717e 100644
--- a/man/groff_tmac.5.man
+++ b/man/groff_tmac.5.man
@@ -363,6 +363,21 @@ English.
 .
 .
 .TP
+.I es
+Spanish;
+localizes
+.IR man ,
+.IR me ,
+.IR mm ,
+.IR mom ,
+and
+.IR ms .
+.
+Sets the input encoding to Latin-9 by loading
+.IR latin9.tmac .
+.
+.
+.TP
 .I fr
 French;
 localizes

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 05/48: INSTALL.extra: Drop Solaris 10 discussion.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit f27dcfd27f752e43318f4af89fd1f5d6b329ce7e
Author: G. Branden Robinson 
AuthorDate: Mon Mar 27 11:18:27 2023 -0500

INSTALL.extra: Drop Solaris 10 discussion.

We cover the matter of automated testing on Solaris 10 in detail in the
PROBLEMS file, which is already cross referenced from here.
---
 INSTALL.extra | 12 
 1 file changed, 12 deletions(-)

diff --git a/INSTALL.extra b/INSTALL.extra
index 6aec3fe7a..9ba44877a 100644
--- a/INSTALL.extra
+++ b/INSTALL.extra
@@ -226,23 +226,11 @@ directory) will have a log file called
 To re-run a test, change to the top of the build directory (if
 necessary) and run the test by name from the shell prompt.
 
-[Solaris 10 users _must_ run the test scripts by hand since the /bin/sh
-and utilities on that system are not conformant to the POSIX standard.]
-
 For example, to rerun the test mentioned above from a "build" directory
 I created as a subdirectory in the source tree, I would do this.
 
   (cd build && ../tmac/tests/localization-works.sh)
 
-[Solaris 10 users will need to put /usr/xpg4/bin or /usr/xpg6/bin in the
-$PATH and pass the test scripts as arguments to a POSIX-conforming
-shell.
-
-  (cd build && PATH=/usr/xpg4/bin:$PATH /usr/xpg4/bin/sh \
-   ../tmac/tests/localization-works.sh)
-
-You might wish to write a small shell script to facilitate the process.]
-
 I can view the test log as follows.
 
   cat build/tmac/tests/localization-works.sh.log

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 36/48: [tmac]: Add Russian language support (4/7).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 5e295cc922b9aac2ac9986a93eb77b4b0976c3c6
Author: G. Branden Robinson 
AuthorDate: Wed Mar 8 04:33:48 2023 -0600

[tmac]: Add Russian language support (4/7).

* tmac/koi8-ru.tmac: Rename this file...
* tmac/koi8-r.tmac: ...to this.  There _is_ a "KOI8-RU" encoding, which
  appears to subsume KOI8-B and KOI8-U (by replacing more box drawing
  characters), but this file does not remap their values to applicable
  Unicode code points.
* tmac/ru.tmac: Load the encoding file under its new name.
---
 ChangeLog  | 11 +++
 tmac/{koi8-ru.tmac => koi8-r.tmac} |  8 
 tmac/ru.tmac   |  2 +-
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f81674002..7280d46e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2023-03-08  G. Branden Robinson 
+
+   [tmac]: Add Russian language support (4/7).
+
+   * tmac/koi8-ru.tmac: Rename this file...
+   * tmac/koi8-r.tmac: ...to this.  There _is_ a "KOI8-RU"
+   encoding, which appears to subsume KOI8-B and KOI8-U (by
+   replacing more box drawing characters), but this file does not
+   remap their values to applicable Unicode code points.
+   * tmac/ru.tmac: Load the encoding file under its new name.
+
 2023-03-08  G. Branden Robinson 
 
[tmac]: Add Russian language support (3/7).
diff --git a/tmac/koi8-ru.tmac b/tmac/koi8-r.tmac
similarity index 93%
rename from tmac/koi8-ru.tmac
rename to tmac/koi8-r.tmac
index 2922cfe2d..a9c37de5b 100644
--- a/tmac/koi8-ru.tmac
+++ b/tmac/koi8-r.tmac
@@ -1,6 +1,6 @@
-.\" koi8-ru.tmac
+.\" koi8-r.tmac
 .\"
-.do nr *groff_koi8-ru_tmac_C \n[.cp]
+.do nr *groff_koi8-r_tmac_C \n[.cp]
 .cp 0
 .trin \[char163]\[u0451]
 .trin \[char179]\[u0401]
@@ -68,8 +68,8 @@
 .trin \[char253]\[u0429]
 .trin \[char254]\[u0427]
 .trin \[char255]\[u042A]
-.cp \n[*groff_koi8-ru_tmac_C]
-.do rr *groff_koi8-ru_tmac_C
+.cp \n[*groff_koi8-r_tmac_C]
+.do rr *groff_koi8-r_tmac_C
 .
 .\" Local Variables:
 .\" mode: nroff
diff --git a/tmac/ru.tmac b/tmac/ru.tmac
index 7e4984c70..537109d84 100644
--- a/tmac/ru.tmac
+++ b/tmac/ru.tmac
@@ -154,7 +154,7 @@
 .
 .
 .\" Default encoding
-.mso koi8-ru.tmac
+.mso koi8-r.tmac
 .
 .ss 12 0
 .

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 41/48: [tmac]: Add Spanish language support (2/5).

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 50f7f202c0f47fa835ff1c437b8b8e19a11976e2
Author: G. Branden Robinson 
AuthorDate: Mon Mar 13 14:12:09 2023 -0500

[tmac]: Add Spanish language support (2/5).

* tmac/es.tmac: Spell weekday and month names in lowercase; every style
  authority I could find online mandates this, and it meshes with my
  half-remembered formal instruction in the language.  Fix groff
  composite special character escape sequences to place the base
  character first.  Replace one Unicode special character escape
  sequence with a composite special character escape sequence, for
  consistency.
---
 ChangeLog| 12 
 tmac/es.tmac | 62 ++--
 2 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2102843ea..c47cade70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2023-03-13  G. Branden Robinson 
+
+   [tmac]: Add Spanish language support (2/5).
+
+   * tmac/es.tmac: Spell weekday and month names in lowercase;
+   every style authority I could find online mandates this, and it
+   meshes with my half-remembered formal instruction in the
+   language.  Fix groff composite special character escape
+   sequences to place the base character first.  Replace one
+   Unicode special character escape sequence with a composite
+   special character escape sequence, for consistency.
+
 2023-03-13  Eloi Montañés 
 
[tmac]: Add Spanish language support (1/5).
diff --git a/tmac/es.tmac b/tmac/es.tmac
index b5eb7fc42..42c22b1bd 100644
--- a/tmac/es.tmac
+++ b/tmac/es.tmac
@@ -41,22 +41,22 @@
 .ds \*[locale]-abstract SINOPSIS\"
 .ds \*[locale]-app ANEXO\"
 .ds \*[locale]-appendix_string Anexo\"
-.ds \*[locale]-april Abril\"
+.ds \*[locale]-april abril\"
 .ds \*[locale]-attribute_string por\"
-.ds \*[locale]-august Agosto\"
-.ds \*[locale]-chapter_string Cap\[' i]tulo\"
-.ds \*[locale]-december Diciembre\"
+.ds \*[locale]-august agosto\"
+.ds \*[locale]-chapter_string Cap\[i ']tulo\"
+.ds \*[locale]-december diciembre\"
 .ds \*[locale]-draft_string Borrador\"
 .ds \*[locale]-endnote_string NOTAS\"
-.ds \*[locale]-february Febrero\"
+.ds \*[locale]-february febrero\"
 .ds \*[locale]-finis_string FIN\"
-.ds \*[locale]-friday Viernes\"
-.ds \*[locale]-january Enero\"
-.ds \*[locale]-july Julio\"
-.ds \*[locale]-june Junio\"
+.ds \*[locale]-friday viernes\"
+.ds \*[locale]-january enero\"
+.ds \*[locale]-july julio\"
+.ds \*[locale]-june junio\"
 .ds \*[locale]-le LISTA DE ECUACIONES\"
-.ds \*[locale]-letapp LE\[' I]DO Y APROVADO\"
-.ds \*[locale]-letat A LA ATENCI\[' O]N DE:\"
+.ds \*[locale]-letapp LE\[I ']DO Y APROVADO\"
+.ds \*[locale]-letat A LA ATENCI\[O ']N DE:\"
 .ds \*[locale]-letcn CONFIDENCIAL\"
 .ds \*[locale]-letdate Fecha\"
 .ds \*[locale]-letfc Por favor acepte, Excelencia, mis mejores saludos.\"
@@ -65,7 +65,7 @@
 .ds \*[locale]-letns!10 Copia (con destinatarios) a\"
 .ds \*[locale]-letns!11 Copia (sin destinatarios) a\"
 .ds \*[locale]-letns!12 Resumen solo para\"
-.ds \*[locale]-letns!13 Memor\[' a]ndum completo para\"
+.ds \*[locale]-letns!13 Memor\[a ']ndum completo para\"
 .ds \*[locale]-letns!14 Cc:\"
 .ds \*[locale]-letns!2 Copia (sin destinatario) a\"
 .ds \*[locale]-letns!3 Destinatairo\"
@@ -74,7 +74,7 @@
 .ds \*[locale]-letns!6 Adjuntos\"
 .ds \*[locale]-letns!7 Bajo cubierta separada\"
 .ds \*[locale]-letns!8 Carta a\"
-.ds \*[locale]-letns!9 Memor\[' a]ndum para\"
+.ds \*[locale]-letns!9 Memor\[a ']ndum para\"
 .ds \*[locale]-letns!copy Copia \" (falta un espacio)\"
 .ds \*[locale]-letns!to " a\"
 .ds \*[locale]-letrn En referencia a:\"
@@ -82,9 +82,9 @@
 .ds \*[locale]-letsj SUJETO:\"
 .ds \*[locale]-lf LISTA DE ILUSTRACIONES\"
 .ds \*[locale]-licon RESUMEN\"
-.ds \*[locale]-liec Ecuaci\[' o]n\"
+.ds \*[locale]-liec Ecuaci\[o ']n\"
 .ds \*[locale]-liex Documento\"
-.ds \*[locale]-lifg Ilustrati\[' o]n\"
+.ds \*[locale]-lifg Ilustrati\[o ']n\"
 .ds \*[locale]-litb Tabla\"
 .ds \*[locale]-lt LISTA DE TABLAS\"
 .ds \*[locale]-lx LISTA DE DOCUMENTOS\"
@@ -97,24 +97,24 @@
 .ds \*[locale]-man-section7 Manual de informaciones diversas\"
 .ds \*[locale]-man-section8 Manual para administradores de sistemas\"
 .ds \*[locale]-man-section9 Manual para desarrolladores del kernel\"
-.ds \*[locale]-march Marzo\"
-.ds \*[locale]-may Mayo\"
-.ds \*[locale]-monday Lunes\"
-.ds \*[locale]-november Noviembre\"
-.ds \*[locale]-october Octubre\"
+.ds \*[locale]-march marzo\"
+.ds \*[locale]-may mayo\"
+.ds \*[locale]-monday lunes\"
+.ds \*[locale]-november noviembre\"
+.ds \*[locale]-october octubre\"
 .ds \*[locale]-paper A4\"
-.ds \*[locale]-qrf Ver chap\[' i]tulo \\*[Qrfh], p\[' a]gina \\*[Qrfp].\"
-.ds \*[locale]-references Bibliograf\[' i]a\"
+.ds \*[locale]-qrf Ver chap\[i ']tulo \\*[Qrfh], p\[a ']gina \\*[Qrfp].\"
+.ds \*[locale]-references Bibliograf\[i ']a\"
 .ds 

[groff] 46/48: [tbl]: Fix Savannah #63838.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 65773f551712c2267c42ff269099976d4e3e395a
Author: G. Branden Robinson 
AuthorDate: Sat Feb 25 18:44:58 2023 -0600

[tbl]: Fix Savannah #63838.

* src/preproc/tbl/table.cpp (table::add_entry): Throw error diagnostic
  if table entry ends in the zero-motion escape sequence `\z`.  This is
  nonsense and provokes baffling diagnostics from the formatter.  Stick
  user's nose directly into the problem.

Fixes .  Thanks to the mandoc(1)
project for documenting the issue in a regression test.

Also annotate a null pointer with `nullptr` comment to ease any future
transition to C++11, which defines it as a keyword.
---
 ChangeLog | 14 ++
 src/preproc/tbl/table.cpp |  9 -
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index a2d7fbb71..234973970 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2023-02-25  G. Branden Robinson 
+
+   [tbl]: Fix Savannah #63838.
+
+   * src/preproc/tbl/table.cpp (table::add_entry): Throw error
+   diagnostic if table entry ends in the zero-motion escape
+   sequence `\z`.  This is nonsense and provokes baffling
+   diagnostics from the formatter.  Stick user's nose directly into
+   the problem.
+
+   Fixes .  Thanks to the
+   mandoc(1) project for documenting the issue in a regression
+   test.
+
 2023-03-16  G. Branden Robinson 
 
* src/libs/libxutil/XFontName.c (utoa): Rename function from
diff --git a/src/preproc/tbl/table.cpp b/src/preproc/tbl/table.cpp
index c391c90ae..a12874d2b 100644
--- a/src/preproc/tbl/table.cpp
+++ b/src/preproc/tbl/table.cpp
@@ -1513,7 +1513,14 @@ void table::add_entry(int r, int c, const string ,
  const entry_format *f, const char *fn, int ln)
 {
   allocate(r);
-  table_entry *e = 0;
+  table_entry *e = 0 /* nullptr */;
+  int len = str.length();
+  if (len > 1) {
+string last_two_chars = str.substring((len - 2), 2);
+if ("\\z" == last_two_chars)
+  error_with_file_and_line(fn, ln, "table entry ends with"
+  " zero-motion escape sequence");
+  }
   char *s = str.extract();
   if (str.search('\n') >= 0) {
 bool was_changed = false;

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 06/48: MANIFEST: Drop "ANNOUNCE".

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit 42652cf9dc89d9ef6b6e1934425eb9458f44ae14
Author: G. Branden Robinson 
AuthorDate: Mon Mar 27 11:54:16 2023 -0500

MANIFEST: Drop "ANNOUNCE".

It is not part of the source distribution, but a template (for emails)
maintained only in the Git repository.
---
 MANIFEST | 1 -
 1 file changed, 1 deletion(-)

diff --git a/MANIFEST b/MANIFEST
index b9f579f22..15849ca42 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -9,7 +9,6 @@ This file summarizes the structure of the groff source 
distribution.
 
 1) Top-level directory contents
 
-  ANNOUNCE  Release announcement template.
   BUG-REPORTA template for bug reports.
   ChangeLog Log of changes since last groff minor version release.
   ChangeLog.*   Log of changes in past groff versions.

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit

[groff] 11/48: groff_man_style(7): Clarify behavior of `\%`.

[G. Branden Robinson]

gbranden pushed a commit to branch branden-2023-03-31
in repository groff.

commit f0b9f96977e5d57e6fa9a28e798a49d6e9ea9ff6
Author: G. Branden Robinson 
AuthorDate: Fri Mar 24 05:54:07 2023 -0500

groff_man_style(7): Clarify behavior of `\%`.

Also clarify effects of `SY` and `YS` macros on adjustment.

Prompted by Alex Colomar in
.
---
 tmac/groff_man.7.man.in | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/tmac/groff_man.7.man.in b/tmac/groff_man.7.man.in
index 8416825cf..5338a715c 100644
--- a/tmac/groff_man.7.man.in
+++ b/tmac/groff_man.7.man.in
@@ -1018,7 +1018,7 @@ has already been called without a corresponding
 .BR .YS ,
 in which case only a break is performed.
 .
-Automatic hyphenation is disabled.
+Adjustment and automatic hyphenation are disabled.
 .
 .I command
 is set in bold.
@@ -1033,8 +1033,10 @@ plus a space.
 .B .YS
 End synopsis.
 .
-The previous indentation amount and initial hyphenation mode are
-restored.
+Indentation,
+adjustment,
+and hyphenation
+are restored to their previous states.
 _ifstyle()dnl
 .
 .
@@ -2466,10 +2468,10 @@ supplementing
 automatic hyphenation patterns.
 .
 At the beginning of a word,
-it suppresses any automatic hyphenation points within;
-any specified with
-.B \e%
-are still honored.
+it suppresses any hyphenation breaks within
+.I except
+those specified with
+.BR \e% .
 .
 .
 .TP

___
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit