Accommodate Doxygen 1.8.16, as found in experimental (#943426).

* documentation/make_pdf: Loosen caption de-hyperlinking to
  accommodate (but not require) interposed mboxes, as produced by Doxygen
  1.8.16 (currently in experimental).
* documentation/src/fltk-book.tex.in: Explicitly \usepackage{ifthen} for
  the sake of several constructs in doxygen.sty, which has just a
  commented-out \RequirePackage call for it as of 1.8.16.  (Together with
  the above, closes: #943426.)

4 files changed, 22 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index f5927fe..362a900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,20 @@
 fltk1.3 (1.3.4-10) UNRELEASED; urgency=medium
 
+  [ Gianfranco Costamagna ]
   * Explicitly install CHANGES file, to avoid confusion
     and build failures when debhelper doesn't install changelogs
     by default (e.g. Ubuntu).  (MR: !1.)
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 01 Mar 2019 14:28:17 +0100
+  [ Aaron M. Ucko ]
+  * documentation/make_pdf: Loosen caption de-hyperlinking to
+    accommodate (but not require) interposed mboxes, as produced by Doxygen
+    1.8.16 (currently in experimental).
+  * documentation/src/fltk-book.tex.in: Explicitly \usepackage{ifthen} for
+    the sake of several constructs in doxygen.sty, which has just a
+    commented-out \RequirePackage call for it as of 1.8.16.  (Together with
+    the above, closes: #943426.)
+
+ -- Aaron M. Ucko <ucko@debian.org>  Thu, 24 Oct 2019 22:33:50 -0400
 
 fltk1.3 (1.3.4-9) unstable; urgency=medium
 
diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes
index eadd376..52e44a3 100644
--- a/debian/patches/debian-changes
+++ b/debian/patches/debian-changes
@@ -169,7 +169,7 @@ Combined patches from git.
 +
  ( cd latex
 -  pdflatex --interaction=nonstopmode refman.tex
-+  sed -i 's/\(\\caption{\)\\hyperlink{[^}]*}/\1/' \
++  sed -i 's/\(\\caption{\(\\mbox{\)\?\)\\hyperlink{[^}]*}/\1/' \
 +      classFl__Input.tex classFl__Tree.tex
 +  run_pdflatex
    makeindex refman.idx
@@ -187,7 +187,13 @@ Combined patches from git.
    cd ..) > pdfall.log 2>&1
 --- fltk1.3-1.3.4.orig/documentation/src/fltk-book.tex.in
 +++ fltk1.3-1.3.4/documentation/src/fltk-book.tex.in
-@@ -30,15 +30,17 @@
+@@ -1,4 +1,5 @@
+ \documentclass[a4paper]{book}
++\usepackage{ifthen}
+ \usepackage{a4wide}
+ \usepackage{makeidx}
+ \usepackage{fancyhdr}
+@@ -30,15 +31,17 @@
  \makeindex
  \setcounter{tocdepth}{1}
  \renewcommand{\footrulewidth}{0.4pt}
@@ -207,7 +213,7 @@ Combined patches from git.
  \vspace*{2cm}
  {\Large
  Revision 9 by F. Costantini, D. Gibson, M. Melcher, \\
-@@ -46,11 +48,11 @@ A. Schlosser, B. Spitzak, and M. Sweet.}
+@@ -46,11 +49,11 @@ A. Schlosser, B. Spitzak, and M. Sweet.}
  \vspace*{1.5cm}
  {\large Copyright 1998-@YEAR@ by Bill Spitzak and others.}\\
  \vspace*{0.75cm}
diff --git a/documentation/make_pdf b/documentation/make_pdf
index 00a8594..52b43db 100755
--- a/documentation/make_pdf
+++ b/documentation/make_pdf
@@ -35,7 +35,7 @@ run_pdflatex() {
 }
 
 ( cd latex
-  sed -i 's/\(\\caption{\)\\hyperlink{[^}]*}/\1/' \
+  sed -i 's/\(\\caption{\(\\mbox{\)\?\)\\hyperlink{[^}]*}/\1/' \
       classFl__Input.tex classFl__Tree.tex
   run_pdflatex
   makeindex refman.idx
diff --git a/documentation/src/fltk-book.tex.in b/documentation/src/fltk-book.tex.in
index 34cfaaf..c5fe5ab 100644
--- a/documentation/src/fltk-book.tex.in
+++ b/documentation/src/fltk-book.tex.in
@@ -1,4 +1,5 @@
 \documentclass[a4paper]{book}
+\usepackage{ifthen}
 \usepackage{a4wide}
 \usepackage{makeidx}
 \usepackage{fancyhdr}