EmbeddedObjects.lyx: new section about Floats set side by side

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22747 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2008-02-02 02:14:10 +00:00
parent 10b8844dc0
commit 9702f66938
4 changed files with 760 additions and 95 deletions

View File

@ -19333,8 +19333,7 @@ hypcap
\series bold
\backslash
usepackage[f\SpecialChar \textcompwordmark{}
igure]{hypcap}
usepackage[figure]{hypcap}
\end_layout
\begin_layout Standard
@ -19982,6 +19981,180 @@ e
\end_inset
\end_layout
\begin_layout Section
Floats Side by Side
\begin_inset LatexCommand index
name "Floats ! Side by side"
\end_inset
\end_layout
\begin_layout Standard
To place floats side by side, like for Figure\InsetSpace ~
\begin_inset LatexCommand ref
reference "fig:Float-left"
\end_inset
and
\begin_inset LatexCommand ref
reference "fig:Float-right"
\end_inset
, only
\emph on
one
\emph default
float is used.
In it two minipage boxes are inserted.
\begin_inset Foot
status collapsed
\begin_layout Standard
Minipages are explained in section\InsetSpace ~
\begin_inset LatexCommand ref
reference "sec:Minipages"
\end_inset
.
\end_layout
\end_inset
The width is set to 45\InsetSpace \thinspace{}
-50\InsetSpace \thinspace{}
column% and the box alignment to
\family sans
Bottom
\family default
for each minipage.
The minipage boxes contain the image and the caption in the same way as
they are in a float.
The only difference is that the image unit
\family sans
Column\InsetSpace ~
Width\InsetSpace ~
%
\family default
is now calculated according to the width of the minipage boxes.
\end_layout
\begin_layout Standard
\begin_inset Float figure
wide false
sideways false
status open
\begin_layout Standard
\begin_inset Box Frameless
position "b"
hor_pos "c"
has_inner_box 1
inner_pos "t"
use_parbox 0
width "45col%"
special "none"
height "1in"
height_special "totalheight"
status open
\begin_layout Standard
\align center
\begin_inset Graphics
filename clipart/mobius.eps
lyxscale 50
width 100col%
scaleBeforeRotation
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Caption
\begin_layout Standard
\begin_inset LatexCommand label
name "fig:Float-left"
\end_inset
Float on the left side.
\end_layout
\end_inset
\end_layout
\end_inset
\hfill
\begin_inset Box Frameless
position "b"
hor_pos "c"
has_inner_box 1
inner_pos "t"
use_parbox 0
width "45col%"
special "none"
height "1in"
height_special "totalheight"
status open
\begin_layout Standard
\align center
\begin_inset Graphics
filename clipart/platypus.eps
lyxscale 50
width 100col%
scaleBeforeRotation
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Caption
\begin_layout Standard
\begin_inset LatexCommand label
name "fig:Float-right"
\end_inset
Float on the right side.
\end_layout
\end_inset
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\end_layout
\end_inset
\end_layout
\begin_layout Section
@ -20138,8 +20311,7 @@ usepackage[tableposition=top]{caption}
\series bold
\backslash
captionsetup[f\SpecialChar \textcompwordmark{}
igure]{labelfont={tt}, textfont=it, indention=1cm,%
captionsetup[figure]{labelfont={tt}, textfont=it, indention=1cm,%
\newline
\begin_inset ERT
@ -20872,8 +21044,7 @@ let
\backslash
MyFigure
\backslash
f\SpecialChar \textcompwordmark{}
igure
figure
\newline
\begin_inset ERT
@ -20892,11 +21063,9 @@ hphantom{ }
\backslash
let
\backslash
MyEndf\SpecialChar \textcompwordmark{}
igure
MyEndfigure
\backslash
endf\SpecialChar \textcompwordmark{}
igure
endfigure
\newline
\begin_inset ERT
@ -20913,14 +21082,11 @@ hphantom{ }
\backslash
renewenvironment{f\SpecialChar \textcompwordmark{}
igure}{
renewenvironment{figure}{
\backslash
begin{SCf\SpecialChar \textcompwordmark{}
igure}}{
begin{SCfigure}}{
\backslash
end{SCf\SpecialChar \textcompwordmark{}
igure}}}
end{SCfigure}}}
\end_layout
\begin_layout Standard
@ -20949,8 +21115,7 @@ hphantom{ }
\backslash
let
\backslash
f\SpecialChar \textcompwordmark{}
igure
figure
\backslash
MyFigure
\newline
@ -20971,11 +21136,9 @@ hphantom{ }
\backslash
let
\backslash
endf\SpecialChar \textcompwordmark{}
igure
endfigure
\backslash
MyEndf\SpecialChar \textcompwordmark{}
igure}
MyEndfigure}
\end_layout
\begin_layout Standard
@ -21121,8 +21284,7 @@ b
\series bold
\backslash
sidecaptionvpos{f\SpecialChar \textcompwordmark{}
igure}{c}
sidecaptionvpos{figure}{c}
\end_layout
\begin_layout Standard

