[groff] 02/05: Fixes for .pdfpagenumbering and .pdfswitchtopage

[Deri James]

deri pushed a commit to branch deri-gropdf-ng
in repository groff.

commit f685c65f2639219103e2c6d15b5f1e4d93344507
Author: Deri James <d...@chuzzlewit.myzen.co.uk>
AuthorDate: Fri Sep 1 12:07:23 2023 +0100

    Fixes for .pdfpagenumbering and .pdfswitchtopage
---
 src/devices/gropdf/gropdf.pl | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/devices/gropdf/gropdf.pl b/src/devices/gropdf/gropdf.pl
index 52e0953d4..2d7b6feda 100644
--- a/src/devices/gropdf/gropdf.pl
+++ b/src/devices/gropdf/gropdf.pl
@@ -348,7 +348,7 @@ my $mark=undef;
 my $suspendmark=undef;
 my $boxmax=0;
 my %missing;    # fonts in download files which are not found/readable
-
+my @PageLabel;  # PageLabels
 
 
 my $n_flg=1;
@@ -862,11 +862,9 @@ foreach my $j (0..$#{$pages->{Kids}})
 {
     my $pg=GetObj($pages->{Kids}->[$j]);
 
-    if (exists($pg->{PageLabel}))
+    if (defined($PageLabel[$j]))
     {
-
-        push(@{$cat->{PageLabels}->{Nums}},$j,$pg->{PageLabel});
-        delete($pg->{PageLabel});
+        push(@{$cat->{PageLabels}->{Nums}},$j,$PageLabel[$j]);
     }
 }
 
@@ -1808,6 +1806,7 @@ sub do_x
                     else
                     {
                         
($curoutlev,$curoutlevno,$thislev)=(@{$outlines[$pginsert]});
+                        $curoutlevno--;
                     }
                 }
             }
@@ -1925,14 +1924,14 @@ sub do_x
                 {
                     $S=substr($xprm[2],0,1) if $xprm[2];
                     $P=$xprm[3];
-                    $St=$xprm[4] if $xprm[4];
+                    $St=$xprm[4] if length($xprm[4]);
 
-                    if (!defined($S) and !defined($P))
+                    if (!defined($S) and !length($P))
                     {
                         $P=' ';
                     }
 
-                    if ($St and $St!~m/^\d+$/)
+                    if ($St and $St!~m/^-?\d+$/)
                     {
                         Warn("Page numbering start '$St' must be numeric");
                         return;
@@ -1942,10 +1941,11 @@ sub do_x
 
                     my $label={};
                     $label->{S} = "/$S" if $S;
-                    $label->{P} = "($P)" if $P;
-                    $label->{St} = $St if $St;
+                    $label->{P} = "($P)" if length($P);
+                    $label->{St} = $St if length($St);
 
-                    $cpage->{PageLabel}=$label;
+                    $#PageLabel=$pginsert if $pginsert > $#PageLabel;
+                    splice(@PageLabel,$pginsert,0,$label);
                 }
             }
 
@@ -3413,11 +3413,11 @@ sub do_p
 {
     my $trans='BLOCK';
 
-            $trans='PAGE' if $firstpause;
-            NewPage($trans);
-            @XOstream=();
-            @PageAnnots=();
-            $firstpause=1;
+    $trans='PAGE' if $firstpause;
+    NewPage($trans);
+    @XOstream=();
+    @PageAnnots=();
+    $firstpause=1;
 }
 
 sub FixTrans

_______________________________________________
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit