[Groff-commit] GNU troff branch, master, updated. bd60d043a586f879b2194be3accf4e0fafdff23f

[Colin Watson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU troff".

http://git.sv.gnu.org/gitweb/?p=groff.git;a=commitdiff;h=bd60d043a586f879b2194be3accf4e0fafdff23f

The branch, master has been updated
       via  bd60d043a586f879b2194be3accf4e0fafdff23f (commit)
      from  d5951b551a3cb8f9cbbf1458489bcbfefd390d83 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit bd60d043a586f879b2194be3accf4e0fafdff23f
Author: Colin Watson <address@hidden>
Date:   Thu Jan 2 13:38:30 2014 +0000

    '+' isn't a regex metacharacter in sed by default
    
    Based on an old patch from Fumitoshi UKAI <address@hidden>.
    
    * font/devascii/Makefile.sub ($(FONTS)): Convert extended regex
    syntax to basic for sed.
    * font/devcp1047/Makefile.sub ($(FONTS)): Likewise.
    * font/devhtml/Makefile.sub ($(FONTS)): Likewise.
    * font/devlatin1/Makefile.sub ($(FONTS)): Likewise.
    * font/devutf8/Makefile.sub ($(FONTS)): Likewise.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                   |    9 +++++++++
 font/devascii/Makefile.sub  |    4 ++--
 font/devcp1047/Makefile.sub |    4 ++--
 font/devhtml/Makefile.sub   |    4 ++--
 font/devlatin1/Makefile.sub |    4 ++--
 font/devutf8/Makefile.sub   |    4 ++--
 6 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index abf7534..465105a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-02  Colin Watson  <address@hidden>
+
+       * font/devascii/Makefile.sub ($(FONTS)): Convert extended regex
+       syntax to basic for sed.
+       * font/devcp1047/Makefile.sub ($(FONTS)): Likewise.
+       * font/devhtml/Makefile.sub ($(FONTS)): Likewise.
+       * font/devlatin1/Makefile.sub ($(FONTS)): Likewise.
+       * font/devutf8/Makefile.sub ($(FONTS)): Likewise.
+
 2013-12-23  Bernd Warken  <address@hidden>
 
        groff/src/roff/groff/groff.cpp: add groff option `-G' to the
diff --git a/font/devascii/Makefile.sub b/font/devascii/Makefile.sub
index 43b2b46..0fa2e77 100644
--- a/font/devascii/Makefile.sub
+++ b/font/devascii/Makefile.sub
@@ -12,8 +12,8 @@ $(FONTS): R.proto
        @-rm -f $@
        @(charwidth=`expr $(RES) / $(CPI)` ; \
         sed -e "s/^name [A-Z]*$$/name $@/" \
-            -e "s/^\\([^       ]*\\)   [0-9]+  /\\1    $$charwidth     /" \
-            -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
+            -e "s/^\\([^       ]*\\)   [0-9][0-9]*     /\\1    $$charwidth     
/" \
+            -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
             -e "s/^internalname .*$$/internalname $@/" \
             -e "/^internalname/s/BI/3/" \
             -e "/^internalname/s/B/2/" \
diff --git a/font/devcp1047/Makefile.sub b/font/devcp1047/Makefile.sub
index 4c2d1db..5aa6cff 100644
--- a/font/devcp1047/Makefile.sub
+++ b/font/devcp1047/Makefile.sub
@@ -12,8 +12,8 @@ $(FONTS): R.proto
        @-rm -f $@
        @(charwidth=`expr $(RES) / $(CPI)` ; \
         sed -e "s/^name [A-Z]*$$/name $@/" \
-            -e "s/^\\([^       ]*\\)   [0-9]+  /\\1    $$charwidth     /" \
-            -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
+            -e "s/^\\([^       ]*\\)   [0-9][0-9]*     /\\1    $$charwidth     
/" \
+            -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
             -e "s/^internalname .*$$/internalname $@/" \
             -e "/^internalname/s/BI/3/" \
             -e "/^internalname/s/B/2/" \
diff --git a/font/devhtml/Makefile.sub b/font/devhtml/Makefile.sub
index c1e5525..36fcf77 100644
--- a/font/devhtml/Makefile.sub
+++ b/font/devhtml/Makefile.sub
@@ -13,8 +13,8 @@ $(FONTS): R.proto
        @-rm -f $@
        @(charwidth=`expr $(RES) / $(CPI)` ; \
         sed -e "s/^name [A-Z]*$$/name $@/" \
-            -e "s/^\\([^       ]*\\)   [0-9]+  /\\1    $$charwidth     /" \
-            -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
+            -e "s/^\\([^       ]*\\)   [0-9][0-9]*     /\\1    $$charwidth     
/" \
+            -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
             -e "s/^internalname .*$$/internalname $@/" \
             -e "/^internalname/s/CR/4/" \
             -e "/^internalname/s/BI/3/" \
diff --git a/font/devlatin1/Makefile.sub b/font/devlatin1/Makefile.sub
index 127e02c..b261f57 100644
--- a/font/devlatin1/Makefile.sub
+++ b/font/devlatin1/Makefile.sub
@@ -12,8 +12,8 @@ $(FONTS): R.proto
        @-rm -f $@
        @(charwidth=`expr $(RES) / $(CPI)` ; \
         sed -e "s/^name [A-Z]*$$/name $@/" \
-            -e "s/^\\([^       ]*\\)   [0-9]+  /\\1    $$charwidth     /" \
-            -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
+            -e "s/^\\([^       ]*\\)   [0-9][0-9]*     /\\1    $$charwidth     
/" \
+            -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
             -e "s/^internalname .*$$/internalname $@/" \
             -e "/^internalname/s/BI/3/" \
             -e "/^internalname/s/B/2/" \
diff --git a/font/devutf8/Makefile.sub b/font/devutf8/Makefile.sub
index 221bd3f..1047bdc 100644
--- a/font/devutf8/Makefile.sub
+++ b/font/devutf8/Makefile.sub
@@ -12,8 +12,8 @@ $(FONTS): R.proto
        @-rm -f $@
        @(charwidth=`expr $(RES) / $(CPI)` ; \
         sed -e "s/^name [A-Z]*$$/name $@/" \
-            -e "s/^\\([^       ]*\\)   [0-9]+  /\\1    $$charwidth     /" \
-            -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \
+            -e "s/^\\([^       ]*\\)   [0-9][0-9]*     /\\1    $$charwidth     
/" \
+            -e "s/^spacewidth [0-9][0-9]*$$/spacewidth $$charwidth/" \
             -e "s/^internalname .*$$/internalname $@/" \
             -e "/^internalname/s/BI/3/" \
             -e "/^internalname/s/B/2/" \


hooks/post-receive
-- 
GNU troff