From MAILER-DAEMON Thu Apr 03 01:59:33 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WVagX-0007Qw-Jw
	for mharc-groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:33 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38754)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1WVagU-0007Q4-E9
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:31 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wl@gnu.org>) id 1WVagT-0005Rg-GQ
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:30 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:55508)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1WVagT-0005Rb-DM
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:29 -0400
Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <wl@gnu.org>) id 1WVagS-0001n4-Oe
	for groff-commit@gnu.org; Thu, 03 Apr 2014 05:59:29 +0000
Date: Thu, 03 Apr 2014 05:59:28 +0000
Message-Id: <E1WVagS-0001n4-Oe@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/05: * src/devices/gropdf/pdfmom.pl: Fix perl(1) warning.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140403055928.6851.25731@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: d8c8bede1fb82dcd48ec7630b2881d9f0f2b110d
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: Thu, 03 Apr 2014 05:59:31 -0000

wl pushed a commit to branch master
in repository groff.

commit d8c8bede1fb82dcd48ec7630b2881d9f0f2b110d
Author: Steffen Nurpmeso <sdaoden@yandex.com>
Date:   Thu Apr 3 07:24:32 2014 +0200

    * src/devices/gropdf/pdfmom.pl: Fix perl(1) warning.
---
 ChangeLog                    |    4 ++++
 src/devices/gropdf/pdfmom.pl |    4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d888a5..b6c1cb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-03  Steffen Nurpmeso  <sdaoden@yandex.com>
+
+	* src/devices/gropdf/pdfmom.pl: Fix perl(1) warning.
+
 2014-03-30  Werner LEMBERG  <wl@gnu.org>
 
 	* configure: Regenerated.
diff --git a/src/devices/gropdf/pdfmom.pl b/src/devices/gropdf/pdfmom.pl
index d8ccf08..beec820 100644
--- a/src/devices/gropdf/pdfmom.pl
+++ b/src/devices/gropdf/pdfmom.pl
@@ -4,7 +4,7 @@
 #	Deri James	: Friday 16 Mar 2012
 #
 
-# Copyright (C) 2012,2013
+# Copyright (C) 2012-2014
 #      Free Software Foundation, Inc.
 #      Written by Deri James <deri@chuzzlewit.demon.co.uk>
 #
@@ -82,7 +82,7 @@ while (my $c=shift)
 	if (length($c) > 1)
 	{
 	    push(@cmd,"\"$c\"");
-	    push(@cmd,"'".shift."'") if length($c)==2 and index('dDfFIKLmMnoPrwW',substr($c,-1)) >= 0;
+	    push(@cmd,"'".(shift)."'") if length($c)==2 and index('dDfFIKLmMnoPrwW',substr($c,-1)) >= 0;
 	}
 	else
 	{


From MAILER-DAEMON Thu Apr 03 01:59:34 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WVagY-0007Si-T2
	for mharc-groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:34 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38775)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1WVagV-0007QC-P8
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wl@gnu.org>) id 1WVagT-0005Ro-MZ
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:31 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:55510)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1WVagT-0005Rk-JC
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:29 -0400
Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <wl@gnu.org>) id 1WVagT-0001nS-7R
	for groff-commit@gnu.org; Thu, 03 Apr 2014 05:59:29 +0000
Date: Thu, 03 Apr 2014 05:59:29 +0000
Message-Id: <E1WVagT-0001nS-7R@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 02/05: contrib/mom/Makefile.sub: Set LC_ALL=C when calling
	$(PDFMOM).
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140403055928.6851.25731@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: ccb914d297a210767b2562f1c2ff3ce4fb5aacf3
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: Thu, 03 Apr 2014 05:59:32 -0000

wl pushed a commit to branch master
in repository groff.

commit ccb914d297a210767b2562f1c2ff3ce4fb5aacf3
Author: Steffen Nurpmeso <sdaoden@yandex.com>
Date:   Thu Apr 3 07:39:29 2014 +0200

    contrib/mom/Makefile.sub: Set LC_ALL=C when calling $(PDFMOM).
    
    Doing so in an UTF-8 locale with $PERL5OPT=-C set avoids warnings like
    
      utf8 "\xF5" does not map to Unicode at\
        [.]src/devices/gropdf/gropdf line 1359, <PD> line 63.
      Malformed UTF-8 character (unexpected end of string)\
        in substitution (s///) at\
        [.]src/devices/gropdf/gropdf line 1315, <PD> line 63.
---
 ChangeLog                |   10 +++++-----
 contrib/mom/ChangeLog    |   12 ++++++++++++
 contrib/mom/Makefile.sub |    2 +-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b6c1cb3..c2bdec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -150,9 +150,9 @@
 2014-03-06  Deri James  <deri@chuzzlewit.myzen.co.uk>
 
 	Missing RE escape in grep.
-	
+
 	* src/devices/gropdf/pdfmom.pl: Escape '\' dot in grep RE.
-	
+
 2014-02-26  Bernd Warken  <groff-bernd.warken-72@web.de>
 
 	* src/roff/grog/grog.pl: Add detection of `gperl' to `grog'.
@@ -175,7 +175,7 @@
 	   existed, it does not seem common nowadays, and in any case, using
 	   the now well-established EXIT STATUS section seems preferable to
 	   me.
-	 - Mention the possibility to use ERRORS for section 4 manuals. 
+	 - Mention the possibility to use ERRORS for section 4 manuals.
 	   While most section 4 manuals have a DIAGNOSTICS section, only
 	   some will need an ERRORS section, but these cases aren't exactly
 	   rare, either.  Quite some device driver manuals explain how to
@@ -250,7 +250,7 @@
 	* groff/tmac/an-ext.tmac (.FONT): Remove.  This doesn't belong into
 	this file.
 
-	* groff/tmac/groff_man.man: Reset to state previous to 2014-01-04. 
+	* groff/tmac/groff_man.man: Reset to state previous to 2014-01-04.
 	Useful changes will be re-committed in smaller, logical chunks.
 
 2014-01-05  Bernd Warken  <groff-bernd.warken-72@web.de>
@@ -270,7 +270,7 @@
 	* src/devices/gropdf/gropdf.pl: gropdf use to fail when handling
 	output from preconv, now works.
 
-	* src/devices/gropdf/pdfmom.pl: can now be used as a pipeline, and 
+	* src/devices/gropdf/pdfmom.pl: can now be used as a pipeline, and
 	improvements made to its switch handling and use with preconv.
 
 	* tmac/pdf.tmac: changes to support preconv.
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index ace63d8..13213b1 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,15 @@
+* Thu Apr 3 2014
+
+o contrib/mom/Makefile.sub: Set LC_ALL=C when calling $(PDFMOM).
+
+  Doing so in an UTF-8 locale with $PERL5OPT=-C set avoids warnings like
+
+    utf8 "\xF5" does not map to Unicode at\
+      [.]src/devices/gropdf/gropdf line 1359, <PD> line 63.
+    Malformed UTF-8 character (unexpected end of string)\
+      in substitution (s///) at\
+      [.]src/devices/gropdf/gropdf line 1315, <PD> line 63.
+
 * Sat Mar 29 2014
 
 o Makefile.sub: Handle examples separately, controlled by
diff --git a/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub
index 06058ec..c213d8f 100644
--- a/contrib/mom/Makefile.sub
+++ b/contrib/mom/Makefile.sub
@@ -114,7 +114,7 @@ MOSTLYCLEANADD=\
 
 .SUFFIXES: .mom .pdf
 .mom.pdf:
-	$(PDFMOM) $< >$@
+	LC_ALL=C $(PDFMOM) $< >$@
 
 all: stamp-strip $(make_pdfexamples)
 


From MAILER-DAEMON Thu Apr 03 01:59:38 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WVagc-0007T2-1e
	for mharc-groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:38 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38811)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1WVaga-0007Sw-Rp
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wl@gnu.org>) id 1WVagU-0005S7-7i
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:36 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:55516)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1WVagU-0005S3-4a
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:30 -0400
Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <wl@gnu.org>) id 1WVagT-0001nj-NG
	for groff-commit@gnu.org; Thu, 03 Apr 2014 05:59:29 +0000
Date: Thu, 03 Apr 2014 05:59:29 +0000
Message-Id: <E1WVagT-0001nj-NG@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 04/05: * Makefile.comm (extraclean): Don't delete `old'.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140403055928.6851.25731@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: c256832262e75f10f83fa8acfd6ce7014b837676
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: Thu, 03 Apr 2014 05:59:37 -0000

wl pushed a commit to branch master
in repository groff.

commit c256832262e75f10f83fa8acfd6ce7014b837676
Author: Steffen Nurpmeso <sdaoden@yandex.com>
Date:   Thu Apr 3 07:52:13 2014 +0200

    * Makefile.comm (extraclean): Don't delete `old'.
    
    The rule calling `rm -f' was originally thought to remove private,
    temporary files.  However, we now have a subdirectory called `old'
    in `fonts/devps' that may not be removed, and trying so now causes
    an error because we no longer ignore the returned error code of
    `rm'.
