UserGuide.lyx: distribute recent changes

This commit is contained in:
Uwe Stöhr 2018-01-12 04:54:03 +01:00
parent 92955116b0
commit 058ee9ab00
6 changed files with 1094 additions and 1527 deletions

View File

@ -16,7 +16,8 @@ first step (not Japanese):
second step: second step:
- document title: Spanish only: new note - document title: Spanish only: new note
- sec. 3.7.3: new paragraph (not French) - sec. 3.4.6: new menu names
- sec. 3.7.3: new paragraph
- sec. 3.7.6: new feature to cross out text - sec. 3.7.6: new feature to cross out text
- sec. 4.6.2: Japanese only: untranslated image captions - sec. 4.6.2: Japanese only: untranslated image captions
- sec. 6.3.2: new sentence for a new option - sec. 6.3.2: new sentence for a new option
@ -27,6 +28,7 @@ second step:
- sec. 6.7.1: new sentence (not French) - sec. 6.7.1: new sentence (not French)
- sec. 6.7.3: new paragraph and changed sentence - sec. 6.7.3: new paragraph and changed sentence
- sec. A.3.6: changed sentence - sec. A.3.6: changed sentence
- sec. A.4.23: new menu entry
- sec. C.2.2.1: new paragraph (not French) - sec. C.2.2.1: new paragraph (not French)
- sec. D: new table row - sec. D: new table row
- nomenclature list: new note - nomenclature list: new note

File diff suppressed because it is too large Load Diff

View File

