commit d26665c67fb1db5d2e7324210d995c438f10378e
Author: Uwe Stöhr <[email protected]>
Date: Tue Dec 12 02:23:22 2017 +0100
UserGuide.lyx: distribute today's changes
---
lib/doc/UserGuide.lyx | 394 +---------------------------------------------
lib/doc/es/UserGuide.lyx | 163 ++++++++++---------
lib/doc/fr/UserGuide.lyx | 161 ++++++++++---------
lib/doc/ja/UserGuide.lyx | 149 ++++++++++--------
4 files changed, 258 insertions(+), 609 deletions(-)
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index ffcd527..61ea1f1 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 -712698321 "Jürgen Spitzmüller"
\end_header
\begin_body
@@ -8337,14 +8336,12 @@ Verbatim
\end_layout
\begin_layout Verbatim
-
This is Verbatim.
\end_layout
\begin_layout Verbatim
\noindent
\align block
-
The following 2 lines are empty:
\end_layout
@@ -8357,7 +8354,6 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
-
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -8381,7 +8377,6 @@ Verbatim
\end_layout
\begin_layout Verbatim*
-
This is Verbatim*.
\end_layout
@@ -16585,32 +16580,9 @@ Whether line breaks around dashes are allowed depends
on the use case and
\end_layout
\begin_layout Itemize
-
-\change_inserted -712698321 1512901448
-In English,
-\change_deleted -712698321 1512901449
-No
-\change_unchanged
-line breaks are
-\change_inserted -712698321 1512901455
-generally
-\change_unchanged
-allowed
-\change_inserted -712698321 1512901463
-after the dash
-\change_unchanged
-in ranges of values
-\change_deleted -712698321 1512901468
-like A–Z or
-\change_inserted -712698321 1512901469
-such as
-\change_unchanged
- 1975–1982
-\change_inserted -712698321 1512901504
-, but no line break should occur if only a single character follows the
- dash (as in A–Z)
-\change_unchanged
-.
+In English, line breaks are generally allowed after the dash in ranges of
+ values such as 1975–1982, but no line break should occur if only a single
+ character follows the dash (as in A–Z).
\end_layout
\begin_layout Itemize
@@ -16624,8 +16596,6 @@ In French and Spanish, dashes around parenthetical
statements are treated
\end_layout
\begin_layout Standard
-
-\change_inserted -712698321 1512901782
In \SpecialChar LyX
, line breaks after en-dashes and em-dashes are only allowed (without
manual intervention), if the option
@@ -16641,8 +16611,6 @@ Output en- and em-dashes as ligatures
status collapsed
\begin_layout Plain Layout
-
-\change_inserted -712698321 1512901760
In this case, the dashes are output as
\begin_inset Quotes eld
\end_inset
@@ -16664,8 +16632,6 @@ In this case, the dashes are output as
The \SpecialChar TeX
font ligature mechanism converts them to dash characters followed
by an optional line break.
-\change_unchanged
-
\end_layout
\end_inset
@@ -16674,14 +16640,10 @@ In this case, the dashes are output as
\end_layout
\begin_layout Standard
-
-\change_inserted -712698321 1512901787
Please note:
\end_layout
\begin_layout Enumerate
-
-\change_inserted -712698321 1512901943
This results in optional line breaks after
\emph on
all
@@ -16692,8 +16654,6 @@ all
status collapsed
\begin_layout Plain Layout
-
-\change_inserted -712698321 1512901782
See section
\emph on
Prevent Hyphenation
@@ -16724,8 +16684,6 @@ nobreakdash
\begin_deeper
\begin_layout Itemize
-
-\change_inserted -712698321 1512901862
Pages
\begin_inset space ~
\end_inset
@@ -16750,8 +16708,6 @@ backgroundcolor "none"
status open
\begin_layout Plain Layout
-
-\change_inserted -712698321 1512902334
368–9
\end_layout
@@ -16761,8 +16717,6 @@ status open
\end_layout
\begin_layout Itemize
-
-\change_inserted -712698321 1512901928
With spaced en dashes
\begin_inset space ~
\end_inset
@@ -16785,8 +16739,6 @@ The Elements of Typographic Style
\begin_layout Itemize
-\change_inserted -712698321 1512901831
-
\lang french
Les incises –
\begin_inset space ~
@@ -16801,8 +16753,6 @@ même si tout le monde ne les aime pas
\begin_layout Itemize
-\change_inserted -712698321 1512901782
-
\lang spanish
En una frase
\begin_inset ERT
@@ -16810,8 +16760,6 @@ status collapsed
\begin_layout Plain Layout
-\change_inserted -712698321 1512901782
-
\backslash
nobreakdash
@@ -16823,8 +16771,6 @@ nobreakdash
\end_layout
\begin_layout Standard
-
-\change_inserted -712698321 1512901782
An incorrect line break is easily overlooked because
\begin_inset space ~
\end_inset
@@ -16839,16 +16785,12 @@ An incorrect line break is easily overlooked because
\end_deeper
\begin_layout Enumerate
-
-\change_inserted -712698321 1512901782
The setting is ignored for documents using non-\SpecialChar TeX
fonts.
\begin_inset Foot
status collapsed
\begin_layout Plain Layout
-
-\change_inserted -712698321 1512901782
Xe\SpecialChar TeX
provides the
\series bold
@@ -16876,8 +16818,6 @@ XeTeXdashbreakstate=0
\end_layout
\begin_layout Enumerate
-
-\change_inserted -712698321 1512901782
Em dashes in
\family typewriter
typewriter
@@ -16894,16 +16834,10 @@ typewriter
\end_layout
\begin_layout Enumerate
-
-\change_inserted -712698321 1512901782
Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
-\change_unchanged
-
\end_layout
\begin_layout Standard
-
-\change_inserted -712698321 1512902074
If the option
\family sans
Document\SpecialChar menuseparator
@@ -16911,333 +16845,25 @@ Settings\SpecialChar menuseparator
Fonts\SpecialChar menuseparator
Output en- and em-dashes as ligatures
\family default
- has not been selected, you can
-\change_deleted -712698321 1512902388
-
-\end_layout
-
-\begin_layout Standard
-
-\change_deleted -712698321 1512902090
-When using spaced en dashes
-\begin_inset space ~
-\end_inset
-
-- common in British English
-\begin_inset space ~
-\end_inset
-
-- line breaks before the dash can be prevented with protected spaces.
-\end_layout
-
-\begin_layout Standard
-
-\change_deleted -712698321 1512902090
-When using em dashes without spaces—\SpecialChar allowbreak
-common in American English—\SpecialChar allowbreak
-one can
-\change_unchanged
- insert optional line breaks
-\change_deleted -712698321 1512902097
-with
-\change_inserted -712698321 1512902097
-via
-\change_unchanged
- the menu
+ has not been selected, you can insert optional line breaks via the menu
+
\family sans
Insert\SpecialChar menuseparator
Formatting\SpecialChar menuseparator
Optional line break
-\change_inserted -712698321 1512902402
-
\family default
:
-\change_deleted -712698321 1512902402
-.
-\change_inserted -712698321 1512902107
-
\end_layout
\begin_layout Itemize
-
-\change_inserted -712698321 1512902150
Em-dashes without spaces—\SpecialChar allowbreak
as common in American English—\SpecialChar allowbreak
should be broken
after the dash.
-\change_unchanged
-
-\end_layout
-
-\begin_layout Standard
-
-\change_deleted -712698321 1512902167
-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.
-\change_unchanged
-
\end_layout
\begin_layout Standard
-
-\change_deleted -712698321 1512901780
-Caution:
-\end_layout
-
-\begin_layout Enumerate
-
-\change_deleted -712698321 1512901780
-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
-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.
- Examples:
-\end_layout
-
-\begin_deeper
-\begin_layout Itemize
-
-\change_deleted -712698321 1512901780
-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
-369–378
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Itemize
-
-\change_deleted -712698321 1512901780
-
-\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
-
-\begin_layout Itemize
-
-\change_deleted -712698321 1512901780
-
-\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
-
-\change_deleted -712698321 1512901780
-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
-
-\change_deleted -712698321 1512901780
-The setting is ignored for documents using non-\SpecialChar TeX
- fonts.
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Xe\SpecialChar TeX
- provides the
-\series bold
-
-\backslash
-XeTeXdashbreakstate
-\series default
- setting.
- The default causes dashes to behave like ligature dashes.
- The usual behaviour of literal dashes can be achieved by inserting
-\family typewriter
-\series bold
-
-\backslash
-XeTeXdashbreakstate=0
-\family default
-\series default
- into the \SpecialChar LaTeX
- preamble.
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Enumerate
-
-\change_deleted -712698321 1512901780
-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
-
-\change_deleted -712698321 1512901780
-Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
-\change_unchanged
-
-\end_layout
-
-\begin_layout Standard
-
-\change_deleted -712698321 1512902180
-Since
-\change_inserted -712698321 1512902181
-As of
-\change_unchanged
- \SpecialChar LyX
+As of \SpecialChar LyX
\begin_inset space ~
\end_inset
@@ -17267,11 +16893,7 @@ Up to \SpecialChar LyX
\begin_inset space ~
\end_inset
-2.3 provides the
-\change_inserted -712698321 1512902196
-aforementioned
-\change_unchanged
-option
+2.3 provides the aforementioned option
\family sans
Output en- and em-dashes as ligatures
\family default
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 1fd213a..095125b 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -16945,7 +16945,9 @@ Whether line breaks around dashes are allowed depends
on the use case and
\begin_layout Itemize
\lang english
-No line breaks are allowed in ranges of values like A–Z or 1975–1982.
+In English, line breaks are generally allowed after the dash in ranges of
+ values such as 1975–1982, but no line break should occur if only a single
+ character follows the dash (as in A–Z).
\end_layout
\begin_layout Itemize
@@ -16965,86 +16967,66 @@ In French and Spanish, dashes around parenthetical
statements are treated
\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 can be prevented with protected spaces.
-\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
+In \SpecialChar LyX
+, line breaks after en-dashes and em-dashes are only allowed (without
+ manual intervention), if the option
\family sans
-Insert\SpecialChar menuseparator
-Formatting\SpecialChar menuseparator
-Optional line break
+Document\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
+Fonts\SpecialChar menuseparator
+Output en- and em-dashes as ligatures
\family default
-.
-\end_layout
-
-\begin_layout Standard
+ is selected (this is the default in \SpecialChar LyX
+ 2.3).
+\begin_inset Foot
+status collapsed
-\lang english
-For documents containing many em dashes, you may consider to select the
- option
-\lang spanish
-
-\family sans
-Documento\SpecialChar menuseparator
+\begin_layout Plain Layout
\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
+In this case, the dashes are output as
+\begin_inset Quotes eld
\end_inset
--
-\begin_inset Quotes crd
+\begin_inset Quotes erd
\end_inset
and
-\begin_inset Quotes cld
+\begin_inset Quotes eld
\end_inset
---
-\begin_inset Quotes crd
+\begin_inset Quotes erd
\end_inset
- when exporting to \SpecialChar LaTeX
+, respectively, when exporting to \SpecialChar LaTeX
.
The \SpecialChar TeX
font ligature mechanism converts them to dash characters followed
by an optional line break.
\end_layout
+\end_inset
+
+
+\end_layout
+
\begin_layout Standard
\lang english
-Caution:
+Please note:
\end_layout
\begin_layout Enumerate
\lang english
This results in optional line breaks after
-\series bold
+\emph on
all
-\series default
- en and em dashes.
- Incorrect line breaks must be prevented by wrapping in a makebox
+\emph default
+ en- and em-dashes.
+ Unwanted line breaks must be prevented by wrapping in a makebox
\lang spanish
\begin_inset Foot
@@ -17064,9 +17046,9 @@ Objetos insertados
\end_inset
-
+
\lang english
-or preceding with
+, using protected spaces or preceding with
\series bold
\backslash
@@ -17107,7 +17089,7 @@ status open
\begin_layout Plain Layout
\lang english
-369–378
+368–9
\end_layout
\end_inset
@@ -17117,39 +17099,35 @@ status open
\begin_layout Itemize
-\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
+\lang english
+With spaced en dashes
+\begin_inset space ~
+\end_inset
-\begin_layout Plain Layout
+– common e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+ in British English and generally recommended by
+\emph on
+The Elements of Typographic Style
+\emph default
-\lang french
-–
\begin_inset space ~
\end_inset
-même
+– line breaks should not occur before the dash.
\end_layout
+\begin_layout Itemize
+
+\lang french
+Les incises –
+\begin_inset space ~
\end_inset
- si tout le monde ne les aime pas
+même si tout le monde ne les aime pas
\begin_inset space ~
\end_inset
@@ -17253,7 +17231,36 @@ Hyphenation is suppressed in words adjacent to hyphens
and ligature dashes.
\begin_layout Standard
\lang english
-Since \SpecialChar LyX
+If the option
+\family sans
+Document\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
+Fonts\SpecialChar menuseparator
+Output en- and em-dashes as ligatures
+\family default
+ has not been selected, you can insert optional line breaks via the menu
+
+\family sans
+Insert\SpecialChar menuseparator
+Formatting\SpecialChar menuseparator
+Optional line break
+\family default
+:
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+Em-dashes without spaces—\SpecialChar allowbreak
+as common in American English—\SpecialChar allowbreak
+should be broken
+ after the dash.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+As of \SpecialChar LyX
\begin_inset space ~
\end_inset
@@ -17285,7 +17292,7 @@ Up to \SpecialChar LyX
\begin_inset space ~
\end_inset
-2.3 provides the option
+2.3 provides the aforementioned option
\family sans
Output en- and em-dashes as ligatures
\family default
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 3ed193f..768ac51 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -17913,7 +17913,9 @@ Whether line breaks around dashes are allowed depends
on the use case and
\begin_layout Itemize
\lang english
-No line breaks are allowed in ranges of values like A–Z or 1975–1982.
+In English, line breaks are generally allowed after the dash in ranges of
+ values such as 1975–1982, but no line break should occur if only a single
+ character follows the dash (as in A–Z).
\end_layout
\begin_layout Itemize
@@ -17933,86 +17935,66 @@ In French and Spanish, dashes around parenthetical
statements are treated
\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 can be prevented with protected spaces.
-\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
-
+In \SpecialChar LyX
+, line breaks after en-dashes and em-dashes are only allowed (without
+ manual intervention), if the option
\family sans
Document\SpecialChar menuseparator
-
-\lang english
Settings\SpecialChar menuseparator
Fonts\SpecialChar menuseparator
-Output en- and em-dashes as ligatures.
-
+Output en- and em-dashes as ligatures
\family default
-This forces the output of dashes as
-\begin_inset Quotes cld
+ is selected (this is the default in \SpecialChar LyX
+ 2.3).
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+In this case, the dashes are output as
+\begin_inset Quotes eld
\end_inset
--
-\begin_inset Quotes crd
+\begin_inset Quotes erd
\end_inset
and
-\begin_inset Quotes cld
+\begin_inset Quotes eld
\end_inset
---
-\begin_inset Quotes crd
+\begin_inset Quotes erd
\end_inset
- when exporting to \SpecialChar LaTeX
+, respectively, when exporting to \SpecialChar LaTeX
.
The \SpecialChar TeX
font ligature mechanism converts them to dash characters followed
by an optional line break.
\end_layout
+\end_inset
+
+
+\end_layout
+
\begin_layout Standard
\lang english
-Caution:
+Please note:
\end_layout
\begin_layout Enumerate
\lang english
This results in optional line breaks after
-\series bold
+\emph on
all
-\series default
- en and em dashes.
- Incorrect line breaks must be prevented by wrapping in a makebox
+\emph default
+ en- and em-dashes.
+ Unwanted line breaks must be prevented by wrapping in a makebox
\lang french
\begin_inset Foot
@@ -18032,9 +18014,9 @@ Objets insérés
\end_inset
-
+
\lang english
-or preceding with
+, using protected spaces or preceding with
\series bold
\backslash
@@ -18075,7 +18057,7 @@ status open
\begin_layout Plain Layout
\lang english
-369–378
+368–9
\end_layout
\end_inset
@@ -18084,36 +18066,34 @@ status open
\end_layout
\begin_layout Itemize
-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 english
+With spaced en dashes
+\begin_inset space ~
+\end_inset
+
+– common e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+ in British English and generally recommended by
+\emph on
+The Elements of Typographic Style
+\emph default
+
\begin_inset space ~
\end_inset
-même
+– line breaks should not occur before the dash.
\end_layout
+\begin_layout Itemize
+Les incises –
+\begin_inset space ~
\end_inset
- si tout le monde ne les aime pas
+même si tout le monde ne les aime pas
\begin_inset space ~
\end_inset
@@ -18219,7 +18199,36 @@ Hyphenation is suppressed in words adjacent to hyphens
and ligature dashes.
\begin_layout Standard
\lang english
-Since \SpecialChar LyX
+If the option
+\family sans
+Document\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
+Fonts\SpecialChar menuseparator
+Output en- and em-dashes as ligatures
+\family default
+ has not been selected, you can insert optional line breaks via the menu
+
+\family sans
+Insert\SpecialChar menuseparator
+Formatting\SpecialChar menuseparator
+Optional line break
+\family default
+:
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+Em-dashes without spaces—\SpecialChar allowbreak
+as common in American English—\SpecialChar allowbreak
+should be broken
+ after the dash.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+As of \SpecialChar LyX
\begin_inset space ~
\end_inset
@@ -18251,7 +18260,7 @@ Up to \SpecialChar LyX
\begin_inset space ~
\end_inset
-2.3 provides the option
+2.3 provides the aforementioned option
\family sans
Output en- and em-dashes as ligatures
\family default
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 732bd12..ae3004a 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -14191,7 +14191,9 @@ Whether line breaks around dashes are allowed depends
on the use case and
\begin_layout Itemize
\lang english
-No line breaks are allowed in ranges of values like A–Z or 1975–1982.
+In English, line breaks are generally allowed after the dash in ranges of
+ values such as 1975–1982, but no line break should occur if only a single
+ character follows the dash (as in A–Z).
\end_layout
\begin_layout Itemize
@@ -14211,45 +14213,24 @@ In French and Spanish, dashes around parenthetical
statements are treated
\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 can be prevented with protected spaces.
-\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
+In \SpecialChar LyX
+, line breaks after en-dashes and em-dashes are only allowed (without
+ manual intervention), if the option
\family sans
Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator
Fonts\SpecialChar menuseparator
-Output en- and em-dashes as ligatures.
-
+Output en- and em-dashes as ligatures
\family default
-This forces the output of dashes as
+ is selected (this is the default in \SpecialChar LyX
+ 2.3).
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+In this case, the dashes are output as
\begin_inset Quotes eld
\end_inset
@@ -14265,28 +14246,33 @@ This forces the output of dashes as
\begin_inset Quotes erd
\end_inset
- when exporting to \SpecialChar LaTeX
+, respectively, when exporting to \SpecialChar LaTeX
.
The \SpecialChar TeX
font ligature mechanism converts them to dash characters followed
by an optional line break.
\end_layout
+\end_inset
+
+
+\end_layout
+
\begin_layout Standard
\lang english
-Caution:
+Please note:
\end_layout
\begin_layout Enumerate
\lang english
This results in optional line breaks after
-\series bold
+\emph on
all
-\series default
- en and em dashes.
- Incorrect line breaks must be prevented by wrapping in a makebox
+\emph default
+ en- and em-dashes.
+ Unwanted line breaks must be prevented by wrapping in a makebox
\begin_inset Foot
status collapsed
@@ -14310,7 +14296,7 @@ Objects
\end_inset
- or preceding with
+, using protected spaces or preceding with
\series bold
\backslash
@@ -14351,7 +14337,7 @@ status open
\begin_layout Plain Layout
\lang english
-369–378
+368–9
\end_layout
\end_inset
@@ -14361,39 +14347,35 @@ status open
\begin_layout Itemize
-\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
+\lang english
+With spaced en dashes
+\begin_inset space ~
+\end_inset
-\begin_layout Plain Layout
+– common e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+ in British English and generally recommended by
+\emph on
+The Elements of Typographic Style
+\emph default
-\lang french
-–
\begin_inset space ~
\end_inset
-même
+– line breaks should not occur before the dash.
\end_layout
+\begin_layout Itemize
+
+\lang french
+Les incises –
+\begin_inset space ~
\end_inset
- si tout le monde ne les aime pas
+même si tout le monde ne les aime pas
\begin_inset space ~
\end_inset
@@ -14499,7 +14481,36 @@ Hyphenation is suppressed in words adjacent to hyphens
and ligature dashes.
\begin_layout Standard
\lang english
-Since \SpecialChar LyX
+If the option
+\family sans
+Document\SpecialChar menuseparator
+Settings\SpecialChar menuseparator
+Fonts\SpecialChar menuseparator
+Output en- and em-dashes as ligatures
+\family default
+ has not been selected, you can insert optional line breaks via the menu
+
+\family sans
+Insert\SpecialChar menuseparator
+Formatting\SpecialChar menuseparator
+Optional line break
+\family default
+:
+\end_layout
+
+\begin_layout Itemize
+
+\lang english
+Em-dashes without spaces—\SpecialChar allowbreak
+as common in American English—\SpecialChar allowbreak
+should be broken
+ after the dash.
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+As of \SpecialChar LyX
\begin_inset space ~
\end_inset
@@ -14531,7 +14542,7 @@ Up to \SpecialChar LyX
\begin_inset space ~
\end_inset
-2.3 provides the option
+2.3 provides the aforementioned option
\family sans
Output en- and em-dashes as ligatures
\family default
