commit 3a6e18f53ab238c965672265bcf30c4fd20013c6
Author: Uwe Stöhr <uwesto...@lyx.org>
Date: Thu Sep 14 01:00:32 2017 +0200
UserGuide.lyx: accept and distribute more recent changes (part 2/3)
---
lib/doc/Changelog-UserGuide-LyX_23x.txt | 3 +-
lib/doc/UserGuide.lyx | 259 ++++++++++----------
lib/doc/de/UserGuide.lyx | 406 +++++++++++++++++++++++++++++++
lib/doc/es/UserGuide.lyx | 325 +++++++++++++++++++++++++
lib/doc/fr/UserGuide.lyx | 323 ++++++++++++++++++++++++
lib/doc/ja/UserGuide.lyx | 325 +++++++++++++++++++++++++
6 files changed, 1505 insertions(+), 136 deletions(-)
diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt
b/lib/doc/Changelog-UserGuide-LyX_23x.txt
index 303ba4e..d1aecc2 100644
--- a/lib/doc/Changelog-UserGuide-LyX_23x.txt
+++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt
@@ -5,7 +5,8 @@ Modified:
first step (not G, not J):
- sec. 3.7.3: changed sentences
- sec. 3.9.1: new handling of dashes
-- sec. 3.9.3.2: section completely rewritten (not F)
+- sec. 3.9.2: new section
+- sec. 3.9.4.2: section completely rewritten (not F)
- 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)
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 1002501..cabffd9 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -8337,12 +8337,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
@@ -8355,6 +8357,7 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
+
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -8378,6 +8381,7 @@ Verbatim
\end_layout
\begin_layout Verbatim*
+
This is Verbatim*.
\end_layout
@@ -16480,13 +16484,9 @@ literal "false"
\end_inset
.
-\change_inserted -1402925745 1504710179
-
\end_layout
-\begin_layout Subsubsection
-
-\change_inserted -1402925745 1503938327
+\begin_layout Subsection
Dashes and line breaks
\begin_inset CommandInset label
LatexCommand label
@@ -16498,45 +16498,25 @@ name "subsec:Dashes-and-line-breaks"
\end_layout
\begin_layout Standard
-
-\change_inserted -1402925745 1504686237
Whether line breaks before or after dashes are allowed depends on the use
case and locale:
\end_layout
\begin_layout Itemize
-
-\change_inserted -1402925745 1504302249
No line breaks are allowed in ranges of values like A–Z or 1975–1982.
-\change_unchanged
-
\end_layout
\begin_layout Itemize
-
-\change_inserted -1402925745 1504537660
In English, lines may break after dashes used to set off parenthetical
statement
s.
\end_layout
\begin_layout Itemize
-
-\change_inserted -1402925745 1504678633
In French and Spanish, dashes around parenthetical statements are treated
- similar to quote signs and line breaks are not allowed on the
-\begin_inset Quotes eld
-\end_inset
-
-inner side
-\begin_inset Quotes erd
-\end_inset
-
-.
+ similar to quote signs and line breaks are not allowed on the left side.
\end_layout
\begin_layout Standard
-
-\change_inserted -1402925745 1504711768
When using spaced en dashes
\begin_inset space ~
\end_inset
@@ -16545,16 +16525,14 @@ When using spaced en dashes
\begin_inset space ~
\end_inset
-- prevent line breaks before the dash with protected spaces.
+- line breaks before the dash with protected spaces are not allowed.
\end_layout
\begin_layout Standard
-
-\change_inserted -1402925745 1504686608
When using em dashes without spaces—\SpecialChar allowbreak
common in American English—\SpecialChar allowbreak
-insert optional
- line breaks with
+one can insert
+ optional line breaks with the menu
\family sans
Insert\SpecialChar menuseparator
Formatting\SpecialChar menuseparator
@@ -16564,9 +16542,8 @@ Optional line break
\end_layout
\begin_layout Standard
-
-\change_inserted -1402925745 1504708653
-For documents containing many em dashes, you may consider to select
+For documents containing many em dashes, you may consider to select the
+ option
\family sans
Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator
@@ -16574,7 +16551,7 @@ Fonts\SpecialChar menuseparator
Output en- and em-dashes as ligatures.
\family default
-This forces output of dashes as
+This forces the output of dashes as
\begin_inset Quotes eld
\end_inset
@@ -16590,42 +16567,62 @@ This forces output of dashes as
\begin_inset Quotes erd
\end_inset
- when exporting to LaTeX.
- The TeX font ligature mechanism convertes them to dash characters followed
+ when exporting to \SpecialChar LaTeX
+.
+ The \SpecialChar TeX
+ font ligature mechanism converts them to dash characters followed
by an optional line break.
\end_layout
\begin_layout Standard
-
-\change_inserted -1402925745 1504003320
-Caveats:
-\change_unchanged
-
+Subtleties:
\end_layout
\begin_layout Enumerate
-
-\change_inserted -1402925745 1504686268
This results in optional line breaks after
\series bold
all
\series default
- en and em dashes.
- Incorrect line breaks must be prevented by wrapping in a makebox or preceding
- with
-\family typewriter
+ en and em dashes.
+ Incorrect line breaks must be prevented by wrapping in a makebox
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+See section
+\emph on
+Prevent Hyphenation
+\emph default
+ of the
+\emph on
+Embedded
+\begin_inset space ~
+\end_inset
+
+Objects
+\emph default
+ manual.
+\end_layout
+
+\end_inset
+
+ or preceding with
+\series bold
\backslash
nobreakdash
-\family default
- in ERT:
+\series default
+ in \SpecialChar TeX
+ code:
\end_layout
\begin_deeper
\begin_layout Quote
+Pages
+\begin_inset space ~
+\end_inset
+
-\change_inserted -1402925745 1504539888
-pages
\begin_inset Box Frameless
position "t"
hor_pos "c"
@@ -16645,8 +16642,6 @@ backgroundcolor "none"
status open
\begin_layout Plain Layout
-
-\change_inserted -1402925745 1504013627
369–378
\end_layout
@@ -16658,7 +16653,7 @@ status open
\begin_deeper
\begin_layout Standard
-\change_inserted -1402925745 1504539962
+\lang french
Les incises
\begin_inset Box Frameless
position "t"
@@ -16680,7 +16675,7 @@ status open
\begin_layout Plain Layout
-\change_inserted -1402925745 1504539973
+\lang french
–
\begin_inset space ~
\end_inset
@@ -16700,20 +16695,16 @@ même
\end_deeper
\begin_layout Quote
-\change_inserted -1402925745 1504686902
+\lang spanish
En una frase
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
-\change_inserted -1402925745 1504246896
-
\backslash
nobreakdash
-\change_unchanged
-
\end_layout
\end_inset
@@ -16722,8 +16713,6 @@ nobreakdash
\end_layout
\begin_layout Standard
-
-\change_inserted -1402925745 1504708818
An incorrect line break is easily overlooked because
\begin_inset space ~
\end_inset
@@ -16732,59 +16721,46 @@ An incorrect line break is easily overlooked because
\begin_inset space ~
\end_inset
-– it does not trigger a warning in the LaTeX log.
+– it does not trigger a warning in the \SpecialChar LaTeX
+ log.
\end_layout
\end_deeper
\begin_layout Enumerate
-
-\change_inserted -1402925745 1504012609
-The setting is ignored for documents using non-TeX fonts.
+The setting is ignored for documents using non-\SpecialChar TeX
+ fonts.
\end_layout
\begin_deeper
\begin_layout Standard
-
-\change_inserted -1402925745 1504709863
-XeTeX provides the
-\family typewriter
+Xe\SpecialChar TeX
+ provides the
+\series bold
\backslash
XeTeXdashbreakstate
-\family default
+\series default
setting.
The default,
\begin_inset Newline newline
\end_inset
-\family typewriter
+\series bold
\backslash
XeTeXdashbreakstate=1
-\family default
-, causes literal dashes to behave like
-\begin_inset Quotes eld
-\end_inset
-
-ligature dashes
-\begin_inset Quotes erd
-\end_inset
-
-.
-\change_unchanged
-
+\series default
+ causes literal dashes to behave like ligature dashes.
\end_layout
\end_deeper
\begin_layout Enumerate
-
-\change_inserted -1402925745 1504686210
Em dashes in
\family typewriter
-typewriter fonts
+typewriter
\family default
- become
+ fonts become
\family typewriter
–-
\family default
@@ -16793,22 +16769,12 @@ typewriter fonts
---
\family default
in the output.
-\change_unchanged
-
\end_layout
\begin_layout Enumerate
-
+Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
\change_inserted -1402925745 1504003612
-Hyphenation is suppressed in words adjacent to hyphens and
-\begin_inset Quotes eld
-\end_inset
-ligature dashes
-\begin_inset Quotes erd
-\end_inset
-
-.
\end_layout
\begin_layout Standard
@@ -16819,51 +16785,44 @@ Changes:
\begin_layout Labeling
\labelwidthstring 00.00.0000
+\SpecialChar LyX
\change_inserted -1402925745 1504711065
-LyX
+
\begin_inset space ~
\end_inset
-2.2 -- and --- in the LyX source are output as -{}- and -{}-{}- to prevent
- ligation to dashes.
+2.2 -- and ---
+\change_unchanged
+in LyX are o
+\change_inserted -1402925745 1504711065
+utput as -{}- and -{}-{}- to prevent ligation to dashes.
+\change_unchanged
+
\begin_inset Foot
status collapsed
\begin_layout Plain Layout
+Up to \SpecialChar LyX
-\change_inserted -1402925745 1504711038
-Up to LyX
\begin_inset space ~
\end_inset
-2.1, -- and --- in the LyX source was output
-\begin_inset Quotes eld
-\end_inset
-
-as is
-\begin_inset Quotes erd
-\end_inset
-
- which led to different look in the GUI, text, or HTML vs.
- documents compiled with LaTeX.
-
-\change_unchanged
-
+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
- Occurences in older documents are converted to literal Unicode dashes [
-\begin_inset CommandInset href
-LatexCommand href
-name "changeset 8aa37c43"
-target "http://www.lyx.org/trac/changeset/8aa37c43/lyxgit";
-literal "false"
-
-\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
@@ -16871,7 +16830,6 @@ literal "false"
\change_inserted -1402925745 1504709468
In some cases this leads to different line breaks.
-
\end_layout
\begin_layout Itemize
@@ -16880,7 +16838,12 @@ In some cases this leads to different line breaks.
It is no longer possible to differentiate dashes with/without optional line
break using --- and -- vs.
literal dashes.
- Either convert one sort to ERT or insert optional line break characters.
+ 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
@@ -16888,13 +16851,18 @@ It is no longer possible to differentiate dashes
with/without optional line
\end_deeper
\begin_layout Labeling
\labelwidthstring 00.00.0000
+\SpecialChar LyX
\change_inserted -1402925745 1504710385
-LyX
+
\begin_inset space ~
\end_inset
-2.3 New setting
+2.3 New
+\change_unchanged
+ option
+\change_inserted -1402925745 1504710385
+
\family sans
Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator
@@ -16902,7 +16870,16 @@ Fonts\SpecialChar menuseparator
Output en- and em-dashes as ligatures.
\family default
- It is on by default but unselected when opening documents edited with LyX 2.2.
+ It is on by default but unselected when opening documents edited with
+\change_unchanged
+\SpecialChar LyX
+
+\begin_inset space ~
+\end_inset
+
+
+\change_inserted -1402925745 1504710385
+2.2.
\end_layout
@@ -16911,7 +16888,11 @@ Output en- and em-dashes as ligatures.
\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 behaviour.
+ unselect it to ensure unchanged
+\change_unchanged
+behavior
+\change_inserted -1402925745 1504712456
+.
\end_layout
\begin_layout Itemize
@@ -16920,8 +16901,16 @@ If you used literal em- and en dashes in pre-2.2
documents, you must manually
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 LyX 2.3 or the optional line
- breaks will be lost!
+ space insets before opening your document with
+\change_unchanged
+\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
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index fd2b9df..a6a0100 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -16731,6 +16731,412 @@ literal "false"
\end_layout
\begin_layout Subsection
+Bindestriche und Zeilenumbrüche
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:Bindestriche-und-Zeilenumbrüche"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Ob Zeilenumbrüche vor oder nach Bindestriche erlaubt sind, hängt vom konkreten
+ Fall und der Sprache ab:
+\end_layout
+
+\begin_layout Itemize
+Zeilenumbrüche sind nicht erlaubt in Bereichen von Werten wie A–Z oder
1975–1982.
+\end_layout
+
+\begin_layout Itemize
+Im Englischen dürfen Zeilen nach Bindestrichen umgebrochen werden, um
eingeschob
+ene Aussagen zu schreiben.
+\end_layout
+
+\begin_layout Itemize
+Im Französischen und Spanischen werden Bindestriche um eingeschobene Aussagen
+ wie Anführungszeichen behandelt und Zeilenumbrüche sind nicht auf der linken
+ Seite erlaubt.
+\end_layout
+
+\begin_layout Standard
+Bei Bindestrichen mit Leerzeichen
+\begin_inset space ~
+\end_inset
+
+- was üblich ist in Britisch Englisch
+\begin_inset space ~
+\end_inset
+
+- sind Zeilenumbrüche vor dem Bindestrich mit geschütztem Leerzeichen nicht
+ zulässig.
+\end_layout
+
+\begin_layout Standard
+Bei Gedankenstrichen ohne Leerzeichen—\SpecialChar allowbreak
+was üblich ist in Amerikanisch Englisch—\SpecialChar allowbreak
+ka
+nn man optionale Zeilenumbrüche mit dem Menü
+\family sans
+Einfügen\SpecialChar menuseparator
+Formatierung\SpecialChar menuseparator
+Optionaler Zeilenumbruch
+\family default
+ einfügen.
+\end_layout
+
+\begin_layout Standard
+In Dokumenten mit vielen Gedankenstrichen, kann man die Option
+\family sans
+Dokument\SpecialChar menuseparator
+Einstellungen\SpecialChar menuseparator
+Schriften\SpecialChar menuseparator
+Halbgeviert und Geviertstriche als Ligaturen
+ ausgeben
+\family default
+verwenden.
+ Dies gibt die Striche als
+\begin_inset Quotes gld
+\end_inset
+
+--
+\begin_inset Quotes grd
+\end_inset
+
+ und
+\begin_inset Quotes gld
+\end_inset
+
+---
+\begin_inset Quotes grd
+\end_inset
+
+ aus, wenn man nach \SpecialChar LaTeX
+ exportiert.
+ Der \SpecialChar TeX
+ Schrift-Ligaturmechanismus konvertiert sie zu Strichzeichen, auf die
+ ein optionaler Zeilenumbruch folgt.
+\end_layout
+
+\begin_layout Standard
+Feinheiten:
+\end_layout
+
+\begin_layout Enumerate
+Dies führt zu einem optionalen Zeilenumbruch nach
+\emph on
+allen
+\emph default
+ Binde- und Gedankenstrichen .
+ Inkorrekte Zeilenumbrüche müssen verhindert werden, indem man sie in eine
+ Makebox packt
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Siehe Abschnitt
+\emph on
+Silbentrennung unterbinden
+\emph default
+ des
+\emph on
+Eingebettete
+\begin_inset space ~
+\end_inset
+
+Objekte
+\emph default
+ Handbuchs.
+\end_layout
+
+\end_inset
+
+ oder davor
+\series bold
+
+\backslash
+nobreakdash
+\series default
+ als \SpecialChar TeX
+-Code schreibt:
+\end_layout
+
+\begin_deeper
+\begin_layout Quote
+Seiten
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset Box Frameless
+position "t"
+hor_pos "c"
+has_inner_box 1
+inner_pos "t"
+use_parbox 0
+use_makebox 1
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
+
+\begin_layout Plain Layout
+369–378
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_deeper
+\begin_layout Standard
+
+\lang french
+Les incises
+\begin_inset Box Frameless
+position "t"
+hor_pos "c"
+has_inner_box 1
+inner_pos "t"
+use_parbox 0
+use_makebox 1
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
+
+\begin_layout Plain Layout
+
+\lang french
+–
+\begin_inset space ~
+\end_inset
+
+même
+\end_layout
+
+\end_inset
+
+ si tout le monde ne les aime pas
+\begin_inset space ~
+\end_inset
+
+– sont très utiles.
+\end_layout
+
+\end_deeper
+\begin_layout Quote
+
+\lang spanish
+En una frase
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+nobreakdash
+\end_layout
+
+\end_inset
+
+—un inciso con rayas— se escribe así.
+\end_layout
+
+\begin_layout Standard
+Ein inkorrekter Zeilenumbruch wird schnell übersehen, denn
+\begin_inset space ~
+\end_inset
+
+– im Gegensatz zu einer übervollen Zeile
+\begin_inset space ~
+\end_inset
+
+– führt dies zu keiner Warnung im \SpecialChar LaTeX
+-Protokoll.
+\end_layout
+
+\end_deeper
+\begin_layout Enumerate
+Diese Einstellung wird ignoriert in Dokumenten, die keine \SpecialChar TeX
+-Schriften verwenden.
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+Xe\SpecialChar TeX
+ bietet die Einstellung
+\series bold
+
+\backslash
+XeTeXdashbreakstate
+\series default
+.
+ Die Voreinstellung
+\begin_inset Newline newline
+\end_inset
+
+
+\series bold
+
+\backslash
+XeTeXdashbreakstate=1
+\series default
+ bewirkt, dass normale Striche als Ligaturstriche behandelt werden.
+\end_layout
+
+\end_deeper
+\begin_layout Enumerate
+Gedankenstriche in
+\family typewriter
+Schreibmaschinenschrift
+\family default
+ werden
+\family typewriter
+–-
+\family default
+ oder
+\family typewriter
+---
+\family default
+ in der Ausgabe.
+\end_layout
+
+\begin_layout Enumerate
+Zeilentrennung wird bei Wörtern verhindert, die neben Bindestrichen und
+ Ligaturstrichen stehen.
+\end_layout
+
+\begin_layout Standard
+Änderungen:
+\end_layout
+
+\begin_layout Labeling
+\labelwidthstring 00.00.0000
+\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.
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Bis zu \SpecialChar LyX
+
+\begin_inset space ~
+\end_inset
+
+2.1 wurde -- und --- in \SpecialChar LyX
+ unverändert ausgegeben, was zu unterschiedlichem
+ Aussehen innerhalb von \SpecialChar LyX
+, dem Text-, HTML- und PDF-Export führte.
+\end_layout
+
+\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
+
+\begin_inset space ~
+\end_inset
+
+2.3 Neue Option
+\family sans
+Dokument\SpecialChar menuseparator
+Einstellungen\SpecialChar menuseparator
+Schriften\SpecialChar menuseparator
+Halbgeviert und Geviertstriche als Ligaturen
+ ausgeben.
+
+\family default
+
+\lang english
+It is on by default but unselected when opening documents edited with
\SpecialChar LyX
+
+\begin_inset space ~
+\end_inset
+
+2.2.
+
+\end_layout
+
+\begin_deeper
+\begin_layout Itemize
+
+\lang english
+If you used literal em- and en dashes in pre-2.2 documents, you must manually
+ unselect it to ensure unchanged behaviour.
+\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
+
+\begin_inset space ~
+\end_inset
+
+2.3 or the optional line breaks will be lost!
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+As with all settings, the default for new documents can be configured via
+ templates.
+\end_layout
+
+\end_deeper
+\begin_layout Subsection
Silbentrennung
\begin_inset CommandInset label
LatexCommand label
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 27084ce..6c8e69f 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -16824,6 +16824,331 @@ literal "false"
\end_layout
\begin_layout Subsection
+
+\lang english
+Dashes and line breaks
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:Dashes-and-line-breaks"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Whether line breaks before or after dashes are allowed depends on the use
+ case and locale:
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+No line breaks are allowed in ranges of values like A–Z or 1975–1982.
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+In English, lines may break after dashes used to set off parenthetical
statement
+s.
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+In French and Spanish, dashes around parenthetical statements are treated
+ similar to quote signs and line breaks are not allowed on the left side.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+When using spaced en dashes
+\begin_inset space ~
+\end_inset
+
+- common in British English
+\begin_inset space ~
+\end_inset
+
+- line breaks before the dash with protected spaces are not allowed.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+When using em dashes without spaces—\SpecialChar allowbreak
+common in American English—\SpecialChar allowbreak
+one can insert
+ optional line breaks with the menu
+\family sans
+Insert\SpecialChar menuseparator
+Formatting\SpecialChar menuseparator
+Optional line break
+\family default
+.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+For documents containing many em dashes, you may consider to select the
+ option
+\lang spanish
+
+\family sans
+Documento\SpecialChar menuseparator
+
+\lang english
+Settings\SpecialChar menuseparator
+Fonts\SpecialChar menuseparator
+Output en- and em-dashes as ligatures.
+
+\family default
+This forces the output of dashes as
+\begin_inset Quotes cld
+\end_inset
+
+--
+\begin_inset Quotes crd
+\end_inset
+
+ and
+\begin_inset Quotes cld
+\end_inset
+
+---
+\begin_inset Quotes crd
+\end_inset
+
+ when exporting to \SpecialChar LaTeX
+.
+ The \SpecialChar TeX
+ font ligature mechanism converts them to dash characters followed
+ by an optional line break.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Subtleties:
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+This results in optional line breaks after
+\series bold
+all
+\series default
+ en and em dashes.
+ Incorrect line breaks must be prevented by wrapping in a makebox
+\lang spanish
+
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Véase sección
+\emph on
+Evitar la partición de palabras
+\emph default
+ del manual
+\emph on
+Objetos insertados
+\emph default
+.
+\end_layout
+
+\end_inset
+
+
+\lang english
+or preceding with
+\series bold
+
+\backslash
+nobreakdash
+\series default
+ in \SpecialChar TeX
+ code:
+\end_layout
+
+\begin_deeper
+\begin_layout Quote
+
+\lang english
+Pages
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset Box Frameless
+position "t"
+hor_pos "c"
+has_inner_box 1
+inner_pos "t"
+use_parbox 0
+use_makebox 1
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+369–378
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_deeper
+\begin_layout Standard
+
+\lang french
+Les incises
+\begin_inset Box Frameless
+position "t"
+hor_pos "c"
+has_inner_box 1
+inner_pos "t"
+use_parbox 0
+use_makebox 1
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
+
+\begin_layout Plain Layout
+
+\lang french
+–
+\begin_inset space ~
+\end_inset
+
+même
+\end_layout
+
+\end_inset
+
+ si tout le monde ne les aime pas
+\begin_inset space ~
+\end_inset
+
+– sont très utiles.
+\end_layout
+
+\end_deeper
+\begin_layout Quote
+En una frase
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+nobreakdash
+\end_layout
+
+\end_inset
+
+—un inciso con rayas— se escribe así.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+An incorrect line break is easily overlooked because
+\begin_inset space ~
+\end_inset
+
+– in contrast to an overfull line
+\begin_inset space ~
+\end_inset
+
+– it does not trigger a warning in the \SpecialChar LaTeX
+ log.
+\end_layout
+
+\end_deeper
+\begin_layout Enumerate
+
+\lang english
+The setting is ignored for documents using non-\SpecialChar TeX
+ fonts.
+\end_layout
+
+\begin_deeper
+\begin_layout Standard
+
+\lang english
+Xe\SpecialChar TeX
+ provides the
+\series bold
+
+\backslash
+XeTeXdashbreakstate
+\series default
+ setting.
+ The default,
+\begin_inset Newline newline
+\end_inset
+
+
+\series bold
+
+\backslash
+XeTeXdashbreakstate=1
+\series default
+ causes literal dashes to behave like ligature dashes.
+\end_layout
+
+\end_deeper
+\begin_layout Enumerate
+
+\lang english
+Em dashes in
+\family typewriter
+typewriter
+\family default
+ fonts become
+\family typewriter
+–-
+\family default
+ or
+\family typewriter
+---
+\family default
+ in the output.
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
+\end_layout
+
+\begin_layout Subsection
División de palabras con guión
\begin_inset Index idx
status collapsed
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 7c42ee2..085e4a1 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -17760,6 +17760,329 @@ literal "false"
\end_layout
\begin_layout Subsection
+
+\lang english
+Dashes and line breaks
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:Dashes-and-line-breaks"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Whether line breaks before or after dashes are allowed depends on the use
+ case and locale:
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+No line breaks are allowed in ranges of values like A–Z or 1975–1982.
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+In English, lines may break after dashes used to set off parenthetical
statement
+s.
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+In French and Spanish, dashes around parenthetical statements are treated
+ similar to quote signs and line breaks are not allowed on the left side.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+When using spaced en dashes
+\begin_inset space ~
+\end_inset
+
+- common in British English
+\begin_inset space ~
+\end_inset
+
+- line breaks before the dash with protected spaces are not allowed.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+When using em dashes without spaces—\SpecialChar allowbreak
+common in American English—\SpecialChar allowbreak
+one can insert
+ optional line breaks with the menu
+\family sans
+Insert\SpecialChar menuseparator
+Formatting\SpecialChar menuseparator
+Optional line break
+\family default
+.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+For documents containing many em dashes, you may consider to select the
+ option
+\lang french
+
+\family sans
+Document\SpecialChar menuseparator
+
+\lang english
+Settings\SpecialChar menuseparator
+Fonts\SpecialChar menuseparator
+Output en- and em-dashes as ligatures.
+
+\family default
+This forces the output of dashes as
+\begin_inset Quotes cld
+\end_inset
+
+--
+\begin_inset Quotes crd
+\end_inset
+
+ and
+\begin_inset Quotes cld
+\end_inset
+
+---
+\begin_inset Quotes crd
+\end_inset
+
+ when exporting to \SpecialChar LaTeX
+.
+ The \SpecialChar TeX
+ font ligature mechanism converts them to dash characters followed
+ by an optional line break.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Subtleties:
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+This results in optional line breaks after
+\series bold
+all
+\series default
+ en and em dashes.
+ Incorrect line breaks must be prevented by wrapping in a makebox
+\lang french
+
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Voir section
+\emph on
+Empêcher la césure
+\emph default
+ du manuel
+\emph on
+Objets insérés
+\emph default
+.
+\end_layout
+
+\end_inset
+
+
+\lang english
+or preceding with
+\series bold
+
+\backslash
+nobreakdash
+\series default
+ in \SpecialChar TeX
+ code:
+\end_layout
+
+\begin_deeper
+\begin_layout Quote
+
+\lang english
+Pages
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset Box Frameless
+position "t"
+hor_pos "c"
+has_inner_box 1
+inner_pos "t"
+use_parbox 0
+use_makebox 1
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+369–378
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_deeper
+\begin_layout Standard
+Les incises
+\begin_inset Box Frameless
+position "t"
+hor_pos "c"
+has_inner_box 1
+inner_pos "t"
+use_parbox 0
+use_makebox 1
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
+
+\begin_layout Plain Layout
+–
+\begin_inset space ~
+\end_inset
+
+même
+\end_layout
+
+\end_inset
+
+ si tout le monde ne les aime pas
+\begin_inset space ~
+\end_inset
+
+– sont très utiles.
+\end_layout
+
+\end_deeper
+\begin_layout Quote
+
+\lang spanish
+En una frase
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+nobreakdash
+\end_layout
+
+\end_inset
+
+—un inciso con rayas— se escribe así.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+An incorrect line break is easily overlooked because
+\begin_inset space ~
+\end_inset
+
+– in contrast to an overfull line
+\begin_inset space ~
+\end_inset
+
+– it does not trigger a warning in the \SpecialChar LaTeX
+ log.
+\end_layout
+
+\end_deeper
+\begin_layout Enumerate
+
+\lang english
+The setting is ignored for documents using non-\SpecialChar TeX
+ fonts.
+\end_layout
+
+\begin_deeper
+\begin_layout Standard
+
+\lang english
+Xe\SpecialChar TeX
+ provides the
+\series bold
+
+\backslash
+XeTeXdashbreakstate
+\series default
+ setting.
+ The default,
+\begin_inset Newline newline
+\end_inset
+
+
+\series bold
+
+\backslash
+XeTeXdashbreakstate=1
+\series default
+ causes literal dashes to behave like ligature dashes.
+\end_layout
+
+\end_deeper
+\begin_layout Enumerate
+
+\lang english
+Em dashes in
+\family typewriter
+typewriter
+\family default
+ fonts become
+\family typewriter
+–-
+\family default
+ or
+\family typewriter
+---
+\family default
+ in the output.
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
+\end_layout
+
+\begin_layout Subsection
Césure
\begin_inset Index idx
status collapsed
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index ecea99d..eb0d062 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -14067,6 +14067,331 @@ literal "false"
\end_layout
\begin_layout Subsection
+
+\lang english
+Dashes and line breaks
+\begin_inset CommandInset label
+LatexCommand label
+name "subsec:Dashes-and-line-breaks"
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Whether line breaks before or after dashes are allowed depends on the use
+ case and locale:
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+No line breaks are allowed in ranges of values like A–Z or 1975–1982.
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+In English, lines may break after dashes used to set off parenthetical
statement
+s.
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+In French and Spanish, dashes around parenthetical statements are treated
+ similar to quote signs and line breaks are not allowed on the left side.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+When using spaced en dashes
+\begin_inset space ~
+\end_inset
+
+- common in British English
+\begin_inset space ~
+\end_inset
+
+- line breaks before the dash with protected spaces are not allowed.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+When using em dashes without spaces—\SpecialChar allowbreak
+common in American English—\SpecialChar allowbreak
+one can insert
+ optional line breaks with the menu
+\family sans
+Insert\SpecialChar menuseparator
+Formatting\SpecialChar menuseparator
+Optional line break
+\family default
+.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+For documents containing many em dashes, you may consider to select the
+ option
+\family sans
+Document\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
+Fonts\SpecialChar menuseparator
+Output en- and em-dashes as ligatures.
+
+\family default
+This forces the output of dashes as
+\begin_inset Quotes eld
+\end_inset
+
+--
+\begin_inset Quotes erd
+\end_inset
+
+ and
+\begin_inset Quotes eld
+\end_inset
+
+---
+\begin_inset Quotes erd
+\end_inset
+
+ when exporting to \SpecialChar LaTeX
+.
+ The \SpecialChar TeX
+ font ligature mechanism converts them to dash characters followed
+ by an optional line break.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Subtleties:
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+This results in optional line breaks after
+\series bold
+all
+\series default
+ en and em dashes.
+ Incorrect line breaks must be prevented by wrapping in a makebox
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+See section
+\emph on
+Prevent Hyphenation
+\emph default
+ of the
+\emph on
+Embedded
+\begin_inset space ~
+\end_inset
+
+Objects
+\emph default
+ manual.
+\end_layout
+
+\end_inset
+
+ or preceding with
+\series bold
+
+\backslash
+nobreakdash
+\series default
+ in \SpecialChar TeX
+ code:
+\end_layout
+
+\begin_deeper
+\begin_layout Quote
+
+\lang english
+Pages
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset Box Frameless
+position "t"
+hor_pos "c"
+has_inner_box 1
+inner_pos "t"
+use_parbox 0
+use_makebox 1
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+369–378
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_deeper
+\begin_layout Standard
+
+\lang french
+Les incises
+\begin_inset Box Frameless
+position "t"
+hor_pos "c"
+has_inner_box 1
+inner_pos "t"
+use_parbox 0
+use_makebox 1
+width ""
+special "none"
+height "1in"
+height_special "totalheight"
+thickness "0.4pt"
+separation "3pt"
+shadowsize "4pt"
+framecolor "black"
+backgroundcolor "none"
+status open
+
+\begin_layout Plain Layout
+
+\lang french
+–
+\begin_inset space ~
+\end_inset
+
+même
+\end_layout
+
+\end_inset
+
+ si tout le monde ne les aime pas
+\begin_inset space ~
+\end_inset
+
+– sont très utiles.
+\end_layout
+
+\end_deeper
+\begin_layout Quote
+
+\lang spanish
+En una frase
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+nobreakdash
+\end_layout
+
+\end_inset
+
+—un inciso con rayas— se escribe así.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+An incorrect line break is easily overlooked because
+\begin_inset space ~
+\end_inset
+
+– in contrast to an overfull line
+\begin_inset space ~
+\end_inset
+
+– it does not trigger a warning in the \SpecialChar LaTeX
+ log.
+\end_layout
+
+\end_deeper
+\begin_layout Enumerate
+
+\lang english
+The setting is ignored for documents using non-\SpecialChar TeX
+ fonts.
+\end_layout
+
+\begin_deeper
+\begin_layout Standard
+
+\lang english
+Xe\SpecialChar TeX
+ provides the
+\series bold
+
+\backslash
+XeTeXdashbreakstate
+\series default
+ setting.
+ The default,
+\begin_inset Newline newline
+\end_inset
+
+
+\series bold
+
+\backslash
+XeTeXdashbreakstate=1
+\series default
+ causes literal dashes to behave like ligature dashes.
+\end_layout
+
+\end_deeper
+\begin_layout Enumerate
+
+\lang english
+Em dashes in
+\family typewriter
+typewriter
+\family default
+ fonts become
+\family typewriter
+–-
+\family default
+ or
+\family typewriter
+---
+\family default
+ in the output.
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
+\end_layout
+
+\begin_layout Subsection
ハイフネーション
\begin_inset Index idx
status collapsed
