From 76a38422712c4abf442391c5bae2d5b012fc1562 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Mon, 20 Nov 2017 23:48:44 +0100 Subject: [PATCH] doc files: port today's changes to master --- lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt | 4 +- lib/doc/Changelog-UserGuide-LyX_23x.txt | 1 + lib/doc/EmbeddedObjects.lyx | 157 ++++------------ lib/doc/UserGuide.lyx | 120 +++--------- lib/doc/de/EmbeddedObjects.lyx | 156 +++------------- lib/doc/de/Math.lyx | 2 +- lib/doc/de/UserGuide.lyx | 121 +++---------- lib/doc/es/EmbeddedObjects.lyx | 160 +++------------- lib/doc/es/UserGuide.lyx | 118 +++--------- lib/doc/fr/EmbeddedObjects.lyx | 171 +++--------------- lib/doc/fr/UserGuide.lyx | 118 ++++-------- lib/doc/ja/EmbeddedObjects.lyx | 152 ++++------------ lib/doc/ja/UserGuide.lyx | 97 +++------- 13 files changed, 294 insertions(+), 1083 deletions(-) diff --git a/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt b/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt index cc806c5968..2c32882ab7 100644 --- a/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt +++ b/lib/doc/Changelog-EmbeddedObjects-LyX_23x.txt @@ -9,7 +9,9 @@ first step (French and Spanish): - bibliography: new entry for Inkscape second step -- sec 7.1: (Spanish and Japanese) new description item for Inkscape drawings +- sec. 4.2: (French) new paragraph +- sec. 4.2: (Japanese) please revise the paragraph about footnotes in minipages +- sec. 7.1: (Spanish and Japanese) new description item for Inkscape drawings - Japanese-only: new file DummyDocument.txt diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt b/lib/doc/Changelog-UserGuide-LyX_23x.txt index c497490cb7..ba998cf280 100644 --- a/lib/doc/Changelog-UserGuide-LyX_23x.txt +++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt @@ -15,6 +15,7 @@ first step (not German, not Japanese): - sec. C.1.2.3 new sentence (not French) second step +- sec. 3.7.6: new feature to cross out text - sec. 4.6.2: Japanese only: untranslated image captions - sec. C.2.2.1 new paragraph (not French, not German) diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx index 799fce71f6..96d5672dba 100644 --- a/lib/doc/EmbeddedObjects.lyx +++ b/lib/doc/EmbeddedObjects.lyx @@ -31504,129 +31504,6 @@ Footnotes in title environments are usually not numbered with symbols and See for example the footnote in the titling of this document. \end_layout -\begin_layout Standard -\begin_inset VSpace defskip -\end_inset - -Footnotes in tables are not printed by \SpecialChar LaTeX - due to technical reasons. - However there exists another method to print them: Instead of the footnote - the command -\series bold - -\backslash -footnotemark{} -\series default - is inserted as \SpecialChar TeX - code. - The text of the footnote is entered as an argument of the \SpecialChar TeX - code command - -\series bold - -\backslash -footnotetext -\series default - after the table. -\begin_inset Newline newline -\end_inset - -This was done for the following table with the command -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -footnotetext{ -\series default -Printed table footnote. -\series bold -} -\end_layout - -\begin_layout Standard -\begin_inset Tabular - - - - - -\begin_inset Text - -\begin_layout Plain Layout -This an example text. -\begin_inset Foot -status open - -\begin_layout Plain Layout -This footnote will not be printed! -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -This an example text. -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -footnotemark{} -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - - - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -footnotetext{ -\end_layout - -\end_inset - -Printed table footnote. -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -} -\end_layout - -\end_inset - - -\end_layout - \begin_layout Standard Footnotes in multi-page tables are described in section \begin_inset space ~ @@ -31642,6 +31519,13 @@ reference "subsec:Footnotes-in-Multi-page" . \end_layout +\begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + \begin_layout Standard Footnotes in minipage boxes are printed, but inside the box and with a different numbering because a minipage box is like a page inside a page. @@ -31657,19 +31541,40 @@ reference "sec:Minipages" \end_inset .) To get a footnote in the minipage that is output at the bottom of the - page like normal footnotes, also use the method of + page like normal footnotes use this method: Instead of the footnote the + command \series bold \backslash footnotemark{} \series default - and + is inserted as \SpecialChar TeX + code. + The text of the footnote is entered as an argument of the \SpecialChar TeX + code command + \series bold \backslash footnotetext \series default -. + after the minipage. +\begin_inset Newline newline +\end_inset + +This was done for the following minipage with the command +\end_layout + +\begin_layout Standard + +\series bold + +\backslash +footnotetext{ +\series default +Footnote outside the minipage. +\series bold +} \end_layout \begin_layout Standard diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 8f3926f268..773ad7db8c 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -8336,12 +8336,14 @@ 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 @@ -8354,6 +8356,7 @@ The following 2 lines are empty: \end_layout \begin_layout Verbatim + Almost everything is allowed in Verbatim:"%&$§#~'` \backslash }][{| @@ -8377,6 +8380,7 @@ Verbatim \end_layout \begin_layout Verbatim* + This is Verbatim*. \end_layout @@ -14679,7 +14683,11 @@ Use this only if a journal absolutely insists on it. \labelwidthstring 00.00.0000 \family sans -Strikeout +Strike +\begin_inset space ~ +\end_inset + +out \family default \strikeout on @@ -14703,6 +14711,27 @@ This is frequently used to indicate an older version of text that has been \begin_layout Labeling \labelwidthstring 00.00.0000 +\family sans +Cross +\begin_inset space ~ +\end_inset + +out +\family default + +\xout on +This is text with Cross out on. +\xout default + +\begin_inset Newline newline +\end_inset + +This is used to make text hardly readable. +\end_layout + +\begin_layout Labeling +\labelwidthstring 00.00.0000 + \family sans Noun \family default @@ -30284,95 +30313,6 @@ The previous entry need not be a real existing entry. See the next subsection for an example. \end_layout -\begin_layout Standard -\begin_inset VSpace bigskip -\end_inset - - -\end_layout - -\begin_layout Standard -In some cases the index entry order is not correct when you are using the - program -\family sans -makeindex -\family default -to generate the index (see section -\begin_inset space ~ -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "subsec:Index-Program" - -\end_inset - -). - -\family sans -makeindex -\family default - would for example print the index entry for the \SpecialChar LaTeX --package aeguill in section -\begin_inset space ~ -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "subsec:Document-Font" - -\end_inset - - after the index entries of the other \SpecialChar LaTeX --packages although all these index - commands start with -\begin_inset Quotes eld -\end_inset - - -\series bold -\SpecialChar LaTeX --packages ! -\series default - -\begin_inset Quotes erd -\end_inset - -. - The reason is that the index entry for aeguill is in a footnote. - To fix this -\family sans -makeindex -\family default - bug, add these commands to the preamble of your document: -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -let -\backslash -OrgIndex -\backslash -index -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -renewcommand*{ -\backslash -index}[1]{ -\backslash -OrgIndex{#1}} -\end_layout - \begin_layout Subsection Index Entry Layout \begin_inset Index idx diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx index d4dc54307e..c50d2a9f5a 100644 --- a/lib/doc/de/EmbeddedObjects.lyx +++ b/lib/doc/de/EmbeddedObjects.lyx @@ -31533,128 +31533,6 @@ Fußnoten in Titel-Umgebungen werden üblicherweise mit Symbolen nummeriert Siehe als Beispiel die Fußnote der Titelseite dieses Dokuments. \end_layout -\begin_layout Standard -\begin_inset VSpace defskip -\end_inset - -Fußnoten in Tabellen werden von \SpecialChar LaTeX - aus technischen Gründen nicht gedruckt. - Jedoch gibt es eine andere Methode sie zu drucken: Anstatt einer Fußnote - wird der Befehl -\series bold - -\backslash -footnotemark{} -\series default - als \SpecialChar TeX --Code eingefügt. - Der Text der Fußnote wird als Argument des \SpecialChar TeX --Code-Befehls -\series bold - -\backslash -footnotetext -\series default - nach der Tabelle eingegeben. -\begin_inset Newline newline -\end_inset - -Hinter folgender Tabelle wurde als Beispiel dieser Befehl eingegeben: -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -footnotetext{ -\series default -Gedruckte Tabellenfußnote. -\series bold -} -\end_layout - -\begin_layout Standard -\begin_inset Tabular - - - - - -\begin_inset Text - -\begin_layout Plain Layout -Dies ist ein Beispieltext. -\begin_inset Foot -status open - -\begin_layout Plain Layout -Diese Fußnote wird nicht gedruckt! -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Dies ist ein Beispieltext. -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -footnotemark{} -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - - - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -footnotetext{ -\end_layout - -\end_inset - -Gedruckte Tabellenfußnote. -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -} -\end_layout - -\end_inset - - -\end_layout - \begin_layout Standard Fußnoten in langen Tabellen sind in Abschnitt \begin_inset space ~ @@ -31670,6 +31548,13 @@ reference "uab:Fußnoten-in-mehrseitigen" beschrieben. \end_layout +\begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + \begin_layout Standard Fußnoten in Minipage-Boxen werden gedruckt, allerdings innerhalb der Box und mit einer anderen Nummerierung, da eine Minipage-Box wie eine Seite @@ -31686,20 +31571,39 @@ reference "abs:Minipage" \end_inset zu finden.) Um eine Fußnote in der Minipage zu erhalten, die am unteren - Seitenrand wie normale Fußnoten gedruckt wird, verenden Sie ebenfalls die - Methode mit + Seitenrand wie normale Fußnoten gedruckt wird, verwenden Sie diese Methode: + Anstatt einer Fußnote wird der Befehl \series bold \backslash footnotemark{} \series default - und + als \SpecialChar TeX +-Code eingefügt. + Der Text der Fußnote wird als Argument des \SpecialChar TeX +-Code-Befehls \series bold \backslash footnotetext \series default -. + nach der Minipage-Box eingegeben. +\begin_inset Newline newline +\end_inset + +Hinter folgender Minipage-Box wurde als Beispiel dieser Befehl eingegeben: +\end_layout + +\begin_layout Standard + +\series bold + +\backslash +footnotetext{ +\series default +Fußnote außerhalb der Minipage. +\series bold +} \end_layout \begin_layout Standard diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx index 2efe2d5e7f..2e3eee29d4 100644 --- a/lib/doc/de/Math.lyx +++ b/lib/doc/de/Math.lyx @@ -20874,7 +20874,7 @@ status collapsed \backslash texorpdfstring \series default - dient dazu, dass die Fußnote nicht mit im pdf-Lesezeichen erscheint. + dient dazu, dass die Fußnote nicht mit im PDF-Lesezeichen erscheint. \end_layout \begin_layout Plain Layout diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index 08aa3a982e..3ab6faacca 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -14824,9 +14824,8 @@ Unterstrichen \bar under Dies ist unterstrichener Text. - \bar default - + \begin_inset Newline newline \end_inset @@ -14867,9 +14866,8 @@ unterstrichen \uuline on Dies ist doppelt unterstrichener Text. - \uuline default - + \begin_inset Newline newline \end_inset @@ -14902,9 +14900,8 @@ unterstrichen \uwave on Dies ist wellig unterstrichener Text. - \uwave default - + \begin_inset Newline newline \end_inset @@ -14928,16 +14925,12 @@ Verwenden Sie dies nur wenn ein Journal unbedingt darauf besteht. \labelwidthstring 00.00.0000 \family sans -Durchgestrichen +Durchgestrichen \family default -\bar under - -\bar default \strikeout on Dies ist durchgestrichener Text. - \strikeout default - + \begin_inset Newline newline \end_inset @@ -14949,13 +14942,29 @@ Strg+Umschalt+O \begin_inset Newline newline \end_inset -Dies wird oft verwendet um eine alte Version eines Textes zu kennzeichnen, +Dies wird oft verwendet, um eine alte Version eines Textes zu kennzeichnen, der inzwischen geändert wurde. \end_layout \begin_layout Labeling \labelwidthstring 00.00.0000 +\family sans +Durchgekreuzt +\family default +\xout on +Dies ist durchgekreuzter Text. +\xout default + +\begin_inset Newline newline +\end_inset + +Dies wird verwendet, um Text schwer lesbar zu machen. +\end_layout + +\begin_layout Labeling +\labelwidthstring 00.00.0000 + \family sans Eigenname/Kapitälchen \family default @@ -29971,92 +29980,6 @@ Der vorige Eintrag muss kein existierender Eintrag sein. siehe den nächsten Unterabschnitt für ein Beispiel. \end_layout -\begin_layout Standard -\begin_inset VSpace bigskip -\end_inset - - -\end_layout - -\begin_layout Standard -In einigen Fällen ist die Stichwort-Reihenfolge inkorrekt wenn das Programm - -\family sans -makeindex -\family default -verwendet wird um das Stichwortverzeichnis zu erzeugen (siehe Kap. -\begin_inset space \thinspace{} -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "subsec:Stichwort-Programm" - -\end_inset - -). - -\family sans -makeindex -\family default - gibt zum Beispiel das Stichwort für das \SpecialChar LaTeX --Paket aeguill in Kap. -\begin_inset space \thinspace{} -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "subsec:Dokumentschrift-und-Schriftgröße" - -\end_inset - - nach den Stichworten der anderen \SpecialChar LaTeX --Pakete aus, obwohl all diese Stichwort-Befehl -e mit -\begin_inset Quotes gld -\end_inset - - -\series bold -\SpecialChar LaTeX --Paket ! -\series default -“ beginnen. - Der Grund ist, dass sich das Stichwort für aeguill in einer Fußnote befindet. - Um diesen Fehler von -\family sans -makeindex -\family default - zu umgehen, kann man diese Befehle zum \SpecialChar LaTeX --Vorspann des Dokuments hinzufügen: -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -let -\backslash -OrgIndex -\backslash -index -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -renewcommand*{ -\backslash -index}[1]{ -\backslash -OrgIndex{#1}} -\end_layout - \begin_layout Subsection Stichwort-Formatierung \begin_inset Index idx diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx index 67cf51872d..692ab3169c 100644 --- a/lib/doc/es/EmbeddedObjects.lyx +++ b/lib/doc/es/EmbeddedObjects.lyx @@ -31214,132 +31214,6 @@ reference "pie:Esto-es-una" Las notas al pie en entornos de título generalmente no se numeran y no pueden contener varios párrafos. Véase como ejemplo la nota al pie en el título de este documento. - -\end_layout - -\begin_layout Standard -\begin_inset VSpace defskip -\end_inset - - -\end_layout - -\begin_layout Standard -Debido a razones técnicas, \SpecialChar LaTeX - no imprime las notas al pie en cuadros. - No obstante, hay otro método para imprimirlas: en lugar de la nota al pie - se inserta el comando -\series bold - -\backslash -footnotemark{} -\series default - en código \SpecialChar TeX -. - El texto de la nota se introduce como argumento del comando -\series bold - -\backslash -footnotetext -\series default - después del cuadro. -\begin_inset Newline newline -\end_inset - -Esto es lo que se ha hecho para el siguiente cuadro con el comando -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -footnotetext{ -\series default -Texto de la nota del cuadro. -\series bold -} -\end_layout - -\begin_layout Standard -\begin_inset Tabular - - - - - -\begin_inset Text - -\begin_layout Plain Layout -Texto de ejemplo. -\begin_inset Foot -status open - -\begin_layout Plain Layout -¡Esta nota no se imprimirá! -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Texto de ejemplo. -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -footnotemark{} -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - - - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -footnotetext{ -\end_layout - -\end_inset - -Texto de la nota del cuadro. -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -} -\end_layout - -\end_inset - - \end_layout \begin_layout Standard @@ -31357,6 +31231,13 @@ reference "subsec:Notas-al-pie-en-Cuadros-Multipágina" . \end_layout +\begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + \begin_layout Standard Las notas al pie en cuadros de minipágina se imprimen, pero dentro del cuadro y con numeración diferente debido a que una minipágina es como una página @@ -31374,19 +31255,38 @@ reference "sec:Minipáginas" ). Para poner notas en una minipágina que se impriman a pie de página como - las notas al pie normales, se puede usar también el método de + las notas al pie normales, se puede usar este método: En lugar de la nota + al pie se inserta el comando \series bold \backslash footnotemark{} \series default - y + en código \SpecialChar TeX +. + El texto de la nota se introduce como argumento del comando \series bold - + \backslash footnotetext \series default -. + después de la minipágina. +\begin_inset Newline newline +\end_inset + +Esto es lo que se ha hecho para la siguiente minipágina con el comando +\end_layout + +\begin_layout Standard + +\series bold + +\backslash +footnotetext{ +\series default +Nota fuera de la minipágina. +\series bold +} \end_layout \begin_layout Standard diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx index e363a00625..11dff18c13 100644 --- a/lib/doc/es/UserGuide.lyx +++ b/lib/doc/es/UserGuide.lyx @@ -8559,12 +8559,14 @@ Literal \end_layout \begin_layout Verbatim + Esto es entorno Literal. \end_layout \begin_layout Verbatim \noindent \align block + Las dos líneas siguientes están vacías: \end_layout @@ -8577,6 +8579,7 @@ Las dos líneas siguientes están vacías: \end_layout \begin_layout Verbatim + Casi todo está permitido en entorno Literal:"%&$§#~'` \backslash }][{| @@ -8601,6 +8604,7 @@ con la diferencia de que los espacios aparecen en la salida como el carácter \end_layout \begin_layout Verbatim* + Esto es entorno Literal*. \end_layout @@ -15016,14 +15020,33 @@ Esto es un texto tachado. \family sans Ctrl+Mayúsculas+O \family default -). +) \begin_inset Newline newline \end_inset Se usa frecuentemente para señalar la versión antigua de un texto cambiado. +\end_layout -\strikeout on +\begin_layout Labeling +\labelwidthstring 00.00.0000 + +\family sans +\lang english +Cross +\begin_inset space ~ +\end_inset + +out +\family default +\xout on +This is text with Cross out on. +\xout default + +\begin_inset Newline newline +\end_inset + +This is used to make text hardly readable. \end_layout \begin_layout Labeling @@ -15045,7 +15068,7 @@ Alt+C C \family default -). +) \noun on \begin_inset Newline newline @@ -31277,95 +31300,6 @@ reference "sec:Indice-alfabético" \end_layout -\begin_layout Standard -\begin_inset VSpace bigskip -\end_inset - - -\end_layout - -\begin_layout Standard -En algunos casos, si estás usando el programa -\family sans -makeindex -\family default - para generar el índice, el orden de entradas en el índice no es correcto - (véase la sec. -\begin_inset space \thinspace{} -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "subsec:Programas-para-índice" - -\end_inset - -). - Por ejemplo, -\family sans -makeindex -\family default - podría imprimir la entrada de índice para el paquete \SpecialChar LaTeX - aeguill, en la sec. -\begin_inset space \thinspace{} -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "subsec:Tipografía-del-documento" - -\end_inset - -, después de las entradas de índice de los demás paquetes \SpecialChar LaTeX -, aunque todos - estos comandos de índice empiezan con -\begin_inset Quotes eld -\end_inset - - -\series bold -\SpecialChar LaTeX -, paquetes ! -\series default - -\begin_inset Quotes erd -\end_inset - -. - La razón es que la entrada de índice para aeguill está en una nota al pie. - Para arreglar este fallo de -\family sans -makeindex -\family default -, añade estos comandos en el preámbulo del documento: -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -let -\backslash -OrgIndex -\backslash -index -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -renewcommand*{ -\backslash -index}[1]{ -\backslash -OrgIndex{#1}} -\end_layout - \begin_layout Subsection Formato de entradas de índice \begin_inset Index idx diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx index b2b511a75d..a28314c06b 100644 --- a/lib/doc/fr/EmbeddedObjects.lyx +++ b/lib/doc/fr/EmbeddedObjects.lyx @@ -32025,143 +32025,6 @@ Footnotes in title environments are usually not numbered with symbols and See for example the footnote in the titling of this document. \end_layout -\begin_layout Standard -\begin_inset VSpace defskip -\end_inset - - -\end_layout - -\begin_layout Standard -Le notes de bas de page se trouvant dans des tableaux ne sont pas imprimées - par \SpecialChar LaTeX - pour des raisons techniques. - Il existe pourtant une autre méthode pour les imprimer : on insère la commande - -\series bold - -\backslash -footnotemark{} -\series default - en code \SpecialChar TeX - à la place de la note de bas de page. - Le texte de la note est mis en argument de la commande \SpecialChar TeX - -\series bold - -\backslash -footnotetext -\series default - après le tableau. -\begin_inset Newline newline -\end_inset - -C'est ce qui a été fait pour le tableau qui suit avec la commande -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -footnotetext{ -\series default -Note de bas de page de tableau imprimée. -\series bold -} -\end_layout - -\begin_layout Standard - -\lang english -\begin_inset Tabular - - - - - -\begin_inset Text - -\begin_layout Plain Layout -Un exemple de texte -\begin_inset Foot -status open - -\begin_layout Plain Layout -Cette note ne sera pas imprimée -\begin_inset space ~ -\end_inset - -! -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -Un autre exemple de texte -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -footnotemark{} -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - - - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -footnotetext{ -\end_layout - -\end_inset - - -\lang french -Note de bas de page de tableau imprimée. -\lang english - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -} -\end_layout - -\end_inset - - -\end_layout - \begin_layout Standard Les notes de bas de page dans des tableaux multi-pages sont décrites dans la section @@ -32178,6 +32041,13 @@ reference "subsec:Notes-dans-tableau-multi-pages" . \end_layout +\begin_layout Standard +\begin_inset VSpace defskip +\end_inset + + +\end_layout + \begin_layout Standard Les notes de bas de page qui se trouvent à l'intérieur d'une minipage sont imprimées, mais à l'intérieur de la minipage et avec une numérotation différent @@ -32196,20 +32066,39 @@ reference "sec:Minipages" . Pour avoir une note de bas de page à l'intérieur d'une minipage et qui - s'imprime en bas de page comme une note normale, on doit aussi utiliser - la méthode utilisant les commandes + s'imprime en bas de page comme une note normale, on doit utiliser cette + méthode : On insère la commande \series bold \backslash footnotemark{} \series default - et + en code \SpecialChar TeX + à la place de la note de bas de page. + Le texte de la note est mis en argument de la commande \SpecialChar TeX + \series bold \backslash footnotetext \series default -. + après la minipage. +\begin_inset Newline newline +\end_inset + +C'est ce qui a été fait pour la minipage qui suit avec la commande +\end_layout + +\begin_layout Standard + +\series bold + +\backslash +footnotetext{ +\series default +Note de bas de page en dehors de la minipage. +\series bold +} \end_layout \begin_layout Standard diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index adee38f4df..f46b05662f 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -9030,12 +9030,14 @@ 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 @@ -9048,6 +9050,7 @@ The following 2 lines are empty: \end_layout \begin_layout Verbatim + Almost everything is allowed in Verbatim:"%&$§#~'` \backslash }][{| @@ -9080,6 +9083,7 @@ Verbatim \end_layout \begin_layout Verbatim* + This is Verbatim*. \end_layout @@ -15853,7 +15857,35 @@ type "shortcut" arg "font-strikeout" \end_inset -) Utilisé fréquemment pour marquer une version ancienne qui a changé depuis; +) +\begin_inset Newline newline +\end_inset + +Utilisé fréquemment pour marquer une version ancienne qui a changé depuis; +\end_layout + +\begin_layout Labeling +\labelwidthstring 00.00.0000 + +\family sans +\lang english +Cross +\begin_inset space ~ +\end_inset + +out +\family default + +\xout on +This is text with Cross out on. +\xout default + +\begin_inset Newline newline +\end_inset + +This is used to make text hardly readable +\lang french +; \end_layout \begin_layout Labeling @@ -32214,90 +32246,6 @@ L'entrée précédente n'a pas besoin d'être une vraie entrée, présente dans Voyez la sous-section suivante pour un exemple. \end_layout -\begin_layout Standard -Dans certains cas l'ordre des entrées d'index n'est pas correct quand vous - utilisez le programme -\family sans -makeindex -\family default -pour générer l'index (voir la section -\begin_inset space ~ -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "subsec:Programme-d'indexation" - -\end_inset - -). - -\family sans -makeindex -\family default - va par exemple imprimer l'entrée d'index pour le paquetage \SpecialChar LaTeX - aeguill de - la section -\begin_inset space \thinspace{} -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "subsec:Document-Polices" - -\end_inset - - après les entrées des autres paquetages \SpecialChar LaTeX - bien que toutes ces entrées pour - des commandes commencent toutes par -\begin_inset Quotes eld -\end_inset - - -\series bold -Paquetages \SpecialChar LaTeX - ! -\series default - -\begin_inset Quotes eld -\end_inset - -. - La raison est que l'entrée d'index pour aeguill se trouve dans une note - de bas de page. - Pour contourner ce bogue de -\family sans -makeindex -\family default -, ajoutez ces commandes au préambule de votre document : -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -let -\backslash -OrgIndex -\backslash -index -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -renewcommand*{ -\backslash -index}[1]{ -\backslash -OrgIndex{#1}} -\end_layout - \begin_layout Subsection Typographie des entrées d'index \begin_inset Index idx diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx index 460f5a0124..2cf1db1866 100644 --- a/lib/doc/ja/EmbeddedObjects.lyx +++ b/lib/doc/ja/EmbeddedObjects.lyx @@ -29813,6 +29813,17 @@ reference "fn:これは脚注の一例" 表題環境における脚註は，通常，記号付きで付番はされず，複数の段落を含むことはできません．たとえば，この文書の表題の脚註をご覧ください． \end_layout +\begin_layout Standard +多頁表中の脚註は，第 +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:多頁表での脚注" + +\end_inset + +節で述べられています． +\end_layout + \begin_layout Standard \begin_inset VSpace defskip \end_inset @@ -29821,22 +29832,32 @@ reference "fn:これは脚注の一例" \end_layout \begin_layout Standard -\SpecialChar LaTeX -では，技術的要因により，表中の脚註は印字されません．しかし，それを行うには他の方法があり，まず脚註の代わりに\SpecialChar TeX +ミニページ中の脚註は出力されますが，ミニボックスは頁中の頁のようなものなので，ボックス内に独立した連番として出力されます（ミニページについての詳細は，第 +\begin_inset CommandInset ref +LatexCommand ref +reference "sec:ミニページ" + +\end_inset + +節を参照）．通常の脚註のように頁底部に出力されるミニページを得るには，しかし，それを行うには他の方法があり，まず脚註の代わりに\SpecialChar TeX コードで \series bold \backslash footnotemark{} \series default -コマンドを入れてください．脚註の本文は，表の後で\SpecialChar TeX +コマンドを入れてください．脚註の本文は．表の後で\SpecialChar TeX コード \series bold \backslash footnotetext \series default -コマンドの引数として入力します． +コマンドの引数として入力します +\lang english +minipage +\lang japanese +． \begin_inset Newline newline \end_inset @@ -29850,7 +29871,7 @@ footnotetext \backslash footnotetext{ \series default -出力される脚註の表 +ミニページ外の脚註です． \series bold } \series default @@ -29858,122 +29879,11 @@ footnotetext{ \begin_inset Newline newline \end_inset -を用いています． -\end_layout - -\begin_layout Standard -\begin_inset Tabular - - - - - -\begin_inset Text - -\begin_layout Plain Layout -これは例文です． -\begin_inset Foot -status open - -\begin_layout Plain Layout -この脚註は出力されません! -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - - - -\begin_inset Text - -\begin_layout Plain Layout -これは例文です． -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -footnotemark{} -\end_layout - -\end_inset - - -\end_layout - -\end_inset - - - - -\end_inset - - -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - - -\backslash -footnotetext{ -\end_layout - -\end_inset - -出力される脚註の表 -\begin_inset ERT -status collapsed - -\begin_layout Plain Layout - -} -\end_layout - -\end_inset - - -\end_layout - -\begin_layout Standard -多頁表中の脚註は，第 -\begin_inset CommandInset ref -LatexCommand ref -reference "subsec:多頁表での脚注" - -\end_inset - -節で述べられています． -\end_layout - -\begin_layout Standard -ミニページ中の脚註は出力されますが，ミニボックスは頁中の頁のようなものなので，ボックス内に独立した連番として出力されます（ミニページについての詳細は，第 -\begin_inset CommandInset ref -LatexCommand ref -reference "sec:ミニページ" - -\end_inset - -節を参照）．通常の脚註のように頁底部に出力されるミニページを得るには，やはり -\series bold - -\backslash -footnotemark{} -\series default -と -\series bold - -\backslash -footntoetext -\series default -による方法を用いてください． +を用いています +\lang english +minipage +\lang japanese +． \end_layout \begin_layout Standard diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index 05fcee1f3a..dfd0f7185c 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -7173,12 +7173,14 @@ Space \end_layout \begin_layout Verbatim + これは原文儘(verbatim)環境です． \end_layout \begin_layout Verbatim \noindent \align block + この下の2行は空白行です． \end_layout @@ -7191,6 +7193,7 @@ Space \end_layout \begin_layout Verbatim + 右記の各文字を始め，ほぼすべての文字が使えます．例："%&$§#~'` \backslash }][{| @@ -7213,6 +7216,7 @@ Space \end_layout \begin_layout Verbatim* + This is Verbatim*. \end_layout @@ -12740,6 +12744,28 @@ arg "font-strikeout" \begin_layout Labeling \labelwidthstring 00.00.0000 +\family sans +\lang english +Cross +\begin_inset space ~ +\end_inset + +out +\family default + +\xout on +This is text with Cross out on. +\xout default + +\begin_inset Newline newline +\end_inset + +This is used to make text hardly readable. +\end_layout + +\begin_layout Labeling +\labelwidthstring 00.00.0000 + \family sans 名詞体 \family default @@ -25839,77 +25865,6 @@ is@maison とします．前項目は実際に存在する項目でなくてもかまわないので，\SpecialChar LaTeX に項目順序を告げる単語であればどんな単語を使ってもかまいません．例として次の小節を参照してください ． -\begin_inset VSpace bigskip -\end_inset - - -\end_layout - -\begin_layout Standard -索引の生成に -\family sans -makeindex -\family default -プログラムを使用している場合には，索引項目の順序が正しくないことがあります(第 -\begin_inset CommandInset ref -LatexCommand ref -reference "subsec:索引プログラム" - -\end_inset - -節を参照)．たとえば， -\family sans -makeindex -\family default -は，第 -\begin_inset CommandInset ref -LatexCommand ref -reference "subsec:文書フォント" - -\end_inset - -節のaeguill \SpecialChar LaTeX -パッケージの索引項目を，他の\SpecialChar LaTeX -パッケージの索引コマンドも「 -\series bold -\SpecialChar LaTeX -パッケージ ! -\series default -」で始まっているにもかかわらず，これらの項目の後に印字してしまいます．そのわけは，aeguillの索引項目が脚註にあるからです．この -\family sans -makeindex -\family default -のバグを修正するには，使用中の文書のプリアンブルに -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -let -\backslash -OrgIndex -\backslash -index -\end_layout - -\begin_layout Standard - -\series bold - -\backslash -renewcommand*{ -\backslash -index}[1]{ -\backslash -OrgIndex{#1}} -\series default - -\begin_inset Newline newline -\end_inset - -というコマンドを書き加えて下さい． \end_layout \begin_layout Subsection -- 2.39.5