View File

@ -302,8 +302,8 @@ Version 1.5.4
\end_layout
\begin_layout Date
letzte Änderung: 27.
Januar 2008
letzte Änderung: 2.
Februar 2008
\end_layout
\begin_layout Standard
@ -20665,8 +20665,7 @@ Dasselbe können Sie für alle Überschriften von Kapiteln, Abschnitten und
\begin_layout Standard
Es gibt auch noch das LaTeX-Paket
\series bold
f\SpecialChar \textcompwordmark{}
lafter
flafter
\series default
\begin_inset LatexCommand index
@ -20980,6 +20979,176 @@ e
\end_inset
\end_layout
\begin_layout Section
Gleitobjekte nebeneinander
\begin_inset LatexCommand index
name "Gleitobjekte ! nebeneinander"
\end_inset
\end_layout
\begin_layout Standard
Um Gleitobjekte nebeneinander zu setzen, wie bei Abbildung\InsetSpace ~
\begin_inset LatexCommand ref
reference "fig:Gleitobjekt-links"
\end_inset
und
\begin_inset LatexCommand ref
reference "fig:Gleitobjekt-rechts"
\end_inset
, wird nur
\emph on
ein
\emph default
Gleitobjekt verwendet.
In dieses werden zwei Minipage Boxen eingefügt.
\begin_inset Foot
status collapsed
\begin_layout Standard
Minipages sind in Abschnitt\InsetSpace ~
\begin_inset LatexCommand ref
reference "abs:Minipage"
\end_inset
erklärt.
\end_layout
\end_inset
Die Breite wird für jede Minipage auf 45\InsetSpace \thinspace{}
-50\InsetSpace \thinspace{}
Spalten% und die Box Ausrichtung
auf
\family sans
Unten
\family default
gesetzt.
Die Minipage Boxen enthalten das Bild und die Beschriftung, so wie in einem
Gleitobjekt.
Der einzige Unterschied ist, dass die Bildeinheit
\family sans
Spaltenbreite\InsetSpace ~
%
\family default
nun bezüglich der Breite der Minipage Boxen berechnet wird.
\end_layout
\begin_layout Standard
\begin_inset Float figure
wide false
sideways false
status open
\begin_layout Standard
\begin_inset Box Frameless
position "b"
hor_pos "c"
has_inner_box 1
inner_pos "t"
use_parbox 0
width "45col%"
special "none"
height "1in"
height_special "totalheight"
status open
\begin_layout Standard
\align center
\begin_inset Graphics
filename D:/LyXSVN/LyX1.5.x/lib/doc/clipart/mobius.eps
lyxscale 50
width 100col%
scaleBeforeRotation
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Caption
\begin_layout Standard
\begin_inset LatexCommand label
name "fig:Gleitobjekt-links"
\end_inset
Gleitobjekt auf der linken Seite.
\end_layout
\end_inset
\end_layout
\end_inset
\hfill
\begin_inset Box Frameless
position "b"
hor_pos "c"
has_inner_box 1
inner_pos "t"
use_parbox 0
width "45col%"
special "none"
height "1in"
height_special "totalheight"
status open
\begin_layout Standard
\align center
\begin_inset Graphics
filename D:/LyXSVN/LyX1.5.x/lib/doc/clipart/platypus.eps
lyxscale 50
width 100col%
scaleBeforeRotation
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Caption
\begin_layout Standard
\begin_inset LatexCommand label
name "fig:Gleitobjekt-rechts"
\end_inset
Gleitobjekt auf der rechten Seite.
\end_layout
\end_inset
\end_layout
\end_inset
\end_layout
\end_inset
\end_layout
\begin_layout Section
@ -21853,8 +22022,7 @@ let
\backslash
MyFigure
\backslash
f\SpecialChar \textcompwordmark{}
igure
figure
\newline
\begin_inset ERT
@ -21873,11 +22041,9 @@ hphantom{ }
\backslash
let
\backslash
MyEndf\SpecialChar \textcompwordmark{}
igure
MyEndfigure
\backslash
endf\SpecialChar \textcompwordmark{}
igure
endfigure
\newline
\begin_inset ERT
@ -21894,14 +22060,11 @@ hphantom{ }
\backslash
renewenvironment{f\SpecialChar \textcompwordmark{}
igure}{
renewenvironment{figure}{
\backslash
begin{SCf\SpecialChar \textcompwordmark{}
igure}}{
begin{SCfigure}}{
\backslash
end{SCf\SpecialChar \textcompwordmark{}
igure}}}
end{SCfigure}}}
\end_layout
\begin_layout Standard
@ -21930,8 +22093,7 @@ hphantom{ }
\backslash
let
\backslash
f\SpecialChar \textcompwordmark{}
igure
figure
\backslash
MyFigure
\newline
@ -21952,11 +22114,9 @@ hphantom{ }
\backslash
let
\backslash
endf\SpecialChar \textcompwordmark{}
igure
endfigure
\backslash
MyEndf\SpecialChar \textcompwordmark{}
igure}
MyEndfigure}
\series default
\lyxline

