branch master updated: * doc/texinfo.tex (\doxeteximage): Add an \hbox around \XeTeXpdffile or \XeTeXpicfile to avoid over-long line. Report from Werner Lemberg.

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 2a15ed3  * doc/texinfo.tex (\doxeteximage): Add an \hbox around 
\XeTeXpdffile or \XeTeXpicfile to avoid over-long line.  Report from Werner 
Lemberg.
2a15ed3 is described below

commit 2a15ed35daf986cd848cea537ca3bb481c1b3fe4
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Apr 14 10:50:09 2021 +0100

    * doc/texinfo.tex (\doxeteximage):
    Add an \hbox around \XeTeXpdffile or \XeTeXpicfile to avoid
    over-long line.  Report from Werner Lemberg.
---
 ChangeLog       |  6 ++++++
 doc/texinfo.tex | 22 +++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca6fad0..a54a2da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-14  Gavin Smith  <gavinsmith0123@gmail.com>
+
+       * doc/texinfo.tex (\doxeteximage):
+       Add an \hbox around \XeTeXpdffile or \XeTeXpicfile to avoid
+       over-long line.  Report from Werner Lemberg.
+
 2021-04-08  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * doc/texinfo.tex (\end): Add % after opening brace to
diff --git a/doc/texinfo.tex b/doc/texinfo.tex
index 7837291..1c4fc54 100644
--- a/doc/texinfo.tex
+++ b/doc/texinfo.tex
@@ -1862,19 +1862,23 @@ output) for that.)}
       \closein 1
     \endgroup
     %
-    \def\xetexpdfext{pdf}%
-    \ifx\xeteximgext\xetexpdfext
-      \XeTeXpdffile "#1".\xeteximgext ""
-    \else
-      \def\xetexpdfext{PDF}%
+    % Putting an \hbox around the image can prevent an over-long line
+    % after the image.
+    \hbox\bgroup
+      \def\xetexpdfext{pdf}%
       \ifx\xeteximgext\xetexpdfext
         \XeTeXpdffile "#1".\xeteximgext ""
       \else
-        \XeTeXpicfile "#1".\xeteximgext ""
+        \def\xetexpdfext{PDF}%
+        \ifx\xeteximgext\xetexpdfext
+          \XeTeXpdffile "#1".\xeteximgext ""
+        \else
+          \XeTeXpicfile "#1".\xeteximgext ""
+        \fi
       \fi
-    \fi
-    \ifdim \wd0 >0pt width \xeteximagewidth \fi
-    \ifdim \wd2 >0pt height \xeteximageheight \fi \relax
+      \ifdim \wd0 >0pt width \xeteximagewidth \fi
+      \ifdim \wd2 >0pt height \xeteximageheight \fi \relax
+    \egroup
   }
 \fi