[csw-devel] SF.net SVN: gar:[18789] csw/mgar/pkg
pfelecan at users.sourceforge.net
pfelecan at users.sourceforge.net
Wed Jul 18 16:10:26 CEST 2012
Revision: 18789
http://gar.svn.sourceforge.net/gar/?rev=18789&view=rev
Author: pfelecan
Date: 2012-07-18 14:10:25 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
latex2html/trunk: migrated from a private recipe to a GAR based recipe.
Added Paths:
-----------
csw/mgar/pkg/latex2html/
csw/mgar/pkg/latex2html/Makefile
csw/mgar/pkg/latex2html/branches/
csw/mgar/pkg/latex2html/tags/
csw/mgar/pkg/latex2html/trunk/
csw/mgar/pkg/latex2html/trunk/Makefile
csw/mgar/pkg/latex2html/trunk/checksums
csw/mgar/pkg/latex2html/trunk/files/
csw/mgar/pkg/latex2html/trunk/files/0001-Add-url.patch
csw/mgar/pkg/latex2html/trunk/files/0002-Don-t-use-rgb.txt-from-pstoimg.patch
csw/mgar/pkg/latex2html/trunk/files/0003-Fix-borders-in-pstoimg.patch
csw/mgar/pkg/latex2html/trunk/files/0004-Fix-file-pattern-in-pstoimg.patch
csw/mgar/pkg/latex2html/trunk/files/0005-Fix-several-typos.patch
csw/mgar/pkg/latex2html/trunk/files/0006-Use-HTML-4.0-by-default.patch
csw/mgar/pkg/latex2html/trunk/files/0007-Fixes-bad-perl-in-l2hconf.pin.patch
csw/mgar/pkg/latex2html/trunk/files/0008-latex2html-fix-authoraddress.patch
csw/mgar/pkg/latex2html/trunk/files/0009-override-dvips-dot-in-filename-problem.patch
csw/mgar/pkg/latex2html/trunk/files/0010-manual-fix-address.patch
csw/mgar/pkg/latex2html/trunk/files/0011-Makefiles-fixes.patch
csw/mgar/pkg/latex2html/trunk/files/0012-Fix-images-types.patch
csw/mgar/pkg/latex2html/trunk/files/0013-Fix-romanian.patch
csw/mgar/pkg/latex2html/trunk/files/0014-Fix-mathend-mark.patch
csw/mgar/pkg/latex2html/trunk/files/0015-Fix-pdfoutput.patch
csw/mgar/pkg/latex2html/trunk/files/0016-Fix-gs-stderr.patch
csw/mgar/pkg/latex2html/trunk/files/0017-Pstoimg-match-gray.patch
csw/mgar/pkg/latex2html/trunk/files/0018-Fix-spaces-in-filenames.patch
csw/mgar/pkg/latex2html/trunk/files/0019-Match-multiline.patch
csw/mgar/pkg/latex2html/trunk/files/0020-latex2html-fix-defined.patch
csw/mgar/pkg/latex2html/trunk/files/0021-Documentation-private-1-and-3.patch
csw/mgar/pkg/latex2html/trunk/files/0022-Run-time-style-private-2.patch
csw/mgar/pkg/latex2html/trunk/files/0023-Installation-private-7.patch
csw/mgar/pkg/latex2html/trunk/files/0024-TeXExpand-private-7.patch
csw/mgar/pkg/latex2html/trunk/files/0025-Icons-installation-private-8.patch
csw/mgar/pkg/latex2html/trunk/files/0026-pnmcrop-detection.patch
csw/mgar/pkg/latex2html/trunk/files/0027-Adapt-makeseg.patch
csw/mgar/pkg/latex2html/trunk/files/0028-Call-environment-defined-Perl.patch
csw/mgar/pkg/latex2html/trunk/files/abnt.perl
csw/mgar/pkg/latex2html/trunk/files/eurosym.perl
csw/mgar/pkg/latex2html/trunk/files/floatflt.ins
csw/mgar/pkg/latex2html/trunk/files/latex2html.1
csw/mgar/pkg/latex2html/trunk/files/texexpand.1
Added: csw/mgar/pkg/latex2html/Makefile
===================================================================
--- csw/mgar/pkg/latex2html/Makefile (rev 0)
+++ csw/mgar/pkg/latex2html/Makefile 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,2 @@
+%:
+ $(MAKE) -C trunk $*
Property changes on: csw/mgar/pkg/latex2html/trunk
___________________________________________________________________
Added: svn:ignore
+ work
Added: csw/mgar/pkg/latex2html/trunk/Makefile
===================================================================
--- csw/mgar/pkg/latex2html/trunk/Makefile (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/Makefile 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,141 @@
+# $Id$
+
+NAME = latex2html
+VERSION = 2008
+GARTYPE = v2
+CATEGORIES = apps
+
+DESCRIPTION = A converter written in Perl that converts LATEX documents to HTML
+define BLURB
+ A converter written in Perl that converts LATEX documents to HTML
+endef
+
+MASTER_SITES = http://mirrors.ctan.org/support/latex2html/
+DISTFILES = $(DISTNAME).tar.gz
+# Debian series 7 from
+# http://patch-tracker.debian.org/package/latex2html/2008-debian1-7
+PATCHFILES += 0001-Add-url.patch
+PATCHFILES += 0002-Don-t-use-rgb.txt-from-pstoimg.patch
+PATCHFILES += 0003-Fix-borders-in-pstoimg.patch
+PATCHFILES += 0004-Fix-file-pattern-in-pstoimg.patch
+PATCHFILES += 0005-Fix-several-typos.patch
+PATCHFILES += 0006-Use-HTML-4.0-by-default.patch
+PATCHFILES += 0007-Fixes-bad-perl-in-l2hconf.pin.patch
+PATCHFILES += 0008-latex2html-fix-authoraddress.patch
+PATCHFILES += 0009-override-dvips-dot-in-filename-problem.patch
+PATCHFILES += 0010-manual-fix-address.patch
+PATCHFILES += 0011-Makefiles-fixes.patch
+PATCHFILES += 0012-Fix-images-types.patch
+# the following DISTFILES are patches creating new files; why GAR
+# doesn't support them?
+DISTFILES += abnt.perl
+PATCHFILES += 0013-Fix-romanian.patch
+PATCHFILES += 0014-Fix-mathend-mark.patch
+DISTFILES += floatflt.ins
+PATCHFILES += 0015-Fix-pdfoutput.patch
+PATCHFILES += 0016-Fix-gs-stderr.patch
+PATCHFILES += 0017-Pstoimg-match-gray.patch
+PATCHFILES += 0018-Fix-spaces-in-filenames.patch
+DISTFILES += texexpand.1
+DISTFILES += latex2html.1
+DISTFILES += eurosym.perl
+PATCHFILES += 0019-Match-multiline.patch
+PATCHFILES += 0020-latex2html-fix-defined.patch
+# previously private and new patches:
+PATCHFILES += 0021-Documentation-private-1-and-3.patch
+PATCHFILES += 0022-Run-time-style-private-2.patch
+PATCHFILES += 0023-Installation-private-7.patch
+PATCHFILES += 0024-TeXExpand-private-7.patch
+PATCHFILES += 0025-Icons-installation-private-8.patch
+PATCHFILES += 0026-pnmcrop-detection.patch
+PATCHFILES += 0027-Adapt-makeseg.patch
+PATCHFILES += 0028-Call-environment-defined-Perl.patch
+
+CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-texpath=$(texmflocaldir)/tex/latex/html
+
+BUILD_DEP_PKGS += CSWgs
+BUILD_DEP_PKGS += CSWnetpbm
+BUILD_DEP_PKGS += CSWperl
+BUILD_DEP_PKGS += CSWtetex
+
+BUILD_SCRIPTS = nominal
+# as strange as it seems the check and test are build actions...
+BUILD_SCRIPTS += check
+BUILD_SCRIPTS += test
+BUILD_SCRIPTS += documentation
+
+TEST_SCRIPTS =
+
+LICENSE = LICENSE
+
+RUNTIME_DEP_PKGS += CSWgs
+RUNTIME_DEP_PKGS += CSWperl
+RUNTIME_DEP_PKGS += CSWnetpbm
+RUNTIME_DEP_PKGS += CSWtetex
+
+include gar/category.mk
+
+build-nominal:
+ $(MAKE) -C $(WORKSRC)
+ $(MAKECOOKIE)
+
+build-check:
+ $(MAKE) -C $(WORKSRC) $(subst build-,,$@)
+ $(MAKECOOKIE)
+
+build-test:
+ $(MAKE) -C $(WORKSRC) $(subst build-,,$@)
+ $(MAKECOOKIE)
+
+build-documentation:
+ $(MAKE) -C $(WORKSRC) $(subst build-,,$@)
+ $(MAKECOOKIE)
+
+pre-install-modulated:
+ cp $(FILEDIR)/abnt.perl $(WORKSRC)/styles
+ cp $(FILEDIR)/eurosym.perl $(WORKSRC)/styles
+ cp $(FILEDIR)/floatflt.ins $(WORKSRC)/texinputs
+ mkdir -p "$(DESTDIR)/$(sharedstatedir)/lib/$(NAME)/icons"
+ $(MAKECOOKIE)
+
+noPack += *.aux
+noPack += *.bbl
+noPack += *.dat
+noPack += *.dvi
+noPack += *.glo
+noPack += *.gls
+noPack += *.idx
+noPack += *.ind
+noPack += *.index
+noPack += *.ist
+noPack += *.lof
+noPack += *.log
+noPack += *.lot
+noPack += *.ptr
+noPack += *.sty
+noPack += *.tex
+noPack += *.toc
+noPack += .latex2html-init
+noPack += Makefile*
+noPack += changebar
+noPack += changebar
+noPack += hthtml
+noPack += hthtml
+noPack += manual/*.aux
+noPack += manual/*.aux
+noPack += manual/*.bbl
+noPack += manual/*.log
+noPack += manual/*.pl
+noPack += manual/*.tex
+noPack += psfiles
+noPack += psfiles
+post-install-modulated:
+ ginstall --directory $(DESTDIR)/$(mandir)/man1
+ ginstall $(FILEDIR)/texexpand.1 $(DESTDIR)/$(mandir)/man1
+ ginstall $(FILEDIR)/latex2html.1 $(DESTDIR)/$(mandir)/man1
+ ginstall --directory $(DESTDIR)/$(docdir)
+ mv $(DESTDIR)/$(sharedstatedir)/lib/$(NAME)/docs $(DESTDIR)/$(docdir)/$(NAME)
+ mv $(DESTDIR)/$(sharedstatedir)/lib/$(NAME)/example $(DESTDIR)/$(docdir)/$(NAME)
+ cd $(DESTDIR)/$(docdir)/$(NAME) && rm -rf $(noPack)
+ $(MAKECOOKIE)
Property changes on: csw/mgar/pkg/latex2html/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: csw/mgar/pkg/latex2html/trunk/checksums
===================================================================
--- csw/mgar/pkg/latex2html/trunk/checksums (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/checksums 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1 @@
+275ab6cfa8ca9328446b7f40d8dc302e latex2html-2008.tar.gz
Added: csw/mgar/pkg/latex2html/trunk/files/0001-Add-url.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0001-Add-url.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0001-Add-url.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,40 @@
+From 752b1d387c044dda5de34e705e227a11cfbc6a5a Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 14:13:41 +0200
+Subject: [PATCH] Add url 1 of Debian series 7
+
+---
+ FAQ | 3 +--
+ README | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/FAQ b/FAQ
+index 33040f9..9ab2f59 100644
+--- a/FAQ
++++ b/FAQ
+@@ -630,8 +630,7 @@ change_end 98.1
+ * To join the community of LATEX2HTML users:
+ More information on a mailing list, discussion archives, bug
+ reporting forms and more is available at
+- http://cbl.leeds.ac.uk/nikos/tex2html/doc/latex2html/latex2html.ht
+- ml
++ http://mirrors.ctan.org/support/latex2html/
+
+ 2.2 Getting Support and More Information
+
+diff --git a/README b/README
+index d2259d3..645393e 100644
+--- a/README
++++ b/README
+@@ -170,7 +170,7 @@ Support and More Information
+
+ Announcements, discussion archives, bug reporting forms and
+ more are kept at the LaTeX2HTML home at
+-http://cbl.leeds.ac.uk/nikos/tex2html/doc/latex2html/latex2html.html.
++http://mirrors.ctan.org/support/latex2html/
+
+ *** this site has not been updated since November 1996.
+ Many of the links are still valid, leading to useful information.
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0002-Don-t-use-rgb.txt-from-pstoimg.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0002-Don-t-use-rgb.txt-from-pstoimg.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0002-Don-t-use-rgb.txt-from-pstoimg.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,29 @@
+From 297ca10bb4356c0e256ad502277c9bbd3b14cbcd Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 14:17:30 +0200
+Subject: [PATCH] Don't use rgb.txt from pstoimg 2 of Debian series 7 This
+ patch prevents pstoimg from using rgb.txt which can make
+ latex2html calls fail. Author: Atsuhito KOHDA
+ <kohda at pm.tokushima-u.ac.jp>
+
+---
+ pstoimg.pin | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/pstoimg.pin b/pstoimg.pin
+index a9f0777..876f6cd 100755
+--- a/pstoimg.pin
++++ b/pstoimg.pin
+@@ -1508,7 +1508,8 @@ sub crop_scale_etc {
+ $pnmtoimg .= ' -interlace';
+ }
+ if($TRANSPARENT) {
+- $trans_color = $TRANSPARENT_COLOR||'gray85';
++ $trans_color = $TRANSPARENT_COLOR||'#d9d9d9'; # don't lookup rgb.txt
++ #$trans_color = $TRANSPARENT_COLOR||'gray85';
+ $pnmtoimg .= ' -trans ' . L2hos->quote($trans_color);
+ }
+ }
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0003-Fix-borders-in-pstoimg.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0003-Fix-borders-in-pstoimg.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0003-Fix-borders-in-pstoimg.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,31 @@
+From 80ffac4475d1474c34203ddb165bd1049222fb86 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 14:49:33 +0200
+Subject: [PATCH] Fix borders in pstoimg 3 of Debian series 7
+
+This patch fixes the borders of images in pstoimg.
+The origin of this patch is actually unknown. Feel free to tell me and I'll
+include it.
+---
+ pstoimg.pin | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pstoimg.pin b/pstoimg.pin
+index 876f6cd..c8bc47e 100755
+--- a/pstoimg.pin
++++ b/pstoimg.pin
+@@ -1289,9 +1289,9 @@ sub crop_scale_etc {
+ my $edge = $1;
+ my $croparg = '';
+ if($edge =~ /b/i) {
+- $croparg = "-bot $PNMCROPOPT ";
++ $croparg = "-bot -sides $PNMCROPOPT ";
+ } elsif($edge =~ /[tlr]/i) {
+- $croparg = "-$edge $PNMCROPOPT ";
++ $croparg = "-$edge -sides $PNMCROPOPT ";
+ } elsif($edge =~ /s/i) {
+ #RRM: shave at most 1-2 rows of white from the bottom
+ #if @pipes@
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0004-Fix-file-pattern-in-pstoimg.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0004-Fix-file-pattern-in-pstoimg.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0004-Fix-file-pattern-in-pstoimg.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,28 @@
+From d1a3df3dd7a0d3d33a335caa9f96e6f70b639d91 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 14:52:49 +0200
+Subject: [PATCH] Fix file pattern in pstoimg 4 of Debian series 7
+
+This patch fixes the file pattern in pstoimg to collect the files created by
+ghostscript.
+Author: Holger Ruckdeschel <holger at hoicher.de>
+---
+ pstoimg.pin | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pstoimg.pin b/pstoimg.pin
+index c8bc47e..c5de1a4 100755
+--- a/pstoimg.pin
++++ b/pstoimg.pin
+@@ -1006,7 +1006,7 @@ sub pstoimg {
+ print qq{$prompt: Error: Could not open directory "$pnmdir": $!\n};
+ return 0;
+ }
+- my @list = grep(/^\d+_\w*\./,readdir(DIR));
++ my @list = grep(/^\d+_${pnmbase}\.pnm/,readdir(DIR));
+ closedir(DIR);
+ if(@list) {
+ my $i;
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0005-Fix-several-typos.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0005-Fix-several-typos.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0005-Fix-several-typos.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,43 @@
+From 30c715466d513d366ae131e16c0c95c18f8aac5c Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 14:55:39 +0200
+Subject: [PATCH] Fix several typos 5 of Debian series 7
+
+This patch fixes several typos in the manual of pstoimg
+Author: Roland Stigge <stigge at antcom.de>
+---
+ pstoimg.pin | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pstoimg.pin b/pstoimg.pin
+index c5de1a4..b9e5014 100755
+--- a/pstoimg.pin
++++ b/pstoimg.pin
+@@ -446,13 +446,13 @@ banner() unless($opt{quiet});
+
+ Use Ghostscript's anti-aliasing feature for rendering "softer" images.
+ This applies to lines and edges of polygonal and oval or circular shapes.
+-Only valid if Ghostscipt 4.03 or higher is installed.
++Only valid if Ghostscript 4.03 or higher is installed.
+
+ =item B<-aaliastext>
+
+ Use Ghostscript's anti-aliasing feature for "smoother" font characters,
+ without the jagged edges. Similar to B<-antialias> for graphic components.
+-Only valid if Ghostscipt 4.03 or higher is installed.
++Only valid if Ghostscript 4.03 or higher is installed.
+
+ =item B<-center> I<num>
+
+@@ -906,7 +906,7 @@ my $Brx = '-?\d+(?:\.\d*|)';
+ =head1 DESCRIPTION
+
+ B<pstoimg> iterates over the given input files and runs them through
+-Ghostscipt. The resulting pnm (portable anymap files) are processed
++Ghostscript. The resulting pnm (portable anymap files) are processed
+ with different Netpbm tools (cropping, color mapping, aligning, ...)
+ and finally converted into (currently) either GIF or PNG format. The
+ bitmaps can now be included e.g. in WWW pages.
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0006-Use-HTML-4.0-by-default.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0006-Use-HTML-4.0-by-default.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0006-Use-HTML-4.0-by-default.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,27 @@
+From 37c9a54b8456795e163786949f01975a9328cadf Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 14:58:16 +0200
+Subject: [PATCH] Use HTML 4.0 by default 6 of Debian series 7
+
+This patch sets HTML 4.0 by default.
+Author: Adrian Bunk <bunk at fs.tum.de>
+---
+ l2hconf.pin | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/l2hconf.pin b/l2hconf.pin
+index 4bfd5eb..24c6a4e 100644
+--- a/l2hconf.pin
++++ b/l2hconf.pin
+@@ -590,7 +590,7 @@ $DEBUG = 0;
+ # -html_version
+ # The default HTML version to be produced
+ #
+-$HTML_VERSION = '3.2';
++$HTML_VERSION = '4.0';
+
+
+ # -no_math
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0007-Fixes-bad-perl-in-l2hconf.pin.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0007-Fixes-bad-perl-in-l2hconf.pin.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0007-Fixes-bad-perl-in-l2hconf.pin.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,23 @@
+From 7ce182625be24a2fb3339dbe9a8660d4be1fe590 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 15:00:44 +0200
+Subject: [PATCH] Fixes bad perl in l2hconf.pin 7 of Debian series 7
+
+This patch removes the first line "#!/perl" from l2hconf.pin
+Author: Roland Stigge <stigge at antcom.de>
+---
+ l2hconf.pin | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/l2hconf.pin b/l2hconf.pin
+index 24c6a4e..66b4286 100644
+--- a/l2hconf.pin
++++ b/l2hconf.pin
+@@ -1,4 +1,3 @@
+-#!/perl
+ # LaTeX2HTML l2hconf.pm
+ # $Id: l2hconf.pin,v 1.17 2002/06/15 22:46:36 RRM Exp $
+
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0008-latex2html-fix-authoraddress.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0008-latex2html-fix-authoraddress.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0008-latex2html-fix-authoraddress.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,29 @@
+From b2f92bfc270ceafe807f05dfb9a4381097b97786 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 15:04:30 +0200
+Subject: [PATCH] latex2html fix authoraddress 8 of Debian series 7
+
+Remove Nikos Drakos' address from documentation
+In some early Debian revision already, Nikos Drakos' old web address (_not_
+the name) was removed from the documentation in favour of Ross Moore's one.
+Author: Roland Stigge <stigge at antcom.de>
+---
+ latex2html.pin | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/latex2html.pin b/latex2html.pin
+index 58f1b76..2f56d6b 100644
+--- a/latex2html.pin
++++ b/latex2html.pin
+@@ -14071,7 +14071,7 @@ sub default_textohtmlinfopage {
+ , "<A HREF=\"$TEX2HTMLADDRESS\"><STRONG>LaTeX</STRONG>2<tt>HTML</tt></A>"
+ , " translator Version $TEX2HTMLVERSION\n"
+ , "<P>Copyright © 1993, 1994, 1995, 1996,\n"
+- , "<A HREF=\"$AUTHORADDRESS\">Nikos Drakos</A>, \n"
++ , "Nikos Drakos, \n"
+ , "Computer Based Learning Unit, University of Leeds.\n"
+ , "<BR>Copyright © 1997, 1998, 1999,\n"
+ , "<A HREF=\"$AUTHORADDRESS2\">Ross Moore</A>, \n"
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0009-override-dvips-dot-in-filename-problem.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0009-override-dvips-dot-in-filename-problem.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0009-override-dvips-dot-in-filename-problem.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,39 @@
+From 89a193af3e2af87b753707a6d567dd2fbb382025 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 15:08:01 +0200
+Subject: [PATCH] override-dvips-dot-in-filename-problem 9 of Debian series 7
+
+Don't complain about multiple dots in filenames
+This patch prevents latex2html from complaining about multiple dots in
+filenames. Earlier versions of dvips were not able to handle this but the
+version on OpenCSW is assumed to be safe.
+Author: "Fred L. Drake, Jr." <fdrake at acm.org>
+---
+ latex2html.pin | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/latex2html.pin b/latex2html.pin
+index 2f56d6b..f89b5bb 100644
+--- a/latex2html.pin
++++ b/latex2html.pin
+@@ -524,7 +524,7 @@ $TMP_PREFIX = "l2h" unless ($TMP_PREFIX);
+ # This can be set to 1 when using a version of dvips that is safe
+ # from the "dot-in-name" bug.
+ # _TODO_ this should be determined by configure
+-#$DVIPS_SAFE = 1;
++$DVIPS_SAFE = 1;
+
+ $CHARSET = $charset || 'iso-8859-1';
+
+@@ -671,7 +671,7 @@ sub set_if_false {
+
+ sub check_for_dots {
+ local($file) = @_;
+- if ($file =~ /\.[^.]*\./) {
++ if ($file =~ /\.[^.]*\./ && !$DVIPS_SAFE) {
+ die "\n\n\n *** Fatal Error --- but easy to fix ***\n"
+ . "\nCannot have '.' in file-name prefix, else dvips fails on images"
+ . "\nChange the name from $file and try again.\n\n";
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0010-manual-fix-address.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0010-manual-fix-address.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0010-manual-fix-address.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,26 @@
+From 90d20a630cebe125ed55fbb6fe3ca4e1962e7611 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 15:11:39 +0200
+Subject: [PATCH] manual fix address 10 of Debian series 7
+
+---
+ docs/manual.tex | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/docs/manual.tex b/docs/manual.tex
+index 5207fdc..7850c7c 100644
+--- a/docs/manual.tex
++++ b/docs/manual.tex
+@@ -168,8 +168,7 @@
+ %
+ \Glossary{latex2html}{\LaTeX2HTML}{}
+ \title{The \LaTeX2HTML{} Translator}
+-\author{Nikos Drakos}
+-\address{Computer Based Learning Unit\\University of Leeds.}
++\author{Nikos Drakos\\Computer Based Learning\\Unit University of Leeds}
+ \date{\today}
+ \index{Computer~Based~Learning~Unit!University of Leeds}%
+ \maketitle
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0011-Makefiles-fixes.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0011-Makefiles-fixes.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0011-Makefiles-fixes.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,176 @@
+From 1188c908e6c2be0bf1cc218be8d2dd3bdc55c203 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 15:26:42 +0200
+Subject: [PATCH] Makefiles fixes 11 of Debian series 7
+
+This patch includes several fixes and adjustments to the Makefiles.
+Author: Roland Stigge <stigge at antcom.de>
+---
+ docs/Makefile | 41 +++++++++++++++++++++--------------------
+ docs/Makefile.frames | 9 +++++----
+ 2 files changed, 26 insertions(+), 24 deletions(-)
+
+diff --git a/docs/Makefile b/docs/Makefile
+index de5d63e..53f9969 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -21,8 +21,8 @@ LATEX = latex
+ MAKEINDEX = makeindex
+ BIBTEX = bibtex
+
+-# L2H = latex2html -no_math -html_version 3.2,math -scalable_fonts
+-L2H = latex2html -no_math -html_version 3.2,math
++# L2H = latex2html -no_math -html_version 3.2,math -scalable_fonts
++L2H = latex2html -no_math -html_version 4.0,math
+
+
+ #
+@@ -30,7 +30,7 @@ L2H = latex2html -no_math -html_version 3.2,math
+ # to set path-variables before calling other scripts.
+ # For example...
+ #
+-TEXMF = /usr/local/texmf
++TEXMF = /usr/lib/texmf
+
+ LATEXINPUTDIR = $(TEXMF)/tex/latex//
+ PKFONTDIR = $(TEXMF)/fonts/public//pk/cx//
+@@ -83,50 +83,50 @@ COMMON = -external_file $(TOP) -dir $(TOP) -info 0 -short_index \
+ -biblio $(REFNODE) -no_auto_link -no_footnode \
+ -split 6 -link 6 -up_url $(TOP).html -up_title $(TOPTITLE)
+
+-LTOP = -short_index -split 4 -link 5\
++LTOP = -short_index -split 4 -link 5 -no_auto_link\
+ -t $(TOPTITLE) $(TOP).tex
+
+ LSEC1 = $(COMMON) -prefix O \
+ -prev_url $(TOP).html -prev_title $(TOPTITLE) \
+- -down_url $(SUP).html -down_title $(S2TITLE) $(OVW).tex
++ -down_url $(SUP).html -down_title $(S2TITLE) $(OVW).tex
+
+ LSEC2 = $(COMMON) -prefix S -debug \
+ -prev_url $(OVW).html -prev_title $(S1TITLE) \
+- -down_url $(ENV).html -down_title $(S3TITLE) $(SUP).tex
++ -down_url $(ENV).html -down_title $(S3TITLE) $(SUP).tex
+
+-# -down_url $(MAN).html -down_title $(S3TITLE) $(SUP).tex
++# -down_url $(MAN).html -down_title $(S3TITLE) $(SUP).tex
+
+ LSEC3 = $(COMMON) -prefix E \
+ -prev_url ../$(TOP)/$(SUP).html -prev_title $(S2TITLE) \
+- -down_url ../$(TOP)/$(HYP).html -down_title $(S4TITLE) $(ENV).tex
++ -down_url ../$(TOP)/$(HYP).html -down_title $(S4TITLE) $(ENV).tex
+
+-# -down_url ../$(TOP)/$(HYP).html -down_title $(S4TITLE) $(MAN).tex
++# -down_url ../$(TOP)/$(HYP).html -down_title $(S4TITLE) $(MAN).tex
+
+ LSEC4 = $(COMMON) -prefix H \
+ -prev_url ../$(TOP)/$(ENV).html -prev_title $(S3TITLE) \
+- -down_url ../$(TOP)/$(MAN).html -down_title $(S5TITLE) $(HYP).tex
++ -down_url ../$(TOP)/$(MAN).html -down_title $(S5TITLE) $(HYP).tex
+
+ # -prev_url ../$(TOP)/$(MAN).html -prev_title $(S3TITLE) \
+-# -down_url ../$(TOP)/$(FEA).html -down_title $(S5TITLE) $(HYP).tex
++# -down_url ../$(TOP)/$(FEA).html -down_title $(S5TITLE) $(HYP).tex
+
+ LSEC5 = $(COMMON) -prefix M \
+ -prev_url ../$(TOP)/$(HYP).html -prev_title $(S4TITLE) \
+- -down_url ../$(TOP)/$(PRO).html -down_title $(S6TITLE) $(MAN).tex
++ -down_url ../$(TOP)/$(PRO).html -down_title $(S6TITLE) $(MAN).tex
+
+-# -down_url ../$(TOP)/$(PRO).html -down_title $(S6TITLE) $(FEA).tex
++# -down_url ../$(TOP)/$(PRO).html -down_title $(S6TITLE) $(FEA).tex
+
+ LSEC6 = $(COMMON) -prefix P \
+ -prev_url ../$(TOP)/$(MAN).html -prev_title $(S5TITLE) \
+- -down_url ../$(TOP)/$(REFNODE).html -down_title $(BIBLIO) $(PRO).tex
++ -down_url ../$(TOP)/$(REFNODE).html -down_title $(BIBLIO) $(PRO).tex
+
+ # -prev_url ../$(TOP)/$(FEA).html -prev_title $(S5TITLE) \
+
+-# -down_url ../$(TOP)/$(CHGNODE).html -down_title $(CHGTITLE) $(PRO).tex
++# -down_url ../$(TOP)/$(CHGNODE).html -down_title $(CHGTITLE) $(PRO).tex
+
+
+ LSEC7 = $(COMMON) -prefix C -dir $(TOP) -info 0 \
+ -prev_url ../$(TOP)/$(PRO).html -prev_title $(S6TITLE) \
+- -down_url ../$(TOP)/$(GLOSSNODE).html -down_title $(GLOSS) $(CHA).tex
++ -down_url ../$(TOP)/$(GLOSSNODE).html -down_title $(GLOSS) $(CHA).tex
+
+
+ #
+@@ -202,12 +202,13 @@ images:
+ $(L2H) -short_index -images_only manual.tex
+
+ htmlclean:
+- rm -f manual/.??* manual/*TMP*
++ rm -f manual/.??* manual/*TMP*
+
+ clean:
+ rm -f manual.dvi manual.ps manual.glo manual.log manual.aux \
+ manual.ilg manual.lof manual.lot manual.cb manual.idx \
+- manual.toc
++ manual.toc manual.gls
++ rm -f *.ptr
+
+
+ #
+@@ -264,7 +265,7 @@ $(TOP)/$(SUP).html: $(SUP).tex $(TOP)/$(INT) \
+ $(SUP):
+ $(L2H) $(LSEC2)
+
+-S.stamp: $(SUP).tex $(TOP)/$(INT)
++S.stamp: $(SUP).tex $(TOP)/$(INT)
+ $(L2H) $(LSEC2)
+ touch $@
+
+@@ -279,7 +280,7 @@ $(TOP)/$(MAN).html: $(MAN).tex $(TOP)/$(INT) $(TOP)/H$(INT) $(TOP)/E$(INT)
+ $(MAN):
+ $(L2H) $(LSEC5)
+
+-M.stamp: $(MAN).tex $(TOP)/$(INT)
++M.stamp: $(MAN).tex $(TOP)/$(INT)
+ $(L2H) $(LSEC5)
+ touch $@
+
+diff --git a/docs/Makefile.frames b/docs/Makefile.frames
+index 1f13c75..f95f9d3 100644
+--- a/docs/Makefile.frames
++++ b/docs/Makefile.frames
+@@ -26,7 +26,7 @@ LATEX = latex
+ MAKEINDEX = makeindex
+ BIBTEX = bibtex
+
+-L2H = latex2html -no_math -html_version 3.2,math -accent_images textrm -toc_depth 6
++L2H = latex2html -no_math -html_version 4.0,math -accent_images textrm -toc_depth 6
+ #L2H = l2ng -no_math -html_version 4.0,math -scalable_fonts
+
+ L2Hframes = latex2html -no_math -html_version 4.0,math,frame -accent_images textrm -scalable_fonts
+@@ -147,13 +147,13 @@ LSEC7 = $(COMMON) -prefix C -dir $(TOP) -info 0 \
+ manual.ps: manual.cb manual.dvi
+ $(DVIPS) manual.dvi -o $@
+
+-manual.aux manual.cb:
++manual.aux manual.cb: \
+ manual.tex credits.tex licence.tex overview.tex \
+ support.tex userman.tex hypextra.tex features.tex \
+ problems.tex l2hfiles.dat manhtml.tex l2hman.sty
+ $(LATEX) manual.tex
+
+-manual.glo manual.idx:
++manual.glo manual.idx: \
+ manual.tex credits.tex licence.tex overview.tex \
+ support.tex userman.tex hypextra.tex features.tex \
+ problems.tex l2hfiles.dat manhtml.tex l2hman.sty
+@@ -234,7 +234,8 @@ htmlclean:
+ clean:
+ rm -f manual.dvi manual.ps manual.glo manual.log manual.aux \
+ manual.ilg manual.lof manual.lot manual.cb manual.idx \
+- manual.toc
++ manual.toc manual.gls
++ rm -f *.ptr
+
+
+ #
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0012-Fix-images-types.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0012-Fix-images-types.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0012-Fix-images-types.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,27 @@
+From a68c3f881db4c17e4c7649371a9ade9240a3186f Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 15:41:50 +0200
+Subject: [PATCH] Fix images types 12 of Debian series 7
+
+By default, IMAGE_TYPES is empty. This patch sets the Debian default
+ to "png gif".
+Author: Roland Stigge <stigge at antcom.de>
+---
+ docs/.latex2html-init | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/docs/.latex2html-init b/docs/.latex2html-init
+index d5910d2..f90ccf1 100644
+--- a/docs/.latex2html-init
++++ b/docs/.latex2html-init
+@@ -6,5 +6,7 @@ $CONTENTS_WIDTH = 250;
+ $HTML_VALIDATE = '';
+ $LOCAL_ICONS = 1;
+
++ at IMAGE_TYPES = qw(png gif);
++$IMAGE_TYPE = $IMAGE_TYPES[0];
+
+ 1;
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0013-Fix-romanian.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0013-Fix-romanian.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0013-Fix-romanian.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,65 @@
+From 9e718a74fbe0fb6d0ebc7ffb5d99ea337f0a9bcd Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 15:49:01 +0200
+Subject: [PATCH] Fix romanian 13 of Debian series 7
+
+This patch fixes several issues in the Romanian version of latex2html.
+Author: Roland Stigge <stigge at antcom.de>
+---
+ styles/romanian.perl | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/styles/romanian.perl b/styles/romanian.perl
+index 28ed5bf..e9ed702 100644
+--- a/styles/romanian.perl
++++ b/styles/romanian.perl
+@@ -16,23 +16,23 @@ package main;
+
+ if (defined &addto_languages) { &addto_languages('romanian') };
+
+-&do_require_extension ('latin2');
++&do_require_extension ('latin10');
+
+ sub romanian_titles {
+ $toc_title = "Cuprins";
+- $lof_title = "Listä de figuri";
+- $lot_title = "Listä de tabele";
++ $lof_title = "Listg de figuri";
++ $lot_title = "Listg de tabele";
+ $idx_title = "Glosar";
+ $ref_title = "Bibliografie";
+ $bib_title = "Bibliografie";
+ $abs_title = "Rezumat";
+ $app_title = "Anexa";
+- $pre_title = "Prefaţä";
++ $pre_title = "PrefaB;g";
+ ## $foot_title = "";
+ ## $thm_title = "";
+ $fig_name = "Figura";
+ $tab_name = "Tabela";
+- $prf_name = "Demonstraţie";
++ $prf_name = "DemonstraB;ie";
+ $page_name = "Pagina";
+ # Sectioning-level titles
+ $part_name = "Partea";
+@@ -52,7 +52,7 @@ sub romanian_titles {
+ ## $prev_name = "";
+ ## $group_name = "";
+ # mail fields
+- $encl_name = "Anexä";
++ $encl_name = "Anexg";
+ $headto_name = "Pentru";
+ $cc_name = "Copie";
+
+@@ -75,7 +75,7 @@ sub romanian_today {
+ &romanian_titles;
+ $default_language = 'romanian';
+ $TITLES_LANGUAGE = 'romanian';
+-$romanian_encoding = 'iso-8859-2';
++$romanian_encoding = 'is-8859-16';
+
+ # $Log: romanian.perl,v $
+ # Revision 1.1 1998/08/25 01:59:07 RRM
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0014-Fix-mathend-mark.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0014-Fix-mathend-mark.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0014-Fix-mathend-mark.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,28 @@
+From 68b587149e2fe0d6f75b1ff7882345b833a25bb9 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 15:52:49 +0200
+Subject: [PATCH] Fix mathend mark 14 of Debian series 7
+
+This patch fixes math.pl to default to empty $mathend_mark to prevent
+mathend000# in documents.
+Author: Arwin Vosselman <arwin at xs4all.nl>
+---
+ versions/math.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/versions/math.pl b/versions/math.pl
+index 6010956..37eadec 100644
+--- a/versions/math.pl
++++ b/versions/math.pl
+@@ -39,7 +39,7 @@ if ($HTML_OPTIONS =~ /math/) {
+
+ package main;
+
+-$mathend_mark = "\n${verbatim_mark}mathend000#";
++$mathend_mark = "";
+ $keepcomments_rx = "\\s*(picture|makeimage|xy|diagram|mathend)[*]?"
+ unless ($keepcomments_rx =~ /mathend/);
+
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0015-Fix-pdfoutput.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0015-Fix-pdfoutput.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0015-Fix-pdfoutput.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,31 @@
+From 77735611cdb772c8ed6fcb836e238c5cd091fa7f Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 16:03:15 +0200
+Subject: [PATCH] Fix pdfoutput 15 of Debian series 7
+
+This patch fixes pdf output in latex2html.
+Author: Giuseppe Ghibo <ghibo at mandrakesoft.com>
+---
+ texinputs/html.sty | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/texinputs/html.sty b/texinputs/html.sty
+index 2f4c413..1b791a5 100644
+--- a/texinputs/html.sty
++++ b/texinputs/html.sty
+@@ -36,7 +36,11 @@
+ \ifx\pdfoutput\relax \let\pdfunknown\relax
+ \RequirePackage{hyperref}\let\html at new=\renewcommand
+ \else
+- \RequirePackage{hyperref}\let\html at new=\newcommand
++ \ifcase\pdfoutput
++ \let\pdfunknown\relax \let\html at new=\newcommand
++ \else
++ \RequirePackage[pdftex]{hyperref}\let\html at new=\newcommand
++ \fi
+ \fi
+ \fi
+ \else
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0016-Fix-gs-stderr.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0016-Fix-gs-stderr.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0016-Fix-gs-stderr.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,30 @@
+From aa765f31edac52a6425192a8f2f6c70999e1e403 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 16:10:35 +0200
+Subject: [PATCH] Fix gs stderr
+
+16 of Debian series 7
+
+This patch fixes the gs version detection in the latex2html perl configuration
+ since gs outputs "gs -h" to stderr.
+Author: Giuseppe Ghibo <ghibo at mandrakesoft.com>
+---
+ config/config.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/config/config.pl b/config/config.pl
+index a50b56b..1b243d7 100755
+--- a/config/config.pl
++++ b/config/config.pl
+@@ -1043,7 +1043,7 @@ if($opt{'have_pstoimg'}) {
+ my $gs_version;
+
+ my $flag = 0;
+- unless(open(GS,"$gs -h |")) {
++ unless(open(GS,"$gs -h 2>&1|")) {
+ $opt{'have_pstoimg'} = 0;
+ logit("Error: could not execute $gs\n");
+ &warn_no_images();
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0017-Pstoimg-match-gray.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0017-Pstoimg-match-gray.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0017-Pstoimg-match-gray.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,28 @@
+From abf2d2b9f608bd2ac9abccd4d58c349dbb43e1f2 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 16:17:20 +0200
+Subject: [PATCH] Pstoimg match gray
+
+This patch fixes gray background detection on dvips via a regexp adjustment in
+pstoimg.pin
+Author: Diab Jerius <djerius at cfa.harvard.edu>
+---
+ pstoimg.pin | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pstoimg.pin b/pstoimg.pin
+index b9e5014..b199f51 100755
+--- a/pstoimg.pin
++++ b/pstoimg.pin
+@@ -1137,7 +1137,7 @@ sub ps2pnm {
+ }
+ my $had_nonwhite;
+ if($opt{white}) {
+- $had_nonwhite = ($ps =~ s/(\n\d+ \d+ bop gsave) \d*\.\d+ (TeXcolorgray clippath fill grestore)/$1 1 $2/s);
++ $had_nonwhite = ($ps =~ s/(\d+ \d+ bop gsave) \d*\.\d+ (TeXcolorgray clippath fill grestore)/$1 1 $2/s);
+ }
+ $ps_changed = $had_papersize || $had_nonwhite;
+ if($ps_changed) {
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0018-Fix-spaces-in-filenames.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0018-Fix-spaces-in-filenames.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0018-Fix-spaces-in-filenames.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,34 @@
+From 955dd8b06dc0a6d363f5a051916e736dc802786f Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 16:22:10 +0200
+Subject: [PATCH] Fix spaces in filenames
+
+This patch adds support for spaces in filenames
+Author: Mazen NEIFER <mazen.neifer at wanadoo.fr>
+---
+ latex2html.pin | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/latex2html.pin b/latex2html.pin
+index f89b5bb..6622723 100644
+--- a/latex2html.pin
++++ b/latex2html.pin
+@@ -829,11 +829,11 @@ sub driver {
+ # die "File $TEXEXPAND does not exist or is not executable\n"
+ # unless (-x $TEXEXPAND);
+ L2hos->syswait("$TEXEXPAND $dbg -auto_exclude $unseg"
+- . "-save_styles $DESTDIR$dd$TMP_${dd}styles "
+- . ($TEXINPUTS ? "-texinputs $TEXINPUTS " : '' )
++ . "-save_styles \"$DESTDIR$dd$TMP_${dd}styles\" "
++ . ($TEXINPUTS ? "-texinputs \"$TEXINPUTS\" " : '' )
+ . (($VERBOSITY >2) ? "-verbose " : '' )
+- . "-out $DESTDIR$dd$TMP_$dd$FILE "
+- . "$texfilepath$dd$FILE.$EXT")
++ . "-out \"$DESTDIR$dd$TMP_$dd$FILE\" "
++ . "\"$texfilepath$dd$FILE.$EXT\"")
+ && die " texexpand failed: $!\n";
+ print STDOUT "\n *** `texexpand' done ***\n" if ($VERBOSITY > 1);
+
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0019-Match-multiline.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0019-Match-multiline.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0019-Match-multiline.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,1295 @@
+From 114592c6f1d4b38e94f2075c54800aa3a5f9172c Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 16:46:47 +0200
+Subject: [PATCH] Match multiline 19 of Debian series 7
+
+This patch replaces the $* flag with the matching option "m" for multiline
+matching since the former one isn't supported by latest perl.
+Author: Roland Stigge <stigge at antcom.de>
+---
+ IndicTeX-HTML/itrans.perl | 8 +++----
+ latex2html.pin | 16 +++++---------
+ styles/alltt.perl | 10 ++++-----
+ styles/amsmath.perl | 1 -
+ styles/amstex.perl | 1 -
+ styles/changebar.perl | 8 +++----
+ styles/color.perl | 6 ------
+ styles/html.perl | 2 +-
+ styles/htmllist.perl | 8 +++----
+ styles/makeidx.perl | 2 +-
+ styles/more_amsmath.perl | 11 +++++-----
+ styles/natbib.perl | 4 +---
+ styles/webtex.perl | 16 +++++++-------
+ versions/html3_1.pl | 50 ++++++++++++++++++-------------------------
+ versions/html3_2.pl | 34 +++++++++++------------------
+ versions/html4_0.pl | 34 +++++++++++------------------
+ versions/html4_01.pl | 34 +++++++++++------------------
+ versions/html4_1.pl | 34 +++++++++++------------------
+ versions/math.pl | 52 +++++++++++++++++++--------------------------
+ 19 files changed, 128 insertions(+), 203 deletions(-)
+
+diff --git a/IndicTeX-HTML/itrans.perl b/IndicTeX-HTML/itrans.perl
+index 7c99cb1..dbb618d 100644
+--- a/IndicTeX-HTML/itrans.perl
++++ b/IndicTeX-HTML/itrans.perl
+@@ -405,13 +405,13 @@ sub do_env_pre_itrans {
+ } else {
+ if ($this_par =~ /^\\/) {
+ #catch 'paragraphs' that are just TeX macros
+- local($savedRS) = $/; $/ = ''; $* = 1;
+- if ($this_par =~ /^(\s*\\\w+)+$/s ) {
++ local($savedRS) = $/; $/ = '';
++ if ($this_par =~ /^(\s*\\\w+)+$/sm ) {
+ # save them for the next paragraph
+ $saved_par .= $this_par."\n\n";
+- $/ = $savedRS; $* = 0; next;
++ $/ = $savedRS; next;
+ }
+- $/ = $savedRS; $* = 0;
++ $/ = $savedRS;
+ }
+ if ($saved_par) {
+ #include any saved macros
+diff --git a/latex2html.pin b/latex2html.pin
+index 6622723..fdf68c2 100644
+--- a/latex2html.pin
++++ b/latex2html.pin
+@@ -10618,19 +10618,17 @@ sub do_rightquotes { (($HTML_VERSION < 5)? '”' : ';SPMrdquo;') }
+ 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>' );
+@@ -11445,7 +11443,6 @@ sub list_helper {
+ # $/ = $savedRS;
+ #
+
+- $* = 1; # Multiline matching ON
+ if (($tag =~ /DL/)&&$labels) {
+ local($label,$aft,$br_id);
+ s/\\item\b[\s\r]*([^\[])/do {
+@@ -11454,9 +11451,8 @@ sub list_helper {
+ $label = &translate_environments(
+ "$O$br_id$C$label$O$br_id$C");
+ join('',"\\item\[" , $label, "\]$aft" );
+- }/eg;
++ }/egm;
+ }
+- $* = 0; # Multiline matching OFF
+
+ # This deals with \item[xxx] ...
+ if ($tag =~ /DL/) {
+@@ -13173,9 +13169,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) );
+diff --git a/styles/alltt.perl b/styles/alltt.perl
+index 9884f78..ade8b1b 100644
+--- a/styles/alltt.perl
++++ b/styles/alltt.perl
+@@ -50,15 +50,15 @@ sub preprocess_alltt {
+ local ($before, $after, $alltt, $alltt_env);
+ local ($alltt_begin) = "<alltt_begin>";
+ local ($alltt_end) = "<alltt_end>";
+- local($saveRS) = $/; $*=1;undef $/;
++ local($saveRS) = $/; undef $/;
+ while (/\\begin\s*{($alltt_rx)}([ \t]*\n)?/m) {
+ $alltt_env = $1;
+ $alltt = "";
+ ($before, $after) = ($`, $');
+- if ($after =~ /\\end\s*{($alltt_rx)}/s) {
++ if ($after =~ /\\end\s*{($alltt_rx)}/sm) {
+ ($alltt, $after) = ($`, $');
+ local(@check) = split("\n",$before);
+- local($lastline) = pop @check unless ($before =~ s/\n$//s);
++ local($lastline) = pop @check unless ($before =~ s/\n$//sm);
+ $alltt = &alltt_helper($alltt) # shield special chars
+ unless ($lastline =~ /(^|[^\\])(\\\\)*%.*$/m); # unless commented out
+ undef @check; undef $lastline;
+@@ -67,8 +67,8 @@ sub preprocess_alltt {
+ , $alltt, $alltt_end, "{$alltt_env}", $after);
+ }
+ $/ = $saveRS;
+- s/$alltt_begin\{([^\}]*)\}/\\begin{$1}/gos;
+- s/$alltt_end\{([^\}]*)\}/\\end{$1}/gos;
++ s/$alltt_begin\{([^\}]*)\}/\\begin{$1}/gosm;
++ s/$alltt_end\{([^\}]*)\}/\\end{$1}/gosm;
+ }
+
+ sub alltt_helper {
+diff --git a/styles/amsmath.perl b/styles/amsmath.perl
+index 063a6db..ff64e6e 100644
+--- a/styles/amsmath.perl
++++ b/styles/amsmath.perl
+@@ -458,7 +458,6 @@ sub get_eqn_number {
+ , $EQNO_END);
+ }
+ } else { $tag = ';SPMnbsp;' }
+- $*=0;
+ if ($labels) {
+ $labels =~ s/$anchor_mark/$tag/o;
+ ($labels , $scan);
+diff --git a/styles/amstex.perl b/styles/amstex.perl
+index b9dc79b..361f08a 100644
+--- a/styles/amstex.perl
++++ b/styles/amstex.perl
+@@ -404,7 +404,6 @@ sub get_eqn_number {
+ , $EQNO_END);
+ }
+ } else { $tag = ';SPMnbsp;' }
+- $*=0;
+ if ($labels) {
+ $labels =~ s/$anchor_mark/$tag/o;
+ ($labels , $scan);
+diff --git a/styles/changebar.perl b/styles/changebar.perl
+index e85da46..d837ee2 100644
+--- a/styles/changebar.perl
++++ b/styles/changebar.perl
+@@ -126,11 +126,11 @@ sub do_env_changebar {
+ $_ = &translate_environments($_);
+
+ # multiple ends of change-bars have icons on the same line.
+- $* = 1; local($saveRS) = $/; undef $/;
++ local($saveRS) = $/; undef $/;
+ s/(($endstr[^<]*<\/$cbstyle>)\s*<BR>(<<\d+>>($cbversion_rx)?)?\s*$)/
+- if ($`) {$1} else { $endcb = 0; $2.$3 }/eg;
+- s/($cbend_rx\s*$)/ if ($`) { $1 } else { $endcb = 0; $2.$4 }/eg;
+- $* = 0; $/ = $saveRS;
++ if ($`) {$1} else { $endcb = 0; $2.$3 }/egm;
++ s/($cbend_rx\s*$)/ if ($`) { $1 } else { $endcb = 0; $2.$4 }/egm;
++ $/ = $saveRS;
+
+
+ if ($this_version) {
+diff --git a/styles/color.perl b/styles/color.perl
+index e326bc3..43b5e46 100644
+--- a/styles/color.perl
++++ b/styles/color.perl
+@@ -145,7 +145,6 @@ $BKGSTRING = "bgcolor";
+ sub read_rgb_colors {
+ local($base_file) = @_;
+ local($file) = $base_file;
+- local($prev) = $*;
+ local($r,$g,$b,$name,$dir);
+ foreach $dir (split(/$envkey/,$LATEX2HTMLSTYLES)) {
+ $file = "$dir$dd$base_file"
+@@ -154,7 +153,6 @@ sub read_rgb_colors {
+ if (-f $file) {
+ if (open(COLORFILE,"<$file")) {
+ print STDOUT "\n(reading colors from $file" if $DEBUG;
+- $* = 0; # Multiline matching OFF
+ while (<COLORFILE>) {
+ s/^\s*(\d+)\s+(\d+)\s+(\d+)\s+(\w+(\s\w+)*)\s*/
+ ($r,$g,$b,$name)=($1,$2,$3,$4);
+@@ -170,14 +168,12 @@ sub read_rgb_colors {
+ }
+ }
+ }
+- $* = $prev; # Restore Multiline matching
+ $_[0];
+ }
+
+ sub read_cmyk_colors {
+ local($base_file) = @_;
+ local($file) = $base_file;
+- local($prev) = $*;
+ local($c,$m,$y,$k,$name,$dir, at colors);
+ local($num_rx) = "(\\d|\\d\\.\\d*)";
+ foreach $dir (split(/$envkey/,$LATEX2HTMLSTYLES)) {
+@@ -187,7 +183,6 @@ sub read_cmyk_colors {
+ if (-f $file) {
+ if (open(COLORFILE,"<$file")) {
+ print STDOUT "\n(reading colors from $file";
+- $* = 0; # Multiline matching OFF
+ @colors = (<COLORFILE>);
+ foreach (@colors) {
+ next if (/^\s*$/);
+@@ -211,7 +206,6 @@ sub read_cmyk_colors {
+ }
+ }
+ }
+- $* = $prev; # Restore Multiline matching
+ $_[0];
+ }
+
+diff --git a/styles/html.perl b/styles/html.perl
+index 7968e1d..367f44b 100644
+--- a/styles/html.perl
++++ b/styles/html.perl
+@@ -236,7 +236,7 @@ sub do_cmd_htmladdnormallink{
+ $url = &missing_braces unless
+ ((s/$next_pair_pr_rx/$url = $2; ''/eo)
+ ||(s/$next_pair_rx/$url = $2; ''/eo));
+- $*=1; s/^\s+/\n/; $*=0;
++ s/^\s+/\n/m;
+ if ($name) { $href = &make_named_href($name,$url,$text) }
+ else { $href = &make_href($url,$text) }
+ print "\nHREF:$href" if ($VERBOSITY > 3);
+diff --git a/styles/htmllist.perl b/styles/htmllist.perl
+index c356d6b..0b0a875 100644
+--- a/styles/htmllist.perl
++++ b/styles/htmllist.perl
+@@ -96,7 +96,6 @@ sub do_env_htmllist{
+ local($imagemark,$mark,$item_len,$desc_len,$mark_len,$mark_size);
+ $imagemark = &set_htmllist_marker($bullet) if ($bullet);
+
+- $* = 1;
+ local($Maxlength) = 99999;
+ local($i, at items_done);
+ print "[";
+@@ -114,8 +113,8 @@ sub do_env_htmllist{
+ $_ = $&.$';
+ push(@items_done,&translate_commands($`));
+ $mark = &missing_braces unless (
+- (s/\\htmlitemmark$any_next_pair_pr_rx/$mark=$2;''/eo)
+- ||(s/\\htmlitemmark$any_next_pair_rx/$mark=$2;''/eo));
++ (s/\\htmlitemmark$any_next_pair_pr_rx/$mark=$2;''/eom)
++ ||(s/\\htmlitemmark$any_next_pair_rx/$mark=$2;''/eom));
+ $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{
+ $_=$';
+ }
+ }
+- $* = 0;
+ $_ = join('', at items_done, $_); undef @items_done;
+
+ #RRM: cannot have anything before the first <LI>
+@@ -148,7 +146,7 @@ sub do_env_htmllist{
+ $preitems =~ s/<P( [^>]*)?>//g;
+ $preitems = "\n".$preitems if $preitems;
+ }
+- $/ = $savedRS; $* = 0; # Multiline matching OFF
++ $/ = $savedRS;
+
+ $_ = '<DT>'.$_ unless (/^\s*<D(D|T)/);
+ print "]";
+diff --git a/styles/makeidx.perl b/styles/makeidx.perl
+index ca5657e..e42660e 100644
+--- a/styles/makeidx.perl
++++ b/styles/makeidx.perl
+@@ -189,7 +189,7 @@ sub named_index_entry {
+ # ! -> \001
+ # @ -> \002
+ # | -> \003
+- $* = 1; $str =~ s/\n\s*/ /g; $* = 0; # remove any newlines
++ $str =~ s/\n\s*/ /gm; # remove any newlines
+ # protect \001 occurring with images
+ $str =~ s/\001/\016/g;
+
+diff --git a/styles/more_amsmath.perl b/styles/more_amsmath.perl
+index 8c8ae30..b760a01 100644
+--- a/styles/more_amsmath.perl
++++ b/styles/more_amsmath.perl
+@@ -94,7 +94,6 @@ sub get_eqn_number {
+ , $EQNO_END);
+ }
+ } else { $tag = ';SPMnbsp;;SPMnbsp;;SPMnbsp;' }
+- $*=0;
+ if ($labels) {
+ $labels =~ s/$anchor_mark/$tag/o;
+ ($labels , $scan);
+@@ -285,7 +284,7 @@ sub process_env_equation {
+ } else { $return .= join('', $mspace , $ecell, $erow); }
+ } else {
+ $thismath = $_;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $thismath = &process_math_in_latex("indisplay",'',''
+ , $doimage.$thismath ) unless ($thismath eq '' );
+@@ -430,7 +429,7 @@ sub process_env_multline {
+
+ # columns to be set using \displaystyle
+ $thismath = $_;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $thismath = &process_math_in_latex("indisplay",'',''
+ , $doimage.$thismath ) unless ($thismath eq '' );
+@@ -767,7 +766,7 @@ sub process_env_align{
+ # alternating right/left aligned
+ $scell = (($scell eq $slcell)? $srcell : $slcell) if ($col_cnt);
+ $thismath = $_; $col_cnt++;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $thismath = &process_math_in_latex("indisplay",'',''
+ , $doimage.$thismath ) unless ($thismath eq '' );
+@@ -923,7 +922,7 @@ sub do_env_split {
+ @cols = split(/$mdlim/o);
+ # left column, set using \displaystyle
+ $thismath = shift(@cols);
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $thismath = &process_math_in_latex("indisplay",'',''
+ , $doimage.$thismath ) unless ($thismath eq '' );
+@@ -940,7 +939,7 @@ sub do_env_split {
+
+ # right column, set using \displaystyle
+ $thismath = shift(@cols);
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $thismath = &process_math_in_latex("indisplay",'',''
+ , $doimage.$thismath ) unless ($thismath eq '' );
+diff --git a/styles/natbib.perl b/styles/natbib.perl
+index dbbfee4..93d8e1a 100644
+--- a/styles/natbib.perl
++++ b/styles/natbib.perl
+@@ -1385,12 +1385,10 @@ sub do_env_thebibliography {
+ $citefile = $CURRENT_FILE;
+ $citefiles{$bbl_nr} = $citefile;
+ s/$next_pair_rx//o;
+- $* = 1; # Multiline matching ON
+ # s/^\s*$//g; # Remove empty lines (otherwise will have paragraphs!)
+ # s/\n//g; # Remove all \n s --- we format the HTML file ourselves.
+ # $* = 0; # Multiline matching OFF
+- s/\\newblock/\<BR\>/g; # break at each \newblock
+- $* = 0; # Multiline matching OFF
++ s/\\newblock/\<BR\>/gm; # break at each \newblock
+ s/\\penalty\d+//mg; # Remove \penalty declarations
+
+ local($this_item,$this_kind, $title);
+diff --git a/styles/webtex.perl b/styles/webtex.perl
+index 576c882..a0c7c3a 100644
+--- a/styles/webtex.perl
++++ b/styles/webtex.perl
+@@ -121,29 +121,29 @@ sub convert_to_webtex {
+ if($WEBEQ_IMG_ONLY) { return (1,$no_applet) };
+
+ local($savedRS, $failed, $env_id, $_) = ($/,'','',$orig);
+- $/=''; $* = 1;
++ $/='';
+ if ($mode =~ /inline/) {
+ if (/^\s*\\\(/) { $failed = 1 }
+ else {
+ $_ = &revert_to_raw_tex($_);
+- $_ =~ s/^\s*\$?/\$/s;
+- $_ =~ s/\$?$/\$/s;
++ $_ =~ s/^\s*\$?/\$/sm;
++ $_ =~ s/\$?$/\$/sm;
+ $env_id .= $WEBEQ_INL if $USING_STYLES;
+ }
+ } elsif ($mode =~ /display/) {
+ if (/^\s*\$\$/) { $failed = 1 }
+ else {
+ $_ = &revert_to_raw_tex($_);
+- $_ =~ s/^\s*(\\\[|\$\$)?/\\\[/s;
+- $_ =~ s/(\$\$|\\\])?\s*$/\\\]/s;
++ $_ =~ s/^\s*(\\\[|\$\$)?/\\\[/sm;
++ $_ =~ s/(\$\$|\\\])?\s*$/\\\]/sm;
+ $env_id .= $WEBEQ_DIS if $USING_STYLES;
+ }
+ } else {
+ print " *** Unknown WebTeX mode, no applet ***";
+- $/ = $savedRS; $* = 0;
++ $/ = $savedRS;
+ return (0,$no_applet)
+ }
+- $/ = $savedRS; $* = 0;
++ $/ = $savedRS;
+ return (0,$no_applet) if $failed;
+
+ ($failed,$_) = &check_only_webtex($_);
+@@ -324,7 +324,7 @@ sub cleanup_mml_attribs {
+ local($mml_code) = join('',<MML>);
+ close MML;
+
+- local($savedRS) = $/; $*=0; $/='';
++ local($savedRS) = $/; $/='';
+ $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;
+diff --git a/versions/html3_1.pl b/versions/html3_1.pl
+index 635f10b..3c1f10e 100644
+--- a/versions/html3_1.pl
++++ b/versions/html3_1.pl
+@@ -78,7 +78,7 @@ sub do_env_tex2html_wrap {
+ 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) }
+- $* = 1; s/^\s*|\s*$//g; $*=0;
++ s/^\s*|\s*$//gm;
+ local($saved) = $_;
+ # if (s/^\\\(|^\$|^\\math|\\\)$|\$$|\\endmath//g) {}
+ if (s/^$math_start_rx|${math_end_rx}$//g) {}
+@@ -161,23 +161,21 @@ sub do_env_equation {
+ local($seqno) = join('',"\n<TD$eqno_class WIDTH=10 ALIGN=\""
+ , (($EQN_TAGS =~ /L/)? 'LEFT': 'RIGHT')
+ , "\">\n");
+- $* = 1;
+ do { # include the equation number, using a <TABLE>
+ $global{'eqn_number'}++;
+ $eqno = join('', $EQNO_START
+ , &simplify(&translate_commands('\theequation'))
+ , $EQNO_END);
+- } unless ((s/(\\nonumber|\\notag)//g)||(/\\tag/));
+- if (s/\\tag(\*)?//){
++ } unless ((s/(\\nonumber|\\notag)//gm)||(/\\tag/));
++ if (s/\\tag(\*)?//m){
+ # AmS-TEX line-number tags.
+ local($nobrack,$before) = ($1,$`);
+ $_ = $';
+- s/next_pair_pr_rx//o;
++ s/next_pair_pr_rx//om;
+ if ($nobrack) { $eqno = $2 }
+ else { $eqno = join('',$EQNO_START, $2, $EQNO_END ) }
+ $_ = $before;
+ }
+- $* = 0;
+
+ local($halign) = " ALIGN=\"CENTER\"" unless $FLUSH_EQN;
+ if ($EQN_TAGS =~ /L/) {
+@@ -353,7 +351,7 @@ sub make_math {
+
+ # remove white space at the extremities
+ # do{ $*=1; s/(^\s+|\s+$)//; $*=0; } unless ($NO_SIMPLE_MATH);
+- $*=1; s/^\s//o;s/\s$//; $*=0;
++ s/^\s//o;s/\s$//m;
+
+ $_;
+ }
+@@ -970,7 +968,7 @@ sub do_env_eqnarray {
+
+ if (s/\\lefteqn//) {
+ $return .= "\"LEFT\" COLSPAN=\"3\">";
+- $* =1; s/(^\s*|$html_specials{'&'}|\s*$)//g; $*=0;
++ s/(^\s*|$html_specials{'&'}|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $_ = (($_)? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$_ ):'');
+@@ -989,7 +987,7 @@ sub do_env_eqnarray {
+
+ # left column, set using \displaystyle
+ $thismath = shift(@cols);
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$thismath ):'');
+@@ -1006,7 +1004,7 @@ sub do_env_eqnarray {
+ $thismath = shift(@cols);
+ if (!($#cols < 0)) {
+ #print "\nEQNARRAY:$#cols : $thismath";
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , 'text', '', $doimage.$thismath ):'');
+@@ -1026,7 +1024,7 @@ sub do_env_eqnarray {
+ &write_warnings($eqnarray_warning);
+ print "\n\n *** $eqnarray_warning \n";
+ }
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$thismath ):'');
+@@ -1385,7 +1383,7 @@ sub translate_math_commands {
+ }
+
+ ($pre_text,$labels) = &extract_labels($pre_text);
+- local($savedRS) = $/; $/ = ''; $* = 1;
++ local($savedRS) = $/; $/ = '';
+ # 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 {
+ # local($savedRS) = $/; $/ = ''; $*=1;
+ while ( $cnt && $found ) {
+ $found = '';
+- if ($post_pre_text =~ /\\(begin|end)(($O|$OP)\d+($C|$CP))$env$star\2/s)
++ if ($post_pre_text =~ /\\(begin|end)(($O|$OP)\d+($C|$CP))$env$star\2/sm)
+ { $pre_text .= $`; $found = $1;
+ $this_env = $&; $post_pre_text = $'; }
+ if ($found =~ /begin/) {
+@@ -1403,7 +1401,7 @@ sub translate_math_commands {
+ $cnt--; $pre_text .= $this_env if ($cnt > 0) ;
+ }
+ }
+- $* = 0; $/ = $savedRS;
++ $/ = $savedRS;
+ $env .= 'star' if $star;
+ local($env_cmd) = 'do_env_'.$env;
+ # parse it further, when possible...
+@@ -1430,7 +1428,7 @@ sub translate_math_commands {
+ $pre_text = &process_math_in_latex($mode,$style,$slevel,$pre_text)
+ if ($pre_text);
+ }
+- $* = 0; $/ = $savedRS;
++ $/ = $savedRS;
+ return($labels . $pre_text) unless ($_);
+
+ local($post_text, $this_text, $which_text);
+@@ -1494,7 +1492,7 @@ sub make_math_comment{
+ $ecomm = "\n\\end{$env}";
+ } unless ($env =~/tex2html/);
+ $_ = &revert_to_raw_tex;
+- $* = 1; s/^\s+//; s/\s+$//; $* = 0;
++ s/^\s+//; s/\s+$//m;
+ $_ = $scomm . $_ . $ecomm;
+ return() if (length($_) < 12);
+ $global{'verbatim_counter'}++;
+@@ -1637,20 +1635,18 @@ sub parse_math_toks {
+ local ($saved) = $_;
+ $_ = $';
+ # find the \end, including nested environments of same type.
+- $* = 1;
+ local($cnt, $thisbit, $which) = (1,'','');
+- while ( /\\(begin|end)(<#\d+#>)($env|$array_env_rx)(\*|star)?\2/s ) {
++ while ( /\\(begin|end)(<#\d+#>)($env|$array_env_rx)(\*|star)?\2/sm ) {
+ $thisbit = $` . $&; $_ = $'; $which = $1;
+ do {
+ # mark rows/columns in nested arrays
+- $thisbit =~ s/;SPMamp;/$array_col_mark/g;
+- $thisbit =~ s/\\(\\|cr(cr)?(\b|$|\d|\W))/$array_row_mark$3/g;
++ $thisbit =~ s/;SPMamp;/$array_col_mark/gm;
++ $thisbit =~ s/\\(\\|cr(cr)?(\b|$|\d|\W))/$array_row_mark$3/gm;
+ } if ($cnt > 1);
+ $this .= $thisbit;
+ if ($which =~ /begin/) {$cnt++} else {$cnt--};
+ last if (!$cnt);
+ }
+- $* = 0;
+
+ # $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 {
+ $this .= $extra;
+ $this = &process_math_in_latex($mode,$style,$slevel,$this);
+ } else {
+- $*=1;
+- $star =~ s/\*/\\\*/o if ($star);
+- $this =~ s/^\\begin(<#\d+#>)$env$star\1//;
+- $this =~ s/\\end(<#\d+#>)$env$star\1\s*$//;
+- $*=0;
++ $star =~ s/\*/\\\*/om if ($star);
++ $this =~ s/^\\begin(<#\d+#>)$env$star\1//m;
++ $this =~ s/\\end(<#\d+#>)$env$star\1\s*$//m;
+ do {
+ local($in_array) = 1;
+ local($_) = $this;
+@@ -2376,9 +2370,7 @@ sub get_supsub {
+ } elsif ($5) {
+ $supsub .= $1; $which .= (($5 =~ /b/) ? '_' : '^');
+ local($multisub_type) = $5;
+- $* = 1;
+- s/\\end(($O|$OP)\d+($C|$CP))$multisub_type\1/$supsub .= $`.$&;''/e;
+- $* = 0;
++ s/\\end(($O|$OP)\d+($C|$CP))$multisub_type\1/$supsub .= $`.$&;''/em;
+ } else { $supsub .= "\{^\\prime\}" }
+ }
+ # include dummy sup/sub-scripts to enhance the vertical spacing
+diff --git a/versions/html3_2.pl b/versions/html3_2.pl
+index 4093cdb..58429ac 100644
+--- a/versions/html3_2.pl
++++ b/versions/html3_2.pl
+@@ -406,9 +406,7 @@ sub translate_colspec {
+ }
+ $celldata .= ' ' if ($celldata =~ /\\\w+$/);
+
+- $* = 1; # multiline matching ON
+- $celldata =~ s/$wrap_parbox_rx/$6/g;
+- $* = 0; # multiline matching OFF
++ $celldata =~ s/$wrap_parbox_rx/$6/gm;
+ # $at_text .= $celldata;
+ # if ( $#colspec > -1) {
+ # $colspec[$#colspec] .= join('', "<TD ALIGN=\"LEFT\">",$celldata,'</TD>');
+@@ -434,9 +432,7 @@ sub translate_colspec {
+ }
+ $celldata .= ' ' if ($celldata =~ /\\\w+$/);
+
+- $* = 1; # multiline matching ON
+- $celldata =~ s/$wrap_parbox_rx/$6/g;
+- $* = 0; # multiline matching OFF
++ $celldata =~ s/$wrap_parbox_rx/$6/gm;
+ $at_text .= $celldata;
+
+ } elsif ( $char =~ /;|\&/ ) {
+@@ -596,9 +592,7 @@ sub process_tabular {
+
+ while (/\\parbox/) {
+ local($parlength) = length($_);
+- $* = 1; # multiline matching ON
+- s/$wrap_parbox_rx/&convert_parbox_newlines($6)/eg;
+- $* = 0; # multiline matching OFF
++ s/$wrap_parbox_rx/&convert_parbox_newlines($6)/egm;
+
+ if ($parlength == length($_)) {
+ print "\n*** \\parbox's remain in table!!\n";
+@@ -823,9 +817,7 @@ sub process_tabular {
+ }
+ $colspec = &translate_environments("$OP$tmp$CP$colspec$OP$tmp$CP");
+ $colspec = &translate_commands($colspec);
+- $* = 1;
+- while ($colspec =~ s/<(\w+)>\s*<\/\1>//g) {};
+- $* = 0;
++ while ($colspec =~ s/<(\w+)>\s*<\/\1>//gm) {};
+ $colspec = ';SPMnbsp;' if ($colspec =~ /^\s*$/);
+ $colspec = join('', $reopens, $colspec
+ , (@$open_tags_R ? &close_all_tags() : '')
+@@ -966,7 +958,7 @@ sub make_math_comment{
+ $ecomm = "\n\\end{$env}";
+ } unless ($env =~/tex2html/);
+ $_ = &revert_to_raw_tex;
+- $* = 1; s/^\s+//s; s/\s+$//s; $* = 0;
++ s/^\s+//s; s/\s+$//sm;
+ $_ = $scomm . $_ . $ecomm;
+ return() if (length($_) < 16);
+ $global{'verbatim_counter'}++;
+@@ -1057,20 +1049,19 @@ sub do_env_equation {
+ local($seqno) = join('',"\n<TD$eqno_class WIDTH=10 ALIGN=\""
+ , (($EQN_TAGS =~ /L/)? 'LEFT': 'RIGHT')
+ , "\">\n");
+- $* = 1;
+ do { # get the equation number
+ $global{'eqn_number'}++;
+ $eqno = &translate_commands('\theequation');
+- } unless ((s/(\\nonumber|\\notag)//g)||(/\\tag/));
++ } unless ((s/(\\nonumber|\\notag)//gm)||(/\\tag/));
+ if (/\\tag(\*)?/){
+ # AmS-TEX line-number tags.
+ if (defined &get_eqn_number ) {
+ ($eqno, $_) = &get_eqn_number(1,$_);
+ } else {
+- s/\\tag(\*)?//;
++ s/\\tag(\*)?//m;
+ local($nobrack,$before) = ($1,$`);
+ $_ = $';
+- s/next_pair_pr_rx//o;
++ s/next_pair_pr_rx//om;
+ if ($nobrack) { $eqno = $2; }
+ else { $eqno = join('',$EQNO_START, $2, $EQNO_END) };
+ $_ = $before;
+@@ -1078,7 +1069,6 @@ sub do_env_equation {
+ } elsif ($eqno) {
+ $eqno = join('',$EQNO_START, $eqno, $EQNO_END)
+ } else { $eqno = ' ' } # spacer, when no numbering
+- $* = 0;
+
+ # include the equation-number, using a <TABLE>
+ local($halign) = $math_class unless $FLUSH_EQN;
+@@ -1255,7 +1245,7 @@ sub do_env_eqnarray {
+ # if (s/\\lefteqn$OP(\d+)$CP(.*)$OP\1$CP/ $2 /) {
+ if (s/\\lefteqn//) {
+ $return .= "\"LEFT\" COLSPAN=\"3\">";
+- $* =1; s/(^\s*|$html_specials{'&'}|\s*$)//g; $*=0;
++ s/(^\s*|$html_specials{'&'}|\s*$)//gm;
+ if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
+ $_ = (($_)? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$_ ):'');
+@@ -1280,7 +1270,7 @@ sub do_env_eqnarray {
+
+ # left column, set using \displaystyle
+ $thismath = shift(@cols); $failed = 0;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$thismath ):'');
+@@ -1300,7 +1290,7 @@ sub do_env_eqnarray {
+
+ # center column, set using \textstyle
+ $thismath = shift(@cols); $failed = 0;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ 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 {
+
+ # right column, set using \displaystyle
+ $thismath = shift(@cols); $failed = 0;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$thismath ):'');
+diff --git a/versions/html4_0.pl b/versions/html4_0.pl
+index ac79a33..57c16e2 100644
+--- a/versions/html4_0.pl
++++ b/versions/html4_0.pl
+@@ -745,9 +745,7 @@ sub translate_colspec {
+ }
+ $celldata .= ' ' if ($celldata =~ /\\\w+$/);
+
+- $* = 1; # multiline matching ON
+- $celldata =~ s/$wrap_parbox_rx/$6/g;
+- $* = 0; # multiline matching OFF
++ $celldata =~ s/$wrap_parbox_rx/$6/gm;
+ # $at_text .= $celldata;
+ # if ( $#colspec > -1) {
+ # $colspec[$#colspec] .= join('', "<TD ALIGN=\"LEFT\">",$celldata,'</TD>');
+@@ -773,9 +771,7 @@ sub translate_colspec {
+ }
+ $celldata .= ' ' if ($celldata =~ /\\\w+$/);
+
+- $* = 1; # multiline matching ON
+- $celldata =~ s/$wrap_parbox_rx/$6/g;
+- $* = 0; # multiline matching OFF
++ $celldata =~ s/$wrap_parbox_rx/$6/gm;
+ $at_text .= $celldata;
+
+ } elsif ( $char =~ /;|\&/ ) {
+@@ -944,9 +940,7 @@ sub process_tabular {
+
+ while (/\\parbox/) {
+ local($parlength) = length($_);
+- $* = 1; # multiline matching ON
+- s/$wrap_parbox_rx/&convert_parbox_newlines($6)/eg;
+- $* = 0; # multiline matching OFF
++ s/$wrap_parbox_rx/&convert_parbox_newlines($6)/egm;
+
+ if ($parlength == length($_)) {
+ print "\n*** \\parbox's remain in table!!\n";
+@@ -1175,9 +1169,7 @@ sub process_tabular {
+ }
+ $colspec = &translate_environments("$OP$tmp$CP$colspec$OP$tmp$CP");
+ $colspec = &translate_commands($colspec);
+- $* = 1;
+- while ($colspec =~ s/<(\w+)>\s*<\/\1>//g) {};
+- $* = 0;
++ while ($colspec =~ s/<(\w+)>\s*<\/\1>//gm) {};
+ $colspec = ';SPMnbsp;' if ($colspec =~ /^\s*$/);
+ $colspec = join('', $reopens, $colspec
+ , (@$open_tags_R ? &close_all_tags() : '')
+@@ -1317,7 +1309,7 @@ sub make_math_comment{
+ $ecomm = "\n\\end{$env}";
+ } unless ($env =~/tex2html/);
+ $_ = &revert_to_raw_tex;
+- $* = 1; s/^\s+//s; s/\s+$//s; $* = 0;
++ s/^\s+//s; s/\s+$//sm;
+ $_ = $scomm . $_ . $ecomm;
+ return() if (length($_) < 16);
+ $global{'verbatim_counter'}++;
+@@ -1419,20 +1411,19 @@ sub do_env_equation {
+ local($seqno) = join('',"\n<TD$eqno_class WIDTH=10 ALIGN=\""
+ , (($EQN_TAGS =~ /L/)? 'LEFT': 'RIGHT')
+ , "\">\n");
+- $* = 1;
+ do { # get the equation number
+ $global{'eqn_number'}++;
+ $eqno = &translate_commands('\theequation');
+- } unless ((s/(\\nonumber|\\notag)//g)||(/\\tag/));
++ } unless ((s/(\\nonumber|\\notag)//gm)||(/\\tag/));
+ if (/\\tag(\*)?/){
+ # AmS-TEX line-number tags.
+ if (defined &get_eqn_number ) {
+ ($eqno, $_) = &get_eqn_number(1,$_);
+ } else {
+- s/\\tag(\*)?//;
++ s/\\tag(\*)?//m;
+ local($nobrack,$before) = ($1,$`);
+ $_ = $';
+- s/next_pair_pr_rx//o;
++ s/next_pair_pr_rx//om;
+ if ($nobrack) { $eqno = $2; }
+ else { $eqno = join('',$EQNO_START, $2, $EQNO_END) };
+ $_ = $before;
+@@ -1440,7 +1431,6 @@ sub do_env_equation {
+ } elsif ($eqno) {
+ $eqno = join('',$EQNO_START, $eqno, $EQNO_END)
+ } else { $eqno = ' ' } # spacer, when no numbering
+- $* = 0;
+
+ # include the equation-number, using a <TABLE>
+ local($halign) = " ALIGN=\"CENTER\"" unless $FLUSH_EQN;
+@@ -1620,7 +1610,7 @@ sub do_env_eqnarray {
+ # if (s/\\lefteqn$OP(\d+)$CP(.*)$OP\1$CP/ $2 /) {
+ if (s/\\lefteqn//) {
+ $return .= "\"LEFT\" COLSPAN=\"3\">";
+- $* =1; s/(^\s*|$html_specials{'&'}|\s*$)//g; $*=0;
++ s/(^\s*|$html_specials{'&'}|\s*$)//gm;
+ if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
+ $_ = (($_)? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$_ ):'');
+@@ -1645,7 +1635,7 @@ sub do_env_eqnarray {
+
+ # left column, set using \displaystyle
+ $thismath = shift(@cols); $failed = 0;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$thismath ):'');
+@@ -1665,7 +1655,7 @@ sub do_env_eqnarray {
+
+ # center column, set using \textstyle
+ $thismath = shift(@cols); $failed = 0;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ 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 {
+
+ # right column, set using \displaystyle
+ $thismath = shift(@cols); $failed = 0;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$thismath ):'');
+diff --git a/versions/html4_01.pl b/versions/html4_01.pl
+index dc00415..9cc3e31 100644
+--- a/versions/html4_01.pl
++++ b/versions/html4_01.pl
+@@ -766,9 +766,7 @@ sub translate_colspec {
+ }
+ $celldata .= ' ' if ($celldata =~ /\\\w+$/);
+
+- $* = 1; # multiline matching ON
+- $celldata =~ s/$wrap_parbox_rx/$6/g;
+- $* = 0; # multiline matching OFF
++ $celldata =~ s/$wrap_parbox_rx/$6/gm;
+ # $at_text .= $celldata;
+ # if ( $#colspec > -1) {
+ # $colspec[$#colspec] .= join('', "<TD ALIGN=\"LEFT\">",$celldata,'</TD>');
+@@ -794,9 +792,7 @@ sub translate_colspec {
+ }
+ $celldata .= ' ' if ($celldata =~ /\\\w+$/);
+
+- $* = 1; # multiline matching ON
+- $celldata =~ s/$wrap_parbox_rx/$6/g;
+- $* = 0; # multiline matching OFF
++ $celldata =~ s/$wrap_parbox_rx/$6/gm;
+ $at_text .= $celldata;
+
+ } elsif ( $char =~ /;|\&/ ) {
+@@ -965,9 +961,7 @@ sub process_tabular {
+
+ while (/\\parbox/) {
+ local($parlength) = length($_);
+- $* = 1; # multiline matching ON
+- s/$wrap_parbox_rx/&convert_parbox_newlines($6)/eg;
+- $* = 0; # multiline matching OFF
++ s/$wrap_parbox_rx/&convert_parbox_newlines($6)/egm;
+
+ if ($parlength == length($_)) {
+ print "\n*** \\parbox's remain in table!!\n";
+@@ -1196,9 +1190,7 @@ sub process_tabular {
+ }
+ $colspec = &translate_environments("$OP$tmp$CP$colspec$OP$tmp$CP");
+ $colspec = &translate_commands($colspec);
+- $* = 1;
+- while ($colspec =~ s/<(\w+)>\s*<\/\1>//g) {};
+- $* = 0;
++ while ($colspec =~ s/<(\w+)>\s*<\/\1>//gm) {};
+ $colspec = ';SPMnbsp;' if ($colspec =~ /^\s*$/);
+ $colspec = join('', $reopens, $colspec
+ , (@$open_tags_R ? &close_all_tags() : '')
+@@ -1338,7 +1330,7 @@ sub make_math_comment{
+ $ecomm = "\n\\end{$env}";
+ } unless ($env =~/tex2html/);
+ $_ = &revert_to_raw_tex;
+- $* = 1; s/^\s+//s; s/\s+$//s; $* = 0;
++ s/^\s+//s; s/\s+$//sm;
+ $_ = $scomm . $_ . $ecomm;
+ return() if (length($_) < 16);
+ $global{'verbatim_counter'}++;
+@@ -1440,20 +1432,19 @@ sub do_env_equation {
+ local($seqno) = join('',"\n<TD$eqno_class WIDTH=10 ALIGN=\""
+ , (($EQN_TAGS =~ /L/)? 'LEFT': 'RIGHT')
+ , "\">\n");
+- $* = 1;
+ do { # get the equation number
+ $global{'eqn_number'}++;
+ $eqno = &translate_commands('\theequation');
+- } unless ((s/(\\nonumber|\\notag)//g)||(/\\tag/));
++ } unless ((s/(\\nonumber|\\notag)//gm)||(/\\tag/));
+ if (/\\tag(\*)?/){
+ # AmS-TEX line-number tags.
+ if (defined &get_eqn_number ) {
+ ($eqno, $_) = &get_eqn_number(1,$_);
+ } else {
+- s/\\tag(\*)?//;
++ s/\\tag(\*)?//m;
+ local($nobrack,$before) = ($1,$`);
+ $_ = $';
+- s/next_pair_pr_rx//o;
++ s/next_pair_pr_rx//om;
+ if ($nobrack) { $eqno = $2; }
+ else { $eqno = join('',$EQNO_START, $2, $EQNO_END) };
+ $_ = $before;
+@@ -1461,7 +1452,6 @@ sub do_env_equation {
+ } elsif ($eqno) {
+ $eqno = join('',$EQNO_START, $eqno, $EQNO_END)
+ } else { $eqno = ' ' } # spacer, when no numbering
+- $* = 0;
+
+ # include the equation-number, using a <TABLE>
+ local($halign) = " ALIGN=\"CENTER\"" unless $FLUSH_EQN;
+@@ -1641,7 +1631,7 @@ sub do_env_eqnarray {
+ # if (s/\\lefteqn$OP(\d+)$CP(.*)$OP\1$CP/ $2 /) {
+ if (s/\\lefteqn//) {
+ $return .= "\"LEFT\" COLSPAN=\"3\">";
+- $* =1; s/(^\s*|$html_specials{'&'}|\s*$)//g; $*=0;
++ s/(^\s*|$html_specials{'&'}|\s*$)//gm;
+ if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
+ $_ = (($_)? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$_ ):'');
+@@ -1666,7 +1656,7 @@ sub do_env_eqnarray {
+
+ # left column, set using \displaystyle
+ $thismath = shift(@cols); $failed = 0;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$thismath ):'');
+@@ -1686,7 +1676,7 @@ sub do_env_eqnarray {
+
+ # center column, set using \textstyle
+ $thismath = shift(@cols); $failed = 0;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ 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 {
+
+ # right column, set using \displaystyle
+ $thismath = shift(@cols); $failed = 0;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$thismath ):'');
+diff --git a/versions/html4_1.pl b/versions/html4_1.pl
+index dc00415..9cc3e31 100644
+--- a/versions/html4_1.pl
++++ b/versions/html4_1.pl
+@@ -766,9 +766,7 @@ sub translate_colspec {
+ }
+ $celldata .= ' ' if ($celldata =~ /\\\w+$/);
+
+- $* = 1; # multiline matching ON
+- $celldata =~ s/$wrap_parbox_rx/$6/g;
+- $* = 0; # multiline matching OFF
++ $celldata =~ s/$wrap_parbox_rx/$6/gm;
+ # $at_text .= $celldata;
+ # if ( $#colspec > -1) {
+ # $colspec[$#colspec] .= join('', "<TD ALIGN=\"LEFT\">",$celldata,'</TD>');
+@@ -794,9 +792,7 @@ sub translate_colspec {
+ }
+ $celldata .= ' ' if ($celldata =~ /\\\w+$/);
+
+- $* = 1; # multiline matching ON
+- $celldata =~ s/$wrap_parbox_rx/$6/g;
+- $* = 0; # multiline matching OFF
++ $celldata =~ s/$wrap_parbox_rx/$6/gm;
+ $at_text .= $celldata;
+
+ } elsif ( $char =~ /;|\&/ ) {
+@@ -965,9 +961,7 @@ sub process_tabular {
+
+ while (/\\parbox/) {
+ local($parlength) = length($_);
+- $* = 1; # multiline matching ON
+- s/$wrap_parbox_rx/&convert_parbox_newlines($6)/eg;
+- $* = 0; # multiline matching OFF
++ s/$wrap_parbox_rx/&convert_parbox_newlines($6)/egm;
+
+ if ($parlength == length($_)) {
+ print "\n*** \\parbox's remain in table!!\n";
+@@ -1196,9 +1190,7 @@ sub process_tabular {
+ }
+ $colspec = &translate_environments("$OP$tmp$CP$colspec$OP$tmp$CP");
+ $colspec = &translate_commands($colspec);
+- $* = 1;
+- while ($colspec =~ s/<(\w+)>\s*<\/\1>//g) {};
+- $* = 0;
++ while ($colspec =~ s/<(\w+)>\s*<\/\1>//gm) {};
+ $colspec = ';SPMnbsp;' if ($colspec =~ /^\s*$/);
+ $colspec = join('', $reopens, $colspec
+ , (@$open_tags_R ? &close_all_tags() : '')
+@@ -1338,7 +1330,7 @@ sub make_math_comment{
+ $ecomm = "\n\\end{$env}";
+ } unless ($env =~/tex2html/);
+ $_ = &revert_to_raw_tex;
+- $* = 1; s/^\s+//s; s/\s+$//s; $* = 0;
++ s/^\s+//s; s/\s+$//sm;
+ $_ = $scomm . $_ . $ecomm;
+ return() if (length($_) < 16);
+ $global{'verbatim_counter'}++;
+@@ -1440,20 +1432,19 @@ sub do_env_equation {
+ local($seqno) = join('',"\n<TD$eqno_class WIDTH=10 ALIGN=\""
+ , (($EQN_TAGS =~ /L/)? 'LEFT': 'RIGHT')
+ , "\">\n");
+- $* = 1;
+ do { # get the equation number
+ $global{'eqn_number'}++;
+ $eqno = &translate_commands('\theequation');
+- } unless ((s/(\\nonumber|\\notag)//g)||(/\\tag/));
++ } unless ((s/(\\nonumber|\\notag)//gm)||(/\\tag/));
+ if (/\\tag(\*)?/){
+ # AmS-TEX line-number tags.
+ if (defined &get_eqn_number ) {
+ ($eqno, $_) = &get_eqn_number(1,$_);
+ } else {
+- s/\\tag(\*)?//;
++ s/\\tag(\*)?//m;
+ local($nobrack,$before) = ($1,$`);
+ $_ = $';
+- s/next_pair_pr_rx//o;
++ s/next_pair_pr_rx//om;
+ if ($nobrack) { $eqno = $2; }
+ else { $eqno = join('',$EQNO_START, $2, $EQNO_END) };
+ $_ = $before;
+@@ -1461,7 +1452,6 @@ sub do_env_equation {
+ } elsif ($eqno) {
+ $eqno = join('',$EQNO_START, $eqno, $EQNO_END)
+ } else { $eqno = ' ' } # spacer, when no numbering
+- $* = 0;
+
+ # include the equation-number, using a <TABLE>
+ local($halign) = " ALIGN=\"CENTER\"" unless $FLUSH_EQN;
+@@ -1641,7 +1631,7 @@ sub do_env_eqnarray {
+ # if (s/\\lefteqn$OP(\d+)$CP(.*)$OP\1$CP/ $2 /) {
+ if (s/\\lefteqn//) {
+ $return .= "\"LEFT\" COLSPAN=\"3\">";
+- $* =1; s/(^\s*|$html_specials{'&'}|\s*$)//g; $*=0;
++ s/(^\s*|$html_specials{'&'}|\s*$)//gm;
+ if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
+ $_ = (($_)? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$_ ):'');
+@@ -1666,7 +1656,7 @@ sub do_env_eqnarray {
+
+ # left column, set using \displaystyle
+ $thismath = shift(@cols); $failed = 0;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$thismath ):'');
+@@ -1686,7 +1676,7 @@ sub do_env_eqnarray {
+
+ # center column, set using \textstyle
+ $thismath = shift(@cols); $failed = 0;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ 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 {
+
+ # right column, set using \displaystyle
+ $thismath = shift(@cols); $failed = 0;
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($NO_SIMPLE_MATH)||($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$thismath ):'');
+diff --git a/versions/math.pl b/versions/math.pl
+index 37eadec..6ce67c3 100644
+--- a/versions/math.pl
++++ b/versions/math.pl
+@@ -87,7 +87,7 @@ sub do_env_tex2html_wrap {
+ 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) }
+- $* = 1; s/^\s*|\s*$//g; $*=0;
++ s/^\s*|\s*$//gm;
+ local($saved) = $_;
+ # if (s/^\\\(|^\$|^\\math|\\\)$|\$$|\\endmath//g) {}
+ if (s/^$math_start_rx|${math_end_rx}$//g) {}
+@@ -174,23 +174,21 @@ sub do_env_equation {
+ local($seqno) = join('',"\n<TD$eqno_class WIDTH=10 ALIGN=\""
+ , (($EQN_TAGS =~ /L/)? 'LEFT': 'RIGHT')
+ , "\">\n");
+- $* = 1;
+ do { # include the equation number, using a <TABLE>
+ $global{'eqn_number'}++;
+ $eqno = join('', $EQNO_START
+ , &simplify(&translate_commands('\theequation'))
+ , $EQNO_END);
+- } unless ((s/(\\nonumber|\\notag)//g)||(/\\tag/));
+- if (s/\\tag(\*)?//){
++ } unless ((s/(\\nonumber|\\notag)//gm)||(/\\tag/));
++ if (s/\\tag(\*)?//m){
+ # AmS-TEX line-number tags.
+ local($nobrack,$before) = ($1,$`);
+ $_ = $';
+- s/next_pair_pr_rx//o;
++ s/next_pair_pr_rx//om;
+ if ($nobrack) { $eqno = $2 }
+ else { $eqno = join('',$EQNO_START, $2, $EQNO_END ) }
+ $_ = $before;
+ }
+- $* = 0;
+
+ local($halign) = " ALIGN=\"CENTER\"" unless $FLUSH_EQN;
+ if ($EQN_TAGS =~ /L/) {
+@@ -398,9 +396,9 @@ sub make_math {
+
+ # remove white space at the extremities
+ # do{ $*=1; s/(^\s+|\s+$)//; $*=0; } unless ($NO_SIMPLE_MATH);
+- $*=1; s/^\s//o;s/\s$//; $*=0;
++ s/^\s//o;s/\s$//m;
+ # but not if there is a comment to finish:
+- $*=1; s/($comment_mark\s*\d+)$/$&\n/; $*=0;
++ s/($comment_mark\s*\d+)$/$&\n/m;
+
+ $_;
+ }
+@@ -1029,7 +1027,7 @@ sub do_env_eqnarray {
+
+ if (s/\\lefteqn//) {
+ $return .= "\"LEFT\" COLSPAN=\"3\">";
+- $* =1; s/(^\s*|$html_specials{'&'}|\s*$)//g; $*=0;
++ s/(^\s*|$html_specials{'&'}|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $_ = (($_)? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$_ ):'');
+@@ -1048,7 +1046,7 @@ sub do_env_eqnarray {
+
+ # left column, set using \displaystyle
+ $thismath = shift(@cols);
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$thismath ):'');
+@@ -1064,7 +1062,7 @@ sub do_env_eqnarray {
+ # center column, set using \textstyle
+ $thismath = shift(@cols);
+ if (!($#cols < 0)) {
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , 'text', '', $doimage.$thismath ):'');
+@@ -1084,7 +1082,7 @@ sub do_env_eqnarray {
+ &write_warnings($eqnarray_warning);
+ print "\n\n *** $eqnarray_warning \n";
+ }
+- $* =1; $thismath =~ s/(^\s*|\s*$)//g; $*=0;
++ $thismath =~ s/(^\s*|\s*$)//gm;
+ if (($doimage)||($failed)) {
+ $thismath = (($thismath ne '')? &process_math_in_latex(
+ "indisplay" , '', '', $doimage.$thismath ):'');
+@@ -1447,7 +1445,7 @@ sub translate_math_commands {
+ }
+
+ ($pre_text,$labels) = &extract_labels($pre_text);
+- local($savedRS) = $/; $/ = ''; $* = 1;
++ local($savedRS) = $/; $/ = '';
+ # 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 {
+ # local($savedRS) = $/; $/ = ''; $*=1;
+ while ( $cnt && $found ) {
+ $found = '';
+- if ($post_pre_text =~ /\\(begin|end)(($O|$OP)\d+($C|$CP))$env$star\2/s)
++ if ($post_pre_text =~ /\\(begin|end)(($O|$OP)\d+($C|$CP))$env$star\2/sm)
+ { $pre_text .= $`; $found = $1;
+ $this_env = $&; $post_pre_text = $'; }
+ if ($found =~ /begin/) {
+@@ -1465,7 +1463,7 @@ sub translate_math_commands {
+ $cnt--; $pre_text .= $this_env if ($cnt > 0) ;
+ }
+ }
+- $* = 0; $/ = $savedRS;
++ $/ = $savedRS;
+ $env .= 'star' if $star;
+ local($env_cmd) = 'do_env_'.$env;
+ # parse it further, when possible...
+@@ -1504,7 +1502,7 @@ sub translate_math_commands {
+ $pre_text = &process_math_in_latex($mode,$style,$slevel,$pre_text)
+ if ($pre_text);
+ }
+- $* = 0; $/ = $savedRS;
++ $/ = $savedRS;
+ return($labels . $pre_text) unless ($_);
+
+ print "\nMore math:\n$_" if ($VERBOSITY > 4);
+@@ -1572,7 +1570,7 @@ sub make_math_comment{
+ $ecomm = "\n\\end{$env}";
+ } unless ($env =~/tex2html/);
+ $_ = &revert_to_raw_tex;
+- $* = 1; s/^\s+//; s/\s+$//; $* = 0;
++ s/^\s+//; s/\s+$//m;
+ $_ = $scomm . $_ . $ecomm;
+ return() if (length($_) < 12);
+ $global{'verbatim_counter'}++;
+@@ -1715,20 +1713,18 @@ sub parse_math_toks {
+ local ($saved) = $_;
+ $_ = $';
+ # find the \end, including nested environments of same type.
+- $* = 1;
+ local($cnt, $thisbit, $which) = (1,'','');
+- while ( /\\(begin|end)(<#\d+#>)($env|$array_env_rx)(\*|star)?\2/s ) {
++ while ( /\\(begin|end)(<#\d+#>)($env|$array_env_rx)(\*|star)?\2/sm ) {
+ $thisbit = $` . $&; $_ = $'; $which = $1;
+ do {
+ # mark rows/columns in nested arrays
+- $thisbit =~ s/;SPMamp;/$array_col_mark/g;
+- $thisbit =~ s/\\(\\|cr(cr)?(\b|$|\d|\W))/$array_row_mark$3/g;
++ $thisbit =~ s/;SPMamp;/$array_col_mark/gm;
++ $thisbit =~ s/\\(\\|cr(cr)?(\b|$|\d|\W))/$array_row_mark$3/gm;
+ } if ($cnt > 1);
+ $this .= $thisbit;
+ if ($which =~ /begin/) {$cnt++} else {$cnt--};
+ last if (!$cnt);
+ }
+- $* = 0;
+
+ # $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 {
+ $this .= $extra;
+ $this = &process_math_in_latex($mode,$style,$slevel,$this);
+ } else {
+- $*=1;
+- $star =~ s/\*/\\\*/o if ($star);
+- $this =~ s/^\\begin(<#\d+#>)$env$star\1//s;
+- $this =~ s/\\end(<#\d+#>)$env$star\1\s*$//s;
+- $*=0;
++ $star =~ s/\*/\\\*/om if ($star);
++ $this =~ s/^\\begin(<#\d+#>)$env$star\1//sm;
++ $this =~ s/\\end(<#\d+#>)$env$star\1\s*$//sm;
+ do {
+ local($in_array) = 1;
+ local($_) = $this;
+@@ -2498,9 +2492,7 @@ sub get_supsub {
+ } elsif ($5) {
+ $supsub .= $1; $which .= (($5 =~ /b/) ? '_' : '^');
+ local($multisub_type) = $5;
+- $* = 1;
+- s/\\end(($O|$OP)\d+($C|$CP))$multisub_type\1/$supsub .= $`.$&;''/e;
+- $* = 0;
++ s/\\end(($O|$OP)\d+($C|$CP))$multisub_type\1/$supsub .= $`.$&;''/em;
+ } else { $supsub .= "\{^\\prime\}" }
+ }
+ # include dummy sup/sub-scripts to enhance the vertical spacing
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0020-latex2html-fix-defined.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0020-latex2html-fix-defined.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0020-latex2html-fix-defined.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,47 @@
+From a0565c0e352725982ecdb6caec6c2a541a8f9329 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Tue, 17 Jul 2012 16:52:20 +0200
+Subject: [PATCH] latex2html fix defined 20 of Debian series 7
+
+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 at antcom.de>
+---
+ latex2html.pin | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/latex2html.pin b/latex2html.pin
+index fdf68c2..d670c0d 100644
+--- a/latex2html.pin
++++ b/latex2html.pin
+@@ -532,7 +532,7 @@ $CHARSET = $charset || 'iso-8859-1';
+ #
+ # 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 @@ sub convert_iso_latin_chars {
+ "\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 @@ sub real_replace_strange_accents {
+ 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!\{!);
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0021-Documentation-private-1-and-3.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0021-Documentation-private-1-and-3.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0021-Documentation-private-1-and-3.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,61 @@
+From 2f8c774becbf4ad792f4e3291f139abe762d58ea Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 18 Jul 2012 08:53:35 +0200
+Subject: [PATCH] Documentation private 1 and 3
+
+---
+ Makefile.in | 13 +++++++++++++
+ docs/Makefile | 6 +++---
+ 2 files changed, 16 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ca2ed5f..64a7ce0 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -63,6 +63,19 @@ all: ${SCRIPTS} ${MODULES}
+ devel:
+ ${MAKE} all BUILDOPT=-devel
+
++documentation: \
++ docPS \
++ docHTML
++
++docPS:
++ cd docs; \
++ TEXINPUTS=$(srcdir)/texinputs: LATEX2HTMLDIR=$(srcdir) $(MAKE) -f Makefile manual.ps
++
++docHTML:
++ cd docs; \
++ TEXINPUTS=$(srcdir)/texinputs: PATH=$(srcdir):${PATH} LATEX2HTMLDIR=$(srcdir) $(MAKE) -f Makefile manual.html
++
++
+ # .SUFFIXES:
+
+ pstoimg: ${cfgfile} ${srcdir}/${buildcmd} pstoimg.pin ${wrappers}
+diff --git a/docs/Makefile b/docs/Makefile
+index 53f9969..1223a89 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -140,16 +140,16 @@ manual.aux manual.cb: \
+ manual.tex credits.tex licence.tex overview.tex \
+ support.tex userman.tex hypextra.tex features.tex \
+ problems.tex l2hfiles.dat manhtml.tex l2hman.sty
+- $(LATEX) manual.tex
++ $(LATEX) '\nonstopmode\input{manual.tex}'
+
+ manual.glo manual.idx: \
+ manual.tex credits.tex licence.tex overview.tex \
+ support.tex userman.tex hypextra.tex features.tex \
+ problems.tex l2hfiles.dat manhtml.tex l2hman.sty
+- $(LATEX) manual.tex
++ $(LATEX) '\nonstopmode\input{manual.tex}'
+
+ manual.dvi: manual.aux manual.ind manual.gls
+- $(LATEX) manual.tex
++ $(LATEX) '\nonstopmode\input{manual.tex}'
+
+ manual.ind: manual.idx
+ $(MAKEINDEX) -s l2hidx.ist manual.idx
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0022-Run-time-style-private-2.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0022-Run-time-style-private-2.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0022-Run-time-style-private-2.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,28 @@
+From ebfa4336a339a13b37386dcced37ee3b1c9914a1 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 18 Jul 2012 09:00:21 +0200
+Subject: [PATCH] Run-time style private 2
+
+---
+ l2hconf.pin | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/l2hconf.pin b/l2hconf.pin
+index 66b4286..41fe807 100644
+--- a/l2hconf.pin
++++ b/l2hconf.pin
+@@ -225,7 +225,10 @@ $PSTOIMG = "$PERL @scriptdir@${dd}pstoimg at scriptext@";
+
+ # This is used to "autoload" perl code to deal with specific style files
+ #
+-$LATEX2HTMLSTYLES = "$LATEX2HTMLDIR${dd}styles";
++if($ENV{'LATEX2HTMLSTYLES'}) {
++ $LATEX2HTMLSTYLES = $ENV{'LATEX2HTMLSTYLES'};
++}
++$LATEX2HTMLSTYLES = "$LATEX2HTMLSTYLES${envkey}$LATEX2HTMLDIR${dd}styles";
+
+
+ # This is used to support upcoming versions of html - directory where perl
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0023-Installation-private-7.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0023-Installation-private-7.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0023-Installation-private-7.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,38 @@
+From 265b8dba7f7ec8b9199a1b24e552423969eebc5b Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 18 Jul 2012 09:16:25 +0200
+Subject: [PATCH] Installation private 7
+
+---
+ config/install.pl | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/config/install.pl b/config/install.pl
+index 86b91d3..a491cea 100755
+--- a/config/install.pl
++++ b/config/install.pl
+@@ -372,14 +372,19 @@ foreach $item (sort keys %Install_items) {
+
+ 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};
++
++ # prepend the value of DESTDIR, for package-managers
++ $dest = $ENV{'DESTDIR'}.$dest if($ENV{'DESTDIR'});
++
++ 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 _)) {
+ print STDERR "\nError: Cannot install LaTeX2HTML style files in $cfg{TEXPATH}\n";
+ } else {
+ my $dir = 'texinputs';
+- my $dest = $cfg{TEXPATH};
+ unless(opendir(DIR,$dir)) {
+ print STDERR qq{Error: Could not read directory "$dir": $!\n};
+ } else {
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0024-TeXExpand-private-7.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0024-TeXExpand-private-7.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0024-TeXExpand-private-7.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,24 @@
+From a4fe8f4a067e1c79c193cafbeafce48a30c34c79 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 18 Jul 2012 09:22:50 +0200
+Subject: [PATCH] TeXExpand private 7
+
+---
+ latex2html.pin | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/latex2html.pin b/latex2html.pin
+index d670c0d..4387813 100644
+--- a/latex2html.pin
++++ b/latex2html.pin
+@@ -828,6 +828,7 @@ sub driver {
+ # does DOS need to check these here ?
+ # die "File $TEXEXPAND does not exist or is not executable\n"
+ # unless (-x $TEXEXPAND);
++ $TEXINPUTS = $ENV{'TEXINPUTS'};
+ L2hos->syswait("$TEXEXPAND $dbg -auto_exclude $unseg"
+ . "-save_styles \"$DESTDIR$dd$TMP_${dd}styles\" "
+ . ($TEXINPUTS ? "-texinputs \"$TEXINPUTS\" " : '' )
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0025-Icons-installation-private-8.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0025-Icons-installation-private-8.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0025-Icons-installation-private-8.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,31 @@
+From 369efd6d8bee8ec9897698d9b9f59634e2a0ac31 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 18 Jul 2012 09:47:40 +0200
+Subject: [PATCH] Icons installation private 8
+
+---
+ config/install.pl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config/install.pl b/config/install.pl
+index a491cea..6b4728c 100755
+--- a/config/install.pl
++++ b/config/install.pl
+@@ -294,12 +294,12 @@ my @icon_types = $cfg{'IMAGE_TYPES'} ?
+ my $iconrx = join('|', @icon_types);
+
+ my $dest1 = "$cfg{'SHLIBDIR'}${dd}icons";
+-if((-d $dest1 && !-w _) || (-d $cfg{'SHLIBDIR'} && !-w _)) {
++if((-d $ENV{'DESTDIR'}.$dest1 && !-w _) || (-d $ENV{'DESTDIR'}.$cfg{'SHLIBDIR'} && !-w _)) {
+ print STDERR "Error: Cannot install icons in '$dest1': No write permission.\n";
+ $dest1 = '';
+ }
+ my $dest2 = $cfg{'ICONSTORAGE'} || '';
+-if(-d $dest2 && !-w $dest2) {
++if(-d $ENV{'DESTDIR'}.$dest2 && !-w $ENV{'DESTDIR'}.$dest2) {
+ print STDERR "Error: Cannot install icons in '$dest2': No write permission.\n";
+ $dest2 = '';
+ }
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0026-pnmcrop-detection.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0026-pnmcrop-detection.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0026-pnmcrop-detection.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,50 @@
+From 1f36a8f997bf56f061a305cdf919db3227f5e58e Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 18 Jul 2012 10:49:53 +0200
+Subject: [PATCH] pnmcrop detection
+
+Simplification in the context of OpenCSW where the version of netpbm
+is greater than 10 and netpbm is a prerequisite of building latex2html
+
+The removed code is testing incorrectly the version greater than 8...
+---
+ config/config.pl | 20 +++-----------------
+ 1 file changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/config/config.pl b/config/config.pl
+index 1b243d7..be1935a 100755
+--- a/config/config.pl
++++ b/config/config.pl
+@@ -1281,26 +1281,12 @@ if($opt{'have_pstoimg'}) {
+ &checking('if pnmcrop can crop from one direction');
+ my $timg = "config${dd}timg.pnm";
+ ($stat,$msg,$err) = &get_out_err("$pnmcrop -l $timg");
+- } elsif ($vers > 8) {
++ } else {
+ my $sub_vers = '';
+- if ($vers =~ /9\.(\d+)/) {
+- $sub_vers = $1;
+- unless ($sub_vers > 11) {
+- $newcfg{'PNMBLACK'} = ' -black ';
+- print
+- "\n Please update to Netpbm 9.12+, from sourceforge.org/projects/netpbm/\n",
+- " else colored cropping-bars will not be removed.\n";
+- } else {
+-# $pnmcrop .= ' -sides ';
+- $newcfg{'PNMCROPOPT'} = ' -sides ';
+- }
+- } else { $newcfg{'PNMCROPOPT'} = ' -sides '; }
+- $pnmcrop .= ' -verbose ' if ($vers >= 10 || $sub_vers > 10);
++ $newcfg{'PNMCROPOPT'} = ' -sides ';
++ $pnmcrop .= ' -verbose ';
+ print "\n$pnmcrop";
+ $msg = 'there is nothing to crop'; $stat = '';
+- } else {
+- print "\nThis $vers for $pnmcrop is not recognisable.";
+- $stat = 1;
+ }
+
+ unless(!$stat && $msg =~ /^p\d+[\s\n]+\d+\s+\d+|nothing to crop/is) {
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0027-Adapt-makeseg.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0027-Adapt-makeseg.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0027-Adapt-makeseg.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,51 @@
+From aad270b2c706ee272824b1a76606221d9d4e4474 Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 18 Jul 2012 14:56:25 +0200
+Subject: [PATCH] Adapt makeseg
+
+Inspired by debian-install.patch
+---
+ makeseg/makeseg | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/makeseg/makeseg b/makeseg/makeseg
+index 76907f4..c1c5116 100755
+--- a/makeseg/makeseg
++++ b/makeseg/makeseg
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#! /usr/bin/env perl
+
+ # Check options and load configuration files
+ &init;
+@@ -17,23 +17,23 @@
+ # config file settings therefore override anything set here
+
+ # Location to look for L2H-supported LaTeX styles
+-$LATEX2HTMLSTYLES="/usr/local/lib/texmf/latex2html/styles"
++$LATEX2HTMLSTYLES="/opt/csw/share/lib/latex2html/styles"
+ unless $LATEX2HTMLSTYLES;
+
+ # Location for TeX style files etc.
+ # $TEXINPUTS is read from the environment if not explicitly supplied
+ $TEXINPUTS=$ENV{'TEXINPUTS'} unless $TEXINPUTS;
+-$TEXINPUTS=".:/usr/local/lib/texmf/tex//" unless $TEXINPUTS;
++$TEXINPUTS=".:/opt/csw/share/texmf-local/tex//" unless $TEXINPUTS;
+
+ # Location for BibTeX Bibliography databases
+ # $BIBINPUTS is read from the environment if not explicitly supplied
+ $BIBINPUTS=$ENV{'BIBINPUTS'} unless $BIBINPUTS;
+-$BIBINPUTS=".:/usr/local/lib/texmf/bibtex/bib/" unless $BIBINPUTS;
++$BIBINPUTS=".:/opt/csw/share/texmf-local/bibtex/bib/" unless $BIBINPUTS;
+
+ # Location for BibTeX Bibliography styles (in addition to $TEXINPUTS)
+ # $BSTINPUTS is read from the environment if not explicitly supplied
+ $BSTINPUTS=$ENV{'BSTINPUTS'} unless $BSTINPUTS;
+-$BSTINPUTS="/usr/local/lib/texmf/bibtex/bst/" unless $BSTINPUTS;
++$BSTINPUTS="/opt/csw/share/texmf-local/bibtex/bst/" unless $BSTINPUTS;
+
+ # The lowest sectioning command at which to create segments
+ # corresponds to -l option
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/0028-Call-environment-defined-Perl.patch
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/0028-Call-environment-defined-Perl.patch (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/0028-Call-environment-defined-Perl.patch 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,45 @@
+From e796cb64140aa16bbabc886c29e847234c05632f Mon Sep 17 00:00:00 2001
+From: Peter Felecan <pfelecan at opencsw.org>
+Date: Wed, 18 Jul 2012 15:25:50 +0200
+Subject: [PATCH] Call environment defined Perl
+
+Inspired by debian-install.patch
+---
+ cweb2html/cweb2html | 2 +-
+ cweb2html/makemake.pl | 2 +-
+ makemap | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cweb2html/cweb2html b/cweb2html/cweb2html
+index 19984c5..85fe655 100755
+--- a/cweb2html/cweb2html
++++ b/cweb2html/cweb2html
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#! /usr/bin/env perl
+
+ ################################################################################
+ # Copyright 1998-1999 by Jens Lippmann (lippmann at rbg.informatik.th-darmstadt.de)
+diff --git a/cweb2html/makemake.pl b/cweb2html/makemake.pl
+index f517b6a..2a6c2a6 100644
+--- a/cweb2html/makemake.pl
++++ b/cweb2html/makemake.pl
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/perl
++#! /usr/bin/env perl
+
+ ################################################################################
+ # Copyright 1998-1999 by Jens Lippmann (lippmann at rbg.informatik.tu-darmstadt.de)
+diff --git a/makemap b/makemap
+index 8a097df..0544ff0 100755
+--- a/makemap
++++ b/makemap
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl
++#! /usr/bin/env perl
+ ###!/usr/local/bin/perl
+
+ $dd = '/'; # directory-delimiter
+--
+1.7.10.3
+
Added: csw/mgar/pkg/latex2html/trunk/files/abnt.perl
===================================================================
--- csw/mgar/pkg/latex2html/trunk/files/abnt.perl (rev 0)
+++ csw/mgar/pkg/latex2html/trunk/files/abnt.perl 2012-07-18 14:10:25 UTC (rev 18789)
@@ -0,0 +1,41 @@
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list