texinfo/util gdoc,1.1.1.1,1.2

[karl]

Update of /cvsroot/texinfo/texinfo/util
In directory sheep:/tmp/cvs-serv25329

Modified Files:
        gdoc 
Log Message:
update

Index: gdoc
===================================================================
RCS file: /cvsroot/texinfo/texinfo/util/gdoc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gdoc        2003/12/06 01:35:54     1.1.1.1
--- gdoc        2003/12/23 12:47:21     1.2
***************
*** 125,130 ****
  $type_constant = "\\\%(\\w+)";
  $type_func = "(\\w+\\(\\))";
- #$type_func = "((\\w|\\\\)+\\(\\))";
- #$type_func = "(\\(w||\\\\)+\\(\\))";
  $type_param = "\\\@(\\w+)";
  $type_struct = "\\\&(\\w+)";
--- 125,128 ----
***************
*** 152,156 ****
                       $type_struct, "{\\\\it \$1}",
                       $type_param, "{\\\\bf \$1}" );
! $blankline_tex = "\\";
  
  # sgml, docbook format
--- 150,154 ----
                       $type_struct, "{\\\\it \$1}",
                       $type_param, "{\\\\bf \$1}" );
! $blankline_tex = "\\\\";
  
  # sgml, docbook format
***************
*** 330,333 ****
--- 328,353 ----
  }
  
+ sub just_highlight {
+     my $contents = join "\n", @_;
+     my $line;
+     my $ret = "";
+ 
+     foreach $pattern (keys %highlights) {
+ #       print "scanning pattern $pattern ($highlights{$pattern})\n";
+         $contents =~ s:$pattern:repstr($pattern, $highlights{$pattern}, $1, $2
+ , $3, $4):gse;
+     }
+     foreach $line (split "\n", $contents) {
+         if ($line eq ""){
+             $ret = $ret . $lineprefix . $blankline;
+         } else {
+             $ret = $ret . $lineprefix . $line;
+         }
+         $ret = $ret . "\n";
+     }
+ 
+     return $ret;
+ }
+ 
  # output in texinfo
  sub output_texinfo {
***************
*** 425,429 ****
      print "{\\it ".$type."}\n";
      print "{\\bf ".$func."}\n";
!     print "(\n";
      $count = 0;
      foreach $parameter (@{$args{'parameterlist'}}) {
--- 445,449 ----
      print "{\\it ".$type."}\n";
      print "{\\bf ".$func."}\n";
!     print "(";
      $count = 0;
      foreach $parameter (@{$args{'parameterlist'}}) {
***************
*** 433,437 ****
          $param2 =~ s/_/\\_/g;
  
!         print "{\\it ".$param."} {\\bf ".$param2."}\n";
          if ($count != $#{$args{'parameterlist'}}) {
              $count++;
--- 453,457 ----
          $param2 =~ s/_/\\_/g;
  
!         print "{\\it ".$param."} {\\bf ".$param2."}";
          if ($count != $#{$args{'parameterlist'}}) {
              $count++;
***************
*** 456,463 ****
  
          $param3 = $args{'parameters'}{$parameter};
-         $param3 =~ s/_/\\_/g;
          $param3 =~ s/&([a-zA-Z\_]+)/{\\it \1}/g;
  
!         output_highlight($param3);
      }
      if ($check==0) {
--- 476,484 ----
  
          $param3 = $args{'parameters'}{$parameter};
          $param3 =~ s/&([a-zA-Z\_]+)/{\\it \1}/g;
  
!         $out = just_highlight($param3);
!         $out =~ s/_/\\_/g;
!         print $out;
      }
      if ($check==0) {
***************
*** 471,479 ****
          $sec =~ s/&([a-zA-Z\_]+)/{\\it \1}/g;
  
!         print "\n\\par{\\large{$sec}}\\par\n";
          print "\\begin{rmfamily}\n";
  
          $sec = $args{'sections'}{$section};
-         $sec =~ s/_/\\_/g;
          $sec =~ s/\\:/:/g;
          $sec =~ s/&([a-zA-Z\_]+)/{\\it \1}/g;
--- 492,499 ----
          $sec =~ s/&([a-zA-Z\_]+)/{\\it \1}/g;
  
!         print "\n{\\large{$sec}}\\\\\n";
          print "\\begin{rmfamily}\n";
  
          $sec = $args{'sections'}{$section};
          $sec =~ s/\\:/:/g;
          $sec =~ s/&([a-zA-Z\_]+)/{\\it \1}/g;
***************
*** 481,485 ****
          $sec =~ s/([0-9]+)\^([0-9]+)/\$\{\1\}\^\{\2\}\$/g;
  
!         output_highlight($sec);
          print "\\end{rmfamily}\n";
      }
--- 501,508 ----
          $sec =~ s/([0-9]+)\^([0-9]+)/\$\{\1\}\^\{\2\}\$/g;
  
!         $out = just_highlight($sec);
!         $out =~ s/_/\\_/g;
! 
!         print $out;
          print "\\end{rmfamily}\n";
      }