From 0920f4fc4a54917079901603737675a22c1a6e44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Tue, 5 Dec 2017 03:04:58 +0100 Subject: [PATCH] UserGuide.lyx: update description for nomenclature according to recent changes --- lib/doc/Changelog-UserGuide-LyX_23x.txt | 3 +- lib/doc/UserGuide.lyx | 60 ++++++++++++++++--------- lib/doc/de/UserGuide.lyx | 34 ++++++-------- lib/doc/es/UserGuide.lyx | 48 ++++++++++++++++---- lib/doc/fr/UserGuide.lyx | 49 +++++++++++++++++--- lib/doc/ja/UserGuide.lyx | 34 +++++++++----- 6 files changed, 160 insertions(+), 68 deletions(-) diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt b/lib/doc/Changelog-UserGuide-LyX_23x.txt index 7fb3a6e988..a57f75d173 100644 --- a/lib/doc/Changelog-UserGuide-LyX_23x.txt +++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt @@ -23,9 +23,10 @@ second step: - sec. 6.5.3: new sentence for a new option - sec. 6.6.7: new item for a new option - sec. 6.7: changed sentences for a new option -- sec. 6.7.1: Spanish only: new sentence +- sec. 6.7.1: new sentence (not French) - sec. C.2.2.1: new paragraph (not French) - sec. D: new table row +- nomenclature list: new note For LyX 2.2.3: diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 3f7d1fdabf..4d42a64307 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 @@ -31269,36 +31273,18 @@ If the characters | \begin_inset space \space{} \end_inset -should appear in nomenclature entries they need to be escaped by adding - a quote character in front of them. +should appear in nomenclature entries containing \SpecialChar TeX + code they need to be escaped + by adding a quote character in front of them. \begin_inset CommandInset nomenclature LatexCommand nomenclature symbol "\"@, \"|, \"!, \"\"" -description "The quote sign is output by writing ' \"\" '" +description "The quote sign in TeX code is output by writing ' \"\" '." literal "true" \end_inset -\begin_inset Note Note -status open - -\begin_layout Plain Layout -Update description when bug -\begin_inset CommandInset href -LatexCommand href -name "10825" -target "http://www.lyx.org/trac/ticket/10825" -literal "false" - -\end_inset - - is fixed. -\end_layout - -\end_inset - - \end_layout \begin_layout Subsection @@ -50284,6 +50270,36 @@ The above bibliography is created from a Bib\SpecialChar TeX database. \end_layout +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +renewcommand*{ +\backslash +pagedeclaration}[1]{, page~ +\backslash +hyperpage{#1}} +\end_layout + +\end_inset + + +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout +This command makes the page number a clickable hyperlink. +\end_layout + +\end_inset + + +\end_layout + \begin_layout Standard \begin_inset CommandInset nomencl_print LatexCommand printnomenclature diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index 803cbd92f4..dcf35dd6ff 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -30913,7 +30913,8 @@ Sollen die Zeichen | \begin_inset space \space{} \end_inset -in Nomenklatureinträgen erscheinen, müssen sie geschützt werden. +in Nomenklatureinträgen mit \SpecialChar TeX +-Code erscheinen, müssen sie geschützt werden. indem man ein Anführungszeichen davor setzt. Um zu verhindern, dass das Anführungszeichen nachfolgende Zeichen beeinflusst, wird es mit einem leeren \SpecialChar TeX @@ -30921,8 +30922,8 @@ in Nomenklatureinträgen erscheinen, müssen sie geschützt werden. \begin_inset CommandInset nomenclature LatexCommand nomenclature symbol "\"@, \"|, \"!, \"\"{}" -description "Das Anführungszeichen wird mit der Sequenz ' \"\"{}\"\"{} ' ausgegeben" -literal "false" +description "Das Anführungszeichen wird im TeX-Code mit der Sequenz ' \"\"{}\"\"{} ' ausgegeben." +literal "true" \end_inset @@ -48742,35 +48743,28 @@ Das obige Literaturverzeichnis stammt aus einer Bib\SpecialChar TeX \end_layout \begin_layout Standard -\begin_inset Note Note +\begin_inset ERT status collapsed \begin_layout Plain Layout -Damit die Nomenklatur auch den entspechenden Namen erhält, wurde im \SpecialChar LaTeX --Vorspann -\end_layout -\begin_layout Plain Layout - -\series bold \backslash -renewcommand{ +renewcommand*{ +\backslash +pagedeclaration}[1]{, Seite~ \backslash -nomname}{Nomenklatur} +hyperpage{#1}} \end_layout -\begin_layout Plain Layout -eingefügt. - Denn voreingestellt ist -\begin_inset Quotes gld \end_inset -Nomenclature -\begin_inset Quotes grd -\end_inset -. +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout +Dieser Befehl macht die Seitennummer zu einem klickbaren Hyperlink. \end_layout \end_inset diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx index ed83dd2fac..cf628a5038 100644 --- a/lib/doc/es/UserGuide.lyx +++ b/lib/doc/es/UserGuide.lyx @@ -8559,14 +8559,12 @@ 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 @@ -8579,7 +8577,6 @@ Las dos líneas siguientes están vacías: \end_layout \begin_layout Verbatim - Casi todo está permitido en entorno Literal:"%&$§#~'` \backslash }][{| @@ -8604,7 +8601,6 @@ 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 @@ -32305,7 +32301,9 @@ palo seco \end_layout \begin_layout Standard -Para introducir en entradas de la nomenclatura caracteres como | +Para introducir en entradas de la nomenclatura con código \SpecialChar TeX + caracteres como + | \begin_inset space \space{} \end_inset @@ -32329,9 +32327,9 @@ Para introducir en entradas de la nomenclatura caracteres como | \lang english To avoid that a single " affects the following characters one writes braces - behind it: + behind it \lang spanish - +: \family sans ""{} \family default @@ -32339,7 +32337,7 @@ To avoid that a single " affects the following characters one writes braces \begin_inset CommandInset nomenclature LatexCommand nomenclature symbol "\"@, \"|, \"!, \"\"{}" -description "El carácter comillas se obtiene escribiendo ' \"\"{}\"\"{} '" +description "El carácter comillas en código TeX se obtiene escribiendo ' \"\"{}\"\"{} '." literal "true" \end_inset @@ -50774,6 +50772,40 @@ Esta bibliografía se ha generado a partir de una base de datos Bib\SpecialChar . \end_layout +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +renewcommand*{ +\backslash +pagedeclaration}[1]{, página~ +\backslash +hyperpage{#1}} +\end_layout + +\end_inset + + +\lang english + +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout + +\lang english +This command makes the page number a clickable hyperlink. +\end_layout + +\end_inset + + +\end_layout + \begin_layout Standard \begin_inset CommandInset nomencl_print LatexCommand printnomenclature diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index e335cd67cd..561cd4836f 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -33059,8 +33059,12 @@ Nota: \series default \lang english -To use \SpecialChar TeX - code for nomenclature entries +To use +\lang french + code \SpecialChar TeX + +\lang english +for nomenclature entries \lang french l'option \family sans @@ -33322,8 +33326,9 @@ Si les caractères | \begin_inset space \space{} \end_inset -" apparaissent dans les entrées de la nomenclature, ils doivent être protégés - en ajoutant un caractère +" apparaissent dans les entrées de la nomenclature avec code \SpecialChar TeX +, ils doivent + être protégés en ajoutant un caractère \begin_inset Quotes cld \end_inset @@ -33335,7 +33340,7 @@ double apostrophe \begin_inset CommandInset nomenclature LatexCommand nomenclature symbol "\"@, \"|, \"!, \"\"" -description "Le signe de citation est produit en écrivant ' \"\"\"\" '" +description "Le signe de citation dans code TeX est produit en écrivant ' \"\"\"\" '." literal "true" \end_inset @@ -52464,6 +52469,40 @@ La bibliographie ci-dessus a été créée à partir d'une base de données Bib\ . \end_layout +\begin_layout Standard +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +renewcommand*{ +\backslash +pagedeclaration}[1]{, page~ +\backslash +hyperpage{#1}} +\end_layout + +\end_inset + + +\lang english + +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout + +\lang english +This command makes the page number a clickable hyperlink. +\end_layout + +\end_inset + + +\end_layout + \begin_layout Standard \begin_inset CommandInset nomencl_print LatexCommand printnomenclature diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index 305bb4ea47..cc611a3b4f 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 @@ -26751,11 +26755,13 @@ textbf{#1}}} \end_layout \begin_layout Standard -もし + +\lang english +If the characters | \begin_inset space \space{} \end_inset -| +, \begin_inset space \space{} \end_inset @@ -26763,7 +26769,7 @@ textbf{#1}}} \begin_inset space \space{} \end_inset -@ +, @ and \begin_inset space \space{} \end_inset @@ -26771,7 +26777,10 @@ textbf{#1}}} \begin_inset space \space{} \end_inset -といった文字が用語項目に登場する場合には,これらの文字の前に引用符をつけてエスケープしなくてはなりません. +should appear in nomenclature entries containing \SpecialChar TeX + cod +\lang japanese +e,これらの文字の前に引用符をつけてエスケープしなくてはなりません. \begin_inset CommandInset nomenclature LatexCommand nomenclature symbol "\"@, \"|, \"!, \"\"" @@ -42582,22 +42591,23 @@ status collapsed \backslash renewcommand{ \backslash -nomname}{記号一覧} +pagedeclaration}[1]{ ( +\backslash +hyperpage{#1}頁参照)} \end_layout \end_inset -\begin_inset ERT -status open +\lang english -\begin_layout Plain Layout +\begin_inset Note Note +status collapsed +\begin_layout Plain Layout -\backslash -renewcommand{ -\backslash -pagedeclaration}[1]{ (#1頁参照)} +\lang english +This command makes the page number a clickable hyperlink. \end_layout \end_inset -- 2.39.5