gbranden pushed a commit to branch master
in repository groff.

commit 45f6f78ddf04f447e5dc3000433f97799279356a
Author: Deri James <[email protected]>
AuthorDate: Fri Dec 29 23:28:11 2023 +0000

    [gropdf]: Fix Savannah #65092.
    
    ...rounded corners in hdtbl's "color_boxes.roff" example.
    
    The \X'ps: exec ...' for setlinejoin and setlinecap (which hdtbl.tmac
    emits as one command) is documented as separate commands in gropdf(1).
    
    * src/devices/gropdf/gropdf.pl (do_x): Allow both setlinecap and
      setlinejoin to be combined in one command.
    
    Fixes <https://savannah.gnu.org/bugs/?64958>.  Thanks to Bjarni Ingi
    Gislason for the report.
---
 ChangeLog                    | 15 +++++++++++++++
 src/devices/gropdf/gropdf.pl |  4 ++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 143fbb665..2a8fc8727 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2023-12-29  Deri James  <[email protected]>
+
+       [gropdf]: Fix Savannah #65092 (rounded corners in hdtbl's
+       "color_boxes.roff" example).
+
+       The \X'ps: exec ...' for setlinejoin and setlinecap (which
+       hdtbl.tmac emits as one command) is documented as separate
+       commands in gropdf(1).
+
+       * src/devices/gropdf/gropdf.pl (do_x): Allow both setlinecap and
+       setlinejoin to be combined in one command.
+
+       Fixes <https://savannah.gnu.org/bugs/?64958>.  Thanks to Bjarni
+       Ingi Gislason for the report.
+
 2023-12-10  Deri James  <[email protected]>
 
        [gropdf]: Fix arc drawing when `-l` option used.
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index 3ab602cca..9a61b839b 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -911,13 +911,13 @@ sub do_x
                $stream.="Q\n";
                $InPicRotate=0;
            }
-           elsif ($par=~m/exec (\d) setlinejoin/)
+           elsif ($par=~m/exec.*? (\d) setlinejoin/)
            {
                IsGraphic();
                $linejoin=$1;
                $stream.="$linejoin j\n";
            }
-           elsif ($par=~m/exec (\d) setlinecap/)
+           if ($par=~m/exec.*? (\d) setlinecap/)
            {
                IsGraphic();
                $linecap=$1;

_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit

Reply via email to