From d88b677bbb58617e9020f08f649da22b83144e216452d88d4b44e6136f943179 Mon Sep 17 00:00:00 2001
From: Petr Gajdos <pgajdos@suse.com>
Date: Mon, 25 Nov 2013 15:11:25 +0000
Subject: [PATCH] - updated to version 2012:   * fix warnings in perl 5.14   *
 build fixes - latex2html-2008.diff was split to share-dir.patch, local.pm  
 (source) and latex2html.1 (source) - buildroot.diff was renamed to
 dest-dir.diff and that was extended   to install icons properly -
 fix-defined.patch was removed (upstreamed) - manual.ps.gz was removed

OBS-URL: https://build.opensuse.org/package/show/Publishing/latex2html?expand=0&rev=16
---
 latex2html-2008-buildroot.diff                |  14 -
 latex2html-2008.diff                          | 179 --------
 latex2html-2008.tar.gz                        |   3 -
 ...=> latex2html-2012-backref-workaround.diff |   0
 ...nmode.diff => latex2html-2012-binmode.diff |   0
 latex2html-2012-dest-dir.diff                 |  28 ++
 ...8-gsout.diff => latex2html-2012-gsout.diff |   0
 ...ch => latex2html-2012-match-multiline.diff | 382 ++++++++----------
 ...r.diff => latex2html-2012-perl-bindir.diff |   0
 latex2html-2012-share-dir.diff                |  14 +
 latex2html-2012.tgz                           |   3 +
 ...html-README.SuSE => latex2html-README.SUSE |   0
 latex2html-fix-defined.patch                  |  37 --
 latex2html-manual.ps.gz                       |   3 -
 latex2html.1                                  | 114 ++++++
 latex2html.changes                            |  13 +
 latex2html.spec                               |  82 ++--
 local.pm                                      |  30 ++
 18 files changed, 407 insertions(+), 495 deletions(-)
 delete mode 100644 latex2html-2008-buildroot.diff
 delete mode 100644 latex2html-2008.diff
 delete mode 100644 latex2html-2008.tar.gz
 rename latex2html-backref-workaround.diff => latex2html-2012-backref-workaround.diff (100%)
 rename latex2html-2008-binmode.diff => latex2html-2012-binmode.diff (100%)
 create mode 100644 latex2html-2012-dest-dir.diff
 rename latex2html-2008-gsout.diff => latex2html-2012-gsout.diff (100%)
 rename latex2html-2008-match-multiline.patch => latex2html-2012-match-multiline.diff (82%)
 rename latex2html-2008-perl-bindir.diff => latex2html-2012-perl-bindir.diff (100%)
 create mode 100644 latex2html-2012-share-dir.diff
 create mode 100644 latex2html-2012.tgz
 rename latex2html-README.SuSE => latex2html-README.SUSE (100%)
 delete mode 100644 latex2html-fix-defined.patch
 delete mode 100644 latex2html-manual.ps.gz
 create mode 100644 latex2html.1
 create mode 100644 local.pm

