[groff] 01/01: groffer.tmac: strings and macros for groffer and other man-pages

[Bernd Warken]

bwarken pushed a commit to branch master
in repository groff.

commit d11bca0ecdead7c2c9fca9b0fa89d77df853b577
Author: Bernd Warken <address@hidden>
Date:   Thu Jul 3 17:59:09 2014 +0200

    groffer.tmac: strings and macros for groffer and other man-pages
---
 contrib/groffer/ChangeLog    |    9 +++
 contrib/groffer/Makefile.sub |   12 +++-
 contrib/groffer/groffer.tmac |  127 ++++++++++++++++++++++++++++++++++++++++++
 contrib/groffer/version.sh   |    2 +-
 4 files changed, 145 insertions(+), 5 deletions(-)

diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index ea60409..2a6c445 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,5 +1,14 @@
 2014-06-18  Bernd Warken  <address@hidden>
 
+       * version.sh: New version 2.2.1.
+
+       * groffer.tmac: Collection of strings and macros for `groffer.man'
+       and other man-pages.
+
+       * Makefile.sub: Add `groffer.tmac'.
+
+2014-06-18  Bernd Warken  <address@hidden>
+
        * version.sh: Upgrade to version 2.1.3.
 
        * perl_test.pl: Remove this file.
diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
index d70c1e2..65c325c 100644
--- a/contrib/groffer/Makefile.sub
+++ b/contrib/groffer/Makefile.sub
@@ -7,7 +7,7 @@
 # Written by Werner Lemberg <address@hidden> and
 # Bernd Warken <address@hidden>.
 
-# Last update: 18 Jun 2014
+# Last update: 3 Jul 2014
 
 # This file is part of `groffer' which is part of `groff'.
 
@@ -54,8 +54,7 @@ GROFFER_REST=roff2.man \
              groffer.pl \
              roff2.pl
 
-groffer: $(GROFFER_PERL) \
-               $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
+groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
        sed -f "$(SH_DEPS_SED_SCRIPT)" \
            -e "s|@g@|$(g)|g" \
            -e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
@@ -73,7 +72,7 @@ groffer: $(GROFFER_PERL) \
            | sed 's/@ROFF2MODE@/'"$$m"'/g' > roff2$${m}.man; \
        done
 
-install_data: groffer
+install_data: groffer groffer.tmac
        -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
        rm -f $(DESTDIR)$(bindir)/groffer
        $(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer
@@ -81,6 +80,11 @@ install_data: groffer
          rm -f $(DESTDIR)$(bindir)/$$f; \
          $(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$f; \
        done
+       - test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
+       for f in groffer.tmac; do \
+         rm -f $(DESTDIR)$(tmacdir)/$$f; \
+         $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
+       done
        -test -d $(DESTDIR)$(groffer_dir) \
          || $(mkinstalldirs) $(DESTDIR)$(groffer_dir)
        rm -f $(DESTDIR)$(groffer_dir)/version.sh
diff --git a/contrib/groffer/groffer.tmac b/contrib/groffer/groffer.tmac
new file mode 100644
index 0000000..049912b
--- /dev/null
+++ b/contrib/groffer/groffer.tmac
@@ -0,0 +1,127 @@
+.\" groffer.tmac
+.\"
+.\" source position: <top-groff>/contrib/groffer/groffer.tmac
+.\" installed position: <prefix>/share/groff/current/tmac/groffer.tmac
+.\"
+.\" Copyright 2014
+.\"    Free Software Foundation, Inc.
+.\" written by Bernd Warken <address@hidden>
+.\" 
+.\" Last update: 3 Jul 2014
+.\" 
+.\" This file is part of runoff, a free software project.
+.\" 
+.\" You can redistribute it and/or modify it under the terms of the GNU
+.\" General Public License (GPL) version 2 as published by the Free
+.\" Software Foundation (FSF).
+.\" 
+.\" The license text for GPL2 is available in the internet at
+.\" http://www.gnu.org/licenses/gpl-2.0.html
+.
+.\" --------------------------------------------------------------------
+.\" Characters
+.\" --------------------------------------------------------------------
+.
+.ie t .char \[Ellipsis] \f[S]\N'188'\f[P]
+.el .char \[Ellipsis] \f[I]...\f[P]
+.\" called by \[Ellipsis]
+.
+.
+.\" --------------------------------------------------------------------
+.\" Macro definitions
+.\" --------------------------------------------------------------------
+.
+.\" --------------------------------------------------------------------
+.\" .Env_var  (<env_var_name> [<punct>])
+.\"
+.\" Display an environment variable, with optional punctuation.
+.\"
+.de Env_var
+.  nh
+.  SM
+.  Text \f[CB]\\$1\f[]\\$2
+.  hy
+..
+.
+.\" --------------------------------------------------------------------
+.\" .Error  (<text>...)
+.\"
+.\" Print error message to terminal and abort.
+.\"
+.de Error
+.  tm \\$*
+.  ab
+..
+.
+.\" --------------------------------------------------------------------
+.\" .FONT (<font name> <text> [<font name> <text> ...])
+.\"
+.\"  in different fonts: R, I, B, CR, CI, CB
+.\"
+.de FONT
+.  if (\\n[.$] = 0) \{\
+.      \" compatibility to .ft
+.      nop \&\f[P]\&
+.      return
+.  \}
+.  ds result \&
+.  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
+.  nop \\*[result]\&
+.\"  hy
+.  rm result
+..
+.
+.\"  --------------------------------------------------------------------
+.\" .Text  (<text>...)
+.\"
+.\" Treat the arguments as text, no matter how they look.
+.\"
+.de Text
+.  if \\n[.$]=0 \
+.    return
+.  nh
+.  nop \)\\$*\)
+.  hy
+..
+.
+.\" --------------------------------------------------------------------
+.\" .Topic  ([<indent>])
+.\"
+.\" A bulleted paragraph
+.\"
+.de Topic
+.  ie \\n[.$]=0 .ds @indent 2m\"
+.  el .ds @indent \\$1\"
+.
+.  ie t .IP \[bu] address@hidden
+.  el .IP \- address@hidden
+.
+.  rm @indent
+..
+.
+.\" --------------------------------------------------------------------
+.\" .UNDERLINE (<text to underline> [<append>])
+.\"
+.\" Underline $1 and append $2 without underline
+.\"
+.de UNDERLINE
+.  ie n \fI\\$1\fP\\$2
+.  el \Z'\\$1'\v'.25m'\D'l \w'\\$1'u 0'\v'-.25m'\\$2
+..
+.
+.\" --------------------------------------------------------------------
+.\" Emacs settings
+.\" --------------------------------------------------------------------
+.\"
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
+.\"
+.\" end of groffer.tmac
diff --git a/contrib/groffer/version.sh b/contrib/groffer/version.sh
index f5b3d03..911bdf7 100644
--- a/contrib/groffer/version.sh
+++ b/contrib/groffer/version.sh
@@ -29,7 +29,7 @@
 export _PROGRAM_VERSION;
 export _LAST_UPDATE;
 
-_PROGRAM_VERSION='2.1.3';
+_PROGRAM_VERSION='2.2.1';
 _LAST_UPDATE='18 Jun 2014';
 
 # this setting of the groff version is only used before make is run,