EmbeddedObjects.lyx: fix bug #7328

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39397 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2011-07-31 16:35:36 +00:00
parent 5778b310d9
commit c954cb89ab
6 changed files with 2112 additions and 232 deletions

View File

@ -33,21 +33,19 @@
% provides commands to set caption
% beside tables/images
\usepackage{sidecap}
\newcommand{\TabBesBeg}{%
\newcommand{\TabBesBeg}[1][1.0]{%
\let\MyTable\table
\let\MyEndtable\endtable
\renewenvironment{table}{\begin{SCtable}}{\end{SCtable}}}
\renewenvironment{table}[1]{\begin{SCtable}[#1]##1}{\end{SCtable}}}
\newcommand{\TabBesEnd}{%
\let\table\MyTable
\let\endtable\MyEndtable}
\newcommand{\FigBesBeg}{%
\newcommand{\FigBesBeg}[1][1.0]{%
\let\MyFigure\figure
\let\MyEndfigure\endfigure
\renewenvironment{figure}{\begin{SCfigure}}{\end{SCfigure}}}
\renewenvironment{figure}[1]{\begin{SCfigure}[#1]##1}{\end{SCfigure}}}
\newcommand{\FigBesEnd}{%
\let\figure\MyFigure
@ -23463,6 +23461,13 @@ To place in LyX the caption of a float on the side, it is necessary to add
these commands to the document preamble:
\end_layout
\begin_layout Standard
\begin_inset Newpage pagebreak
\end_inset
\end_layout
\begin_layout Standard
\noindent
\begin_inset CommandInset line
@ -23483,7 +23488,7 @@ height "1pt"
\backslash
newcommand{
\backslash
TabBesBeg}{%
TabBesBeg}[1][1.0]{%
\begin_inset Newline newline
\end_inset
@ -23492,8 +23497,6 @@ TabBesBeg}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23518,7 +23521,7 @@ status open
\begin_layout Plain Layout
\series bold
\series medium
\begin_inset space ~
\end_inset
@ -23543,7 +23546,7 @@ status open
\begin_layout Plain Layout
\series bold
\series medium
\begin_inset space ~
\end_inset
@ -23554,9 +23557,9 @@ status open
\backslash
renewenvironment{table}{
renewenvironment{table}[1]{
\backslash
begin{SCtable}}{
begin{SCtable}[#1]##1}{
\backslash
end{SCtable}}}
\end_layout
@ -23577,8 +23580,6 @@ TabBesEnd}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23602,8 +23603,6 @@ MyTable
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23628,7 +23627,7 @@ MyEndtable
\backslash
newcommand{
\backslash
FigBesBeg}{%
FigBesBeg}[1][1.0]{%
\begin_inset Newline newline
\end_inset
@ -23637,8 +23636,6 @@ FigBesBeg}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23662,8 +23659,6 @@ figure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23687,8 +23682,6 @@ endfigure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23699,9 +23692,9 @@ status open
\backslash
renewenvironment{figure}{
renewenvironment{figure}[1]{
\backslash
begin{SCfigure}}{
begin{SCfigure}[#1]##1}{
\backslash
end{SCfigure}}}
\end_layout
@ -23722,8 +23715,6 @@ FigBesEnd}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23747,8 +23738,6 @@ MyFigure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23795,7 +23784,7 @@ FigBesBeg
\begin_layout Standard
in TeX-Code before the float.
After the float insert the command
And insert the command
\end_layout
\begin_layout Standard
@ -23807,7 +23796,8 @@ FigBesEnd
\end_layout
\begin_layout Standard
in TeX-Code to get back to the original float definition.
in TeX-Code at the point where you want to get back to the original float
definition.
\end_layout
\begin_layout Standard
@ -23946,6 +23936,115 @@ reference "fig:cap-beside-fig-2"
\begin_inset VSpace medskip
\end_inset
\end_layout
\begin_layout Standard
The default caption width is the width of the image/table.
For thin image/tables, like in Table
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:cap-beside-tab"
\end_inset
, this leads to captions that are too thin.
You can increase the width by specifying a factor that will be multiplied
with the image/table width to get the caption width.
The caption width will automatically be recalculated in case it would protrude
over the page or column margin due to the specified width.
The
\emph on
factor
\emph default
can either be given as optional argument for
\series bold
\backslash
FigBesBeg
\series default
:
\end_layout
\begin_layout Standard
\series bold
\backslash
FigBesBeg[factor]
\end_layout
\begin_layout Standard
or in the definition of
\series bold
\backslash
FigBesBeg
\series default
by replacing the
\series bold
1.0
\series default
with another value.
If you do the latter, your factor will be the default if
\series bold
\backslash
FigBesBeg
\series default
is used without an argument.
For Table
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:cap-beside-tab-wider"
\end_inset
the factor 5 was used.
\end_layout
\begin_layout Standard
\begin_inset Note Greyedout
status open
\begin_layout Plain Layout
\series bold
Note:
\series default
For floats with captions set beside, you cannot use the float placement
option
\family sans
Here
\begin_inset space ~
\end_inset
definitely
\family default
because it is not supported by
\series bold
sidecap
\series default
.
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset VSpace medskip
\end_inset
For more information about the package
\series bold
sidecap
@ -24314,22 +24413,6 @@ status collapsed
\begin_layout Plain Layout
\backslash
TabBesEnd
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
sidecaptionvpos{figure}{c}
\end_layout
@ -24399,6 +24482,282 @@ status collapsed
\begin_layout Plain Layout
\backslash
TabBesBeg[5]
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Float table
wide false
sideways false
status open
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
\begin_inset CommandInset label
LatexCommand label
name "tab:cap-beside-tab-wider"
\end_inset
This is a caption is wider than the one in Table
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:cap-beside-tab"
\end_inset
.
\end_layout
\end_inset
\end_layout
\begin_layout Plain Layout
\begin_inset Tabular
<lyxtabular version="3" rows="4" columns="5">
<features tabularvalignment="middle">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
a
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
b
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
c
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
d
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
e
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
f
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
g
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
h
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
i
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
j
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
</row>
</lyxtabular>
\end_inset
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
TabBesEnd
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
else
\end_layout

View File

@ -30,22 +30,20 @@
% Formatierung von Legenden
\usepackage[labelfont={bf,sf}]{caption}[2004/07/16]
% Befehle, um Legenden neben Tabellen und Abbildungen zu setzen
\usepackage{sidecap}
\newcommand{\TabBesBeg}{%
% Definitionen um Legenden neben Tabellen und Abbildungen zu setzen
\newcommand{\TabBesBeg}[1][1.0]{%
\let\MyTable\table
\let\MyEndtable\endtable
\renewenvironment{table}{\begin{SCtable}}{\end{SCtable}}}
\renewenvironment{table}[1]{\begin{SCtable}[#1]##1}{\end{SCtable}}}
\newcommand{\TabBesEnd}{%
\let\table\MyTable
\let\endtable\MyEndtable}
\newcommand{\FigBesBeg}{%
\newcommand{\FigBesBeg}[1][1.0]{%
\let\MyFigure\figure
\let\MyEndfigure\endfigure
\renewenvironment{figure}{\begin{SCfigure}}{\end{SCfigure}}}
\renewenvironment{figure}[1]{\begin{SCfigure}[#1]##1}{\end{SCfigure}}}
\newcommand{\FigBesEnd}{%
\let\figure\MyFigure
@ -23702,7 +23700,7 @@ height "1pt"
\backslash
newcommand{
\backslash
TabBesBeg}{%
TabBesBeg}[1][1.0]{%
\begin_inset Newline newline
\end_inset
@ -23711,8 +23709,6 @@ TabBesBeg}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23737,7 +23733,7 @@ status open
\begin_layout Plain Layout
\series bold
\series medium
\begin_inset space ~
\end_inset
@ -23762,7 +23758,7 @@ status open
\begin_layout Plain Layout
\series bold
\series medium
\begin_inset space ~
\end_inset
@ -23773,9 +23769,9 @@ status open
\backslash
renewenvironment{table}{
renewenvironment{table}[1]{
\backslash
begin{SCtable}}{
begin{SCtable}[#1]##1}{
\backslash
end{SCtable}}}
\end_layout
@ -23796,8 +23792,6 @@ TabBesEnd}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23821,8 +23815,6 @@ MyTable
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23847,7 +23839,7 @@ MyEndtable
\backslash
newcommand{
\backslash
FigBesBeg}{%
FigBesBeg}[1][1.0]{%
\begin_inset Newline newline
\end_inset
@ -23856,8 +23848,6 @@ FigBesBeg}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23881,8 +23871,6 @@ figure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23906,8 +23894,6 @@ endfigure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23918,9 +23904,9 @@ status open
\backslash
renewenvironment{figure}{
renewenvironment{figure}[1]{
\backslash
begin{SCfigure}}{
begin{SCfigure}[#1]##1}{
\backslash
end{SCfigure}}}
\end_layout
@ -23941,8 +23927,6 @@ FigBesEnd}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23966,8 +23950,6 @@ MyFigure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -24001,7 +23983,7 @@ height "1pt"
\begin_layout Standard
Mit den Befehlen können Sie die Gleitobjekte so umdefinieren, dass die Beschrift
ungen seitlich gedruckt werden.
Für Gleitobjekt-Abbildungen schreiben Sie dann die Befehle
Für Gleitobjekt-Abbildungen schreiben Sie den Befehl
\end_layout
\begin_layout Standard
@ -24013,7 +23995,7 @@ FigBesBeg
\end_layout
\begin_layout Standard
als TeX-Code vor und
als TeX-Code vor das Gleitobjekt und fügen Sie den Befehl
\end_layout
\begin_layout Standard
@ -24025,8 +24007,12 @@ FigBesEnd
\end_layout
\begin_layout Standard
hinter das Gleitobjekt.
Bei Gleitobjekt-Tabellen heißen die Befehle
als TeX-Code an der Stelle ein, wo Sie zur ursprünglichen Gleitobjekt-Definition
zurückkehren wollen.
\end_layout
\begin_layout Standard
Bei Gleitobjekt-Tabellen heißen die Befehle
\end_layout
\begin_layout Standard
@ -24064,7 +24050,7 @@ reference "abb:Beschriftung-neben"
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:cap-beside-tab"
reference "tab:Beschriftung-neben"
\end_inset
@ -24144,6 +24130,135 @@ reference "abb:cap-beside-fig-2"
\begin_inset VSpace medskip
\end_inset
\end_layout
\begin_layout Standard
Die Standard Beschriftungsbreite ist die Breite des Bildes/der Tabelle.
Für schmale Bilder/Tabellen, wie in Tabelle
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:Beschriftung-neben"
\end_inset
, führt dies zu zu schmalen Beschriftungen.
Die breite kann erhöht werden, indem man einen Faktor angibt mit dem die
Breite des Bildes/der Tabelle multipliziert wird.
Das Ergebnis ist die Beschriftungsbreite.
Die Breite der Beschriftung wird automatisch neu berechnet, falls sie aufgrund
der angegebenen Breite in den Seiten- oder Spaltenrand ragen würde.
Der
\emph on
Faktor
\emph default
kann entweder als optionales Argument für
\series bold
\backslash
FigBesBeg
\series default
angegeben werden:
\end_layout
\begin_layout Standard
\series bold
\backslash
FigBesBeg[Faktor]
\end_layout
\begin_layout Standard
oder indem man in der Definition von
\series bold
\backslash
FigBesBeg
\series default
die
\series bold
1.0
\series default
mit einem anderen Wert ersetzt.
Bei letzterem ist der angegebene Faktor der Standard wenn
\series bold
\backslash
FigBesBeg
\series default
ohne Argument verwendet wird.
Für Tabelle
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:Beschriftung-neben-breiter"
\end_inset
und Abbildung
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "abb:cap-beside-fig-2"
\end_inset
wurde der Faktor 5 verwendet.
\end_layout
\begin_layout Standard
\begin_inset Note Greyedout
status open
\begin_layout Plain Layout
\series bold
Achtung:
\series default
Für Gleitobjekten mit Beschriftung neben dem Objekt kann die Gleitobjekt-Platzi
erungsoption
\family sans
Hier,
\begin_inset space ~
\end_inset
auf
\begin_inset space ~
\end_inset
jeden
\begin_inset space ~
\end_inset
Fall
\family default
nicht verwendet werden werden, da diese von
\series bold
sidecap
\series default
nicht unterstützt wird.
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset VSpace medskip
\end_inset
Weitere Informationen über das Paket
\series bold
sidecap
@ -24285,7 +24400,7 @@ status open
\begin_layout Plain Layout
\begin_inset CommandInset label
LatexCommand label
name "tab:cap-beside-tab"
name "tab:Beschriftung-neben"
\end_inset
@ -24514,7 +24629,7 @@ status collapsed
\backslash
TabBesEnd
FigBesBeg[5]
\end_layout
\end_inset
@ -24598,6 +24713,282 @@ status collapsed
\begin_layout Plain Layout
\backslash
TabBesBeg[5]
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Float table
wide false
sideways false
status open
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
\begin_inset CommandInset label
LatexCommand label
name "tab:Beschriftung-neben-breiter"
\end_inset
Diese Beschriftung ist breiter als die in Tabelle
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:Beschriftung-neben"
\end_inset
.
\end_layout
\end_inset
\end_layout
\begin_layout Plain Layout
\begin_inset Tabular
<lyxtabular version="3" rows="4" columns="5">
<features tabularvalignment="middle">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
a
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
b
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
c
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
d
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
e
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
f
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
g
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
h
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
i
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
j
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
</row>
</lyxtabular>
\end_inset
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
TabBesEnd
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
else
\end_layout

View File

@ -33,21 +33,19 @@
% provides commands to set caption
% beside tables/images
\usepackage{sidecap}
\newcommand{\TabBesBeg}{%
\newcommand{\TabBesBeg}[1][1.0]{%
\let\MyTable\table
\let\MyEndtable\endtable
\renewenvironment{table}{\begin{SCtable}}{\end{SCtable}}}
\renewenvironment{table}[1]{\begin{SCtable}[#1]##1}{\end{SCtable}}}
\newcommand{\TabBesEnd}{%
\let\table\MyTable
\let\endtable\MyEndtable}
\newcommand{\FigBesBeg}{%
\newcommand{\FigBesBeg}[1][1.0]{%
\let\MyFigure\figure
\let\MyEndfigure\endfigure
\renewenvironment{figure}{\begin{SCfigure}}{\end{SCfigure}}}
\renewenvironment{figure}[1]{\begin{SCfigure}[#1]##1}{\end{SCfigure}}}
\newcommand{\FigBesEnd}{%
\let\figure\MyFigure
@ -23259,7 +23257,7 @@ height "1pt"
\backslash
newcommand{
\backslash
TabBesBeg}{%
TabBesBeg}[1][1.0]{%
\begin_inset Newline newline
\end_inset
@ -23268,8 +23266,6 @@ TabBesBeg}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23294,7 +23290,7 @@ status open
\begin_layout Plain Layout
\series bold
\series medium
\begin_inset space ~
\end_inset
@ -23319,7 +23315,7 @@ status open
\begin_layout Plain Layout
\series bold
\series medium
\begin_inset space ~
\end_inset
@ -23330,9 +23326,9 @@ status open
\backslash
renewenvironment{table}{
renewenvironment{table}[1]{
\backslash
begin{SCtable}}{
begin{SCtable}[#1]##1}{
\backslash
end{SCtable}}}
\end_layout
@ -23353,8 +23349,6 @@ TabBesEnd}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23378,8 +23372,6 @@ MyTable
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23404,7 +23396,7 @@ MyEndtable
\backslash
newcommand{
\backslash
FigBesBeg}{%
FigBesBeg}[1][1.0]{%
\begin_inset Newline newline
\end_inset
@ -23413,8 +23405,6 @@ FigBesBeg}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23438,8 +23428,6 @@ figure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23463,8 +23451,6 @@ endfigure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23475,9 +23461,9 @@ status open
\backslash
renewenvironment{figure}{
renewenvironment{figure}[1]{
\backslash
begin{SCfigure}}{
begin{SCfigure}[#1]##1}{
\backslash
end{SCfigure}}}
\end_layout
@ -23498,8 +23484,6 @@ FigBesEnd}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23523,8 +23507,6 @@ MyFigure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -23571,7 +23553,7 @@ FigBesBeg
\begin_layout Standard
en código TeX antes del flotante.
Detrás del flotante inserta
Y inserta
\end_layout
\begin_layout Standard
@ -23583,7 +23565,11 @@ FigBesEnd
\end_layout
\begin_layout Standard
en código TeX para volver a la definición original de flotantes.
en código TeX
\lang english
at the point where you want to
\lang spanish
volver a la definición original de flotantes.
\end_layout
\begin_layout Standard
@ -23698,6 +23684,132 @@ reference "fig:encab-al-lado-de-fig"
\begin_inset VSpace medskip
\end_inset
\end_layout
\begin_layout Standard
\lang english
The default caption width is the width of the image/table.
For thin image/tables, like in
\lang spanish
cuadro
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:encab-al-lado"
\end_inset
,
\lang english
this leads to captions that are too thin.
You can increase the width by specifying a factor that will be multiplied
with the image/table width to get the caption width.
The caption width will automatically be recalculated in case it would protrude
over the page or column margin due to the specified width.
The
\emph on
factor
\emph default
can either be given as optional argument for
\series bold
\backslash
FigBesBeg
\series default
:
\end_layout
\begin_layout Standard
\series bold
\lang english
\backslash
FigBesBeg[factor]
\end_layout
\begin_layout Standard
\lang english
or in the definition of
\series bold
\backslash
FigBesBeg
\series default
by replacing the
\series bold
1.0
\series default
with another value.
If you do the latter, your factor will be the default if
\series bold
\backslash
FigBesBeg
\series default
is used without an argument.
For
\lang spanish
cuadro
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:cap-beside-tab-wider"
\end_inset
\lang english
the factor 5 was used.
\end_layout
\begin_layout Standard
\lang english
\begin_inset Note Greyedout
status open
\begin_layout Plain Layout
\series bold
Nota
\lang english
:
\series default
For floats with captions set beside, you cannot use the float placement
option
\family sans
Here
\begin_inset space ~
\end_inset
definitely
\family default
because it is not supported by
\series bold
sidecap
\series default
.
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset VSpace medskip
\end_inset
Más información sobre el paquete
\series bold
sidecap
@ -24065,22 +24177,6 @@ status collapsed
\begin_layout Plain Layout
\backslash
TabBesEnd
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
sidecaptionvpos{figure}{c}
\end_layout
@ -24149,6 +24245,286 @@ status collapsed
\begin_layout Plain Layout
\backslash
TabBesBeg[5]
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Float table
wide false
sideways false
status open
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
\begin_inset CommandInset label
LatexCommand label
name "tab:cap-beside-tab-wider"
\end_inset
\lang english
This is a caption is wider than the one in
\lang spanish
cuadro
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:encab-al-lado"
\end_inset
.
\end_layout
\end_inset
\end_layout
\begin_layout Plain Layout
\begin_inset Tabular
<lyxtabular version="3" rows="4" columns="5">
<features tabularvalignment="middle">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
a
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
b
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
c
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
d
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
e
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
f
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
g
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
h
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
i
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
j
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
</row>
</lyxtabular>
\end_inset
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
TabBesEnd
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
else
\end_layout

View File

@ -33,21 +33,19 @@
% provides commands to set caption
% beside tables/images
\usepackage{sidecap}
\newcommand{\TabBesBeg}{%
\newcommand{\TabBesBeg}[1][1.0]{%
\let\MyTable\table
\let\MyEndtable\endtable
\renewenvironment{table}{\begin{SCtable}}{\end{SCtable}}}
\renewenvironment{table}[1]{\begin{SCtable}[#1]##1}{\end{SCtable}}}
\newcommand{\TabBesEnd}{%
\let\table\MyTable
\let\endtable\MyEndtable}
\newcommand{\FigBesBeg}{%
\newcommand{\FigBesBeg}[1][1.0]{%
\let\MyFigure\figure
\let\MyEndfigure\endfigure
\renewenvironment{figure}{\begin{SCfigure}}{\end{SCfigure}}}
\renewenvironment{figure}[1]{\begin{SCfigure}[#1]##1}{\end{SCfigure}}}
\newcommand{\FigBesEnd}{%
\let\figure\MyFigure
@ -23970,7 +23968,7 @@ height "1pt"
\backslash
newcommand{
\backslash
TabBesBeg}{%
TabBesBeg}[1][1.0]{%
\begin_inset Newline newline
\end_inset
@ -23979,8 +23977,6 @@ TabBesBeg}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -24005,7 +24001,7 @@ status open
\begin_layout Plain Layout
\series bold
\series medium
\begin_inset space ~
\end_inset
@ -24030,7 +24026,7 @@ status open
\begin_layout Plain Layout
\series bold
\series medium
\begin_inset space ~
\end_inset
@ -24041,9 +24037,9 @@ status open
\backslash
renewenvironment{table}{
renewenvironment{table}[1]{
\backslash
begin{SCtable}}{
begin{SCtable}[#1]##1}{
\backslash
end{SCtable}}}
\end_layout
@ -24064,8 +24060,6 @@ TabBesEnd}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -24089,8 +24083,6 @@ MyTable
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -24115,7 +24107,7 @@ MyEndtable
\backslash
newcommand{
\backslash
FigBesBeg}{%
FigBesBeg}[1][1.0]{%
\begin_inset Newline newline
\end_inset
@ -24124,8 +24116,6 @@ FigBesBeg}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -24149,8 +24139,6 @@ figure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -24174,8 +24162,6 @@ endfigure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -24186,9 +24172,9 @@ status open
\backslash
renewenvironment{figure}{
renewenvironment{figure}[1]{
\backslash
begin{SCfigure}}{
begin{SCfigure}[#1]##1}{
\backslash
end{SCfigure}}}
\end_layout
@ -24209,8 +24195,6 @@ FigBesEnd}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -24234,8 +24218,6 @@ MyFigure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -24282,7 +24264,7 @@ FigBesBeg
\begin_layout Standard
en code TeX avant le flottant.
Après le flottant, insérez la commande
Et insérez la commande
\end_layout
\begin_layout Standard
@ -24294,7 +24276,11 @@ FigBesEnd
\end_layout
\begin_layout Standard
en code TeX pour revenir à la définition originale du flottant.
en code TeX
\lang english
at the point where you want to
\lang french
revenir à la définition originale du flottant.
\end_layout
\begin_layout Standard
@ -24433,6 +24419,131 @@ reference "fig:legende-à-coté-fig-2"
\begin_inset VSpace medskip
\end_inset
\end_layout
\begin_layout Standard
\lang english
The default caption width is the width of the image/table.
For thin image/tables, like in
\lang french
tableau
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:legende-à-coté-tableau"
\end_inset
,
\lang english
this leads to captions that are too thin.
You can increase the width by specifying a factor that will be multiplied
with the image/table width to get the caption width.
The caption width will automatically be recalculated in case it would protrude
over the page or column margin due to the specified width.
The
\emph on
factor
\emph default
can either be given as optional argument for
\series bold
\backslash
FigBesBeg
\series default
:
\end_layout
\begin_layout Standard
\series bold
\lang english
\backslash
FigBesBeg[factor]
\end_layout
\begin_layout Standard
\lang english
or in the definition of
\series bold
\backslash
FigBesBeg
\series default
by replacing the
\series bold
1.0
\series default
with another value.
If you do the latter, your factor will be the default if
\series bold
\backslash
FigBesBeg
\series default
is used without an argument.
For
\lang french
tableau
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:cap-beside-tab-wider"
\end_inset
\lang english
the factor 5 was used.
\end_layout
\begin_layout Standard
\lang english
\begin_inset Note Greyedout
status open
\begin_layout Plain Layout
\series bold
\lang english
Note:
\series default
For floats with captions set beside, you cannot use the float placement
option
\family sans
Here
\begin_inset space ~
\end_inset
definitely
\family default
because it is not supported by
\series bold
sidecap
\series default
.
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset VSpace medskip
\end_inset
Pour plus d'information sur le paquetage
\series bold
sidecap
@ -24801,22 +24912,6 @@ status collapsed
\begin_layout Plain Layout
\backslash
TabBesEnd
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
sidecaptionvpos{figure}{c}
\end_layout
@ -24886,6 +24981,286 @@ status collapsed
\begin_layout Plain Layout
\backslash
TabBesBeg[5]
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Float table
wide false
sideways false
status open
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
\lang english
\begin_inset CommandInset label
LatexCommand label
name "tab:cap-beside-tab-wider"
\end_inset
This is a caption is wider than the one in
\lang french
tableau
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:legende-à-coté-tableau"
\end_inset
.
\end_layout
\end_inset
\end_layout
\begin_layout Plain Layout
\begin_inset Tabular
<lyxtabular version="3" rows="4" columns="5">
<features tabularvalignment="middle">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
a
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
b
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
c
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
d
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
e
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
f
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
g
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
h
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
i
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
j
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
</row>
</lyxtabular>
\end_inset
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
TabBesEnd
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
else
\end_layout

View File

@ -39,21 +39,19 @@
% provides commands to set caption
% beside tables/images
\usepackage{sidecap}
\newcommand{\TabBesBeg}{%
\newcommand{\TabBesBeg}[1][1.0]{%
\let\MyTable\table
\let\MyEndtable\endtable
\renewenvironment{table}{\begin{SCtable}}{\end{SCtable}}}
\renewenvironment{table}[1]{\begin{SCtable}[#1]##1}{\end{SCtable}}}
\newcommand{\TabBesEnd}{%
\let\table\MyTable
\let\endtable\MyEndtable}
\newcommand{\FigBesBeg}{%
\newcommand{\FigBesBeg}[1][1.0]{%
\let\MyFigure\figure
\let\MyEndfigure\endfigure
\renewenvironment{figure}{\begin{SCfigure}}{\end{SCfigure}}}
\renewenvironment{figure}[1]{\begin{SCfigure}[#1]##1}{\end{SCfigure}}}
\newcommand{\FigBesEnd}{%
\let\figure\MyFigure
@ -21808,7 +21806,7 @@ height "1pt"
\backslash
newcommand{
\backslash
TabBesBeg}{%
TabBesBeg}[1][1.0]{%
\begin_inset Newline newline
\end_inset
@ -21817,8 +21815,6 @@ TabBesBeg}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -21843,7 +21839,7 @@ status open
\begin_layout Plain Layout
\series bold
\series medium
\begin_inset space ~
\end_inset
@ -21868,7 +21864,7 @@ status open
\begin_layout Plain Layout
\series bold
\series medium
\begin_inset space ~
\end_inset
@ -21879,9 +21875,9 @@ status open
\backslash
renewenvironment{table}{
renewenvironment{table}[1]{
\backslash
begin{SCtable}}{
begin{SCtable}[#1]##1}{
\backslash
end{SCtable}}}
\end_layout
@ -21902,8 +21898,6 @@ TabBesEnd}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -21927,8 +21921,6 @@ MyTable
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -21953,7 +21945,7 @@ MyEndtable
\backslash
newcommand{
\backslash
FigBesBeg}{%
FigBesBeg}[1][1.0]{%
\begin_inset Newline newline
\end_inset
@ -21962,8 +21954,6 @@ FigBesBeg}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -21987,8 +21977,6 @@ figure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -22012,8 +22000,6 @@ endfigure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -22024,9 +22010,9 @@ status open
\backslash
renewenvironment{figure}{
renewenvironment{figure}[1]{
\backslash
begin{SCfigure}}{
begin{SCfigure}[#1]##1}{
\backslash
end{SCfigure}}}
\end_layout
@ -22047,8 +22033,6 @@ FigBesEnd}{%
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -22072,8 +22056,6 @@ MyFigure
status open
\begin_layout Plain Layout
\series bold
\begin_inset space ~
\end_inset
@ -22117,7 +22099,9 @@ FigBesBeg
\end_layout
\begin_layout Standard
というコマンドを、フロートの前にTeXコードで入れてください。本来のフロート定義に戻すには、フロートの後に、TeXコードで
というコマンドを、フロートの前にTeXコードで入れてください。
\lang english
And insert the command
\end_layout
\begin_layout Standard
@ -22129,7 +22113,10 @@ FigBesEnd
\end_layout
\begin_layout Standard
というコマンドを挿入してください。
\lang english
in TeX-Code at the point where you want to get back to the original float
definition.
\end_layout
\begin_layout Standard
@ -22233,6 +22220,131 @@ reference "fig:図横キャプション-2"
\end_inset
\end_layout
\begin_layout Standard
\lang english
The default caption width is the width of the image/table.
For thin image/tables, like in Table
\lang japanese
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:表横キャプション"
\end_inset
,
\lang english
this leads to captions that are too thin.
You can increase the width by specifying a factor that will be multiplied
with the image/table width to get the caption width.
The caption width will automatically be recalculated in case it would protrude
over the page or column margin due to the specified width.
The
\emph on
factor
\emph default
can either be given as optional argument for
\series bold
\backslash
FigBesBeg
\series default
:
\end_layout
\begin_layout Standard
\series bold
\lang english
\backslash
FigBesBeg[factor]
\end_layout
\begin_layout Standard
\lang english
or in the definition of
\series bold
\backslash
FigBesBeg
\series default
by replacing the
\series bold
1.0
\series default
with another value.
If you do the latter, your factor will be the default if
\series bold
\backslash
FigBesBeg
\series default
is used without an argument.
For Table
\lang japanese
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:cap-beside-tab-wider"
\end_inset
\lang english
the factor 5 was used.
\end_layout
\begin_layout Standard
\lang english
\begin_inset Note Greyedout
status open
\begin_layout Plain Layout
\series bold
\lang english
Note:
\series default
For floats with captions set beside, you cannot use the float placement
option
\family sans
Here
\begin_inset space ~
\end_inset
definitely
\family default
because it is not supported by
\series bold
sidecap
\series default
.
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset VSpace medskip
\end_inset
\series bold
sidecap
\series default
@ -22596,22 +22708,6 @@ status collapsed
\begin_layout Plain Layout
\backslash
TabBesEnd
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
sidecaptionvpos{figure}{c}
\end_layout
@ -22681,6 +22777,286 @@ status collapsed
\begin_layout Plain Layout
\backslash
TabBesBeg[5]
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Float table
wide false
sideways false
status open
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
\lang english
\begin_inset CommandInset label
LatexCommand label
name "tab:cap-beside-tab-wider"
\end_inset
This is a caption is wider than the one in Table
\lang japanese
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "tab:表横キャプション"
\end_inset
.
\end_layout
\end_inset
\end_layout
\begin_layout Plain Layout
\begin_inset Tabular
<lyxtabular version="3" rows="4" columns="5">
<features tabularvalignment="middle">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<column alignment="center" valignment="top" width="0">
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
a
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
b
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
c
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
d
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
e
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
f
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
g
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
h
\end_layout
\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
i
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
j
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\end_layout
\end_inset
</cell>
</row>
</lyxtabular>
\end_inset
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
TabBesEnd
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
else
\end_layout

View File

@ -273,6 +273,9 @@ What's new
- fixed compilation of the agutex template file.
- correct command definitions for floats with captions set beside in the
EmbeddedObjects manual (bug 7328).
* BUILD/INSTALLATION