[groff] 02/02: [gropdf]: Fix Savannah #61908

[Deri James]

deri pushed a commit to branch master
in repository groff.

commit 1307a645ca75217f1f287dffe3f9afb8f505a64d
Author: Deri James <deri@chuzzlewit.myzen.co.uk>
AuthorDate: Mon Jan 24 14:39:55 2022 +0000

    [gropdf]: Fix Savannah #61908
    
            * src/devices/gropdf/gropdf.pl: Adjust text position when
            given landscape media (i.e -P-l).
    
            Fixes <https://savannah.gnu.org/bugs/?61908>.
    
            Problem found and patch supplied by KUBO Koichi.
---
 ChangeLog                    | 16 ++++++++++++++++
 src/devices/gropdf/gropdf.pl |  7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e142662a..39e6a96b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2022-01-24  Deri James  <deri@chuzzlewit.myzen.co.uk>
+
+       [gropdf]: Fix Savannah #61908
+
+       * src/devices/gropdf/gropdf.pl: Adjust text position when
+       given landscape media (i.e -P-l).
+
+       Fixes <https://savannah.gnu.org/bugs/?61908>.
+
+       Problem found and patch supplied by KUBO Koichi.
+
+2022-01-24  Deri James  <deri@chuzzlewit.myzen.co.uk>
+
+       * src/devices/gropdf/gropdf.pl: A fix to importing pdf
+       versions > 1.4.
+
 2022-01-21  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        [pdfpic]: Fix Savannah #58206.
diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index e3958bb1..8c4b52a7 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -797,7 +797,12 @@ sub do_x
                IsGraphic();
                my ($curangle,$hyp)=RtoP($xpos,GraphY($ypos));
                my ($x,$y)=PtoR($theta+$curangle,$hyp);
-               $stream.="q\n".sprintf("%.3f %.3f %.3f %.3f %.3f %.3f 
cm",cos($theta),sin($theta),-sin($theta),cos($theta),$xpos-$x,GraphY($ypos)-$y)."\n";
+               my ($tx, $ty) = ($xpos - $x, GraphY($ypos) - $y);
+               if ($frot) {
+                 ($tx, $ty) = ($tx *  sin($theta) + $ty * -cos($theta),
+                               $tx * -cos($theta) + $ty * -sin($theta));
+               }
+               $stream.="q\n".sprintf("%.3f %.3f %.3f %.3f %.3f %.3f 
cm",cos($theta),sin($theta),-sin($theta),cos($theta),$tx,$ty)."\n";
                $InPicRotate=1;
            }
            elsif ($par=~m/exec grestore/ and $InPicRotate)