[css2] Arnaud bug fix

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401753

Author: ianbjacobs

css2/bin/html2ps

@@ -18,7 +18,7 @@ eval 'exec perl -S $0 "$@"'
 #
 
 #
-# This is html2ps version 1.0 beta1, an HTML-to-PostScript converter.
+# This is html2ps version 1.0 beta2, an HTML-to-PostScript converter.
 #   Copyright (C) 1995-1997 Jan Karrman.
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -386,7 +386,7 @@ $space=join('|',keys %space);
  "archb",30.5, "archa",22.9, "flsa",21.6, "flse",21.6, "halfletter",14,
  "11x17",27.9, "ledger",43.2);
 
-$version="html2ps version 1.0 beta1 patched by Arnaud Le Hors";
+$version="html2ps version 1.0 beta2 patched by Arnaud Le Hors 19990806";
 $opts="2|b:|c|C:|d|D|e:|f:|F|g|h|H|i:|l:|L|m:|n|N:|o:|O|r:|R|s:|S:|T|u|U|v|W:|"
  ."x:";
 %optalias=( 'twoup','2', 'base','b', 'check','c', 'toc','C', 'debug','d',
@@ -3860,12 +3860,8 @@ sub DSC {
         last S;
       }
       if($line=~/^\[(.*) (\d+) $io\]$/) {
-        # $li=$BM[$2]=~y/\n/\n/+2;
-        # the above Arnaud's line; this is the old:
 	$li=$BM[$ix[$2]]=~y/\n/\n/+2;
         $line="\/picstr $WS[$ix[$2]] string D\n$1\n"
-           #  ."%%BeginData: $li Hex Lines\n$val[$3]\n$BM[$2]\n%%EndData";
-	   # The above is Arnaud's line, this is the old:
   	     ."%%BeginData: $li Hex Lines\n$val[$3]\n$BM[$ix[$2]]\n%%EndData";
         last S;
       }
@@ -3998,8 +3994,19 @@ sub ref {
   open(TMP, "<$scr.out.bak");
   open(OUTPUT, ">$scr.out");
   while (<TMP>) {
-      s|/HN [^D]*D|/HN [$pnum] D|;
+    if (/^\/HN /) {
+      # load the whole block of lines up to the end
+      $buf = $_;
+      while (!/[^D]*D$/) {
+	$_ = <TMP>;
+	$buf .= $_;
+      }
+      # update it now
+      $buf =~ s|/HN [^D]*D|/HN [$pnum] D|;
+      print OUTPUT $buf;
+    } else {
       print OUTPUT $_;
+    }
   }
   close(TMP);
   close(OUTPUT);