[groff] 01/01: improve definitions in several man-pages

[Bernd Warken]

bwarken pushed a commit to branch master
in repository groff.

commit de785e2f64dc3d165a0a04d8df25dffa86520bb1
Author: Bernd Warken <address@hidden>
Date:   Thu Jul 3 23:45:10 2014 +0200

    improve definitions in several man-pages
---
 contrib/glilypond/ChangeLog     |    4 +++
 contrib/glilypond/glilypond.man |   26 +++++++++++++------
 contrib/gperl/ChangeLog         |    4 +++
 contrib/gperl/gperl.man         |   54 ++++++++++----------------------------
 contrib/groffer/ChangeLog       |    6 ++++
 contrib/groffer/groffer.man     |    2 +-
 contrib/groffer/roff2.man       |   14 +++++-----
 7 files changed, 54 insertions(+), 56 deletions(-)

diff --git a/contrib/glilypond/ChangeLog b/contrib/glilypond/ChangeLog
index 7cdd6c4..7b6d3fd 100644
--- a/contrib/glilypond/ChangeLog
+++ b/contrib/glilypond/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-03  Bernd Warken  <address@hidden>
+
+       * glilypond.man: Improve definitions.
+
 2014-03-30  Steffen Nurpmeso  <address@hidden>
 
        * Makefile.sub: Put straight error-prevention prefixes for `rm'.
diff --git a/contrib/glilypond/glilypond.man b/contrib/glilypond/glilypond.man
index bfd4951..cce82a7 100644
--- a/contrib/glilypond/glilypond.man
+++ b/contrib/glilypond/glilypond.man
@@ -57,8 +57,13 @@ If not, see the GNU licenses at
 .\" Setup
 .\" --------------------------------------------------------------------
 .
-.ds Ellipsis "\&.\|.\|.\&\"
-.ad l
+.\" --------------------------------------------------------------------
+.\" Characters
+.\" --------------------------------------------------------------------
+.
+.ie t .char \[Ellipsis] \f[S]\N'188'\f[P]
+.el .char \[Ellipsis] \&.\|.\|.\&\
+.\" called by \[Ellipsis]
 .
 .
 .\" --------------------------------------------------------------------
@@ -68,10 +73,11 @@ If not, see the GNU licenses at
 .\" --------------------------------------------------------------------
 .\" .FONT (<font name> <text> [<font name> <text> ...])
 .\"
-.\" Print in different fonts: R, I, B, CR, CI, CB
+.\"  in different fonts: R, I, B, CR, CI, CB
 .\"
-.de1 FONT
+.de FONT
 .  if (\\n[.$] = 0) \{\
+.      \" compatibility to .ft
 .      nop \&\f[P]\&
 .      return
 .  \}
@@ -79,15 +85,16 @@ If not, see the GNU licenses at
 .  while (\\n[.$] >= 2) \{\
 .      as result \,\f[\\$1]\\$2
 .      if !"\\$1"P" .as result \f[P]
+.       \" the double-quote " after P above is now ignored in Emacs
 .      shift 2
 .  \}
 .  if (\\n[.$] = 1) .as result \,\f[\\$1]
-.  nh
+.\"  nh
 .  nop \\*[result]\&
-.  hy
+.\"  hy
+.  rm result
 ..
 .
-.
 .\" --------------------------------------------------------------------
 .\" .OP+ (<option> [ [ | option] ...] [<optarg> [<end>] ])
 .\"
@@ -96,7 +103,7 @@ If not, see the GNU licenses at
 .\" Example: `.OP+ -h | --help | --usage' gets `[-h|--help|--usage]'
 .\" Example: `.OP+ -v | --verbose "" ,' gets `[-v|--verbose],'
 .\"
