From MAILER-DAEMON Mon May 26 14:59:06 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Wp070-0003hI-FR
	for mharc-groff-commit@gnu.org; Mon, 26 May 2014 14:59:06 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:44619)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1Wp06x-0003gK-9Z
	for groff-commit@gnu.org; Mon, 26 May 2014 14:59:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1Wp06v-0004vu-Ey
	for groff-commit@gnu.org; Mon, 26 May 2014 14:59:03 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:56361)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1Wp06v-0004vq-Az
	for groff-commit@gnu.org; Mon, 26 May 2014 14:59:01 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1Wp06u-0000oG-96
	for groff-commit@gnu.org; Mon, 26 May 2014 18:59:00 +0000
Date: Mon, 26 May 2014 18:59:00 +0000
Message-Id: <E1Wp06u-0000oG-96@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: grog.pl: add handling of first lines like .\" [eprt], 
	ignore $Sp grog.man,
	groff_char.man: use license website instead of postal address
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140526185900.3073.1303@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: dfaed933279c029339522d87a2819cf23542b6ae
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 May 2014 18:59:05 -0000

bwarken pushed a commit to branch master
in repository groff.

commit dfaed933279c029339522d87a2819cf23542b6ae
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Mon May 26 20:58:13 2014 +0200

    grog.pl: add handling of first lines like .\" [eprt], ignore $Sp
    grog.man,groff_char.man: use license website instead of postal address
---
 ChangeLog              |   25 ++++++++++++++------
 man/groff_char.man     |   30 +++++++++++++++----------
 src/roff/grog/grog.man |   58 ++++++++++++++++++++++++++---------------------
 src/roff/grog/grog.pl  |   42 +++++++++++++++++++++++++++++-----
 4 files changed, 102 insertions(+), 53 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a913d24..666b18b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-05-26  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* src/roff/grog/grog.pl: Add detection of `.\" [eprt]' as first
+	line to `grog'.  Change usage of `$Sp' to reasonable efforts in
+	`groff'.
+
+	* src/roff/grog/grog.man, man/groff_char.man: Add website for
+	license text, not only the postage address.
+
 2014-04-03  Steffen Nurpmeso  <sdaoden@yandex.com>
 
 	* */Makefile.*: Path quoting fixes, whitespace, formatting.
@@ -99,7 +108,7 @@
 	Problem reported by Ted Harding <ted.harding@wlandres.net> in a
 	thread starting with
 
-	  http://lists.gnu.org/archive/html/groff/2014-03/msg00181.html
+	http://lists.gnu.org/archive/html/groff/2014-03/msg00181.html
 
 2014-03-16  Werner LEMBERG  <wl@gnu.org>
 
@@ -129,7 +138,7 @@
 
 	See
 
-	  http://lists.gnu.org/archive/html/groff/2013-11/msg00026.html
+	http://lists.gnu.org/archive/html/groff/2013-11/msg00026.html
 
 	for more.
 
@@ -153,22 +162,22 @@
 
 	* src/roff/groff/Makefile.sub: POSIX conformance.
 
-	 - POSIX says that the meaning of the make(1) `$<' macro shall be
+	- POSIX says that the meaning of the make(1) `$<' macro shall be
 	   unspecified except in inference rules.  Consequently, use `$?'
 	   for portability.
 
-	   That's safe because the rules have only one prerequisite and are
-	   not `.PHONY', so `$?' will always expand to one item.
+	   That's safe because the rules have only one prerequisite and
+	   are not `.PHONY', so `$?' will always expand to one item.
 
-	 - While here, clean up two instances of superfluous use of cat(1).
+	- While here, clean up two instances of superfluous use of cat(1).
 
 2014-03-11  Ingo Schwarze  <schwarze@openbsd.org> (tiny change)
 
 	* Makefile.in (dist): Improve.
 
-	 - Bugfix: Do not error out if one of the DISTDIRS
+	- Bugfix: Do not error out if one of the DISTDIRS
 	   contains a subdirectory.
-	 - Make debugging easier by splitting the huge "cd tmp; ...; ..."
+	- Make debugging easier by splitting the huge "cd tmp; ...; ..."
 	   command sequence into several independent shell commands,
 	   such that one can see which command actually fails.
 
diff --git a/man/groff_char.man b/man/groff_char.man
index bb41163..6e3663a 100644
--- a/man/groff_char.man
+++ b/man/groff_char.man
@@ -17,7 +17,8 @@ groff_char(7)
 
 This file is part of groff (GNU roff).
 
-File position: <groff_src_top>/man/groff_char.man
+Source file position: <groff_source>/man/groff_char.man
+Installed position: <prefix>/share/man/man7/groff_char.7
 
 Copyright (C) 1989-2004, 2006-2009, 2012, 2014
   Free Software Foundation, Inc.
@@ -25,18 +26,23 @@ written by Werner Lemberg <wl@gnu.org>
 with additions by Bernd Warken <groff-bernd.warken-72@web.de>
 revised to use real tables by Eric S. Raymond <esr@thyrsus.com>
 
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3 or
-any later version published by the Free Software Foundation; with the
-Invariant Sections being this .ig-section and AUTHOR, with no
-Front-Cover Texts, and with no Back-Cover Texts.
+This file is part of `groff'.
 
-A copy of the Free Documentation License is included as a file called
-FDL in the main directory of the groff source package.
-..
-.ig
-A copy of the GNU Free Documentation License is also available in this
-Debian package as /usr/share/doc/groff/copyright.
+`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 2 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
+<http://www.gnu.org/licenses/gpl-2.0.html>.
+
+Latest update: 26 May 2014
 ..
 .
 .\" --------------------------------------------------------------------
diff --git a/src/roff/grog/grog.man b/src/roff/grog/grog.man
index f236fb3..837772d 100644
--- a/src/roff/grog/grog.man
+++ b/src/roff/grog/grog.man
@@ -10,7 +10,7 @@ grog.1 - man page for grog (section 1)
 Source file position:  <groff_source_top>/src/roff/grog/grog.man
 Installed position:    $prefix/share/man/man1/grog.1
 
-Last Update: 22 Jan 2011
+Last Update: 26 May 2014
 ..
 .de co
 Copyright (C) 1989\[en]2003, 2006, 2007, 2009\[en]2012, 2014
@@ -23,6 +23,7 @@ Werner Lemberg
 .ME .
 Rewritten and put under GPL by Bernd Warken <groff-bernd.warken-72@web.de>.
 .
+.
 .P
 This file is part of
 .IR grog ,
@@ -30,33 +31,38 @@ which is part of
 .IR groff ,
 a free software project.
 .
-You can redistribute it and/or modify it under the terms of the
-.nh
-.B "GNU General Public License"
-.hy
-(\f[CR]GPL\f[]) as published by the
-.nh
-.BR "Free Software Foundation" ,
-.hy
-either version\~2, or (at your option) any later version.
+.I groff
+is free software; you can redistribute it and/or modify it under the
+terms of the
+.I GNU General Public License
+as published by the
+.IR "Free Software Foundation" ,
+either
+.I version 2
+of the License, or (at your option) any later version.
 .
-.P
-You should have received a copy of the \f[CR]GNU General Public
-License\f[] along with
-.IR groff ,
-see the files \%\f[CB]COPYING\f[] and \%\f[CB]LICENSE\f[] in the top
-directory of the
+.
+P
 .I groff
-source package.
-.
-Or read the
-.I man\~page
-.BR gpl (1).
-You can also write to the
-.nh
-.B "Free Software Foundation, 51 Franklin St \[en] Fifth Floor, Boston,"
-.BR "MA 02110-1301, USA" .
-.hy
+is distributed in the hope that it will be useful, but
+.IR "WITHOUT ANY WARRANTY" ;
+without even the implied warranty of
+.I MERCHANTABILITY
+or
+.IR "FITNESS FOR A PARTICULAR PURPOSE" .
+.
+See the
+.B GNU General Public License
+for more details.
+
+You should have received a copy of the
+.I GNU General Public License
+along with this program.
+.
+If not, see
+.UR http://\:www.gnu.org/\:licenses/\:gpl-2.0.html
+GPL2
+.UE .
 ..
 .
 .
diff --git a/src/roff/grog/grog.pl b/src/roff/grog/grog.pl
index 0cdd4d8..6a246bc 100644
--- a/src/roff/grog/grog.pl
+++ b/src/roff/grog/grog.pl
@@ -14,8 +14,8 @@
 # This file is part of `grog', which 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 (GPL) as published
-# by the Free Software Foundation, either version 2 of the License, or
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
 # (at your option) any later version.
 
 # `groff' is distributed in the hope that it will be useful, but
@@ -24,10 +24,11 @@
 # 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 <http://www.gnu.org/licenses/>.
+# along with this program. If not, see
+# <http://www.gnu.org/licenses/gpl-2.0.html>.
 
 ########################################################################
-my $Last_Update = '27 Feb 2014';
+my $Last_Update = '26 May 2014';
 ########################################################################
 
 require v5.6;
@@ -45,7 +46,8 @@ my $Prog = $0;
 }
 
 #my $Sp = "[\\s\\n]";
-my $Sp = qr([\s\n]);
+#my $Sp = qr([\s\n]);
+my $Sp = '';
 
 my @Command;			# stores the final output
 my @Mparams;			# stores the options -m*
@@ -79,7 +81,7 @@ my %Groff = (
 	     'tbl' => 0,
 );
 