---
 ChangeLog     |   10 ++++++++++
 Makefile.comm |    2 +-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1c6a134..f8fb923 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2014-04-03  Steffen Nurpmeso  <sdaoden@yandex.com>
 
+	* Makefile.comm (extraclean): Don't delete `old'.
+
+	The rule calling `rm -f' was originally thought to remove private,
+	temporary files.  However, we now have a subdirectory called `old'
+	in `fonts/devps' that may not be removed, and trying so now causes
+	an error because we no longer ignore the returned error code of
+	`rm'.
+
+2014-04-03  Steffen Nurpmeso  <sdaoden@yandex.com>
+
 	* Makefile.in (OTHERDIRS): Fix directory order.
 
 	This has been accidentally broken in commit 51476bee from
diff --git a/Makefile.comm b/Makefile.comm
index 7d4b57c..6bcb2e8 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -90,7 +90,7 @@ realclean: distclean
 	rm -f $(REALCLEANFILES)
 
 extraclean: distclean
-	rm -f \#* *~ =* core junk grot old temp tmp tem *.new *.old *.orig
+	rm -f \#* *~ =* core junk grot temp tmp tem *.new *.old *.orig
 
 .SUFFIXES:
 .SUFFIXES: .o .obj .cpp .c .y .man .n


From MAILER-DAEMON Thu Apr 03 01:59:40 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WVage-0007U1-7U
	for mharc-groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:40 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38801)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1WVagY-0007Se-RW
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wl@gnu.org>) id 1WVagU-0005ST-MR
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:34 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:55519)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1WVagU-0005SN-IK
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:30 -0400
Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <wl@gnu.org>) id 1WVagT-0001nr-Vm
	for groff-commit@gnu.org; Thu, 03 Apr 2014 05:59:30 +0000
Date: Thu, 03 Apr 2014 05:59:30 +0000
Message-Id: <E1WVagT-0001nr-Vm@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 05/05: * */Makefile.*: Path quoting fixes, whitespace,
	formatting.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140403055928.6851.25731@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 1b8b2a7b019846b6340611e5c562f5b6b3f5ba74
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: Thu, 03 Apr 2014 05:59:38 -0000

wl pushed a commit to branch master
in repository groff.

commit 1b8b2a7b019846b6340611e5c562f5b6b3f5ba74
Author: Steffen Nurpmeso <sdaoden@yandex.com>
Date:   Thu Apr 3 07:58:48 2014 +0200

    * */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.
---
 ChangeLog                       |    8 ++++++++
 Makefile.ccpg                   |   10 +++++-----
 Makefile.comm                   |   38 +++++++++++++++++---------------------
 Makefile.cpg                    |   10 +++++-----
 Makefile.dev                    |   10 +++++-----
 Makefile.in                     |   19 +++++++++----------
 Makefile.init                   |   10 +++++-----
 Makefile.lib                    |   10 +++++-----
 Makefile.man                    |   10 +++++-----
 Makefile.sub                    |   10 +++++-----
 arch/misc/Makefile.sub          |   10 +++++-----
 contrib/eqn2graph/Makefile.sub  |    8 ++++----
 contrib/glilypond/Makefile.sub  |    7 ++++---
 contrib/grap2graph/Makefile.sub |    8 ++++----
 contrib/groffer/Makefile.sub    |    2 +-
 contrib/hdtbl/Makefile.sub      |   14 ++++++++------
 contrib/mm/Makefile.sim         |   12 ++++++------
 contrib/mm/Makefile.sub         |   12 ++++++------
 contrib/mom/Makefile.sub        |   11 +++++++----
 contrib/pdfmark/Makefile.sub    |   16 +++++++++-------
 contrib/pic2graph/Makefile.sub  |    8 ++++----
 doc/Makefile.in                 |   14 +++++++-------
 doc/Makefile.sub                |   10 +++++-----
 font/devpdf/Makefile.sub        |   18 +++++++++---------
 src/libs/libgroff/Makefile.sub  |    6 +++---
 src/roff/groff/Makefile.sub     |    9 +++++----
 src/roff/grog/Makefile.sub      |   27 +++++++++------------------
 tmac/Makefile.sub               |    8 ++++----
 28 files changed, 169 insertions(+), 166 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f8fb923..a913d24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2014-04-03  Steffen Nurpmeso  <sdaoden@yandex.com>
 
+	* */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.
+
+2014-04-03  Steffen Nurpmeso  <sdaoden@yandex.com>
+
 	* Makefile.comm (extraclean): Don't delete `old'.
 
 	The rule calling `rm -f' was originally thought to remove private,
diff --git a/Makefile.ccpg b/Makefile.ccpg
index b6a3cde..ee2533a 100644
--- a/Makefile.ccpg
+++ b/Makefile.ccpg
@@ -1,19 +1,19 @@
-# Copyright (C) 1992, 1995, 2001, 2004, 2009
+# Copyright (C) 1992, 1995, 2001, 2004, 2009, 2014
 #   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
diff --git a/Makefile.comm b/Makefile.comm
index 6bcb2e8..89bbc25 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -1,19 +1,19 @@
-# Copyright (C) 1989-2000, 2002-2004, 2006-2011, 2013, 2014
+# Copyright (C) 1989-2000, 2002-2004, 2006-2011, 2013-2014
 #   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
@@ -69,9 +69,7 @@ fonts:
 mostlyclean:
 	rm -f $(MOSTLYCLEANFILES)
 	-rm -rf $(MOSTLYCLEANDIRADD)
-	-@if test `cd $(srcdir); pwd` = `pwd`; then \
-	  :; \
-	else \
+	-@if test "`cd $(srcdir); pwd`" != "`pwd`"; then \
 	  rm -f $(MOSTLYCLEANNOTSRCDIRADD); \
 	fi
 
@@ -80,9 +78,7 @@ clean: mostlyclean
 
 distclean: clean
 	rm -f $(DISTCLEANFILES)
-	-@if test `cd $(srcdir); pwd` = `pwd`; then \
-	  :; \
-	else \
+	-@if test "`cd $(srcdir); pwd`" != "`pwd`"; then \
 	  rm -f $(YTABC) $(YTABH); \
 	fi
 
@@ -301,17 +297,17 @@ uninstall_dev:
 	  || for f in ""$(OLDDEVFILES); do \
 	       rm -f $(DESTDIR)$(oldfontsubdir)/$$f; \
 	     done
-	-d="$(DESTDIR)$(fontsubdir)/generate";\
-	  if test -d "$$d"; then rmdir "$$d"; fi
-	-d="$(DESTDIR)$(fontsubdir)/enc";\
-	  if test -d "$$d"; then rmdir "$$d"; fi
-	-d="$(DESTDIR)$(fontsubdir)/map";\
-	  if test -d "$$d"; then rmdir "$$d"; fi
-	-d="$(DESTDIR)$(fontsubdir)/util";\
-	  if test -d "$$d"; then rmdir "$$d"; fi
+	-d=$(DESTDIR)$(fontsubdir)/generate;\
+	  if test -d $$d; then rmdir $$d; fi
+	-d=$(DESTDIR)$(fontsubdir)/enc;\
+	  if test -d $$d; then rmdir $$d; fi
+	-d=$(DESTDIR)$(fontsubdir)/map;\
+	  if test -d $$d; then rmdir $$d; fi
+	-d=$(DESTDIR)$(fontsubdir)/util;\
+	  if test -d $$d; then rmdir $$d; fi
 	-rmdir $(DESTDIR)$(fontsubdir)
-	-d="$(DESTDIR)$(oldfontsubdir)";\
-	  if test -d "$$d"; then rmdir "$$d"; fi
+	-d=$(DESTDIR)$(oldfontsubdir);\
+	  if test -d $$d; then rmdir $$d; fi
 
 .PHONY: depend_src
 depend_src: depend.temp
diff --git a/Makefile.cpg b/Makefile.cpg
index bcb020f..d5894b5 100644
--- a/Makefile.cpg
+++ b/Makefile.cpg
@@ -1,19 +1,19 @@
-# Copyright (C) 1992, 1995, 2001, 2004, 2009
+# Copyright (C) 1992, 1995, 2001, 2004, 2009, 2014
 #   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
diff --git a/Makefile.dev b/Makefile.dev
index 864c7bf..4d2fc8b 100644
--- a/Makefile.dev
+++ b/Makefile.dev
@@ -1,18 +1,18 @@
-# Copyright (C) 1989-2000, 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2003, 2009, 2014 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
diff --git a/Makefile.in b/Makefile.in
index 7e6d851..65ae1fc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,19 +3,19 @@
 #      Written by James Clark (jjc@jclark.com)
 #
 # Last update: 30 Mar 2014
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
@@ -384,7 +384,7 @@ make_uninstall_examples=@make_uninstall_examples@
 #				<stdio.h>
 # -DICONV_CONST=const		if declaration of iconv() needs const
 # -DLONG_FOR_TIME_T		if localtime() takes a long * not a time_t *
-# -DRETSIGTYPE=int		if signal handlers return int not void	
+# -DRETSIGTYPE=int		if signal handlers return int not void
 # -DRET_TYPE_SRAND_IS_VOID	if srand() returns void not int
 #
 # -DWCOREFLAG=0200		if the 0200 bit of the status returned by
@@ -617,7 +617,6 @@ MAKE_K_FLAG=`for f in x $(MAKEFLAGS); do \
                esac; \
              done`
 
-
 INCDIRS=\
   src/include
 LIBDIRS=\
@@ -907,8 +906,8 @@ dist:
 	rm -f tmp/Makefile
 	cp Makefile.init tmp/Makefile
 	mv tmp groff-$(version)$(revision)
-	tar cfh - groff-$(version)$(revision) | \
-	  gzip -c >groff-$(version)$(revision).tar.gz
+	tar cfh - groff-$(version)$(revision) \
+	  | gzip -c >groff-$(version)$(revision).tar.gz
 	rm -fr groff-$(version)$(revision)
 
 # $(PROGDIRS): libgroff
@@ -939,8 +938,8 @@ install:
 	@$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) \
 	  do=do_install $(dodirs)
 	cd $(DESTDIR)$(dataprogramdir); \
-	rm -f current; \
-	$(LN_S) $(version)$(revision) current
+	  rm -f current; \
+	  $(LN_S) $(version)$(revision) current
 
 .PHONY: uninstall
 uninstall: uninstall_sub uninstall_dirs
diff --git a/Makefile.init b/Makefile.init
index 832ec0c..bc141ca 100644
--- a/Makefile.init
+++ b/Makefile.init
@@ -1,18 +1,18 @@
-# Copyright (C) 1989-2000, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2009, 2014 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
diff --git a/Makefile.lib b/Makefile.lib
index 746360e..b1b9a47 100644
--- a/Makefile.lib
+++ b/Makefile.lib
@@ -1,18 +1,18 @@
-# Copyright (C) 1989-2000, 2003, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2003, 2009, 2014 Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
diff --git a/Makefile.man b/Makefile.man
index 2f41967..21b1679 100644
--- a/Makefile.man
+++ b/Makefile.man
@@ -1,19 +1,19 @@
-# Copyright (C) 1992, 2001, 2009
+# Copyright (C) 1992, 2001, 2009, 2014
 #   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
diff --git a/Makefile.sub b/Makefile.sub
index f810de0..0094a59 100644
--- a/Makefile.sub
+++ b/Makefile.sub
@@ -1,19 +1,19 @@
-# Copyright (C) 1989-2000, 2001-2004, 2006, 2009, 2013
+# Copyright (C) 1989-2000, 2001-2004, 2006, 2009, 2013-2014
 #   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
diff --git a/arch/misc/Makefile.sub b/arch/misc/Makefile.sub
index 5bce8ce..f5d6b51 100644
--- a/arch/misc/Makefile.sub
+++ b/arch/misc/Makefile.sub
@@ -1,18 +1,18 @@
-# Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2009, 2014 Free Software Foundation, Inc.
 #      Written by Keith Marshall (keith.d.marshall@ntlworld.com)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
diff --git a/contrib/eqn2graph/Makefile.sub b/contrib/eqn2graph/Makefile.sub
index 02567e6..ff5e3ae 100644
--- a/contrib/eqn2graph/Makefile.sub
+++ b/contrib/eqn2graph/Makefile.sub
@@ -1,18 +1,18 @@
 # Copyright (C) 2002, 2006, 2009, 2014
 #   Free Software Foundation, Inc.
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
diff --git a/contrib/glilypond/Makefile.sub b/contrib/glilypond/Makefile.sub
index 9bd3eae..7dc5961 100644
--- a/contrib/glilypond/Makefile.sub
+++ b/contrib/glilypond/Makefile.sub
@@ -34,9 +34,10 @@ all: glilypond
 
 # files going to lib directory `$(glilypond_dir)'
 
