From 4348166d8bc9c56461e2d0d56f533f311ff66274 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Fri, 15 Sep 2017 00:09:40 +0200 Subject: [PATCH] UserGuide.lyx: accept and distribute all recent changes (part 3/3) --- lib/doc/Changelog-UserGuide-LyX_23x.txt | 1 + lib/doc/UserGuide.lyx | 146 +++++++----------------- lib/doc/de/UserGuide.lyx | 133 +++++++++++---------- lib/doc/es/UserGuide.lyx | 140 ++++++++++++++++++++++- lib/doc/fr/UserGuide.lyx | 138 +++++++++++++++++++++- lib/doc/ja/UserGuide.lyx | 134 +++++++++++++++++++++- 6 files changed, 501 insertions(+), 191 deletions(-) diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt b/lib/doc/Changelog-UserGuide-LyX_23x.txt index d1aecc2f6a..fcc2137576 100644 --- a/lib/doc/Changelog-UserGuide-LyX_23x.txt +++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt @@ -10,6 +10,7 @@ first step (not G, not J): - sec. 6.1: new reference format and new options (not F) - sec. 6.5: section and its subsections completely rewritten - sec. 6.8: new feature "inverted branches" (not F) +- sec. A.4.3 new menu - sec. B.12 new sentences (not F) - sec. C.1.2.3 new sentence (not F) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index cabffd917b..639ca6f5ba 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -140,12 +140,11 @@ enumitem \papercolumns 1 \papersides 2 \paperpagestyle default -\tracking_changes true +\tracking_changes false \output_changes false \html_math_output 0 \html_css_as_file 0 \html_be_strict true -\author -1402925745 "Günter Milde" \end_header \begin_body @@ -16617,7 +16616,7 @@ nobreakdash \end_layout \begin_deeper -\begin_layout Quote +\begin_layout Itemize Pages \begin_inset space ~ \end_inset @@ -16650,8 +16649,7 @@ status open \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Itemize \lang french Les incises @@ -16692,8 +16690,7 @@ même – sont très utiles. \end_layout -\end_deeper -\begin_layout Quote +\begin_layout Itemize \lang spanish En una frase @@ -16773,32 +16770,20 @@ typewriter \begin_layout Enumerate Hyphenation is suppressed in words adjacent to hyphens and ligature dashes. -\change_inserted -1402925745 1504003612 - \end_layout \begin_layout Standard +In \SpecialChar LyX -\change_inserted -1402925745 1504709020 -Changes: -\end_layout - -\begin_layout Labeling -\labelwidthstring 00.00.0000 -\SpecialChar LyX +\begin_inset space ~ +\end_inset -\change_inserted -1402925745 1504711065 +2.2 -- and --- were in \SpecialChar LyX \begin_inset space ~ \end_inset -2.2 -- and --- -\change_unchanged -in LyX are o -\change_inserted -1402925745 1504711065 -utput as -{}- and -{}-{}- to prevent ligation to dashes. -\change_unchanged - +2.3 output as -{}- and -{}-{}- to prevent ligation to dashes. \begin_inset Foot status collapsed @@ -16816,111 +16801,65 @@ Up to \SpecialChar LyX \end_inset - Occurrences -\change_inserted -1402925745 1504711065 -in older documents are converted to literal Unicode dashe -\change_unchanged -s. -\change_inserted -1402925745 1504711065 - -\end_layout - -\begin_deeper -\begin_layout Itemize - -\change_inserted -1402925745 1504709468 -In some cases this leads to different line breaks. -\end_layout - -\begin_layout Itemize - -\change_inserted -1402925745 1504710005 -It is no longer possible to differentiate dashes with/without optional line - break using --- and -- vs. - literal dashes. - Either convert one sort t -\change_unchanged -o \SpecialChar TeX - code -\change_inserted -1402925745 1504710005 -or insert optional line break characters. -\change_unchanged - -\end_layout - -\end_deeper -\begin_layout Labeling -\labelwidthstring 00.00.0000 -\SpecialChar LyX - -\change_inserted -1402925745 1504710385 + Occurrences in older documents are converted to literal Unicode dashes. + This lead to problems like different line breaks. + Since \SpecialChar LyX \begin_inset space ~ \end_inset -2.3 New -\change_unchanged - option -\change_inserted -1402925745 1504710385 - +2.3 there is the option +\family sans +Output en- and em-dashes as ligatures +\family default + in the menu \family sans Document\SpecialChar menuseparator Settings\SpecialChar menuseparator -Fonts\SpecialChar menuseparator -Output en- and em-dashes as ligatures. +Fonts. \family default - It is on by default but unselected when opening documents edited with -\change_unchanged -\SpecialChar LyX + It is on by default but unselected when opening documents edited with \SpecialChar LyX \begin_inset space ~ \end_inset - -\change_inserted -1402925745 1504710385 2.2. - +\begin_inset Newline newline +\end_inset + +Note the following side-effects of the \SpecialChar LyX + dash handling: \end_layout -\begin_deeper \begin_layout Itemize +If you used literal em- and en dashes in pre-\SpecialChar LyX -\change_inserted -1402925745 1504712456 -If you used literal em- and en dashes in pre-2.2 documents, you must manually - unselect it to ensure unchanged -\change_unchanged -behavior -\change_inserted -1402925745 1504712456 -. +\begin_inset space ~ +\end_inset + +2.2 documents, you must manually unselect the option to ensure unchanged + behavior. \end_layout \begin_layout Itemize +Zero-width space (ZWSP) characters in older \SpecialChar LyX + documents that follow literal + em- and en-dashes are removed during the conversion to the format of \SpecialChar LyX -\change_inserted -1402925745 1504712456 -ZWSP characters (u200b) following literal em- and en-dashes are deleted - by lyx2lyx when converting to 2.3 format. +\begin_inset space ~ +\end_inset + +2.3. If you used them as optional line breaks after dashes, convert them to - space insets before opening your document with -\change_unchanged -\SpecialChar LyX + space insets before opening your document with \SpecialChar LyX \begin_inset space ~ \end_inset - -\change_inserted -1402925745 1504712456 2.3 or the optional line breaks will be lost! \end_layout -\begin_layout Itemize - -\change_inserted -1402925745 1504709574 -As with all settings, the default for new documents can be configured via - templates. -\end_layout - -\end_deeper \begin_layout Subsection Hyphenation \begin_inset Index idx @@ -38747,13 +38686,9 @@ reference "subsec:Ligatures" \end_inset . -\change_inserted -1402925745 1503938048 - \end_layout \begin_layout Description - -\change_inserted -1402925745 1503938353 Optional \begin_inset space ~ \end_inset @@ -38762,7 +38697,8 @@ Line \begin_inset space ~ \end_inset -Break Inserts a line break point (ZWSP) that is invisible in the output. +Break Inserts a line break point (zero-width space character) that is invisible + in the output. See section \begin_inset space ~ \end_inset @@ -38778,8 +38714,6 @@ noprefix "false" \end_inset for a usage example. -\change_unchanged - \end_layout \begin_layout Description diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index a6a0100f6b..f6b5a9dbc6 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -16864,7 +16864,7 @@ nobreakdash \end_layout \begin_deeper -\begin_layout Quote +\begin_layout Itemize Seiten \begin_inset space ~ \end_inset @@ -16897,8 +16897,7 @@ status open \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Itemize \lang french Les incises @@ -16939,8 +16938,7 @@ même – sont très utiles. \end_layout -\end_deeper -\begin_layout Quote +\begin_layout Itemize \lang spanish En una frase @@ -16979,7 +16977,7 @@ Diese Einstellung wird ignoriert in Dokumenten, die keine \SpecialChar TeX \end_layout \begin_deeper -\begin_layout Enumerate +\begin_layout Standard Xe\SpecialChar TeX bietet die Einstellung \series bold @@ -17024,19 +17022,13 @@ Zeilentrennung wird bei Wörtern verhindert, die neben Bindestrichen und \end_layout \begin_layout Standard -Änderungen: -\end_layout - -\begin_layout Labeling -\labelwidthstring 00.00.0000 -\SpecialChar LyX +-- und --- wurden in \SpecialChar LyX \begin_inset space ~ \end_inset -2.2 -- und --- in \SpecialChar LyX - werden als -{}- und -{}-{}- ausgegeben um die Ligatur - zu einem Bindestrich zu verhindern. +2.2 als -{}- und -{}-{}- ausgegeben um die Ligatur zu einem Bindestrich zu + verhindern. \begin_inset Foot status collapsed @@ -17055,87 +17047,69 @@ Bis zu \SpecialChar LyX \end_inset Striche in älteren Dokumenten werden zu normalen Unicode-Strichen konvertiert. -\end_layout - -\begin_deeper -\begin_layout Itemize - -\lang english -In some cases this leads to different line breaks. -\end_layout - -\begin_layout Itemize - -\lang english -It is no longer possible to differentiate dashes with/without optional line - break using --- and -- vs. - literal dashes. - Either convert one sort to -\lang ngerman -\SpecialChar TeX --Code -\lang english - or insert optional line break characters. -\end_layout - -\end_deeper -\begin_layout Labeling -\labelwidthstring 00.00.0000 -\SpecialChar LyX + Dies führte zu Problemen, wie verschiedenen Zeilenumbrüche. + Seit \SpecialChar LyX \begin_inset space ~ \end_inset -2.3 Neue Option +2.3 gibt es die Option +\family sans +Halbgeviert und Geviertstriche als Ligaturen ausgeben +\family default + im Menü \family sans Dokument\SpecialChar menuseparator Einstellungen\SpecialChar menuseparator -Schriften\SpecialChar menuseparator -Halbgeviert und Geviertstriche als Ligaturen - ausgeben. - +Schriften \family default - -\lang english -It is on by default but unselected when opening documents edited with \SpecialChar LyX +. + Sie ist per Voreinstellung aktiviert, wird aber deaktiviert, wenn Dokumente + geöffnet werden, die mit \SpecialChar LyX \begin_inset space ~ \end_inset -2.2. - +2.2 erstellt wurden. +\begin_inset Newline newline +\end_inset + +Beachten Sie die folgenden Effekte von \SpecialChar LyX +'s Strich-Handhabung: \end_layout -\begin_deeper \begin_layout Itemize +Falls Sie gewöhnliche Binde- und Gedankenstriche in Dokumenten älter als + \SpecialChar LyX -\lang english -If you used literal em- and en dashes in pre-2.2 documents, you must manually - unselect it to ensure unchanged behaviour. +\begin_inset space ~ +\end_inset + +2.2 haben, müssen Sie die Option manuell ausschalten um sicherzustellen, + dass diese Striche nicht verändert werden. \end_layout \begin_layout Itemize - -\lang english -ZWSP characters (u200b) following literal em- and en-dashes are deleted - by lyx2lyx when converting to 2.3 format. - If you used them as optional line breaks after dashes, convert them to - space insets before opening your document with \SpecialChar LyX +Breitenlose Leerzeichen, die in älteren \SpecialChar LyX +-Dokumenten auf normale Binde- und + Gedankenstriche folgen, werden während der Konversion in das Format von + \SpecialChar LyX \begin_inset space ~ \end_inset -2.3 or the optional line breaks will be lost! -\end_layout +2.3 entfernt. + Wenn Sie diese als optionale Zeilenumbrüche nach Strichen verwendet haben, + sollten Sie diese in Leerzeichen konvertieren, bevor Sie ihr Dokument mit + \SpecialChar LyX -\begin_layout Itemize +\begin_inset space ~ +\end_inset -\lang english -As with all settings, the default for new documents can be configured via - templates. +2.3 öffnen. + Ansonsten werden die optionale Zeilenumbrüche verloren gehen! \end_layout -\end_deeper \begin_layout Subsection Silbentrennung \begin_inset CommandInset label @@ -37894,6 +37868,27 @@ reference "subsec:Ligaturen" . \end_layout +\begin_layout Description +Optionaler +\begin_inset space ~ +\end_inset + +Zeilenumbruch Fügt eine Trennmöglichkeit ein (breitenloses Leerzeichen), + die in der Ausgabe unsichtbar ist. + Siehe Abschnitt +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:Bindestriche-und-Zeilenumbrüche" + +\end_inset + + für ein ein Anwendungsbeispiel. +\end_layout + \begin_layout Description Normaler \begin_inset space ~ diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx index 6c8e69f85c..8b7b61ead8 100644 --- a/lib/doc/es/UserGuide.lyx +++ b/lib/doc/es/UserGuide.lyx @@ -16978,7 +16978,7 @@ nobreakdash \end_layout \begin_deeper -\begin_layout Quote +\begin_layout Itemize \lang english Pages @@ -17015,8 +17015,7 @@ status open \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Itemize \lang french Les incises @@ -17057,8 +17056,7 @@ même – sont très utiles. \end_layout -\end_deeper -\begin_layout Quote +\begin_layout Itemize En una frase \begin_inset ERT status collapsed @@ -17148,6 +17146,102 @@ typewriter Hyphenation is suppressed in words adjacent to hyphens and ligature dashes. \end_layout +\begin_layout Standard + +\lang english +In \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.2 -- and --- were in \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3 output as -{}- and -{}-{}- to prevent ligation to dashes. +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout + +\lang english +Up to \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.1 -- and --- in \SpecialChar LyX + was output unchanged which led to different look in the + within \SpecialChar LyX +, text export, HTML export and the PDF export. +\end_layout + +\end_inset + + Occurrences in older documents are converted to literal Unicode dashes. + This lead to problems like different line breaks. + Since \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3 there is the option +\family sans +Output en- and em-dashes as ligatures +\family default + in the menu +\family sans +Document\SpecialChar menuseparator +Settings\SpecialChar menuseparator +Fonts. + +\family default + It is on by default but unselected when opening documents edited with \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.2. +\begin_inset Newline newline +\end_inset + +Note the following side-effects of the \SpecialChar LyX + dash handling: +\end_layout + +\begin_layout Itemize + +\lang english +If you used literal em- and en dashes in pre-\SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.2 documents, you must manually unselect the option to ensure unchanged + behavior. +\end_layout + +\begin_layout Itemize + +\lang english +Zero-width space (ZWSP) characters in older \SpecialChar LyX + documents that follow literal + em- and en-dashes are removed during the conversion to the format of \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3. + If you used them as optional line breaks after dashes, convert them to + space insets before opening your document with \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3 or the optional line breaks will be lost! +\end_layout + \begin_layout Subsection División de palabras con guión \begin_inset Index idx @@ -39137,6 +39231,40 @@ reference "subsec:Ligaduras" . \end_layout +\begin_layout Description + +\lang english +Optional +\begin_inset space ~ +\end_inset + +Line +\begin_inset space ~ +\end_inset + +Break Inserts a line break point (zero-width space character) that is invisible + in the output +\lang spanish +. + Véase la sección +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:Dashes-and-line-breaks" +plural "false" +caps "false" +noprefix "false" + +\end_inset + + +\lang english +for a usage example. +\end_layout + \begin_layout Description Salto \begin_inset space ~ @@ -39179,7 +39307,7 @@ línea justificada Fuerza un salto de línea de forma que la línea se expande hasta el margen, véase la sección -\begin_inset space \thinspace{} +\begin_inset space ~ \end_inset diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index 085e4a145d..a4945f95af 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -17914,7 +17914,7 @@ nobreakdash \end_layout \begin_deeper -\begin_layout Quote +\begin_layout Itemize \lang english Pages @@ -17951,8 +17951,7 @@ status open \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Itemize Les incises \begin_inset Box Frameless position "t" @@ -17989,8 +17988,7 @@ même – sont très utiles. \end_layout -\end_deeper -\begin_layout Quote +\begin_layout Itemize \lang spanish En una frase @@ -18082,6 +18080,102 @@ typewriter Hyphenation is suppressed in words adjacent to hyphens and ligature dashes. \end_layout +\begin_layout Standard + +\lang english +In \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.2 -- and --- were in \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3 output as -{}- and -{}-{}- to prevent ligation to dashes. +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout + +\lang english +Up to \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.1 -- and --- in \SpecialChar LyX + was output unchanged which led to different look in the + within \SpecialChar LyX +, text export, HTML export and the PDF export. +\end_layout + +\end_inset + + Occurrences in older documents are converted to literal Unicode dashes. + This lead to problems like different line breaks. + Since \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3 there is the option +\family sans +Output en- and em-dashes as ligatures +\family default + in the menu +\family sans +Document\SpecialChar menuseparator +Settings\SpecialChar menuseparator +Fonts. + +\family default + It is on by default but unselected when opening documents edited with \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.2. +\begin_inset Newline newline +\end_inset + +Note the following side-effects of the \SpecialChar LyX + dash handling: +\end_layout + +\begin_layout Itemize + +\lang english +If you used literal em- and en dashes in pre-\SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.2 documents, you must manually unselect the option to ensure unchanged + behavior. +\end_layout + +\begin_layout Itemize + +\lang english +Zero-width space (ZWSP) characters in older \SpecialChar LyX + documents that follow literal + em- and en-dashes are removed during the conversion to the format of \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3. + If you used them as optional line breaks after dashes, convert them to + space insets before opening your document with \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3 or the optional line breaks will be lost! +\end_layout + \begin_layout Subsection Césure \begin_inset Index idx @@ -40498,6 +40592,40 @@ reference "subsec:Ligatures" . \end_layout +\begin_layout Description + +\lang english +Optional +\begin_inset space ~ +\end_inset + +Line +\begin_inset space ~ +\end_inset + +Break Inserts a line break point (zero-width space character) that is invisible + in the output +\lang french +. + Voir section +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:Dashes-and-line-breaks" +plural "false" +caps "false" +noprefix "false" + +\end_inset + + +\lang english +for a usage example. +\end_layout + \begin_layout Description Passage \begin_inset space ~ diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index eb0d062d58..0181513163 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -14219,7 +14219,7 @@ nobreakdash \end_layout \begin_deeper -\begin_layout Quote +\begin_layout Itemize \lang english Pages @@ -14256,8 +14256,7 @@ status open \end_layout -\begin_deeper -\begin_layout Standard +\begin_layout Itemize \lang french Les incises @@ -14298,8 +14297,7 @@ même – sont très utiles. \end_layout -\end_deeper -\begin_layout Quote +\begin_layout Itemize \lang spanish En una frase @@ -14391,6 +14389,102 @@ typewriter Hyphenation is suppressed in words adjacent to hyphens and ligature dashes. \end_layout +\begin_layout Standard + +\lang english +In \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.2 -- and --- were in \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3 output as -{}- and -{}-{}- to prevent ligation to dashes. +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout + +\lang english +Up to \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.1 -- and --- in \SpecialChar LyX + was output unchanged which led to different look in the + within \SpecialChar LyX +, text export, HTML export and the PDF export. +\end_layout + +\end_inset + + Occurrences in older documents are converted to literal Unicode dashes. + This lead to problems like different line breaks. + Since \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3 there is the option +\family sans +Output en- and em-dashes as ligatures +\family default + in the menu +\family sans +Document\SpecialChar menuseparator +Settings\SpecialChar menuseparator +Fonts. + +\family default + It is on by default but unselected when opening documents edited with \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.2. +\begin_inset Newline newline +\end_inset + +Note the following side-effects of the \SpecialChar LyX + dash handling: +\end_layout + +\begin_layout Itemize + +\lang english +If you used literal em- and en dashes in pre-\SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.2 documents, you must manually unselect the option to ensure unchanged + behavior. +\end_layout + +\begin_layout Itemize + +\lang english +Zero-width space (ZWSP) characters in older \SpecialChar LyX + documents that follow literal + em- and en-dashes are removed during the conversion to the format of \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3. + If you used them as optional line breaks after dashes, convert them to + space insets before opening your document with \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3 or the optional line breaks will be lost! +\end_layout + \begin_layout Subsection ハイフネーション \begin_inset Index idx @@ -32653,6 +32747,36 @@ reference "subsec:合字" 節に述べられている合字回避指定を挿入します． \end_layout +\begin_layout Description + +\lang english +Optional +\begin_inset space ~ +\end_inset + +Line +\begin_inset space ~ +\end_inset + +Break Inserts a line break point (zero-width space character) that is invisible + in the output. + See +\lang japanese +第 +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:Dashes-and-line-breaks" +plural "false" +caps "false" +noprefix "false" + +\end_inset + + +\lang english +for a usage example. +\end_layout + \begin_layout Description 整形なし改行 第 \begin_inset CommandInset ref -- 2.39.5