-{
+{ # command line arguments except file names
   my @filespec = ();
   my $double_minus = 0;
   my $was_minus = 0;
@@ -138,7 +140,7 @@ my %Groff = (
   @ARGV = @filespec;
 }
 
-foreach my $arg (@ARGV) {
+foreach my $arg (@ARGV) { # test for each file name in the arguments
   &process($arg, 0);
 }
 
@@ -146,14 +148,40 @@ sub process {
   my ($filename, $level) = @_;
   local(*FILE);
   my %macros;
+  my $first_line = 1; # we are now in reading the first line
 
   if (!open(FILE, $filename eq "-" ? $filename : "< $filename")) {
     print STDERR "$Prog: can't open \`$filename': $!";
     exit 1 unless $level;
     return;
   }
+
   while (<FILE>) {
     chomp;
+
+    if ( $first_line ) { # in first line test on e, p, r, t
+      $first_line = 0; # end of first line
+
+      if ( /^\.\\"\s*(.+)$/ ) {
+	my $_ = $1;
+	if ( /e/ ) {
+	  $Groff{'eqn'}++;
+	}
+	if ( /p/ ) {
+	  $Groff{'pic'}++;
+	}
+	if ( /r/ ) {
+	  $Groff{'refer'}++;
+	}
+	if ( /t/ ) {
+	  $Groff{'tbl'}++;
+	}
+	next;
+      }
+    }
+
+    # $first_line no longer needed in the following
+
     next unless ( /^[.']/ );
     next if ( /^[.']{2}/ );
 


From MAILER-DAEMON Mon May 26 15:28:28 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Wp0ZP-0005YJ-V7
	for mharc-groff-commit@gnu.org; Mon, 26 May 2014 15:28:27 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49622)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1Wp0ZN-0005XW-FA
	for groff-commit@gnu.org; Mon, 26 May 2014 15:28:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1Wp0ZM-0005dA-EN
	for groff-commit@gnu.org; Mon, 26 May 2014 15:28:25 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:56675)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1Wp0ZM-0005d6-B6
	for groff-commit@gnu.org; Mon, 26 May 2014 15:28:24 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1Wp0ZL-00034e-Ge
	for groff-commit@gnu.org; Mon, 26 May 2014 19:28:23 +0000
Date: Mon, 26 May 2014 19:28:23 +0000
Message-Id: <E1Wp0ZL-00034e-Ge@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: grog.pl: add more first line gessing groff option
	characters grog.man: order the guessing options
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140526192823.11785.27276@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: d65ff2e12f107f096d24497d081c958579dcb1cd
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 May 2014 19:28:26 -0000

bwarken pushed a commit to branch master
in repository groff.

commit d65ff2e12f107f096d24497d081c958579dcb1cd
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Mon May 26 21:28:11 2014 +0200

    grog.pl: add more first line gessing groff option characters
    grog.man: order the guessing options
---
 ChangeLog              |    9 ++++++++-
 src/roff/grog/grog.man |   22 +++++++++++++---------
 src/roff/grog/grog.pl  |   28 ++++++++++++++++++++++------
 3 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 666b18b..235b8b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,18 @@
 2014-05-26  Bernd Warken  <groff-bernd.warken-72@web.de>
 
+	* src/roff/grog/grog.pl: Add further first line characters for
+	single character `groff' options.
+
+	* src/roff/grog/grog.man: make generated options more readable.
+
+2014-05-26  Bernd Warken  <groff-bernd.warken-72@web.de>
+
 	* src/roff/grog/grog.pl: Add detection of `.\" [eprt]' as first
 	line to `grog'.  Change usage of `$Sp' to reasonable efforts in
 	`groff'.
 
 	* src/roff/grog/grog.man, man/groff_char.man: Add website for
-	license text, not only the postage address.
+	license text, not only the postal address.
 
 2014-04-03  Steffen Nurpmeso  <sdaoden@yandex.com>
 
diff --git a/src/roff/grog/grog.man b/src/roff/grog/grog.man
index 837772d..539ad69 100644
--- a/src/roff/grog/grog.man
+++ b/src/roff/grog/grog.man
@@ -185,20 +185,24 @@ It tries to guess which of the following
 options are required for running the input under
 .BR groff :
 .BR \-e ,
+.BR \-g ,
+.BR \-G ,
+.BR \-j ,
+.BR \-p ,
+.BR \-R ,
+.BR \-s ,
+.BR \-t .
 .BR \-man ,
+.BR \-mdoc,
+.BR \-mdoc-old,
 .BR \-me ,
 .BR \-mm ,
 .BR \-mom ,
-.BR \-ms ,
-.BR \-mdoc,
-.BR \-mdoc-old,
-.BR \-p ,
-.BR \-R ,
-.BR \-g ,
-.BR \-G ,
-.BR \-s ,
 and
-.BR \-t .
+.BR \-ms .
+.
+.
+.P
 The guessed
 .B groff
 command including those options and the found
diff --git a/src/roff/grog/grog.pl b/src/roff/grog/grog.pl
index 6a246bc..bbecbcb 100644
--- a/src/roff/grog/grog.pl
+++ b/src/roff/grog/grog.pl
@@ -159,7 +159,11 @@ sub process {
   while (<FILE>) {
     chomp;
 
-    if ( $first_line ) { # in first line test on e, p, r, t
+    s/^[']/./;
+
+    if ( $first_line ) {
+      # when first line, test on comment with character set for grog args
+
       $first_line = 0; # end of first line
 
       if ( /^\.\\"\s*(.+)$/ ) {
@@ -167,12 +171,24 @@ sub process {
 	if ( /e/ ) {
 	  $Groff{'eqn'}++;
 	}
+	if ( /g/ ) {
+	  $Groff{'grn'}++;
+	}
+	if ( /G/ ) {
+	  $Groff{'grap'}++;
+	}
+	if ( /j/ ) {
+	  $Groff{'chem'}++;
+	}
 	if ( /p/ ) {
 	  $Groff{'pic'}++;
 	}
-	if ( /r/ ) {
+	if ( /R/ ) {
 	  $Groff{'refer'}++;
 	}
+	if ( /s/ ) {
+	  $Groff{'soelim'}++;
+	}
 	if ( /t/ ) {
 	  $Groff{'tbl'}++;
 	}
@@ -396,14 +412,14 @@ sub version {
        $Groff{'grn'} || $Groff{'grap'} || $Groff{'refer'} ||
        $Groff{'chem'} ) {
     my $s = "-";
-    $s .= "s" if $Groff{'soelim'};
-    $s .= "R" if $Groff{'refer'};
+    $s .= "e" if $Groff{'eqn'};
+    $s .= "g" if $Groff{'grn'};
     $s .= "G" if $Groff{'grap'};
     $s .= "j" if $Groff{'chem'};
     $s .= "p" if $Groff{'pic'};
-    $s .= "g" if $Groff{'grn'};
+    $s .= "R" if $Groff{'refer'};
+    $s .= "s" if $Groff{'soelim'};
     $s .= "t" if $Groff{'tbl'};
-    $s .= "e" if $Groff{'eqn'};
     push(@Command, $s);
   }
 


From MAILER-DAEMON Mon May 26 17:17:18 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Wp2Gk-0007Cm-UD
	for mharc-groff-commit@gnu.org; Mon, 26 May 2014 17:17:18 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38846)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1Wp2Gg-0007C0-VE
	for groff-commit@gnu.org; Mon, 26 May 2014 17:17:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1Wp2Ge-000775-4V
	for groff-commit@gnu.org; Mon, 26 May 2014 17:17:14 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:57734)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1Wp2Ge-000770-1f
	for groff-commit@gnu.org; Mon, 26 May 2014 17:17:12 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1Wp2Gd-00047t-8A
	for groff-commit@gnu.org; Mon, 26 May 2014 21:17:11 +0000
Date: Mon, 26 May 2014 21:17:11 +0000
Message-Id: <E1Wp2Gd-00047t-8A@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: groff_char.man: add notes for half of the tables
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140526211711.15830.8646@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 63d550bb989809891fe49bba2a015d625dd1f71f
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 May 2014 21:17:17 -0000

bwarken pushed a commit to branch master
in repository groff.

commit 63d550bb989809891fe49bba2a015d625dd1f71f
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Mon May 26 23:17:01 2014 +0200

    groff_char.man: add notes for half of the tables
---
 ChangeLog          |   10 ++-
 man/groff_char.man |  270 ++++++++++++++++++++++++++--------------------------
 2 files changed, 141 insertions(+), 139 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 235b8b6..866f9ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-05-26  Bernd Warken  <groff-bernd.warken-72@web.de>
 
+	* man/groff_char.man: Add notes in some tables, more will come.
+
+2014-05-26  Bernd Warken  <groff-bernd.warken-72@web.de>
+
 	* src/roff/grog/grog.pl: Add further first line characters for
 	single character `groff' options.
 
@@ -18,9 +22,9 @@
 
 	* */Makefile.*: Path quoting fixes, whitespace, formatting.
 
-	Remove many quotes (and introduce a few as additional guards) since
-	groff's build system is generally not set up to properly handle
-	paths that need quoting.
+	Remove many quotes (and introduce a few as additional guards)
+	since groff's build system is generally not set up to properly
+	handle paths that need quoting.
 
 2014-04-03  Steffen Nurpmeso  <sdaoden@yandex.com>
 
diff --git a/man/groff_char.man b/man/groff_char.man
index 6e3663a..8da635e 100644
--- a/man/groff_char.man
+++ b/man/groff_char.man
@@ -264,37 +264,37 @@ usable as a diacritic; a larger glyph can be obtained with `\f(CW\e(ha\fP'.
 l l l l l lx.
 Output	Input	Code	PostScript	Unicode	Notes
 _
-\[char33]	\[char33]	33	exclam	u0021
-\[char34]	\[char34]	34	quotedbl	u0022
-\[char35]	\[char35]	35	numbersign	u0023
-\[char36]	\[char36]	36	dollar	u0024
-\[char37]	\[char37]	37	percent	u0025
-\[char38]	\[char38]	38	ampersand	u0026
-\[char39]	\[char39]	39	quoteright	u0027
-\[char40]	\[char40]	40	parenleft	u0028
-\[char41]	\[char41]	41	parenright	u0029
-\[char42]	\[char42]	42	asterisk	u002A
-\[char43]	\[char43]	43	plus	u002B
-\[char44]	\[char44]	44	comma	u002C
-\[char45]	\[char45]	45	hyphen	u2010
-\[char46]	\[char46]	46	period	u002E
-\[char47]	\[char47]	47	slash	u002F
-\[char58]	\[char58]	58	colon	u003A
-\[char59]	\[char59]	59	semicolon	u003B
-\[char60]	\[char60]	60	less	u003C
-\[char61]	\[char61]	61	equal	u003D
-\[char62]	\[char62]	62	greater	u003E
-\[char63]	\[char63]	63	question	u003F
-\[char64]	\[char64]	64	at	u0040
-\[char91]	\[char91]	91	bracketleft	u005B
-\[char92]	\[char92]	92	backslash	u005C
-\[char93]	\[char93]	93	bracketright	u005D
+\[char33]	\[char33]	33	exclam	u0021	exclamation mark (bang)
+\[char34]	\[char34]	34	quotedbl	u0022	double quote
+\[char35]	\[char35]	35	numbersign	u0023	number sign
+\[char36]	\[char36]	36	dollar	u0024	currency dollar sign
+\[char37]	\[char37]	37	percent	u0025	percent
+\[char38]	\[char38]	38	ampersand	u0026	ampersand
+\[char39]	\[char39]	39	quoteright	u0027	right quote
+\[char40]	\[char40]	40	parenleft	u0028	parentheses left
+\[char41]	\[char41]	41	parenright	u0029	parentheses right
+\[char42]	\[char42]	42	asterisk	u002A	asterisk
+\[char43]	\[char43]	43	plus	u002B	plus
+\[char44]	\[char44]	44	comma	u002C	comma
+\[char45]	\[char45]	45	hyphen	u2010	hyphen
+\[char46]	\[char46]	46	period	u002E	period, dot
+\[char47]	\[char47]	47	slash	u002F	slash
+\[char58]	\[char58]	58	colon	u003A	colon
+\[char59]	\[char59]	59	semicolon	u003B	semicolon
+\[char60]	\[char60]	60	less	u003C	less than
+\[char61]	\[char61]	61	equal	u003D	equal
+\[char62]	\[char62]	62	greater	u003E	greater than
+\[char63]	\[char63]	63	question	u003F	question mark
+\[char64]	\[char64]	64	at	u0040	at
+\[char91]	\[char91]	91	bracketleft	u005B	square bracket left
+\[char92]	\[char92]	92	backslash	u005C	backslash
+\[char93]	\[char93]	93	bracketright	u005D	square bracket right
 \[char94]	\[char94]	94	circumflex	u005E	circumflex accent
-\[char95]	\[char95]	95	underscore	u005F
-\[char96]	\[char96]	96	quoteleft	u0060
-\[char123]	\[char123]	123	braceleft	u007B
-\[char124]	\[char124]	124	bar	u007C
-\[char125]	\[char125]	125	braceright	u007D
+\[char95]	\[char95]	95	underscore	u005F	underscore
+\[char96]	\[char96]	96	quoteleft	u0060	quote left
+\[char123]	\[char123]	123	braceleft	u007B	curly brace left
+\[char124]	\[char124]	124	bar	u007C	bar
+\[char125]	\[char125]	125	braceright	u007D	curly brace right
 \[char126]	\[char126]	126	tilde	u007E	tilde accent
 .TE
 .ad
@@ -348,102 +348,100 @@ see next section.
 l l l l l lx.
 Output	Input	Code	PostScript	Unicode	Notes
 _
-\[char161]	\[char161]	161	exclamdown	u00A1	T{
-inverted exclamation mark
-T}
-\[char162]	\[char162]	162	cent	u00A2
-\[char163]	\[char163]	163	sterling	u00A3
-\[char164]	\[char164]	164	currency	u00A4
-\[char165]	\[char165]	165	yen	u00A5
-\[char166]	\[char166]	166	brokenbar	u00A6
-\[char167]	\[char167]	167	section	u00A7
-\[char168]	\[char168]	168	dieresis	u00A8
-\[char169]	\[char169]	169	copyright	u00A9
-\[char170]	\[char170]	170	ordfeminine	u00AA
-\[char171]	\[char171]	171	guillemotleft	u00AB
-\[char172]	\[char172]	172	logicalnot	u00AC
-\[char174]	\[char174]	174	registered	u00AE
-\[char175]	\[char175]	175	macron	u00AF
-\[char176]	\[char176]	176	degree	u00B0
-\[char177]	\[char177]	177	plusminus	u00B1
-\[char178]	\[char178]	178	twosuperior	u00B2
-\[char179]	\[char179]	179	threesuperior	u00B3
+\[char161]	\[char161]	161	exclamdown	u00A1	inverted exclamation mark
+\[char162]	\[char162]	162	cent	u00A2	currency cent
+\[char163]	\[char163]	163	sterling	u00A3	pound sterling
+\[char164]	\[char164]	164	currency	u00A4	currency
+\[char165]	\[char165]	165	yen	u00A5	Yen
+\[char166]	\[char166]	166	brokenbar	u00A6	broken bar
+\[char167]	\[char167]	167	section	u00A7	section, paragraph
+\[char168]	\[char168]	168	dieresis	u00A8	dieresis
+\[char169]	\[char169]	169	copyright	u00A9	copyright
+\[char170]	\[char170]	170	ordfeminine	u00AA	feminine ordinal (Spanish)
+\[char171]	\[char171]	171	guillemotleft	u00AB	guillemot left
+\[char172]	\[char172]	172	logicalnot	u00AC	logical not
+\[char174]	\[char174]	174	registered	u00AE	registered mark
+\[char175]	\[char175]	175	macron	u00AF	macron (for 1st tone in Chinese pinyin)
+\[char176]	\[char176]	176	degree	u00B0	degree
+\[char177]	\[char177]	177	plusminus	u00B1	plus-minus
+\[char178]	\[char178]	178	twosuperior	u00B2	2 superior
+\[char179]	\[char179]	179	threesuperior	u00B3	3 superior
 \[char180]	\[char180]	180	acute	u00B4	acute accent
-\[char181]	\[char181]	181	mu	u00B5	micro sign
-\[char182]	\[char182]	182	paragraph	u00B6
-\[char183]	\[char183]	183	periodcentered	u00B7
-\[char184]	\[char184]	184	cedilla	u00B8
-\[char185]	\[char185]	185	onesuperior	u00B9
-\[char186]	\[char186]	186	ordmasculine	u00BA
-\[char187]	\[char187]	187	guillemotright	u00BB
-\[char188]	\[char188]	188	onequarter	u00BC
-\[char189]	\[char189]	189	onehalf	u00BD
-\[char190]	\[char190]	190	threequarters	u00BE
-\[char191]	\[char191]	191	questiondown	u00BF
-\[char192]	\[char192]	192	Agrave	u0041_0300
-\[char193]	\[char193]	193	Aacute	u0041_0301
-\[char194]	\[char194]	194	Acircumflex	u0041_0302
-\[char195]	\[char195]	195	Atilde	u0041_0303
-\[char196]	\[char196]	196	Adieresis	u0041_0308
-\[char197]	\[char197]	197	Aring	u0041_030A
-\[char198]	\[char198]	198	AE	u00C6
-\[char199]	\[char199]	199	Ccedilla	u0043_0327
-\[char200]	\[char200]	200	Egrave	u0045_0300
-\[char201]	\[char201]	201	Eacute	u0045_0301
-\[char202]	\[char202]	202	Ecircumflex	u0045_0302
-\[char203]	\[char203]	203	Edieresis	u0045_0308
-\[char204]	\[char204]	204	Igrave	u0049_0300
-\[char205]	\[char205]	205	Iacute	u0049_0301
-\[char206]	\[char206]	206	Icircumflex	u0049_0302
-\[char207]	\[char207]	207	Idieresis	u0049_0308
-\[char208]	\[char208]	208	Eth	u00D0
-\[char209]	\[char209]	209	Ntilde	u004E_0303
-\[char210]	\[char210]	210	Ograve	u004F_0300
-\[char211]	\[char211]	211	Oacute	u004F_0301
-\[char212]	\[char212]	212	Ocircumflex	u004F_0302
-\[char213]	\[char213]	213	Otilde	u004F_0303
-\[char214]	\[char214]	214	Odieresis	u004F_0308
-\[char215]	\[char215]	215	multiply	u00D7
-\[char216]	\[char216]	216	Oslash	u00D8
-\[char217]	\[char217]	217	Ugrave	u0055_0300
-\[char218]	\[char218]	218	Uacute	u0055_0301
-\[char219]	\[char219]	219	Ucircumflex	u0055_0302
-\[char220]	\[char220]	220	Udieresis	u0055_0308
-\[char221]	\[char221]	221	Yacute	u0059_0301
-\[char222]	\[char222]	222	Thorn	u00DE
-\[char223]	\[char223]	223	germandbls	u00DF
-\[char224]	\[char224]	224	agrave	u0061_0300
-\[char225]	\[char225]	225	aacute	u0061_0301
-\[char226]	\[char226]	226	acircumflex	u0061_0302
-\[char227]	\[char227]	227	atilde	u0061_0303
-\[char228]	\[char228]	228	adieresis	u0061_0308
-\[char229]	\[char229]	229	aring	u0061_030A
-\[char230]	\[char230]	230	ae	u00E6
-\[char231]	\[char231]	231	ccedilla	u0063_0327
-\[char232]	\[char232]	232	egrave	u0065_0300
-\[char233]	\[char233]	233	eacute	u0065_0301
-\[char234]	\[char234]	234	ecircumflex	u0065_0302
-\[char235]	\[char235]	235	edieresis	u0065_0308
-\[char236]	\[char236]	236	igrave	u0069_0300
-\[char237]	\[char237]	237	iacute	u0069_0301
-\[char238]	\[char238]	238	icircumflex	u0069_0302
-\[char239]	\[char239]	239	idieresis	u0069_0308
-\[char240]	\[char240]	240	eth	u00F0
-\[char241]	\[char241]	241	ntilde	u006E_0303
-\[char242]	\[char242]	242	ograve	u006F_0300
-\[char243]	\[char243]	243	oacute	u006F_0301
-\[char244]	\[char244]	244	ocircumflex	u006F_0302
-\[char245]	\[char245]	245	otilde	u006F_0303
-\[char246]	\[char246]	246	odieresis	u006F_0308
-\[char247]	\[char247]	247	divide	u00F7
-\[char248]	\[char248]	248	oslash	u00F8
-\[char249]	\[char249]	249	ugrave	u0075_0300
-\[char250]	\[char250]	250	uacute	u0075_0301
-\[char251]	\[char251]	251	ucircumflex	u0075_0302
-\[char252]	\[char252]	252	udieresis	u0075_0308
-\[char253]	\[char253]	253	yacute	u0079_0301
-\[char254]	\[char254]	254	thorn	u00FE
-\[char255]	\[char255]	255	ydieresis	u0079_0308
+\[char181]	\[char181]	181	mu	u00B5	micro sign (from Greek character mu)
+\[char182]	\[char182]	182	paragraph	u00B6	end of line ?
+\[char183]	\[char183]	183	periodcentered	u00B7	peroid centered
+\[char184]	\[char184]	184	cedilla	u00B8	cedilla
+\[char185]	\[char185]	185	onesuperior	u00B9	1 superior
+\[char186]	\[char186]	186	ordmasculine	u00BA	masculine ordinal (Spanish)
+\[char187]	\[char187]	187	guillemotright	u00BB	guillemot right
+\[char188]	\[char188]	188	onequarter	u00BC	1/4 one quarter
+\[char189]	\[char189]	189	onehalf	u00BD	1/2 one half
+\[char190]	\[char190]	190	threequarters	u00BE	3/4 three quarters
+\[char191]	\[char191]	191	questiondown	u00BF	question mark down
+\[char192]	\[char192]	192	Agrave	u0041_0300	A grave
+\[char193]	\[char193]	193	Aacute	u0041_0301	A acute
+\[char194]	\[char194]	194	Acircumflex	u0041_0302	A circumflex
+\[char195]	\[char195]	195	Atilde	u0041_0303	A tilde
+\[char196]	\[char196]	196	Adieresis	u0041_0308	A dieresis
+\[char197]	\[char197]	197	Aring	u0041_030A	A ring
+\[char198]	\[char198]	198	AE	u00C6	A+E combined
+\[char199]	\[char199]	199	Ccedilla	u0043_0327	C cedilla
+\[char200]	\[char200]	200	Egrave	u0045_0300	E grave
+\[char201]	\[char201]	201	Eacute	u0045_0301	E acute
+\[char202]	\[char202]	202	Ecircumflex	u0045_0302	E circumflex
+\[char203]	\[char203]	203	Edieresis	u0045_0308	E dieresis
+\[char204]	\[char204]	204	Igrave	u0049_0300	I grave
+\[char205]	\[char205]	205	Iacute	u0049_0301	I acute
+\[char206]	\[char206]	206	Icircumflex	u0049_0302	I circumflex
+\[char207]	\[char207]	207	Idieresis	u0049_0308	I dieresis
+\[char208]	\[char208]	208	Eth	u00D0	E th
+\[char209]	\[char209]	209	Ntilde	u004E_0303	N tilde
+\[char210]	\[char210]	210	Ograve	u004F_0300	O grave
+\[char211]	\[char211]	211	Oacute	u004F_0301	O acute
+\[char212]	\[char212]	212	Ocircumflex	u004F_0302	O circumflex
+\[char213]	\[char213]	213	Otilde	u004F_0303	O tilde
+\[char214]	\[char214]	214	Odieresis	u004F_0308	O dieresis
+\[char215]	\[char215]	215	multiply	u00D7	multiply
+\[char216]	\[char216]	216	Oslash	u00D8	O slash
+\[char217]	\[char217]	217	Ugrave	u0055_0300	U grave
+\[char218]	\[char218]	218	Uacute	u0055_0301	U acute
+\[char219]	\[char219]	219	Ucircumflex	u0055_0302	U circumflex
+\[char220]	\[char220]	220	Udieresis	u0055_0308	U dieresis
+\[char221]	\[char221]	221	Yacute	u0059_0301	Y acute
+\[char222]	\[char222]	222	Thorn	u00DE	Thorn
+\[char223]	\[char223]	223	germandbls	u00DF	German double s (sharp s)
+\[char224]	\[char224]	224	agrave	u0061_0300	a grave
+\[char225]	\[char225]	225	aacute	u0061_0301	a acute
+\[char226]	\[char226]	226	acircumflex	u0061_0302	a circumflex
+\[char227]	\[char227]	227	atilde	u0061_0303	a tilde
+\[char228]	\[char228]	228	adieresis	u0061_0308	a dieresis
+\[char229]	\[char229]	229	aring	u0061_030A	a ring
+\[char230]	\[char230]	230	ae	u00E6	a+e combined
+\[char231]	\[char231]	231	ccedilla	u0063_0327	c cedilla
+\[char232]	\[char232]	232	egrave	u0065_0300	e grave
+\[char233]	\[char233]	233	eacute	u0065_0301	e acute
+\[char234]	\[char234]	234	ecircumflex	u0065_0302	e circumflex
+\[char235]	\[char235]	235	edieresis	u0065_0308	e dieresis
+\[char236]	\[char236]	236	igrave	u0069_0300	i grave
+\[char237]	\[char237]	237	iacute	u0069_0301	i acute
+\[char238]	\[char238]	238	icircumflex	u0069_0302	i circumflex
+\[char239]	\[char239]	239	idieresis	u0069_0308	i dieresis
+\[char240]	\[char240]	240	eth	u00F0	e th
+\[char241]	\[char241]	241	ntilde	u006E_0303	n tilde
+\[char242]	\[char242]	242	ograve	u006F_0300	o grave
+\[char243]	\[char243]	243	oacute	u006F_0301	o acute
+\[char244]	\[char244]	244	ocircumflex	u006F_0302	o circumflex
+\[char245]	\[char245]	245	otilde	u006F_0303	o tilde
+\[char246]	\[char246]	246	odieresis	u006F_0308	o dieresis
+\[char247]	\[char247]	247	divide	u00F7	divide
+\[char248]	\[char248]	248	oslash	u00F8	o slash
+\[char249]	\[char249]	249	ugrave	u0075_0300	u grave
+\[char250]	\[char250]	250	uacute	u0075_0301	u acute
+\[char251]	\[char251]	251	ucircumflex	u0075_0302	u circumflex
+\[char252]	\[char252]	252	udieresis	u0075_0308	u dieresis
+\[char253]	\[char253]	253	yacute	u0079_0301	y acute
+\[char254]	\[char254]	254	thorn	u00FE	thorn
+\[char255]	\[char255]	255	ydieresis	u0079_0308	y dieresis
 .TE
 .ad
 .
@@ -542,17 +540,17 @@ _
 \[fl]	\e[fl]	fl	u0066_006C	fl ligature +
 \[Fi]	\e[Fi]	ffi	u0066_0066_0069	ffi ligature +
 \[Fl]	\e[Fl]	ffl	u0066_0066_006C	ffl ligature +
-\[/L]	\e[/L]	Lslash	u0141	(Polish)
-\[/l]	\e[/l]	lslash	u0142	(Polish)
-\[/O]	\e[/O]	Oslash	u00D8	(Scandinavian)
-\[/o]	\e[/o]	oslash	u00F8	(Scandinavian)
-\[AE]	\e[AE]	AE	u00C6
-\[ae]	\e[ae]	ae	u00E6
-\[OE]	\e[OE]	OE	u0152
-\[oe]	\e[oe]	oe	u0153
-\[IJ]	\e[IJ]	IJ	u0132	(Dutch)
-\[ij]	\e[ij]	ij	u0133	(Dutch)
-\[.i]	\e[.i]	dotlessi	u0131	(Turkish)
+\[/L]	\e[/L]	Lslash	u0141	L slash (Polish)
+\[/l]	\e[/l]	lslash	u0142	l slash (Polish)
+\[/O]	\e[/O]	Oslash	u00D8	O slash (Scandinavian)
+\[/o]	\e[/o]	oslash	u00F8	o slash (Scandinavian)
+\[AE]	\e[AE]	AE	u00C6	A+E combined
+\[ae]	\e[ae]	ae	u00E6	a+e combined
+\[OE]	\e[OE]	OE	u0152	O+E combined
+\[oe]	\e[oe]	oe	u0153	o+e combined
+\[IJ]	\e[IJ]	IJ	u0132	I+J combined (Dutch)
+\[ij]	\e[ij]	ij	u0133	i+j combined(Dutch)
+\[.i]	\e[.i]	dotlessi	u0131	i without a dot (Turkish)
 \[.j]	\e[.j]	dotlessj	u0237	j without a dot
 .TE
 .ad


From MAILER-DAEMON Mon May 26 18:59:48 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Wp3rw-0002GG-SU
	for mharc-groff-commit@gnu.org; Mon, 26 May 2014 18:59:48 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55850)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1Wp3ru-0002D5-JY
	for groff-commit@gnu.org; Mon, 26 May 2014 18:59:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wl@gnu.org>) id 1Wp3rt-000465-RJ
	for groff-commit@gnu.org; Mon, 26 May 2014 18:59:46 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:58613)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1Wp3rt-00045V-NG
	for groff-commit@gnu.org; Mon, 26 May 2014 18:59:45 -0400
Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <wl@gnu.org>) id 1Wp3rs-0002uF-Mf
	for groff-commit@gnu.org; Mon, 26 May 2014 22:59:45 +0000
Date: Mon, 26 May 2014 22:59:44 +0000
Message-Id: <E1Wp3rs-0002uF-Mf@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: Fix mark for calling `tbl'.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140526225944.11140.14133@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 658472a64f2f00bee8cceb604d7a8a597d924d97
Auto-Submitted: auto-generated
From: Werner LEMBERG <wl@gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 May 2014 22:59:47 -0000

wl pushed a commit to branch master
in repository groff.

commit 658472a64f2f00bee8cceb604d7a8a597d924d97
Author: Werner Lemberg <wl@gnu.org>
Date:   Tue May 27 00:58:25 2014 +0200

    Fix mark for calling `tbl'.
---
 man/groff_char.man |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/man/groff_char.man b/man/groff_char.man
index 8da635e..1a3b5c5 100644
--- a/man/groff_char.man
+++ b/man/groff_char.man
@@ -1,4 +1,4 @@
-.\" t
+'\" t
 .TH GROFF_CHAR @MAN7EXT@ "@MDATE@" "@VERSION@"
 .SH NAME
 groff_char \- groff glyph names


From MAILER-DAEMON Tue May 27 09:25:31 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WpHNi-0001XA-FY
	for mharc-groff-commit@gnu.org; Tue, 27 May 2014 09:25:30 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36589)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1WpHNe-0001OB-Dl
	for groff-commit@gnu.org; Tue, 27 May 2014 09:25:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1WpHNZ-0003uZ-P3
	for groff-commit@gnu.org; Tue, 27 May 2014 09:25:26 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:38248)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1WpHNZ-0003uR-MB
	for groff-commit@gnu.org; Tue, 27 May 2014 09:25:21 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1WpHNY-0000dl-Qc
	for groff-commit@gnu.org; Tue, 27 May 2014 13:25:21 +0000
Date: Tue, 27 May 2014 13:25:20 +0000
Message-Id: <E1WpHNY-0000dl-Qc@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: in all man-pages of groff,
	change first line leading character into apostrophe, where suitable
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140527132520.2430.2630@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 99c062ba311eb42e1b62b2c9cf55644fdb7eedb2
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 May 2014 13:25:27 -0000

bwarken pushed a commit to branch master
in repository groff.

commit 99c062ba311eb42e1b62b2c9cf55644fdb7eedb2
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Tue May 27 15:25:12 2014 +0200

    in all man-pages of groff, change first line leading character into apostrophe, where suitable
---
 tmac/groff_mdoc.man |    2 +-
 tmac/groff_me.man   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tmac/groff_mdoc.man b/tmac/groff_mdoc.man
index 4e6aee8..e77b198 100644
--- a/tmac/groff_mdoc.man
+++ b/tmac/groff_mdoc.man
@@ -1,4 +1,4 @@
-.\" t
+'\" t
 .\" groff_mdoc.man
 .\"
 .\"   A complete reference of the mdoc macro package for GNU troff.
diff --git a/tmac/groff_me.man b/tmac/groff_me.man
index 132f481..edbb5ac 100644
--- a/tmac/groff_me.man
+++ b/tmac/groff_me.man
@@ -1,4 +1,4 @@
-.\" t
+'\" t
 .\" Copyright (c) 1980 The Regents of the University of California.
 .\" All rights reserved.
 .\"


From MAILER-DAEMON Tue May 27 13:19:15 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WpL1v-0003tq-3B
	for mharc-groff-commit@gnu.org; Tue, 27 May 2014 13:19:15 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:53068)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1WpL1q-0003tE-GI
	for groff-commit@gnu.org; Tue, 27 May 2014 13:19:14 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1WpL1m-00043r-Ry
	for groff-commit@gnu.org; Tue, 27 May 2014 13:19:10 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40703)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1WpL1m-00043n-Oo
	for groff-commit@gnu.org; Tue, 27 May 2014 13:19:06 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1WpL1l-0003NA-NH
	for groff-commit@gnu.org; Tue, 27 May 2014 17:19:06 +0000
Date: Tue, 27 May 2014 17:19:05 +0000
Message-Id: <E1WpL1l-0003NA-NH@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: groff_char.man: complete notes in tables
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140527171905.12933.41011@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 07a6233adeb476611f7a286295935cbbf6b9cbbd
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 May 2014 17:19:14 -0000

bwarken pushed a commit to branch master
in repository groff.

commit 07a6233adeb476611f7a286295935cbbf6b9cbbd
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Tue May 27 19:18:51 2014 +0200

    groff_char.man: complete notes in tables
---
 ChangeLog          |    4 +
 man/groff_char.man |  675 ++++++++++++++++++++++++----------------------------
 2 files changed, 315 insertions(+), 364 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 866f9ed..39c2f73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-27  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* man/groff_char.man: Finish notes in all tables.
+
 2014-05-26  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* man/groff_char.man: Add notes in some tables, more will come.
diff --git a/man/groff_char.man b/man/groff_char.man
index 1a3b5c5..09bee8e 100644
--- a/man/groff_char.man
+++ b/man/groff_char.man
@@ -42,7 +42,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see
 <http://www.gnu.org/licenses/gpl-2.0.html>.
 
-Latest update: 26 May 2014
+Latest update: 27 May 2014
 ..
 .
 .\" --------------------------------------------------------------------
@@ -352,10 +352,10 @@ _
 \[char162]	\[char162]	162	cent	u00A2	currency cent
 \[char163]	\[char163]	163	sterling	u00A3	pound sterling
 \[char164]	\[char164]	164	currency	u00A4	currency
-\[char165]	\[char165]	165	yen	u00A5	Yen
+\[char165]	\[char165]	165	yen	u00A5	Japanese currency Yen
 \[char166]	\[char166]	166	brokenbar	u00A6	broken bar
-\[char167]	\[char167]	167	section	u00A7	section, paragraph
-\[char168]	\[char168]	168	dieresis	u00A8	dieresis
+\[char167]	\[char167]	167	section	u00A7	section esp. in legal texts
+\[char168]	\[char168]	168	dieresis	u00A8	dieresis (with umlaut)
 \[char169]	\[char169]	169	copyright	u00A9	copyright
 \[char170]	\[char170]	170	ordfeminine	u00AA	feminine ordinal (Spanish)
 \[char171]	\[char171]	171	guillemotleft	u00AB	guillemot left
@@ -368,8 +368,8 @@ _
 \[char179]	\[char179]	179	threesuperior	u00B3	3 superior
 \[char180]	\[char180]	180	acute	u00B4	acute accent
 \[char181]	\[char181]	181	mu	u00B5	micro sign (from Greek character mu)
-\[char182]	\[char182]	182	paragraph	u00B6	end of line ?
-\[char183]	\[char183]	183	periodcentered	u00B7	peroid centered
+\[char182]	\[char182]	182	paragraph	u00B6	end of paragraphs in documents
+\[char183]	\[char183]	183	periodcentered	u00B7	period centered
 \[char184]	\[char184]	184	cedilla	u00B8	cedilla
 \[char185]	\[char185]	185	onesuperior	u00B9	1 superior
 \[char186]	\[char186]	186	ordmasculine	u00BA	masculine ordinal (Spanish)
@@ -382,14 +382,14 @@ _
 \[char193]	\[char193]	193	Aacute	u0041_0301	A acute
 \[char194]	\[char194]	194	Acircumflex	u0041_0302	A circumflex
 \[char195]	\[char195]	195	Atilde	u0041_0303	A tilde
-\[char196]	\[char196]	196	Adieresis	u0041_0308	A dieresis
+\[char196]	\[char196]	196	Adieresis	u0041_0308	A dieresis (with umlaut)
 \[char197]	\[char197]	197	Aring	u0041_030A	A ring
 \[char198]	\[char198]	198	AE	u00C6	A+E combined
 \[char199]	\[char199]	199	Ccedilla	u0043_0327	C cedilla
 \[char200]	\[char200]	200	Egrave	u0045_0300	E grave
 \[char201]	\[char201]	201	Eacute	u0045_0301	E acute
 \[char202]	\[char202]	202	Ecircumflex	u0045_0302	E circumflex
-\[char203]	\[char203]	203	Edieresis	u0045_0308	E dieresis
+\[char203]	\[char203]	203	Edieresis	u0045_0308	E dieresis (with umlaut)
 \[char204]	\[char204]	204	Igrave	u0049_0300	I grave
 \[char205]	\[char205]	205	Iacute	u0049_0301	I acute
 \[char206]	\[char206]	206	Icircumflex	u0049_0302	I circumflex
@@ -400,13 +400,13 @@ _
 \[char211]	\[char211]	211	Oacute	u004F_0301	O acute
 \[char212]	\[char212]	212	Ocircumflex	u004F_0302	O circumflex
 \[char213]	\[char213]	213	Otilde	u004F_0303	O tilde
-\[char214]	\[char214]	214	Odieresis	u004F_0308	O dieresis
+\[char214]	\[char214]	214	Odieresis	u004F_0308	O dieresis (with umlaut)
 \[char215]	\[char215]	215	multiply	u00D7	multiply
 \[char216]	\[char216]	216	Oslash	u00D8	O slash
 \[char217]	\[char217]	217	Ugrave	u0055_0300	U grave
 \[char218]	\[char218]	218	Uacute	u0055_0301	U acute
 \[char219]	\[char219]	219	Ucircumflex	u0055_0302	U circumflex
-\[char220]	\[char220]	220	Udieresis	u0055_0308	U dieresis
+\[char220]	\[char220]	220	Udieresis	u0055_0308	U dieresis (with umlaut)
 \[char221]	\[char221]	221	Yacute	u0059_0301	Y acute
 \[char222]	\[char222]	222	Thorn	u00DE	Thorn
 \[char223]	\[char223]	223	germandbls	u00DF	German double s (sharp s)
@@ -414,34 +414,34 @@ _
 \[char225]	\[char225]	225	aacute	u0061_0301	a acute
 \[char226]	\[char226]	226	acircumflex	u0061_0302	a circumflex
 \[char227]	\[char227]	227	atilde	u0061_0303	a tilde
-\[char228]	\[char228]	228	adieresis	u0061_0308	a dieresis
+\[char228]	\[char228]	228	adieresis	u0061_0308	a dieresis (with umlaut)
 \[char229]	\[char229]	229	aring	u0061_030A	a ring
 \[char230]	\[char230]	230	ae	u00E6	a+e combined
 \[char231]	\[char231]	231	ccedilla	u0063_0327	c cedilla
 \[char232]	\[char232]	232	egrave	u0065_0300	e grave
 \[char233]	\[char233]	233	eacute	u0065_0301	e acute
 \[char234]	\[char234]	234	ecircumflex	u0065_0302	e circumflex
-\[char235]	\[char235]	235	edieresis	u0065_0308	e dieresis
+\[char235]	\[char235]	235	edieresis	u0065_0308	e dieresis (Umlaut)
 \[char236]	\[char236]	236	igrave	u0069_0300	i grave
 \[char237]	\[char237]	237	iacute	u0069_0301	i acute
 \[char238]	\[char238]	238	icircumflex	u0069_0302	i circumflex
-\[char239]	\[char239]	239	idieresis	u0069_0308	i dieresis
+\[char239]	\[char239]	239	idieresis	u0069_0308	i dieresis (Umlaut)
 \[char240]	\[char240]	240	eth	u00F0	e th
 \[char241]	\[char241]	241	ntilde	u006E_0303	n tilde
 \[char242]	\[char242]	242	ograve	u006F_0300	o grave
 \[char243]	\[char243]	243	oacute	u006F_0301	o acute
 \[char244]	\[char244]	244	ocircumflex	u006F_0302	o circumflex
 \[char245]	\[char245]	245	otilde	u006F_0303	o tilde
-\[char246]	\[char246]	246	odieresis	u006F_0308	o dieresis
+\[char246]	\[char246]	246	odieresis	u006F_0308	o dieresis (Umlaut)
 \[char247]	\[char247]	247	divide	u00F7	divide
 \[char248]	\[char248]	248	oslash	u00F8	o slash
 \[char249]	\[char249]	249	ugrave	u0075_0300	u grave
 \[char250]	\[char250]	250	uacute	u0075_0301	u acute
 \[char251]	\[char251]	251	ucircumflex	u0075_0302	u circumflex
-\[char252]	\[char252]	252	udieresis	u0075_0308	u dieresis
+\[char252]	\[char252]	252	udieresis	u0075_0308	u dieresis (Umlaut)
 \[char253]	\[char253]	253	yacute	u0079_0301	y acute
 \[char254]	\[char254]	254	thorn	u00FE	thorn
-\[char255]	\[char255]	255	ydieresis	u0079_0308	y dieresis
+\[char255]	\[char255]	255	ydieresis	u0079_0308	y dieresis (Umlaut)
 .TE
 .ad
 .
@@ -523,7 +523,7 @@ _
 \[Sd]	\e[Sd]	eth	u00F0	lowercase eth
 \[TP]	\e[TP]	Thorn	u00DE	uppercase thorn
 \[Tp]	\e[Tp]	thorn	u00FE	lowercase thorn
-\[ss]	\e[ss]	germandbls	u00DF	German sharp s
+\[ss]	\e[ss]	germandbls	u00DF	German double s or sharp s
 .TE
 .ad
 .
@@ -563,66 +563,66 @@ _
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\['A]	\e['A]	Aacute	u0041_0301
-\['C]	\e['C]	Cacute	u0043_0301
-\['E]	\e['E]	Eacute	u0045_0301
-\['I]	\e['I]	Iacute	u0049_0301
-\['O]	\e['O]	Oacute	u004F_0301
-\['U]	\e['U]	Uacute	u0055_0301
-\['Y]	\e['Y]	Yacute	u0059_0301
-\['a]	\e['a]	aacute	u0061_0301
-\['c]	\e['c]	cacute	u0063_0301
-\['e]	\e['e]	eacute	u0065_0301
-\['i]	\e['i]	iacute	u0069_0301
-\['o]	\e['o]	oacute	u006F_0301
-\['u]	\e['u]	uacute	u0075_0301
-\['y]	\e['y]	yacute	u0079_0301
-\[:A]	\e[:A]	Adieresis	u0041_0308	A with umlaut
-\[:E]	\e[:E]	Edieresis	u0045_0308
-\[:I]	\e[:I]	Idieresis	u0049_0308
-\[:O]	\e[:O]	Odieresis	u004F_0308
-\[:U]	\e[:U]	Udieresis	u0055_0308
-\[:Y]	\e[:Y]	Ydieresis	u0059_0308
-\[:a]	\e[:a]	adieresis	u0061_0308
-\[:e]	\e[:e]	edieresis	u0065_0308
-\[:i]	\e[:i]	idieresis	u0069_0308
-\[:o]	\e[:o]	odieresis	u006F_0308
-\[:u]	\e[:u]	udieresis	u0075_0308
-\[:y]	\e[:y]	ydieresis	u0079_0308
-\[^A]	\e[^A]	Acircumflex	u0041_0302
-\[^E]	\e[^E]	Ecircumflex	u0045_0302
-\[^I]	\e[^I]	Icircumflex	u0049_0302
-\[^O]	\e[^O]	Ocircumflex	u004F_0302
-\[^U]	\e[^U]	Ucircumflex	u0055_0302
-\[^a]	\e[^a]	acircumflex	u0061_0302
-\[^e]	\e[^e]	ecircumflex	u0065_0302
-\[^i]	\e[^i]	icircumflex	u0069_0302
-\[^o]	\e[^o]	ocircumflex	u006F_0302
-\[^u]	\e[^u]	ucircumflex	u0075_0302
-\[`A]	\e[`A]	Agrave	u0041_0300
-\[`E]	\e[`E]	Egrave	u0045_0300
-\[`I]	\e[`I]	Igrave	u0049_0300
-\[`O]	\e[`O]	Ograve	u004F_0300
-\[`U]	\e[`U]	Ugrave	u0055_0300
-\[`a]	\e[`a]	agrave	u0061_0300
-\[`e]	\e[`e]	egrave	u0065_0300
-\[`i]	\e[`i]	igrave	u0069_0300
-\[`o]	\e[`o]	ograve	u006F_0300
-\[`u]	\e[`u]	ugrave	u0075_0300
-\[~A]	\e[~A]	Atilde	u0041_0303
-\[~N]	\e[~N]	Ntilde	u004E_0303
-\[~O]	\e[~O]	Otilde	u004F_0303
-\[~a]	\e[~a]	atilde	u0061_0303
-\[~n]	\e[~n]	ntilde	u006E_0303
-\[~o]	\e[~o]	otilde	u006F_0303
-\[vS]	\e[vS]	Scaron	u0053_030C
-\[vs]	\e[vs]	scaron	u0073_030C
-\[vZ]	\e[vZ]	Zcaron	u005A_030C
-\[vz]	\e[vz]	zcaron	u007A_030C
-\[,C]	\e[,C]	Ccedilla	u0043_0327
-\[,c]	\e[,c]	ccedilla	u0063_0327
-\[oA]	\e[oA]	Aring	u0041_030A
-\[oa]	\e[oa]	aring	u0061_030A
+\['A]	\e['A]	Aacute	u0041_0301	A acute
+\['C]	\e['C]	Cacute	u0043_0301	C acute
+\['E]	\e['E]	Eacute	u0045_0301	E acute
+\['I]	\e['I]	Iacute	u0049_0301	I acute
+\['O]	\e['O]	Oacute	u004F_0301	O acute
+\['U]	\e['U]	Uacute	u0055_0301	U acute
+\['Y]	\e['Y]	Yacute	u0059_0301	Y acute
+\['a]	\e['a]	aacute	u0061_0301	a acute
+\['c]	\e['c]	cacute	u0063_0301	c acute
+\['e]	\e['e]	eacute	u0065_0301	e acute
+\['i]	\e['i]	iacute	u0069_0301	i acute
+\['o]	\e['o]	oacute	u006F_0301	o acute
+\['u]	\e['u]	uacute	u0075_0301	u acute
+\['y]	\e['y]	yacute	u0079_0301	y acute
+\[:A]	\e[:A]	Adieresis	u0041_0308	A dieresis (with umlaut)
+\[:E]	\e[:E]	Edieresis	u0045_0308	E dieresis (with umlaut)
+\[:I]	\e[:I]	Idieresis	u0049_0308	I dieresis (with umlaut)
+\[:O]	\e[:O]	Odieresis	u004F_0308	O dieresis (with umlaut)
+\[:U]	\e[:U]	Udieresis	u0055_0308	U dieresis (with umlaut)
+\[:Y]	\e[:Y]	Ydieresis	u0059_0308	Y dieresis (with umlaut)
+\[:a]	\e[:a]	adieresis	u0061_0308	a dieresis (with umlaut)
+\[:e]	\e[:e]	edieresis	u0065_0308	e dieresis (with umlaut)
+\[:i]	\e[:i]	idieresis	u0069_0308	i dieresis (with umlaut)
+\[:o]	\e[:o]	odieresis	u006F_0308	o dieresis (with umlaut)
+\[:u]	\e[:u]	udieresis	u0075_0308	u dieresis (with umlaut)
+\[:y]	\e[:y]	ydieresis	u0079_0308	y dieresis (with umlaut)
+\[^A]	\e[^A]	Acircumflex	u0041_0302	A circumflex
+\[^E]	\e[^E]	Ecircumflex	u0045_0302	E circumflex
+\[^I]	\e[^I]	Icircumflex	u0049_0302	I circumflex
+\[^O]	\e[^O]	Ocircumflex	u004F_0302	O circumflex
+\[^U]	\e[^U]	Ucircumflex	u0055_0302	U circumflex
+\[^a]	\e[^a]	acircumflex	u0061_0302	a circumflex
+\[^e]	\e[^e]	ecircumflex	u0065_0302	e circumflex
+\[^i]	\e[^i]	icircumflex	u0069_0302	i circumflex
+\[^o]	\e[^o]	ocircumflex	u006F_0302	o circumflex
+\[^u]	\e[^u]	ucircumflex	u0075_0302	u circumflex
+\[`A]	\e[`A]	Agrave	u0041_0300	A grave
+\[`E]	\e[`E]	Egrave	u0045_0300	E grave
+\[`I]	\e[`I]	Igrave	u0049_0300	I grave
+\[`O]	\e[`O]	Ograve	u004F_0300	O grave
+\[`U]	\e[`U]	Ugrave	u0055_0300	U grave
+\[`a]	\e[`a]	agrave	u0061_0300	a grave
+\[`e]	\e[`e]	egrave	u0065_0300	e grave
+\[`i]	\e[`i]	igrave	u0069_0300	i grave
+\[`o]	\e[`o]	ograve	u006F_0300	o grave
+\[`u]	\e[`u]	ugrave	u0075_0300	u grave
+\[~A]	\e[~A]	Atilde	u0041_0303	A tilde
+\[~N]	\e[~N]	Ntilde	u004E_0303	N tilde
+\[~O]	\e[~O]	Otilde	u004F_0303	O tilde
+\[~a]	\e[~a]	atilde	u0061_0303	a tilde
+\[~n]	\e[~n]	ntilde	u006E_0303	n tilde
+\[~o]	\e[~o]	otilde	u006F_0303	o tilde
+\[vS]	\e[vS]	Scaron	u0053_030C	S caron, 3rd tone in Chinese pinyin
+\[vs]	\e[vs]	scaron	u0073_030C	s caron, 3rd tone in Chinese pinyin
+\[vZ]	\e[vZ]	Zcaron	u005A_030C	Z caron, 3rd tone in Chinese pinyin
+\[vz]	\e[vz]	zcaron	u007A_030C	z caron, 3rd tone in Chinese pinyin
+\[,C]	\e[,C]	Ccedilla	u0043_0327	C cedilla
+\[,c]	\e[,c]	ccedilla	u0063_0327	c cedilla
+\[oA]	\e[oA]	Aring	u0041_030A	A ring
+\[oa]	\e[oa]	aring	u0061_030A	a ring
 .TE
 .ad
 .
@@ -640,21 +640,21 @@ the values given in parentheses are the original (spacing) ones.
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\[a"]	\e[a"]	hungarumlaut	u030B (u02DD)	(Hungarian)
-\[a-]	\e[a-]	macron	u0304 (u00AF)
-\[a.]	\e[a.]	dotaccent	u0307 (u02D9)
-\[a^]	\e[a^]	circumflex	u0302 (u005E)
-\[aa]	\e[aa]	acute	u0301 (u00B4)	+
-\[ga]	\e[ga]	grave	u0300 (u0060)	+
-\[ab]	\e[ab]	breve	u0306 (u02D8)
-\[ac]	\e[ac]	cedilla	u0327 (u00B8)
+\[a"]	\e[a"]	hungarumlaut	u030B (u02DD)	Hungarian umlaut
+\[a-]	\e[a-]	macron	u0304 (u00AF)	macron, 1st tone in Chinese pinyin
+\[a.]	\e[a.]	dotaccent	u0307 (u02D9)	dot accent
+\[a^]	\e[a^]	circumflex	u0302 (u005E)	circumflex accent
+\[aa]	\e[aa]	acute	u0301 (u00B4)	acute accent
+\[ga]	\e[ga]	grave	u0300 (u0060)	grave accent
+\[ab]	\e[ab]	breve	u0306 (u02D8)	breve
+\[ac]	\e[ac]	cedilla	u0327 (u00B8)	cedilla
 \[ad]	\e[ad]	dieresis	u0308 (u00A8)	umlaut
-\[ah]	\e[ah]	caron	u030C (u02C7)
-\[ao]	\e[ao]	ring	u030A (u02DA)	circle
-\[a~]	\e[a~]	tilde	u0303 (u007E)
+\[ah]	\e[ah]	caron	u030C (u02C7)	caron, 3rd tone in Chinese pinyin
+\[ao]	\e[ao]	ring	u030A (u02DA)	small circle, ring
+\[a~]	\e[a~]	tilde	u0303 (u007E)	tilde
 \[ho]	\e[ho]	ogonek	u0328 (u02DB)	hook
-\[ha]	\e[ha]	asciicircum	u005E	(spacing)
-\[ti]	\e[ti]	asciitilde	u007E	(spacing)
+\[ha]	\e[ha]	asciicircum	u005E	high circumflex, ASCII character, in mathematics the power sign
+\[ti]	\e[ti]	asciitilde	u007E	tilde in vertical middle, ASCII, in Unix-like the home directory
 .TE
 .ad
 .
@@ -668,16 +668,16 @@ Output	Input	PostScript	Unicode	Notes
 _
 \[Bq]	\e[Bq]	quotedblbase	u201E	low double comma quote
 \[bq]	\e[bq]	quotesinglbase	u201A	low single comma quote
-\[lq]	\e[lq]	quotedblleft	u201C
-\[rq]	\e[rq]	quotedblright	u201D
-\[oq]	\e[oq]	quoteleft	u2018	single open quote
-\[cq]	\e[cq]	quoteright	u2019	single closing quote
+\[lq]	\e[lq]	quotedblleft	u201C	double quote left
+\[rq]	\e[rq]	quotedblright	u201D	double quote right
+\[oq]	\e[oq]	quoteleft	u2018	single open (left) quote
+\[cq]	\e[cq]	quoteright	u2019	single closing (right) quote
 \[aq]	\e[aq]	quotesingle	u0027	apostrophe quote (ASCII 39)
 \[dq]	\e[dq]	quotedbl	u0022	double quote (ASCII 34)
-\[Fo]	\e[Fo]	guillemotleft	u00AB
-\[Fc]	\e[Fc]	guillemotright	u00BB
-\[fo]	\e[fo]	guilsinglleft	u2039
-\[fc]	\e[fc]	guilsinglright	u203A
+\[Fo]	\e[Fo]	guillemotleft	u00AB	guillemot left
+\[Fc]	\e[Fc]	guillemotright	u00BB	guillemot right
+\[fo]	\e[fo]	guilsinglleft	u2039	single left-pointing angle quotation mark 
+\[fc]	\e[fc]	guilsinglright	u203A	single right-pointing angle quotation mark
 .TE
 .ad
 .
@@ -689,11 +689,11 @@ _
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\[r!]	\e[r!]	exclamdown	u00A1
-\[r?]	\e[r?]	questiondown	u00BF
-\[em]	\e[em]	emdash	u2014	+
-\[en]	\e[en]	endash	u2013
-\[hy]	\e[hy]	hyphen	u2010	+
+\[r!]	\e[r!]	exclamdown	u00A1	exclamation mark down
+\[r?]	\e[r?]	questiondown	u00BF	question mark down
+\[em]	\e[em]	emdash	u2014	em-dash in roff
+\[en]	\e[en]	endash	u2013	en-dash in roff
+\[hy]	\e[hy]	hyphen	u2010	hyphen in roff
 .TE
 .ad
 .
@@ -770,50 +770,43 @@ devices (provided those glyphs exist).
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\[lB]	\e[lB]	bracketleft	u005B
-\[rB]	\e[rB]	bracketright	u005D
-\[lC]	\e[lC]	braceleft	u007B
-\[rC]	\e[rC]	braceright	u007D
-\[la]	\e[la]	angleleft	u27E8	T{
-left angle bracket
-T}
-\[ra]	\e[ra]	angleright	u27E9	T{
-right angle bracket
-T}
+\[lB]	\e[lB]	bracketleft	u005B	left square bracket
+\[rB]	\e[rB]	bracketright	u005D	right square bracket
+\[lC]	\e[lC]	braceleft	u007B	left curly brace
+\[rC]	\e[rC]	braceright	u007D	right curly brace
+\[la]	\e[la]	angleleft	u27E8	left angle bracket
+\[ra]	\e[ra]	angleright	u27E9	right angle bracket
 
-\[bv]	\e[bv]	braceex	u23AA	T{
-vertical extension *** +
-T}
-\[braceex]	\e[braceex]	braceex	u23AA
+\[bv]	\e[bv]	braceex	u23AA	curly brace vertical extension within
+\[braceex]	\e[braceex]	braceex	u23AA	curly brace vertical extension within
 
-\[bracketlefttp]	\e[bracketlefttp]	bracketlefttp	u23A1
-\[bracketleftbt]	\e[bracketleftbt]	bracketleftbt	u23A3
-\[bracketleftex]	\e[bracketleftex]	bracketleftex	u23A2
-\[bracketrighttp]	\e[bracketrighttp]	bracketrighttp	u23A4
-\[bracketrightbt]	\e[bracketrightbt]	bracketrightbt	u23A6
-\[bracketrightex]	\e[bracketrightex]	bracketrightex	u23A5
+\[bracketlefttp]	\e[bracketlefttp]	bracketlefttp	u23A1	left square bracket top
+\[bracketleftbt]	\e[bracketleftbt]	bracketleftbt	u23A3	left square bracket bottom
+\[bracketleftex]	\e[bracketleftex]	bracketleftex	u23A2	left square bracket extension within
+\[bracketrighttp]	\e[bracketrighttp]	bracketrighttp	u23A4	right square bracket top
+\[bracketrightbt]	\e[bracketrightbt]	bracketrightbt	u23A6	right square bracket bottom
+\[bracketrightex]	\e[bracketrightex]	bracketrightex	u23A5	right square bracket extension within
 
-\[lt]	\e[lt]	bracelefttp	u23A7	+
-\[bracelefttp]	\e[bracelefttp]	bracelefttp	u23A7
-\[lk]	\e[lk]	braceleftmid	u23A8	+
-\[braceleftmid]	\e[braceleftmid]	braceleftmid	u23A8
-\[lb]	\e[lb]	braceleftbt	u23A9	+
-\[braceleftbt]	\e[braceleftbt]	braceleftbt	u23A9
-\[braceleftex]	\e[braceleftex]	braceleftex	u23AA
-\[rt]	\e[rt]	bracerighttp	u23AB	+
-\[bracerighttp]	\e[bracerighttp]	bracerighttp	u23AB
-\[rk]	\e[rk]	bracerightmid	u23AC	+
-\[bracerightmid]	\e[bracerightmid]	bracerightmid	u23AC
-\[rb]	\e[rb]	bracerightbt	u23AD	+
-\[bracerightbt]	\e[bracerightbt]	bracerightbt	u23AD
-\[bracerightex]	\e[bracerightex]	bracerightex	u23AA
-.
-\[parenlefttp]	\e[parenlefttp]	parenlefttp	u239B
-\[parenleftbt]	\e[parenleftbt]	parenleftbt	u239D
-\[parenleftex]	\e[parenleftex]	parenleftex	u239C
-\[parenrighttp]	\e[parenrighttp]	parenrighttp	u239E
-\[parenrightbt]	\e[parenrightbt]	parenrightbt	u23A0
-\[parenrightex]	\e[parenrightex]	parenrightex	u239F
+\[lt]	\e[lt]	bracelefttp	u23A7	left curly brace top
+\[bracelefttp]	\e[bracelefttp]	bracelefttp	u23A7	left curly brace top
+\[lk]	\e[lk]	braceleftmid	u23A8	left curly brace middle
+\[braceleftmid]	\e[braceleftmid]	braceleftmid	u23A8	left curly brace middle
+\[lb]	\e[lb]	braceleftbt	u23A9	left curly brace bottom
+\[braceleftbt]	\e[braceleftbt]	braceleftbt	u23A9	left curly brace bottom
+\[braceleftex]	\e[braceleftex]	braceleftex	u23AA	left curly brace extension within
+\[rt]	\e[rt]	bracerighttp	u23AB	right curly brace top
+\[bracerighttp]	\e[bracerighttp]	bracerighttp	u23AB	right curly brace top
+\[rk]	\e[rk]	bracerightmid	u23AC	right curly brace middle
+\[bracerightmid]	\e[bracerightmid]	bracerightmid	u23AC	right curly brace middle
+\[rb]	\e[rb]	bracerightbt	u23AD	right curly brace bottom
+\[bracerightbt]	\e[bracerightbt]	bracerightbt	u23AD	right curly brace bottom
+\[bracerightex]	\e[bracerightex]	bracerightex	u23AA	right curly brace extension within
+\[parenlefttp]	\e[parenlefttp]	parenlefttp	u239B	left parenthesis top
+\[parenleftbt]	\e[parenleftbt]	parenleftbt	u239D	left parenthesis bottom
+\[parenleftex]	\e[parenleftex]	parenleftex	u239C	left parenthesis extension within
+\[parenrighttp]	\e[parenrighttp]	parenrighttp	u239E	right parenthesis top
+\[parenrightbt]	\e[parenrightbt]	parenrightbt	u23A0	right parenthesis bottoom
+\[parenrightex]	\e[parenrightex]	parenrightex	u239F	right parenthesis extension within
 .TE
 .ad
 .
@@ -825,23 +818,19 @@ T}
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\[<-]	\e[<-]	arrowleft	u2190	+
-\[->]	\e[->]	arrowright	u2192	+
-\[<>]	\e[<>]	arrowboth	u2194	(horizontal)
-\[da]	\e[da]	arrowdown	u2193	+
-\[ua]	\e[ua]	arrowup	u2191	+
-\[va]	\e[va]	arrowupdn	u2195
-\[lA]	\e[lA]	arrowdblleft	u21D0
-\[rA]	\e[rA]	arrowdblright	u21D2
-\[hA]	\e[hA]	arrowdblboth	u21D4	(horizontal)
-\[dA]	\e[dA]	arrowdbldown	u21D3
-\[uA]	\e[uA]	arrowdblup	u21D1
-\[vA]	\e[vA]	uni21D5	u21D5	T{
-vertical double-headed double arrow
-T}
-\[an]	\e[an]	arrowhorizex	u23AF	T{
-horizontal arrow extension
-T}
+\[<-]	\e[<-]	arrowleft	u2190	horizontal arrow left
+\[->]	\e[->]	arrowright	u2192	horizontal arrow right
+\[<>]	\e[<>]	arrowboth	u2194	horizontal arrow in both directions
+\[da]	\e[da]	arrowdown	u2193	vertical arrow down
+\[ua]	\e[ua]	arrowup	u2191	vertical arrow up
+\[va]	\e[va]	arrowupdn	u2195	vertical arrow in both directions
+\[lA]	\e[lA]	arrowdblleft	u21D0	horizontal double arrow left
+\[rA]	\e[rA]	arrowdblright	u21D2	horizontal double arrow right
+\[hA]	\e[hA]	arrowdblboth	u21D4	horizontal double arrow in both directions
+\[dA]	\e[dA]	arrowdbldown	u21D3	vertical double arrow down
+\[uA]	\e[uA]	arrowdblup	u21D1	vertical double arrow up
+\[vA]	\e[vA]	uni21D5	u21D5	vertical double arrow in both directions
+\[an]	\e[an]	arrowhorizex	u23AF	horizontal arrow extension
 .TE
 .ad
 .
@@ -867,14 +856,14 @@ square root sign.
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\[ba]	\e[ba]	bar	u007C
-\[br]	\e[br]	SF110000	u2502	box rule +
-\[ul]	\e[ul]	underscore	u005F	+
-\[rn]	\e[rn]	overline	u203E	+
-\[ru]	\e[ru]	---	---	baseline rule +
-\[bb]	\e[bb]	brokenbar	u00A6
-\[sl]	\e[sl]	slash	u002F	+
-\[rs]	\e[rs]	backslash	u005C	reverse solidus
+\[ba]	\e[ba]	bar	u007C	bar
+\[br]	\e[br]	SF110000	u2502	box rule
+\[ul]	\e[ul]	underscore	u005F	underscore
+\[rn]	\e[rn]	overline	u203E	overline
+\[ru]	\e[ru]	---	---	baseline rule
+\[bb]	\e[bb]	brokenbar	u00A6	broken bar
+\[sl]	\e[sl]	slash	u002F	slash, solidus
+\[rs]	\e[rs]	backslash	u005C	reverse slash, reverse solidus
 .TE
 .ad
 .
@@ -890,19 +879,19 @@ continuation of square root.
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\[ci]	\e[ci]	circle	u25CB	+
-\[bu]	\e[bu]	bullet	u2022	+
-\[dd]	\e[dd]	daggerdbl	u2021	double dagger sign +
-\[dg]	\e[dg]	dagger	u2020	+
-\[lz]	\e[lz]	lozenge	u25CA
-\[sq]	\e[sq]	uni25A1	u25A1	white square +
-\[ps]	\e[ps]	paragraph	u00B6
-\[sc]	\e[sc]	section	u00A7	+
-\[lh]	\e[lh]	uni261C	u261C	hand pointing left +
-\[rh]	\e[rh]	a14	u261E	hand pointing right +
-\[at]	\e[at]	at	u0040
-\[sh]	\e[sh]	numbersign	u0023
-\[CR]	\e[CR]	carriagereturn	u21B5
+\[ci]	\e[ci]	circle	u25CB	circle
+\[bu]	\e[bu]	bullet	u2022	bullet
+\[dd]	\e[dd]	daggerdbl	u2021	double dagger sign
+\[dg]	\e[dg]	dagger	u2020	dagger
+\[lz]	\e[lz]	lozenge	u25CA	lozenge, diamond, pound key
+\[sq]	\e[sq]	uni25A1	u25A1	white square
+\[ps]	\e[ps]	paragraph	u00B6	end of paragraphs in documents
+\[sc]	\e[sc]	section	u00A7	section esp. in legal texts
+\[lh]	\e[lh]	uni261C	u261C	hand pointing left
+\[rh]	\e[rh]	a14	u261E	hand pointing right
+\[at]	\e[at]	at	u0040	at
+\[sh]	\e[sh]	numbersign	u0023	number sign
+\[CR]	\e[CR]	carriagereturn	u21B5	carriage return
 \[OK]	\e[OK]	a19	u2713	check mark, tick
 .TE
 .ad
@@ -915,9 +904,9 @@ _
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\[co]	\e[co]	copyright	u00A9	+
-\[rg]	\e[rg]	registered	u00AE	+
-\[tm]	\e[tm]	trademark	u2122
+\[co]	\e[co]	copyright	u00A9	copyright sign
+\[rg]	\e[rg]	registered	u00AE	registered mark
+\[tm]	\e[tm]	trademark	u2122	trademark symbol
 \[bs]	\e[bs]	---	---	AT&T Bell Labs logo +
 .TE
 .ad
@@ -933,14 +922,12 @@ The Bell Labs logo is not supported in groff.
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\[Do]	\e[Do]	dollar	u0024
-\[ct]	\e[ct]	cent	u00A2	+
+\[Do]	\e[Do]	dollar	u0024	dollar
+\[ct]	\e[ct]	cent	u00A2	cent
 \[eu]	\e[eu]	---	u20AC	official Euro symbol
-\[Eu]	\e[Eu]	Euro	u20AC	T{
-font-specific Euro glyph variant
-T}
-\[Ye]	\e[Ye]	yen	u00A5
-\[Po]	\e[Po]	sterling	u00A3	British currency sign
+\[Eu]	\e[Eu]	Euro	u20AC	font-specific Euro glyph variant
+\[Ye]	\e[Ye]	yen	u00A5	Japanese Yen
+\[Po]	\e[Po]	sterling	u00A3	British currency sign pound sterling
 \[Cs]	\e[Cs]	currency	u00A4	Scandinavian currency sign
 \[Fn]	\e[Fn]	florin	u0192	Dutch currency sign
 .TE
@@ -954,13 +941,13 @@ T}
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\[de]	\e[de]	degree	u00B0	+
+\[de]	\e[de]	degree	u00B0	degree
 \[%0]	\e[%0]	perthousand	u2030	per thousand, per mille sign
-\[fm]	\e[fm]	minute	u2032	footmark, prime +
-\[sd]	\e[sd]	second	u2033
-\[mc]	\e[mc]	mu	u00B5	micro sign
-\[Of]	\e[Of]	ordfeminine	u00AA
-\[Om]	\e[Om]	ordmasculine	u00BA
+\[fm]	\e[fm]	minute	u2032	in astronomy unit m minute of angle
+\[sd]	\e[sd]	second	u2033	in astronomy unit second of angle
+\[mc]	\e[mc]	mu	u00B5	mu, micro sign
+\[Of]	\e[Of]	ordfeminine	u00AA	feminine ordinal (Spanish)
+\[Om]	\e[Om]	ordmasculine	u00BA	masculine ordinal (Spanish)
 .TE
 .ad
 .
@@ -972,18 +959,16 @@ _
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\[AN]	\e[AN]	logicaland	u2227
-\[OR]	\e[OR]	logicalor	u2228
-\[no]	\e[no]	logicalnot	u00AC	+
+\[AN]	\e[AN]	logicaland	u2227	logical and
+\[OR]	\e[OR]	logicalor	u2228	logical or
+\[no]	\e[no]	logicalnot	u00AC	logical not
 \[tno]	\e[tno]	logicalnot	u00AC	text variant of `no'
 \[te]	\e[te]	existential	u2203	there exists
 \[fa]	\e[fa]	universal	u2200	for all
-\[st]	\e[st]	suchthat	u220B
-\[3d]	\e[3d]	therefore	u2234
-\[tf]	\e[tf]	therefore	u2234
-\[or]	\e[or]	bar	u007C	T{
-bitwise OR operator (as used in C) +
-T}
+\[st]	\e[st]	suchthat	u220B	sucht that
+\[3d]	\e[3d]	therefore	u2234	therefore
+\[tf]	\e[tf]	therefore	u2234	therefore
+\[or]	\e[or]	bar	u007C	bitwise OR operator (as used in C)
 .TE
 .ad
 .
@@ -995,124 +980,86 @@ T}
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\[12]	\e[12]	onehalf	u00BD	+
-\[14]	\e[14]	onequarter	u00BC	+
-\[34]	\e[34]	threequarters	u00BE	+
-\[18]	\e[18]	oneeighth	u215B
-\[38]	\e[38]	threeeighths	u215C
-\[58]	\e[58]	fiveeighths	u215D
-\[78]	\e[78]	seveneighths	u215E
-\[S1]	\e[S1]	onesuperior	u00B9
-\[S2]	\e[S2]	twosuperior	u00B2
-\[S3]	\e[S3]	threesuperior	u00B3
+\[12]	\e[12]	onehalf	u00BD	1/2 one half
+\[14]	\e[14]	onequarter	u00BC	1/4 one quarter
+\[34]	\e[34]	threequarters	u00BE	3/4 three quarter
+\[18]	\e[18]	oneeighth	u215B	1/8 one eighth
+\[38]	\e[38]	threeeighths	u215C	3/8 three eighth
+\[58]	\e[58]	fiveeighths	u215D	5/8 five eighth
+\[78]	\e[78]	seveneighths	u215E	7/8 seven eighth
+\[S1]	\e[S1]	onesuperior	u00B9	one superior
+\[S2]	\e[S2]	twosuperior	u00B2	two superior
+\[S3]	\e[S3]	threesuperior	u00B3	three superior
 
-\[pl]	\e[pl]	plus	u002B	T{
-plus in special font +
-T}
-\[mi]	\e[mi]	minus	u2212	T{
-minus in special font +
-T}
-\[-+]	\e[-+]	uni2213	u2213
-\[+-]	\e[+-]	plusminus	u00B1	+
-\[t+-]	\e[t+-]	plusminus	u00B1	T{
-text variant of `+\-'
-T}
-\[pc]	\e[pc]	periodcentered	u00B7
-\[md]	\e[md]	dotmath	u22C5	T{
-multiplication dot
-T}
-\[mu]	\e[mu]	multiply	u00D7	+
-\[tmu]	\e[tmu]	multiply	u00D7	T{
-text variant of `mu'
-T}
-\[c*]	\e[c*]	circlemultiply	u2297	T{
-multiply sign in a circle
-T}
-\[c+]	\e[c+]	circleplus	u2295	T{
-plus in a circle
-T}
-\[di]	\e[di]	divide	u00F7	division +
-\[tdi]	\e[tdi]	divide	u00F7	T{
-text variant of `di'
-T}
-\[f/]	\e[f/]	fraction	u2044	T{
-bar for fractions
-T}
-\[**]	\e[**]	asteriskmath	u2217	+
+\[pl]	\e[pl]	plus	u002B	plus in special font
+\[mi]	\e[mi]	minus	u2212	minus in special font
+\[-+]	\e[-+]	uni2213	u2213	minus-plus
+\[+-]	\e[+-]	plusminus	u00B1	plus-minus
+\[t+-]	\e[t+-]	plusminus	u00B1	text variant of plus-minus
+\[pc]	\e[pc]	periodcentered	u00B7	period centered
+\[md]	\e[md]	dotmath	u22C5	multiplication dot
+\[mu]	\e[mu]	multiply	u00D7	`mu', multiply
+\[tmu]	\e[tmu]	multiply	u00D7	text variant of multiply, `mu'
+\[c*]	\e[c*]	circlemultiply	u2297	multiply sign in a circle
+\[c+]	\e[c+]	circleplus	u2295	plus in a circle
+\[di]	\e[di]	divide	u00F7	division, `di'
+\[tdi]	\e[tdi]	divide	u00F7	text variant of division, `di'
+\[f/]	\e[f/]	fraction	u2044	bar for fractions
+\[**]	\e[**]	asteriskmath	u2217	mathematical asterisk
 
-\[<=]	\e[<=]	lessequal	u2264	+
-\[>=]	\e[>=]	greaterequal	u2265	+
+\[<=]	\e[<=]	lessequal	u2264	less or equal
+\[>=]	\e[>=]	greaterequal	u2265	greater or equal
 \[<<]	\e[<<]	uni226A	u226A	much less
 \[>>]	\e[>>]	uni226B	u226B	much greater
-\[eq]	\e[eq]	equal	u003D	T{
-equals in special font +
-T}
-\[!=]	\e[!=]	notequal	u003D_0338	+
-\[==]	\e[==]	equivalence	u2261	+
-\[ne]	\e[ne]	uni2262	u2261_0338
-\[=~]	\e[=~]	congruent	u2245	T{
-approx.\& equal
-T}
-\[|=]	\e[|=]	uni2243	u2243	T{
-asymptot.\& equal to +
-T}
-\[ap]	\e[ap]	similar	u223C	+
-\[~~]	\e[~~]	approxequal	u2248	T{
-almost equal to
-T}
-\[~=]	\e[~=]	approxequal	u2248
-\[pt]	\e[pt]	proportional	u221D	+
+\[eq]	\e[eq]	equal	u003D	equals in special font
+\[!=]	\e[!=]	notequal	u003D_0338	not equal	
+\[==]	\e[==]	equivalence	u2261	equivalent
+\[ne]	\e[ne]	uni2262	u2261_0338	not equivalent
+\[=~]	\e[=~]	congruent	u2245	congruent, approx. equal
+\[|=]	\e[|=]	uni2243	u2243	asymptot. equal to
+\[ap]	\e[ap]	similar	u223C	similar
+\[~~]	\e[~~]	approxequal	u2248	almost equal to
+\[~=]	\e[~=]	approxequal	u2248	almost equal to
+\[pt]	\e[pt]	proportional	u221D	proportional
 
-\[es]	\e[es]	emptyset	u2205	+
-\[mo]	\e[mo]	element	u2208	+
-\[nm]	\e[nm]	notelement	u2208_0338
-\[sb]	\e[sb]	propersubset	u2282	+
-\[nb]	\e[nb]	notsubset	u2282_0338
-\[sp]	\e[sp]	propersuperset	u2283	+
+\[es]	\e[es]	emptyset	u2205	empty set
+\[mo]	\e[mo]	element	u2208	element of a set
+\[nm]	\e[nm]	notelement	u2208_0338	not element of some set
+\[sb]	\e[sb]	propersubset	u2282	proper subset
+\[nb]	\e[nb]	notsubset	u2282_0338	not supset
+\[sp]	\e[sp]	propersuperset	u2283	proper superset
 \[nc]	\e[nc]	uni2285	u2283_0338	not superset
-\[ib]	\e[ib]	reflexsubset	u2286	+
-\[ip]	\e[ip]	reflexsuperset	u2287	+
-\[ca]	\e[ca]	intersection	u2229	T{
-intersection, cap +
-T}
-\[cu]	\e[cu]	union	u222A	union, cup +
+\[ib]	\e[ib]	reflexsubset	u2286	subset or equal
+\[ip]	\e[ip]	reflexsuperset	u2287	superset or equal
+\[ca]	\e[ca]	intersection	u2229	intersection, cap
+\[cu]	\e[cu]	union	u222A	union, cup
 
-\[/_]	\e[/_]	angle	u2220
-\[pp]	\e[pp]	perpendicular	u22A5
-\[is]	\e[is]	integral	u222B	+
-\[integral]	\e[integral]	integral	u222B	***
-\[sum]	\e[sum]	summation	u2211	***
-\[product]	\e[product]	product	u220F	***
-\[coproduct]	\e[coproduct]	uni2210	u2210	***
-\[gr]	\e[gr]	gradient	u2207	+
-\[sr]	\e[sr]	radical	u221A	square root +
-\[sqrt]	\e[sqrt]	radical	u221A	***
-\[radicalex]	\e[radicalex]	radicalex	---	T{
-square root continuation
-T}
-\[sqrtex]	\e[sqrtex]	radicalex	---	***
+\[/_]	\e[/_]	angle	u2220	angle
+\[pp]	\e[pp]	perpendicular	u22A5	perpendicular
+\[is]	\e[is]	integral	u222B	integral
+\[integral]	\e[integral]	integral	u222B	integral
+\[sum]	\e[sum]	summation	u2211	summation
+\[product]	\e[product]	product	u220F	product
+\[coproduct]	\e[coproduct]	uni2210	u2210	coproduct
+\[gr]	\e[gr]	gradient	u2207	gradient
+\[sr]	\e[sr]	radical	u221A	square root
+\[sqrt]	\e[sqrt]	radical	u221A	square root
+\[radicalex]	\e[radicalex]	radicalex	---	square root continuation
+\[sqrtex]	\e[sqrtex]	radicalex	---	square root continuation
 
-\[lc]	\e[lc]	uni2308	u2308	left ceiling +
-\[rc]	\e[rc]	uni2309	u2309	right ceiling +
-\[lf]	\e[lf]	uni230A	u230A	left floor +
-\[rf]	\e[rf]	uni230B	u230B	right floor +
+\[lc]	\e[lc]	uni2308	u2308	left ceiling
+\[rc]	\e[rc]	uni2309	u2309	right ceiling
+\[lf]	\e[lf]	uni230A	u230A	left floor
+\[rf]	\e[rf]	uni230B	u230B	right floor
 
-\[if]	\e[if]	infinity	u221E	+
-\[Ah]	\e[Ah]	aleph	u2135
-\[Im]	\e[Im]	Ifraktur	u2111	T{
-Gothic I, imaginary
-T}
-\[Re]	\e[Re]	Rfraktur	u211C	T{
-Gothic R, real
-T}
+\[if]	\e[if]	infinity	u221E	infinity
+\[Ah]	\e[Ah]	aleph	u2135	aleph
+\[Im]	\e[Im]	Ifraktur	u2111	Gothic I, imaginary
+\[Re]	\e[Re]	Rfraktur	u211C	Gothic R, real
 \[wp]	\e[wp]	weierstrass	u2118	Weierstrass\~p
-\[pd]	\e[pd]	partialdiff	u2202	T{
-partial differentiation +
-T}
-\[-h]	\e[-h]	uni210F	u210F	T{
-Planck constant / 2pi
-T}
-\[hbar]	\e[hbar]	uni210F	u210F
+\[pd]	\e[pd]	partialdiff	u2202	partial differentiation
+\[-h]	\e[-h]	uni210F	u210F	Planck constant / 2pi (h-bar)
+\[hbar]	\e[hbar]	uni210F	u210F	Planck constant / 2pi (h-bar)
 .TE
 .ad
 .
@@ -1150,55 +1097,55 @@ phi, and `\f(CW\e[+f]\fP' the curly variant.
 l l l l lx.
 Output	Input	PostScript	Unicode	Notes
 _
-\[*A]	\e[*A]	Alpha	u0391	+
-\[*B]	\e[*B]	Beta	u0392	+
-\[*G]	\e[*G]	Gamma	u0393	+
-\[*D]	\e[*D]	Delta	u0394	+
-\[*E]	\e[*E]	Epsilon	u0395	+
-\[*Z]	\e[*Z]	Zeta	u0396	+
-\[*Y]	\e[*Y]	Eta	u0397	+
-\[*H]	\e[*H]	Theta	u0398	+
-\[*I]	\e[*I]	Iota	u0399	+
-\[*K]	\e[*K]	Kappa	u039A	+
-\[*L]	\e[*L]	Lambda	u039B	+
-\[*M]	\e[*M]	Mu	u039C	+
-\[*N]	\e[*N]	Nu	u039D	+
-\[*C]	\e[*C]	Xi	u039E	+
-\[*O]	\e[*O]	Omicron	u039F	+
-\[*P]	\e[*P]	Pi	u03A0	+
-\[*R]	\e[*R]	Rho	u03A1	+
-\[*S]	\e[*S]	Sigma	u03A3	+
-\[*T]	\e[*T]	Tau	u03A4	+
-\[*U]	\e[*U]	Upsilon	u03A5	+
-\[*F]	\e[*F]	Phi	u03A6	+
-\[*X]	\e[*X]	Chi	u03A7	+
-\[*Q]	\e[*Q]	Psi	u03A8	+
-\[*W]	\e[*W]	Omega	u03A9	+
-\[*a]	\e[*a]	alpha	u03B1	+
-\[*b]	\e[*b]	beta	u03B2	+
-\[*g]	\e[*g]	gamma	u03B3	+
-\[*d]	\e[*d]	delta	u03B4	+
-\[*e]	\e[*e]	epsilon	u03B5	+
-\[*z]	\e[*z]	zeta	u03B6	+
-\[*y]	\e[*y]	eta	u03B7	+
-\[*h]	\e[*h]	theta	u03B8	+
-\[*i]	\e[*i]	iota	u03B9	+
-\[*k]	\e[*k]	kappa	u03BA	+
-\[*l]	\e[*l]	lambda	u03BB	+
-\[*m]	\e[*m]	mu	u03BC	+
-\[*n]	\e[*n]	nu	u03BD	+
-\[*c]	\e[*c]	xi	u03BE	+
-\[*o]	\e[*o]	omicron	u03BF	+
-\[*p]	\e[*p]	pi	u03C0	+
-\[*r]	\e[*r]	rho	u03C1	+
-\[ts]	\e[ts]	sigma1	u03C2	terminal sigma +
-\[*s]	\e[*s]	sigma	u03C3	+
-\[*t]	\e[*t]	tau	u03C4	+
-\[*u]	\e[*u]	upsilon	u03C5	+
-\[*f]	\e[*f]	phi	u03D5	(stroked glyph) +
-\[*x]	\e[*x]	chi	u03C7	+
-\[*q]	\e[*q]	psi	u03C8	+
-\[*w]	\e[*w]	omega	u03C9	+
+\[*A]	\e[*A]	Alpha	u0391	Alpha
+\[*B]	\e[*B]	Beta	u0392	Beta
+\[*G]	\e[*G]	Gamma	u0393	Gamma
+\[*D]	\e[*D]	Delta	u0394	Delta
+\[*E]	\e[*E]	Epsilon	u0395	Epsilon
+\[*Z]	\e[*Z]	Zeta	u0396	Zeta
+\[*Y]	\e[*Y]	Eta	u0397	Eta
+\[*H]	\e[*H]	Theta	u0398	Theta
+\[*I]	\e[*I]	Iota	u0399	Iota
+\[*K]	\e[*K]	Kappa	u039A	Kappa
+\[*L]	\e[*L]	Lambda	u039B	Lamda
+\[*M]	\e[*M]	Mu	u039C	Mu
+\[*N]	\e[*N]	Nu	u039D	Nu
+\[*C]	\e[*C]	Xi	u039E	Xi
+\[*O]	\e[*O]	Omicron	u039F	Omicron
+\[*P]	\e[*P]	Pi	u03A0	Pi
+\[*R]	\e[*R]	Rho	u03A1	Rho
+\[*S]	\e[*S]	Sigma	u03A3	Sigma
+\[*T]	\e[*T]	Tau	u03A4	Tau
+\[*U]	\e[*U]	Upsilon	u03A5	Upsilon
+\[*F]	\e[*F]	Phi	u03A6	Phi
+\[*X]	\e[*X]	Chi	u03A7	Chi
+\[*Q]	\e[*Q]	Psi	u03A8	Psi
+\[*W]	\e[*W]	Omega	u03A9	Omega
+\[*a]	\e[*a]	alpha	u03B1	alpha
+\[*b]	\e[*b]	beta	u03B2	beta
+\[*g]	\e[*g]	gamma	u03B3	gamma
+\[*d]	\e[*d]	delta	u03B4	delta
+\[*e]	\e[*e]	epsilon	u03B5	epsilon
+\[*z]	\e[*z]	zeta	u03B6	zeta
+\[*y]	\e[*y]	eta	u03B7	eta
+\[*h]	\e[*h]	theta	u03B8	theta
+\[*i]	\e[*i]	iota	u03B9	iota
+\[*k]	\e[*k]	kappa	u03BA	kappa
+\[*l]	\e[*l]	lambda	u03BB	lambda
+\[*m]	\e[*m]	mu	u03BC	mu
+\[*n]	\e[*n]	nu	u03BD	nu
+\[*c]	\e[*c]	xi	u03BE	xi
+\[*o]	\e[*o]	omicron	u03BF	omicron
+\[*p]	\e[*p]	pi	u03C0	pi
+\[*r]	\e[*r]	rho	u03C1	rho
+\[ts]	\e[ts]	sigma1	u03C2	terminal sigma
+\[*s]	\e[*s]	sigma	u03C3	sigma
+\[*t]	\e[*t]	tau	u03C4	tau
+\[*u]	\e[*u]	upsilon	u03C5	upsilon
+\[*f]	\e[*f]	phi	u03D5	phi oked glyph)
+\[*x]	\e[*x]	chi	u03C7	chi
+\[*q]	\e[*q]	psi	u03C8	psi
+\[*w]	\e[*w]	omega	u03C9	omega
 \[+h]	\e[+h]	theta1	u03D1	variant theta
 \[+f]	\e[+f]	phi1	u03C6	variant phi (curly shape)
 \[+p]	\e[+p]	omega1	u03D6	variant pi, looking like omega


From MAILER-DAEMON Wed May 28 07:52:13 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WpcOz-000566-8z
	for mharc-groff-commit@gnu.org; Wed, 28 May 2014 07:52:13 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33002)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1WpcOw-00055m-BI
	for groff-commit@gnu.org; Wed, 28 May 2014 07:52:11 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1WpcOr-00054Q-Bh
	for groff-commit@gnu.org; Wed, 28 May 2014 07:52:10 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:51107)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1WpcOr-00054M-7y
	for groff-commit@gnu.org; Wed, 28 May 2014 07:52:05 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1WpcOq-0005kG-1J
	for groff-commit@gnu.org; Wed, 28 May 2014 11:52:04 +0000
Date: Wed, 28 May 2014 11:52:04 +0000
Message-Id: <E1WpcOq-0005kG-1J@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: grog.pl: error messages for a document's first line
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140528115203.22052.38738@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 6f0d81ccdb32432f2d0157ad2788c06c76260e8c
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 May 2014 11:52:11 -0000

bwarken pushed a commit to branch master
in repository groff.

commit 6f0d81ccdb32432f2d0157ad2788c06c76260e8c
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Wed May 28 13:51:52 2014 +0200

    grog.pl: error messages for a document's first line
---
 src/roff/grog/grog.pl |   45 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/roff/grog/grog.pl b/src/roff/grog/grog.pl
index bbecbcb..23d6fdd 100644
--- a/src/roff/grog/grog.pl
+++ b/src/roff/grog/grog.pl
@@ -28,7 +28,7 @@
 # <http://www.gnu.org/licenses/gpl-2.0.html>.
 
 ########################################################################
-my $Last_Update = '26 May 2014';
+my $Last_Update = '28 May 2014';
 ########################################################################
 
 require v5.6;
@@ -159,15 +159,46 @@ sub process {
   while (<FILE>) {
     chomp;
 
-    s/^[']/./;
-
     if ( $first_line ) {
-      # when first line, test on comment with character set for grog args
+      # As documented for the `man' program, the first line can be
+      # used as an groff option line.  This is done by:
+      # - start the line with '\" (apostrophe, backslash, double quote)
+      # - add a space character
+      # - a word using the following characters can be appended: `egGjpRst'.
+      #     Each of these characters means an option for the generated
+      #     `groff' command line, e.g. `-t'.
+
+      $first_line = 0; # for later necessary end of first line
+
+      if ( /^\.\\"/ ) {
+	my $line = $_;
+	$line =~ s/^[.]\\"//g;
+	$line =~ s/\s//g;
+	if ( $line =~ /[egGjpRst]+$/ ) {
+	  # line is a groff options line with . instead of '
+	  print STDERR "First line must start with " .
+	    "apostrophe ' instead of period . for groff options line!";
+	  s/^\./'/; # line now starts with apostrophe '
+	} else {
+	  # line has non-option characters, so is a comment, i.e. ignore
+	  next;
+	}
+      }
 
-      $first_line = 0; # end of first line
+      if ( /^'\\"/ ) {
+	s/^'\\"//;
+	s/\W//g;
+	{
+	  my $chars = $_;
+	  $chars =~ s/[egGjpRst]//g;
+	  if ( $chars ) {
+	    print STDERR 'Wrong characters in first line: ' .
+	      $chars . '.';
+	    print STDERR
+	      "For an options line are only allowed: [egGjpRst].";
+	  }
+	}
 
-      if ( /^\.\\"\s*(.+)$/ ) {
-	my $_ = $1;
 	if ( /e/ ) {
 	  $Groff{'eqn'}++;
 	}


From MAILER-DAEMON Thu May 29 14:37:11 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Wq5CR-0004JF-K2
	for mharc-groff-commit@gnu.org; Thu, 29 May 2014 14:37:11 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41675)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1Wq5CP-0004Gj-4v
	for groff-commit@gnu.org; Thu, 29 May 2014 14:37:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1Wq5CN-0003d1-Jg
	for groff-commit@gnu.org; Thu, 29 May 2014 14:37:09 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40193)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1Wq5CN-0003cv-GF
	for groff-commit@gnu.org; Thu, 29 May 2014 14:37:07 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1Wq5CM-0004L9-F4
	for groff-commit@gnu.org; Thu, 29 May 2014 18:37:06 +0000
Date: Thu, 29 May 2014 18:37:06 +0000
Message-Id: <E1Wq5CM-0004L9-F4@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: man/groff.man: in special characters,
	add the mentioning of the `groff' writing `\[xy]'.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140529183706.16651.37739@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: af5771902bbb6d00f0b927324f4d5bc7917fa771
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 May 2014 18:37:10 -0000

bwarken pushed a commit to branch master
in repository groff.

commit af5771902bbb6d00f0b927324f4d5bc7917fa771
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Thu May 29 20:36:04 2014 +0200

    man/groff.man: in special characters, add the mentioning of the
    `groff' writing `\[xy]'.
---
 ChangeLog     |    5 +++++
 man/groff.man |   16 ++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 39c2f73..4c9a7c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-29  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* man/groff.man: In special characters, add the mentioning of the
+	`groff' writing `\[xy]'.
+
 2014-05-27  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* man/groff_char.man: Finish notes in all tables.
diff --git a/man/groff.man b/man/groff.man
index e138a8e..07428a7 100644
--- a/man/groff.man
+++ b/man/groff.man
@@ -3313,11 +3313,19 @@ with characters
 and
 .IR y .
 .
-Some of these exist in the usual font while most of them are only
-available in the special font.
+In
+.IR groff ,
+it is also possible to use the writing
+.BI \[rs][ xy ]
+as well.
+.
+.
+.P
+Some of these special characters exist in the usual font while most of
+them are only available in the special font.
 .
-Below you can find a selection of the most important glyphs; a complete
-list can be found in
+Below you can see a small selection of the most important glyphs; a
+complete list can be found in
 .BR groff_char (@MAN7EXT@).
 .RS
 .P


From MAILER-DAEMON Sat May 31 10:32:52 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WqkL6-0003SU-20
	for mharc-groff-commit@gnu.org; Sat, 31 May 2014 10:32:52 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47861)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1WqkL0-0003RT-Om
	for groff-commit@gnu.org; Sat, 31 May 2014 10:32:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1WqkKw-0005CD-Ek
	for groff-commit@gnu.org; Sat, 31 May 2014 10:32:46 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:34939)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bernd.warken@web.de>) id 1WqkKw-0005C8-AM
	for groff-commit@gnu.org; Sat, 31 May 2014 10:32:42 -0400
Received: from bwarken by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <bernd.warken@web.de>) id 1WqkKv-0006cf-9b
	for groff-commit@gnu.org; Sat, 31 May 2014 14:32:41 +0000
Date: Sat, 31 May 2014 14:32:41 +0000
Message-Id: <E1WqkKv-0006cf-9b@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: groffer: replace all options --*viewer* by a single
	--viewer
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140531143241.25426.65537@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 6e8c0971c4193551b4cc91e51e8a02b9cff146ad
Auto-Submitted: auto-generated
From: Bernd Warken <bernd.warken@web.de>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 140.186.70.72
X-BeenThere: groff-commit@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: groff@gnu.org
List-Id: <groff-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/groff-commit>
List-Post: <mailto:groff-commit@gnu.org>
List-Help: <mailto:groff-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/groff-commit>,
	<mailto:groff-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 31 May 2014 14:32:50 -0000

bwarken pushed a commit to branch master
in repository groff.

commit 6e8c0971c4193551b4cc91e51e8a02b9cff146ad
Author: Bernd Warken <groff-bernd.warken-72@web.de>
Date:   Sat May 31 16:32:25 2014 +0200

    groffer: replace all options --*viewer* by a single --viewer
---
 contrib/groffer/ChangeLog   |    7 +
 contrib/groffer/func.pl     |   26 ++--
 contrib/groffer/groffer.man |  259 ++++++++++++++++++++---------------
 contrib/groffer/groffer.pl  |  317 ++++++++++++++++++++++---------------------
 contrib/groffer/version.sh  |    4 +-
 5 files changed, 335 insertions(+), 278 deletions(-)

diff --git a/contrib/groffer/ChangeLog b/contrib/groffer/ChangeLog
index d0f7b26..7d046d4 100644
--- a/contrib/groffer/ChangeLog
+++ b/contrib/groffer/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-31  Bernd Warken  <groff-bernd.warken-72@web.de>
+
+	* groffer.pl, func.pl, groffer.man: Change all existing viewer
+	options into a single one `--viewer'.
+
+	* version.sh: Upgrade to version 2.1.0.
+
 2014-03-30  Steffen Nurpmeso  <sdaoden@yandex.com>
 
 	* Makefile.sub: Put straight error-prevention prefixes for `rm'.
diff --git a/contrib/groffer/func.pl b/contrib/groffer/func.pl
index b292d3f..4532ed7 100644
--- a/contrib/groffer/func.pl
+++ b/contrib/groffer/func.pl
@@ -8,7 +8,7 @@
 # Copyright (C) 2006, 2009, 2014 Free Software Foundation, Inc.
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 
-# Last update: 25 Feb 2014
+# Last update: 31 May 2014
 
 # This file is part of `groffer', which is part of `groff'.
 
@@ -554,12 +554,9 @@ The most important groffer long options are
 --default-modes=mode1,mode2,...
                   set sequence of automatically tried modes.
 --dvi             display in a viewer for TeX device independent format.
---dvi-viewer=prog choose the viewer program for dvi mode.
 --groff           process like groff, disable viewing features.
 --help            display this helping output.
 --html            display in a web browser.
---html-viewer=program
-                  choose the web browser for html mode.
 --man             check file parameters first whether they are man pages.
 --mode=auto|dvi|groff|html|pdf|ps|source|text|tty|www|x|X
                   choose display mode.
@@ -567,20 +564,16 @@ The most important groffer long options are
 --no-special      disable --all, --apropos*, and --whatis
 --pager=program   preset the paging program for tty mode.
 --pdf             display in a PDF viewer.
---pdf-viewer=prog choose the viewer program for pdf mode.
 --ps              display in a Postscript viewer.
---ps-viewer=prog  choose the viewer program for ps mode.
 --source          output as roff source.
 --text            output in a text device without a pager.
 --to-stdout       output the content of the mode file without display.
 --tty             display with a pager on text terminal even when in X.
---tty-viewer=prog select a pager for tty mode; same as --pager.
+--viewer          choose a viewer for the actual device mode
+--viewer-tty      choose a viewer for the actual text mode
 --whatis          display the file name and description of man pages
 --www             same as --html.
---www-viewer=prog same as --html-viewer
 --x --X           display with "gxditview" using an X* device.
---x-viewer=prog   choose viewer program for x mode (X mode).
---X-viewer=prog   same as "--xviewer".
 
 The usual X Windows toolkit options transformed into GNU long options:
 --background=color, --bd=size, --bg=color, --bordercolor=color,
@@ -598,6 +591,19 @@ Development options that are not useful for normal usage:
 --debug-tmpdir, --do-nothing, --print=text
 
 EOF
+
+# The following mode-viewer options were replaced by a single --viewer
+# option.  The old options are only ignored:
+# --dvi-viewer=prog choose the viewer program for dvi mode.
+# --html-viewer=program
+#                  choose the web browser for html mode.
+# --pdf-viewer=prog choose the viewer program for pdf mode.
+# --ps-viewer=prog  choose the viewer program for ps mode.
+# --tty-viewer=prog select a pager for tty mode; same as --pager.
+# --www-viewer=prog same as --html-viewer
+# --x-viewer=prog   choose viewer program for x mode (X mode).
+# --X-viewer=prog   same as "--xviewer".
+
 } # usage()
 
 
diff --git a/contrib/groffer/groffer.man b/contrib/groffer/groffer.man
index b3c7a07..f3ec6c7 100644
--- a/contrib/groffer/groffer.man
+++ b/contrib/groffer/groffer.man
@@ -11,6 +11,10 @@ groffer \- display groff files and man\~pages on X and tty
 .
 .de author
 This file was written by Bernd Warken <groff-bernd.warken-72@web.de>.
+.
+.
+.P
+Latest update: 31 May 2014
 ..
 .de co
 Copyright (C) 2001, 2002, 2004\[en]2006, 2009\[en]2012, 2014
@@ -43,7 +47,10 @@ The license text is available in the internet at
 .\" Setup
 .\" --------------------------------------------------------------------
 .
-.ds Ellipsis "\&.\|.\|.\&\"
+.char \[Ellipsis] \f[S]\N'188'\fP
+.
+.\" ds Ellipsis \[el]
+.\" ds Ellipsis "\&.\|.\|.\&\"
 .
 .\" --------------------------------------------------------------------
 .\" Macro definitions
@@ -150,9 +157,17 @@ The license text is available in the internet at
 .\" --------------------------------------------------------------------
 .
 .SY groffer
-.OP option \*[Ellipsis]
 .OP \-\-
-.OP \%filespec \*[Ellipsis]
+.OP \%filespec \[Ellipsis]
+.YS
+.
+.SY groffer
+.OP mode-option \[Ellipsis]
+.OP groff-options \[Ellipsis]
+.OP man-options \[Ellipsis]
+.OP X-options \[Ellipsis]
+.OP \-\-
+.OP \%filespec \[Ellipsis]
 .YS
 .
 .SY groffer
@@ -300,31 +315,38 @@ Long options can be abbreviated in several ways.
 .SY
 .OP \-\-auto
 .OP \-\-default
-.OP \-\-default\-modes mode1,mode2,\*[Ellipsis]
+.OP \-\-default\-modes mode1,mode2,\[Ellipsis]
 .OP \-\-dvi
-.OP \-\-dvi\-viewer prog
 .OP \-\-groff
 .OP \-\-html
-.OP \-\-html\-viewer prog
+.OP \-\-latin1
 .OP \-\-mode display_mode
 .OP \-\-pdf
 .OP \-\-pdf2
-.OP \-\-pdf\-viewer prog
 .OP \-\-ps
-.OP \-\-ps\-viewer prog
 .OP \-\-source
 .OP \-\-text
 .OP \-\-to\-stdout
 .OP \-\-tty
-.OP \-\-tty\-viewer prog
+.OP \-\-viewer prog
 .OP \-\-www
-.OP \-\-www\-viewer prog
 .OP \-\-x\~\fR|\fB\~\-\-X
-.OP \-\-x\-viewer\~\fR|\fB\~\-\-X\-viewer prog
 .YS
 .RE
 .
 .
+.ig
+Replace these options by --viewer
+.OP \-\-dvi\-viewer prog
+.OP \-\-html\-viewer prog
+.OP \-\-pdf\-viewer prog
+.OP \-\-ps\-viewer prog
+.OP \-\-tty\-viewer prog
+.OP \-\-www\-viewer prog
+.OP \-\-x\-viewer\~\fR|\fB\~\-\-X\-viewer prog
+..
+.
+.
 .TP
 .I options related to \%groff
 .RS
@@ -369,11 +391,11 @@ short options are accepted.
 .OP \-\-locale language
 .OP \-\-local\-file
 .OP \-\-location\~\fR|\fB\~\-\-where
-.OP \-\-manpath dir1:dir2:\*[Ellipsis]
+.OP \-\-manpath dir1:dir2:\[Ellipsis]
 .OP \-\-no\-location
 .OP \-\-pager program
-.OP \-\-sections sec1:sec2:\*[Ellipsis]
-.OP \-\-systems sys1,sys2,\*[Ellipsis]
+.OP \-\-sections sec1:sec2:\[Ellipsis]
+.OP \-\-systems sys1,sys2,\[Ellipsis]
 .OP \-\-troff\-device device
 .YS
 .P
@@ -617,8 +639,9 @@ default mode do not exist.
 .
 .
 .P
-In \%\f[CR]X\~Window\f[],
-many programs create their own window when called.
+In \%\f[CR]X\~Window\f[], many programs create their own window when
+called.
+.
 .B \%groffer
 can run these viewers as an independent program in the background.
 .
@@ -646,7 +669,8 @@ There is a chance to view the output source; for example, the
 combination of the options
 .B \-\-mode=ps
 and
-.B \-\-ps\-viewer=less
+.\# B \-\-ps\-viewer=less
+.B \-\-viewer=less
 shows the content of the
 .I Postscript
 output, the source code, with the pager
@@ -670,7 +694,7 @@ and restart option processing using only the rest of the command line.
 .
 .
 .TP
-.BI \-\-default\-modes \ mode1,mode2,\*[Ellipsis]
+.BI \-\-default\-modes \ mode1,mode2,\[Ellipsis]
 Set the sequence of modes for
 .I \%auto\~mode
 to the comma separated list given in the argument.
@@ -691,10 +715,8 @@ in this sequence.
 .B \-\-dvi
 Equivalent to
 .BR \-\-mode=\%dvi .
-.
-.
-.TP
-.BI \-\-dvi\-viewer \ prog
+.TQ
+.BI \-\-viewer \ prog
 Choose a viewer program for
 .IR \%dvi\~mode .
 .
@@ -721,10 +743,8 @@ Equivalent to
 .B \-\-html
 Equivalent to
 .BR \-\-mode=html .
-.
-.
-.TP
-.B \-\-html\-viewer
+.TQ
+.B \-\-viewer
 Choose a web browser program for viewing in
 .IR \%html\~mode .
 .
@@ -812,7 +832,7 @@ generator.
 The generated
 .I PDF file
 is displayed with suitable viewer programs, such as
-.BR ocular (1).
+.BR okular (1).
 .
 .
 .TP
@@ -886,7 +906,7 @@ program being distributed together with
 But the standard \%\f[CR]X\~Window\f[] tool
 .BR \%xditview (1)
 can also be chosen with the option
-.BR \-\-x\-viewer .
+.BR \-\-viewer .
 The default resolution is
 .BR 75dpi ,
 but
@@ -957,16 +977,12 @@ processing.
 .B \-\-pdf
 Equivalent to
 .BR \-\-mode=pdf .
-.
-.
-.TP
+.TQ
 .B \-\-pdf2
 Equivalent to
 .BR \-\-mode=pdf2 .
-.
-.
-.TP
-.BI \-\-pdf\-viewer \ prog
+.TQ
+.BI \-\-viewer \ prog
 Choose a viewer program for
 .IR \%pdf\~mode .
 .
@@ -979,10 +995,8 @@ arguments can be provided additionally.
 .B \-\-ps
 Equivalent to
 .BR \-\-mode=ps .
-.
-.
-.TP
-.BI \-\-ps\-viewer \ prog
+.TQ
+.BI \-\-viewer \ prog
 Choose a viewer program for
 .IR \%ps\~mode .
 .
@@ -990,6 +1004,8 @@ This can be a file name or a program to be searched in
 .Env_var $PATH .
 .
 Common Postscript viewers include
+.BR \%okular (1),
+.BR \%evince (1),
 .BR \%gv (1),
 .BR \%ghostview (1),
 and
@@ -1022,10 +1038,8 @@ It will not be displayed in graphical mode.
 .B \-\-tty
 Equivalent to
 .BR \-\-mode=tty .
-.
-.
-.TP
-.BI \-\-tty\-viewer \ prog
+.TQ
+.BI \-\-viewer \ prog
 Choose a text pager for mode
 .IR tty .
 The standard pager is
@@ -1043,22 +1057,17 @@ arguments can be provided additionally.
 .B \-\-www
 Equivalent to
 .BR \-\-mode=html .
-.
-.
-.TP
-.BI \-\-www\-viewer \ prog
-Equivalent to
-.BR \-\-html\-viewer .
+.TQ
+.B \-\-viewer
+.IR prog .
 .
 .
 .TP
 .B \-\-X\~\fR|\fB\~\-\-x
 Equivalent to
 .BR \-\-mode=x .
-.
-.
-.TP
-.BI \-\-X\-viewer\~\fR|\fB\~\-\-x\-viewer \ prog
+.TQ
+.BI \-\-viewer " prog"
 Choose a viewer program for
 .IR \%x\~mode .
 Suitable viewer programs are
@@ -1551,7 +1560,7 @@ This was added by
 .
 .
 .TP
-.BI \-\-manpath \ 'dir1:dir2:\*[Ellipsis]'
+.BI \-\-manpath \ 'dir1:dir2:\[Ellipsis]'
 Use the specified search path for retrieving
 .I \%man\~pages
 instead of the program defaults.
@@ -1567,12 +1576,13 @@ Set the pager program in
 .IR \%tty\~mode ;
 default is
 .BR \%less .
-This is equivalent to
-.BR \-\-tty\-viewer .
+.
+This can be set with
+.BR \-\-viewer .
 .
 .
 .TP
-.BI \-\-sections \ sec1:sec2:\*[Ellipsis]
+.BI \-\-sections \ sec1:sec2:\[Ellipsis]
 Restrict searching for
 .I \%man\~pages
 to the given
@@ -1581,7 +1591,7 @@ a colon-separated list.
 .
 .
 .TP
-.BI \-\-systems \ sys1,sys2,\*[Ellipsis]
+.BI \-\-systems \ sys1,sys2,\[Ellipsis]
 Search for
 .I \%man\~pages
 for the given operating systems; the argument
@@ -2103,9 +2113,9 @@ The modes are selected by option the arguments of
 Additionally, each of this argument can be specified as an option of
 its own, such as
 .BR anymode .
-Most of these modes have a viewer program, which can be chosen by an
-option that is constructed like
-.BR \-\-\,\fIanymode\/\fR\-viewer .
+Most of these modes have a viewer program, which can be chosen by the
+option
+.BR \-\-viewer .
 .
 .
 .P
@@ -2264,7 +2274,7 @@ or
 The pager to be used can be specified by one of the options
 .B \-\-pager
 and
-.BR \-\-tty\-viewer ,
+.BR \-\-viewer ,
 or by the environment variable
 .Env_var \%$PAGER .
 If all of this is not used the
@@ -3373,8 +3383,8 @@ or
 # groffer options that are used in each call of groffer
 \-\-foreground=DarkBlue
 \-\-resolution=100
-\-\-x\-viewer=gxditview \-geometry 900x1200
-\-\-pdf\-viewer xpdf \-Z 150
+\-\-viewer=gxditview \-geometry 900x1200
+\-\-viewer xpdf \-Z 150
 .fi
 .hy
 .ft
@@ -3558,7 +3568,7 @@ The formatted files are concatenated and displayed in one piece.
 .
 .sp
 .EX
-\fIsh#\fR\~LANG=de\~groffer\~\-\-man\~\-\-www\~\-\-www-viewer=galeon\~ls
+\fIsh#\fR\~LANG=de\~groffer\~\-\-man\~\-\-viewer=galeon\~ls
 .EE
 .sp
 Retrieve the German
@@ -3785,6 +3795,15 @@ all of them can be used with
 .
 .
 .TP
+.BR \%grog (@MAN1EXT@)
+This program tries to guess the necessary
+.B \%groff
+command line options from the input and the
+.B groffer
+options.
+.
+.
+.TP
 .BR \%groff (@MAN7EXT@)
 Documentation of the
 .I \%groff
@@ -3792,29 +3811,36 @@ language.
 .
 .
 .TP
-.BR \%grog (@MAN1EXT@)
-Internally,
-.B \%groffer
-tries to guess the
-.B \%groff
-command line options from the input using this program.
+.BR groff_char (@MAN7EXT@)
+Documentation on the
+.I \%groff
+characters, special characters, and glyphs..
+.
+.
+.TP
+.BR groff_tmac (@MAN5EXT@)
+Documentation on the
+.I \%groff
+macro files.
 .
 .
 .TP
 .BR groff_out (@MAN5EXT@)
 Documentation on the
 .I \%groff intermediate output
+before the run of a
+.IR postprocessor .
 .nh
 .RI ( ditroff
 output).
 .hy
 .
-.
-.TP
-.BR groff_tmac (@MAN5EXT@)
-Documentation on the
-.I \%groff
-macro files.
+This can be run by the
+.B groff
+or
+.B groffer
+option
+.BR -Z .
 .
 .
 .TP
@@ -3831,8 +3857,9 @@ supported by
 .BR \%groffer .
 .
 .
-.P
-.BR \%gxditview (@MAN1EXT@),
+.TP
+.BR \%gxditview (@MAN1EXT@)
+.TQ
 .BR \%xditview (1x)
 .RS
 Viewers for
@@ -3841,34 +3868,42 @@ Viewers for
 .RE
 .
 .
-.P
-.BR \%kpdf (1),
-.BR \%kghostview (1),
-.BR \%evince (1),
-.BR \%ggv (1),
-.BR \%gv (1),
-.BR \%ghostview (1),
+.TP
+.BR \%kpdf (1)
+.TQ
+.BR \%kghostview (1)
+.TQ
+.BR \%evince (1)
+.TQ
+.BR \%ggv (1)
+.TQ
+.BR \%gv (1)
+.TQ
+.BR \%ghostview (1)
+.TQ
 .BR \%gs (1)
-.RS
 Viewers for
 .BR \%groffer 's
 .IR \%ps\~mode .
-.RE
 .
 .
-.P
-.BR \%kpdf (1),
-.BR \%acroread (1),
-.BR \%evince (1),
-.BR \%xpdf (1),
-.BR \%gpdf (1),
-.BR \%kghostview (1),
+.TP
+.BR \%kpdf (1)
+.TQ
+.BR \%acroread (1)
+.TQ
+.BR \%evince (1)
+.TQ
+.BR \%xpdf (1)
+.TQ
+.BR \%gpdf (1)
+.TQ
+.BR \%kghostview (1)
+.TQ
 .BR \%ggv (1)
-.RS
 Viewers for
 .BR \%groffer 's
 .IR \%pdf\~mode .
-.RE
 .
 .
 .P
@@ -3882,35 +3917,41 @@ Viewers for
 .RE
 .
 .
-.P
-.BR \%konqueror (1),
-.BR \%epiphany (1),
-.BR \%firefox (1),
-.BR \%mozilla (1),
-.BR \%netscape (1),
+.TP
+.BR \%konqueror (1)
+.TQ
+.BR \%epiphany (1)
+.TQ
+.BR \%firefox (1)
+.TQ
+.BR \%mozilla (1)
+.TQ
+.BR \%netscape (1)
+.TQ
 .BR \%lynx (1)
-.RS
 Web-browsers for
 .BR \%groffer 's
 .I \%html
 or
 .IR \%www\~mode .
-.RE
 .
 .
 .TP
 .BR \%less (1)
+.TQ
+.BR more (1)
 Standard pager program for the
 .IR \%tty\~mode .
 .
 .
-.P
-.BR \%gzip (1),
+.TP
+.BR \%gzip (1)
+.TQ
 .BR \%bzip2 (1)
-.RS
+.TQ
+.BR \%xz (1)
 The decompression programs supported by
 .BR \%groffer .
-.RE
 .
 .
 .\" --------------------------------------------------------------------
diff --git a/contrib/groffer/groffer.pl b/contrib/groffer/groffer.pl
index 1a19a8b..1a7b65b 100755
--- a/contrib/groffer/groffer.pl
+++ b/contrib/groffer/groffer.pl
@@ -10,7 +10,7 @@
 
 # Written by Bernd Warken <groff-bernd.warken-72@web.de>.
 
-# Last update: 25 Feb 2014
+# Last update: 31 May 2014
 
 # This file is part of `groffer', which is part of `groff'.
 
@@ -193,9 +193,9 @@ my %Viewer_X = ('DVI' => ['kdvi', 'xdvi', 'dvilx'],
 			  'xpdf -z 150', 'gpdf', 'xpdf', 'zathura'.
 			  'epdfview', 'qpdfview', 'apvlv', 'qpdfview',
 			  'kghostview --scale 1.45', 'gv', 'ggv'],
-		'PS' => ['gs', 'gs_x11', 'ghostscript', 'ghostview',
-			 'kghostview --scale 1.45',
-			 'gv', 'okular', 'kpdf', 'evince', 'ggv'],
+		'PS' => ['okular', 'evince', 'gv',
+			 'gs', 'gs_x11', 'ghostscript', 'ghostview',
+			 'kghostview --scale 1.45', 'ggv', 'kpdf'],
 		'TTY' => ['xless'],
 		'X' => ['gxditview', 'xditview'],
 	      );
@@ -250,19 +250,23 @@ sub main_set_options {
   'debug-filenames', 'debug-func', 'debug-grog', 'debug-not-func',
   'debug-keep', 'debug-lm', 'debug-params', 'debug-stacks',
   'debug-tmpdir', 'debug-user', 'default', 'do-nothing', 'dvi',
-  'groff', 'help', 'intermediate-output', 'html', 'man',
+  'groff', 'help', 'intermediate-output', 'html', 'latin1', 'man',
   'no-location', 'no-man', 'no-special', 'pdf', 'pdf2', 'ps', 'rv', 'source',
   'text', 'to-stdout', 'text-device', 'tty', 'tty-device', 'version',
   'whatis', 'where', 'www', 'x', 'X');
 
 ### main_set_options()
-  my @opts_groffer_long_arg = ('default-modes', 'device',
-  'dvi-viewer', 'dvi-viewer-tty', 'extension', 'fg', 'fn', 'font',
-  'foreground', 'html-viewer', 'html-viewer-tty', 'mode',
-  'pdf-viewer', 'pdf-viewer-tty', 'print', 'ps-viewer',
-  'ps-viewer-tty', 'title', 'tty-viewer', 'tty-viewer-tty',
-  'www-viewer', 'www-viewer-tty', 'x-viewer', 'x-viewer-tty',
-  'X-viewer', 'X-viewer-tty');
+  my @opts_groffer_long_arg =
+    ('default-modes', 'device', 'extension', 'fg', 'fn', 'font',
+     'foreground', 'mode', 'print', 'title', 'viewer',
+     # tty viewers are ignored
+     'dvi-viewer-tty', 'html-viewer-tty', 'pdf-viewer-tty',
+     'ps-viewer-tty', 'tty-viewer-tty', 'www-viewer-tty',
+     'X-viewer-tty', 'x-viewer-tty',
+     # viewers for modes are ignored
+     'dvi-viewer', 'html-viewer', 'pdf-viewer', 'ps-viewer', 'tty-viewer',
+     'www-viewer', 'X-viewer', 'x-viewer',
+    );
 
   ##### groffer options inhereted from groff
 
@@ -363,26 +367,28 @@ sub main_set_options {
 			  '--bw' => '--borderwidth',
 			  '--debug-all' => '--debug',
 			  '--ditroff' => '--intermediate-output',
-			  '--dvi-viewer-tty' => '--dvi-viewer',
 			  '--fg' => '--foreground',
 			  '--fn' => '--font',
 			  '--ft' => '--font',
-			  '--html-viewer-tty' => '--html-viewer',
-			  '--pdf-viewer-tty' => '--pdf-viewer',
-			  '--ps-viewer-tty' => '--ps-viewer',
+			  '--latin1' => '--tty',
 			  '--troff-device' => '--device',
 			  '--tty-device' => '--text-device',
-			  '--tty-viewer' => '--pager',
-			  '--tty-viewer-tty' => '--pager',
+			  '--viewer' => '--viewer',
 			  '--where' => '--location',
 			  '--www' => '--html',
-			  '--www-viewer' => '--html-viewer',
-			  '--www-viewer-tty' => '--html-viewer',
-			  '--x-viewer-tty' => '--x-viewer',
 			  '--X' => '--x',
-			  '--X-viewer' => '--x-viewer',
-			  '--X-viewer-tty' => '--x-viewer',
-			 );
+			  # '--dvi-viewer' => '--viewer',
+			  '--dvi-viewer-tty' => '--viewer',
+			  '--html-viewer-tty' => '--viewer',
+			  '--pdf-viewer-tty' => '--viewer',
+			  '--ps-viewer-tty' => '--viewer',
+			  '--tty-viewer' => '--pager',
+			  '--tty-viewer-tty' => '--pager',
+			  '--www-viewer' => '--viewer',
+			  '--www-viewer-tty' => '--pager',
+			  '--X-viewer' => '--viewer', '--X-viewer-tty'
+			  => '--pager', '--x-viewer' => '--viewer',
+			  '--x-viewer-tty' => '--pager', );
 
   # groff short options with leading minus
   foreach (@opts_groff_short_na) {
@@ -392,7 +398,7 @@ sub main_set_options {
     $Opts_Groff_Short{"-$_"} = 1;
   }
 
-}				# main_set_options()
+} # main_set_options()
 
 
 ########################################################################
@@ -403,7 +409,7 @@ sub main_set_options {
 my @Manopt;
 
 sub main_parse_MANOPT {
-  if ($ENV{'MANOPT'}) {
+  if ( $ENV{'MANOPT'} ) {
     @Manopt = `sh $File_split_env_sh MANOPT`;
     chomp @Manopt;
 
@@ -412,37 +418,37 @@ sub main_parse_MANOPT {
     # All options not in %opts are ignored.
     # Check options used with %Opts_Cmdline_Double.
     # 0: option used ('' for ignore), 1: has argument or not
-### main_parse_MANOPT()
+    ### main_parse_MANOPT()
     my %opts = ('-7' => ['--ascii', 0],
-		'--ascii' => ['--ascii', 0],
+		'-L' => ['--locale', 1],
+		'-M' => ['--manpath', 1],
+		'-P' => ['--pager', 1],
+		'-S' => ['--sections', 1],
+		'-T' => ['-T', 1],
+		'-w' => ['--location', 0],
 		'-a' => ['--all', 0],
-		'--all' => ['--all', 0],
 		'-c' => ['', 1],
-		'--catman' => ['', 1],
 		'-e' => ['--extension', 1],
-		'--extension' => ['--extension', 1],
 		'-f' => ['--whatis', 1],
-		'--whatis' => ['--whatis', 1],
-		'-L' => ['--locale', 1],
-		'--locale' => ['--locale', 1],
 		'-m' => ['--systems', 1],
-		'--systems' => ['--systems', 1],
-		'-M' => ['--manpath', 1],
-		'-manpath' => ['--manpath', 1],
-		'--manpath' => ['--manpath', 1],
 		'-p' => ['', 1],
-		'--preprocessor' => ['', 1],
-		'-P' => ['--pager', 1],
-		'-pager' => ['--pager', 1],
 		'-r' => ['', 1],
+		'-manpath' => ['--manpath', 1],
+		'-pager' => ['--pager', 1],
 		'-prompt' => ['', 1],
-		'-S' => ['--sections', 1],
 		'-sections' => ['--sections', 1],
-		'-T' => ['-T', 1],
+		'--all' => ['--all', 0],
+		'--ascii' => ['--ascii', 0],
+		'--catman' => ['', 1],
 		'--device' => ['-T', 1],
-		'-w' => ['--location', 0],
-		'--where' => ['--location', 0],
+		'--extension' => ['--extension', 1],
+		'--locale' => ['--locale', 1],
 		'--location' => ['--location', 0],
+		'--manpath' => ['--manpath', 1],
+		'--preprocessor' => ['', 1],
+		'--systems' => ['--systems', 1],
+		'--whatis' => ['--whatis', 1],
+		'--where' => ['--location', 0],
 	       );
 
 ### main_parse_MANOPT()
@@ -494,7 +500,7 @@ my @Starting_ARGV = @ARGV;
 sub main_config_params {	# handle configuration files
   # options may not be abbreviated, but must be exact
   my @conf_args;
-  foreach my $f (@Conf_Files) {
+  foreach my $f ( @Conf_Files ) {
     if (-s $f) {
       my $fh;
       open $fh, "<$f" || next;
@@ -513,7 +519,7 @@ sub main_config_params {	# handle configuration files
 	  warn "Wrong option $line in configuration file $f.\n";
 	  next;
 	}
-	if ($line =~ /^--[ =]/) {
+	if ( $line =~ /^--[ =]/ ) {
 	  warn "No option name in `$line' in configuration " .
 	    "file $f.\n";
 	  next;
@@ -522,46 +528,42 @@ sub main_config_params {	# handle configuration files
 	# -- or -
 	if ($line =~ /^--?$/) {
 	  warn "`$line' is not allowed in configuration files.\n";
-	  next;
-	}
-	### main_config_params()
-	if ($line =~ /^--/) {	# line is long option
+	  next; }
+### main_config_params()
+	if ($line =~ /^--/) {		# line is long option
 	  my ($name, $arg);
-	  if ($line =~ /[ =]/) { # has arg on line
-	    $line =~ /^(--[^ =]+)[ =] ?(.*)$/;
+	  if ($line =~ /[ =]/) {	# has arg on line $line =~
+	    /^(--[^ =]+)[ =] ?(.*)$/;
 	    ($name, $arg) = ($1, $2);
 	    $arg =~ s/[\'\"]//g;
-	  } else {		# does not have an argument on line
+	  } else {			# does not have an argument on line
 	    $name = $line;
-	  }
-	  $name =~ s/[\'\"]//g;
+	  } $name =~ s/[\'\"]//g;
 	  unless (exists $Opts_Cmdline_Long{$name}) {
 	    # option does not exist
 	    warn "Option `$name' does not exist.\n";
 	    next LINE;
 	  }
 	  # option exists
-	  if ($Opts_Cmdline_Long{$name}) { # option has arg
+	  if ( $Opts_Cmdline_Long{$name} ) { # option has arg
 	    if (defined $arg) {
 	      push @conf_args, $name, $arg;
 	      next LINE;
-	    } else {
-	      warn "Option `$name' needs an argument in " .
-		"configuration file $f\n";
-	      next LINE;
-	    }
-	  } else {		# option has no arg
+	    } else { warn "Option `$name' needs an argument in " .
+		       "configuration file $f\n";
+		     next LINE;
+		   }
+	  } else { # option has no arg
 	    if (defined $arg) {
 	      warn "Option `$name' may not have an argument " .
 		"in configuration file $f\n";
 	      next LINE;
 	    } else {
-	      push @conf_args, $name;
-	      next LINE;
+	      push @conf_args, $name; next LINE;
 	    }
 	  }
-	  ### main_config_params()
-	} else {		# line is short option or cluster
+### main_config_params()
+	} else {			# line is short option or cluster
 	  $line =~ s/^-//;
 	  while ($line) {
 	    $line =~ s/^(.)//;
@@ -572,19 +574,19 @@ sub main_config_params {	# handle configuration files
 		"have an argument.\n";
 	      next LINE;
 	    }
-	    if (exists $Opts_Cmdline_Short{$opt}) {
+	    if ( exists $Opts_Cmdline_Short{$opt} ) {
 	      # short opt exists
 	      push @conf_args, $opt;
-	      if ($Opts_Cmdline_Short{$opt}) { # with arg
+	      if ( $Opts_Cmdline_Short{$opt} ) { # with arg
 		my $arg = $line;
 		$arg =~ s/^ //;
 		$arg =~ s/\'\"//g;
 		push @conf_args, "$arg";
 		next LINE;
-	      } else {		# no arg
+	      } else { # no arg
 		next;
 	      }
-	    } else {		# short option does not exist
+	    } else { # short option does not exist
 	      warn "Wrong short option `-$opt' from " .
 		"configuration.  Rest of line ignored.\n";
 	      next LINE;
@@ -597,9 +599,9 @@ sub main_config_params {	# handle configuration files
   }
 
 ### main_config_params()
-  # handle environment variable $GROFFER_OPT
+  #handle environment variable $GROFFER_OPT
   my @GROFFER_OPT;
-  if ($ENV{'GROFFER_OPT'}) {
+  if ( $ENV{'GROFFER_OPT'} ) {
     @GROFFER_OPT = `sh $File_split_env_sh GROFFER_OPT`;
     chomp @GROFFER_OPT;
   }
@@ -610,7 +612,7 @@ sub main_config_params {	# handle configuration files
     my @argv0 = (@GROFFER_OPT, @ARGV);
     my @argv;
     my $only_files = 0;
-    my $n = $#argv0;		  # last element
+    my $n = $#argv0;		# last element
     my $n1 = scalar @GROFFER_OPT; # first element of @ARGV
     my $i = 0;			# number of the element
     my @s = ('the environment variable $GROFFER_OPT', 'the command line');
@@ -630,27 +632,27 @@ sub main_config_params {	# handle configuration files
       }
 
 ### main_config_params()
-      if ($elt =~ /^-$/) {	# -
+      if ( $elt =~ /^-$/ ) { # -
 	push @Filespecs, $elt;
 	next ELT;
       }
-      if ($elt =~ /^--$/) {	# --
+      if ($elt =~ /^--$/) { # --
 	$only_files = 1;
 	next ELT;
       }
 
-      if ($elt =~ /^--[ =]/) {	# no option name
+      if ($elt =~ /^--[ =]/) { # no option name
 	warn "No option name in `$elt' at $s[$j].\n";
 	next ELT;
       }
-      if ($elt =~ /^---/) {	# wrong with three minus
+      if ($elt =~ /^---/) { # wrong with three minus
 	warn "Wrong option `$elt' at $s[$j].\n";
 	next ELT;
       }
 
-      if ($elt =~ /^--[^-]/) {	# long option
+      if ($elt =~ /^--[^-]/) { # long option
 	my ($name, $opt, $abbrev, $arg);
-	if ($elt =~ /[ =]/) {	# has arg on elt
+	if ($elt =~ /[ =]/) { # has arg on elt
 	  $elt =~ /^--([^ =]+)[ =] ?(.*)$/;
 	  ($name, $arg) = ($1, $2);
 	  $opt = "--$name";
@@ -666,25 +668,24 @@ sub main_config_params {	# handle configuration files
 	$name =~ s/[\'\"]//g;
 	my $match = $name;
 	$match =~ s/-/[^- ]*-/g;
-	### main_config_params()
-	if (exists $Opts_Cmdline_Long{$opt}) {
+	if ( exists $Opts_Cmdline_Long{$opt} ) {
 	  # option exists exactly
-	} elsif ($Opts_Cmdline_Long_Str =~ / (${match}[^- ]*?) /) {
+	} elsif	( $Opts_Cmdline_Long_Str =~ / (${match}[^- ]*?) / ) {
 	  # option is an abbreviation without further -
 	  my $n0 = $1;
-	  if ($Opts_Cmdline_Long_Str =~
-	      / (${match}[^- ]*) .* (${match}[^- ]*) /) {
+	  if ( $Opts_Cmdline_Long_Str =~
+	       /\s(${match}[^-\s]*)\s.*\s(${match}[^-\s]*) / ) {
 	    warn "Option name `--$abbrev' is not unique: " .
 	      "--$1 --$2 \n";
 	    next ELT;
 	  }
 	  $name = $n0;
 	  $opt = "--$n0";
-	} elsif ($Opts_Cmdline_Long_Str =~ / (${match}[^ ]*) /) {
+	} elsif ( $Opts_Cmdline_Long_Str =~ /\s(${match}[^\s]*)\s/ ) {
 	  # option is an abbreviation with further -
 	  my $n0 = $1;
-	  if ($Opts_Cmdline_Long_Str =~
-	      / (${match}[^ ]*) .* (${match}[^ ]*) /) {
+	  if ( $Opts_Cmdline_Long_Str =~
+	       /\s(${match}[^\s]*)\s.*\s(${match}[^\s]*)\s/ ) {
 	    warn "Option name `--$abbrev' is not unique: " .
 	      "--$1 --$2 \n";
 	    next ELT;
@@ -696,23 +697,21 @@ sub main_config_params {	# handle configuration files
 	  next ELT;
 	}
 ### main_config_params()
-	if ($Opts_Cmdline_Long{$opt}) { # option has arg
+	if ( $Opts_Cmdline_Long{$opt} ) { # option has arg
 	  if (defined $arg) {
 	    push @argv, "--$name", $arg;
 	    next ELT;
-	  } else {		# $arg not defined, argument at next element
+	  } else { # $arg not defined, argument at next	element
 	    if (($i == $n1) || ($i > $n)) {
 	      warn "No argument left for option " .
 		"`$elt' at $s[$j].\n";
-	      next ELT;
-	    }
-	    ### main_config_params()
+	      next ELT; }
 	    # add argument as next element
 	    push @argv, "--$name", $argv0[$i];
 	    ++$i;
 	    next ELT;
-	  }			# if (defined $arg)
-	} else {		# option has no arg
+	  }		# if (defined $arg)
+	} else {	# option has no arg
 	  if (defined $arg) {
 	    warn "Option `$abbrev' may not have an argument " .
 	      "at $s[$j].\n";
@@ -721,59 +720,56 @@ sub main_config_params {	# handle configuration files
 	    push @argv, "--$name";
 	    next ELT;
 	  }
-	}			# if ($Opts_Cmdline_Long{$opt})
+	}		# if ($Opts_Cmdline_Long{$opt})
 ### main_config_params()
-      } elsif ($elt =~ /^-[^-]/) { # short option or cluster
+      } elsif ( $elt =~ /^-[^-]/ ) { # short option or cluster
 	my $cluster = $elt;
 	$cluster =~ s/^-//;
 	while ($cluster) {
 	  $cluster =~ s/^(.)//;
 	  my $opt = "-$1";
-	  if (exists $Opts_Cmdline_Short{$opt}) { # opt exists
-	    if ($Opts_Cmdline_Short{$opt}) { # with arg
+	  if ( exists $Opts_Cmdline_Short{$opt} ) {	# opt exists
+	    if ( $Opts_Cmdline_Short{$opt} ) {		# with arg
 	      if ($cluster) {	# has argument in this element
-		$cluster =~ s/^ //;
+		$cluster =~ s/^\s//;
 		$cluster =~ s/\'\"//g;
-				# add argument as rest of this element
+		# add argument as rest of this element
 		push @argv, $opt, $cluster;
 		next ELT;
-	      } else {		# argument at next element
+	      } else { # argument at next element
 		if (($i == $n1) || ($i > $n)) {
 		  warn "No argument left for option " .
 		    "`$opt' at $s[$j].\n";
-		  next ELT;
-		}
-		### main_config_params()
-				# add argument as next element
+		  next ELT; }
+### main_config_params()
+		# add argument as next element
 		push @argv, $opt, $argv0[$i];
 		++$i;
 		next ELT;
 	      }
-	    } else {		# no arg
-	      push @argv, $opt;
-	      next;
+	    } else { # no arg
+	      push @argv, $opt; next;
 	    }
-	  } else {		# short option does not exist
+	  } else { # short option does not exist
 	    warn "Wrong short option `$opt' at $s[$j].\n";
 	    next ELT;
-	  }			# if (exists $Opts_Cmdline_Short{$opt})
-	}			# while ($cluster)
-      } else {			# not an option, file name
+	  }		# if (exists $Opts_Cmdline_Short{$opt})
+	}		# while ($cluster)
+      } else {		# not an option, file name
 	push @Filespecs, $elt;
 	next;
       }
     }
 ### main_config_params()
     @Options = (@Manopt, @conf_args, @argv);
-    foreach my $i (0..$#Options) {
-      if ( exists $Opts_Cmdline_Double{ $Options[$i] } ) {
+    foreach my $i ( 0..$#Options ) {
+      if ( exists $Opts_Cmdline_Double{$Options[$i]} ) {
 	$Options[$i] = $Opts_Cmdline_Double{ $Options[$i] };
       }
-    }
-    @Filespecs = ('-') unless (@Filespecs);
+    } @Filespecs = ('-') unless (@Filespecs);
     @ARGV = (@Options, '--', @Filespecs);
   }
-} # main_config_params()
+}
 
 if (0) {
   print STDERR "<$_>\n" foreach @ARGV;
@@ -784,8 +780,7 @@ if (0) {
 # main_parse_params()
 ########################################################################
 
-my $i;
-my $n;
+my $i; my $n;
 
 $Opt{'XRM'} = [];
 
@@ -796,10 +791,10 @@ sub main_parse_params {
   # options that are ignored in this part
   # shell version of groffer: --debug*, --shell
   # man options: --catman (only special in man),
-  #              --preprocessor (force groff preproc., handled by grog),
-  #              --prompt (prompt for less, ignored),
-  #              --troff (-mandoc, handled by grog),
-  #              --update (inode check, ignored)
+  #		 --preprocessor (force groff preproc., handled by grog),
+  #		 --prompt (prompt for less, ignored),
+  #		 --troff (-mandoc, handled by grog),
+  #		 --update (inode check, ignored)
   my %ignored_opts = (
 		      '--catman' => 0,
 		      '--debug-func' => 0,
@@ -828,19 +823,20 @@ sub main_parse_params {
      '--help' => sub { &usage(); $Opt{'DO_NOTHING'} = 1; },
      '--source' => sub { $Opt{'MODE'} = 'source'; },
      '--device' =>
-     sub {  $Opt{'DEVICE'} = &_get_arg();
-	    my %modes = ( 'dvi'=> 'dvi',
-			  'html' => 'html',
-			  'lbp' => 'groff',
-			  'lj4' => 'groff',
-			  'pdf' => 'pdf',
-			  'pdf2' => 'pdf',
-			  'ps' => 'ps',
-			  'ascii' => 'tty',
-			  'cp1047' => 'tty',
-			  'latin1' => 'tty',
-			  'utf8' => 'tty',
-			);
+     sub { $Opt{'DEVICE'} = &_get_arg();
+	   my %modes = (
+			'ascii' => 'tty',
+			'cp1047' => 'tty',
+			'dvi'=> 'dvi',
+			'html' => 'html',
+			'latin1' => 'tty',
+			'lbp' => 'groff',
+			'lj4' => 'groff',
+			'pdf' => 'pdf',
+			'pdf2' => 'pdf',
+			'ps' => 'ps',
+			'utf8' => 'tty',
+		       );
 	    if ($Opt{'DEVICE'} =~ /^X.*/) {
 	      $Opt{'MODE'} = 'x';
 	    } elsif ( exists $modes{ $Opt{'DEVICE'} } ) {
@@ -895,8 +891,6 @@ sub main_parse_params {
      sub { $Opt{'DISPLAY'} = &_get_arg(); },
      '--do-nothing' => sub { $Opt{'DO_NOTHING'} = 1; },
      '--dvi' => sub { $Opt{'MODE'} = 'dvi'; },
-     '--dvi-viewer' =>		# viewer program for dvi mode; arg
-     sub { $Opt{'VIEWER_DVI'} = &_get_arg(); },
      '--extension' =>		# the extension for man pages, arg
      sub { $Opt{'EXTENSION'} = &_get_arg(); },
      '--foreground' =>		# foreground color for viewers, arg
@@ -907,8 +901,6 @@ sub main_parse_params {
      sub { $Opt{'GEOMETRY'} = &_get_arg(); },
      '--groff' => sub { $Opt{'MODE'} = 'groff'; },
      '--html' => sub { $Opt{'MODE'} = 'html'; },
-     '--html-viewer' =>		# viewer program for html mode; arg
-     sub { $Opt{'VIEWER_HTML'} = &_get_arg(); },
      '--iconic' =>		# start viewers as icons
      sub { $Opt{'ICONIC'} = 1; },
      '--locale' =>		# set language for man pages, arg
@@ -964,13 +956,9 @@ sub main_parse_params {
      sub { $Opt{'PAGER'} = &_get_arg(); },
      '--pdf' => sub { $Opt{'MODE'} = 'pdf'; },
      '--pdf2' => sub { $Opt{'MODE'} = 'pdf2'; },
-     '--pdf-viewer' =>		# viewer program for pdf and pdf2 mode; arg
-     sub { $Opt{'VIEWER_PDF'} = &_get_arg(); },
      '--print' =>		# print argument, for argument test
      sub { my $arg = &_get_arg; print STDERR "$arg\n"; },
      '--ps' => sub { $Opt{'MODE'} = 'ps'; },
-     '--ps-viewer' =>		# viewer program for ps mode; arg
-     sub { $Opt{'VIEWER_PS'} = &_get_arg(); },
      '--resolution' =>		# set resolution for X devices, arg
      sub { my $arg = &_get_arg();
 	   my %res = ( '75' => 75,
@@ -1017,21 +1005,32 @@ sub main_parse_params {
 	     }
 	   }
 	 },
-     '--tty' =>			# tty mode, text with pager
-     sub { $Opt{'MODE'} = 'tty'; },
-     '--to-stdout' =>		# print mode file without display
-     sub { $Opt{'STDOUT'} = 1; },
      '--text-device' =>		# device for tty mode; arg
      sub { $Opt{'TEXT_DEVICE'} = &_get_arg(); },
+     '--to-stdout' =>		# print mode file without display
+     sub { $Opt{'STDOUT'} = 1; },
+     '--tty' =>			# tty mode, text with pager
+     sub { $Opt{'MODE'} = 'tty'; },
+     '--viewer' =>		# viewer for actiual mode
+     sub { $Opt{'VIEWER'} = &_get_arg(); },
      '--whatis' => sub { delete $Opt{'APROPOS'}; $Opt{'WHATIS'} = 1; },
      '--x' => sub { $Opt{'MODE'} = 'x'; },
 ### main_parse_params()
      '--xrm' =>			# pass X resource string, arg
      sub { my $arg = &_get_arg(); push @{$Opt{'XRM'}}, $arg if $arg; },
-     '--x-viewer' =>		# viewer program for x mode; arg
-     sub { $Opt{'VIEWER_X'} = &_get_arg(); },
     );
 
+#     '--dvi-viewer' =>		# viewer program for dvi mode; arg
+#     sub { $Opt{'VIEWER_DVI'} = &_get_arg(); },
+#     '--html-viewer' =>		# viewer program for html mode; arg
+#     sub { $Opt{'VIEWER_HTML'} = &_get_arg(); },
+#     '--pdf-viewer' =>		# viewer program for pdf and pdf2 mode; arg
+#     sub { $Opt{'VIEWER_PDF'} = &_get_arg(); },
+#     '--ps-viewer' =>		# viewer program for ps mode; arg
+#     sub { $Opt{'VIEWER_PS'} = &_get_arg(); },
+#     '--x-viewer' =>		# viewer program for x mode; arg
+#     sub { $Opt{'VIEWER_X'} = &_get_arg(); },
+
   my %short_opts = (
 		    '-V' => sub { $Opt{'V'} = 1; },
 		    '-X' => sub { $Opt{'X'} = 1; },
@@ -1040,7 +1039,7 @@ sub main_parse_params {
   if (0) {
     # check if all options are handled in parse parameters
 
-    #short options
+    # short options
     my %these_opts = (%ignored_opts, %short_opts, %Opts_Groff_Short,
 		      %Opts_Cmdline_Double);
     foreach my $key (keys %Opts_Cmdline_Short) {
@@ -1084,7 +1083,7 @@ sub main_parse_params {
 	}
       }				# if (exists $short_opts{$opt})
     }				# if ($opt =~ /^-([^-])$/)
-    # Now it is a long option
+    # now it is a long option
 
     # handle ignored options
     if ( exists $ignored_opts{ $opt } ) {
@@ -1232,7 +1231,7 @@ sub main_set_mode {
     } else {			# other modes
       &_get_prog_args($m) ? return 1 : next LOOP;
     }				# if $m
-  }				# LOOP: foreach
+  }				# loop: foreach
   die 'set mode: no suitable display mode found under ' .
     join(', ', @modes) . ';' unless $Display{'MODE'};
   die 'set mode: no viewer available for mode ' . $Display{'MODE'} . ';'
@@ -1251,9 +1250,12 @@ sub main_set_mode {
 # Simplification for loop in set mode.
 #
 # Globals in/out: $Viewer_Background
-# Globals in    : $Opt{VIEWER_<MODE>}, $Viewer_X{<MODE>},
+# globals in    : $Opt{VIEWER}, $VIEWER_X{<MODE>},
 #                 $Viewer_tty{<MODE>}
 #
+## globals in    : $Opt{VIEWER_<MODE>}, $VIEWER_X{<MODE>},
+##                 $Viewer_tty{<MODE>}
+##
 sub _get_prog_args {
   my $n = @_;
   die "_get_prog_args(): one argument is needed; you used $n;"
@@ -1265,11 +1267,12 @@ sub _get_prog_args {
   my $xlist = $Viewer_X{$MODE};
   my $ttylist = $Viewer_tty{$MODE};
 
-  my $vm = "VIEWER_${MODE}";
+#  my $vm = "VIEWER_${MODE";
+  my $vm = "VIEWER";
   my $opt = $Opt{$vm};
 
   if ($opt) {
-    my %prog = where_is_prog $opt;
+    my %prog = &where_is_prog($opt);
     my $prog_ref = \%prog;
     unless (%prog) {
       warn "_get_prog_args(): `$opt' is not an existing program;";
diff --git a/contrib/groffer/version.sh b/contrib/groffer/version.sh
index 339fc33..9c2a592 100644
--- a/contrib/groffer/version.sh
+++ b/contrib/groffer/version.sh
@@ -29,8 +29,8 @@
 export _PROGRAM_VERSION;
 export _LAST_UPDATE;
 
-_PROGRAM_VERSION='2.0.2';
-_LAST_UPDATE='26 Feb 2014';
+_PROGRAM_VERSION='2.1.0';
+_LAST_UPDATE='31 May 2014';
 
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it, see groffer.sh.


