commit b6ca19adb4c982c7044f215fc7041b9d9c050eca
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Wed May 14 14:19:52 2025 +0200
Remove dubious branch example from UserGuide
The main reason for removing it is that it breaks previews. Since it
is a weird example, it seems easier to remove it than to make it work.
Note that, since change tracking is on, the document still break
previews for now.
(cherry picked from commit a3e7819856fdefb1cbae2a021d61850d48b4d8c6)
---
lib/doc/UserGuide.lyx | 48 +++++++++++++++++++++++++++++++++++++++++++-----
status.24x | 1 +
2 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index bcaa282d0c..85d7ed1ded 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -148,7 +148,7 @@ logicalmkup
\papersides 2
\paperpagestyle default
\tablestyle default
-\tracking_changes false
+\tracking_changes true
\output_changes false
\change_bars false
\postpone_fragile_content false
@@ -157,6 +157,7 @@ logicalmkup
\html_be_strict true
\docbook_table_output 0
\docbook_mathml_prefix 1
+\author -495245474 "Jean-Marc Lasgouttes"
\end_header
\begin_body
@@ -37700,9 +37701,22 @@ Answer
\end_layout
\begin_layout Standard
-To use conditional output inside places where you cannot insert branch insets,
- like inside equations,
- you can code special \SpecialChar LaTeX
+To use conditional output inside
+\change_inserted -495245474 1747223737
+equations,
+
+\change_deleted -495245474 1747223748
+places
+\change_unchanged
+where you cannot insert branch insets,
+
+\change_deleted -495245474 1747223754
+like inside equations,
+
+\change_inserted -495245474 1747223724
+it is useful to define
+\change_deleted -495245474 1747223516
+you can code special \SpecialChar LaTeX
definitions for each branch.
For example you can define for the question branch
\begin_inset Foot
@@ -37733,6 +37747,8 @@ nolink "false"
\begin_layout Standard
+\change_deleted -495245474 1747223516
+
\series bold
\backslash
@@ -37743,6 +37759,8 @@ question}[1]{#1}
\begin_layout Standard
+\change_deleted -495245474 1747223516
+
\series bold
\backslash
@@ -37752,11 +37770,15 @@ answer}[1]{}
\end_layout
\begin_layout Standard
+
+\change_deleted -495245474 1747223516
and for the answer branch
\end_layout
\begin_layout Standard
+\change_deleted -495245474 1747223516
+
\series bold
\backslash
@@ -37767,6 +37789,8 @@ question}[1]{}
\begin_layout Standard
+\change_deleted -495245474 1747223516
+
\series bold
\backslash
@@ -37776,6 +37800,8 @@ answer}[1]{#1}
\end_layout
\begin_layout Standard
+
+\change_deleted -495245474 1747223516
\begin_inset Branch Question
inverted 0
status open
@@ -37813,6 +37839,8 @@ answer}[1]{}
\end_layout
\begin_layout Standard
+
+\change_deleted -495245474 1747223516
\begin_inset Branch Answer
inverted 0
status collapsed
@@ -37850,6 +37878,8 @@ answer}[1]{#1}
\end_layout
\begin_layout Standard
+
+\change_deleted -495245474 1747223516
Now it is possible to use the
\series bold
@@ -37883,8 +37913,16 @@
x^{2}-2x-2\Rightarrow\question{x_{1}}\answer{x_{2}}=1\question{+\sqrt{3}}\answer
\end_layout
\begin_layout Standard
+
+\change_deleted -495245474 1747223516
Inside math,
- the same effect can be achieved using math macros,
+ the same effect can be achieved using
+\change_unchanged
+ math macros
+\change_inserted -495245474 1747223549
+ in branches
+\change_unchanged
+,
see the
\emph on
Math
diff --git a/status.24x b/status.24x
index baf70a07a4..50d7a599e3 100644
--- a/status.24x
+++ b/status.24x
@@ -148,6 +148,7 @@ What's new
* DOCUMENTATION AND LOCALIZATION
+- Fix preview error in UserGuide.
* LYX2LYX
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