-GLILYPOND_LIB=$(srcdir)/subs.pl \
-	$(srcdir)/oop_fh.pl \
-	$(srcdir)/args.pl
+GLILYPOND_LIB=\
+  $(srcdir)/subs.pl \
+  $(srcdir)/oop_fh.pl \
+  $(srcdir)/args.pl
 
 GLILYPOND_LIB_=`echo $(GLILYPOND_LIB) | sed 's|$(srcdir)/||g'`
 
diff --git a/contrib/grap2graph/Makefile.sub b/contrib/grap2graph/Makefile.sub
index bd08345..9647eeb 100644
--- a/contrib/grap2graph/Makefile.sub
+++ b/contrib/grap2graph/Makefile.sub
@@ -1,18 +1,18 @@
 # Copyright (C) 2003, 2006, 2009, 2014
 #   Free Software Foundation, Inc.
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
index d98b4d3..f1fd51d 100644
--- a/contrib/groffer/Makefile.sub
+++ b/contrib/groffer/Makefile.sub
@@ -74,7 +74,7 @@ groffer: $(GROFFER_PERL) \
 	chmod +x $@
 	for m in $(ROFF2MODES); do \
 	  cat $(srcdir)/roff2.man \
-	  | sed 's/@ROFF2MODE@/'"$$m"'/g' > roff2$${m}.man; \
+	    | sed 's/@ROFF2MODE@/'"$$m"'/g' > roff2$${m}.man; \
 	done
 
 install_data: groffer
diff --git a/contrib/hdtbl/Makefile.sub b/contrib/hdtbl/Makefile.sub
index c85efb9..b028457 100644
--- a/contrib/hdtbl/Makefile.sub
+++ b/contrib/hdtbl/Makefile.sub
@@ -1,18 +1,18 @@
 # Copyright (C) 2006, 2009, 2010, 2012, 2014 Free Software Foundation, Inc.
 #      Written by Werner Lemberg (wl@gnu.org)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
@@ -109,8 +109,8 @@ gnu.eps:
 	elif test -f $(top_builddir)/doc/gnu.eps; then \
 	  cp $(top_builddir)/doc/gnu.eps . ; \
 	else \
-	  xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 | \
-	    $(pnmtops_nosetpage) -noturn -rle >$@ ; \
+	  xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 \
+	    | $(pnmtops_nosetpage) -noturn -rle >$@ ; \
 	fi
 
 examples/stamp:
@@ -125,6 +125,7 @@ stamp-strip: $(STRIPFILES)
 	touch $@
 
 install_data: install_always $(make_install_examples)
+
 install_always: $(STRIPFILES) $(GENFILES)
 	-test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
 	for f in $(STRIPFILES); do \
@@ -148,6 +149,7 @@ install_examples: install_always $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) \
 	$(INSTALL_DATA) gnu.eps $(DESTDIR)$(exampledir)/hdtbl/gnu.eps
 
 uninstall_sub: uninstall_always $(make_uninstall_examples)
+
 uninstall_always:
 	-for f in $(STRIPFILES); do rm -f $(DESTDIR)$(tmacdir)/$$f; done
 
diff --git a/contrib/mm/Makefile.sim b/contrib/mm/Makefile.sim
index c132a8d..09da95b 100644
--- a/contrib/mm/Makefile.sim
+++ b/contrib/mm/Makefile.sim
@@ -1,17 +1,17 @@
 # Copyright 1991, 1993, 2000, 2001, 2009, 2014
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
@@ -46,11 +46,11 @@ all:
 
 install: groff_mm.n groff_mmse.n
 	$(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \
-		INSTALL_DATA='$(install)' tmac_m=$(tmac_m) install
+	  INSTALL_DATA='$(install)' tmac_m=$(tmac_m) install
 
 uninstall: groff_mm.n groff_mmse.n
 	$(MAKE) -f Makefile.sub tmacdir=$(tmacdir) srcdir=$(srcdir) \
-		INSTALL_DATA='$(install)' tmac_m=$(tmac_m) uninstall_sub
+	  INSTALL_DATA='$(install)' tmac_m=$(tmac_m) uninstall_sub
 
 .man.n:
 	@echo Making $@ from $<
diff --git a/contrib/mm/Makefile.sub b/contrib/mm/Makefile.sub
index aab1080..faf577f 100644
--- a/contrib/mm/Makefile.sub
+++ b/contrib/mm/Makefile.sub
@@ -1,20 +1,20 @@
-# Copyright 1991-1993, 1999-2001, 2006, 2007, 2009, 2011, 2013, 2014
+# Copyright 1991-1993, 1999-2001, 2006, 2007, 2009, 2011, 2013-2014
 #   Free Software Foundation, Inc.
-# 
+#
 # Last update: 15 Apr 2013
 #
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
@@ -27,7 +27,7 @@ MAN1=\
 MAN7=\
   groff_mm.n \
   groff_mmse.n
-FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov 
+FILES=0.MT 5.MT 4.MT ms.cov se_ms.cov
 # Local configuration files with default values.
 LOCALE=locale se_locale
 MOSTLYCLEANADD=temp
diff --git a/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub
index c213d8f..a286dfb 100644
--- a/contrib/mom/Makefile.sub
+++ b/contrib/mom/Makefile.sub
@@ -1,19 +1,19 @@
 # Copyright (C) 2002-2006, 2009, 2012-2014
 #   Free Software Foundation, Inc.
 #      Written by Werner Lemberg (wl@gnu.org)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
@@ -134,6 +134,7 @@ examples/stamp:
 install_data: install_always \
 	      $(make_install_pdfdoc) $(make_install_htmldoc) \
 	      $(make_install_examples)
+
 install_always: stamp-strip $(NORMALFILES)
 	-test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
 	for f in $(NORMALFILES); do \
@@ -158,6 +159,7 @@ install_htmldoc: install_always $(HTMLDOCFILES)
 	done
 
 install_examples: install_examples_always $(make_install_pdfexamples)
+
 install_examples_always: $(EXAMPLEFILES)
 	-test -d $(DESTDIR)$(exampledir)/mom \
 	  || $(mkinstalldirs) $(DESTDIR)$(exampledir)/mom
@@ -189,6 +191,7 @@ stamp-strip: $(STRIPFILES)
 uninstall_sub: uninstall_always \
 		$(make_uninstall_pdfdoc) $(make_uninstall_htmldoc) \
 		$(make_uninstall_examples)
+
 uninstall_always:
 	-for f in $(NORMALFILES) $(STRIPFILES); do \
 	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
diff --git a/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub
index ffa402a..4332367 100644
--- a/contrib/pdfmark/Makefile.sub
+++ b/contrib/pdfmark/Makefile.sub
@@ -1,19 +1,19 @@
-# Copyright (C) 2005, 2006, 2009, 2011, 2012, 2014
+# Copyright (C) 2005, 2006, 2009, 2011, 2012-2014
 # Free Software Foundation, Inc.
 #      Written by Keith Marshall (keith.d.marshall@ntlworld.com)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
@@ -74,8 +74,8 @@ gnu.eps:
 	elif test -f $(top_builddir)/doc/gnu.eps; then \
 	  cp $(top_builddir)/doc/gnu.eps . ; \
 	else \
-	  xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 | \
-	    $(pnmtops_nosetpage) -noturn -rle >$@ ; \
+	  xpmtoppm $(top_srcdir)/doc/gnu.xpm | pnmdepth 15 \
+	    | $(pnmtops_nosetpage) -noturn -rle >$@ ; \
 	fi
 
 pdfroff: pdfroff.sh $(SH_DEPS_SED_SCRIPT)
@@ -87,6 +87,7 @@ pdfroff: pdfroff.sh $(SH_DEPS_SED_SCRIPT)
 	chmod +x $@
 
 install_data: install_always $(make_install_pdfdoc)
+
 install_always:
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
 	for f in $(CMDFILES); do \
@@ -108,6 +109,7 @@ install_pdfdoc: install_always
 	done
 
 uninstall_sub: uninstall_always $(make_uninstall_pdfdoc)
+
 uninstall_always:
 	-for f in $(CMDFILES); do rm -f $(DESTDIR)$(bindir)/$$f; done
 	-for f in $(TMACFILES); do rm -f $(DESTDIR)$(tmacdir)/$$f; done
diff --git a/contrib/pic2graph/Makefile.sub b/contrib/pic2graph/Makefile.sub
index 94b9f05..4a98487 100644
--- a/contrib/pic2graph/Makefile.sub
+++ b/contrib/pic2graph/Makefile.sub
@@ -1,18 +1,18 @@
 # Copyright (C) 2001, 2006, 2009, 2014
 #   Free Software Foundation, Inc.
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 54487d8..4fafaf0 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,19 +1,19 @@
 # Copyright (C) 2002-2007, 2009-2011, 2014
 #   Free Software Foundation, Inc.
 #      Written by Werner Lemberg <wl@gnu.org>
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
@@ -76,9 +76,9 @@ TFLAG=-M$(top_builddir)/tmac -M$(top_srcdir)/tmac
 TROFF=$(TROFFBIN) $(TFLAG) $(FFLAG) -ww
 GROFF=\
   sed -e "s;@VERSION@;$(version)$(revision);" $< \
-  | GROFF_COMMAND_PREFIX= \
-    GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
-    $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww
+    | GROFF_COMMAND_PREFIX= \
+      GROFF_BIN_PATH="$(GROFF_BIN_PATH)" \
+      $(GROFFBIN) $(TFLAG) $(FFLAG) -Upet -ww
 
 imagedir=img
 
diff --git a/doc/Makefile.sub b/doc/Makefile.sub
index 9eaa187..0778d5f 100644
--- a/doc/Makefile.sub
+++ b/doc/Makefile.sub
@@ -1,19 +1,19 @@
-# Copyright (C) 2002-2007, 2009, 2011, 2013, 2014
+# Copyright (C) 2002-2007, 2009, 2011, 2013-2014
 #   Free Software Foundation, Inc.
 #      Written by Werner Lemberg <wl@gnu.org>
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
diff --git a/font/devpdf/Makefile.sub b/font/devpdf/Makefile.sub
index 6e88312..baae606 100644
--- a/font/devpdf/Makefile.sub
+++ b/font/devpdf/Makefile.sub
@@ -1,4 +1,4 @@
-# Copyright (C) 2011, 2013, 2014 Free Software Foundation, Inc.
+# Copyright (C) 2011, 2013-2014 Free Software Foundation, Inc.
 #      Free Software Foundation, Inc.
 #      Written by Deri James <deri@chuzzlewit.demon.co.uk>
 #
@@ -118,11 +118,11 @@ uninstall_sub:
 	-for f in $(MOSTLYCLEANADD); do \
 	  rm -f $(DESTDIR)$(fontsubdir)/$$f; \
 	done
-	-d="$(DESTDIR)$(fontsubdir)/enc"; \
-	  if test -d "$$d"; then rmdir "$$d"; fi
-	-d="$(DESTDIR)$(fontsubdir)/map"; \
-	  if test -d "$$d"; then rmdir "$$d"; fi
-	-d="$(DESTDIR)$(fontsubdir)/util"; \
-	  if test -d "$$d"; then rmdir "$$d"; fi
-	-d="$(DESTDIR)$(fontsubdir)"; \
-	  if test -d "$$d"; then rmdir "$$d"; fi
+	-d=$(DESTDIR)$(fontsubdir)/enc; \
+	  if test -d $$d; then rmdir $$d; fi
+	-d=$(DESTDIR)$(fontsubdir)/map; \
+	  if test -d $$d; then rmdir $$d; fi
+	-d=$(DESTDIR)$(fontsubdir)/util; \
+	  if test -d $$d; then rmdir $$d; fi
+	-d=$(DESTDIR)$(fontsubdir); \
+	  if test -d $$d; then rmdir $$d; fi
diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub
index 300908a..80fd87c 100644
--- a/src/libs/libgroff/Makefile.sub
+++ b/src/libs/libgroff/Makefile.sub
@@ -158,14 +158,14 @@ install_charset_data:
 	  sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias \
 	    > $(DESTDIR)$(libdir)/t-charset.alias; \
 	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
-	                  $(DESTDIR)$(libdir)/charset.alias; \
+	    $(DESTDIR)$(libdir)/charset.alias; \
 	  rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
 	else \
 	  if test $(GLIBC21) = no; then \
 	    sed -f ref-add.sed charset.alias \
 	      > $(DESTDIR)$(libdir)/t-charset.alias; \
 	    $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
-	                    $(DESTDIR)$(libdir)/charset.alias; \
+	      $(DESTDIR)$(libdir)/charset.alias; \
 	    rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
 	  fi; \
 	fi
@@ -180,7 +180,7 @@ uninstall_charset_data:
 	    rm -f $(DESTDIR)$(libdir)/charset.alias; \
 	  else \
 	    $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
-	                    $(DESTDIR)$(libdir)/charset.alias; \
+	      $(DESTDIR)$(libdir)/charset.alias; \
 	  fi; \
 	  rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
 	fi
diff --git a/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub
index 4119201..d1d3381 100644
--- a/src/roff/groff/Makefile.sub
+++ b/src/roff/groff/Makefile.sub
@@ -34,8 +34,9 @@ CCSRCS=$(srcdir)/groff.cpp
 CSRCS=$(srcdir)/pipeline.c
 HDRS=$(srcdir)/pipeline.h
 
-GROFF_OPTS_OUTPUT=groff_opts_no_arg.txt \
-	groff_opts_with_arg.txt
+GROFF_OPTS_OUTPUT=\
+  groff_opts_no_arg.txt \
+  groff_opts_with_arg.txt
 
 MOSTLYCLEANADD=groff_opts.tmp $(GROFF_OPTS_OUTPUT)
 
@@ -71,5 +72,5 @@ uninstall_sub:
 	done
 # XXX This will be removed by `uninstall_dirs' in `$(top_srcdir)/Makefile.in'
 # XXX (And only from there it is successful on an empty directory)
-#	-d="$(DESTDIR)$(libprogramdir)";\
-#	  if test -d "$$d"; then rmdir "$$d"; fi
+#	-d=$(DESTDIR)$(libprogramdir);\
+#	  if test -d $$d; then rmdir $$d; fi
diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub
index 5a2accc..318656d 100644
--- a/src/roff/grog/Makefile.sub
+++ b/src/roff/grog/Makefile.sub
@@ -2,7 +2,7 @@
 
 # File position: <groff-source>/src/roff/grog/Makefile.sub
 
-# Copyright (C) 1993, 2006, 2009, 2013, 2014
+# Copyright (C) 1993, 2006, 2009, 2013-2014
 #   Free Software Foundation, Inc.
 
 # Last update: 30 Mar 2014
@@ -47,9 +47,8 @@ grog: grog.pl $(GROG) $(SH_DEPS_SED_SCRIPT)
 	    -e "s|@EGREP@|$(EGREP)|g" \
 	    -e "s|@VERSION@|$(version)$(revision)|" \
 	    -e "$(SH_SCRIPT_SED_CMD)" \
-	    $(srcdir)/grog.pl >$@;
-	chmod +x $@;
-
+	    $(srcdir)/grog.pl >$@
+	chmod +x $@
 
 .PHONY: install_data
 install_data: grog
@@ -58,23 +57,15 @@ install_data: grog
 	$(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog
 	-test -d $(DESTDIR)$(grog_dir) || $(mkinstalldirs) $(DESTDIR)$(grog_dir)
 	for f in $(GROG_); do \
-	  rm -f "$(DESTDIR)$(grog_dir)/$$f"; \
+	  rm -f $(DESTDIR)$(grog_dir)/$$f; \
 	  $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(grog_dir)/$$f; \
-	done;
+	done
 
 .PHONY: uninstall_data
 uninstall_sub:
-	rm -f "$(DESTDIR)$(bindir)/grog"
+	rm -f $(DESTDIR)$(bindir)/grog
 	-for f in $(GROG_); do \
-	  rm -f "$(DESTDIR)$(grog_dir)/$$f"; \
+	  rm -f $(DESTDIR)$(grog_dir)/$$f; \
 	done
-	-d="$(DESTDIR)$(grog_dir)";\
-	  if test -d "$$d"; then rmdir $$d; fi
-
-########################################################################
-# Emacs settings
-########################################################################
-#
-# Local Variables:
-# mode: makefile
-# End:
+	-d=$(DESTDIR)$(grog_dir);\
+	  if test -d $$d; then rmdir $$d; fi
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
index 5aa11e8..19877eb 100644
--- a/tmac/Makefile.sub
+++ b/tmac/Makefile.sub
@@ -1,19 +1,19 @@
 # Copyright (C) 1989-2007, 2009-2012, 2014
 #   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
-# 
+#
 # This file is part of groff.
-# 
+#
 # groff is free software; you can redistribute it and/or modify it under
 # the terms of the GNU General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # groff is distributed in the hope that it will be useful, but WITHOUT ANY
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or
 # FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 # for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 


From MAILER-DAEMON Thu Apr 03 01:59:33 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WVagX-0007R9-Nn
	for mharc-groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:33 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38773)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1WVagV-0007Q7-G4
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <wl@gnu.org>) id 1WVagT-0005Rx-Vv
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:31 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:55513)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <wl@gnu.org>)
	id 1WVagT-0005Rt-SR
	for groff-commit@gnu.org; Thu, 03 Apr 2014 01:59:29 -0400
