[groff] 01/01: Regression in commit '3fe78135c9'

[Deri James]

deri pushed a commit to branch master
in repository groff.

commit feb7bacca140c0d7127e4dbe77d36082fcbf6f67
Author: Deri James <address@hidden>
Date:   Tue Nov 18 23:37:36 2014 +0000

    Regression in commit '3fe78135c9'
    
        Introduced problem in subroutine TextWid. Octal char
        \nnn returns width of 4 char string rather than width
        of single character. May result in unwanted large gaps.
    
        * src/devices/gropdf/gropdf.pl: Change 'TextWid' to
          recognise octal escaped characters (\nnn).
---
 ChangeLog                    |   10 ++++++++++
 src/devices/gropdf/gropdf.pl |    6 +++++-
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 80cc07c..aebc238 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-11-18  Deri James  <address@hidden>
+
+       My commit '3fe78135c9fe666dadffde2a822b0535d8db6feb'
+       introduced problem in subroutine TextWid. Octal char
+       \nnn returns width of 4 char string rather than width 
+       of single character.
+       
+       * src/devices/gropdf/gropdf.pl: Change 'TextWid' to
+         recognise octal escaped characters (\nnn).
+         
 2014-11-07  Deri James  <address@hidden>
 
        See bug #43555
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index 5d1b346..1cbd52d 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -767,7 +767,10 @@ sub do_x
                }
                elsif ($pdfmark=~m/(.+) \/OUT/)
                {
-                   my @xwds=split(' ',"<< $1 >>");
+                   my $t=$1;
+                   $t=~s/\\\) /\\\\\) /g;
+                   $t=~s/\\e/\\\\/g;
+                   my @xwds=split(' ',"<< $t >>");
                    my $out=ParsePDFValue(address@hidden);
 
                    my $this=[$out,[]];
@@ -3029,6 +3032,7 @@ sub TextWid
     my $txt=shift;
     my $w=0;
     my $ck=0;
+    $txt=~s/^\\(\d\d\d)/chr($1)/e;
 
     foreach my $c (split('',$txt))
     {