View File

@ -20105,6 +20105,191 @@ e
\end_inset
\end_layout
\begin_layout Section
Flotantes Side by Side
\begin_inset LatexCommand index
name "Flotantes ! Side by side"
\end_inset
\end_layout
\begin_layout Standard
\lang english
To place floats side by side, like for
\lang spanish
Figura\InsetSpace ~
\begin_inset LatexCommand ref
reference "fig:Float-left"
\end_inset
y
\begin_inset LatexCommand ref
reference "fig:Float-right"
\end_inset
,
\lang english
only
\emph on
one
\emph default
float is used.
In it two minipage boxes are inserted.
\begin_inset Foot
status collapsed
\begin_layout Standard
Minipáginas
\lang english
are explained in
\lang spanish
sección\InsetSpace ~
\begin_inset LatexCommand ref
reference "sec:Minipáginas"
\end_inset
.
\end_layout
\end_inset
The width is set to 45\InsetSpace \thinspace{}
-50\InsetSpace \thinspace{}
column% and the box alignment to
\family sans
Bottom
\family default
for each minipage.
The minipage boxes contain the image and the caption in the same way as
they are in a float.
The only difference is that the image unit
\family sans
Column\InsetSpace ~
Width\InsetSpace ~
%
\family default
is now calculated according to the width of the minipage boxes.
\end_layout
\begin_layout Standard
\begin_inset Float figure
placement h
wide false
sideways false
status open
\begin_layout Standard
\begin_inset Box Frameless
position "b"
hor_pos "c"
has_inner_box 1
inner_pos "t"
use_parbox 0
width "45col%"
special "none"
height "1in"
height_special "totalheight"
status open
\begin_layout Standard
\align center
\begin_inset Graphics
filename D:/LyXSVN/LyX1.5.x/lib/doc/clipart/mobius.eps
lyxscale 50
width 100col%
scaleBeforeRotation
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Caption
\begin_layout Standard
\lang english
\begin_inset LatexCommand label
name "fig:Float-left"
\end_inset
Float on the left side.
\end_layout
\end_inset
\end_layout
\end_inset
\hfill
\begin_inset Box Frameless
position "b"
hor_pos "c"
has_inner_box 1
inner_pos "t"
use_parbox 0
width "45col%"
special "none"
height "1in"
height_special "totalheight"
status open
\begin_layout Standard
\align center
\begin_inset Graphics
filename D:/LyXSVN/LyX1.5.x/lib/doc/clipart/platypus.eps
lyxscale 50
width 100col%
scaleBeforeRotation
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Caption
\begin_layout Standard
\lang english
\begin_inset LatexCommand label
name "fig:Float-right"
\end_inset
Float on the right side.
\end_layout
\end_inset
\end_layout
\end_inset
\end_layout
\end_inset
\end_layout
\begin_layout Section
@ -20263,8 +20448,7 @@ usepackage[tableposition=top]{caption}
\series bold
\backslash
captionsetup[f\SpecialChar \textcompwordmark{}
igure]{labelfont={tt}, textfont=it, indention=1cm,%
captionsetup[figure]{labelfont={tt}, textfont=it, indention=1cm,%
\newline
\begin_inset ERT
@ -21020,8 +21204,7 @@ let
\backslash
MyFigure
\backslash
f\SpecialChar \textcompwordmark{}
igure
figure
\newline
\begin_inset ERT
@ -21040,11 +21223,9 @@ hphantom{ }
\backslash
let
\backslash
MyEndf\SpecialChar \textcompwordmark{}
igure
MyEndfigure
\backslash
endf\SpecialChar \textcompwordmark{}
igure
endfigure
\newline
\begin_inset ERT
@ -21061,14 +21242,11 @@ hphantom{ }
\backslash
renewenvironment{f\SpecialChar \textcompwordmark{}
igure}{
renewenvironment{figure}{
\backslash
begin{SCf\SpecialChar \textcompwordmark{}
igure}}{
begin{SCfigure}}{
\backslash
end{SCf\SpecialChar \textcompwordmark{}
igure}}}
end{SCfigure}}}
\end_layout
\begin_layout Standard
@ -21097,8 +21275,7 @@ hphantom{ }
\backslash
let
\backslash
f\SpecialChar \textcompwordmark{}
igure
figure
\backslash
MyFigure
\newline
@ -21119,11 +21296,9 @@ hphantom{ }
\backslash
let
\backslash
endf\SpecialChar \textcompwordmark{}
igure
endfigure
\backslash
MyEndf\SpecialChar \textcompwordmark{}
igure}
MyEndfigure}
\end_layout
\begin_layout Standard
@ -21293,8 +21468,7 @@ bottom
\series bold
\backslash
sidecaptionvpos{f\SpecialChar \textcompwordmark{}
igure}{c}
sidecaptionvpos{figure}{c}
\end_layout
\begin_layout Standard