diff --git a/latex2html-2008-buildroot.diff b/latex2html-2008-buildroot.diff
deleted file mode 100644
index 3ae3ca4..0000000
--- a/latex2html-2008-buildroot.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- config/install.pl
-+++ config/install.pl
-@@ -372,7 +372,10 @@
- 
- if($cfg{TEXPATH}) {
-   print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n     ($cfg{TEXPATH})\n";
--  unless(mkpath($cfg{TEXPATH})) {
-+  my $dest = $cfg{TEXPATH};
-+  my $buildroot=$ENV{"RPM_BUILD_ROOT"};
-+  $dest= "$buildroot$dest";
-+  unless(mkpath($dest)) {
-   #my $testpath = $cfg{TEXPATH}; # to strip (latex2)html
-   #$testpath =~ s/[$dd$dd][^$dd$dd]*$//;
-   #if((-d $cfg{TEXPATH} && !-w _) || (-d $testpath && !-w _)) {
diff --git a/latex2html-2008.diff b/latex2html-2008.diff
deleted file mode 100644
index 5b90f6f..0000000
--- a/latex2html-2008.diff
+++ /dev/null
@@ -1,179 +0,0 @@
-Index: config/config.pl
-===================================================================
---- config/config.pl.orig
-+++ config/config.pl
-@@ -1918,7 +1918,7 @@ else {
-     $newcfg{'SHLIBDIR'} = $newcfg{'PREFIX'};
-   }
-   else {
--    $newcfg{'SHLIBDIR'} = "$newcfg{'PREFIX'}${dd}share${dd}lib${dd}latex2html";
-+    $newcfg{'SHLIBDIR'} = "$newcfg{'PREFIX'}${dd}share${dd}latex2html";
-   }
- }
- add_drive_letter($newcfg{'SHLIBDIR'});
-Index: config/install.pl
-===================================================================
---- config/install.pl.orig
-+++ config/install.pl
-@@ -406,6 +406,9 @@ exit 0;
- 
- sub install_file {
-   my ($src,$dest,$chmod) = @_;
-+  
-+  my $buildroot=$ENV{"RPM_BUILD_ROOT"};
-+  $dest= "$buildroot$dest";
- 
-   # prepend the value of DESTDIR, for package-managers
-   $dest = $ENV{'DESTDIR'}.$dest if($ENV{'DESTDIR'});
-Index: latex2html.man
-===================================================================
---- /dev/null
-+++ latex2html.man
-@@ -0,0 +1,113 @@
-+.00;                       # finish .ig
-+
-+'di           \" finish diversion--previous line must be blank
-+.nr nl 0-1    \" fake up transition to first page again
-+.nr % 0         \" start at page 1
-+'; __END__ ##### From here on it's a standard manual page - VERSION #####
-+.TH LaTeX2HTML 1
-+.AT 3
-+.SH NAME
-+latex2html \- translate LaTeX files to HTML (HyperText Markup Language)
-+.SH SYNOPSIS
-+.B
-+
-+latex2html
-+   [-address author-address]
-+   [-antialias]
-+   [-antialias_text]
-+   [-ascii_mode]
-+   [-auto_navigation]
-+   [-auto_prefix]
-+   [-biblio URL]
-+   [-bottom_navigation]
-+   [-contents URL]
-+   [-contents_in_navigation]
-+   [-custom_titles]
-+   [-debug]
-+   [-dir output-directory]
-+   [-discard]
-+   [-down_title string]
-+   [-down_url URL]
-+   [-external_file filename]
-+   [-external_images]
-+   [-font_size size]
-+   [-h(elp)]
-+   [-html_version (2.0|3.0|3.2)[,(math|i18n|table)]*]
-+   [-images_only]
-+   [-index URL]
-+   [-index_in_navigation]
-+   [-info string]
-+   [-init_file file]
-+   [-iso_language type]
-+   [-ldump]
-+   [-link num]
-+   [-local_icons]
-+   [-long_titles num]
-+   [-next_page_in_navigation]
-+   [-no_antialias]
-+   [-no_antialias_text]
-+   [-no_auto_link]
-+   [-no_footnode]
-+   [-no_fork]
-+   [-no_images]
-+   [-no_math]
-+   [-no_navigation]
-+   [-no_reuse]
-+   [-no_subdir]
-+   [-no_tex_defs]
-+   [-no_white]
-+   [-nolatex]
-+   [-numbered_footnotes]
-+   [-prefix filename-prefix]
-+   [-prev_title string]
-+   [-prev_url URL]
-+   [-previous_page_in_navigation]
-+   [-ps_images]
-+   [-reuse reuse_option]
-+   [-scalable_fonts]
-+   [-short_extn]
-+   [-short_index]
-+   [-show_section_numbers]
-+   [-split + num]
-+   [-split num]
-+   [-t top-page-title]
-+   [-tmp path]
-+   [-toc_depth num]
-+   [-toc_stars]
-+   [-top_navigation]
-+   [-unsegment]
-+   [-up_title string]
-+   [-up_url URL]
-+   [-v]
-+   [-verbosity num]
-+   [-white]
-+   file(s)
-+
-+
-+.SH DESCRIPTION
-+.I LaTeX2HTML
-+is a Perl program that translates LaTeX source files into HTML. For each source
-+file given as an argument the translator will create a directory containing the
-+corresponding HTML files.
-+See the WWW online documentation or the /usr/share/doc/packages/latex2html/manual.ps.gz
-+file for more detailed information and examples.
-+
-+.SH PROBLEMS
-+For information on various problems and remedies see the WWW online documentation
-+or the documents available in the distribution.
-+A mailing list for technical discussion about latex2html, bugs and enhancements is available at
-+latex2html@tug.org
-+
-+.SH SUSE installation
-+
-+In /usr/share/doc/packages/latex2html you may find more information about this package.
-+
-+.SH AUTHOR
-+Nikos Drakos,  Computer Based Learning Unit, University of Leeds
-+<nikos@cbl.leeds.ac.uk>. Several people have contributed suggestions,
-+ideas, solutions, support and
-+encouragement.
-+
-+The pstogif script uses the pstoppm.ps
-+postscript program originally written by Phillip Conrad (Perfect Byte, Inc.)
-+and modified by L.  Peter Deutsch (Aladdin Enterprises).
-Index: local.pm
-===================================================================
---- /dev/null
-+++ local.pm
-@@ -0,0 +1,29 @@
-+#################################################################
-+# local.pm
-+#
-+# Local Configuration for LaTeX2HTML
-+#
-+# This file is created automatically. Do not edit!
-+#
-+#################################################################
-+
-+package main;
-+
-+### start pstoimg configuration ###
-+$GS_LIB = '   . ; /usr/share/ghostscript/5.50 ; /usr/share/ghostscript/fonts'; # Inserted by configure-pstoimg
-+$GS_DEVICE = 'ppmraw'; # Inserted by configure-pstoimg
-+$GS = '/usr/bin/gs'; # Inserted by configure-pstoimg
-+$PNMCAT = '/usr/X11R6/bin/pnmcat'; # Inserted by configure-pstoimg
-+$PNMFILE = '/usr/X11R6/bin/pnmfile'; # Inserted by configure-pstoimg
-+$PNMTOPNG = '/usr/X11R6/bin/pnmtopng'; # Inserted by configure-pstoimg
-+$PBMMAKE = '/usr/X11R6/bin/pbmmake'; # Inserted by configure-pstoimg
-+$GSLANDSCAPE = '/usr/share/ghostscript/5.50/landscap.ps'; # Inserted by configure-pstoimg
-+$PPMQUANT = '/usr/X11R6/bin/ppmquant'; # Inserted by configure-pstoimg
-+$PNMFLIP = '/usr/X11R6/bin/pnmflip'; # Inserted by configure-pstoimg
-+$bg_color = '\#bfbfbf'; # Inserted by configure-pstoimg
-+$white_color = '\#ffffff'; # Inserted by configure-pstoimg
-+$PNMCROP = '/usr/X11R6/bin/pnmcrop'; # Inserted by configure-pstoimg
-+
-+### end pstoimg configuration ###
-+
-+1;
diff --git a/latex2html-2008.tar.gz b/latex2html-2008.tar.gz
deleted file mode 100644
index 8df5914..0000000
--- a/latex2html-2008.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:59456815a3984250c295d3d5c46b85646038db8db2735cdc0d3780cf4da337ad
-size 1133054
diff --git a/latex2html-backref-workaround.diff b/latex2html-2012-backref-workaround.diff
similarity index 100%
rename from latex2html-backref-workaround.diff
rename to latex2html-2012-backref-workaround.diff
diff --git a/latex2html-2008-binmode.diff b/latex2html-2012-binmode.diff
similarity index 100%
rename from latex2html-2008-binmode.diff
rename to latex2html-2012-binmode.diff
diff --git a/latex2html-2012-dest-dir.diff b/latex2html-2012-dest-dir.diff
new file mode 100644
index 0000000..091ed22
--- /dev/null
+++ b/latex2html-2012-dest-dir.diff
@@ -0,0 +1,28 @@
+Index: config/install.pl
+===================================================================
+--- config/install.pl.orig	2002-11-29 12:49:01.000000000 +0100
++++ config/install.pl	2013-11-25 15:17:23.522211642 +0100
+@@ -293,8 +293,10 @@
+   split(/\s+/,$cfg{'IMAGE_TYPES'}) : qw(gif);
+ my $iconrx = join('|', @icon_types);
+ 
++my $destdir=$ENV{"DESTDIR"};
+ my $dest1 = "$cfg{'SHLIBDIR'}${dd}icons";
+-if((-d $dest1 && !-w _) || (-d $cfg{'SHLIBDIR'} && !-w _)) {
++print STDERR "((( $destdir, $dest1 )))\n";
++if((-d "$destdir$dest1" && !-w _) || (-d "$destdir$cfg{'SHLIBDIR'}" && !-w _)) {
+   print STDERR "Error: Cannot install icons in '$dest1': No write permission.\n";
+   $dest1 = '';
+ }
+@@ -372,7 +374,10 @@
+ 
+ if($cfg{TEXPATH}) {
+   print "\nNote: trying to install LaTeX2HTML style files in TeX directory tree\n     ($cfg{TEXPATH})\n";
+-  unless(mkpath($cfg{TEXPATH})) {
++  my $dest = $cfg{TEXPATH};
++  my $destdir=$ENV{"DESTDIR"};
++  $dest= "$destdir$dest";
++  unless(mkpath($dest)) {
+   #my $testpath = $cfg{TEXPATH}; # to strip (latex2)html
+   #$testpath =~ s/[$dd$dd][^$dd$dd]*$//;
+   #if((-d $cfg{TEXPATH} && !-w _) || (-d $testpath && !-w _)) {
diff --git a/latex2html-2008-gsout.diff b/latex2html-2012-gsout.diff
similarity index 100%
rename from latex2html-2008-gsout.diff
rename to latex2html-2012-gsout.diff
diff --git a/latex2html-2008-match-multiline.patch b/latex2html-2012-match-multiline.diff
similarity index 82%
rename from latex2html-2008-match-multiline.patch
rename to latex2html-2012-match-multiline.diff
index 39a6b6c..2559546 100644
--- a/latex2html-2008-match-multiline.patch
+++ b/latex2html-2012-match-multiline.diff
@@ -3,68 +3,26 @@ Description: Replace $* with "m" matching option
  matching since the former one isn't supported by latest perl.
 Author: Roland Stigge <stigge@antcom.de>
 
-Index: latex2html-2008/latex2html.pin
+Refreshed for latex2html 2012
+
+Index: latex2html.pin
 ===================================================================
---- latex2html-2008.orig/latex2html.pin
-+++ latex2html-2008/latex2html.pin
-@@ -10637,19 +10637,17 @@ sub do_rightquotes { (($HTML_VERSION < 5
- sub do_cmd_parbox {
-     local($_) = @_;
-     local($args, $contents, $dum, $pat);
--    $* = 1;			# Multiline matching ON
-     ($dum,$pat) = &get_next_optional_argument; # discard this
-     ($dum,$pat) = &get_next_optional_argument; # discard this
-     ($dum,$pat) = &get_next_optional_argument; # discard this
-     $args .= $pat if ($pat);
-     $pat = &missing_braces unless (
--	(s/$next_pair_pr_rx/$pat=$2;''/eo)
--	||(s/$next_pair_rx/$pat=$2;''/eo));
-+	(s/$next_pair_pr_rx/$pat=$2;''/eom)
-+	||(s/$next_pair_rx/$pat=$2;''/eom));
-     $args .= "{".$`.$pat."}";
-     $contents = &missing_braces unless (
--	(s/$next_pair_pr_rx/$contents=$2;''/eo)
--	||(s/$next_pair_rx/$contents=$2;''/eo));
--    $* = 0;			# Multiline matching OFF
-+	(s/$next_pair_pr_rx/$contents=$2;''/eom)
-+	||(s/$next_pair_rx/$contents=$2;''/eom));
-     $args .= "{".$`.$contents."}";
-     if ($NO_PARBOX_IMAGES) {
- 	$contents = join ('', &do_cmd_par(), $contents, '</P>' );
-@@ -11464,7 +11462,6 @@ sub list_helper {
- #    $/ = $savedRS; 
- #
- 
--    $* = 1;			# Multiline matching ON
-     if (($tag =~ /DL/)&&$labels) {
- 	local($label,$aft,$br_id);
- 	s/\\item\b[\s\r]*([^\[])/do {
-@@ -11473,9 +11470,8 @@ sub list_helper {
+--- latex2html.pin.orig	2013-11-25 13:09:05.115061067 +0100
++++ latex2html.pin	2013-11-25 13:09:26.719320051 +0100
+@@ -11473,7 +11473,7 @@
  		$label = &translate_environments(
  			"$O$br_id$C$label$O$br_id$C");
  		join('',"\\item\[" , $label, "\]$aft" );
 -	    }/eg;
 +	    }/egm;
      }
--    $* = 0;			# Multiline matching OFF
+     #$* = 0;			# Multiline matching OFF
  
-     # This deals with \item[xxx] ...
-     if ($tag =~ /DL/) {
-@@ -13192,9 +13188,7 @@ sub wrap_raw_arg_cmds {
- 	my $padding = ($after =~ /^[a-zA-Z]/s)? ($cmd =~ /\W$/ ? '':' '):'';
- 
- 	if ($raw_arg_cmds{$cmd} && defined &$wrapper) {
--            $* = 1;
- 	    ($wrap, $_) = &$wrapper("\\$cmd$star", $padding . $after);
--            $* = 0;
- 	    # ...but don't leave an unwanted space at the beginning
- 	    $_ =~ s/^ //s if($padding && $wrap !~ /\w$/m
- 	    	&& (length($_) == length($after)+1) );
-Index: latex2html-2008/styles/natbib.perl
+Index: styles/natbib.perl
 ===================================================================
---- latex2html-2008.orig/styles/natbib.perl
-+++ latex2html-2008/styles/natbib.perl
-@@ -1385,12 +1385,10 @@ sub do_env_thebibliography {
+--- styles/natbib.perl.orig	2002-11-29 12:49:18.000000000 +0100
++++ styles/natbib.perl	2013-11-25 13:09:05.116061079 +0100
+@@ -1385,12 +1385,10 @@
      $citefile = $CURRENT_FILE;
      $citefiles{$bbl_nr} = $citefile;
      s/$next_pair_rx//o;
@@ -78,11 +36,11 @@ Index: latex2html-2008/styles/natbib.perl
      s/\\penalty\d+//mg;		# Remove \penalty declarations
  
      local($this_item,$this_kind, $title);
-Index: latex2html-2008/styles/color.perl
+Index: styles/color.perl
 ===================================================================
---- latex2html-2008.orig/styles/color.perl
-+++ latex2html-2008/styles/color.perl
-@@ -145,7 +145,6 @@ $BKGSTRING = "bgcolor";
+--- styles/color.perl.orig	2013-11-25 13:09:05.077060611 +0100
++++ styles/color.perl	2013-11-25 13:09:05.116061079 +0100
+@@ -145,7 +145,6 @@
  sub read_rgb_colors {
      local($base_file) = @_;
      local($file) = $base_file;
@@ -90,7 +48,7 @@ Index: latex2html-2008/styles/color.perl
      local($r,$g,$b,$name,$dir);
      foreach $dir (split(/$envkey/,$LATEX2HTMLSTYLES)) {
      	$file = "$dir$dd$base_file"
-@@ -155,7 +154,6 @@ sub read_rgb_colors {
+@@ -155,7 +154,6 @@
              if (open(COLORFILE,"<$file")) {
  		print STDOUT "\n(reading colors from $file" if $DEBUG;
          binmode COLORFILE;
@@ -98,7 +56,7 @@ Index: latex2html-2008/styles/color.perl
  		while (<COLORFILE>) {
  	s/^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\w+(\s\w+)*)\s*/
  	    ($r,$g,$b,$name)=($1,$2,$3,$4);
-@@ -171,14 +169,12 @@ sub read_rgb_colors {
+@@ -171,14 +169,12 @@
  	    }
  	}
      }
@@ -113,7 +71,7 @@ Index: latex2html-2008/styles/color.perl
      local($c,$m,$y,$k,$name,$dir,@colors);
      local($num_rx) = "(\\d|\\d\\.\\d*)";
      foreach $dir (split(/$envkey/,$LATEX2HTMLSTYLES)) {
-@@ -189,7 +185,6 @@ sub read_cmyk_colors {
+@@ -189,7 +185,6 @@
  	    if (open(COLORFILE,"<$file")) {
  		print STDOUT "\n(reading colors from $file";
  		binmode COLORFILE;
@@ -121,7 +79,7 @@ Index: latex2html-2008/styles/color.perl
  		@colors = (<COLORFILE>);
  		foreach (@colors) {
  		    next if (/^\s*$/);
-@@ -213,7 +208,6 @@ sub read_cmyk_colors {
+@@ -213,7 +208,6 @@
  	    }
  	} 
      }
@@ -129,11 +87,11 @@ Index: latex2html-2008/styles/color.perl
      $_[0];
  }
  
-Index: latex2html-2008/styles/htmllist.perl
+Index: styles/htmllist.perl
 ===================================================================
---- latex2html-2008.orig/styles/htmllist.perl
-+++ latex2html-2008/styles/htmllist.perl
-@@ -96,7 +96,6 @@ sub do_env_htmllist{
+--- styles/htmllist.perl.orig	2002-11-29 12:49:18.000000000 +0100
++++ styles/htmllist.perl	2013-11-25 13:09:05.116061079 +0100
+@@ -96,7 +96,6 @@
      local($imagemark,$mark,$item_len,$desc_len,$mark_len,$mark_size);
      $imagemark = &set_htmllist_marker($bullet) if ($bullet);
  
@@ -141,7 +99,7 @@ Index: latex2html-2008/styles/htmllist.perl
      local($Maxlength) = 99999;
      local($i,@items_done);
      print "[";
-@@ -114,8 +113,8 @@ sub do_env_htmllist{
+@@ -114,8 +113,8 @@
  		$_ = $&.$';
  		push(@items_done,&translate_commands($`));
  		$mark = &missing_braces unless (
@@ -152,7 +110,7 @@ Index: latex2html-2008/styles/htmllist.perl
  		$imagemark = &set_htmllist_marker($mark) if ($mark);
  #		$mark_size = $ImageSizeMarks{$mark};
  #		$mark = "$ICONSERVER/$ImageMarks{$2}.gif" if ($ImageMarks{$2});
-@@ -136,7 +135,6 @@ sub do_env_htmllist{
+@@ -136,7 +135,6 @@
  		$_=$';
  	}
      }
@@ -160,7 +118,7 @@ Index: latex2html-2008/styles/htmllist.perl
      $_ = join('',@items_done, $_); undef @items_done;
  
      #RRM: cannot have anything before the first <LI>
-@@ -148,7 +146,7 @@ sub do_env_htmllist{
+@@ -148,7 +146,7 @@
  	$preitems =~ s/<P( [^>]*)?>//g;
  	$preitems = "\n".$preitems if $preitems;
      }
@@ -169,11 +127,11 @@ Index: latex2html-2008/styles/htmllist.perl
  
      $_ = '<DT>'.$_ unless (/^\s*<D(D|T)/);
      print "]";
-Index: latex2html-2008/versions/html4_1.pl
+Index: versions/html4_1.pl
 ===================================================================
---- latex2html-2008.orig/versions/html4_1.pl
-+++ latex2html-2008/versions/html4_1.pl
-@@ -766,9 +766,7 @@ sub translate_colspec {
+--- versions/html4_1.pl.orig	2004-01-01 07:15:01.000000000 +0100
++++ versions/html4_1.pl	2013-11-25 13:09:05.117061091 +0100
+@@ -766,9 +766,7 @@
  	    }
  	    $celldata .= ' ' if ($celldata =~ /\\\w+$/);
  
@@ -184,7 +142,7 @@ Index: latex2html-2008/versions/html4_1.pl
  #	    $at_text .= $celldata;
  #	    if ( $#colspec > -1) {
  #	        $colspec[$#colspec] .= join('', "<TD ALIGN=\"LEFT\">",$celldata,'</TD>');
-@@ -794,9 +792,7 @@ sub translate_colspec {
+@@ -794,9 +792,7 @@
  	    }
  	    $celldata .= ' ' if ($celldata =~ /\\\w+$/);
  
@@ -195,7 +153,7 @@ Index: latex2html-2008/versions/html4_1.pl
  	    $at_text .= $celldata;
  
  	} elsif ( $char =~ /;|\&/ ) {
-@@ -965,9 +961,7 @@ sub process_tabular {
+@@ -965,9 +961,7 @@
  
      while (/\\parbox/) {
  	local($parlength) = length($_);
@@ -206,7 +164,7 @@ Index: latex2html-2008/versions/html4_1.pl
  
  	if ($parlength == length($_)) {
  	    print "\n*** \\parbox's remain in table!!\n";
-@@ -1196,9 +1190,7 @@ sub process_tabular {
+@@ -1196,9 +1190,7 @@
  		}
  		$colspec = &translate_environments("$OP$tmp$CP$colspec$OP$tmp$CP");
  		$colspec = &translate_commands($colspec);
@@ -217,7 +175,7 @@ Index: latex2html-2008/versions/html4_1.pl
  		$colspec = ';SPMnbsp;' if ($colspec =~ /^\s*$/);
  		$colspec = join('', $reopens, $colspec
  		        , (@$open_tags_R ? &close_all_tags() : '')
-@@ -1338,7 +1330,7 @@ sub make_math_comment{
+@@ -1338,7 +1330,7 @@
  	$ecomm = "\n\\end{$env}";
      } unless ($env =~/tex2html/);
      $_ = &revert_to_raw_tex;
@@ -226,7 +184,7 @@ Index: latex2html-2008/versions/html4_1.pl
      $_ = $scomm . $_ . $ecomm;
      return() if (length($_) < 16);
      $global{'verbatim_counter'}++;
-@@ -1440,20 +1432,19 @@ sub do_env_equation {
+@@ -1440,20 +1432,19 @@
      local($seqno) = join('',"\n<TD$eqno_class WIDTH=10 ALIGN=\""
                           , (($EQN_TAGS =~ /L/)? 'LEFT': 'RIGHT')
  		         , "\">\n");
@@ -250,7 +208,7 @@ Index: latex2html-2008/versions/html4_1.pl
  	    if ($nobrack) { $eqno = $2; }
  	    else { $eqno = join('',$EQNO_START, $2, $EQNO_END) };
  	    $_ = $before;
-@@ -1461,7 +1452,6 @@ sub do_env_equation {
+@@ -1461,7 +1452,6 @@
      } elsif ($eqno) {
  	$eqno = join('',$EQNO_START, $eqno, $EQNO_END)
      } else { $eqno = '&nbsp;' } # spacer, when no numbering
@@ -258,7 +216,7 @@ Index: latex2html-2008/versions/html4_1.pl
  
      # include the equation-number, using a <TABLE>
      local($halign) = " ALIGN=\"CENTER\"" unless $FLUSH_EQN;
-@@ -1641,7 +1631,7 @@ sub do_env_eqnarray {
+@@ -1641,7 +1631,7 @@
  #	    if (s/\\lefteqn$OP(\d+)$CP(.*)$OP\1$CP/ $2 /) {
  	    if (s/\\lefteqn//) {
  		$return .= "\"LEFT\" COLSPAN=\"3\">";
@@ -267,7 +225,7 @@ Index: latex2html-2008/versions/html4_1.pl
  		if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		    $_ = (($_)? &process_math_in_latex(
  		        "indisplay" , '', '', $doimage.$_ ):'');
-@@ -1666,7 +1656,7 @@ sub do_env_eqnarray {
+@@ -1666,7 +1656,7 @@
  
  	    # left column, set using \displaystyle
  	    $thismath = shift(@cols); $failed = 0;
@@ -276,7 +234,7 @@ Index: latex2html-2008/versions/html4_1.pl
  	    if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , '', '', $doimage.$thismath ):'');
-@@ -1686,7 +1676,7 @@ sub do_env_eqnarray {
+@@ -1686,7 +1676,7 @@
  
  	    # center column, set using \textstyle
  	    $thismath = shift(@cols); $failed = 0;
@@ -285,7 +243,7 @@ Index: latex2html-2008/versions/html4_1.pl
  	    if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , 'text', '', $doimage.$thismath ):'');
-@@ -1706,7 +1696,7 @@ sub do_env_eqnarray {
+@@ -1706,7 +1696,7 @@
  
  	    # right column, set using \displaystyle
  	    $thismath = shift(@cols); $failed = 0;
@@ -294,11 +252,11 @@ Index: latex2html-2008/versions/html4_1.pl
  	    if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , '', '', $doimage.$thismath ):'');
-Index: latex2html-2008/versions/html4_01.pl
+Index: versions/html4_01.pl
 ===================================================================
---- latex2html-2008.orig/versions/html4_01.pl
-+++ latex2html-2008/versions/html4_01.pl
-@@ -766,9 +766,7 @@ sub translate_colspec {
+--- versions/html4_01.pl.orig	2004-01-01 07:15:01.000000000 +0100
++++ versions/html4_01.pl	2013-11-25 13:09:05.117061091 +0100
+@@ -766,9 +766,7 @@
  	    }
  	    $celldata .= ' ' if ($celldata =~ /\\\w+$/);
  
@@ -309,7 +267,7 @@ Index: latex2html-2008/versions/html4_01.pl
  #	    $at_text .= $celldata;
  #	    if ( $#colspec > -1) {
  #	        $colspec[$#colspec] .= join('', "<TD ALIGN=\"LEFT\">",$celldata,'</TD>');
-@@ -794,9 +792,7 @@ sub translate_colspec {
+@@ -794,9 +792,7 @@
  	    }
  	    $celldata .= ' ' if ($celldata =~ /\\\w+$/);
  
@@ -320,7 +278,7 @@ Index: latex2html-2008/versions/html4_01.pl
  	    $at_text .= $celldata;
  
  	} elsif ( $char =~ /;|\&/ ) {
-@@ -965,9 +961,7 @@ sub process_tabular {
+@@ -965,9 +961,7 @@
  
      while (/\\parbox/) {
  	local($parlength) = length($_);
@@ -331,7 +289,7 @@ Index: latex2html-2008/versions/html4_01.pl
  
  	if ($parlength == length($_)) {
  	    print "\n*** \\parbox's remain in table!!\n";
-@@ -1196,9 +1190,7 @@ sub process_tabular {
+@@ -1196,9 +1190,7 @@
  		}
  		$colspec = &translate_environments("$OP$tmp$CP$colspec$OP$tmp$CP");
  		$colspec = &translate_commands($colspec);
@@ -342,7 +300,7 @@ Index: latex2html-2008/versions/html4_01.pl
  		$colspec = ';SPMnbsp;' if ($colspec =~ /^\s*$/);
  		$colspec = join('', $reopens, $colspec
  		        , (@$open_tags_R ? &close_all_tags() : '')
-@@ -1338,7 +1330,7 @@ sub make_math_comment{
+@@ -1338,7 +1330,7 @@
  	$ecomm = "\n\\end{$env}";
      } unless ($env =~/tex2html/);
      $_ = &revert_to_raw_tex;
@@ -351,7 +309,7 @@ Index: latex2html-2008/versions/html4_01.pl
      $_ = $scomm . $_ . $ecomm;
      return() if (length($_) < 16);
      $global{'verbatim_counter'}++;
-@@ -1440,20 +1432,19 @@ sub do_env_equation {
+@@ -1440,20 +1432,19 @@
      local($seqno) = join('',"\n<TD$eqno_class WIDTH=10 ALIGN=\""
                           , (($EQN_TAGS =~ /L/)? 'LEFT': 'RIGHT')
  		         , "\">\n");
@@ -375,7 +333,7 @@ Index: latex2html-2008/versions/html4_01.pl
  	    if ($nobrack) { $eqno = $2; }
  	    else { $eqno = join('',$EQNO_START, $2, $EQNO_END) };
  	    $_ = $before;
-@@ -1461,7 +1452,6 @@ sub do_env_equation {
+@@ -1461,7 +1452,6 @@
      } elsif ($eqno) {
  	$eqno = join('',$EQNO_START, $eqno, $EQNO_END)
      } else { $eqno = '&nbsp;' } # spacer, when no numbering
@@ -383,7 +341,7 @@ Index: latex2html-2008/versions/html4_01.pl
  
      # include the equation-number, using a <TABLE>
      local($halign) = " ALIGN=\"CENTER\"" unless $FLUSH_EQN;
-@@ -1641,7 +1631,7 @@ sub do_env_eqnarray {
+@@ -1641,7 +1631,7 @@
  #	    if (s/\\lefteqn$OP(\d+)$CP(.*)$OP\1$CP/ $2 /) {
  	    if (s/\\lefteqn//) {
  		$return .= "\"LEFT\" COLSPAN=\"3\">";
@@ -392,7 +350,7 @@ Index: latex2html-2008/versions/html4_01.pl
  		if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		    $_ = (($_)? &process_math_in_latex(
  		        "indisplay" , '', '', $doimage.$_ ):'');
-@@ -1666,7 +1656,7 @@ sub do_env_eqnarray {
+@@ -1666,7 +1656,7 @@
  
  	    # left column, set using \displaystyle
  	    $thismath = shift(@cols); $failed = 0;
@@ -401,7 +359,7 @@ Index: latex2html-2008/versions/html4_01.pl
  	    if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , '', '', $doimage.$thismath ):'');
-@@ -1686,7 +1676,7 @@ sub do_env_eqnarray {
+@@ -1686,7 +1676,7 @@
  
  	    # center column, set using \textstyle
  	    $thismath = shift(@cols); $failed = 0;
@@ -410,7 +368,7 @@ Index: latex2html-2008/versions/html4_01.pl
  	    if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , 'text', '', $doimage.$thismath ):'');
-@@ -1706,7 +1696,7 @@ sub do_env_eqnarray {
+@@ -1706,7 +1696,7 @@
  
  	    # right column, set using \displaystyle
  	    $thismath = shift(@cols); $failed = 0;
@@ -419,11 +377,11 @@ Index: latex2html-2008/versions/html4_01.pl
  	    if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , '', '', $doimage.$thismath ):'');
-Index: latex2html-2008/versions/html3_2.pl
+Index: versions/html3_2.pl
 ===================================================================
---- latex2html-2008.orig/versions/html3_2.pl
-+++ latex2html-2008/versions/html3_2.pl
-@@ -406,9 +406,7 @@ sub translate_colspec {
+--- versions/html3_2.pl.orig	2002-11-29 12:49:19.000000000 +0100
++++ versions/html3_2.pl	2013-11-25 13:09:05.117061091 +0100
+@@ -406,9 +406,7 @@
  	    }
  	    $celldata .= ' ' if ($celldata =~ /\\\w+$/);
  
@@ -434,7 +392,7 @@ Index: latex2html-2008/versions/html3_2.pl
  #	    $at_text .= $celldata;
  #	    if ( $#colspec > -1) {
  #	        $colspec[$#colspec] .= join('', "<TD ALIGN=\"LEFT\">",$celldata,'</TD>');
-@@ -434,9 +432,7 @@ sub translate_colspec {
+@@ -434,9 +432,7 @@
  	    }
  	    $celldata .= ' ' if ($celldata =~ /\\\w+$/);
  
@@ -445,7 +403,7 @@ Index: latex2html-2008/versions/html3_2.pl
  	    $at_text .= $celldata;
  
  	} elsif ( $char =~ /;|\&/ ) {
-@@ -596,9 +592,7 @@ sub process_tabular {
+@@ -596,9 +592,7 @@
  
      while (/\\parbox/) {
  	local($parlength) = length($_);
@@ -456,7 +414,7 @@ Index: latex2html-2008/versions/html3_2.pl
  
  	if ($parlength == length($_)) {
  	    print "\n*** \\parbox's remain in table!!\n";
-@@ -823,9 +817,7 @@ sub process_tabular {
+@@ -823,9 +817,7 @@
  		}
  		$colspec = &translate_environments("$OP$tmp$CP$colspec$OP$tmp$CP");
  		$colspec = &translate_commands($colspec);
@@ -467,7 +425,7 @@ Index: latex2html-2008/versions/html3_2.pl
  		$colspec = ';SPMnbsp;' if ($colspec =~ /^\s*$/);
  		$colspec = join('', $reopens, $colspec
  		        , (@$open_tags_R ? &close_all_tags() : '')
-@@ -966,7 +958,7 @@ sub make_math_comment{
+@@ -966,7 +958,7 @@
  	$ecomm = "\n\\end{$env}";
      } unless ($env =~/tex2html/);
      $_ = &revert_to_raw_tex;
@@ -476,7 +434,7 @@ Index: latex2html-2008/versions/html3_2.pl
      $_ = $scomm . $_ . $ecomm;
      return() if (length($_) < 16);
      $global{'verbatim_counter'}++;
-@@ -1057,20 +1049,19 @@ sub do_env_equation {
+@@ -1057,20 +1049,19 @@
      local($seqno) = join('',"\n<TD$eqno_class WIDTH=10 ALIGN=\""
                           , (($EQN_TAGS =~ /L/)? 'LEFT': 'RIGHT')
  		         , "\">\n");
@@ -500,7 +458,7 @@ Index: latex2html-2008/versions/html3_2.pl
  	    if ($nobrack) { $eqno = $2; }
  	    else { $eqno = join('',$EQNO_START, $2, $EQNO_END) };
  	    $_ = $before;
-@@ -1078,7 +1069,6 @@ sub do_env_equation {
+@@ -1078,7 +1069,6 @@
      } elsif ($eqno) {
  	$eqno = join('',$EQNO_START, $eqno, $EQNO_END)
      } else { $eqno = '&nbsp;' } # spacer, when no numbering
@@ -508,7 +466,7 @@ Index: latex2html-2008/versions/html3_2.pl
  
      # include the equation-number, using a <TABLE>
      local($halign) = $math_class unless $FLUSH_EQN;
-@@ -1255,7 +1245,7 @@ sub do_env_eqnarray {
+@@ -1255,7 +1245,7 @@
  #	    if (s/\\lefteqn$OP(\d+)$CP(.*)$OP\1$CP/ $2 /) {
  	    if (s/\\lefteqn//) {
  		$return .= "\"LEFT\" COLSPAN=\"3\">";
@@ -517,7 +475,7 @@ Index: latex2html-2008/versions/html3_2.pl
  		if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		    $_ = (($_)? &process_math_in_latex(
  		        "indisplay" , '', '', $doimage.$_ ):'');
-@@ -1280,7 +1270,7 @@ sub do_env_eqnarray {
+@@ -1280,7 +1270,7 @@
  
  	    # left column, set using \displaystyle
  	    $thismath = shift(@cols); $failed = 0;
@@ -526,7 +484,7 @@ Index: latex2html-2008/versions/html3_2.pl
  	    if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , '', '', $doimage.$thismath ):'');
-@@ -1300,7 +1290,7 @@ sub do_env_eqnarray {
+@@ -1300,7 +1290,7 @@
  
  	    # center column, set using \textstyle
  	    $thismath = shift(@cols); $failed = 0;
@@ -535,7 +493,7 @@ Index: latex2html-2008/versions/html3_2.pl
  	    if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , 'text', '', $doimage.$thismath ):'');
-@@ -1320,7 +1310,7 @@ sub do_env_eqnarray {
+@@ -1320,7 +1310,7 @@
  
  	    # right column, set using \displaystyle
  	    $thismath = shift(@cols); $failed = 0;
@@ -544,11 +502,11 @@ Index: latex2html-2008/versions/html3_2.pl
  	    if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , '', '', $doimage.$thismath ):'');
-Index: latex2html-2008/versions/html4_0.pl
+Index: versions/html4_0.pl
 ===================================================================
---- latex2html-2008.orig/versions/html4_0.pl
-+++ latex2html-2008/versions/html4_0.pl
-@@ -745,9 +745,7 @@ sub translate_colspec {
+--- versions/html4_0.pl.orig	2004-01-01 07:15:00.000000000 +0100
++++ versions/html4_0.pl	2013-11-25 13:09:05.117061091 +0100
+@@ -745,9 +745,7 @@
  	    }
  	    $celldata .= ' ' if ($celldata =~ /\\\w+$/);
  
@@ -559,7 +517,7 @@ Index: latex2html-2008/versions/html4_0.pl
  #	    $at_text .= $celldata;
  #	    if ( $#colspec > -1) {
  #	        $colspec[$#colspec] .= join('', "<TD ALIGN=\"LEFT\">",$celldata,'</TD>');
-@@ -773,9 +771,7 @@ sub translate_colspec {
+@@ -773,9 +771,7 @@
  	    }
  	    $celldata .= ' ' if ($celldata =~ /\\\w+$/);
  
@@ -570,7 +528,7 @@ Index: latex2html-2008/versions/html4_0.pl
  	    $at_text .= $celldata;
  
  	} elsif ( $char =~ /;|\&/ ) {
-@@ -944,9 +940,7 @@ sub process_tabular {
+@@ -944,9 +940,7 @@
  
      while (/\\parbox/) {
  	local($parlength) = length($_);
@@ -581,7 +539,7 @@ Index: latex2html-2008/versions/html4_0.pl
  
  	if ($parlength == length($_)) {
  	    print "\n*** \\parbox's remain in table!!\n";
-@@ -1175,9 +1169,7 @@ sub process_tabular {
+@@ -1175,9 +1169,7 @@
  		}
  		$colspec = &translate_environments("$OP$tmp$CP$colspec$OP$tmp$CP");
  		$colspec = &translate_commands($colspec);
@@ -592,7 +550,7 @@ Index: latex2html-2008/versions/html4_0.pl
  		$colspec = ';SPMnbsp;' if ($colspec =~ /^\s*$/);
  		$colspec = join('', $reopens, $colspec
  		        , (@$open_tags_R ? &close_all_tags() : '')
-@@ -1317,7 +1309,7 @@ sub make_math_comment{
+@@ -1317,7 +1309,7 @@
  	$ecomm = "\n\\end{$env}";
      } unless ($env =~/tex2html/);
      $_ = &revert_to_raw_tex;
@@ -601,7 +559,7 @@ Index: latex2html-2008/versions/html4_0.pl
      $_ = $scomm . $_ . $ecomm;
      return() if (length($_) < 16);
      $global{'verbatim_counter'}++;
-@@ -1419,20 +1411,19 @@ sub do_env_equation {
+@@ -1419,20 +1411,19 @@
      local($seqno) = join('',"\n<TD$eqno_class WIDTH=10 ALIGN=\""
                           , (($EQN_TAGS =~ /L/)? 'LEFT': 'RIGHT')
  		         , "\">\n");
@@ -625,7 +583,7 @@ Index: latex2html-2008/versions/html4_0.pl
  	    if ($nobrack) { $eqno = $2; }
  	    else { $eqno = join('',$EQNO_START, $2, $EQNO_END) };
  	    $_ = $before;
-@@ -1440,7 +1431,6 @@ sub do_env_equation {
+@@ -1440,7 +1431,6 @@
      } elsif ($eqno) {
  	$eqno = join('',$EQNO_START, $eqno, $EQNO_END)
      } else { $eqno = '&nbsp;' } # spacer, when no numbering
@@ -633,7 +591,7 @@ Index: latex2html-2008/versions/html4_0.pl
  
      # include the equation-number, using a <TABLE>
      local($halign) = " ALIGN=\"CENTER\"" unless $FLUSH_EQN;
-@@ -1620,7 +1610,7 @@ sub do_env_eqnarray {
+@@ -1620,7 +1610,7 @@
  #	    if (s/\\lefteqn$OP(\d+)$CP(.*)$OP\1$CP/ $2 /) {
  	    if (s/\\lefteqn//) {
  		$return .= "\"LEFT\" COLSPAN=\"3\">";
@@ -642,7 +600,7 @@ Index: latex2html-2008/versions/html4_0.pl
  		if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		    $_ = (($_)? &process_math_in_latex(
  		        "indisplay" , '', '', $doimage.$_ ):'');
-@@ -1645,7 +1635,7 @@ sub do_env_eqnarray {
+@@ -1645,7 +1635,7 @@
  
  	    # left column, set using \displaystyle
  	    $thismath = shift(@cols); $failed = 0;
@@ -651,7 +609,7 @@ Index: latex2html-2008/versions/html4_0.pl
  	    if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , '', '', $doimage.$thismath ):'');
-@@ -1665,7 +1655,7 @@ sub do_env_eqnarray {
+@@ -1665,7 +1655,7 @@
  
  	    # center column, set using \textstyle
  	    $thismath = shift(@cols); $failed = 0;
@@ -660,7 +618,7 @@ Index: latex2html-2008/versions/html4_0.pl
  	    if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , 'text', '', $doimage.$thismath ):'');
-@@ -1685,7 +1675,7 @@ sub do_env_eqnarray {
+@@ -1685,7 +1675,7 @@
  
  	    # right column, set using \displaystyle
  	    $thismath = shift(@cols); $failed = 0;
@@ -669,11 +627,11 @@ Index: latex2html-2008/versions/html4_0.pl
  	    if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , '', '', $doimage.$thismath ):'');
-Index: latex2html-2008/IndicTeX-HTML/itrans.perl
+Index: IndicTeX-HTML/itrans.perl
 ===================================================================
---- latex2html-2008.orig/IndicTeX-HTML/itrans.perl
-+++ latex2html-2008/IndicTeX-HTML/itrans.perl
-@@ -406,13 +406,13 @@ sub do_env_pre_itrans {
+--- IndicTeX-HTML/itrans.perl.orig	2013-11-25 13:09:05.071060540 +0100
++++ IndicTeX-HTML/itrans.perl	2013-11-25 13:09:05.117061091 +0100
+@@ -406,13 +406,13 @@
  	    } else {
  		if ($this_par =~ /^\\/) {
  		    #catch 'paragraphs' that are just TeX macros
@@ -691,11 +649,11 @@ Index: latex2html-2008/IndicTeX-HTML/itrans.perl
  		}
  		if ($saved_par) {
  		    #include any saved macros
-Index: latex2html-2008/styles/html.perl
+Index: styles/html.perl
 ===================================================================
---- latex2html-2008.orig/styles/html.perl
-+++ latex2html-2008/styles/html.perl
-@@ -236,7 +236,7 @@ sub do_cmd_htmladdnormallink{
+--- styles/html.perl.orig	2013-11-25 13:09:05.078060623 +0100
++++ styles/html.perl	2013-11-25 13:09:05.118061103 +0100
+@@ -236,7 +236,7 @@
      $url = &missing_braces unless
  	((s/$next_pair_pr_rx/$url = $2; ''/eo)
  	||(s/$next_pair_rx/$url = $2; ''/eo));
@@ -704,11 +662,11 @@ Index: latex2html-2008/styles/html.perl
      if ($name) { $href = &make_named_href($name,$url,$text) }
      else { $href = &make_href($url,$text) }
      print "\nHREF:$href" if ($VERBOSITY > 3);
-Index: latex2html-2008/styles/more_amsmath.perl
+Index: styles/more_amsmath.perl
 ===================================================================
---- latex2html-2008.orig/styles/more_amsmath.perl
-+++ latex2html-2008/styles/more_amsmath.perl
-@@ -94,7 +94,6 @@ sub get_eqn_number {
+--- styles/more_amsmath.perl.orig	2002-11-29 12:49:18.000000000 +0100
++++ styles/more_amsmath.perl	2013-11-25 13:09:05.118061103 +0100
+@@ -94,7 +94,6 @@
  		, $EQNO_END);
  	}
      } else { $tag = ';SPMnbsp;;SPMnbsp;;SPMnbsp;' }
@@ -716,7 +674,7 @@ Index: latex2html-2008/styles/more_amsmath.perl
      if ($labels) {
  	$labels =~ s/$anchor_mark/$tag/o;
  	($labels , $scan);
-@@ -285,7 +284,7 @@ sub process_env_equation {
+@@ -285,7 +284,7 @@
  	    } else { $return .= join('', $mspace , $ecell, $erow); } 
  	} else {
  	    $thismath = $_;
@@ -725,7 +683,7 @@ Index: latex2html-2008/styles/more_amsmath.perl
  	    if (($doimage)||($failed)) {
  	        $thismath = &process_math_in_latex("indisplay",'',''
  		    , $doimage.$thismath ) unless ($thismath eq '' );
-@@ -430,7 +429,7 @@ sub process_env_multline {
+@@ -430,7 +429,7 @@
  
  	    # columns to be set using \displaystyle
  	    $thismath = $_; 
@@ -734,7 +692,7 @@ Index: latex2html-2008/styles/more_amsmath.perl
  	    if (($doimage)||($failed)) {
  	        $thismath = &process_math_in_latex("indisplay",'',''
  		    , $doimage.$thismath ) unless ($thismath eq '' );
-@@ -767,7 +766,7 @@ sub process_env_align{
+@@ -767,7 +766,7 @@
  		# alternating right/left aligned
  		$scell =  (($scell eq $slcell)? $srcell : $slcell) if ($col_cnt);
  		$thismath = $_; $col_cnt++;
@@ -743,7 +701,7 @@ Index: latex2html-2008/styles/more_amsmath.perl
  		if (($doimage)||($failed)) {
  		    $thismath = &process_math_in_latex("indisplay",'',''
  	 		, $doimage.$thismath ) unless ($thismath eq '' );
-@@ -923,7 +922,7 @@ sub do_env_split {
+@@ -923,7 +922,7 @@
  	    @cols = split(/$mdlim/o);
  	    # left column, set using \displaystyle
  	    $thismath = shift(@cols); 
@@ -752,7 +710,7 @@ Index: latex2html-2008/styles/more_amsmath.perl
  	    if (($doimage)||($failed)) {
  	        $thismath = &process_math_in_latex("indisplay",'',''
  		    , $doimage.$thismath ) unless ($thismath eq '' );
-@@ -940,7 +939,7 @@ sub do_env_split {
+@@ -940,7 +939,7 @@
  
  	    # right column, set using \displaystyle
  	    $thismath = shift(@cols);
@@ -761,11 +719,11 @@ Index: latex2html-2008/styles/more_amsmath.perl
  	    if (($doimage)||($failed)) {
  		$thismath = &process_math_in_latex("indisplay",'',''
  		    , $doimage.$thismath ) unless ($thismath eq '' );
-Index: latex2html-2008/styles/changebar.perl
+Index: styles/changebar.perl
 ===================================================================
---- latex2html-2008.orig/styles/changebar.perl
-+++ latex2html-2008/styles/changebar.perl
-@@ -126,11 +126,11 @@ sub do_env_changebar {
+--- styles/changebar.perl.orig	2002-11-29 12:49:17.000000000 +0100
++++ styles/changebar.perl	2013-11-25 13:09:05.118061103 +0100
+@@ -126,11 +126,11 @@
      $_ = &translate_environments($_);
  
      # multiple ends of change-bars have icons on the same line.
@@ -781,11 +739,11 @@ Index: latex2html-2008/styles/changebar.perl
  
  
      if ($this_version) {
-Index: latex2html-2008/styles/alltt.perl
+Index: styles/alltt.perl
 ===================================================================
---- latex2html-2008.orig/styles/alltt.perl
-+++ latex2html-2008/styles/alltt.perl
-@@ -50,15 +50,15 @@ sub preprocess_alltt {
+--- styles/alltt.perl.orig	2002-11-29 12:49:17.000000000 +0100
++++ styles/alltt.perl	2013-11-25 13:09:05.118061103 +0100
+@@ -50,15 +50,15 @@
      local ($before, $after, $alltt, $alltt_env);
      local ($alltt_begin) = "<alltt_begin>";
      local ($alltt_end) = "<alltt_end>";
@@ -804,7 +762,7 @@ Index: latex2html-2008/styles/alltt.perl
  	    $alltt = &alltt_helper($alltt)	 # shield special chars
  		unless ($lastline =~ /(^|[^\\])(\\\\)*%.*$/m);  # unless commented out
  	    undef @check; undef $lastline;
-@@ -67,8 +67,8 @@ sub preprocess_alltt {
+@@ -67,8 +67,8 @@
  		, $alltt, $alltt_end, "{$alltt_env}", $after);
      }
      $/ = $saveRS;
@@ -815,11 +773,11 @@ Index: latex2html-2008/styles/alltt.perl
  }
  
  sub alltt_helper {
-Index: latex2html-2008/styles/amstex.perl
+Index: styles/amstex.perl
 ===================================================================
---- latex2html-2008.orig/styles/amstex.perl
-+++ latex2html-2008/styles/amstex.perl
-@@ -404,7 +404,6 @@ sub get_eqn_number {
+--- styles/amstex.perl.orig	2002-11-29 12:49:17.000000000 +0100
++++ styles/amstex.perl	2013-11-25 13:09:05.118061103 +0100
+@@ -404,7 +404,6 @@
  		, $EQNO_END);
  	}
      } else { $tag = ';SPMnbsp;' }
@@ -827,11 +785,11 @@ Index: latex2html-2008/styles/amstex.perl
      if ($labels) {
  	$labels =~ s/$anchor_mark/$tag/o;
  	($labels , $scan);
-Index: latex2html-2008/styles/makeidx.perl
+Index: styles/makeidx.perl
 ===================================================================
---- latex2html-2008.orig/styles/makeidx.perl
-+++ latex2html-2008/styles/makeidx.perl
-@@ -189,7 +189,7 @@ sub named_index_entry {
+--- styles/makeidx.perl.orig	2002-11-29 12:49:18.000000000 +0100
++++ styles/makeidx.perl	2013-11-25 13:09:05.118061103 +0100
+@@ -189,7 +189,7 @@
      # ! -> \001
      # @ -> \002
      # | -> \003
@@ -840,11 +798,11 @@ Index: latex2html-2008/styles/makeidx.perl
      # protect \001 occurring with images
      $str =~ s/\001/\016/g;
  
-Index: latex2html-2008/styles/webtex.perl
+Index: styles/webtex.perl
 ===================================================================
---- latex2html-2008.orig/styles/webtex.perl
-+++ latex2html-2008/styles/webtex.perl
-@@ -121,29 +121,29 @@ sub convert_to_webtex {
+--- styles/webtex.perl.orig	2013-11-25 13:09:05.078060623 +0100
++++ styles/webtex.perl	2013-11-25 13:09:05.118061103 +0100
+@@ -121,29 +121,29 @@
      if($WEBEQ_IMG_ONLY) { return (1,$no_applet) };
  
      local($savedRS, $failed, $env_id, $_) = ($/,'','',$orig);
@@ -881,7 +839,7 @@ Index: latex2html-2008/styles/webtex.perl
      return (0,$no_applet) if $failed;
  
      ($failed,$_) = &check_only_webtex($_);
-@@ -325,7 +325,7 @@ sub cleanup_mml_attribs {
+@@ -325,7 +325,7 @@
      local($mml_code) = join('',<MML>);
      close MML;
  
@@ -890,11 +848,11 @@ Index: latex2html-2008/styles/webtex.perl
      $mml_code =~ s/^\s*<P><CENTER>\n?//s;
      $mml_code =~ s/\s*<applet code="[^"]*" width=(\d+) height=(\d+) align=(\w+)>\s*/
  	$width=$1;$height=$2;$align=$3;''/e;
-Index: latex2html-2008/styles/amsmath.perl
+Index: styles/amsmath.perl
 ===================================================================
---- latex2html-2008.orig/styles/amsmath.perl
-+++ latex2html-2008/styles/amsmath.perl
-@@ -458,7 +458,6 @@ sub get_eqn_number {
+--- styles/amsmath.perl.orig	2004-01-01 07:15:00.000000000 +0100
++++ styles/amsmath.perl	2013-11-25 13:09:05.118061103 +0100
+@@ -458,7 +458,6 @@
  		, $EQNO_END);
  	}
      } else { $tag = ';SPMnbsp;' }
@@ -902,11 +860,11 @@ Index: latex2html-2008/styles/amsmath.perl
      if ($labels) {
  	$labels =~ s/$anchor_mark/$tag/o;
  	($labels , $scan);
-Index: latex2html-2008/versions/math.pl
+Index: versions/math.pl
 ===================================================================
---- latex2html-2008.orig/versions/math.pl
-+++ latex2html-2008/versions/math.pl
-@@ -87,7 +87,7 @@ sub do_env_tex2html_wrap {
+--- versions/math.pl.orig	2004-01-01 07:15:01.000000000 +0100
++++ versions/math.pl	2013-11-25 13:09:05.119061115 +0100
+@@ -87,7 +87,7 @@
      local($attribs, $border);
      if (s/$htmlborder_rx//o) { $attribs = $2; $border = (($4)? "$4" : 1) }
      elsif (s/$htmlborder_pr_rx//o) { $attribs = $2; $border = (($4)? "$4" : 1) }
@@ -915,7 +873,7 @@ Index: latex2html-2008/versions/math.pl
      local($saved) = $_;
  #   if (s/^\\\(|^\$|^\\math|\\\)$|\$$|\\endmath//g) {}
      if (s/^$math_start_rx|${math_end_rx}$//g) {}
-@@ -174,23 +174,21 @@ sub do_env_equation {
+@@ -174,23 +174,21 @@
      local($seqno) = join('',"\n<TD$eqno_class WIDTH=10 ALIGN=\""
                           , (($EQN_TAGS =~ /L/)? 'LEFT': 'RIGHT')
  		         , "\">\n");
@@ -942,7 +900,7 @@ Index: latex2html-2008/versions/math.pl
  
      local($halign) = " ALIGN=\"CENTER\"" unless $FLUSH_EQN;
      if ($EQN_TAGS =~ /L/) {
-@@ -398,9 +396,9 @@ sub make_math {
+@@ -398,9 +396,9 @@
  
      # remove white space at the extremities
  #   do{ $*=1; s/(^\s+|\s+$)//; $*=0; } unless ($NO_SIMPLE_MATH);
@@ -954,7 +912,7 @@ Index: latex2html-2008/versions/math.pl
  
      $_;
  }
-@@ -1029,7 +1027,7 @@ sub do_env_eqnarray {
+@@ -1029,7 +1027,7 @@
  
  	    if (s/\\lefteqn//) {
  		$return .= "\"LEFT\" COLSPAN=\"3\">";
@@ -963,7 +921,7 @@ Index: latex2html-2008/versions/math.pl
  		if (($doimage)||($failed)) {
  		    $_ = (($_)? &process_math_in_latex(
  			"indisplay" , '', '', $doimage.$_ ):'');
-@@ -1048,7 +1046,7 @@ sub do_env_eqnarray {
+@@ -1048,7 +1046,7 @@
  
  	    # left column, set using \displaystyle
  	    $thismath = shift(@cols); 
@@ -972,7 +930,7 @@ Index: latex2html-2008/versions/math.pl
  	    if (($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , '', '', $doimage.$thismath ):'');
-@@ -1064,7 +1062,7 @@ sub do_env_eqnarray {
+@@ -1064,7 +1062,7 @@
  	    # center column, set using \textstyle
  	    $thismath = shift(@cols);
  	    if (!($#cols < 0)) {
@@ -981,7 +939,7 @@ Index: latex2html-2008/versions/math.pl
  		if (($doimage)||($failed)) {
  		    $thismath = (($thismath ne '')? &process_math_in_latex(
  			"indisplay" , 'text', '', $doimage.$thismath ):'');
-@@ -1084,7 +1082,7 @@ sub do_env_eqnarray {
+@@ -1084,7 +1082,7 @@
  		&write_warnings($eqnarray_warning);
  		print "\n\n *** $eqnarray_warning \n";
  	    }
@@ -990,7 +948,7 @@ Index: latex2html-2008/versions/math.pl
  	    if (($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , '', '', $doimage.$thismath ):'');
-@@ -1447,7 +1445,7 @@ sub translate_math_commands {
+@@ -1447,7 +1445,7 @@
      	}
  
  	($pre_text,$labels) = &extract_labels($pre_text);
@@ -999,7 +957,7 @@ Index: latex2html-2008/versions/math.pl
  #	if ($pre_text =~ m/^((.|\n)*)\\begin\s*(($O|$OP)\d+($C|$CP))$ams_aligned_envs_rx\3/m) {
  	if ($pre_text =~ m/^()\\begin\s*(($O|$OP)\d+($C|$CP))$ams_aligned_envs_rx\3/m) {
  	    local($env,$star,$orig,$cnt) = ($7,$8,$pre_text.$_,1);
-@@ -1456,7 +1454,7 @@ sub translate_math_commands {
+@@ -1456,7 +1454,7 @@
  #	    local($savedRS) = $/; $/ = ''; $*=1;
  	    while ( $cnt && $found ) {
  		$found = '';
@@ -1008,7 +966,7 @@ Index: latex2html-2008/versions/math.pl
  		    { $pre_text .= $`; $found = $1;
  		      $this_env = $&; $post_pre_text = $'; }
  		if ($found =~ /begin/) {
-@@ -1465,7 +1463,7 @@ sub translate_math_commands {
+@@ -1465,7 +1463,7 @@
  		    $cnt--; $pre_text .= $this_env if ($cnt > 0) ;
  		}
  	    }
@@ -1017,7 +975,7 @@ Index: latex2html-2008/versions/math.pl
  	    $env .= 'star' if $star;
  	    local($env_cmd) = 'do_env_'.$env;
  	    # parse it further, when possible...
-@@ -1504,7 +1502,7 @@ sub translate_math_commands {
+@@ -1504,7 +1502,7 @@
  	    $pre_text = &process_math_in_latex($mode,$style,$slevel,$pre_text)
  		if ($pre_text);
  	}
@@ -1026,7 +984,7 @@ Index: latex2html-2008/versions/math.pl
  	return($labels . $pre_text) unless ($_);
  
  	print "\nMore math:\n$_" if ($VERBOSITY > 4);
-@@ -1572,7 +1570,7 @@ sub make_math_comment{
+@@ -1572,7 +1570,7 @@
  	$ecomm = "\n\\end{$env}";
      } unless ($env =~/tex2html/);
      $_ = &revert_to_raw_tex;
@@ -1035,7 +993,7 @@ Index: latex2html-2008/versions/math.pl
      $_ = $scomm . $_ . $ecomm;
      return() if (length($_) < 12);
      $global{'verbatim_counter'}++;
-@@ -1715,20 +1713,18 @@ sub parse_math_toks {
+@@ -1715,20 +1713,18 @@
  	        local ($saved) = $_;
  	        $_ = $';
  	        # find the \end, including nested environments of same type.
@@ -1059,7 +1017,7 @@ Index: latex2html-2008/versions/math.pl
  
  #		$this =~ s/\\cr(cr)?(\b|$|\d|\\|\W)/\\\\$2/g;
  	        local($env_cmd) = "do_env_$env".(($star)? "star" : '');
-@@ -1746,11 +1742,9 @@ sub parse_math_toks {
+@@ -1746,11 +1742,9 @@
  			$this .= $extra;
  			$this = &process_math_in_latex($mode,$style,$slevel,$this);
  		    } else { 
@@ -1074,7 +1032,7 @@ Index: latex2html-2008/versions/math.pl
  			do {
  			    local($in_array) = 1;
  			    local($_) = $this;
-@@ -2498,9 +2492,7 @@ sub get_supsub {
+@@ -2498,9 +2492,7 @@
  	} elsif ($5) {
  	    $supsub .= $1; $which .= (($5 =~ /b/) ? '_' : '^');
  	    local($multisub_type) = $5;
@@ -1085,11 +1043,11 @@ Index: latex2html-2008/versions/math.pl
  	} else { $supsub .= "\{^\\prime\}" }
      }
      # include dummy sup/sub-scripts to enhance the vertical spacing
-Index: latex2html-2008/versions/html3_1.pl
+Index: versions/html3_1.pl
 ===================================================================
---- latex2html-2008.orig/versions/html3_1.pl
-+++ latex2html-2008/versions/html3_1.pl
-@@ -78,7 +78,7 @@ sub do_env_tex2html_wrap {
+--- versions/html3_1.pl.orig	2002-11-29 12:49:19.000000000 +0100
++++ versions/html3_1.pl	2013-11-25 13:09:05.119061115 +0100
+@@ -78,7 +78,7 @@
      local($attribs, $border);
      if (s/$htmlborder_rx//o) { $attribs = $2; $border = (($4)? "$4" : 1) }
      elsif (s/$htmlborder_pr_rx//o) { $attribs = $2; $border = (($4)? "$4" : 1) }
@@ -1098,7 +1056,7 @@ Index: latex2html-2008/versions/html3_1.pl
      local($saved) = $_;
  #   if (s/^\\\(|^\$|^\\math|\\\)$|\$$|\\endmath//g) {}
      if (s/^$math_start_rx|${math_end_rx}$//g) {}
-@@ -161,23 +161,21 @@ sub do_env_equation {
+@@ -161,23 +161,21 @@
      local($seqno) = join('',"\n<TD$eqno_class WIDTH=10 ALIGN=\""
                           , (($EQN_TAGS =~ /L/)? 'LEFT': 'RIGHT')
  		         , "\">\n");
@@ -1125,7 +1083,7 @@ Index: latex2html-2008/versions/html3_1.pl
  
      local($halign) = " ALIGN=\"CENTER\"" unless $FLUSH_EQN;
      if ($EQN_TAGS =~ /L/) {
-@@ -353,7 +351,7 @@ sub make_math {
+@@ -353,7 +351,7 @@
  
      # remove white space at the extremities
  #   do{ $*=1; s/(^\s+|\s+$)//; $*=0; } unless ($NO_SIMPLE_MATH);
@@ -1134,7 +1092,7 @@ Index: latex2html-2008/versions/html3_1.pl
  
      $_;
  }
-@@ -970,7 +968,7 @@ sub do_env_eqnarray {
+@@ -970,7 +968,7 @@
  
  	    if (s/\\lefteqn//) {
  		$return .= "\"LEFT\" COLSPAN=\"3\">";
@@ -1143,7 +1101,7 @@ Index: latex2html-2008/versions/html3_1.pl
  		if (($doimage)||($failed)) {
  		    $_ = (($_)? &process_math_in_latex(
  			"indisplay" , '', '', $doimage.$_ ):'');
-@@ -989,7 +987,7 @@ sub do_env_eqnarray {
+@@ -989,7 +987,7 @@
  
  	    # left column, set using \displaystyle
  	    $thismath = shift(@cols); 
@@ -1152,7 +1110,7 @@ Index: latex2html-2008/versions/html3_1.pl
  	    if (($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , '', '', $doimage.$thismath ):'');
-@@ -1006,7 +1004,7 @@ sub do_env_eqnarray {
+@@ -1006,7 +1004,7 @@
  	    $thismath = shift(@cols);
  	    if (!($#cols < 0)) {
  #print "\nEQNARRAY:$#cols : $thismath";
@@ -1161,7 +1119,7 @@ Index: latex2html-2008/versions/html3_1.pl
  		if (($doimage)||($failed)) {
  		    $thismath = (($thismath ne '')? &process_math_in_latex(
  			"indisplay" , 'text', '', $doimage.$thismath ):'');
-@@ -1026,7 +1024,7 @@ sub do_env_eqnarray {
+@@ -1026,7 +1024,7 @@
  		&write_warnings($eqnarray_warning);
  		print "\n\n *** $eqnarray_warning \n";
  	    }
@@ -1170,7 +1128,7 @@ Index: latex2html-2008/versions/html3_1.pl
  	    if (($doimage)||($failed)) {
  		$thismath = (($thismath ne '')? &process_math_in_latex(
  		    "indisplay" , '', '', $doimage.$thismath ):'');
-@@ -1385,7 +1383,7 @@ sub translate_math_commands {
+@@ -1385,7 +1383,7 @@
      	}
  
  	($pre_text,$labels) = &extract_labels($pre_text);
@@ -1179,7 +1137,7 @@ Index: latex2html-2008/versions/html3_1.pl
  #	if ($pre_text =~ m/^((.|\n)*)\\begin\s*(($O|$OP)\d+($C|$CP))$ams_aligned_envs_rx\3/m) {
  	if ($pre_text =~ m/^()\\begin\s*(($O|$OP)\d+($C|$CP))$ams_aligned_envs_rx\3/m) {
  	    local($env,$star,$orig,$cnt) = ($7,$8,$pre_text.$_,1);
-@@ -1394,7 +1392,7 @@ sub translate_math_commands {
+@@ -1394,7 +1392,7 @@
  #	    local($savedRS) = $/; $/ = ''; $*=1;
  	    while ( $cnt && $found ) {
  		$found = '';
@@ -1188,7 +1146,7 @@ Index: latex2html-2008/versions/html3_1.pl
  		    { $pre_text .= $`; $found = $1;
  		      $this_env = $&; $post_pre_text = $'; }
  		if ($found =~ /begin/) {
-@@ -1403,7 +1401,7 @@ sub translate_math_commands {
+@@ -1403,7 +1401,7 @@
  		    $cnt--; $pre_text .= $this_env if ($cnt > 0) ;
  		}
  	    }
@@ -1197,7 +1155,7 @@ Index: latex2html-2008/versions/html3_1.pl
  	    $env .= 'star' if $star;
  	    local($env_cmd) = 'do_env_'.$env;
  	    # parse it further, when possible...
-@@ -1430,7 +1428,7 @@ sub translate_math_commands {
+@@ -1430,7 +1428,7 @@
  	    $pre_text = &process_math_in_latex($mode,$style,$slevel,$pre_text)
  		if ($pre_text);
  	}
@@ -1206,7 +1164,7 @@ Index: latex2html-2008/versions/html3_1.pl
  	return($labels . $pre_text) unless ($_);
  
  	local($post_text, $this_text, $which_text);
-@@ -1494,7 +1492,7 @@ sub make_math_comment{
+@@ -1494,7 +1492,7 @@
  	$ecomm = "\n\\end{$env}";
      } unless ($env =~/tex2html/);
      $_ = &revert_to_raw_tex;
@@ -1215,7 +1173,7 @@ Index: latex2html-2008/versions/html3_1.pl
      $_ = $scomm . $_ . $ecomm;
      return() if (length($_) < 12);
      $global{'verbatim_counter'}++;
-@@ -1637,20 +1635,18 @@ sub parse_math_toks {
+@@ -1637,20 +1635,18 @@
  	        local ($saved) = $_;
  	        $_ = $';
  	        # find the \end, including nested environments of same type.
@@ -1239,7 +1197,7 @@ Index: latex2html-2008/versions/html3_1.pl
  
  #		$this =~ s/\\cr(cr)?(\b|$|\d|\\|\W)/\\\\$2/g;
  	        local($env_cmd) = "do_env_$env".(($star)? "star" : '');
-@@ -1668,11 +1664,9 @@ sub parse_math_toks {
+@@ -1668,11 +1664,9 @@
  			$this .= $extra;
  			$this = &process_math_in_latex($mode,$style,$slevel,$this);
  		    } else { 
@@ -1254,7 +1212,7 @@ Index: latex2html-2008/versions/html3_1.pl
  			do {
  			    local($in_array) = 1;
  			    local($_) = $this;
-@@ -2376,9 +2370,7 @@ sub get_supsub {
+@@ -2376,9 +2370,7 @@
  	} elsif ($5) {
  	    $supsub .= $1; $which .= (($5 =~ /b/) ? '_' : '^');
  	    local($multisub_type) = $5;
@@ -1265,11 +1223,11 @@ Index: latex2html-2008/versions/html3_1.pl
  	} else { $supsub .= "\{^\\prime\}" }
      }
      # include dummy sup/sub-scripts to enhance the vertical spacing
-Index: latex2html-2008/cweb2html/makemake.pl
+Index: cweb2html/makemake.pl
 ===================================================================
---- latex2html-2008.orig/cweb2html/makemake.pl
-+++ latex2html-2008/cweb2html/makemake.pl
-@@ -37,12 +37,11 @@ sub main {
+--- cweb2html/makemake.pl.orig	2013-11-25 13:09:05.098060863 +0100
++++ cweb2html/makemake.pl	2013-11-25 13:09:05.119061115 +0100
+@@ -37,12 +37,11 @@
      $_ = delete $string{'STRING'}; # Blow it away and return the result
      close IN;
  
@@ -1285,7 +1243,7 @@ Index: latex2html-2008/cweb2html/makemake.pl
      shift(@files) unless $files[0];
  
      &rip("no files found in $FILES macro")
-@@ -51,22 +50,22 @@ sub main {
+@@ -51,22 +50,22 @@
  
      # get template (one allowed currently)
      &rip("no template found in $source")
@@ -1313,11 +1271,11 @@ Index: latex2html-2008/cweb2html/makemake.pl
  	    print OUT $_,"\n\n";
  	}
      }
-Index: latex2html-2008/foilhtml/foilhtml.dtx
+Index: foilhtml/foilhtml.dtx
 ===================================================================
---- latex2html-2008.orig/foilhtml/foilhtml.dtx
-+++ latex2html-2008/foilhtml/foilhtml.dtx
-@@ -695,9 +695,7 @@ sub make_latex{
+--- foilhtml/foilhtml.dtx.orig	2002-11-29 12:49:12.000000000 +0100
++++ foilhtml/foilhtml.dtx	2013-11-25 13:09:05.119061115 +0100
+@@ -695,9 +695,7 @@
      $preamble = "\\documentclass\{article\}%\n\\usepackage{html,color}%\n\\makeatletter"
  	unless ($preamble);
      if (($LATEX_DUMP)&&(!($preamble =~ /\\usepackage\{ldump\}/))) {
diff --git a/latex2html-2008-perl-bindir.diff b/latex2html-2012-perl-bindir.diff
similarity index 100%
rename from latex2html-2008-perl-bindir.diff
rename to latex2html-2012-perl-bindir.diff
diff --git a/latex2html-2012-share-dir.diff b/latex2html-2012-share-dir.diff
new file mode 100644
index 0000000..25a2154
--- /dev/null
+++ b/latex2html-2012-share-dir.diff
@@ -0,0 +1,14 @@
+Index: config/config.pl
+===================================================================
+--- config/config.pl.orig
++++ config/config.pl
+@@ -1918,7 +1918,7 @@ else {
+     $newcfg{'SHLIBDIR'} = $newcfg{'PREFIX'};
+   }
+   else {
+-    $newcfg{'SHLIBDIR'} = "$newcfg{'PREFIX'}${dd}share${dd}lib${dd}latex2html";
++    $newcfg{'SHLIBDIR'} = "$newcfg{'PREFIX'}${dd}share${dd}latex2html";
+   }
+ }
+ add_drive_letter($newcfg{'SHLIBDIR'});
+
diff --git a/latex2html-2012.tgz b/latex2html-2012.tgz
new file mode 100644
index 0000000..1768ade
--- /dev/null
+++ b/latex2html-2012.tgz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36b4b633507dba19a356d4ec5c6c145b242406b2b47cbe44aabf5e7efa2aa16f
+size 1155856
diff --git a/latex2html-README.SuSE b/latex2html-README.SUSE
similarity index 100%
rename from latex2html-README.SuSE
rename to latex2html-README.SUSE
diff --git a/latex2html-fix-defined.patch b/latex2html-fix-defined.patch
deleted file mode 100644
index a3d5107..0000000
--- a/latex2html-fix-defined.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Fix perl warning about deprecated "defined(%hash)"
- latex2html with current perl gives warnings about the deprecation of
- "defined(%hash)". This patches removes them by just removing the resp.
- keyword.
-Author: Roland Stigge <stigge@antcom.de>
-
-Index: latex2html-2008-debian1/latex2html.pin
-===================================================================
---- latex2html-2008-debian1.orig/latex2html.pin	2010-07-31 16:13:21.000000000 +0200
-+++ latex2html-2008-debian1/latex2html.pin	2012-04-09 17:21:52.000000000 +0200
-@@ -532,7 +532,7 @@
- #
- # If possible, use icons of the same type as generated images
- #
--if ($IMAGE_TYPE && defined %{"icons_$IMAGE_TYPE"}) {
-+if ($IMAGE_TYPE && %{"icons_$IMAGE_TYPE"}) {
-     %icons = %{"icons_$IMAGE_TYPE"};
- }
- 
-@@ -2112,7 +2112,7 @@
- 		"\nCould not find translation function for $default_language.\n\n")
- 	    }
- 	);
--	if ($USE_UTF ||(!$NO_UTF &&(defined %unicode_table)&&length(%unicode_table)>2)) {
-+	if ($USE_UTF ||(!$NO_UTF &&(%unicode_table)&&length(%unicode_table)>2)) {
- 	    &convert_to_unicode($_)};
-     }
-     $_ = join('', @case_processed, $_); undef(@case_processed);
-@@ -9117,7 +9117,7 @@
-     my ($charset) = "${CHARSET}_character_map_inv";
-     $charset =~ s/-/_/g;
-     # convert upper 8-bit characters
--    if (defined %$charset &&($CHARSET =~ /8859[_\-]1$/)) {
-+    if (%$charset &&($CHARSET =~ /8859[_\-]1$/)) {
- 	s/([\200-\377])/
- 	    $tmp = $$charset{'&#'.ord($1).';'};
- 	    &mark_string($tmp) if ($tmp =~ m!\{!);
diff --git a/latex2html-manual.ps.gz b/latex2html-manual.ps.gz
deleted file mode 100644
index 37448aa..0000000
--- a/latex2html-manual.ps.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:00e6b3ab0f0d3e1b519047a1fb08ae035355b80d9deaa766fb652bee7ca62f6d
-size 423013
diff --git a/latex2html.1 b/latex2html.1
new file mode 100644
index 0000000..46ab672
--- /dev/null
+++ b/latex2html.1
@@ -0,0 +1,114 @@
+.00;                       # finish .ig
+
+'di           \" finish diversion--previous line must be blank
+.nr nl 0-1    \" fake up transition to first page again
+.nr % 0         \" start at page 1
+'; __END__ ##### From here on it's a standard manual page - VERSION #####
+.TH LaTeX2HTML 1
+.AT 3
+.SH NAME
+latex2html \- translate LaTeX files to HTML (HyperText Markup Language)
+.SH SYNOPSIS
+.B
+
+latex2html
+   [-address author-address]
+   [-antialias]
+   [-antialias_text]
+   [-ascii_mode]
+   [-auto_navigation]
+   [-auto_prefix]
+   [-biblio URL]
+   [-bottom_navigation]
+   [-contents URL]
+   [-contents_in_navigation]
+   [-custom_titles]
+   [-debug]
+   [-dir output-directory]
+   [-discard]
+   [-down_title string]
+   [-down_url URL]
+   [-external_file filename]
+   [-external_images]
+   [-font_size size]
+   [-h(elp)]
+   [-html_version (2.0|3.0|3.2)[,(math|i18n|table)]*]
+   [-images_only]
+   [-index URL]
+   [-index_in_navigation]
+   [-info string]
+   [-init_file file]
+   [-iso_language type]
+   [-ldump]
+   [-link num]
+   [-local_icons]
+   [-long_titles num]
+   [-next_page_in_navigation]
+   [-no_antialias]
+   [-no_antialias_text]
+   [-no_auto_link]
+   [-no_footnode]
+   [-no_fork]
+   [-no_images]
+   [-no_math]
+   [-no_navigation]
+   [-no_reuse]
+   [-no_subdir]
+   [-no_tex_defs]
+   [-no_white]
+   [-nolatex]
+   [-numbered_footnotes]
+   [-prefix filename-prefix]
+   [-prev_title string]
+   [-prev_url URL]
+   [-previous_page_in_navigation]
+   [-ps_images]
+   [-reuse reuse_option]
+   [-scalable_fonts]
+   [-short_extn]
+   [-short_index]
+   [-show_section_numbers]
+   [-split + num]
+   [-split num]
+   [-t top-page-title]
+   [-tmp path]
+   [-toc_depth num]
+   [-toc_stars]
+   [-top_navigation]
+   [-unsegment]
+   [-up_title string]
+   [-up_url URL]
+   [-v]
+   [-verbosity num]
+   [-white]
+   file(s)
+
+
+.SH DESCRIPTION
+.I LaTeX2HTML
+is a Perl program that translates LaTeX source files into HTML. For each source
+file given as an argument the translator will create a directory containing the
+corresponding HTML files.
+See the WWW online documentation or the /usr/share/doc/packages/latex2html/manual.ps.gz
+file for more detailed information and examples.
+
+.SH PROBLEMS
+For information on various problems and remedies see the WWW online documentation
+or the documents available in the distribution.
+A mailing list for technical discussion about latex2html, bugs and enhancements is available at
+latex2html@tug.org
+
+.SH SUSE installation
+
+In /usr/share/doc/packages/latex2html you may find more information about this package.
+
+.SH AUTHOR
+Nikos Drakos,  Computer Based Learning Unit, University of Leeds
+<nikos@cbl.leeds.ac.uk>. Several people have contributed suggestions,
+ideas, solutions, support and
+encouragement.
+
+The pstogif script uses the pstoppm.ps
+postscript program originally written by Phillip Conrad (Perfect Byte, Inc.)
+and modified by L.  Peter Deutsch (Aladdin Enterprises).
+
diff --git a/latex2html.changes b/latex2html.changes
index b6dc59d..b122d82 100644
--- a/latex2html.changes
+++ b/latex2html.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Nov 25 14:59:53 UTC 2013 - pgajdos@suse.com
+
+- updated to version 2012:
+  * fix warnings in perl 5.14
+  * build fixes
+- latex2html-2008.diff was split to share-dir.patch, local.pm 
+  (source) and latex2html.1 (source)
+- buildroot.diff was renamed to dest-dir.diff and that was extended
+  to install icons properly
+- fix-defined.patch was removed (upstreamed)
+- manual.ps.gz was removed
+
 -------------------------------------------------------------------
 Tue Sep 10 12:08:06 UTC 2013 - werner@suse.de
 
diff --git a/latex2html.spec b/latex2html.spec
index ffd7db7..68a4a22 100644
--- a/latex2html.spec
+++ b/latex2html.spec
@@ -21,40 +21,39 @@ BuildRequires:  fdupes
 BuildRequires:  ghostscript-fonts-std
 BuildRequires:  ghostscript-x11
 BuildRequires:  netpbm
+BuildRequires:  texlive-dvips
 BuildRequires:  texlive-kpathsea
 BuildRequires:  texlive-latex
 BuildRequires:  xorg-x11
 BuildRequires:  xorg-x11-devel
 %{expand: %%global _texmfmaindir %(kpsewhich -expand-var='$TEXMFMAIN')}
 %define share_dir /usr/share/latex2html
-Obsoletes:      l2h
-Provides:       l2h
 Url:            http://www.latex2html.org/
-Provides:       l2h99_1
 Requires:       ghostscript_any
 Requires:       latex2html-pngicons
 Requires:       netpbm
 Requires:       perl
+Requires:       texlive-dvips
 Requires:       texlive-latex
-Version:        2008
+Version:        2012
 Release:        0
-Summary:        LaTeX2HTML Converter
+Summary:        LaTeX to HTML Converter
 License:        GPL-2.0+
 Group:          Productivity/Publishing/TeX/Utilities
 BuildArch:      noarch
-Source:         http://www.latex2html.org/~latex2ht/current/%{name}-%{version}.tar.gz
-Source1:        latex2html-manual.ps.gz
-Source2:        latex2html-manual.tar.bz2
-Source3:        latex2html-README.SuSE
-Source4:        testfile.tex
-Patch:          latex2html-%{version}.diff
-Patch1:         latex2html-%{version}-binmode.diff
-Patch2:         latex2html-%{version}-gsout.diff
-Patch3:         latex2html-%{version}-buildroot.diff
-Patch4:         latex2html-%{version}-perl-bindir.diff
-Patch5:         latex2html-%{version}-match-multiline.patch
-Patch6:         http://patch-tracker.debian.org/patch/series/dl/latex2html/2008-debian1-9/latex2html-fix-defined.patch
-Patch7:         latex2html-backref-workaround.diff
+Source0:        http://mirrors.ctan.org/support/latex2html/latex2html-%{version}.tgz
+Source1:        latex2html-manual.tar.bz2
+Source2:        latex2html-README.SUSE
+Source3:        testfile.tex
+Source4:        local.pm
+Source5:        latex2html.1
+Patch0:         latex2html-%{version}-share-dir.diff
+Patch1:         latex2html-%{version}-perl-bindir.diff
+Patch2:         latex2html-%{version}-dest-dir.diff
+Patch3:         latex2html-%{version}-binmode.diff
+Patch4:         latex2html-%{version}-gsout.diff
+Patch5:         latex2html-%{version}-match-multiline.diff
+Patch6:         latex2html-%{version}-backref-workaround.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -62,12 +61,8 @@ LaTeX2HTML lets you easily convert basic LaTeX documents into the HTML
 format. This allows both a written and online version even of older
 LaTeX texts.
 
-Find documentation in /usr/share/doc/packages/latex2html.
-
 %package pngicons
-Provides:       l2h-pngicons
-Obsoletes:      l2h-pngicons
-Summary:        Icons in the PNG format for the LaTeX to HTML Converter
+Summary:        Icons in the PNG format for LateX2HTML
 License:        GPL-2.0+
 Group:          Productivity/Publishing/TeX/Utilities
 
@@ -75,7 +70,7 @@ Group:          Productivity/Publishing/TeX/Utilities
 Icons in the PNG format for the LaTeX to HTML Converter.
 
 %package doc
-Summary:        LaTeX2HTML Converter
+Summary:        Documentation for Latex2HTML Converter
 License:        GPL-2.0+ and LPPL-1.3c
 Group:          Productivity/Publishing/TeX/Utilities
 
@@ -85,38 +80,33 @@ format. This allows both a written and online version even of older
 LaTeX texts.
 
 %prep
-%setup 
-%setup -a 2 
-%patch
+%setup -a 1
+%patch0
 %patch1
 %patch2
 %patch3
 %patch4
-%patch5 -p1
-%patch6 -p1
-%patch7
-cp %{S:1} manual.ps.gz
-cp %{S:3} README.SuSE
+%patch5
+%patch6
+cp %{S:2} README.SUSE
+cp %{S:4} .
 
 %build
 ./configure --prefix=%{_prefix}
 make
-#removing files with zero-length
-rm manual/{images.idx,Simages.cb,Pimages.cb,Oimages.cb,Mimages.cb,Himages.cb,Eimages.cb,Pimages.aux,Simages.aux,Oimages.aux,Mimages.aux,Himages.aux}
 
 %install
-export RPM_BUILD_ROOT
-make install
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-install -m 644 latex2html.man $RPM_BUILD_ROOT/%{_mandir}/man1/latex2html.1
-rm -r $RPM_BUILD_ROOT%{share_dir}/{docs,example,dot.latex2html-init,readme.hthtml} 
-chmod 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/{cweb2html/makemake.pl,cweb2html/cweb2html,makemap,makeseg/makeseg}
+make DESTDIR=%{buildroot} install
+mkdir -p %{buildroot}/%{_mandir}/man1
+install -m 644 %{S:5} %{buildroot}/%{_mandir}/man1
+rm -r %{buildroot}%{share_dir}/{docs,example,dot.latex2html-init,readme.hthtml} 
+chmod 755 %{buildroot}%{_datadir}/%{name}/{cweb2html/makemake.pl,cweb2html/cweb2html,makemap,makeseg/makeseg}
 #removing out-dated url.sty [#283760]
-rm ${RPM_BUILD_ROOT}%{_texmfmaindir}/tex/latex/html/url.sty
-%fdupes -s $RPM_BUILD_ROOT
+rm %{buildroot}%{_texmfmaindir}/tex/latex/html/url.sty
+%fdupes -s %{buildroot}
 
 %check
-LATEX2HTMLDIR=%buildroot/%{share_dir} ./latex2html --test_mode %{S:4}
+LATEX2HTMLDIR=%buildroot/%{share_dir} ./latex2html --test_mode %{S:3}
 
 %postun
 mkdir -p var/adm/SuSEconfig
@@ -128,10 +118,8 @@ touch var/adm/SuSEconfig/run-texhash
 
 %files
 %defattr(-, root, root)
-%doc README.SuSE
+%doc README.SUSE
 %doc Changes FAQ README TODO dot.latex2html-init readme.hthtml 
-#%doc %{_defaultdocdir}/latex2html/manual
-#%doc %{_defaultdocdir}/latex2html/manual.ps.gz
 /usr/lib/latex2html
 %dir %{share_dir}
 %{share_dir}/*.pm
@@ -159,7 +147,7 @@ touch var/adm/SuSEconfig/run-texhash
 
 %files doc
 %defattr(-,root,root)
-%doc manual.ps.gz
+%doc manual
 %doc tests
 %doc example
 
diff --git a/local.pm b/local.pm
new file mode 100644
index 0000000..8ecfb98
--- /dev/null
+++ b/local.pm
@@ -0,0 +1,30 @@
+#################################################################
+# local.pm
+#
+# Local Configuration for LaTeX2HTML
+#
+# This file is created automatically. Do not edit!
+#
+#################################################################
+
+package main;
+
+### start pstoimg configuration ###
+$GS_LIB = '   . ; /usr/share/ghostscript/5.50 ; /usr/share/ghostscript/fonts'; # Inserted by configure-pstoimg
+$GS_DEVICE = 'ppmraw'; # Inserted by configure-pstoimg
+$GS = '/usr/bin/gs'; # Inserted by configure-pstoimg
+$PNMCAT = '/usr/X11R6/bin/pnmcat'; # Inserted by configure-pstoimg
+$PNMFILE = '/usr/X11R6/bin/pnmfile'; # Inserted by configure-pstoimg
+$PNMTOPNG = '/usr/X11R6/bin/pnmtopng'; # Inserted by configure-pstoimg
+$PBMMAKE = '/usr/X11R6/bin/pbmmake'; # Inserted by configure-pstoimg
+$GSLANDSCAPE = '/usr/share/ghostscript/5.50/landscap.ps'; # Inserted by configure-pstoimg
+$PPMQUANT = '/usr/X11R6/bin/ppmquant'; # Inserted by configure-pstoimg
+$PNMFLIP = '/usr/X11R6/bin/pnmflip'; # Inserted by configure-pstoimg
+$bg_color = '\#bfbfbf'; # Inserted by configure-pstoimg
+$white_color = '\#ffffff'; # Inserted by configure-pstoimg
+$PNMCROP = '/usr/X11R6/bin/pnmcrop'; # Inserted by configure-pstoimg
+
+### end pstoimg configuration ###
+
+1;
+