commit 178c7464e2a9e03b44fb7bdc3f5887597bbe0043
Author: Uwe Stöhr <[email protected]>
Date: Sat Dec 5 19:22:34 2015 +0100
EmbeddedObjects.lyx: merge changes
diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index bed7077..4c8c6c1 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -226,12 +226,11 @@ graphicboxes
\papercolumns 1
\papersides 2
\paperpagestyle default
-\tracking_changes true
+\tracking_changes false
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict false
-\author 2047637253 "Guillaume Munch"
\end_header
\begin_body
@@ -26900,43 +26899,37 @@ Float on the right side.
\end_layout
-\begin_layout Plain Layout
-
-\end_layout
-
\end_inset
-\change_inserted 2047637253 1447344411
-
\end_layout
\begin_layout Standard
-
-\change_inserted 2047637253 1447344943
-Putting two floats side-by-side is made simpler using variable-width minipages
- (Section
-\begin_inset space ~
+An alternative and simpler solution is to use the module
+\family sans
+Variable-width Minipages
+\family default
+, see sec.
+\begin_inset space \thinspace{}
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
-reference "sec:Varwidth"
+reference "sec:Minipages"
\end_inset
-).
- Variable-width minipages adapt automatically to the width of the figures.
+.
+ Variable-width minipages adapt automatically to the width of the figures
+ and tables.
They do not require an explicit width to be given, and they improve the
horizontal alignment of the figures.
- The file
-\family typewriter
-examples/varwidth-floats-side-by-side.lyx
-\family default
+ The LyX example file
+\emph on
+varwidth-floats-side-by-side
+\emph default
gives examples of how to do this.
-\change_unchanged
-
\end_layout
\begin_layout Section
@@ -34111,59 +34104,30 @@ Note:
\end_inset
-\change_inserted 2047637253 1447344098
-
-\end_layout
-
-\begin_layout Section
-
-\change_inserted 2047637253 1447344355
-Variable-width Minipages
-\begin_inset CommandInset label
-LatexCommand label
-name "sec:Varwidth"
-
-\end_inset
-
-
-\begin_inset Index idx
-status open
-
-\begin_layout Plain Layout
-
-\change_inserted 2047637253 1447344099
-Boxes ! Minipages (variable width)
\end_layout
+\begin_layout Standard
+\begin_inset VSpace bigskip
\end_inset
\end_layout
\begin_layout Standard
-
-\change_inserted 2047637253 1447344362
\SpecialChar LyX
- has a limited support for minipages whose size is automatically determined
+ has also basic support for minipages whose size is automatically determined
by the width of their contents, via the module
-\emph on
+\family sans
Variable-width Minipages
-\emph default
-.
- The file
-\family typewriter
-examples/varwidth-floats-side-by-side.lyx
\family default
+.
+ The \SpecialChar LyX
+ example file
+\emph on
+varwidth-floats-side-by-side
+\emph default
gives examples of variable-width minipages used for placing two floats
side-by-side.
- This requires the \SpecialChar LaTeX
- package
-\family typewriter
-Varwidth
-\family default
-.
-\change_unchanged
-
\end_layout
\begin_layout Section
diff --git a/lib/doc/attic/Changelog-EmbeddedObjects-LyX_22x.txt
b/lib/doc/attic/Changelog-EmbeddedObjects-LyX_22x.txt
index c31a63b..1da566d 100644
--- a/lib/doc/attic/Changelog-EmbeddedObjects-LyX_22x.txt
+++ b/lib/doc/attic/Changelog-EmbeddedObjects-LyX_22x.txt
@@ -1,8 +1,10 @@
Modified:
- sec. 2.2: (Japanese only) added a sentence
+- sec. 3.8: new paragraph
- sec. 5.2.3: 2 changed sentences
- sec. 5.3: (Japanese only) changed sentence
+- sec. 5.4: new paragraph
- sec. 5.7: complete revision
- sec. 5.8: complete revision
- Appendix A: new strings in the table
diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index 032c219..51036c7 100644
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -27093,6 +27093,37 @@ Gleitobjekt auf der rechten Seite.
\end_layout
+\begin_layout Standard
+Eine alternative und einfachere Methode ist, das Modul
+\family sans
+Breitenvariable
+\begin_inset space ~
+\end_inset
+
+Minipages
+\family default
+ zu verwenden, siehe Abschnitt
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "abs:Minipage"
+
+\end_inset
+
+.
+ Breitenvariable Minipages berücksichtigen die Breite der Abbildungen und
+ Tabellen automatisch, so dass keine explizite Breite angegeben werden muss.
+ Die \SpecialChar LyX
+-Beispieldatei
+\emph on
+varwidth-floats-side-by-side
+\emph default
+ zeigt ein paar Beispiele.
+\end_layout
+
\begin_layout Section
Beschriftungs-Formatierung
\begin_inset CommandInset label
@@ -34227,6 +34258,34 @@ Bemerkung:
\end_layout
+\begin_layout Standard
+\begin_inset VSpace bigskip
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\SpecialChar LyX
+ unterstützt auch Minipages, deren Breite sich automatisch an die Größe
+ des Inhalts anpasst, über das Modul
+\family sans
+Breitenvariable
+\begin_inset space ~
+\end_inset
+
+Minipages
+\family default
+.
+ Die \SpecialChar LyX
+-Beispieldatei
+\emph on
+varwidth-floats-side-by-side
+\emph default
+ gibt Beispiele von breitenvariablen Minipages, um Gleitobjekte nebeneinander
+ zu setzen.
+\end_layout
+
\begin_layout Section
Parbox
\begin_inset CommandInset label
diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx
index 5a86088..109fff0 100644
--- a/lib/doc/es/EmbeddedObjects.lyx
+++ b/lib/doc/es/EmbeddedObjects.lyx
@@ -26702,6 +26702,36 @@ Flotante en el lado derecho.
\end_layout
+\begin_layout Standard
+
+\lang english
+An alternative and simpler solution is to use the module
+\family sans
+Variable-width Minipages
+\family default
+, see sec.
+\begin_inset space \thinspace{}
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:Minipáginas"
+
+\end_inset
+
+.
+ Variable-width minipages adapt automatically to the width of the figures
+ and tables.
+ They do not require an explicit width to be given, and they improve the
+ horizontal alignment of the figures.
+ The LyX example file
+\emph on
+varwidth-floats-side-by-side
+\emph default
+ gives examples of how to do this.
+\end_layout
+
\begin_layout Section
Formato de las leyendas
\begin_inset Index idx
@@ -33807,6 +33837,32 @@ Nota:
\end_layout
+\begin_layout Standard
+\begin_inset VSpace bigskip
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+\SpecialChar LyX
+ has also basic support for minipages whose size is automatically determined
+ by the width of their contents, via the module
+\family sans
+Variable-width Minipages
+\family default
+.
+ The \SpecialChar LyX
+ example file
+\emph on
+varwidth-floats-side-by-side
+\emph default
+ gives examples of variable-width minipages used for placing two floats
+ side-by-side.
+\end_layout
+
\begin_layout Section
Marcos de párrafo
\begin_inset CommandInset label
diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx
index baf8924..544e963 100644
--- a/lib/doc/fr/EmbeddedObjects.lyx
+++ b/lib/doc/fr/EmbeddedObjects.lyx
@@ -27407,6 +27407,36 @@ Flottant du côté droit.
\end_layout
+\begin_layout Standard
+
+\lang english
+An alternative and simpler solution is to use the module
+\family sans
+Variable-width Minipages
+\family default
+, see sec.
+\begin_inset space \thinspace{}
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:Minipages"
+
+\end_inset
+
+.
+ Variable-width minipages adapt automatically to the width of the figures
+ and tables.
+ They do not require an explicit width to be given, and they improve the
+ horizontal alignment of the figures.
+ The LyX example file
+\emph on
+varwidth-floats-side-by-side
+\emph default
+ gives examples of how to do this.
+\end_layout
+
\begin_layout Section
Mise en forme de la légende
\begin_inset Index idx
@@ -34715,6 +34745,32 @@ Note:
\end_layout
+\begin_layout Standard
+\begin_inset VSpace bigskip
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+\SpecialChar LyX
+ has also basic support for minipages whose size is automatically determined
+ by the width of their contents, via the module
+\family sans
+Variable-width Minipages
+\family default
+.
+ The \SpecialChar LyX
+ example file
+\emph on
+varwidth-floats-side-by-side
+\emph default
+ gives examples of variable-width minipages used for placing two floats
+ side-by-side.
+\end_layout
+
\begin_layout Section
Les parboxes
\begin_inset CommandInset label
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index d2a478a..b67a293 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -25604,6 +25604,40 @@ name "fig:右側のフロート"
\end_layout
+\begin_layout Standard
+
+\lang english
+An alternative and simpler solution is to use the module
+\family sans
+Variable-width Minipages
+\family default
+, see sec.
+\lang japanese
+
+\begin_inset space \thinspace{}
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:ミニページ"
+
+\end_inset
+
+
+\lang english
+.
+ Variable-width minipages adapt automatically to the width of the figures
+ and tables.
+ They do not require an explicit width to be given, and they improve the
+ horizontal alignment of the figures.
+ The LyX example file
+\emph on
+varwidth-floats-side-by-side
+\emph default
+ gives examples of how to do this.
+\end_layout
+
\begin_layout Section
キャプションの書式設定
\begin_inset Index idx
@@ -32073,6 +32107,32 @@ status open
\end_layout
+\begin_layout Standard
+\begin_inset VSpace bigskip
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+\SpecialChar LyX
+ has also basic support for minipages whose size is automatically determined
+ by the width of their contents, via the module
+\family sans
+Variable-width Minipages
+\family default
+.
+ The \SpecialChar LyX
+ example file
+\emph on
+varwidth-floats-side-by-side
+\emph default
+ gives examples of variable-width minipages used for placing two floats
+ side-by-side.
+\end_layout
+
\begin_layout Section
Parbox
\begin_inset CommandInset label