View File

@ -19969,11 +19969,7 @@ On peut parfois se trouver dans la situation où un flottant est placé en
suppressfloats
\series default
pour éviter ce cas.
\lang english
\lang french
Elle empêche le placement d'un flottant donné dans la page dans laquelle
Elle empêche le placement d'un flottant donné dans la page dans laquelle
il est inséré et donc elle peut être utilisée pour éviter qu'un flottant
soit placé avant que la section commence.
Pour obtenir ce comportement, ajoutez ces commandes dans le préambule de
@ -20335,6 +20331,190 @@ e
\end_inset
\end_layout
\begin_layout Section
Flottants Side by Side
\begin_inset LatexCommand index
name "Flottants ! Side by side"
\end_inset
\end_layout
\begin_layout Standard
\lang english
To place floats side by side, like for
\lang french
Figure\InsetSpace ~
\begin_inset LatexCommand ref
reference "fig:Float-left"
\end_inset
et
\begin_inset LatexCommand ref
reference "fig:Float-right"
\end_inset
,
\lang english
only
\emph on
one
\emph default
float is used.
In it two minipage boxes are inserted.
\begin_inset Foot
status collapsed
\begin_layout Standard
\lang english
Minipages are explained in
\lang french
section\InsetSpace ~
\begin_inset LatexCommand ref
reference "sec:Minipages"
\end_inset
.
\end_layout
\end_inset
The width is set to 45\InsetSpace \thinspace{}
-50\InsetSpace \thinspace{}
column% and the box alignment to
\family sans
Bottom
\family default
for each minipage.
The minipage boxes contain the image and the caption in the same way as
they are in a float.
The only difference is that the image unit
\family sans
Column\InsetSpace ~
Width\InsetSpace ~
%
\family default
is now calculated according to the width of the minipage boxes.
\end_layout
\begin_layout Standard
\begin_inset Float figure
wide false
sideways false
status open
\begin_layout Standard
\begin_inset Box Frameless
position "b"
hor_pos "c"
has_inner_box 1
inner_pos "t"
use_parbox 0
width "45col%"
special "none"
height "1in"
height_special "totalheight"
status open
\begin_layout Standard
\align center
\begin_inset Graphics
filename D:/LyXSVN/LyX1.5.x/lib/doc/clipart/mobius.eps
lyxscale 50
width 100col%
scaleBeforeRotation
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Caption
\begin_layout Standard
\lang english
\begin_inset LatexCommand label
name "fig:Float-left"
\end_inset
Float on the left side.
\end_layout
\end_inset
\end_layout
\end_inset
\hfill
\begin_inset Box Frameless
position "b"
hor_pos "c"
has_inner_box 1
inner_pos "t"
use_parbox 0
width "45col%"
special "none"
height "1in"
height_special "totalheight"
status open
\begin_layout Standard
\align center
\begin_inset Graphics
filename D:/LyXSVN/LyX1.5.x/lib/doc/clipart/platypus.eps
lyxscale 50
width 100col%
scaleBeforeRotation
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Caption
\begin_layout Standard
\lang english
\begin_inset LatexCommand label
name "fig:Float-right"
\end_inset
Float on the right side.
\end_layout
\end_inset
\end_layout
\end_inset
\end_layout
\end_inset
\end_layout
\begin_layout Section
@ -20493,8 +20673,7 @@ usepackage[tableposition=top]{caption}
\series bold
\backslash
captionsetup[f\SpecialChar \textcompwordmark{}
igure]{labelfont={tt}, textfont=it, indention=1cm,%
captionsetup[figure]{labelfont={tt}, textfont=it, indention=1cm,%
\newline
\begin_inset ERT
@ -21231,8 +21410,7 @@ let
\backslash
MyFigure
\backslash
f\SpecialChar \textcompwordmark{}
igure
figure
\newline
\begin_inset ERT
@ -21251,11 +21429,9 @@ hphantom{ }
\backslash
let
\backslash
MyEndf\SpecialChar \textcompwordmark{}
igure
MyEndfigure
\backslash
endf\SpecialChar \textcompwordmark{}
igure
endfigure
\newline
\begin_inset ERT
@ -21272,14 +21448,11 @@ hphantom{ }
\backslash
renewenvironment{f\SpecialChar \textcompwordmark{}
igure}{
renewenvironment{figure}{
\backslash
begin{SCf\SpecialChar \textcompwordmark{}
igure}}{
begin{SCfigure}}{
\backslash
end{SCf\SpecialChar \textcompwordmark{}
igure}}}
end{SCfigure}}}
\end_layout
\begin_layout Standard
@ -21308,8 +21481,7 @@ hphantom{ }
\backslash
let
\backslash
f\SpecialChar \textcompwordmark{}
igure
figure
\backslash
MyFigure
\newline
@ -21330,11 +21502,9 @@ hphantom{ }
\backslash
let
\backslash
endf\SpecialChar \textcompwordmark{}
igure
endfigure
\backslash
MyEndf\SpecialChar \textcompwordmark{}
igure}
MyEndfigure}
\end_layout
\begin_layout Standard
@ -21480,8 +21650,7 @@ b
\series bold
\backslash
sidecaptionvpos{f\SpecialChar \textcompwordmark{}
igure}{c}
sidecaptionvpos{figure}{c}
\end_layout
\begin_layout Standard