Received: from wl by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <wl@gnu.org>) id 1WVagT-0001nb-EI
	for groff-commit@gnu.org; Thu, 03 Apr 2014 05:59:29 +0000
Date: Thu, 03 Apr 2014 05:59:29 +0000
Message-Id: <E1WVagT-0001nb-EI@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 03/05: * Makefile.in (OTHERDIRS): Fix directory order.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140403055928.6851.25731@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 932e391c2011c14ed8daa72dcd1538b9bf501b09
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: Thu, 03 Apr 2014 05:59:32 -0000

wl pushed a commit to branch master
in repository groff.

commit 932e391c2011c14ed8daa72dcd1538b9bf501b09
Author: Steffen Nurpmeso <sdaoden@yandex.com>
Date:   Thu Apr 3 07:45:44 2014 +0200

    * Makefile.in (OTHERDIRS): Fix directory order.
    
    This has been accidentally broken in commit 51476bee from
    2014-02-25.
---
 ChangeLog   |    7 +++++++
 Makefile.in |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c2bdec2..1c6a134 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2014-04-03  Steffen Nurpmeso  <sdaoden@yandex.com>
 
+	* Makefile.in (OTHERDIRS): Fix directory order.
+
+	This has been accidentally broken in commit 51476bee from
+	2014-02-25.
+
+2014-04-03  Steffen Nurpmeso  <sdaoden@yandex.com>
+
 	* src/devices/gropdf/pdfmom.pl: Fix perl(1) warning.
 
 2014-03-30  Werner LEMBERG  <wl@gnu.org>
diff --git a/Makefile.in b/Makefile.in
index f24c8f3..7e6d851 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -672,6 +672,7 @@ ALLTTYDEVDIRS=\
 # `doc' must be processed before `contrib/pdfmark',
 # pdf stuff must be processed before `contrib/mom
 OTHERDIRS=\
+  font/devpdf \
   contrib/chem \
   contrib/eqn2graph \
   contrib/gdiffmk \
@@ -686,7 +687,6 @@ OTHERDIRS=\
   contrib/pic2graph \
   contrib/mom \
   doc \
-  font/devpdf \
   man \
   src/utils/afmtodit \
   src/roff/grog \


From MAILER-DAEMON Sun Apr 27 19:29:34 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WeYVq-00047R-Cw
	for mharc-groff-commit@gnu.org; Sun, 27 Apr 2014 19:29:34 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36700)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter@schaffter.ca>) id 1WeYVm-0003yX-Dz
	for groff-commit@gnu.org; Sun, 27 Apr 2014 19:29:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter@schaffter.ca>) id 1WeYVk-0006IB-Ou
	for groff-commit@gnu.org; Sun, 27 Apr 2014 19:29:30 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:53521)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter@schaffter.ca>) id 1WeYVk-0006I7-LP
	for groff-commit@gnu.org; Sun, 27 Apr 2014 19:29:28 -0400
Received: from PTPi by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <peter@schaffter.ca>) id 1WeYVk-0006Qr-5C
	for groff-commit@gnu.org; Sun, 27 Apr 2014 23:29:28 +0000