-.de1 OP+
+.de OP+
 .  if ( \\n[.$] == 0 ) \{\
 .      nop \&\f[CR][]\fR\&
 .      return
@@ -121,6 +128,9 @@ If not, see the GNU licenses at
 .  hy
 ..
 .
+.ad l
+.
+.
 .\" --------------------------------------------------------------------
 .SH "SYNOPSIS"
 .\" --------------------------------------------------------------------
diff --git a/contrib/gperl/ChangeLog b/contrib/gperl/ChangeLog
index 589d4b1..eaa2a06 100644
--- a/contrib/gperl/ChangeLog
+++ b/contrib/gperl/ChangeLog
@@ -1,3 +1,7 @@
+2014-07-03  Bernd Warken  <address@hidden>
+
+       * gperl.pl: Improve definitions.
+
 2014-06-15  Bernd Warken  <address@hidden>
 
        * gperl.pl: Version 1.2.1.
diff --git a/contrib/gperl/gperl.man b/contrib/gperl/gperl.man
index 0271437..2229e2b 100644
--- a/contrib/gperl/gperl.man
+++ b/contrib/gperl/gperl.man
@@ -46,56 +46,30 @@ The license text is available in the internet at
 .\" --------------------------------------------------------------------
 .
 .
-.char \[Ellipsis] \f[S]\N'188'\fP
+.\" --------------------------------------------------------------------
+.\" Characters
+.\" --------------------------------------------------------------------
 .
-.\" ds Ellipsis \[el]
-.\" ds Ellipsis "\&.\|.\|.\&\"
+.ie t .char \[Ellipsis] \f[S]\N'188'\f[P]
+.el .char \[Ellipsis] \&.\|.\|.\&\
+.\" called with \[Ellipsis]
 .
-.\" --------------------------------------------------------------------
-.\" Macro definitions
 .
 .\" --------------------------------------------------------------------
-.\" .CB  (<text>...)
-.\"
-.\" Print in constant-width bold font.
-.\"
-.de CB
-.  ft CB
-.  Text \\$*
-.  ft
-..
-.\" --------------------------------------------------------------------
-.\" .CI  (<text>...)
-.\"
-.\" Print in constant-width italic font.
-.\"
-.de CI
-.  ft CI
-.  Text \\$*
-.  ft
-..
-.\" --------------------------------------------------------------------
-.\" .CR  (<text>...)
-.\"
-.\" Print in constant-width roman font.
-.\"
-.de CR
-.  ft CR
-.  Text \\$*
-.  ft
-..
+.\" Macro definitions
 .
-.\" --------------------------------------------------------------------
+..\" --------------------------------------------------------------------
 .\" .Topic  ([<indent>])
 .\"
 .\" A bulleted paragraph
 .\"
 .de Topic
-.  ie \\n[.$]=0 \
-.    ds @indent 2m\"
-.  el \
-.    ds @indent \\$1\"
-.  IP \[bu] address@hidden
+.  ie \\n[.$]=0 .ds @indent 2m\"
+.  el .ds @indent \\$1\"
+.
+.  ie t .IP \[bu] address@hidden
+.  el .IP \- address@hidden
+.
 .  rm @indent
 ..
 .
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index d374096..7e3c215 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,5 +1,11 @@
 2014-07-03  Bernd Warken  <address@hidden>
 
+       * roff2.man: Move `.TH', etc. to the beginning of the file.
+
+       * groffer.man: Improve definition of char `Ellipsis'.
+
+2014-07-03  Bernd Warken  <address@hidden>
+
        * groffer.tmac: Remove this file.
 
        * Makefile.sub: Remove parts related to `groffer.tmac'.
diff --git a/contrib/groffer/groffer.man b/contrib/groffer/groffer.man
index 968bfe1..c4488d1 100644
--- a/contrib/groffer/groffer.man
+++ b/contrib/groffer/groffer.man
@@ -48,7 +48,7 @@ The license text is available in the internet at
 .\" --------------------------------------------------------------------
 .
 .ie t .char \[Ellipsis] \f[S]\N'188'\f[P]
-.el .char \[Ellipsis] \f[I]...\f[P]
+.el .char \[Ellipsis] \&.\|.\|.\&\
 .\" called by \[Ellipsis]
 .
 .
diff --git a/contrib/groffer/roff2.man b/contrib/groffer/roff2.man
index 7990b82..11daeeb 100644
--- a/contrib/groffer/roff2.man
+++ b/contrib/groffer/roff2.man
@@ -1,3 +1,9 @@
+.TH address@hidden@ @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
+.SH NAME
address@hidden@ \- transform roff code into @ROFF2MODE@ mode
+.
+.\" --------------------------------------------------------------------
+.SH "SYNOPSIS"
 .ig
 address@hidden@.1 - man page for address@hidden@ (section 1).
 
@@ -40,14 +46,8 @@ The license text is available in the internet at
 .UE .
 ..
 .
-.
-.TH address@hidden@ @MAN1EXT@ "@MDATE@" "Groff Version @VERSION@"
-.SH NAME
address@hidden@ \- transform roff code into @ROFF2MODE@ mode
-.
-.
 .\" --------------------------------------------------------------------
-.SH "SYNOPSIS"
+.\" SH "SYNOPSIS"
 .
 .SY address@hidden@
 .RI [ \%groffer_option .\|.\|.\&]