X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fdoc%2FEmbeddedObjects.lyx;h=8d1107161bcad45411131480a5af4876537de4f5;hb=c8297baad933b57beb580248b6411c32da742bc9;hp=8e957d979b4b6e83207194dc56f5383b55047731;hpb=385aed9721612cc117e33f6d48c7278c319b5d18;p=lyx.git

diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx
index 8e957d979b..8d1107161b 100644
--- a/lib/doc/EmbeddedObjects.lyx
+++ b/lib/doc/EmbeddedObjects.lyx
@@ -1,20 +1,10 @@
 #LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 501
+\lyxformat 503
 \begin_document
 \begin_header
 \origin /systemlyxdir/doc/
 \textclass scrbook
 \begin_preamble
-% if pdflatex is used
-\usepackage{ifpdf}
-\ifpdf
-
-% set fonts for nicer pdf view
-\IfFileExists{lmodern.sty}
- {\usepackage{lmodern}}{}
-
-\fi % end if pdflatex is used
-
 % that links to image floats jumps
 % to the beginning of the float and 
 % not to its caption
@@ -170,9 +160,9 @@ graphicboxes
 \language_package default
 \inputencoding auto
 \fontencoding global
-\font_roman "default" "default"
-\font_sans "default" "default"
-\font_typewriter "default" "default"
+\font_roman "lmodern" "default"
+\font_sans "lmss" "default"
+\font_typewriter "lmtt" "default"
 \font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
@@ -181,7 +171,7 @@ graphicboxes
 \font_sf_scale 100 100
 \font_tt_scale 100 100
 \graphics default
-\default_output_format default
+\default_output_format pdf2
 \output_sync 0
 \bibtex_command default
 \index_command default
@@ -26909,13 +26899,37 @@ Float on the right side.
 
 \end_layout
 
-\begin_layout Plain Layout
+\end_inset
+
 
 \end_layout
 
+\begin_layout Standard
+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
@@ -34092,6 +34106,30 @@ Note:
 
 \end_layout
 
+\begin_layout Standard
+\begin_inset VSpace bigskip
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\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
 Parboxes
 \begin_inset CommandInset label
@@ -36550,11 +36588,9 @@ reference "sec:Wrap-Floats"
 \begin_inset Text
 
 \begin_layout Plain Layout
-\begin_inset Graphics
-	filename ../images/dialog-show-new-inset_graphics.png
-	scale 70
-	scaleBeforeRotation
-
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
 
@@ -36616,11 +36652,9 @@ text
 \begin_inset Text
 
 \begin_layout Plain Layout
-\begin_inset Graphics
-	filename ../images/dialog-show-new-inset_graphics.png
-	scale 70
-	scaleBeforeRotation
-
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
 
@@ -36698,11 +36732,9 @@ text
 \begin_inset Text
 
 \begin_layout Plain Layout
-\begin_inset Graphics
-	filename ../images/dialog-show-new-inset_graphics.png
-	scale 70
-	scaleBeforeRotation
-
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
 
@@ -36764,11 +36796,9 @@ text
 \begin_inset Text
 
 \begin_layout Plain Layout
-\begin_inset Graphics
-	filename ../images/dialog-show-new-inset_graphics.png
-	scale 70
-	scaleBeforeRotation
-
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
 
@@ -36802,11 +36832,9 @@ text
 \begin_inset Text
 
 \begin_layout Plain Layout
-\begin_inset Graphics
-	filename ../images/dialog-show-new-inset_graphics.png
-	scale 70
-	scaleBeforeRotation
-
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
 
@@ -36907,11 +36935,9 @@ text
 \begin_inset Text
 
 \begin_layout Plain Layout
-\begin_inset Graphics
-	filename ../images/dialog-show-new-inset_graphics.png
-	scale 70
-	scaleBeforeRotation
-
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
 
@@ -36969,11 +36995,9 @@ text
 \begin_inset Text
 
 \begin_layout Plain Layout
-\begin_inset Graphics
-	filename ../images/dialog-show-new-inset_graphics.png
-	scale 70
-	scaleBeforeRotation
-
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
 
@@ -37065,11 +37089,9 @@ text
 \begin_inset Text
 
 \begin_layout Plain Layout
-\begin_inset Graphics
-	filename ../images/dialog-show-new-inset_graphics.png
-	scale 70
-	scaleBeforeRotation
-
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset
 
 
@@ -37160,11 +37182,9 @@ text
 \begin_inset Text
 
 \begin_layout Plain Layout
-\begin_inset Graphics
-	filename ../images/dialog-show-new-inset_graphics.png
-	scale 70
-	scaleBeforeRotation
-
+\begin_inset Info
+type  "icon"
+arg   "dialog-show-new-inset graphics"
 \end_inset