Date: Sun, 27 Apr 2014 23:29:28 +0000
Message-Id: <E1WeYVk-0006Qr-5C@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/02: Fixed diacritic lowercase to caps. Moved control of
	\n[#KERN_UNIT] to macro space. Added COL_MARK.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140427232928.24694.54380@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: 33f1287aa537d9f3e632e913c88b70b255212e5c
Auto-Submitted: auto-generated
From: Peter Schaffter <peter@schaffter.ca>
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: Sun, 27 Apr 2014 23:29:32 -0000

PTPi pushed a commit to branch master
in repository groff.

commit 33f1287aa537d9f3e632e913c88b70b255212e5c
Author: Peter Schaffter <peter@schaffter.ca>
Date:   Sun Apr 27 19:19:49 2014 -0400

    Fixed diacritic lowercase to caps. Moved control of \n[#KERN_UNIT] to macro space.  Added COL_MARK.
---
 contrib/mom/BUGS    |    3 +
 contrib/mom/om.tmac |  290 +++++++++++++++++++++++++++------------------------
 2 files changed, 157 insertions(+), 136 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 165c0d7..014af85 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -26,6 +26,9 @@ Also, please--no html email.  That, too, gets nuked.
 Version 2.0-c
 =============
 
+Character translation of diacritics from lowercase to caps broken.
+---Fixed---
+
 Spacing not being restored (.ns/.rs) after a HEADING that falls at
 the top of the page.
 ---Fixed---
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index af7f8dd..dfed95a 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -745,17 +745,20 @@ end
 \#
 \# Inline kerning provides a simple way to adjust the amount of
 \# space between any two letters.  It's predicated on a unit of
-\# measure "U", which is 1/36 of the current point size as returned
-\# by \n[.ps].  E.g., if the current point size is 18, \n[.ps]
-\# returns 18000u, therefore U=500u.  Since U remains proportional
-\# relative to the current point size, the amount of kerning
-\# between two letters as expressed in Us remains visually similar
-\# regardless of changes in point size.
-\#
-\# N.B.--the amount of inline kerning supplied by \*[BU<n>] or
-\# \*[FU<n>] is added to or subtracted from any kerning that already
-\# takes place between two characters when automatic kerning is
-\# turned on.
+\# measure "U", which, by default, is 1/36 of the current point
+\# size as returned by \n[.ps]; e.g., if the current point size is
+\# 18, \n[.ps] returns 18000u, therefore U=500u.  Since U remains
+\# proportional relative to the current point size, the amount of
+\# kerning between two letters as expressed in Us remains visually
+\# similar regardless of changes in point size.
+\#
+\# The default value for U may be changed or reset with the
+\# KERN_UNIT macro.
+\#
+.MAC KERN_UNIT END
+.    ie '\\$1'DEFAULT' .nr #KERN_UNIT 36
+.    el .nr #KERN_UNIT \\$1
+.END
 \#
 .nr #KERN_UNIT 36
 .ds BU   \h'-(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*\\$1u)'
@@ -3737,72 +3740,73 @@ end
 .MAC CAPS END
 .    ie '\\$1'' \{\
 .       tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
-.       tr �\[`A]
-.       tr �\[^A]
-.       tr �\['A]
-.       tr �\[:A]
-.       tr �\[oA]
-.       tr �\[~A]
-.       tr �\[AE]
-.       tr �\[`E]
-.       tr �\[^E]
-.       tr �\['E]
-.       tr �\[:E]
-.       tr �\[`I]
-.       tr �\[^I]
-.       tr �\['I]
-.       tr �\[:I]
-.       tr �\[`O]
-.       tr �\[^O]
-.       tr �\['O]
-.       tr �\[:O]
-.       tr �\[~O]
-.       tr �\[/O]
-.       tr �\[`U]
-.       tr �\[^U]
-.       tr �\['U]
-.       tr �\[:U]
-.       tr �\[,C]
-.       tr �\[-D]
-.       tr �\[~N]
-.       tr �\[TP]
-.       tr �\['Y]
-.       tr �\[:Y]
+.       tr \[`a]\[`A]
+.       tr \[^a]\[^A]
+.       tr \['a]\['A]
+.       tr \[:a]\[:A]
+.       tr \[oa]\[oA]
+.       tr \[~a]\[~A]
+.       tr \[ae]\[AE]
+.       tr \[`e]\[`E]
+.       tr \[^e]\[^E]
+.       tr \['e]\['E]
+.       tr \[:e]\[:E]
+.       tr \[`i]\[`I]
+.       tr \[^i]\[^I]
+.       tr \['i]\['I]
+.       tr \[:i]\[:I]
+.       tr \[`o]\[`O]
+.       tr \[^o]\[^O]
+.       tr \['o]\['O]
+.       tr \[:o]\[:O]
+.       tr \[~o]\[~O]
+.       tr \[/o]\[/O]
+.       tr \[`u]\[`U]
+.       tr \[^u]\[^U]
+.       tr \['u]\['U]
+.       tr \[:u]\[:U]
+.       tr \[,c]\[,C]
+.       tr \[-d]\[-D]
+.       tr \[~n]\[~N]
+.       tr \[Sd]\[-D]
+.       tr \[Tp]\[TP]
+.       tr \['y]\['Y]
+.       tr \[:y]\[:Y]
 .       nr #CAPS_ON 1
 .    \}
 .    el \{\
 .       tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
-.       tr �\[`a]
-.       tr �\[^a]
-.       tr �\['a]
-.       tr �\[:a]
-.       tr �\[oa]
-.       tr �\[~a]
-.       tr �\[ae]
-.       tr �\[`e]
-.       tr �\[^e]
-.       tr �\['e]
-.       tr �\[:e]
-.       tr �\[`i]
-.       tr �\[^i]
-.       tr �\['i]
-.       tr �\[:i]
-.       tr �\[`o]
-.       tr �\[^o]
-.       tr �\['o]
-.       tr �\[:o]
-.       tr �\[~o]
-.       tr �\[/o]
-.       tr �\[`u]
-.       tr �\[^u]
-.       tr �\['u]
-.       tr �\[:u]
-.       tr �\[,c]
-.       tr �\[Sd]
-.       tr �\[~n]
-.       tr �\[Tp]
-.       tr �\['y]
-.       tr �\[:y]
+.       tr \[`a]\[`a]
+.       tr \[^a]\[^a]
+.       tr \['a]\['a]
+.       tr \[:a]\[:a]
+.       tr \[oa]\[oa]
+.       tr \[~a]\[~a]
+.       tr \[ae]\[ae]
+.       tr \[`e]\[`e]
+.       tr \[^e]\[^e]
+.       tr \['e]\['e]
+.       tr \[:e]\[:e]
+.       tr \[`i]\[`i]
+.       tr \[^i]\[^i]
+.       tr \['i]\['i]
+.       tr \[:i]\[:i]
+.       tr \[`o]\[`o]
+.       tr \[^o]\[^o]
+.       tr \['o]\['o]
+.       tr \[:o]\[:o]
+.       tr \[~o]\[~o]
+.       tr \[/o]\[/o]
+.       tr \[`u]\[`u]
+.       tr \[^u]\[^u]
+.       tr \['u]\['u]
+.       tr \[:u]\[:u]
+.       tr \[,c]\[,c]
+.       tr \[Sd]\[Sd]
+.       tr \[~n]\[~n]
+.       tr \[Tp]\[Tp]
+.       tr \['y]\['y]
+.       tr \[:y]\[:y]
 .       rr #CAPS_ON
 .    \}
 .END
@@ -3810,74 +3814,74 @@ end
 .MAC UC END
 \c
 .    tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
-.    tr �\[`A]
-.    tr �\[^A]
-.    tr �\['A]
-.    tr �\[:A]
-.    tr �\[oA]
-.    tr �\[~A]
-.    tr �\[AE]
-.    tr �\[`E]
-.    tr �\[^E]
-.    tr �\['E]
-.    tr �\[:E]
-.    tr �\[`I]
-.    tr �\[^I]
-.    tr �\['I]
-.    tr �\[:I]
-.    tr �\[`O]
-.    tr �\[^O]
-.    tr �\['O]
-.    tr �\[:O]
-.    tr �\[~O]
-.    tr �\[/O]
-.    tr �\[`U]
-.    tr �\[^U]
-.    tr �\['U]
-.    tr �\[:U]
-.    tr �\[,C]
-.    tr �\[-D]
-.    tr �\[~N]
-.    tr �\[TP]
-.    tr �\['Y]
-.    tr �\[:Y]
+.    tr \[`a]\[`A]
+.    tr \[^a]\[^A]
+.    tr \['a]\['A]
+.    tr \[:a]\[:A]
+.    tr \[oa]\[oA]
+.    tr \[~a]\[~A]
+.    tr \[ae]\[AE]
+.    tr \[`e]\[`E]
+.    tr \[^e]\[^E]
+.    tr \['e]\['E]
+.    tr \[:e]\[:E]
+.    tr \[`i]\[`I]
+.    tr \[^i]\[^I]
+.    tr \['i]\['I]
+.    tr \[:i]\[:I]
+.    tr \[`o]\[`O]
+.    tr \[^o]\[^O]
+.    tr \['o]\['O]
+.    tr \[:o]\[:O]
+.    tr \[~o]\[~O]
+.    tr \[/o]\[/O]
+.    tr \[`u]\[`U]
+.    tr \[^u]\[^U]
+.    tr \['u]\['U]
+.    tr \[:u]\[:U]
+.    tr \[,c]\[,C]
+.    tr \[Sd]\[-D]
+.    tr \[~n]\[~N]
+.    tr \[Tp]\[TP]
+.    tr \['y]\['Y]
+.    tr \[:y]\[:Y]
 .    nr #CAPS_ON 1
 .END
 \#
 .MAC LC END
 \c
 .    tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
-.    tr �\[`a]
-.    tr �\[^a]
-.    tr �\['a]
-.    tr �\[:a]
-.    tr �\[oa]
-.    tr �\[~a]
-.    tr �\[ae]
-.    tr �\[`e]
-.    tr �\[^e]
-.    tr �\['e]
-.    tr �\[:e]
-.    tr �\[`i]
-.    tr �\[^i]
-.    tr �\['i]
-.    tr �\[:i]
-.    tr �\[`o]
-.    tr �\[^o]
-.    tr �\['o]
-.    tr �\[:o]
-.    tr �\[~o]
-.    tr �\[/o]
-.    tr �\[`u]
-.    tr �\[^u]
-.    tr �\['u]
-.    tr �\[:u]
-.    tr �\[,c]
-.    tr �\[Sd]
-.    tr �\[~n]
-.    tr �\[Tp]
-.    tr �\['y]
-.    tr �\[:y]
+.    tr \[`a]\[`a]
+.    tr \[^a]\[^a]
+.    tr \['a]\['a]
+.    tr \[:a]\[:a]
+.    tr \[oa]\[oa]
+.    tr \[~a]\[~a]
+.    tr \[ae]\[ae]
+.    tr \[`e]\[`e]
+.    tr \[^e]\[^e]
+.    tr \['e]\['e]
+.    tr \[:e]\[:e]
+.    tr \[`i]\[`i]
+.    tr \[^i]\[^i]
+.    tr \['i]\['i]
+.    tr \[:i]\[:i]
+.    tr \[`o]\[`o]
+.    tr \[^o]\[^o]
+.    tr \['o]\['o]
+.    tr \[:o]\[:o]
+.    tr \[~o]\[~o]
+.    tr \[/o]\[/o]
+.    tr \[`u]\[`u]
+.    tr \[^u]\[^u]
+.    tr \['u]\['u]
+.    tr \[:u]\[:u]
+.    tr \[,c]\[,c]
+.    tr \[Sd]\[Sd]
+.    tr \[~n]\[~n]
+.    tr \[Tp]\[Tp]
+.    tr \['y]\['y]
+.    tr \[:y]\[:y]
 .    rr #CAPS_ON
 .END
 \#
@@ -7838,7 +7842,7 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM] \\$\\n[#DOC_COVER_TITLE_NUM]
 .    el \{\
 .       nr #VALID_BASELINE \\n[#T_MARGIN]-\\n[#DOC_LEAD] \\n[#DOC_LEAD]
 .       if !r#CURRENT_V_POS .nr #CURRENT_V_POS \\n[.d]
-.       ie r#ADVANCE_FROM_TOP \{\
+.       ie \\n[#ADVANCE_FROM_TOP] \{\
 .          ie \\n[#CURRENT_V_POS]<(\\n[#T_MARGIN]-1v) \{\
 .             while \\n-[#VALID_BASELINE]>\\n[#CURRENT_V_POS] .
 .             nr #VALID_BASELINE +\\n[#DOC_LEAD]
@@ -14824,6 +14828,20 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
 .    rr #COL_NUM
 .END
 \#
+\# MARK COL V-POSITION AFTER DOCHEADER
+\# -----------------------------------
+\# *Arguments:
+\#   none
+\# *Function:
+\#   Sets 1st page dc register.
+\# *Notes:
+\#   Only required if manual spacing, positive or negative, precedes
+\#   start of columns on first page of doc.
+\#
+.MAC COL_MARK END
+.    mk dc
+.END
+\#
 \# NEXT COLUMN
 \# -----------
 \# *Arguments:


From MAILER-DAEMON Sun Apr 27 19:29:34 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WeYVq-00047j-Eo
	for mharc-groff-commit@gnu.org; Sun, 27 Apr 2014 19:29:34 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36710)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter@schaffter.ca>) id 1WeYVn-000413-P5
	for groff-commit@gnu.org; Sun, 27 Apr 2014 19:29:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter@schaffter.ca>) id 1WeYVk-0006IJ-Vi
	for groff-commit@gnu.org; Sun, 27 Apr 2014 19:29:31 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:53524)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter@schaffter.ca>) id 1WeYVk-0006IF-Sd
	for groff-commit@gnu.org; Sun, 27 Apr 2014 19:29:28 -0400
Received: from PTPi by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <peter@schaffter.ca>) id 1WeYVk-0006RG-Il
	for groff-commit@gnu.org; Sun, 27 Apr 2014 23:29:28 +0000
Date: Sun, 27 Apr 2014 23:29:28 +0000
Message-Id: <E1WeYVk-0006RG-Il@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 02/02: Merge branch 'master' of git.sv.gnu.org:/srv/git/groff
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140427232928.24694.54380@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: a941bd6d6cde34d52f5f0b282219a1567d47d51d
Auto-Submitted: auto-generated
From: Peter Schaffter <peter@schaffter.ca>
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: Sun, 27 Apr 2014 23:29:32 -0000

PTPi pushed a commit to branch master
in repository groff.

commit a941bd6d6cde34d52f5f0b282219a1567d47d51d
Merge: 33f1287 1b8b2a7
Author: Peter Schaffter <peter@schaffter.ca>
Date:   Sun Apr 27 19:27:55 2014 -0400

    Merge branch 'master' of git.sv.gnu.org:/srv/git/groff

 ChangeLog                                   |  110 +++++-
 Makefile.ccpg                               |   13 +-
 Makefile.comm                               |  198 +++++-----
 Makefile.cpg                                |   13 +-
 Makefile.dev                                |   10 +-
 Makefile.in                                 |  126 +++++--
 Makefile.init                               |   10 +-
 Makefile.lib                                |   10 +-
 Makefile.man                                |   13 +-
 Makefile.sub                                |   12 +-
 arch/misc/Makefile.sub                      |   12 +-
 configure                                   |  237 +++++++++---
 configure.ac                                |    5 +-
 contrib/chem/ChangeLog                      |   19 +-
 contrib/chem/Makefile.sub                   |   85 ++---
 contrib/chem/chem.man                       |   10 +-
 contrib/eqn2graph/Makefile.sub              |   17 +-
 contrib/eqn2graph/eqn2graph.man             |   24 +-
 contrib/gdiffmk/ChangeLog                   |   12 +-
 contrib/gdiffmk/Makefile.sub                |   13 +-
 contrib/gdiffmk/gdiffmk.man                 |    8 +-
 contrib/glilypond/ChangeLog                 |    8 +
 contrib/glilypond/Makefile.sub              |   53 +--
 contrib/gperl/Makefile.sub                  |   19 +-
 contrib/grap2graph/Makefile.sub             |   17 +-
 contrib/grap2graph/grap2graph.man           |   16 +-
 contrib/groff_filenames/Makefile.sub        |   10 +-
 contrib/groff_filenames/groff_filenames.man |   19 +-
 contrib/groffer/ChangeLog                   |   16 +-
 contrib/groffer/Makefile.sub                |   85 ++---
 contrib/groffer/groffer.man                 |  536 +++++++++++++-------------
 contrib/hdtbl/ChangeLog                     |    7 +-
 contrib/hdtbl/Makefile.sub                  |   45 ++-
 contrib/hdtbl/groff_hdtbl.man               |   29 ++-
 contrib/mm/ChangeLog                        |    7 +-
 contrib/mm/Makefile.sim                     |   61 ++--
 contrib/mm/Makefile.sub                     |   63 ++--
 contrib/mm/groff_mm.man                     |   39 +-
 contrib/mm/groff_mmse.man                   |    5 +-
 contrib/mm/mmroff.man                       |   53 ++-
 contrib/mom/ChangeLog                       |   17 +
 contrib/mom/Makefile.sub                    |   60 +++-
 contrib/mom/groff_mom.man                   |  398 ++++++++++----------
 contrib/pdfmark/ChangeLog                   |   11 +-
 contrib/pdfmark/Makefile.sub                |   50 ++--
 contrib/pdfmark/pdfroff.man                 |    8 +-
 contrib/pic2graph/Makefile.sub              |   17 +-
 contrib/pic2graph/pic2graph.man             |   29 +-
 doc/Makefile.in                             |   46 +--
 doc/Makefile.sub                            |  142 +++++---
 font/devascii/Makefile.sub                  |   20 +-
 font/devcp1047/Makefile.sub                 |   21 +-
 font/devdvi/generate/Makefile               |    8 +-
 font/devhtml/Makefile.sub                   |   20 +-
 font/devlatin1/Makefile.sub                 |   21 +-
 font/devlbp/Makefile.sub                    |    4 +-
 font/devlj4/Makefile.sub                    |    1 -
 font/devlj4/generate/Makefile               |    5 +-
 font/devpdf/Makefile.sub                    |   64 ++--
 font/devps/Makefile.sub                     |    3 +-
 font/devps/generate/Makefile                |   16 +-
 font/devutf8/Makefile.sub                   |   21 +-
 m4/groff.m4                                 |  225 +++++++++---
 man/ditroff.man                             |    4 +-
 man/groff_char.man                          |  214 ++++++++----
 man/groff_diff.man                          |  102 +++---
 man/groff_font.man                          |    4 +-
 man/groff_out.man                           |   62 ++--
 man/groff_tmac.man                          |   42 +-
 man/roff.man                                |   14 +-
 src/devices/grodvi/grodvi.man               |    1 +
 src/devices/grolbp/grolbp.man               |   14 +-
 src/devices/grolj4/grolj4.man               |    4 +-
 src/devices/grolj4/lj4_font.man             |    6 +-
 src/devices/gropdf/Makefile.sub             |   16 +-
 src/devices/gropdf/gropdf.man               |   17 +-
 src/devices/gropdf/pdfmom.man               |    8 +-
 src/devices/gropdf/pdfmom.pl                |    4 +-
 src/devices/grops/grops.man                 |   11 +-
 src/devices/grotty/grotty.man               |    8 +-
 src/devices/xditview/Makefile.sub           |    7 +-
 src/devices/xditview/gxditview.man          |   16 +-
 src/libs/libgroff/Makefile.sub              |   20 +-
 src/preproc/eqn/Makefile.sub                |   10 +-
 src/preproc/eqn/eqn.man                     |   32 +-
 src/preproc/grn/grn.man                     |   28 +-
 src/preproc/pic/pic.man                     |   48 ++--
 src/preproc/preconv/preconv.man             |    6 +-
 src/preproc/refer/refer.man                 |    4 +-
 src/preproc/tbl/tbl.man                     |   12 +-
 src/roff/groff/Makefile.sub                 |   42 +--
 src/roff/groff/groff.man                    |   53 ++--
 src/roff/grog/Makefile.sub                  |   65 ++--
 src/roff/grog/grog.man                      |   13 +-
 src/roff/nroff/Makefile.sub                 |    8 +-
 src/roff/troff/Makefile.sub                 |    7 +-
 src/roff/troff/troff.man                    |    4 +-
 src/utils/addftinfo/addftinfo.man           |    6 +-
 src/utils/afmtodit/Makefile.sub             |   26 +-
 src/utils/afmtodit/afmtodit.man             |    4 +-
 src/utils/hpftodit/hpftodit.man             |    8 +-
 src/utils/indxbib/Makefile.sub              |    6 +-
 src/utils/tfmtodit/tfmtodit.man             |    2 +-
 src/utils/xtotroff/Makefile.in              |    8 +-
 tmac/Makefile.sub                           |   35 +-
 tmac/an-ext.tmac                            |    7 +-
 tmac/groff_man.man                          |   13 +-
 tmac/groff_mdoc.man                         |   22 +-
 tmac/groff_me.man                           |  154 ++++++--
 tmac/groff_ms.man                           |   45 ++--
 tmac/groff_trace.man                        |   12 +-
 tmac/groff_www.man                          |   42 +-
 tmac/www.tmac                               |    5 +-
 113 files changed, 2608 insertions(+), 1945 deletions(-)


From MAILER-DAEMON Sun Apr 27 19:33:08 2014
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1WeYZI-00053j-2n
	for mharc-groff-commit@gnu.org; Sun, 27 Apr 2014 19:33:08 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37004)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter@schaffter.ca>) id 1WeYZF-00053b-GO
	for groff-commit@gnu.org; Sun, 27 Apr 2014 19:33:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter@schaffter.ca>) id 1WeYZE-0007RN-9C
	for groff-commit@gnu.org; Sun, 27 Apr 2014 19:33:05 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:53608)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter@schaffter.ca>) id 1WeYZE-0007RJ-5n
	for groff-commit@gnu.org; Sun, 27 Apr 2014 19:33:04 -0400
Received: from PTPi by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <peter@schaffter.ca>) id 1WeYZD-0006xT-C0
	for groff-commit@gnu.org; Sun, 27 Apr 2014 23:33:03 +0000
Date: Sun, 27 Apr 2014 23:33:03 +0000
Message-Id: <E1WeYZD-0006xT-C0@vcs.savannah.gnu.org>
To: groff-commit@gnu.org
Subject: [groff] 01/01: Doc updates.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
In-Reply-To: groff@gnu.org
References: <20140427233303.26716.84256@vcs.savannah.gnu.org>
X-Git-Repo: groff
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Rev: bd57dba7ea5dffde48d037d70db5099fb64927fe
Auto-Submitted: auto-generated
From: Peter Schaffter <peter@schaffter.ca>
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: Sun, 27 Apr 2014 23:33:06 -0000

PTPi pushed a commit to branch master
in repository groff.

commit bd57dba7ea5dffde48d037d70db5099fb64927fe
Author: Peter Schaffter <peter@schaffter.ca>
Date:   Sun Apr 27 19:32:40 2014 -0400

    Doc updates.
---
 contrib/mom/momdoc/definitions.html   |    9 ++++--
 contrib/mom/momdoc/docprocessing.html |   45 +++++++++++++++++++++++++++++++-
 contrib/mom/momdoc/inlines.html       |   27 +++++++++++++++----
 3 files changed, 70 insertions(+), 11 deletions(-)

diff --git a/contrib/mom/momdoc/definitions.html b/contrib/mom/momdoc/definitions.html
index 2cf0d8b..5d82909 100644
--- a/contrib/mom/momdoc/definitions.html
+++ b/contrib/mom/momdoc/definitions.html
@@ -318,13 +318,16 @@ or concept you&#8217;re not familiar with.
   
   <dt id="kernunit">Kern Units</dt>
   <dd>
-  A relative distance equal to 1/36 of the current
+  A relative distance, which, by default, is equal to 1/36 of the
+  current
   <a href="#ps">point size</a>.
-  Used between individual letters
-  for
+  Used between individual letters for
   <a href="#kern">kerning</a>.
   Different typesetting systems use different values (1/54 is
   popular), and sometimes call kern units by a different name.
+  It is possible to change the default size of the kern unit with the
+  <a href="inlines.html#kernunit">KERN_UNIT</a>
+  macro.
   </dd>
   
   <dt id="leading">Lead/leading</dt>
diff --git a/contrib/mom/momdoc/docprocessing.html b/contrib/mom/momdoc/docprocessing.html
index a044dcc..dd7dfae 100644
--- a/contrib/mom/momdoc/docprocessing.html
+++ b/contrib/mom/momdoc/docprocessing.html
@@ -119,6 +119,10 @@ class="header-link" href="#setup">Preliminary document setup</a></h3>
   <li><a href="#columns-intro"><b>Setting documents in columns</b></a>
   <ul class="toc-docproc">
     <li><a href="#columns">COLUMNS</a></li>
+    <li><a href="#marking-col-start">Marking the first page column start position</a>
+    <ul class="toc-docproc">
+      <li><a href="#col-mark">COL_MARK</a></li>
+    </ul></li>
     <li><a href="#breaking-columns">Breaking columns manually</a>
     <ul class="toc-docproc">
       <li><a href="#col-next">COL_NEXT</a> and <a href="#col-break">COL_BREAK</a></li>
@@ -3070,14 +3074,51 @@ always be the last document setup macro prior to
 <div class="box-tip">
 <p class="tip">
 <span class="note">Note:</span>
-Mom ignores columns completely
-when the
+Mom ignores columns completely when the
 <a href="#printstyle">PRINTSTYLE</a>
 is <kbd>TYPEWRITE</kbd>.  The notion of typewriter-style
 output in columns is just too ghastly for her to bear.
 </p>
 </div>
 
+<h3 class="docs" id="marking-col-start">Marking the first page column start position</h3>
+
+<p>
+If you insert or remove space after the docheader, i.e. immediately after
+<a href="#start">START</a>
+in your input file, mom needs to know where your first column begins
+in order to align subsequent columns on the first page.
+</p>
+
+<div id="col-mark" class="box-macro-args">
+Macro: <b>COL_MARK</b>
+</div>
+
+<p>
+<kbd>COL_MARK</kbd> tells mom where the first column after the
+docheader begins, in order for the top of subsequent columns on the
+first page to be aligned.  Note that if you do not manually add
+or remove space after the docheader, there is no need to invoke
+<kbd>COL_MARK</kbd>.
+</p>
+
+<div class="box-tip">
+<p class="tip">
+<span class="note">Note:</span>
+If you add or subtract space after the docheader, e.g. with
+<a href="typesetting.html#ald">ALD</a>
+or
+<a href="typesetting.html#SP">SP</a>,
+and your
+<a href="definitions.html#unitofmeasure">unit of measure</a>
+is something other than &#8220;<kbd>v</kbd>&#8221;, be sure to follow the spacing
+command with
+<a href="docprocessing.html#shim"><kbd>.SHIM</kbd></a>
+unless shimming has been disabled with
+<a href="#disable-shim">NO_SHIM</a>.
+</p>
+</div>
+
 <h3 class="docs">Using tabs when COLUMNS are enabled</h3>
 
 <p>
diff --git a/contrib/mom/momdoc/inlines.html b/contrib/mom/momdoc/inlines.html
index 7574dd2..d8d03bf 100644
--- a/contrib/mom/momdoc/inlines.html
+++ b/contrib/mom/momdoc/inlines.html
@@ -352,9 +352,9 @@ escapes
 <br/>
 <span class="pre-in-pp">
   \*[BU &lt;n&gt;]&nbsp;Closes the space between letters (Back Units).
-  \*[FU &lt;n&gt;]&nbsp;Opens the space between letters (Forward Units).
+  \*[FU &lt;n&gt;]&nbsp;Opens the space between letters  (Forward Units).
 </span>
-&#8220;<b>&lt;n&gt;</b>&#8221; is the number of
+<b>&lt;n&gt;</b> is the number of
 <a href="definitions.html#kernunit">kern units</a>
 by which to close or open the space between letters.
 </p>
@@ -365,10 +365,10 @@ For example,
 <span class="pre-in-pp">
   THE HUMAN COST OF COMMODIF\*[FU 1]YING FRESH W\*[BU 4]A\*[BU 5]TER
 </span>
-moves the letter Y in &#8220;COMMODIFYING&#8221; one kern unit away from
-the letter F, and the letter A in &#8220;WATER&#8221; four kern units
-closer to the letter W.  Additionally, the letter T in "WATER" is
-moved five kern units closer to the letter A.
+moves the letter Y in &#8220;COMMODIFYING&#8221; one kern unit away
+from the letter F, and the letter A in &#8220;WATER&#8221; four
+kern units closer to the letter W.  Additionally, the letter T in
+&#8220;WATER&#8221; is moved five kern units closer to the letter A.
 </p>
 
 <p>
@@ -382,6 +382,21 @@ also exist (ie with no space before the number of kern units desired,
 up to a limit of 36).
 </p>
 
+<p id="kernunit">
+The default size of a kern unit is 1/36 of the current point size;
+this may be changed by invoking the macro, <kbd>.KERN_UNIT</kbd>,
+with the desired value, which represents a fraction of the current
+point size.  For example, to change the kern unit to 1/54 of the
+current point size,
+<br/>
+<span class="pre-in-pp">
+  .KERN_UNIT 54
+</span>
+To restore the kern unit to its default, invoke
+<kbd>.KERN_UNIT</kbd> with an argument of <kbd>DEFAULT</kbd>.
+</p>
+
+
 <div class="box-notes">
 <h3 id="inlines-docprocessing-kerning" class="docs notes">Notes concerning document processing</h3>
 <p style="margin-top: .5em;">


