UserGuide.lyx: adopt Martins Changes in r21531 to the doc style and the other maintained docs.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21538 a592a061-630c-0410-9148-cb99ea01b6c8

lib/doc/de/UserGuide.lyx

@@ -93,11 +93,11 @@
 \paperorientation portrait
 \branch Frage
 \selected 1
-\color #ff0000
+\color #00ff00
 \end_branch
 \branch Antwort
 \selected 0
-\color #00ff00
+\color #aa55ff
 \end_branch
 \secnumdepth 3
 \tocdepth 3
@@ -27288,8 +27288,7 @@ Zuerst müssen Sie die verschiedenen Zweige definieren.
  Das machen Sie in 
 \family sans
 Dokument\SpecialChar \menuseparator
-Einstellungen\SpecialChar \ldots{}
+Einstellungen\SpecialChar \menuseparator
-\SpecialChar \menuseparator
 Zweige
 \family default
 .
@@ -27371,6 +27370,206 @@ Antwort: Wilhelm Conrad Röntgen
 
 \end_layout
 
+\begin_layout Standard
+\begin_inset VSpace bigskip
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Um konditionale Ausgaben zu erzeugen wo keine Zweige angegeben werden können,
+ wie in Formeln, können spezielle LaTeX-Definitionen für jeden Zweig angegeben
+ werden.
+ Man kann z.\InsetSpace \thinspace{}
+B.
+ für den Frage Zweig definieren:
+\begin_inset Foot
+status collapsed
+
+\begin_layout Standard
+Eine Einführung in die LaTeX-Syntax ist in Abschnitt\InsetSpace ~
+
+\begin_inset LatexCommand ref
+reference "sub:LaTeX-Syntax"
+
+\end_inset
+
+ zu finden.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+newcommand{
+\backslash
+Frage}[1]{#1}
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+newcommand{
+\backslash
+Antwort}[1]{}
+\end_layout
+
+\begin_layout Standard
+und für den Antwort Zweig
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+newcommand{
+\backslash
+Frage}[1]{}
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+newcommand{
+\backslash
+Antwort}[1]{#1}
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+\begin_inset Branch Frage
+status open
+
+\begin_layout Standard
+
+\lang english
+\begin_inset ERT
+status open
+
+\begin_layout Standard
+
+
+\backslash
+newcommand{
+\backslash
+Frage}[1]{#1}
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+newcommand{
+\backslash
+Antwort}[1]{}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+\begin_inset Branch Antwort
+status open
+
+\begin_layout Standard
+
+\lang english
+\begin_inset ERT
+status open
+
+\begin_layout Standard
+
+
+\backslash
+newcommand{
+\backslash
+Frage}[1]{}
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+newcommand{
+\backslash
+Antwort}[1]{#1}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Nun ist es möglich die Befehle 
+\series bold
+
+\backslash
+Frage{\SpecialChar \ldots{}
+}
+\series default
+ und 
+\series bold
+
+\backslash
+Antwort{\SpecialChar \ldots{}
+}
+\series default
+ zu verwenden um eine konditionale Ausgabe zu erhalten.
+ Hier ist eine Beispielformel in der nur der 
+\series bold
+
+\backslash
+Frage
+\series default
+ Teil erscheint:
+\begin_inset Formula \[
+x^{2}-2x-2\Rightarrow\Frage{x_{1}}\Antwort{x_{2}}=1\Frage{+\sqrt{3}}\Antwort{-\sqrt{3}}.\]
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Innerhalb von Formeln, kann dasselbe auch mit Hilfe von Makros geschehen,
+ siehe Abschnitt\InsetSpace ~
+
+\begin_inset LatexCommand ref
+reference "Makro-erzeugen"
+
+\end_inset
+
+.
+\end_layout
+
 \begin_layout Section
 ERT und die LaTeX-Syntax
 \begin_inset LatexCommand label
@@ -27769,7 +27968,7 @@ im LaTeX-Vorspann einfügen.
  Bevor Sie also ein großes Dokument schreiben, ist es sinnvoll, dass Sie
  sich zunächst die Dokumentation der Dokumentklasse durchlesen.
 \begin_inset Foot
-status open
+status collapsed
 
 \begin_layout Standard
 

lib/doc/es/UserGuide.lyx

@@ -21460,6 +21460,12 @@ Esto no es intuitivo y se corregirá en la siguiente versión de LyX.
 
 \begin_layout Section
 Definición de macros de ecuación
+\begin_inset LatexCommand label
+name "sec:Definición de macros"
+
+\end_inset
+
+
 \begin_inset LatexCommand index
 name "Matemáticas ! Macros de ecuación"
 
@@ -25058,7 +25064,7 @@ Pregunta: ¿Quién fue el primer Nobel de Física?
 
 \begin_layout Standard
 \begin_inset Branch Respuesta
-status collapsed
+status open
 
 \begin_layout Standard
 Respuesta: Wilhelm Conrad Röntgen
@@ -25069,6 +25075,219 @@ Respuesta: Wilhelm Conrad Röntgen
 
 \end_layout
 
+\begin_layout Standard
+\begin_inset VSpace bigskip
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+To use conditional output inside places where you cannot insert branch insets,
+ like inside equations, you can code special LaTeX definitions for each
+ branch.
+ For example you can define for the question branch
+\begin_inset Foot
+status collapsed
+
+\begin_layout Standard
+
+\lang english
+For an introduction to the LaTeX-syntax, see section\InsetSpace ~
+
+\begin_inset LatexCommand ref
+reference "sub:LaTeX-Syntax"
+
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+\lang english
+
+\backslash
+newcommand{
+\backslash
+question}[1]{#1}
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+\lang english
+
+\backslash
+newcommand{
+\backslash
+answer}[1]{}
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+and for the answer branch
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+\lang english
+
+\backslash
+newcommand{
+\backslash
+question}[1]{}
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+\lang english
+
+\backslash
+newcommand{
+\backslash
+answer}[1]{#1}
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+\begin_inset Branch Pregunta
+status open
+
+\begin_layout Standard
+
+\lang english
+\begin_inset ERT
+status open
+
+\begin_layout Standard
+
+
+\backslash
+newcommand{
+\backslash
+question}[1]{#1}
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+newcommand{
+\backslash
+answer}[1]{}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+\begin_inset Branch Respuesta
+status open
+
+\begin_layout Standard
+
+\lang english
+\begin_inset ERT
+status open
+
+\begin_layout Standard
+
+
+\backslash
+newcommand{
+\backslash
+question}[1]{}
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+newcommand{
+\backslash
+answer}[1]{#1}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Now it is possible to use the commands 
+\series bold
+
+\backslash
+question{\SpecialChar \ldots{}
+}
+\series default
+ and 
+\series bold
+
+\backslash
+answer{\SpecialChar \ldots{}
+}
+\series default
+ to obtain conditional output.
+ Here is an example formula where only the 
+\series bold
+
+\backslash
+question
+\series default
+ part appears:
+\begin_inset Formula \[
+x^{2}-2x-2\Rightarrow\question{x_{1}}\answer{x_{2}}=1\question{+\sqrt{3}}\answer{-\sqrt{3}}.\]
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Inside math, the same effect can be achieved using math macros, see section
+\lang spanish
+\InsetSpace ~
+
+\begin_inset LatexCommand ref
+reference "sec:Definición de macros"
+
+\end_inset
+
+.
+\end_layout
+
 \begin_layout Section
 ERT y la sintaxis de LaTeX
 \begin_inset LatexCommand label
@@ -35044,7 +35263,7 @@ LyX
 
 \begin_layout Standard
 \begin_inset Graphics
-	filename ../../images/href-insert.png
+	filename ../../images/url-insert.png
 	BoundingBox 0bp 5bp 20bp 20bp
 
 \end_inset
@@ -35061,7 +35280,7 @@ LyX
 
 \family sans
 Insertar\SpecialChar \menuseparator
-Hyperlink
+URL
 \end_layout
 
 \end_inset