mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 05:16:21 +00:00
Revise dash documentation in the UserGuide (en and de).
This commit is contained in:
parent
1962b8bedb
commit
0f6af3da50
@ -140,11 +140,12 @@ enumitem
|
||||
\papercolumns 1
|
||||
\papersides 2
|
||||
\paperpagestyle default
|
||||
\tracking_changes false
|
||||
\tracking_changes true
|
||||
\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
|
||||
@ -12696,7 +12697,13 @@ status open
|
||||
Note:
|
||||
\series default
|
||||
In practice, some fonts might fail due to a legacy (non Unicode) font encoding,
|
||||
bad metrics, and other font deficiencies; so you might have to experiment.
|
||||
bad metrics,
|
||||
\change_deleted -1402925745 1506439424
|
||||
and
|
||||
\change_inserted -1402925745 1506439424
|
||||
or
|
||||
\change_unchanged
|
||||
other font deficiencies; so you might have to experiment.
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -16057,7 +16064,11 @@ Typography
|
||||
\end_layout
|
||||
|
||||
\begin_layout Subsection
|
||||
Hyphens, Dashes and Minus Signs
|
||||
Hyphens, Dashes
|
||||
\change_inserted -1402925745 1506496113
|
||||
,
|
||||
\change_unchanged
|
||||
and Minus Signs
|
||||
\begin_inset Index idx
|
||||
status collapsed
|
||||
|
||||
@ -16094,7 +16105,13 @@ In \SpecialChar LyX
|
||||
\begin_inset Quotes erd
|
||||
\end_inset
|
||||
|
||||
character comes in four variants: the
|
||||
|
||||
\change_deleted -1402925745 1506541644
|
||||
character
|
||||
\change_inserted -1402925745 1506541880
|
||||
symbol
|
||||
\change_unchanged
|
||||
comes in four variants: the
|
||||
\emph on
|
||||
hyphen
|
||||
\emph default
|
||||
@ -16157,7 +16174,13 @@ name
|
||||
\begin_inset Text
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_deleted -1402925745 1506545222
|
||||
output
|
||||
\change_inserted -1402925745 1506614773
|
||||
glyph
|
||||
\change_unchanged
|
||||
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
@ -16235,6 +16258,8 @@ en dash
|
||||
\begin_inset Text
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_deleted -1402925745 1506592215
|
||||
system key combination
|
||||
\begin_inset Foot
|
||||
status collapsed
|
||||
@ -16242,15 +16267,47 @@ status collapsed
|
||||
\begin_layout Plain Layout
|
||||
On Mac and Linux, the en dash is entered with
|
||||
\family sans
|
||||
Option-hyphen
|
||||
Opt
|
||||
\change_inserted -1402925745 1506589385
|
||||
+
|
||||
\begin_inset Quotes eld
|
||||
\end_inset
|
||||
|
||||
-
|
||||
\begin_inset Quotes erd
|
||||
\end_inset
|
||||
|
||||
|
||||
\change_deleted -1402925745 1506589369
|
||||
ion-hyphen
|
||||
\change_unchanged
|
||||
|
||||
\family default
|
||||
and the em dash with
|
||||
\family sans
|
||||
Shift-Option-hyphen
|
||||
Shift-Opt
|
||||
\change_inserted -1402925745 1506589416
|
||||
+
|
||||
\begin_inset Quotes erd
|
||||
\end_inset
|
||||
|
||||
-
|
||||
\begin_inset Quotes erd
|
||||
\end_inset
|
||||
|
||||
|
||||
\change_deleted -1402925745 1506589408
|
||||
ion-hyphen
|
||||
\change_unchanged
|
||||
|
||||
\family default
|
||||
(
|
||||
\family sans
|
||||
Option
|
||||
Opt
|
||||
\change_deleted -1402925745 1506589513
|
||||
ion
|
||||
\change_unchanged
|
||||
|
||||
\family default
|
||||
is the Mac label for the right
|
||||
\family sans
|
||||
@ -16280,12 +16337,28 @@ unicode-insert
|
||||
\end_inset
|
||||
|
||||
\SpecialChar LyX
|
||||
function with the Unicode code as argument (2013 for the em dash and 2014
|
||||
for the en dash).
|
||||
function with the Unicode code
|
||||
\change_inserted -1402925745 1506441959
|
||||
point
|
||||
\change_unchanged
|
||||
as argument (2013 for the em dash and 2014 for the en dash).
|
||||
\end_layout
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\change_inserted -1402925745 1506612124
|
||||
|
||||
\begin_inset CommandInset href
|
||||
LatexCommand href
|
||||
name "system key combination"
|
||||
target "https://en.wikipedia.org/wiki/Dash#Encoding.2C_substitution.2C_and_keyboard_shortcuts"
|
||||
literal "false"
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\change_unchanged
|
||||
or
|
||||
\begin_inset Quotes eld
|
||||
\end_inset
|
||||
@ -16323,7 +16396,22 @@ em dash
|
||||
\begin_inset Text
|
||||
|
||||
\begin_layout Plain Layout
|
||||
system key combination or
|
||||
|
||||
\change_deleted -1402925745 1506612094
|
||||
system key combination
|
||||
\change_inserted -1402925745 1506592246
|
||||
|
||||
\begin_inset CommandInset href
|
||||
LatexCommand href
|
||||
name "system key combination"
|
||||
target "https://en.wikipedia.org/wiki/Dash#Encoding_and_keyboard_shortcuts"
|
||||
literal "false"
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\change_unchanged
|
||||
or
|
||||
\begin_inset Quotes eld
|
||||
\end_inset
|
||||
|
||||
@ -16396,6 +16484,31 @@ minus sign
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
|
||||
\change_inserted -1402925745 1506592362
|
||||
Dashes can also be inserted with
|
||||
\family sans
|
||||
Insert\SpecialChar menuseparator
|
||||
Special
|
||||
\begin_inset space ~
|
||||
\end_inset
|
||||
|
||||
Character\SpecialChar menuseparator
|
||||
Symbols
|
||||
\family default
|
||||
or the
|
||||
\begin_inset Quotes eld
|
||||
\end_inset
|
||||
|
||||
unicode-insert
|
||||
\begin_inset Quotes erd
|
||||
\end_inset
|
||||
|
||||
\SpecialChar LyX
|
||||
function.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
Hyphen and dashes are distinct from the minus sign, which appears in math
|
||||
mode and has a length of its own.
|
||||
@ -16415,11 +16528,19 @@ hyphen
|
||||
\end_layout
|
||||
|
||||
\begin_layout Enumerate
|
||||
From A–Z; pages
|
||||
|
||||
\change_deleted -1402925745 1506519699
|
||||
From
|
||||
\change_unchanged
|
||||
A–Z; pages
|
||||
\begin_inset space ~
|
||||
\end_inset
|
||||
|
||||
369–378
|
||||
\change_inserted -1402925745 1506594369
|
||||
; Oh – there's a dash.
|
||||
\change_unchanged
|
||||
|
||||
\begin_inset space \hfill{}
|
||||
\end_inset
|
||||
|
||||
@ -16431,6 +16552,8 @@ en dash
|
||||
\end_layout
|
||||
|
||||
\begin_layout Enumerate
|
||||
|
||||
\change_deleted -1402925745 1506594263
|
||||
Dashes indicate interruptions, performing a function related to – but subtly
|
||||
different from – parentheses.
|
||||
\begin_inset space \hfill{}
|
||||
@ -16445,7 +16568,11 @@ en dash
|
||||
|
||||
\begin_deeper
|
||||
\begin_layout Standard
|
||||
The em dash is used without spaces: Oh—there's a dash.
|
||||
|
||||
\change_deleted -1402925745 1506594328
|
||||
The em dash is used without spaces:
|
||||
\change_unchanged
|
||||
Oh—there's a dash.
|
||||
\begin_inset space \hfill{}
|
||||
\end_inset
|
||||
|
||||
@ -16497,8 +16624,13 @@ name "subsec:Dashes-and-line-breaks"
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
Whether line breaks before or after dashes are allowed depends on the use
|
||||
case and locale:
|
||||
Whether line breaks
|
||||
\change_deleted -1402925745 1506541984
|
||||
before or after
|
||||
\change_inserted -1402925745 1506541984
|
||||
around
|
||||
\change_unchanged
|
||||
dashes are allowed depends on the use case and locale:
|
||||
\end_layout
|
||||
|
||||
\begin_layout Itemize
|
||||
@ -16506,13 +16638,32 @@ No line breaks are allowed in ranges of values like A–Z or 1975–1982.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Itemize
|
||||
In English, lines may break after dashes used to set off parenthetical statement
|
||||
s.
|
||||
In English,
|
||||
\change_deleted -1402925745 1506542010
|
||||
lines may break after
|
||||
\change_unchanged
|
||||
dashes used to set off parenthetical statements
|
||||
\change_inserted -1402925745 1506547201
|
||||
should not start a new line
|
||||
\change_unchanged
|
||||
.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Itemize
|
||||
In French and Spanish, dashes around parenthetical statements are treated
|
||||
similar to quote signs and line breaks are not allowed on the left side.
|
||||
similar to
|
||||
\change_deleted -1402925745 1506542045
|
||||
quote signs and
|
||||
\change_inserted -1402925745 1506614820
|
||||
brackets:
|
||||
\change_unchanged
|
||||
line breaks are not allowed on the
|
||||
\change_deleted -1402925745 1506542045
|
||||
left
|
||||
\change_inserted -1402925745 1506436627
|
||||
inner
|
||||
\change_unchanged
|
||||
side.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
@ -16524,7 +16675,15 @@ When using spaced en dashes
|
||||
\begin_inset space ~
|
||||
\end_inset
|
||||
|
||||
- line breaks before the dash with protected spaces are not allowed.
|
||||
- line breaks before the dash
|
||||
\change_inserted -1402925745 1506432533
|
||||
can be prevented
|
||||
\change_unchanged
|
||||
with protected spaces
|
||||
\change_deleted -1402925745 1506432538
|
||||
are not allowed
|
||||
\change_unchanged
|
||||
.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
@ -16574,7 +16733,13 @@ This forces the output of dashes as
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
Subtleties:
|
||||
|
||||
\change_deleted -1402925745 1506436929
|
||||
Subtleties
|
||||
\change_inserted -1402925745 1506436930
|
||||
Caution
|
||||
\change_unchanged
|
||||
:
|
||||
\end_layout
|
||||
|
||||
\begin_layout Enumerate
|
||||
@ -16612,7 +16777,12 @@ Objects
|
||||
nobreakdash
|
||||
\series default
|
||||
in \SpecialChar TeX
|
||||
code:
|
||||
code
|
||||
\change_inserted -1402925745 1506595187
|
||||
.
|
||||
Examples
|
||||
\change_unchanged
|
||||
:
|
||||
\end_layout
|
||||
|
||||
\begin_deeper
|
||||
@ -16726,10 +16896,48 @@ An incorrect line break is easily overlooked because
|
||||
\begin_layout Enumerate
|
||||
The setting is ignored for documents using non-\SpecialChar TeX
|
||||
fonts.
|
||||
\change_inserted -1402925745 1506594733
|
||||
|
||||
\lang ngerman
|
||||
|
||||
\begin_inset Foot
|
||||
status collapsed
|
||||
|
||||
\begin_layout Plain Layout
|
||||
|
||||
\change_inserted -1402925745 1506594830
|
||||
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
|
||||
|
||||
|
||||
\change_unchanged
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_deeper
|
||||
\begin_layout Standard
|
||||
|
||||
\change_deleted -1402925745 1506594722
|
||||
Xe\SpecialChar TeX
|
||||
provides the
|
||||
\series bold
|
||||
@ -16749,6 +16957,8 @@ XeTeXdashbreakstate
|
||||
XeTeXdashbreakstate=1
|
||||
\series default
|
||||
causes literal dashes to behave like ligature dashes.
|
||||
\change_unchanged
|
||||
|
||||
\end_layout
|
||||
|
||||
\end_deeper
|
||||
@ -16773,17 +16983,33 @@ Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Standard
|
||||
In \SpecialChar LyX
|
||||
|
||||
\change_deleted -1402925745 1506433667
|
||||
In
|
||||
\change_inserted -1402925745 1506433670
|
||||
Since
|
||||
\change_unchanged
|
||||
\SpecialChar LyX
|
||||
|
||||
\begin_inset space ~
|
||||
\end_inset
|
||||
|
||||
2.2 -- and --- were in \SpecialChar LyX
|
||||
2.2
|
||||
\change_inserted -1402925745 1506433674
|
||||
,
|
||||
\change_unchanged
|
||||
-- and ---
|
||||
\change_deleted -1402925745 1506433728
|
||||
were in \SpecialChar LyX
|
||||
|
||||
\begin_inset space ~
|
||||
\end_inset
|
||||
|
||||
2.3 output as -{}- and -{}-{}- to prevent ligation to dashes.
|
||||
2.3 output
|
||||
\change_inserted -1402925745 1506433733
|
||||
are exported to LaTeX
|
||||
\change_unchanged
|
||||
as -{}- and -{}-{}- to prevent ligation to dashes.
|
||||
\begin_inset Foot
|
||||
status collapsed
|
||||
|
||||
@ -16793,22 +17019,65 @@ 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.
|
||||
2.1
|
||||
\change_inserted -1402925745 1506437858
|
||||
,
|
||||
\change_unchanged
|
||||
-- and ---
|
||||
\change_deleted -1402925745 1506437892
|
||||
in \SpecialChar LyX
|
||||
|
||||
\change_unchanged
|
||||
was output unchanged which led to different look in
|
||||
\change_deleted -1402925745 1506429846
|
||||
the within
|
||||
\change_unchanged
|
||||
\SpecialChar LyX
|
||||
, text export,
|
||||
\change_inserted -1402925745 1506429869
|
||||
and
|
||||
\change_unchanged
|
||||
HTML export
|
||||
\change_inserted -1402925745 1506429873
|
||||
vs.
|
||||
\change_deleted -1402925745 1506429876
|
||||
and the
|
||||
\change_unchanged
|
||||
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
|
||||
This le
|
||||
\change_deleted -1402925745 1506436302
|
||||
a
|
||||
\change_unchanged
|
||||
d to
|
||||
\change_deleted -1402925745 1506436261
|
||||
problems like
|
||||
\change_unchanged
|
||||
different line breaks
|
||||
\change_inserted -1402925745 1506436268
|
||||
in some documents
|
||||
\change_unchanged
|
||||
.
|
||||
|
||||
\change_deleted -1402925745 1506595735
|
||||
Since
|
||||
\change_unchanged
|
||||
\SpecialChar LyX
|
||||
|
||||
\begin_inset space ~
|
||||
\end_inset
|
||||
|
||||
2.3 there is the option
|
||||
2.3
|
||||
\change_deleted -1402925745 1506595740
|
||||
there is
|
||||
\change_inserted -1402925745 1506595742
|
||||
provides
|
||||
\change_unchanged
|
||||
the option
|
||||
\family sans
|
||||
Output en- and em-dashes as ligatures
|
||||
\family default
|
||||
@ -16828,7 +17097,11 @@ Fonts.
|
||||
\begin_inset Newline newline
|
||||
\end_inset
|
||||
|
||||
Note the following side-effects of the \SpecialChar LyX
|
||||
Note the following side-effects of the
|
||||
\change_inserted -1402925745 1506438339
|
||||
changes in
|
||||
\change_unchanged
|
||||
\SpecialChar LyX
|
||||
dash handling:
|
||||
\end_layout
|
||||
|
||||
@ -16838,8 +17111,32 @@ 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.
|
||||
2.2 documents, you must manually unselect
|
||||
\change_deleted -1402925745 1506547512
|
||||
the option
|
||||
\change_inserted -1402925745 1506547512
|
||||
|
||||
\family sans
|
||||
Output en- and em-dashes as ligatures
|
||||
\change_unchanged
|
||||
|
||||
\family default
|
||||
to ensure unchanged behavior.
|
||||
|
||||
\change_inserted -1402925745 1506596162
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Itemize
|
||||
|
||||
\change_inserted -1402925745 1506614938
|
||||
If you used both, literal and ligature dashes in pre-\SpecialChar LyX
|
||||
|
||||
\begin_inset space ~
|
||||
\end_inset
|
||||
|
||||
2.2 documents, you may need to enable or prevent individual line breaks as
|
||||
shown above to restore the correct line breaking behaviour.
|
||||
\end_layout
|
||||
|
||||
\begin_layout Itemize
|
||||
@ -16857,7 +17154,13 @@ Zero-width space (ZWSP) characters in older \SpecialChar LyX
|
||||
\begin_inset space ~
|
||||
\end_inset
|
||||
|
||||
2.3 or the optional line breaks will be lost!
|
||||
2.3 or the optional line breaks will be lost
|
||||
\change_deleted -1402925745 1506596503
|
||||
!
|
||||
\change_inserted -1402925745 1506596503
|
||||
.
|
||||
\change_unchanged
|
||||
|
||||
\end_layout
|
||||
|
||||
\begin_layout Subsection
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user