X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fexamples%2FMultilingualCaptions.lyx;h=5d0da6cea8021c894cd96e972b03679735c21072;hb=aa6c0fef2fddbd153b47e512b6e58788439e1364;hp=dd13bb740829eded9bf206b2b8de10f9d1e6f8ec;hpb=b95c17cfdd469aac842304073a56e3fb64bfe629;p=lyx.git

diff --git a/lib/examples/MultilingualCaptions.lyx b/lib/examples/MultilingualCaptions.lyx
index dd13bb7408..5d0da6cea8 100644
--- a/lib/examples/MultilingualCaptions.lyx
+++ b/lib/examples/MultilingualCaptions.lyx
@@ -1,5 +1,5 @@
 #LyX 2.1 created this file. For more info see http://www.lyx.org/
-\lyxformat 446
+\lyxformat 459
 \begin_document
 \begin_header
 \textclass scrartcl
@@ -65,6 +65,8 @@ bicaption
 \use_package mathdots 1
 \use_package mathtools 0
 \use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
 \use_package undertilde 0
 \cite_engine basic
 \cite_engine_type numerical
@@ -178,7 +180,6 @@ status open
 \begin_layout Plain Layout
 
 \series bold
-\color none
 Note
 \series default
 : If no optional argument is used for 
@@ -206,7 +207,7 @@ lang=ngerman
 \end_layout
 
 \begin_layout Standard
-in TeX-Code in a 
+in a 
 \family sans
 Caption setup
 \family default
@@ -232,37 +233,44 @@ reference "tab:List-of-babel"
 \end_layout
 
 \begin_layout Standard
-To add a multilingual caption to a float, delete the caption that is automatical
-ly added when inserting a new float and choose the style 
+To add a multilingual caption to a float, press the right mouse button on
+ the caption that is automatically added when inserting a new float and
+ select 
 \family sans
+Caption (Bicaption
+\family default
+) from the context menu.
+ If no caption is inserted, you can insert the multilingual caption via
+ 
+\family sans
+Insert\SpecialChar \menuseparator
+Caption\SpecialChar \menuseparator
 Bicaption
 \family default
 .
- This style has a mandatory argument that is inserted via the menu 
+ The caption text in the document language must be inserted in the inset
+ which is inserted in the caption via 
 \family sans
 Insert\SpecialChar \menuseparator
-Short
-\begin_inset space ~
-\end_inset
-
-Title
+Main Language Caption Text
 \family default
 .
- Insert there the caption text in the document language.
- The caption text in the second language is inserted as normal text behind
- the mandatory argument.
+ The caption text in the second language is inserted as normal text in the
+ caption.
 \end_layout
 
 \begin_layout Standard
-The 
+Short Titles for both languages (for the List of Tables\SpecialChar \slash{}
+Figures) can be inserted
+ via 
 \family sans
-Bicaption
+Insert\SpecialChar \menuseparator
+Main Language Caption Short Title
 \family default
- style has also an optional argument and is inserted the same way as the
- mandatory argument.
- In LyX the first of the two argument insets is the optional one.
- Insert there a short title for the caption in the document language.
- This short title will be used for the list of figures/tables.
+ and 
+\family sans
+Insert\SpecialChar \menuseparator
+Second Language Caption Short Title.
 \end_layout
 
 \begin_layout Standard
@@ -290,18 +298,7 @@ bi-second
 
 \end_inset
 
-
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
 lang=ngerman
-\end_layout
-
-\end_inset
-
-
 \begin_inset Note Note
 status collapsed
 
@@ -345,7 +342,10 @@ A figure.
 
 \end_layout
 
-\begin_layout Bicaption
+\begin_layout Plain Layout
+\begin_inset Caption Bicaption
+
+\begin_layout Plain Layout
 \begin_inset Argument 1
 status open
 
@@ -394,6 +394,11 @@ name "fig:example-figure"
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Standard
@@ -496,7 +501,7 @@ status open
 \series bold
 Note
 \series default
-: This setup doesn't have an effect in this file as described in section
+: This setup does not have an effect in this file as described in section
 \begin_inset space ~
 \end_inset
 
@@ -522,18 +527,7 @@ bi-both
 
 \end_inset
 
-
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-labelfont=bf,labelsep=newline
-\end_layout
-
-\end_inset
-
-
+labelfont=bf, labelsep=newline
 \begin_inset Note Note
 status collapsed
 
@@ -557,23 +551,12 @@ bi-first
 
 \end_inset
 
-
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-labelfont=bf,labelsep=newline
-\end_layout
-
-\end_inset
-
-
+labelfont=bf, labelsep=newline
 \begin_inset Note Note
 status collapsed
 
 \begin_layout Plain Layout
-the second language caption text should be sans-serif italic
+the first language caption text should be sans-serif italic
 \end_layout
 
 \end_inset
@@ -591,18 +574,7 @@ bi-second
 
 \end_inset
 
-
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-labelfont=bf,textfont={sf,it},labelsep=newline
-\end_layout
-
-\end_inset
-
-
+labelfont=bf, textfont={sf,it}, labelsep=newline
 \begin_inset Note Note
 status collapsed
 
@@ -646,7 +618,10 @@ A figure.
 
 \end_layout
 
-\begin_layout Bicaption
+\begin_layout Plain Layout
+\begin_inset Caption Bicaption
+
+\begin_layout Plain Layout
 \begin_inset Argument 2
 status open
 
@@ -673,6 +648,11 @@ name "fig:example-figure-custom"
 \end_inset
 
 
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Section
@@ -800,7 +780,6 @@ status open
 \begin_layout Plain Layout
 
 \series bold
-\color none
 Note
 \series default
 : If you are using this feature, the 
@@ -862,7 +841,7 @@ key "bicaption"
 \begin_inset Text
 
 \begin_layout Plain Layout
-\begin_inset Caption
+\begin_inset Caption Standard
 
 \begin_layout Plain Layout
 \begin_inset CommandInset label