@ -8597,10 +8597,12 @@ Unformatiert
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
Dies ist Unformatiert. Dies ist Unformatiert.
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
Die folgenden 2 Zeilen sind leer: Die folgenden 2 Zeilen sind leer:
\end_layout \end_layout
@ -8613,6 +8615,7 @@ Die folgenden 2 Zeilen sind leer:
\end_layout \end_layout
\begin_layout Verbatim \begin_layout Verbatim
Fast alles ist in Unformatiert erlaubt:"%&$§#~'` Fast alles ist in Unformatiert erlaubt:"%&$§#~'`
\backslash \backslash
}][{| }][{|
@ -8636,6 +8639,7 @@ Unformatiert
\end_layout \end_layout
\begin_layout Verbatim* \begin_layout Verbatim*
Dies ist Unformatiert*. Dies ist Unformatiert*.
\end_layout \end_layout
@ -13546,8 +13550,11 @@ Bzw.
\end_inset \end_inset
aus, nicht in Form von Ligaturen (--, ---) (vgl. aus, statt in Form von Ligaturen (--, ---) (vgl.
Abschnitt \begin_inset space \space{}
\end_inset
Abschnitt
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -16468,14 +16475,33 @@ Minuszeichen
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
\begin_inset Box Frameless
position "t"
hor_pos "c"
has_inner_box 1
inner_pos "t"
use_parbox 0
use_makebox 0
width "100col%"
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 Tabular \begin_inset Tabular
<lyxtabular version="3" rows="5" columns="3"> <lyxtabular version="3" rows="5" columns="3">
<features tabularvalignment="middle"> <features tabularvalignment="middle">
<column alignment="left" valignment="top"> <column alignment="left" valignment="top" width="0pt">
<column alignment="left" valignment="top"> <column alignment="left" valignment="top">
<column alignment="left" valignment="top"> <column alignment="left" valignment="top">
<row interlinespace="3mm"> <row interlinespace="3mm">
<cell alignment="center" valignment="top" usebox="none"> <cell alignment="left" valignment="top" bottomline="true" usebox="none">
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@ -16484,7 +16510,7 @@ Name
\end_inset \end_inset
</cell> </cell>
<cell alignment="center" valignment="top" usebox="none"> <cell alignment="center" valignment="top" bottomline="true" usebox="none">
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@ -16493,7 +16519,7 @@ Aussehen
\end_inset \end_inset
</cell> </cell>
<cell alignment="center" valignment="top" usebox="none"> <cell alignment="center" valignment="top" bottomline="true" usebox="none">
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@ -16504,7 +16530,7 @@ Eingefügt mit
</cell> </cell>
</row> </row>
<row interlinespace="3mm"> <row interlinespace="3mm">
<cell alignment="center" valignment="top" usebox="none"> <cell alignment="left" valignment="top" usebox="none">
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@ -16545,7 +16571,7 @@ Viertelgeviertstrich
</cell> </cell>
</row> </row>
<row interlinespace="3mm"> <row interlinespace="3mm">
<cell alignment="center" valignment="top" usebox="none"> <cell alignment="left" valignment="top" usebox="none">
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@ -16590,7 +16616,7 @@ literal "false"
</cell> </cell>
</row> </row>
<row interlinespace="3mm"> <row interlinespace="3mm">
<cell alignment="center" valignment="top" usebox="none"> <cell alignment="left" valignment="top" usebox="none">
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@ -16635,7 +16661,7 @@ literal "false"
</cell> </cell>
</row> </row>
<row> <row>
<cell alignment="center" valignment="top" usebox="none"> <cell alignment="left" valignment="top" usebox="none">
\begin_inset Text \begin_inset Text
\begin_layout Plain Layout \begin_layout Plain Layout
@ -16682,6 +16708,11 @@ Minuszeichen
\end_inset \end_inset
\end_layout
\end_inset
\begin_inset VSpace medskip \begin_inset VSpace medskip
\end_inset \end_inset
@ -17018,13 +17049,13 @@ Objekte
\end_inset \end_inset
oder oder
\family typewriter \series bold
\backslash \backslash
nobreakdash nobreakdash
\family default \series default
(als \SpecialChar TeX als \SpecialChar TeX
-Code) vor den Strich schreibt. -Code vor den Strich schreibt.
Beispiele: Beispiele:
\end_layout \end_layout
@ -17185,8 +17216,25 @@ n verhindern
\begin_layout Enumerate \begin_layout Enumerate
Zeilenumbrüche sind weiterhin erlaubt, wenn auf den Strich ein Leerzeichen Zeilenumbrüche sind weiterhin erlaubt, wenn auf den Strich ein Leerzeichen
folgt. folgt.
Beispiel:
\end_layout \end_layout
\begin_deeper
\begin_layout Itemize
\lang french
Les incises
\begin_inset space ~
\end_inset
même si tout le monde ne les aime pas
\begin_inset space ~
\end_inset
sont très utiles.
\end_layout
\end_deeper
\begin_layout Enumerate \begin_layout Enumerate
\SpecialChar LaTeX \SpecialChar LaTeX
trennt mit dieser Option auch Wörter unmittelbar vor einem Halbgeviert- trennt mit dieser Option auch Wörter unmittelbar vor einem Halbgeviert-
@ -38863,7 +38911,7 @@ reference "sec:Randnotizen"
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
Neue Umgebung (oberhalb/unterhalb) Separierte Umgebung (oberhalb/unterhalb)
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard

View File

@ -140,12 +140,11 @@ enumitem
\papercolumns 1 \papercolumns 1
\papersides 2 \papersides 2
\paperpagestyle default \paperpagestyle default
\tracking_changes true \tracking_changes false
\output_changes false \output_changes false
\html_math_output 0 \html_math_output 0
\html_css_as_file 0 \html_css_as_file 0
\html_be_strict true \html_be_strict true
\author -712698321 "Jürgen Spitzmüller"
\end_header \end_header
\begin_body \begin_body
@ -10786,55 +10785,30 @@ enumeración
Para dividir una lista existente en dos, pon el cursor al final de un ítem Para dividir una lista existente en dos, pon el cursor al final de un ítem
de la lista y usa el menú de la lista y usa el menú
\family sans \family sans
Editar\SpecialChar menuseparator Insertar\SpecialChar menuseparator
Iniciar nuevo entorno
\family default
.
Se inserta un separador simple (una línea roja en \SpecialChar LyX
) y a continuación la
nueva lista.
El menú
\family sans
Editar\SpecialChar menuseparator
Iniciar nuevo entorno padre
\family default
solo aparece si el ítem está anidado.
No solo separa la lista, sino que también crea un entorno nuevo sin anidar.
\change_inserted -712698321 1514711343
\lang ngerman
\begin_inset Note Note
status open
\begin_layout Plain Layout
\change_inserted -712698321 1514711343
\lang english \lang english
NEW: To split an existing list into two lists, set the cursor at the end
of a list item and use the menu
\family sans
Insert\SpecialChar menuseparator
Separated <Name> Above Separated <Name> Above
\family default \family default
or \lang spanish
o
\family sans \family sans
Insert\SpecialChar menuseparator Insertar\SpecialChar menuseparator
\lang english
Separated <Name> Below Separated <Name> Below
\family default \family default
\lang spanish
. .
This inserts a plain separator (red line in \SpecialChar LyX Se inserta un separador simple (una línea roja en \SpecialChar LyX
) and before or behind it the ) y
new list. \lang english
Inside nested environments, it is also possible to split the outer environment. before or behind
\end_layout \lang spanish
la nueva lista.
\end_inset
\change_unchanged
\lang english
Inside nested environments, it is also possible to split the outer environment.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -13679,13 +13653,44 @@ status collapsed
\end_inset \end_inset
. .
La opción \end_layout
\family sans
Salir en-guiones y &em-guiones como ligaduras \begin_layout Standard
\family default
\lang english \lang english
outputs en- and em-dashes as ligatures (--, ---) instead of a sigle character. The option
\family sans
Disallow line breaks after dashes
\family default
outputs en- and em-dashes as literal characters
\begin_inset Foot
status collapsed
\begin_layout Plain Layout
\lang english
Or \SpecialChar LaTeX
macro, if the literal character is not supported by the \SpecialChar LaTeX
input encoding.
\end_layout
\end_inset
instead of ligatures (--, ---) (see 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
).
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -16745,28 +16750,10 @@ Alt
\family default \family default
\family sans \family sans
/ AltGr
\family default \family default
key). key).
Alternatively, dashes can be inserted with
\family sans
\lang spanish
Insertar\SpecialChar menuseparator
Carácter especial\SpecialChar menuseparator
Símbolos
\family default
\lang english
or with the
\begin_inset Quotes eld
\end_inset
unicode-insert
\begin_inset Quotes erd
\end_inset
\SpecialChar LyX
function with the Unicode code point as argument (2013 for the em dash
and 2014 for the en dash).
\end_layout \end_layout
\end_inset \end_inset
@ -16877,16 +16864,13 @@ Special
Character\SpecialChar menuseparator Character\SpecialChar menuseparator
Symbols Symbols
\family default \family default
or the or using the
\begin_inset Quotes eld \family typewriter
\end_inset
unicode-insert unicode-insert
\begin_inset Quotes erd \family default
\end_inset
\SpecialChar LyX \SpecialChar LyX
function. function with the Unicode code point as argument (2013 for the em dash
and 2014 for the en dash).
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -16920,7 +16904,7 @@ guión
\end_layout \end_layout
\begin_layout Enumerate \begin_layout Enumerate
De AZ; paginas AZ; paginas
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -16994,15 +16978,19 @@ name "subsec:Dashes-and-line-breaks"
\begin_layout Standard \begin_layout Standard
\lang english \lang english
Whether line breaks at dashes are allowed depends on the use case and locale: Whether line breaks before or after dashes are allowed depends on the use
case and locale, e.
\begin_inset space \thinspace{}
\end_inset
g.:
\end_layout \end_layout
\begin_layout Itemize \begin_layout Itemize
\lang english \lang english
In English, line breaks are generally allowed after the dash in ranges of In English, line breaks are generally allowed after the dash, but no line
values such as 19751982, but no line break should occur if only a single break should occur if only a single character follows the dash (as in AZ).
character follows the dash (as in AZ).
\end_layout \end_layout
\begin_layout Itemize \begin_layout Itemize
@ -17022,22 +17010,43 @@ In French and Spanish, dashes around parenthetical statements are treated
\begin_layout Standard \begin_layout Standard
\lang english \lang english
The dashes that are output by \SpecialChar LyX By default, dashes are output by \SpecialChar LyX
to \SpecialChar LaTeX to \SpecialChar LaTeX
by default generally allow for line breaks as
after en-dashes and em-dashes. \begin_inset Quotes eld
\end_layout \end_inset
\begin_layout Standard ligature dashes
\begin_inset Quotes erd
\end_inset
\lang english (-- and ---).
Please note: \SpecialChar LaTeX
allows line breaks after hyphens, en-dashes and em-dashes.
\end_layout \end_layout
\begin_layout Enumerate \begin_layout Enumerate
\lang english \lang english
Unwanted line breaks can be prevented by wrapping in a makebox Line breaks before spaced en dashes
\begin_inset space ~
\end_inset
common in British English and generally recommended by
\emph on
The Elements of Typographic Style
\emph default
\begin_inset space ~
\end_inset
can be prevented using protected spaces.
\end_layout
\begin_layout Enumerate
\lang english
Unwanted line breaks after dashes can be prevented by wrapping in a makebox
\lang spanish \lang spanish
\begin_inset Foot \begin_inset Foot
@ -17059,7 +17068,7 @@ Objetos insertados
\lang english \lang english
, using protected spaces or preceding with or preceding with
\series bold \series bold
\backslash \backslash
@ -17100,7 +17109,7 @@ status open
\begin_layout Plain Layout \begin_layout Plain Layout
\lang english \lang english
3689 3639
\end_layout \end_layout
\end_inset \end_inset
@ -17110,35 +17119,39 @@ status open
\begin_layout Itemize \begin_layout Itemize
\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
line breaks should not occur before the dash.
\end_layout
\begin_layout Itemize
\lang french \lang french
Les incises 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 ~ \begin_inset space ~
\end_inset \end_inset
même si tout le monde ne les aime pas même
\end_layout
\end_inset
si tout le monde ne les aime pas
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -17162,6 +17175,7 @@ nobreakdash
—un inciso con rayas— se escribe así. —un inciso con rayas— se escribe así.
\end_layout \end_layout
\end_deeper
\begin_layout Standard \begin_layout Standard
\lang english \lang english
@ -17177,15 +17191,6 @@ An incorrect line break is easily overlooked because
log. log.
\end_layout \end_layout
\end_deeper
\begin_layout Enumerate
\lang english
The default dashes output to \SpecialChar LaTeX
disable hyphenation in words adjacent to hyphens
and ligature dashes.
\end_layout
\begin_layout Standard \begin_layout Standard
\lang english \lang english
@ -17197,12 +17202,43 @@ Settings\SpecialChar menuseparator
Fonts\SpecialChar menuseparator Fonts\SpecialChar menuseparator
Disallow line breaks after dashes Disallow line breaks after dashes
\family default \family default
. :
In this case optional line breaks after individual \end_layout
\family sans
dashes \begin_layout Enumerate
\family default
can be re-allowed via the menu \lang english
Line breaks are still allowed after spaced dashes.
They can be prevented using protected spaces (without need for a makebox
or \SpecialChar TeX
code).
Example:
\end_layout
\begin_deeper
\begin_layout Itemize
\lang french
Les incises
\begin_inset space ~
\end_inset
même si tout le monde ne les aime pas
\begin_inset space ~
\end_inset
sont très utiles.
\end_layout
\end_deeper
\begin_layout Enumerate
\lang english
Line breaks after unspaced dashes can be allowed via the menu
\begin_inset Newline newline
\end_inset
\family sans \family sans
Insert\SpecialChar menuseparator Insert\SpecialChar menuseparator
Formatting\SpecialChar menuseparator Formatting\SpecialChar menuseparator
@ -17211,141 +17247,197 @@ Optional line break
: :
\end_layout \end_layout
\begin_deeper
\begin_layout Itemize \begin_layout Itemize
\lang english \lang english
Em-dashes without spaces—\SpecialChar allowbreak Em-dashes without spaces—\SpecialChar allowbreak
as common in American English—\SpecialChar allowbreak common in American English—\SpecialChar allowbreak
should be broken should be followed by
after the dash. a line break opportunity.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
\lang english \lang english
Note: Up to \SpecialChar LyX This also allows hyphenation of the word following the dash (see section
\begin_inset space ~
\end_inset
\lang spanish
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:División-con-guión"
\end_inset
\lang english
).
\end_layout
\end_deeper
\begin_layout Enumerate
\lang english
With this setting, \SpecialChar LaTeX
hyphenates words also if immediately followed by em
or en dashes (see section
\begin_inset space ~
\end_inset
\lang spanish
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:División-con-guión"
\end_inset
\lang english
).
\end_layout
\begin_layout Subsubsection
\lang english
Changes and backwards compatibility
\end_layout
\begin_layout Standard
\lang english
Up to \SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.1, you could insert en-dashes and em-dashes as -- and ---, respectively; 2.1, consecutive hyphen characters (-- and ---) in the LyX source were merged
they were automatically merged to proper (breakable) dashes in the output, to en or em dashes by LaTeX.
but kept as consecutive hyphen characters in the LyX document. These
If you inserted literal dash characters, however, they were output to \SpecialChar LaTeX \begin_inset Quotes eld
\end_inset
ligature dashes
\begin_inset Quotes erd
\end_inset
retain the line-break properties of hyphens while literal dash characters
are regarded by \SpecialChar LaTeX
as as
\emph on \emph on
non-breakable non-breakable
\emph default \emph default
dashes (this was actually rather by accident than intentionally, but some .
used these two forms of dashes deliberately). \end_layout
As of \SpecialChar LyX
\begin_layout Standard
\lang english
Since \SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.2, things work differently: consecutive hyphens are merged to dashes immediatel 2.2, consecutive hyphens in the LyX source are exported to \SpecialChar LaTeX
y in the input. in a way that
prevents ligation to dashes.
\begin_inset Quotes eld
\end_inset
Ligature dashes
\begin_inset Quotes erd
\end_inset
in documents from earlier versions are converted to literal dash characters
(except in
\family typewriter
typewriter
\family default
font); typed in consecutive hyphens are merged to dash characters immediately
after the input (unless the current text font is
\family typewriter
type
\family default
writer).
\begin_inset Foot \begin_inset Foot
status collapsed status open
\begin_layout Plain Layout \begin_layout Plain Layout
\lang english \lang english
The behavior was changed since it led to different look in \SpecialChar LyX The behavior was changed since
, text export, \begin_inset Quotes eld
HTML export and the PDF export. \end_inset
lyx --help
\begin_inset Quotes erd
\end_inset
became
\begin_inset Quotes eld
\end_inset
lyx help
\begin_inset Quotes erd
\end_inset
in PDF, Postscript, and DVI output.
An unintended consequence of these changes was that all dashes were output
as non-breakable dashes.
This also resulted in changed line breaks in some older documents.
\end_layout \end_layout
\end_inset \end_inset
If you copy consecutive hyphens, by contrast, they are output as consecutive
hyphen characters. \end_layout
An unintended consequence of this change was that all dashes now were output
as non-breakable dashes. \begin_layout Standard
Since furthermore, in order to maintain the output, occurrences of consecutive
hyphens in documents that were saved by \SpecialChar LyX \lang english
\SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.1 or earlier versions, were converted to literal en- and em-dash characters, 2.3 outputs
respectively, these were output to \SpecialChar LaTeX
in \SpecialChar LyX
\begin_inset space ~
\end_inset
2.2 as
\emph on
non-breakable
\emph default
dashes as well.
An obvious drawback of all this was that it resulted in different line
breaks in some documents.
\SpecialChar LyX
\begin_inset space ~
\end_inset
2.3, by contrast and as outlined above, outputs
\emph on \emph on
breakable breakable
\emph default \emph default
dashes by default, so if you load a document saved previous to LyX 2.2, dashes by default.
you should get the identical output with LyX 2.3 for the dashes inserted When opening documents edited with \SpecialChar LyX
with -- and ---.
Furthermore, \SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.3 provides the aforementioned option 2.2 or earlier and containing literal dash characters not followed by whitespace,
\family sans the setting
Disallow line breaks after dashes
\family default
in the menu
\family sans \family sans
Document\SpecialChar menuseparator Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator Settings\SpecialChar menuseparator
Fonts. Fonts\SpecialChar menuseparator
\family default
It is off by default but selected when opening documents edited with \SpecialChar LyX
\begin_inset space ~
\end_inset
2.2 in order to maintain line breaking between \SpecialChar LyX
2.2 and 2.3 (so these document
have non-breakable dashes).
\begin_inset Newline newline
\end_inset
Note the following side-effects of the changes in \SpecialChar LyX
's dash handling:
\end_layout
\begin_layout Itemize
\lang english
If you used only literal em- and en dashes in pre-\SpecialChar LyX
\begin_inset space ~
\end_inset
2.2 documents, you must manually select
\family sans
Disallow line breaks after dashes Disallow line breaks after dashes
\family default \family default
to ensure unchanged behavior. is active to prevent changes to the line breaks.
\series bold
Warning:
\series default
If you used both literal and
\begin_inset Quotes eld
\end_inset
\end_layout ligature
\begin_inset Quotes erd
\end_inset
\begin_layout Itemize dashes in pre-\SpecialChar LyX
\lang english
If you used both literal and --/--- dashes in pre-\SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -17354,26 +17446,6 @@ If you used both literal and --/--- dashes in pre-\SpecialChar LyX
shown above to restore the correct line breaking behavior. shown above to restore the correct line breaking behavior.
\end_layout \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_layout Subsection
División de palabras con guión División de palabras con guión
\begin_inset Index idx \begin_inset Index idx
@ -17415,6 +17487,14 @@ status collapsed
\end_inset \end_inset
, siguiendo las normas del idioma del documento. , siguiendo las normas del idioma del documento.
\lang english
\SpecialChar LaTeX
does not hyphenate text in the
\family sans
typewriter
\family default
font and words immediately preceded or followed by hyphens or dashes.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -38777,33 +38857,6 @@ reference "subsec:Profundidad-de-numeración"
. .
\end_layout \end_layout
\begin_layout Subsection
\change_deleted -712698321 1514711508
Iniciar nuevo entorno, Iniciar nuevo entorno padre
\end_layout
\begin_layout Standard
\change_deleted -712698321 1514711508
Estos menús sólo están visibles si es posible tener dos entornos consecutivos
del mismo tipo.
Véase la sección
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:Anidación-separada"
\end_inset
para la descripción.
\change_unchanged
\end_layout
\begin_layout Section \begin_layout Section
El menú Ver El menú Ver
\begin_inset Index idx \begin_inset Index idx
@ -40221,33 +40274,16 @@ reference "sec:Notas-al-margen"
\end_inset \end_inset
. .
\change_inserted -712698321 1514711534
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
\change_inserted -712698321 1514711561 \family sans
Iniciar nuevo entorno \lang english
\begin_inset Note Note Separate <Name> (Above/Below)
status open
\begin_layout Plain Layout
\change_inserted -712698321 1514711565
above/below
\change_unchanged
\end_layout
\end_inset
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
\change_inserted -712698321 1514711537
Estos menús sólo están visibles si es posible tener dos entornos consecutivos Estos menús sólo están visibles si es posible tener dos entornos consecutivos
del mismo tipo. del mismo tipo.
Véase la sección Véase la sección
@ -40262,8 +40298,6 @@ reference "subsec:Anidación-separada"
\end_inset \end_inset
para la descripción. para la descripción.
\change_unchanged
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection

View File

@ -155,12 +155,11 @@ logicalmkup
\papercolumns 1 \papercolumns 1
\papersides 2 \papersides 2
\paperpagestyle default \paperpagestyle default
\tracking_changes true \tracking_changes false
\output_changes false \output_changes false
\html_math_output 0 \html_math_output 0
\html_css_as_file 0 \html_css_as_file 0
\html_be_strict false \html_be_strict false
\author -712698321 "Jürgen Spitzmüller"
\end_header \end_header
\begin_body \begin_body
@ -11416,56 +11415,27 @@ Pour diviser une liste existante en deux listes, mettez le curseur à la
fin du dernier élément de le première liste désirée et utilisez le menu fin du dernier élément de le première liste désirée et utilisez le menu
\family sans \family sans
Édition\SpecialChar menuseparator Insertion\SpecialChar menuseparator
Début de nouvel environnement
\family default
.
Ceci insère un séparateur ordinaire (une ligne rouge dans la fenêtre \SpecialChar LyX
),
la nouvelle liste est après.
Le menu
\family sans
Édition\SpecialChar menuseparator
Début de nouvel environnement parent
\family default
n'apparaît que si l'élément est encapsulé.
Il ne fait pas que mettre une séparation dans la liste, il en en crée une
nouvelle en dehors de l'encapsulation.
\change_inserted -712698321 1514711363
\lang ngerman
\begin_inset Note Note
status open
\begin_layout Plain Layout
\change_inserted -712698321 1514711363
\lang english \lang english
NEW: To split an existing list into two lists, set the cursor at the end
of a list item and use the menu
\family sans
Insert\SpecialChar menuseparator
Separated <Name> Above Separated <Name> Above
\family default \family default
or \lang french
ou
\family sans \family sans
Insert\SpecialChar menuseparator Insertion\SpecialChar menuseparator
\lang english
Separated <Name> Below Separated <Name> Below
\family default \family default
\lang french
. .
This inserts a plain separator (red line in \SpecialChar LyX Ceci insère un séparateur ordinaire (une ligne rouge dans la fenêtre \SpecialChar LyX
) and before or behind it the )
new list. et la nouvelle liste avant ou après.
Inside nested environments, it is also possible to split the outer environment.
\end_layout
\end_inset
\change_unchanged
\lang english
Inside nested environments, it is also possible to split the outer environment.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -14454,18 +14424,44 @@ Paquetages \SpecialChar LaTeX
\end_inset \end_inset
. .
L'option \end_layout
\lang english
\begin_layout Standard
\family sans
\lang french
Exporter les tirets de longueur en et &em comme des ligatures
\family default
utiliser les ligatures -- et --- à la place
\lang english \lang english
of a sigle character The option
\lang french \family sans
pour les tirets de longueur en et em. Disallow line breaks after dashes
\family default
outputs en- and em-dashes as literal characters
\begin_inset Foot
status collapsed
\begin_layout Plain Layout
\lang english
Or \SpecialChar LaTeX
macro, if the literal character is not supported by the \SpecialChar LaTeX
input encoding.
\end_layout
\end_inset
instead of ligatures (--, ---) (see 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
).
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -17664,32 +17660,10 @@ Alt
\family default \family default
\family sans \family sans
/ AltGr
\family default \family default
key). key).
Alternatively, dashes can be inserted with
\family sans
\lang french
Insertion\SpecialChar menuseparator
Caractère
\begin_inset space ~
\end_inset
spécial\SpecialChar menuseparator
Symboles
\family default
\lang english
or with the
\begin_inset Quotes eld
\end_inset
unicode-insert
\begin_inset Quotes erd
\end_inset
\SpecialChar LyX
function with the Unicode code point as argument (2013 for the em dash
and 2014 for the en dash).
\end_layout \end_layout
\end_inset \end_inset
@ -17823,16 +17797,13 @@ Special
Character\SpecialChar menuseparator Character\SpecialChar menuseparator
Symbols Symbols
\family default \family default
or the or using the
\begin_inset Quotes eld \family typewriter
\end_inset
unicode-insert unicode-insert
\begin_inset Quotes erd \family default
\end_inset
\SpecialChar LyX \SpecialChar LyX
function. function with the Unicode code point as argument (2013 for the em dash
and 2014 for the en dash).
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -17927,15 +17898,19 @@ name "subsec:Dashes-and-line-breaks"
\begin_layout Standard \begin_layout Standard
\lang english \lang english
Whether line breaks at dashes are allowed depends on the use case and locale: Whether line breaks before or after dashes are allowed depends on the use
case and locale, e.
\begin_inset space \thinspace{}
\end_inset
g.:
\end_layout \end_layout
\begin_layout Itemize \begin_layout Itemize
\lang english \lang english
In English, line breaks are generally allowed after the dash in ranges of In English, line breaks are generally allowed after the dash, but no line
values such as 19751982, but no line break should occur if only a single break should occur if only a single character follows the dash (as in AZ).
character follows the dash (as in AZ).
\end_layout \end_layout
\begin_layout Itemize \begin_layout Itemize
@ -17955,22 +17930,43 @@ In French and Spanish, dashes around parenthetical statements are treated
\begin_layout Standard \begin_layout Standard
\lang english \lang english
The dashes that are output by \SpecialChar LyX By default, dashes are output by \SpecialChar LyX
to \SpecialChar LaTeX to \SpecialChar LaTeX
by default generally allow for line breaks as
after en-dashes and em-dashes. \begin_inset Quotes eld
\end_layout \end_inset
\begin_layout Standard ligature dashes
\begin_inset Quotes erd
\end_inset
\lang english (-- and ---).
Please note: \SpecialChar LaTeX
allows line breaks after hyphens, en-dashes and em-dashes.
\end_layout \end_layout
\begin_layout Enumerate \begin_layout Enumerate
\lang english \lang english
Unwanted line breaks can be prevented by wrapping in a makebox Line breaks before spaced en dashes
\begin_inset space ~
\end_inset
common in British English and generally recommended by
\emph on
The Elements of Typographic Style
\emph default
\begin_inset space ~
\end_inset
can be prevented using protected spaces.
\end_layout
\begin_layout Enumerate
\lang english
Unwanted line breaks after dashes can be prevented by wrapping in a makebox
\lang french \lang french
\begin_inset Foot \begin_inset Foot
@ -17992,7 +17988,7 @@ Objets insérés
\lang english \lang english
, using protected spaces or preceding with or preceding with
\series bold \series bold
\backslash \backslash
@ -18033,7 +18029,7 @@ status open
\begin_layout Plain Layout \begin_layout Plain Layout
\lang english \lang english
3689 3639
\end_layout \end_layout
\end_inset \end_inset
@ -18042,34 +18038,36 @@ status open
\end_layout \end_layout
\begin_layout Itemize \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
\lang english \begin_layout Plain Layout
With spaced en dashes
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
common e. même
\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
line breaks should not occur before the dash.
\end_layout \end_layout
\begin_layout Itemize
Les incises
\begin_inset space ~
\end_inset \end_inset
même si tout le monde ne les aime pas si tout le monde ne les aime pas
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -18095,6 +18093,7 @@ nobreakdash
—un inciso con rayas— se escribe así. —un inciso con rayas— se escribe así.
\end_layout \end_layout
\end_deeper
\begin_layout Standard \begin_layout Standard
\lang english \lang english
@ -18110,15 +18109,6 @@ An incorrect line break is easily overlooked because
log. log.
\end_layout \end_layout
\end_deeper
\begin_layout Enumerate
\lang english
The default dashes output to \SpecialChar LaTeX
disable hyphenation in words adjacent to hyphens
and ligature dashes.
\end_layout
\begin_layout Standard \begin_layout Standard
\lang english \lang english
@ -18130,12 +18120,41 @@ Settings\SpecialChar menuseparator
Fonts\SpecialChar menuseparator Fonts\SpecialChar menuseparator
Disallow line breaks after dashes Disallow line breaks after dashes
\family default \family default
. :
In this case optional line breaks after individual \end_layout
\family sans
dashes \begin_layout Enumerate
\family default
can be re-allowed via the menu \lang english
Line breaks are still allowed after spaced dashes.
They can be prevented using protected spaces (without need for a makebox
or \SpecialChar TeX
code).
Example:
\end_layout
\begin_deeper
\begin_layout Itemize
Les incises
\begin_inset space ~
\end_inset
même si tout le monde ne les aime pas
\begin_inset space ~
\end_inset
sont très utiles.
\end_layout
\end_deeper
\begin_layout Enumerate
\lang english
Line breaks after unspaced dashes can be allowed via the menu
\begin_inset Newline newline
\end_inset
\family sans \family sans
Insert\SpecialChar menuseparator Insert\SpecialChar menuseparator
Formatting\SpecialChar menuseparator Formatting\SpecialChar menuseparator
@ -18144,141 +18163,197 @@ Optional line break
: :
\end_layout \end_layout
\begin_deeper
\begin_layout Itemize \begin_layout Itemize
\lang english \lang english
Em-dashes without spaces—\SpecialChar allowbreak Em-dashes without spaces—\SpecialChar allowbreak
as common in American English—\SpecialChar allowbreak common in American English—\SpecialChar allowbreak
should be broken should be followed by
after the dash. a line break opportunity.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
\lang english \lang english
Note: Up to \SpecialChar LyX This also allows hyphenation of the word following the dash (see section
\begin_inset space ~
\end_inset
\lang french
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:Césure"
\end_inset
\lang english
).
\end_layout
\end_deeper
\begin_layout Enumerate
\lang english
With this setting, \SpecialChar LaTeX
hyphenates words also if immediately followed by em
or en dashes (see section
\begin_inset space ~
\end_inset
\lang french
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:Césure"
\end_inset
\lang english
).
\end_layout
\begin_layout Subsubsection
\lang english
Changes and backwards compatibility
\end_layout
\begin_layout Standard
\lang english
Up to \SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.1, you could insert en-dashes and em-dashes as -- and ---, respectively; 2.1, consecutive hyphen characters (-- and ---) in the LyX source were merged
they were automatically merged to proper (breakable) dashes in the output, to en or em dashes by LaTeX.
but kept as consecutive hyphen characters in the LyX document. These
If you inserted literal dash characters, however, they were output to \SpecialChar LaTeX \begin_inset Quotes eld
\end_inset
ligature dashes
\begin_inset Quotes erd
\end_inset
retain the line-break properties of hyphens while literal dash characters
are regarded by \SpecialChar LaTeX
as as
\emph on \emph on
non-breakable non-breakable
\emph default \emph default
dashes (this was actually rather by accident than intentionally, but some .
used these two forms of dashes deliberately). \end_layout
As of \SpecialChar LyX
\begin_layout Standard
\lang english
Since \SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.2, things work differently: consecutive hyphens are merged to dashes immediatel 2.2, consecutive hyphens in the LyX source are exported to \SpecialChar LaTeX
y in the input. in a way that
prevents ligation to dashes.
\begin_inset Quotes eld
\end_inset
Ligature dashes
\begin_inset Quotes erd
\end_inset
in documents from earlier versions are converted to literal dash characters
(except in
\family typewriter
typewriter
\family default
font); typed in consecutive hyphens are merged to dash characters immediately
after the input (unless the current text font is
\family typewriter
type
\family default
writer).
\begin_inset Foot \begin_inset Foot
status collapsed status open
\begin_layout Plain Layout \begin_layout Plain Layout
\lang english \lang english
The behavior was changed since it led to different look in \SpecialChar LyX The behavior was changed since
, text export, \begin_inset Quotes eld
HTML export and the PDF export. \end_inset
lyx --help
\begin_inset Quotes erd
\end_inset
became
\begin_inset Quotes eld
\end_inset
lyx help
\begin_inset Quotes erd
\end_inset
in PDF, Postscript, and DVI output.
An unintended consequence of these changes was that all dashes were output
as non-breakable dashes.
This also resulted in changed line breaks in some older documents.
\end_layout \end_layout
\end_inset \end_inset
If you copy consecutive hyphens, by contrast, they are output as consecutive
hyphen characters. \end_layout
An unintended consequence of this change was that all dashes now were output
as non-breakable dashes. \begin_layout Standard
Since furthermore, in order to maintain the output, occurrences of consecutive
hyphens in documents that were saved by \SpecialChar LyX \lang english
\SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.1 or earlier versions, were converted to literal en- and em-dash characters, 2.3 outputs
respectively, these were output to \SpecialChar LaTeX
in \SpecialChar LyX
\begin_inset space ~
\end_inset
2.2 as
\emph on
non-breakable
\emph default
dashes as well.
An obvious drawback of all this was that it resulted in different line
breaks in some documents.
\SpecialChar LyX
\begin_inset space ~
\end_inset
2.3, by contrast and as outlined above, outputs
\emph on \emph on
breakable breakable
\emph default \emph default
dashes by default, so if you load a document saved previous to LyX 2.2, dashes by default.
you should get the identical output with LyX 2.3 for the dashes inserted When opening documents edited with \SpecialChar LyX
with -- and ---.
Furthermore, \SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.3 provides the aforementioned option 2.2 or earlier and containing literal dash characters not followed by whitespace,
\family sans the setting
Disallow line breaks after dashes
\family default
in the menu
\family sans \family sans
Document\SpecialChar menuseparator Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator Settings\SpecialChar menuseparator
Fonts. Fonts\SpecialChar menuseparator
\family default
It is off by default but selected when opening documents edited with \SpecialChar LyX
\begin_inset space ~
\end_inset
2.2 in order to maintain line breaking between \SpecialChar LyX
2.2 and 2.3 (so these document
have non-breakable dashes).
\begin_inset Newline newline
\end_inset
Note the following side-effects of the changes in \SpecialChar LyX
's dash handling:
\end_layout
\begin_layout Itemize
\lang english
If you used only literal em- and en dashes in pre-\SpecialChar LyX
\begin_inset space ~
\end_inset
2.2 documents, you must manually select
\family sans
Disallow line breaks after dashes Disallow line breaks after dashes
\family default \family default
to ensure unchanged behavior. is active to prevent changes to the line breaks.
\series bold
Warning:
\series default
If you used both literal and
\begin_inset Quotes eld
\end_inset
\end_layout ligature
\begin_inset Quotes erd
\end_inset
\begin_layout Itemize dashes in pre-\SpecialChar LyX
\lang english
If you used both literal and --/--- dashes in pre-\SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -18287,26 +18362,6 @@ If you used both literal and --/--- dashes in pre-\SpecialChar LyX
shown above to restore the correct line breaking behavior. shown above to restore the correct line breaking behavior.
\end_layout \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_layout Subsection
Césure Césure
\begin_inset Index idx \begin_inset Index idx
@ -18373,6 +18428,14 @@ Paramètres
\end_inset \end_inset
. .
\lang english
\SpecialChar LaTeX
does not hyphenate text in the
\family sans
typewriter
\family default
font and words immediately preceded or followed by hyphens or dashes.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -40018,33 +40081,6 @@ reference "subsec:Profondeur-section"
. .
\end_layout \end_layout
\begin_layout Subsection
\change_deleted -712698321 1514711582
Début de nouvel environnement/Début de nouvel environnement parent
\end_layout
\begin_layout Standard
\change_deleted -712698321 1514711582
Ces menus ne sont visibles que s'il est possible d'avoir deux environnements
consécutifs de même type.
Voir la section
\begin_inset space ~
\end_inset
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:Separate-Emboîtements"
\end_inset
pour une explication.
\change_unchanged
\end_layout
\begin_layout Section \begin_layout Section
Le menu Affichage Le menu Affichage
\begin_inset Index idx \begin_inset Index idx
@ -41545,33 +41581,16 @@ reference "sec:Notes_en_Marge"
\end_inset \end_inset
. .
\change_inserted -712698321 1514711591
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
\change_inserted -712698321 1514711598 \family sans
Début de nouvel environnement \lang english
\begin_inset Note Note Separate <Name> (Above/Below)
status open
\begin_layout Plain Layout
\change_inserted -712698321 1514711602
above/below
\change_unchanged
\end_layout
\end_inset
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
\change_inserted -712698321 1514711591
Ces menus ne sont visibles que s'il est possible d'avoir deux environnements Ces menus ne sont visibles que s'il est possible d'avoir deux environnements
consécutifs de même type. consécutifs de même type.
Voir la section Voir la section
@ -41586,8 +41605,6 @@ reference "subsec:Separate-Emboîtements"
\end_inset \end_inset
pour une explication. pour une explication.
\change_unchanged
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection

View File

@ -173,7 +173,6 @@ End
\html_math_output 0 \html_math_output 0
\html_css_as_file 0 \html_css_as_file 0
\html_be_strict true \html_be_strict true
\author -712698321 "Jürgen Spitzmüller"
\end_header \end_header
\begin_body \begin_body
@ -9227,31 +9226,7 @@ name "subsec:入れ子の分離"
\begin_layout Standard \begin_layout Standard
既存の箇条書きを2つの箇条書きに分けるにはカーソルを箇条書き項目の終わりに置いて 既存の箇条書きを2つの箇条書きに分けるにはカーソルを箇条書き項目の終わりに置いて
\family sans \family sans
編集\SpecialChar menuseparator
新たな環境を開始
\family default
メニューを選択します.すると,分離記号が挿入され(\SpecialChar LyX
中では赤線),その後から新規の箇条書きが始まります.また,
\family sans
編集\SpecialChar menuseparator
新たな親環境を開始
\family default
メニューは,項目が入れ子になっているときにのみ表示されます.これは,箇条書きを分離するだけでなく,入れ子から出たところに新しい箇条書きを作ります.
\change_inserted -712698321 1514711380
\lang ngerman
\begin_inset Note Note
status open
\begin_layout Plain Layout
\change_inserted -712698321 1514711380
\lang english \lang english
NEW: To split an existing list into two lists, set the cursor at the end
of a list item and use the menu
\family sans
Insert\SpecialChar menuseparator Insert\SpecialChar menuseparator
Separated <Name> Above Separated <Name> Above
\family default \family default
@ -9260,18 +9235,11 @@ Separated <Name> Above
Insert\SpecialChar menuseparator Insert\SpecialChar menuseparator
Separated <Name> Below Separated <Name> Below
\family default \family default
. \lang japanese
This inserts a plain separator (red line in \SpecialChar LyX .すると,分離記号が挿入され(\SpecialChar LyX
) and before or behind it the 中では赤線),その後から新規の箇条書きが始まります.
new list. \lang english
Inside nested environments, it is also possible to split the outer environment. Inside nested environments, it is also possible to split the outer environment.
\end_layout
\end_inset
\change_unchanged
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -11701,14 +11669,44 @@ latexはつけじ@\SpecialChar LaTeX
\end_inset \end_inset
\end_layout
\begin_layout Standard
\lang english \lang english
The option The option
\family sans \family sans
\lang japanese Disallow line breaks after dashes
ダッシュとemダッシュは合字で出力
\family default \family default
outputs en- and em-dashes as literal characters
\begin_inset Foot
status collapsed
\begin_layout Plain Layout
\lang english \lang english
outputs en- and em-dashes as ligatures (--, ---) instead of a sigle character. Or \SpecialChar LaTeX
macro, if the literal character is not supported by the \SpecialChar LaTeX
input encoding.
\end_layout
\end_inset
instead of ligatures (--, ---) (see 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
).
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -13980,29 +13978,10 @@ Alt
\family default \family default
\family sans \family sans
/ AltGr
\family default \family default
key). key).
Alternatively, dashes can be inserted with
\family sans
\lang japanese
挿入\SpecialChar menuseparator
特殊文字\SpecialChar menuseparator
記号
\family default
で挿入
\lang english
or with the
\begin_inset Quotes eld
\end_inset
unicode-insert
\begin_inset Quotes erd
\end_inset
\SpecialChar LyX
function with the Unicode code point as argument (2013 for the em dash
and 2014 for the en dash).
\end_layout \end_layout
\end_inset \end_inset
@ -14125,16 +14104,13 @@ Special
Character\SpecialChar menuseparator Character\SpecialChar menuseparator
Symbols Symbols
\family default \family default
or the or using the
\begin_inset Quotes eld \family typewriter
\end_inset
unicode-insert unicode-insert
\begin_inset Quotes erd \family default
\end_inset
\SpecialChar LyX \SpecialChar LyX
function. function with the Unicode code point as argument (2013 for the em dash
and 2014 for the en dash).
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -14154,7 +14130,7 @@ line- and page-breaks
\end_layout \end_layout
\begin_layout Enumerate \begin_layout Enumerate
From AZ; AZ;
\lang english \lang english
pages pages
\begin_inset space ~ \begin_inset space ~
@ -14219,15 +14195,19 @@ name "subsec:Dashes-and-line-breaks"
\begin_layout Standard \begin_layout Standard
\lang english \lang english
Whether line breaks at dashes are allowed depends on the use case and locale: Whether line breaks before or after dashes are allowed depends on the use
case and locale, e.
\begin_inset space \thinspace{}
\end_inset
g.:
\end_layout \end_layout
\begin_layout Itemize \begin_layout Itemize
\lang english \lang english
In English, line breaks are generally allowed after the dash in ranges of In English, line breaks are generally allowed after the dash, but no line
values such as 19751982, but no line break should occur if only a single break should occur if only a single character follows the dash (as in AZ).
character follows the dash (as in AZ).
\end_layout \end_layout
\begin_layout Itemize \begin_layout Itemize
@ -14247,22 +14227,43 @@ In French and Spanish, dashes around parenthetical statements are treated
\begin_layout Standard \begin_layout Standard
\lang english \lang english
The dashes that are output by \SpecialChar LyX By default, dashes are output by \SpecialChar LyX
to \SpecialChar LaTeX to \SpecialChar LaTeX
by default generally allow for line breaks as
after en-dashes and em-dashes. \begin_inset Quotes eld
\end_layout \end_inset
\begin_layout Standard ligature dashes
\begin_inset Quotes erd
\end_inset
\lang english (-- and ---).
Please note: \SpecialChar LaTeX
allows line breaks after hyphens, en-dashes and em-dashes.
\end_layout \end_layout
\begin_layout Enumerate \begin_layout Enumerate
\lang english \lang english
Unwanted line breaks can be prevented by wrapping in a makebox Line breaks before spaced en dashes
\begin_inset space ~
\end_inset
common in British English and generally recommended by
\emph on
The Elements of Typographic Style
\emph default
\begin_inset space ~
\end_inset
can be prevented using protected spaces.
\end_layout
\begin_layout Enumerate
\lang english
Unwanted line breaks after dashes can be prevented by wrapping in a makebox
\begin_inset Foot \begin_inset Foot
status collapsed status collapsed
@ -14286,7 +14287,7 @@ Objects
\end_inset \end_inset
, using protected spaces or preceding with or preceding with
\series bold \series bold
\backslash \backslash
@ -14327,7 +14328,7 @@ status open
\begin_layout Plain Layout \begin_layout Plain Layout
\lang english \lang english
3689 3639
\end_layout \end_layout
\end_inset \end_inset
@ -14337,35 +14338,39 @@ status open
\begin_layout Itemize \begin_layout Itemize
\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
line breaks should not occur before the dash.
\end_layout
\begin_layout Itemize
\lang french \lang french
Les incises 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 ~ \begin_inset space ~
\end_inset \end_inset
même si tout le monde ne les aime pas même
\end_layout
\end_inset
si tout le monde ne les aime pas
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -14391,6 +14396,7 @@ nobreakdash
—un inciso con rayas— se escribe así. —un inciso con rayas— se escribe así.
\end_layout \end_layout
\end_deeper
\begin_layout Standard \begin_layout Standard
\lang english \lang english
@ -14406,15 +14412,6 @@ An incorrect line break is easily overlooked because
log. log.
\end_layout \end_layout
\end_deeper
\begin_layout Enumerate
\lang english
The default dashes output to \SpecialChar LaTeX
disable hyphenation in words adjacent to hyphens
and ligature dashes.
\end_layout
\begin_layout Standard \begin_layout Standard
\lang english \lang english
@ -14426,12 +14423,43 @@ Settings\SpecialChar menuseparator
Fonts\SpecialChar menuseparator Fonts\SpecialChar menuseparator
Disallow line breaks after dashes Disallow line breaks after dashes
\family default \family default
. :
In this case optional line breaks after individual \end_layout
\family sans
dashes \begin_layout Enumerate
\family default
can be re-allowed via the menu \lang english
Line breaks are still allowed after spaced dashes.
They can be prevented using protected spaces (without need for a Makebox
inset or \SpecialChar TeX
code).
Example:
\end_layout
\begin_deeper
\begin_layout Itemize
\lang french
Les incises
\begin_inset space ~
\end_inset
même si tout le monde ne les aime pas
\begin_inset space ~
\end_inset
sont très utiles.
\end_layout
\end_deeper
\begin_layout Enumerate
\lang english
Line breaks after unspaced dashes can be allowed via the menu
\begin_inset Newline newline
\end_inset
\family sans \family sans
Insert\SpecialChar menuseparator Insert\SpecialChar menuseparator
Formatting\SpecialChar menuseparator Formatting\SpecialChar menuseparator
@ -14440,141 +14468,201 @@ Optional line break
: :
\end_layout \end_layout
\begin_deeper
\begin_layout Itemize \begin_layout Itemize
\lang english \lang english
Em-dashes without spaces—\SpecialChar allowbreak Em-dashes without spaces—\SpecialChar allowbreak
as common in American English—\SpecialChar allowbreak common in American English—\SpecialChar allowbreak
should be broken should be followed by
after the dash. a line break opportunity.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
\lang english \lang english
Note: Up to \SpecialChar LyX This also allows hyphenation of the word following the dash (see section
\begin_inset space ~
\end_inset
\lang japanese
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:ハイフネーション"
\end_inset
\lang english
).
\end_layout
\end_deeper
\begin_layout Enumerate
\lang english
With this setting, \SpecialChar LaTeX
hyphenates words also if immediately followed by em
or en dashes (see section
\begin_inset space ~
\end_inset
\lang japanese
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:ハイフネーション"
\end_inset
\lang english
).
\end_layout
\begin_layout Subsubsection
\lang english
Changes and backwards compatibility
\end_layout
\begin_layout Standard
\lang english
Up to \SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.1, you could insert en-dashes and em-dashes as -- and ---, respectively; 2.1, consecutive hyphen characters (-- and ---) in the LyX source were merged
they were automatically merged to proper (breakable) dashes in the output, to en or em dashes by LaTeX.
but kept as consecutive hyphen characters in the LyX document. These
If you inserted literal dash characters, however, they were output to \SpecialChar LaTeX \begin_inset Quotes eld
\end_inset
ligature dashes
\begin_inset Quotes erd
\end_inset
retain the line-break properties of hyphens while literal dash characters
are regarded by \SpecialChar LaTeX
as as
\emph on \emph on
non-breakable non-breakable
\emph default \emph default
dashes (this was actually rather by accident than intentionally, but some .
used these two forms of dashes deliberately). \end_layout
As of \SpecialChar LyX
\begin_layout Standard
\end_layout
\begin_layout Standard
\lang english
Since \SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.2, things work differently: consecutive hyphens are merged to dashes immediatel 2.2, consecutive hyphens in the LyX source are exported to \SpecialChar LaTeX
y in the input. in a way that
prevents ligation to dashes.
\begin_inset Quotes eld
\end_inset
Ligature dashes
\begin_inset Quotes erd
\end_inset
in documents from earlier versions are converted to literal dash characters
(except in
\family typewriter
typewriter
\family default
font); typed in consecutive hyphens are merged to dash characters immediately
after the input (unless the current text font is
\family typewriter
type
\family default
writer).
\begin_inset Foot \begin_inset Foot
status collapsed status open
\begin_layout Plain Layout \begin_layout Plain Layout
\lang english \lang english
The behavior was changed since it led to different look in \SpecialChar LyX The behavior was changed since
, text export, \begin_inset Quotes eld
HTML export and the PDF export. \end_inset
lyx --help
\begin_inset Quotes erd
\end_inset
became
\begin_inset Quotes eld
\end_inset
lyx help
\begin_inset Quotes erd
\end_inset
in PDF, Postscript, and DVI output.
An unintended consequence of these changes was that all dashes were output
as non-breakable dashes.
This also resulted in changed line breaks in some older documents.
\end_layout \end_layout
\end_inset \end_inset
If you copy consecutive hyphens, by contrast, they are output as consecutive
hyphen characters. \end_layout
An unintended consequence of this change was that all dashes now were output
as non-breakable dashes. \begin_layout Standard
Since furthermore, in order to maintain the output, occurrences of consecutive
hyphens in documents that were saved by \SpecialChar LyX \lang english
\SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.1 or earlier versions, were converted to literal en- and em-dash characters, 2.3 outputs
respectively, these were output to \SpecialChar LaTeX
in \SpecialChar LyX
\begin_inset space ~
\end_inset
2.2 as
\emph on
non-breakable
\emph default
dashes as well.
An obvious drawback of all this was that it resulted in different line
breaks in some documents.
\SpecialChar LyX
\begin_inset space ~
\end_inset
2.3, by contrast and as outlined above, outputs
\emph on \emph on
breakable breakable
\emph default \emph default
dashes by default, so if you load a document saved previous to LyX 2.2, dashes by default.
you should get the identical output with LyX 2.3 for the dashes inserted When opening documents edited with \SpecialChar LyX
with -- and ---.
Furthermore, \SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
2.3 provides the aforementioned option 2.2 or earlier and containing literal dash characters not followed by whitespace,
\family sans the setting
Disallow line breaks after dashes
\family default
in the menu
\family sans \family sans
Document\SpecialChar menuseparator Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator Settings\SpecialChar menuseparator
Fonts. Fonts\SpecialChar menuseparator
\family default
It is off by default but selected when opening documents edited with \SpecialChar LyX
\begin_inset space ~
\end_inset
2.2 in order to maintain line breaking between \SpecialChar LyX
2.2 and 2.3 (so these document
have non-breakable dashes).
\begin_inset Newline newline
\end_inset
Note the following side-effects of the changes in \SpecialChar LyX
's dash handling:
\end_layout
\begin_layout Itemize
\lang english
If you used only literal em- and en dashes in pre-\SpecialChar LyX
\begin_inset space ~
\end_inset
2.2 documents, you must manually select
\family sans
Disallow line breaks after dashes Disallow line breaks after dashes
\family default \family default
to ensure unchanged behavior. is active to prevent changes to the line breaks.
\series bold
Warning:
\series default
If you used both literal and
\begin_inset Quotes eld
\end_inset
\end_layout ligature
\begin_inset Quotes erd
\end_inset
\begin_layout Itemize dashes in pre-\SpecialChar LyX
\lang english
If you used both literal and --/--- dashes in pre-\SpecialChar LyX
\begin_inset space ~ \begin_inset space ~
\end_inset \end_inset
@ -14583,26 +14671,6 @@ If you used both literal and --/--- dashes in pre-\SpecialChar LyX
shown above to restore the correct line breaking behavior. shown above to restore the correct line breaking behavior.
\end_layout \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_layout Subsection
ハイフネーション ハイフネーション
\begin_inset Index idx \begin_inset Index idx
@ -14639,6 +14707,13 @@ latexはつけじ@\SpecialChar LaTeX
\end_inset \end_inset
が,文書言語のルールに基づいて行います. が,文書言語のルールに基づいて行います.
\lang english
\SpecialChar LaTeX
does not hyphenate text in the
\family sans
typewriter
\family default
font and words immediately preceded or followed by hyphens or dashes.
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
@ -32419,27 +32494,6 @@ reference "subsec:番号の付け方-深度"
節に説明されているように,環境の入れ子の階層を上げたり下げたりします. 節に説明されているように,環境の入れ子の階層を上げたり下げたりします.
\end_layout \end_layout
\begin_layout Subsection
\change_deleted -712698321 1514711626
新たな環境を開始/新たな親環境を開始
\end_layout
\begin_layout Standard
\change_deleted -712698321 1514711626
これらのメニューは同じ型の環境を2つ続けることが可能なときにのみ表示されます詳細については
\begin_inset CommandInset ref
LatexCommand ref
reference "subsec:入れ子の分離"
\end_inset
節をご覧ください.
\change_unchanged
\end_layout
\begin_layout Section \begin_layout Section
表示メニュー 表示メニュー
\begin_inset Index idx \begin_inset Index idx
@ -33555,33 +33609,16 @@ reference "sec:傍注"
\end_inset \end_inset
節に説明されているように,傍註を挿入します. 節に説明されているように,傍註を挿入します.
\change_inserted -712698321 1514711647
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection
\change_inserted -712698321 1514711654 \family sans
新たな環境を開始 \lang english
\begin_inset Note Note Separate <Name> (Above/Below)
status open
\begin_layout Plain Layout
\change_inserted -712698321 1514711660
above/below
\change_unchanged
\end_layout
\end_inset
\end_layout \end_layout
\begin_layout Standard \begin_layout Standard
\change_inserted -712698321 1514711648
これらのメニューは同じ型の環境を2つ続けることが可能なときにのみ表示されます詳細については これらのメニューは同じ型の環境を2つ続けることが可能なときにのみ表示されます詳細については
\begin_inset CommandInset ref \begin_inset CommandInset ref
LatexCommand ref LatexCommand ref
@ -33590,8 +33627,6 @@ reference "subsec:入れ子の分離"
\end_inset \end_inset
節をご覧ください. 節をご覧ください.
\change_unchanged
\end_layout \end_layout
\begin_layout Subsection \begin_layout Subsection