[LyX/master] EmbeddedObjects: make picinpar workaround work with XeTeX as well

commit af700fe7401afde45c4c766d836167ae0b8f487a
Author: Juergen Spitzmueller <[email protected]>
Date:   Mon Mar 16 08:25:35 2026 +0100

    EmbeddedObjects: make picinpar workaround work with XeTeX as well
---
 lib/doc/EmbeddedObjects.lyx    |  9 +++++----
 lib/doc/de/EmbeddedObjects.lyx |  9 ++++++---
 lib/doc/es/EmbeddedObjects.lyx | 11 ++++++++---
 lib/doc/fr/EmbeddedObjects.lyx | 11 ++++++++---
 lib/doc/ja/EmbeddedObjects.lyx |  9 ++++++---
 lib/doc/ru/EmbeddedObjects.lyx | 10 ++++++----
 6 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 35b2f92b65..d984b03c80 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -118,11 +118,12 @@
 % used for surrounded fixed objects
 \newboolean{picinpar}
 \IfFileExists{picinpar.sty}
- {%
+ {\usepackage{picinpar}
+  \setboolean{picinpar}{true}
   % see https://github.com/latex3/latex2e/issues/1725
-  \tracinglostchars=3
-  \usepackage{picinpar}
-  \setboolean{picinpar}{true}}
+  \let\prevtracinglostchars=\tracinglostchars
+  \AddToHook{env/window/begin}{\tracinglostchars=0}
+  \AddToHook{env/window/end}{\tracinglostchars=\prevtracinglostchars}}
  {\setboolean{picinpar}{false}}
 
 % check for lettrine
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index c3b66f88aa..5d7eab55a9 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -116,9 +116,12 @@
 % Prüfung auf picinpar
 \newboolean{picinpar}
 \IfFileExists{picinpar.sty}
- {\tracinglostchars=3
-  \usepackage{picinpar}
-  \setboolean{picinpar}{true}}
+ {\usepackage{picinpar}
+  \setboolean{picinpar}{true}
+  % see https://github.com/latex3/latex2e/issues/1725
+  \let\prevtracinglostchars=\tracinglostchars
+  \AddToHook{env/window/begin}{\tracinglostchars=0}
+  \AddToHook{env/window/end}{\tracinglostchars=\prevtracinglostchars}}
  {\setboolean{picinpar}{false}}
 
 % Prüfung auf lettrine
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index 3051afd924..7447eccb5d 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -136,9 +136,12 @@
 % used for surrounded fixed objects
 \newboolean{picinpar}
 \IfFileExists{picinpar.sty}
- {\tracinglostchars=3
-  \usepackage{picinpar}
-  \setboolean{picinpar}{true}}
+ {\usepackage{picinpar}
+  \setboolean{picinpar}{true}
+  % see https://github.com/latex3/latex2e/issues/1725
+  \let\prevtracinglostchars=\tracinglostchars
+  \AddToHook{env/window/begin}{\tracinglostchars=0}
+  \AddToHook{env/window/end}{\tracinglostchars=\prevtracinglostchars}}
  {\setboolean{picinpar}{false}}
 
 % check for lettrine
@@ -189,6 +192,8 @@ varwidth
 \output_sync 0
 \bibtex_command default
 \index_command makeindex
+\float_placement class
+\float_alignment class
 \paperfontsize 12
 \spacing single
 \use_hyperref true
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index f5eadf2b98..c8af0a3b9f 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -133,9 +133,12 @@
 % used for surrounded fixed objects
 \newboolean{picinpar}
 \IfFileExists{picinpar.sty}
- {\tracinglostchars=3
-  \usepackage{picinpar}
-  \setboolean{picinpar}{true}}
+ {\usepackage{picinpar}
+  \setboolean{picinpar}{true}
+  % see https://github.com/latex3/latex2e/issues/1725
+  \let\prevtracinglostchars=\tracinglostchars
+  \AddToHook{env/window/begin}{\tracinglostchars=0}
+  \AddToHook{env/window/end}{\tracinglostchars=\prevtracinglostchars}}
  {\setboolean{picinpar}{false}}
 
 % check for lettrine
@@ -186,6 +189,8 @@ varwidth
 \output_sync 0
 \bibtex_command default
 \index_command default
+\float_placement class
+\float_alignment class
 \paperfontsize 12
 \spacing single
 \use_hyperref true
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 013542467a..c1765c7926 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -145,9 +145,12 @@
 % used for surrounded fixed objects
 \newboolean{picinpar}
 \IfFileExists{picinpar.sty}
- {\tracinglostchars=3
-  \usepackage{picinpar}
-  \setboolean{picinpar}{true}}
+ {\usepackage{picinpar}
+  \setboolean{picinpar}{true}
+  % see https://github.com/latex3/latex2e/issues/1725
+  \let\prevtracinglostchars=\tracinglostchars
+  \AddToHook{env/window/begin}{\tracinglostchars=0}
+  \AddToHook{env/window/end}{\tracinglostchars=\prevtracinglostchars}}
  {\setboolean{picinpar}{false}}
 
 % check for lettrine
diff --git a/lib/doc/ru/EmbeddedObjects.lyx b/lib/doc/ru/EmbeddedObjects.lyx
index 587911a9cd..788a83248e 100644
--- a/lib/doc/ru/EmbeddedObjects.lyx
+++ b/lib/doc/ru/EmbeddedObjects.lyx
@@ -135,10 +135,12 @@
 % used for surrounded fixed objects
 \newboolean{picinpar}
 \IfFileExists{picinpar.sty}
- {% see https://github.com/latex3/latex2e/issues/1725
-  \tracinglostchars=3
-  \usepackage{picinpar}
-  \setboolean{picinpar}{true}}
+ {\usepackage{picinpar}
+  \setboolean{picinpar}{true}
+  % see https://github.com/latex3/latex2e/issues/1725
+  \let\prevtracinglostchars=\tracinglostchars
+  \AddToHook{env/window/begin}{\tracinglostchars=0}
+  \AddToHook{env/window/end}{\tracinglostchars=\prevtracinglostchars}}
  {\setboolean{picinpar}{false}}
 
 % check for lettrine
-- 
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs