[groff] 01/01: groffer.tmac: remove file and replace .mso for man-pages in chem, gideal, and groffer

[Bernd Warken]

bwarken pushed a commit to branch master
in repository groff.

commit 92ae621e419bac9668f2435e82097dd4bc5b3c27
Author: Bernd Warken <address@hidden>
Date:   Thu Jul 3 22:52:15 2014 +0200

    groffer.tmac: remove file and replace .mso for man-pages in chem, gideal, 
and groffer
---
 contrib/chem/chem.man        |  101 ++++++++++++++++++++++++++++++++-
 contrib/gideal/gideal.man    |   99 ++++++++++++++++++++++++++++++++-
 contrib/gideal/ideal.man     |   99 ++++++++++++++++++++++++++++++++-
 contrib/groffer/ChangeLog    |    9 +++
 contrib/groffer/Makefile.sub |    8 +--
 contrib/groffer/groffer.man  |   99 ++++++++++++++++++++++++++++++++-
 contrib/groffer/groffer.tmac |  127 ------------------------------------------
 7 files changed, 403 insertions(+), 139 deletions(-)

diff --git a/contrib/chem/chem.man b/contrib/chem/chem.man
index 2a99bfc..50b1691 100644
--- a/contrib/chem/chem.man
+++ b/contrib/chem/chem.man
@@ -60,9 +60,106 @@ is available in the internet at
 .
 .
 .\" --------------------------------------------------------------------
-.\" Local macro definitions
+.\" Setup
+.\" --------------------------------------------------------------------
+.
+.\" --------------------------------------------------------------------
+.\" 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
+..
 .
-.mso groffer.tmac
 .
 .\" End of macro definitions
 .
diff --git a/contrib/gideal/gideal.man b/contrib/gideal/gideal.man
index 78b42bd..6a07d5b 100644
--- a/contrib/gideal/gideal.man
+++ b/contrib/gideal/gideal.man
@@ -61,8 +61,105 @@ The license text is available in the internet at
 .
 .\" --------------------------------------------------------------------
 .\" setup
+.\" --------------------------------------------------------------------
+.
+.\" --------------------------------------------------------------------
+.\" Characters
+.\" --------------------------------------------------------------------
+.
+.ie t .char \[Ellipsis] \f[S]\N'188'\f[P]
+.el .char \[Ellipsis] \f[I]...\f[P]
+.\" called by \[Ellipsis]
+.
+.
+.\" --------------------------------------------------------------------
+.\" Macro definitions
+.\" --------------------------------------------------------------------
 .
-.mso groffer.tmac
+.\" --------------------------------------------------------------------
+.\" .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
+..
 .
 .\" end of macro definitions
 .\" --------------------------------------------------------------------
diff --git a/contrib/gideal/ideal.man b/contrib/gideal/ideal.man
index 14fc770..1bbfb38 100644
--- a/contrib/gideal/ideal.man
+++ b/contrib/gideal/ideal.man
@@ -62,8 +62,105 @@ The license text is available in the internet at
 .
 .\" --------------------------------------------------------------------
 .\" Setup
+.\" --------------------------------------------------------------------
+.
+.\" --------------------------------------------------------------------
+.\" Characters
+.\" --------------------------------------------------------------------
 .
-.mso groffer.tmac
+.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
+..
 .
 .\" end of macro definitions
 .\" --------------------------------------------------------------------
diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index 492482d..d374096 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,3 +1,12 @@
+2014-07-03  Bernd Warken  <address@hidden>
+
+       * groffer.tmac: Remove this file.
+
+       * Makefile.sub: Remove parts related to `groffer.tmac'.
+
+       * groffer.man: Instead of `.mso' for `groffer.tmac' copy former
+       `groffer.tmac' at the head of the man-page.
+
 2014-06-18  Bernd Warken  <address@hidden>
 
        * Makefile.sub: Let `groffer.tmac' be removed in uninstalling
diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
index 03d1e42..4a64423 100644
--- a/contrib/groffer/Makefile.sub
+++ b/contrib/groffer/Makefile.sub
@@ -72,7 +72,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
            | sed 's/@ROFF2MODE@/'"$$m"'/g' > roff2$${m}.man; \
        done
 
-install_data: groffer groffer.tmac
+install_data: groffer
        -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
        rm -f $(DESTDIR)$(bindir)/groffer
        $(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer
@@ -80,11 +80,6 @@ install_data: groffer groffer.tmac
          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
@@ -97,7 +92,6 @@ install_data: groffer groffer.tmac
        done;
 
 uninstall_sub:
-       rm -f $(DESTDIR)$(tmacdir)/groffer.tmac
        rm -f $(DESTDIR)$(bindir)/groffer
        -for f in $(ROFF2PROGS); do rm -f $(DESTDIR)$(bindir)/$$f; done
        -for f in $(GROFFER_PERL) version.sh; do \
diff --git a/contrib/groffer/groffer.man b/contrib/groffer/groffer.man
index c709da0..968bfe1 100644
--- a/contrib/groffer/groffer.man
+++ b/contrib/groffer/groffer.man
@@ -43,7 +43,104 @@ The license text is available in the internet at
 .UE .
 ..
 .
-.mso groffer.tmac
+.\" --------------------------------------------------------------------
+.\" 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
+..
+.
 .
 .\" --------------------------------------------------------------------
 .\" SH "SYNOPSIS"
diff --git a/contrib/groffer/groffer.tmac b/contrib/groffer/groffer.tmac
deleted file mode 100644
index 049912b..0000000
--- a/contrib/groffer/groffer.tmac
+++ /dev/null
@@ -1,127 +0,0 @@
-.\" 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