From 1ef3a1f69c5665a3b770d400f559aeda64a05b1907125e9bd78c520444ece42c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Tue, 25 Jun 2013 14:59:56 +0000 Subject: [PATCH] use \g syntax for \8 and \9 regexp backrefs OBS-URL: https://build.opensuse.org/package/show/Publishing/latex2html?expand=0&rev=12 --- latex2html-backref-workaround.diff | 20 ++++++++++++++++++++ latex2html.changes | 6 ++++++ latex2html.spec | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 latex2html-backref-workaround.diff diff --git a/latex2html-backref-workaround.diff b/latex2html-backref-workaround.diff new file mode 100644 index 0000000..190bb85 --- /dev/null +++ b/latex2html-backref-workaround.diff @@ -0,0 +1,20 @@ +--- ./latex2html.pin.orig 2013-06-25 14:57:10.000000000 +0000 ++++ ./latex2html.pin 2013-06-25 14:57:27.000000000 +0000 +@@ -16557,7 +16557,7 @@ sub make_isolatin1_rx { + $caption_suffixes = "lof|lot"; + # $caption_rx = "\\\\caption\\s*([[]\\s*((($any_next_pair_rx5)|([[][^]]*[]])|[^]])*)[]])?$O(\\d+)$C([\\s\\S]*)$O\\8$C$EOL"; + +- $caption_rx = "\\\\(top|bottom|table)?caption\\s*\\\*?\\s*([[]\\s*((($any_next_pair_rx6)|([[][^]]*[]])|[^]])*)[]])?$O(\\d+)$C([\\s\\S]*)$O\\9$C$EOL"; ++ $caption_rx = "\\\\(top|bottom|table)?caption\\s*\\\*?\\s*([[]\\s*((($any_next_pair_rx6)|([[][^]]*[]])|[^]])*)[]])?$O(\\d+)$C([\\s\\S]*)$O\\g9$C$EOL"; + $caption_width_rx = "\\\\setlength\\s*(($O|$OP)\\d+($C|$CP))\\\\captionwidth\\1\\s*(($O|$OP)\\d+($C|$CP))([^>]*)\\4"; + + # Matches the \htmlimage command +@@ -16622,7 +16622,7 @@ sub make_isolatin1_rx { + + # Matches a label command and its argument + $labels_rx = "\\\\label\\s*$O(\\d+)$C([\\s\\S]*)$O\\1$C$EOL"; +- $labels_rx8 = "\\\\label\\s*$O(\\d+)$C([\\s\\S]*)$O\\8$C$EOL"; ++ $labels_rx8 = "\\\\label\\s*$O(\\d+)$C([\\s\\S]*)$O\\g8$C$EOL"; + + # Matches environments that should not be touched during the translation + # $verbatim_env_rx = "\\s*{(verbatim|rawhtml|LVerbatim)[*]?}"; diff --git a/latex2html.changes b/latex2html.changes index 226d653..1754e33 100644 --- a/latex2html.changes +++ b/latex2html.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 25 16:58:46 CEST 2013 - mls@suse.de + +- use \g syntax for \8 and \9 regexp backrefs to work around + a bug in perl-5.18 + ------------------------------------------------------------------- Tue Jun 25 09:47:55 UTC 2013 - coolo@suse.com diff --git a/latex2html.spec b/latex2html.spec index 837c3c0..e8094e8 100644 --- a/latex2html.spec +++ b/latex2html.spec @@ -52,6 +52,7 @@ Patch3: latex2html-%{version}-buildroot.diff Patch4: latex2html-%{version}-perl-bindir.diff Patch5: latex2html-%{version}-match-multiline.patch Patch6: http://patch-tracker.debian.org/patch/series/dl/latex2html/2008-debian1-9/latex2html-fix-defined.patch +Patch7: latex2html-backref-workaround.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -91,6 +92,7 @@ LaTeX texts. %patch4 %patch5 -p1 %patch6 -p1 +%patch7 cp %{S:1} manual.ps.gz cp %{S:3} README.SuSE