From 95a4fd0bbe9d078317df04196209a807720c6f71 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Thu, 6 Mar 2014 00:01:35 +0100 Subject: [PATCH] EmbeddedObjects.lyx: describe caption above/below - also simplify the float section structure in the UserGuide.lyx --- lib/doc/EmbeddedObjects.lyx | 380 +++++++++++++++++++++++++++++-- lib/doc/UserGuide.lyx | 6 +- lib/doc/de/EmbeddedObjects.lyx | 382 +++++++++++++++++++++++++++++-- lib/doc/de/UserGuide.lyx | 122 +--------- lib/doc/es/EmbeddedObjects.lyx | 396 +++++++++++++++++++++++++++++++- lib/doc/es/UserGuide.lyx | 9 +- lib/doc/fr/EmbeddedObjects.lyx | 396 +++++++++++++++++++++++++++++++- lib/doc/fr/UserGuide.lyx | 9 +- lib/doc/ja/EmbeddedObjects.lyx | 397 ++++++++++++++++++++++++++++++++- lib/doc/ja/UserGuide.lyx | 9 +- 10 files changed, 1894 insertions(+), 212 deletions(-) diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx index 2669b22973..52fbc1aec4 100644 --- a/lib/doc/EmbeddedObjects.lyx +++ b/lib/doc/EmbeddedObjects.lyx @@ -26896,7 +26896,7 @@ Figure #: is the actual reference number. By default the label and the number are in the same font as the caption text and a colon follows the number to divide the label from the text. - This caption format is not suitable for all document formats. + This caption format is suitable for many but not all documents. \end_layout @@ -26927,7 +26927,7 @@ usepackage[format definition]{caption} \end_layout \begin_layout Standard -To have for example the label and the number in sans-serif bold font and +To have for example the label and the number in sans-serif, bold font and the table captions always above the table as in this document, use the following command: \end_layout @@ -27480,12 +27480,21 @@ letter report \family default there will be no space between the caption and the table. - To insert the necessary space, add the following option to the load command - of the LaTeX-package + To insert the necessary space, load the LaTeX-package \series bold caption \series default - in your document preamble + +\begin_inset Index idx +status collapsed + +\begin_layout Plain Layout +LaTeX-packages ! caption +\end_layout + +\end_inset + + in your document preamble with the option \begin_inset Foot status collapsed @@ -27510,7 +27519,7 @@ caption \end_inset -: + \end_layout \begin_layout Standard @@ -27558,11 +27567,342 @@ report (KOMA-Script) \series bold caption \series default - package set the document class option + package set the document class option +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout +That option is used in this document. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard + \series bold captions=tableheading -\series default -. +\end_layout + +\begin_layout Standard +In documents with a KOMA-Script document class you can also right-click + on a caption and mark in the context menu if this should be a caption above + or below the table/figure. + This way you can override the document-wide caption placement for certain + captions. + Table +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "tab:A-caption-marked" + +\end_inset + + is an example where the caption is marked a being below the table while + it is above. + For comparison the caption in Table +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "tab:A-standard-table" + +\end_inset + + is not marked. +\end_layout + +\begin_layout Standard +\begin_inset Float table +wide false +sideways false +status open + +\begin_layout Plain Layout +\begin_inset Caption Below + +\begin_layout Plain Layout +\begin_inset CommandInset label +LatexCommand label +name "tab:A-caption-marked" + +\end_inset + +A caption marked as being below the table. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\align center +\begin_inset Tabular + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout +1 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +2 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +3 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +Joe +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Mary +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Ted +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\int x^{2}dx$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\left[\begin{array}{cc} +a & b\\ +c & d +\end{array}\right]$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $1+1=2$ +\end_inset + + +\end_layout + +\end_inset + + + + +\end_inset + + +\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 Standard + +\begin_layout Plain Layout +\begin_inset CommandInset label +LatexCommand label +name "tab:A-standard-table" + +\end_inset + +A standard table caption. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\align center +\begin_inset Tabular + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout +1 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +2 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +3 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +Joe +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Mary +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Ted +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\int x^{2}dx$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\left[\begin{array}{cc} +a & b\\ +c & d +\end{array}\right]$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $1+1=2$ +\end_inset + + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_inset + + \end_layout \begin_layout Standard @@ -27649,13 +27989,6 @@ 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 @@ -28633,6 +28966,19 @@ status collapsed \begin_layout Plain Layout +\backslash +FigBesBeg +\end_layout + +\end_inset + + +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + \backslash sidecaptionvpos{figure}{c} \end_layout @@ -28727,7 +29073,7 @@ name "tab:cap-beside-tab-wider" \end_inset -This is a caption is wider than the one in Table +This caption is wider than the one in Table \begin_inset space ~ \end_inset diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index e8df54391f..014b341d63 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -21831,10 +21831,6 @@ You should insert floats in a separate paragraph to avoid possible LaTeX-errors \end_layout \begin_layout Subsection -Examples -\end_layout - -\begin_layout Subsubsection Figure Floats \begin_inset CommandInset label LatexCommand label @@ -22179,7 +22175,7 @@ Two distorted images. \end_layout -\begin_layout Subsubsection +\begin_layout Subsection Table Floats \begin_inset Index idx status collapsed diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx index 3f19bc33cf..2e858853d7 100644 --- a/lib/doc/de/EmbeddedObjects.lyx +++ b/lib/doc/de/EmbeddedObjects.lyx @@ -27039,7 +27039,7 @@ xyz die von LyX vergebene Nummer ist. Standardmäßig werden die Marke und der Beschriftungstext im selben Font gedruckt. - Dies ist nicht immer brauchbar. + Dieses Format ist für die meisten aber nicht alle Dokumente geeignet. \end_layout \begin_layout Standard @@ -27070,8 +27070,9 @@ usepackage[Format-Definition]{caption} \end_layout \begin_layout Standard -Wenn zum Beispiel Name und Nummer serifenfrei und fett gedruckt werden und - die Beschriftung immer über der Tabelle, müssen Sie folgenden Befehl benutzen: +Soll zum Beispiel Name und Nummer serifenlos und fett gedruckt werden und + die Beschriftung immer über der Tabelle stehen, müssen Sie folgenden Befehl + verwenden: \end_layout \begin_layout Standard @@ -27618,11 +27619,21 @@ letter report \family default benutzen, wird zwischen Beschriftung und Tabelle kein Zwischenraum gedruckt. - Um das zu erreichen, müssen Sie beim Lade-Befehl des LaTeX-Pakets + Um das zu erreichen, , laden Sie das LaTeX-Paket \series bold caption \series default - im LaTeX-Vorspann folgendes schreiben: + +\begin_inset Index idx +status collapsed + +\begin_layout Plain Layout +LaTeX-Pakete ! caption +\end_layout + +\end_inset + + im LaTeX-Vorspann mit der Option \begin_inset Foot status collapsed @@ -27691,11 +27702,346 @@ report (KOMA-Script) \series bold caption \series default --Paket die Option +-Paket die Dokumentklassen-Option +\end_layout + +\begin_layout Standard + \series bold captions=tableheading -\series default - benutzen. +\end_layout + +\begin_layout Standard +benutzen. +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout +Diese Option wird in diesem Dokument verwendet. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +In Dokumenten, die eine KOMA-Script Klasse verwenden, können Sie auch mit + rechts auf eine Beschriftung klicken und im Kontextmenü markieren, ob diese + Beschriftung über oder unter der Tabelle/Abbildung sein soll. + Auf diese Weise kann die dokumentweite Beschriftungs-Platzierung für bestimmte + Beschriftungen überschrieben werden. + Tabelle +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "tab:Eine-Beschriftung-unterhalb" + +\end_inset + + ist ein Beispiel, bei dem die Beschriftung als unterhalb der Tabelle markiert + wurde, obwohl sie über der Tabelle steht. + Zum Vergleich ist die Beschriftung von Tabelle +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "tab:Eine-normale-Tabellen-Beschriftu" + +\end_inset + + nicht markiert. +\end_layout + +\begin_layout Standard +\begin_inset Float table +wide false +sideways false +status open + +\begin_layout Plain Layout +\begin_inset Caption Below + +\begin_layout Plain Layout +\begin_inset CommandInset label +LatexCommand label +name "tab:Eine-Beschriftung-unterhalb" + +\end_inset + +Eine Beschriftung, die als unterhalb der der Tabelle markiert wurde. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\align center +\begin_inset Tabular + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout +1 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +2 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +3 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +Joe +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Mary +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Ted +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\int x^{2}dx$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\left[\begin{array}{cc} +a & b\\ +c & d +\end{array}\right]$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $1+1=2$ +\end_inset + + +\end_layout + +\end_inset + + + + +\end_inset + + +\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 Standard + +\begin_layout Plain Layout +\begin_inset CommandInset label +LatexCommand label +name "tab:Eine-normale-Tabellen-Beschriftu" + +\end_inset + +Eine normale Tabellen-Beschriftung. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\align center +\begin_inset Tabular + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout +1 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +2 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +3 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +Joe +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Mary +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Ted +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\int x^{2}dx$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\left[\begin{array}{cc} +a & b\\ +c & d +\end{array}\right]$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $1+1=2$ +\end_inset + + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_inset + + \end_layout \begin_layout Standard @@ -27782,6 +28128,13 @@ Um die Beschriftung mit LyX seitlich zu drucken, müssen Sie folgende Befehle in den LaTeX-Vorspann schreiben: \end_layout +\begin_layout Standard +\begin_inset Newpage newpage +\end_inset + + +\end_layout + \begin_layout Standard \noindent \begin_inset CommandInset line @@ -28303,17 +28656,6 @@ FigBesBeg 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. @@ -28763,7 +29105,7 @@ status collapsed \backslash -FigBesBeg[5] +FigBesBeg \end_layout \end_inset diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index 416988df34..7e730acf2a 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -8167,119 +8167,6 @@ LyX stellt zwei Umgebungen bereit, die dazu genutzt werden können, das Verhalte einer Computer-Konsole/Terminal und einer Schreibmaschine zu emulieren. \end_layout -\begin_layout Standard -\begin_inset Note Note -status open - -\begin_layout Subsubsection -Legende, Legende oben, Legende unten -\end_layout - -\begin_layout Plain Layout -Die -\family sans -Legende -\family default --Umgebung ist die Standard-Paragraph-Umgebung für Gleitobjekt-Ab\SpecialChar \- -bil\SpecialChar \- -dungen - und -Tabellen. - In LyX sehen Sie die Marke -\emph on -Abbildung -\begin_inset space \space{} -\end_inset - -Nr: -\emph default - oder -\emph on -Tabelle -\begin_inset space \space{} -\end_inset - -Nr: -\emph default -. -\end_layout - -\begin_layout Plain Layout -Man kann in die -\family sans -Legende -\family default --Umgebung nichts schachteln. - Außerdem setzt -\family sans -Eingabe -\family default - die Absatzumgebung auf -\family sans -Standard -\family default - zurück, sodass die -\family sans -Legende -\family default -nur aus einem Absatz besteht. -\end_layout - -\begin_layout Plain Layout -Außerhalb von Gleitobjekten kann man die -\family sans -Legende -\family default --Umgebung nicht benutzen. - Siehe auch die Abschnitte -\begin_inset space ~ -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Abbildungen" - -\end_inset - - und -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:Tabellen" - -\end_inset - - für weitere Informationen über Gleitobjekt-Abbildungen und -Tabellen. -\end_layout - -\begin_layout Plain Layout - -\family sans -Legende -\family default - wird in der normalen -\family sans -book -\family default --Dokumentklasse benutzt, L -\family sans -egende oben -\family default - und -\family sans -Legende unten -\family default - in der -\family sans -KOMA-Script -\family default --Version. -\end_layout - -\end_inset - - -\end_layout - \begin_layout Subsubsection \family sans @@ -8601,12 +8488,10 @@ Verbatim \end_layout \begin_layout Verbatim - Dies ist Verbatim. \end_layout \begin_layout Verbatim - Die folgenden 2 Zeilen sind leer: \end_layout @@ -8619,7 +8504,6 @@ Die folgenden 2 Zeilen sind leer: \end_layout \begin_layout Verbatim - Fast alles ist in Verbatim erlaubt:"%&$§#~'` \backslash }][{| @@ -22669,10 +22553,6 @@ Es wird empfohlen Gleitobjekte als separaten Absatz einzufügen um mögliche \end_layout \begin_layout Subsection -Beispiele -\end_layout - -\begin_layout Subsubsection Abbildungs-Gleitobjekte \begin_inset CommandInset label LatexCommand label @@ -23015,7 +22895,7 @@ Zwei verzerrte Bilder. \end_layout -\begin_layout Subsubsection +\begin_layout Subsection Tabellen-Gleitobjekt \begin_inset Index idx status collapsed diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx index bf8a1156d0..75f7617522 100644 --- a/lib/doc/es/EmbeddedObjects.lyx +++ b/lib/doc/es/EmbeddedObjects.lyx @@ -27247,12 +27247,29 @@ letter report \family default no habrá espacio entre la leyenda y el cuadro. - Para insertar el espacio adecuado añade la siguiente opción al comando - del paquete LaTeX + Para insertar el espacio adecuado, +\lang english +load +\lang spanish + el paquete LaTeX \series bold caption \series default - en el preámbulo del documento: + +\begin_inset Index idx +status collapsed + +\begin_layout Plain Layout +LaTeX-paquetes ! caption +\end_layout + +\end_inset + + en el preámbulo del documento con la +\lang english + +\lang spanish +opción \begin_inset Foot status collapsed @@ -27325,11 +27342,362 @@ report (KOMA-Script) \series bold caption \series default - puedes poner la opción + puedes poner la opción +\end_layout + +\begin_layout Standard + \series bold captions=tableheading -\series default - de la clase de documento. +\end_layout + +\begin_layout Standard +de la clase de documento. +\begin_inset Foot +status open + +\begin_layout Plain Layout + +\lang english +That option is used in this document. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard + +\lang english +In documents with a KOMA-Script document class you can also right-click + on a caption and mark in the context menu if this should be a caption above + or below the table/figure. + This way you can override the document-wide caption placement for certain + captions. + Table +\lang spanish + +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "tab:A-caption-marked" + +\end_inset + + +\lang english + is an example where the caption is marked a being below the table while + it is above. + For comparison the caption in Table +\lang spanish + +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "tab:A-standard-table" + +\end_inset + + +\lang english + is not marked. +\end_layout + +\begin_layout Standard +\begin_inset Float table +wide false +sideways false +status open + +\begin_layout Plain Layout +\begin_inset Caption Below + +\begin_layout Plain Layout +\begin_inset CommandInset label +LatexCommand label +name "tab:A-caption-marked" + +\end_inset + + +\lang english +A caption marked as being below the table. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\align center +\begin_inset Tabular + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout +1 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +2 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +3 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +Joe +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Mary +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Ted +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\int x^{2}dx$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\left[\begin{array}{cc} +a & b\\ +c & d +\end{array}\right]$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $1+1=2$ +\end_inset + + +\end_layout + +\end_inset + + + + +\end_inset + + +\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 Standard + +\begin_layout Plain Layout +\begin_inset CommandInset label +LatexCommand label +name "tab:A-standard-table" + +\end_inset + + +\lang english +A standard table caption. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\align center +\begin_inset Tabular + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout +1 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +2 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +3 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +Joe +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Mary +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Ted +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\int x^{2}dx$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\left[\begin{array}{cc} +a & b\\ +c & d +\end{array}\right]$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $1+1=2$ +\end_inset + + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_inset + + \end_layout \begin_layout Standard @@ -28377,6 +28745,22 @@ status collapsed \begin_layout Plain Layout +\backslash +FigBesBeg +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + \backslash sidecaptionvpos{figure}{c} \end_layout diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx index b03bc14237..f994b39956 100644 --- a/lib/doc/es/UserGuide.lyx +++ b/lib/doc/es/UserGuide.lyx @@ -8343,14 +8343,12 @@ Verbatim \end_layout \begin_layout Verbatim - This is verbatim. \end_layout \begin_layout Verbatim \noindent \align block - The following 2 lines are empty: \end_layout @@ -8363,7 +8361,6 @@ The following 2 lines are empty: \end_layout \begin_layout Verbatim - Almost everything is allowed in verbatim:"%&$§#~'` \backslash }][{| @@ -22316,10 +22313,6 @@ Se recomienda insertar flotantes como párrafos separados para evitar posibles \end_layout \begin_layout Subsection -Ejemplos -\end_layout - -\begin_layout Subsubsection Figuras flotantes \begin_inset Index idx status collapsed @@ -22635,7 +22628,7 @@ Dos imágenes distorsionadas. \end_layout -\begin_layout Subsubsection +\begin_layout Subsection Cuadros flotantes \begin_inset Index idx status collapsed diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx index d788be558d..2ff3ada07b 100644 --- a/lib/doc/fr/EmbeddedObjects.lyx +++ b/lib/doc/fr/EmbeddedObjects.lyx @@ -28346,14 +28346,27 @@ letter report \family default il n'y aura pas d'espace libre entre la légende et le tableau. - Pour insérer l'espace nécessaire, ajoutez l'option suivante à la commande - de chargement du paquetage LaTeX + Pour insérer l'espace nécessaire, +\lang english +load +\lang french + le paquetage LaTeX \series bold caption \series default - dans le préambule de votre document + +\begin_inset Index idx +status collapsed + +\begin_layout Plain Layout +Paquetages LaTeX ! caption +\end_layout + +\end_inset + + dans le préambule de votre document avec l'option \begin_inset Foot -status open +status collapsed \begin_layout Plain Layout Voir la section @@ -28376,7 +28389,7 @@ caption \end_inset -: + \end_layout \begin_layout Standard @@ -28424,11 +28437,362 @@ report (KOMA-Script) \series bold caption \series default - l'option + l'option +\end_layout + +\begin_layout Standard + \series bold captions=tableheading -\series default - de la classe de document. +\end_layout + +\begin_layout Standard +de la classe de document. +\begin_inset Foot +status open + +\begin_layout Plain Layout + +\lang english +That option is used in this document. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard + +\lang english +In documents with a KOMA-Script document class you can also right-click + on a caption and mark in the context menu if this should be a caption above + or below the table/figure. + This way you can override the document-wide caption placement for certain + captions. + Table +\lang french + +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "tab:A-caption-marked" + +\end_inset + + +\lang english + is an example where the caption is marked a being below the table while + it is above. + For comparison the caption in Table +\lang french + +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "tab:A-standard-table" + +\end_inset + + +\lang english + is not marked. +\end_layout + +\begin_layout Standard +\begin_inset Float table +wide false +sideways false +status open + +\begin_layout Plain Layout +\begin_inset Caption Below + +\begin_layout Plain Layout +\begin_inset CommandInset label +LatexCommand label +name "tab:A-caption-marked" + +\end_inset + + +\lang english +A caption marked as being below the table. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\align center +\begin_inset Tabular + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout +1 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +2 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +3 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +Joe +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Mary +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Ted +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\int x^{2}dx$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\left[\begin{array}{cc} +a & b\\ +c & d +\end{array}\right]$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $1+1=2$ +\end_inset + + +\end_layout + +\end_inset + + + + +\end_inset + + +\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 Standard + +\begin_layout Plain Layout +\begin_inset CommandInset label +LatexCommand label +name "tab:A-standard-table" + +\end_inset + + +\lang english +A standard table caption. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\align center +\begin_inset Tabular + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout +1 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +2 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +3 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +Joe +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Mary +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Ted +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\int x^{2}dx$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\left[\begin{array}{cc} +a & b\\ +c & d +\end{array}\right]$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $1+1=2$ +\end_inset + + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_inset + + \end_layout \begin_layout Standard @@ -29507,6 +29871,22 @@ status collapsed \begin_layout Plain Layout +\backslash +FigBesBeg +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + \backslash sidecaptionvpos{figure}{c} \end_layout diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index eaac037552..c3f4f168f3 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -8510,14 +8510,12 @@ Verbatim \end_layout \begin_layout Verbatim - This is verbatim. \end_layout \begin_layout Verbatim \noindent \align block - The following 2 lines are empty: \end_layout @@ -8530,7 +8528,6 @@ The following 2 lines are empty: \end_layout \begin_layout Verbatim - Almost everything is allowed in verbatim:"%&$§#~'` \backslash }][{| @@ -23030,10 +23027,6 @@ Il est recommandé d'insérer les flottants comme des paragraphes séparés \end_layout \begin_layout Subsection -Exemples -\end_layout - -\begin_layout Subsubsection Figure flottantes \begin_inset Index idx status collapsed @@ -23382,7 +23375,7 @@ name "fig:Deux-images-déformées." \end_layout -\begin_layout Subsubsection +\begin_layout Subsection Flottant de tableau \begin_inset Index idx status collapsed diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx index be29e71f62..8549d801df 100644 --- a/lib/doc/ja/EmbeddedObjects.lyx +++ b/lib/doc/ja/EmbeddedObjects.lyx @@ -25442,22 +25442,28 @@ letter \family sans report \family default -といった文書クラスを使用している時には、キャプションと表の間に余白が置かれなくなってしまいます。本来あるべき余白を挿入するには、お使いの文書プリアンブルでLaT -eXパッケージ +といった文書クラスを使用している時には、キャプションと表の間に余白が置かれなくなってしまいます。本来あるべき余白を挿入するには、 +\lang english + load the LaTeX-package \series bold +\lang japanese caption \series default -を読み込むコマンドに -\end_layout -\begin_layout Standard +\begin_inset Index idx +status collapsed -\series bold -tableposition=top +\begin_layout Plain Layout +LaTeXぱっけーじ@LaTeXパッケージ ! caption \end_layout -\begin_layout Standard -というオプションを追加してください +\end_inset + + +\lang english +in your document preamble with the option +\lang japanese + \begin_inset Foot status collapsed @@ -25478,7 +25484,17 @@ reference "sec:キャプションの書式設定" \end_inset -。 + +\end_layout + +\begin_layout Standard + +\series bold +tableposition=top +\end_layout + +\begin_layout Standard + \series bold KOMA-script \series default @@ -25517,10 +25533,353 @@ report (KOMA-script) caption \series default パッケージにオプションを与える代わりに、文書クラスオプション +\end_layout + +\begin_layout Standard + \series bold captions=tableheading -\series default +\end_layout + +\begin_layout Standard を設定することもできます。 +\begin_inset Foot +status open + +\begin_layout Plain Layout + +\lang english +That option is used in this document. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard + +\lang english +In documents with a KOMA-Script document class you can also right-click + on a caption and mark in the context menu if this should be a caption above + or below the table/figure. + This way you can override the document-wide caption placement for certain + captions. + Table +\lang japanese + +\begin_inset CommandInset ref +LatexCommand ref +reference "tab:A-caption-marked" + +\end_inset + + +\lang english + is an example where the caption is marked a being below the table while + it is above. + For comparison the caption in Table +\lang japanese + +\begin_inset CommandInset ref +LatexCommand ref +reference "tab:A-standard-table" + +\end_inset + + +\lang english + is not marked. +\end_layout + +\begin_layout Standard +\begin_inset Float table +wide false +sideways false +status open + +\begin_layout Plain Layout +\begin_inset Caption Below + +\begin_layout Plain Layout +\begin_inset CommandInset label +LatexCommand label +name "tab:A-caption-marked" + +\end_inset + + +\lang english +A caption marked as being below the table. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\align center +\begin_inset Tabular + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout +1 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +2 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +3 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +Joe +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Mary +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Ted +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\int x^{2}dx$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\left[\begin{array}{cc} +a & b\\ +c & d +\end{array}\right]$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $1+1=2$ +\end_inset + + +\end_layout + +\end_inset + + + + +\end_inset + + +\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 Standard + +\begin_layout Plain Layout +\begin_inset CommandInset label +LatexCommand label +name "tab:A-standard-table" + +\end_inset + + +\lang english +A standard table caption. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\align center +\begin_inset Tabular + + + + + + + +\begin_inset Text + +\begin_layout Plain Layout +1 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +2 +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +3 +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +Joe +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Mary +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +Ted +\end_layout + +\end_inset + + + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\int x^{2}dx$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $\left[\begin{array}{cc} +a & b\\ +c & d +\end{array}\right]$ +\end_inset + + +\end_layout + +\end_inset + + +\begin_inset Text + +\begin_layout Plain Layout +\begin_inset Formula $1+1=2$ +\end_inset + + +\end_layout + +\end_inset + + + + +\end_inset + + +\end_layout + +\end_inset + + \end_layout \begin_layout Standard @@ -26546,6 +26905,22 @@ status collapsed \begin_layout Plain Layout +\backslash +FigBesBeg +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Plain Layout +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + \backslash sidecaptionvpos{figure}{c} \end_layout diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index 9af6ad57cf..16e7ab128f 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -7011,14 +7011,12 @@ Verbatim \end_layout \begin_layout Verbatim - This is verbatim. \end_layout \begin_layout Verbatim \noindent \align block - The following 2 lines are empty: \end_layout @@ -7031,7 +7029,6 @@ The following 2 lines are empty: \end_layout \begin_layout Verbatim - Almost everything is allowed in verbatim:"%&$§#~'` \backslash }][{| @@ -18519,10 +18516,6 @@ status collapsed \end_layout \begin_layout Subsection -用例 -\end_layout - -\begin_layout Subsubsection 図フロート \begin_inset Index idx status collapsed @@ -18815,7 +18808,7 @@ name "fig:歪められた二つの像" \end_layout -\begin_layout Subsubsection +\begin_layout Subsection 表フロート \begin_inset Index idx status collapsed -- 2.39.5