From 058ee9ab0045a399162f325ecd9fd37e7671923c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20St=C3=B6hr?= Date: Fri, 12 Jan 2018 04:54:03 +0100 Subject: [PATCH] UserGuide.lyx: distribute recent changes --- lib/doc/Changelog-UserGuide-LyX_23x.txt | 4 +- lib/doc/UserGuide.lyx | 671 ++---------------------- lib/doc/de/UserGuide.lyx | 78 ++- lib/doc/es/UserGuide.lyx | 636 +++++++++++----------- lib/doc/fr/UserGuide.lyx | 621 +++++++++++----------- lib/doc/ja/UserGuide.lyx | 611 +++++++++++---------- 6 files changed, 1094 insertions(+), 1527 deletions(-) diff --git a/lib/doc/Changelog-UserGuide-LyX_23x.txt b/lib/doc/Changelog-UserGuide-LyX_23x.txt index 3b13069145..4c8bb1edb6 100644 --- a/lib/doc/Changelog-UserGuide-LyX_23x.txt +++ b/lib/doc/Changelog-UserGuide-LyX_23x.txt @@ -16,7 +16,8 @@ first step (not Japanese): second step: - 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. 4.6.2: Japanese only: untranslated image captions - 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.3: new paragraph and 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. D: new table row - nomenclature list: new note diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index c65d7076c8..b9288ac164 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -140,13 +140,11 @@ enumitem \papercolumns 1 \papersides 2 \paperpagestyle default -\tracking_changes true +\tracking_changes false \output_changes false \html_math_output 0 \html_css_as_file 0 \html_be_strict true -\author -1402925745 "Günter Milde" -\author -712698321 "Jürgen Spitzmüller" \end_header \begin_body @@ -8337,14 +8335,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 +8353,6 @@ The following 2 lines are empty: \end_layout \begin_layout Verbatim - Almost everything is allowed in Verbatim:"%&$§#~'` \backslash }][{| @@ -8381,7 +8376,6 @@ Verbatim \end_layout \begin_layout Verbatim* - This is Verbatim*. \end_layout @@ -10532,48 +10526,20 @@ enumeration \begin_layout Standard To split an existing list into two lists, set the cursor at the end of a list item and use the menu -\change_deleted -712698321 1514652028 - \family sans -Edit -\change_inserted -712698321 1514652029 -Insert -\change_unchanged -\SpecialChar menuseparator - -\change_deleted -712698321 1514652035 -Start New Environment -\change_inserted -712698321 1514652814 +Insert\SpecialChar menuseparator Separated Above \family default or \family sans Insert\SpecialChar menuseparator Separated Below -\change_unchanged - \family default . This inserts a plain separator (red line in \SpecialChar LyX -) and -\change_inserted -712698321 1514652169 -before or -\change_unchanged -behind it the new list. - -\change_deleted -712698321 1514652256 -The menu -\family sans -Edit\SpecialChar menuseparator -Start New Parent Environment -\family default - only appears if the item is nested. - It does not only separate the list but also creates a new one outside the - nesting -\change_inserted -712698321 1514652300 -Inside nested environments, it is also possible to split the outer environment -\change_unchanged -. +) and before or behind it the + new list. + Inside nested environments, it is also possible to split the outer environment. \end_layout \begin_layout Standard @@ -13402,55 +13368,26 @@ status collapsed . -\change_inserted -1402925745 1514889567 - \end_layout \begin_layout Standard The option -\change_deleted -1402925745 1514890586 - -\family sans -Output en- and em-dashes as ligatures -\change_unchanged - -\family default - -\change_inserted -1402925745 1514890570 - \family sans Disallow line breaks after dashes \family default - -\change_unchanged -outputs en- and em-dashes as -\change_deleted -1402925745 1514890990 -ligatures (--, ---) -\change_inserted -1402925745 1514891156 -literal characters + outputs en- and em-dashes as literal characters \begin_inset Foot status collapsed \begin_layout Plain Layout - -\change_inserted -1402925745 1514891207 Or \SpecialChar LaTeX macro, if the literal character is not supported by the \SpecialChar LaTeX input encoding. -\change_unchanged - \end_layout \end_inset - -\change_unchanged - instead of -\change_deleted -1402925745 1514891082 -a sigle character -\change_inserted -1402925745 1514891224 -ligatures (--, ---) (cf. - section + instead of ligatures (--, ---) (see section \begin_inset space ~ \end_inset @@ -13464,9 +13401,7 @@ noprefix "false" \end_inset -) -\change_unchanged -. +). \end_layout \begin_layout Standard @@ -16417,42 +16352,10 @@ Opt \family default is the Mac label for the right \family sans -Alt -\family default - -\change_deleted -1402925745 1514650349 - -\family sans -/ AltGr -\change_unchanged - +Alt \family default key). -\change_deleted -1402925745 1514642633 -Alternatively, dashes can be inserted with -\family sans -Insert\SpecialChar menuseparator -Special -\begin_inset space ~ -\end_inset - -Character\SpecialChar menuseparator -Symbols -\family default - 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). -\change_unchanged - \end_layout \end_inset @@ -16578,37 +16481,13 @@ Special Character\SpecialChar menuseparator Symbols \family default - or -\change_inserted -1402925745 1514890768 -using -\change_unchanged -the -\change_deleted -1402925745 1514650507 - -\begin_inset Quotes eld -\end_inset - - -\change_unchanged - + or using the \family typewriter unicode-insert -\change_deleted -1402925745 1514650506 - \family default - -\begin_inset Quotes erd -\end_inset - - -\change_unchanged \SpecialChar LyX - function -\change_inserted -1402925745 1514650396 - with the Unicode code point as argument (2013 for the em dash and 2014 - for the en dash) -\change_unchanged -. + function with the Unicode code point as argument (2013 for the em dash + and 2014 for the en dash). \end_layout \begin_layout Standard @@ -16630,19 +16509,11 @@ hyphen \end_layout \begin_layout Enumerate - -\change_deleted -1402925745 1514642720 -From -\change_unchanged A–Z; pages \begin_inset space ~ \end_inset 369–378 -\change_inserted -1402925745 1514642746 -; Oh – there's a dash. -\change_unchanged - \begin_inset space \hfill{} \end_inset @@ -16705,30 +16576,17 @@ name "subsec:Dashes-and-line-breaks" \end_layout \begin_layout Standard -Whether line breaks -\change_deleted -1402925745 1514642422 -at -\change_inserted -1402925745 1514890882 -before or after -\change_unchanged - dashes are allowed depends on the use case and locale -\change_inserted -1402925745 1514650654 -, e. +Whether line breaks before or after dashes are allowed depends on the use + case and locale, e. \begin_inset space \thinspace{} \end_inset -g. -\change_unchanged -: +g.: \end_layout \begin_layout Itemize -In English, line breaks are generally allowed after the dash -\change_deleted -1402925745 1514642312 - in ranges of values such as 1975–1982 -\change_unchanged -, but no line break should occur if only a single character follows the - dash (as in A–Z). +In English, line breaks are generally allowed after the dash, but no line + break should occur if only a single character follows the dash (as in A–Z). \end_layout \begin_layout Itemize @@ -16742,23 +16600,9 @@ In French and Spanish, dashes around parenthetical statements are treated \end_layout \begin_layout Standard - -\change_deleted -1402925745 1514643928 -The -\change_inserted -1402925745 1514891332 -By default, -\change_unchanged - dashes -\change_deleted -1402925745 1514891353 -that -\change_unchanged -are output by \SpecialChar LyX +By default, dashes are output by \SpecialChar LyX to \SpecialChar LaTeX - -\change_deleted -1402925745 1514891361 -by default generally -\change_inserted -1402925745 1514891480 -as + as \begin_inset Quotes eld \end_inset @@ -16768,37 +16612,11 @@ ligature dashes (-- and ---). \SpecialChar LaTeX - -\change_unchanged - allow -\change_inserted -1402925745 1514891455 -s -\change_unchanged - -\change_deleted -1402925745 1514891448 -for -\change_unchanged -line breaks after -\change_inserted -1402925745 1514891497 -hyphens, -\change_unchanged -en-dashes and em-dashes. -\change_inserted -1402925745 1514643799 - -\end_layout - -\begin_layout Standard - -\change_deleted -1402925745 1514650817 -Please note: -\change_unchanged - + allows line breaks after hyphens, en-dashes and em-dashes. \end_layout \begin_layout Enumerate - -\change_inserted -1402925745 1514652254 -Line breaks before spaced en dashes +Line breaks before spaced en dashes \begin_inset space ~ \end_inset @@ -16814,21 +16632,7 @@ The Elements of Typographic Style \end_layout \begin_layout Enumerate -Unwanted line breaks -\change_inserted -1402925745 1514652276 -after dashes -\change_unchanged -can be prevented by wrapping in a -\change_deleted -1402925745 1514891688 -m -\change_inserted -1402925745 1514891688 -M -\change_unchanged -akebox -\change_inserted -1402925745 1514891707 - inset -\change_unchanged - +Unwanted line breaks after dashes can be prevented by wrapping in a makebox \begin_inset Foot status collapsed @@ -16850,16 +16654,12 @@ Objects \end_inset - -\change_deleted -1402925745 1514652291 -, using protected spaces -\change_unchanged or preceding with -\family typewriter +\series bold \backslash nobreakdash -\family default +\series default in \SpecialChar TeX code. Examples: @@ -16891,53 +16691,18 @@ backgroundcolor "none" status open \begin_layout Plain Layout -36 -\change_deleted -1402925745 1514891557 -8 -\change_unchanged -– -\change_inserted -1402925745 1514891614 -3 -\change_unchanged -9 +36–39 \end_layout \end_inset -\end_layout - -\begin_layout Itemize - -\change_deleted -1402925745 1514652372 -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. -\change_unchanged - \end_layout \begin_layout Itemize \lang french Les incises -\change_inserted -1402925745 1514642994 - \begin_inset Box Frameless position "t" hor_pos "c" @@ -16958,8 +16723,6 @@ status open \begin_layout Plain Layout -\change_inserted -1402925745 1514642994 - \lang french – \begin_inset space ~ @@ -16970,14 +16733,6 @@ même \end_inset - -\change_deleted -1402925745 1514642998 -– -\begin_inset space ~ -\end_inset - -même -\change_unchanged si tout le monde ne les aime pas \begin_inset space ~ \end_inset @@ -17016,18 +16771,6 @@ An incorrect line break is easily overlooked because – it does not trigger a warning in the \SpecialChar LaTeX log. -\change_deleted -1402925745 1514891753 - -\end_layout - -\begin_layout Enumerate - -\change_deleted -1402925745 1514643500 -The default dashes output to \SpecialChar LaTeX - disable hyphenation in words adjacent to hyphens - and ligature dashes. -\change_unchanged - \end_layout \begin_layout Standard @@ -17038,23 +16781,14 @@ Document\SpecialChar menuseparator Settings\SpecialChar menuseparator Fonts\SpecialChar menuseparator Disallow line breaks after dashes -\change_deleted -1402925745 1514653511 - \family default -. - -\change_inserted -1402925745 1514653512 : -\change_unchanged - \end_layout \begin_layout Enumerate - -\change_inserted -1402925745 1514891789 Line breaks are still allowed after spaced dashes. - They can be prevented using protected spaces (without need for a Makebox - inset or \SpecialChar TeX + They can be prevented using protected spaces (without need for a makebox + or \SpecialChar TeX code). Example: \end_layout @@ -17062,55 +16796,25 @@ Line breaks are still allowed after spaced dashes. \begin_deeper \begin_layout Itemize -\change_inserted -1402925745 1514653363 - \lang french Les incises – \begin_inset space ~ \end_inset -même si tout le monde ne les aime pas +même si tout le monde ne les aime pas \begin_inset space ~ \end_inset – sont très utiles. -\change_unchanged - \end_layout \end_deeper \begin_layout Enumerate - -\change_deleted -1402925745 1514644579 -In this case optional l -\change_inserted -1402925745 1514644580 -L -\change_unchanged -ine breaks after -\change_deleted -1402925745 1514646589 -individual -\family sans - -\change_inserted -1402925745 1514646372 - -\family default -unspaced -\change_unchanged -dashes can be -\change_deleted -1402925745 1514644570 -re- -\change_unchanged -allowed via the menu -\change_inserted -1402925745 1514891813 - +Line breaks after unspaced dashes can be allowed via the menu \begin_inset Newline newline \end_inset -\change_deleted -1402925745 1514891815 - -\change_unchanged - \family sans Insert\SpecialChar menuseparator Formatting\SpecialChar menuseparator @@ -17122,27 +16826,13 @@ Optional line break \begin_deeper \begin_layout Itemize Em-dashes without spaces—\SpecialChar allowbreak - -\change_deleted -1402925745 1514644634 -as -\change_unchanged common in American English—\SpecialChar allowbreak -should be -\change_deleted -1402925745 1514644706 -broken after the dash -\change_inserted -1402925745 1514644714 -followed by a line break opportunity -\change_unchanged -. -\change_inserted -1402925745 1514890478 - +should be followed by + a line break opportunity. \end_layout \begin_layout Standard - -\change_inserted -1402925745 1514890517 -This also allows hyphenation of the word following the dash (cf. - section +This also allows hyphenation of the word following the dash (see section \begin_inset space ~ \end_inset @@ -17157,18 +16847,13 @@ noprefix "false" \end_inset ). -\change_unchanged - \end_layout \end_deeper \begin_layout Enumerate - -\change_inserted -1402925745 1514653204 With this setting, \SpecialChar LaTeX hyphenates words also if immediately followed by em - or en dashes (cf. - section + or en dashes (see section \begin_inset space ~ \end_inset @@ -17186,41 +16871,18 @@ noprefix "false" \end_layout \begin_layout Subsubsection - -\change_inserted -1402925745 1514646777 Changes and backwards compatibility \end_layout \begin_layout Standard - -\change_deleted -1402925745 1514646781 -Note: -\change_unchanged Up to \SpecialChar LyX \begin_inset space ~ \end_inset -2.1, -\change_deleted -1402925745 1514653772 -you could insert en-dashes and em-dashes as -- and ---, respectively; they - were automatically merged to proper (breakable) dashes in the output, but - kept as -\change_unchanged - consecutive hyphen characters -\change_inserted -1402925745 1514654314 -(-- and ---) -\change_unchanged -in the LyX -\change_deleted -1402925745 1514653785 - document -\change_inserted -1402925745 1514654235 - source were merged to en or em dashes by LaTeX -\change_unchanged -. - -\change_inserted -1402925745 1514653905 -These +2.1, consecutive hyphen characters (-- and ---) in the LyX source were merged + to en or em dashes by LaTeX. + These \begin_inset Quotes eld \end_inset @@ -17235,49 +16897,17 @@ ligature dashes non-breakable \emph default . -\change_unchanged - \end_layout \begin_layout Standard - -\change_deleted -1402925745 1514647104 -If you inserted literal dash characters, however, they were output to \SpecialChar LaTeX - as - -\emph on -non-breakable -\emph default - dashes (this was actually rather by accident than intentionally, but some - used these two forms of dashes deliberately). - -\change_inserted -1402925745 1514646979 - -\end_layout - -\begin_layout Standard - -\change_deleted -1402925745 1514653950 -As of -\change_unchanged - -\change_inserted -1402925745 1514653959 -Since -\change_unchanged -\SpecialChar LyX +Since \SpecialChar LyX \begin_inset space ~ \end_inset -2.2, -\change_deleted -1402925745 1514655286 -things work differently: consecutive hyphens are merged to dashes immediately - in the input. - -\change_inserted -1402925745 1514892048 - consecutive hyphens in the LyX source are exported to \SpecialChar LaTeX - in a way that prevents - ligation to dashes. +2.2, consecutive hyphens in the LyX source are exported to \SpecialChar LaTeX + in a way that + prevents ligation to dashes. \begin_inset Quotes eld \end_inset @@ -17297,18 +16927,11 @@ typewriter type \family default writer). -\change_unchanged - \begin_inset Foot status open \begin_layout Plain Layout The behavior was changed since -\change_deleted -1402925745 1514892102 -it led to different look in \SpecialChar LyX -, text export, HTML export and the PDF export -\change_inserted -1402925745 1514892145 - \begin_inset Quotes eld \end_inset @@ -17324,50 +16947,16 @@ lyx –help \begin_inset Quotes erd \end_inset - in PDF, Postscript, and DVI output -\change_unchanged -. - -\change_inserted -1402925745 1514654876 + 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. -\change_unchanged - \end_layout \end_inset -\change_deleted -1402925745 1514655286 - If you copy consecutive hyphens, by contrast, they are output as consecutive - hyphen characters. - An unintended consequence of this change was that all dashes now were output - as non-breakable dashes. - Since furthermore, in order to maintain the output, occurrences of consecutive - hyphens in documents that were saved by \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.1 or earlier versions, were converted to literal en- and em-dash characters, - 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. - -\change_inserted -1402925745 1514891934 - \end_layout \begin_layout Standard @@ -17376,46 +16965,11 @@ non-breakable \begin_inset space ~ \end_inset -2.3 -\change_deleted -1402925745 1514688984 -, by contrast and as outlined above, -\change_unchanged - outputs +2.3 outputs \emph on breakable \emph default - dashes by default -\change_inserted -1402925745 1514654979 -. -\change_deleted -1402925745 1514655571 -, so if you load a document saved previous to LyX 2.2, you should get the - identical output with LyX 2.3 for the dashes inserted with -- and ---. - Furthermore, \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.3 provides the aforementioned option -\family sans -Disallow line breaks after dashes -\family default - in the menu -\family sans -Document\SpecialChar menuseparator -Settings\SpecialChar menuseparator -Fonts. - -\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). - -\change_inserted -1402925745 1514892224 + dashes by default. When opening documents edited with \SpecialChar LyX \begin_inset space ~ @@ -17430,43 +16984,10 @@ Fonts\SpecialChar menuseparator Disallow line breaks after dashes \family default is active to prevent changes to the line breaks. -\change_deleted -1402925745 1514655571 - -\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 - -\change_deleted -1402925745 1514649416 -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 -\family default - to ensure unchanged behavior. - -\end_layout - -\begin_layout Standard - -\change_inserted -1402925745 1514892245 - \series bold Warning: \series default - -\change_unchanged -If you used both literal and -\change_inserted -1402925745 1514655424 - + If you used both literal and \begin_inset Quotes eld \end_inset @@ -17474,10 +16995,6 @@ ligature \begin_inset Quotes erd \end_inset - -\change_deleted -1402925745 1514655426 ---/--- -\change_unchanged dashes in pre-\SpecialChar LyX \begin_inset space ~ @@ -17485,30 +17002,6 @@ ligature 2.2 documents, you may need to enable or prevent individual line breaks as shown above to restore the correct line breaking behavior. -\change_deleted -1402925745 1514649416 - -\end_layout - -\begin_layout Itemize - -\change_deleted -1402925745 1514649416 -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. -\change_inserted -1402925745 1514649439 - \end_layout \begin_layout Subsection @@ -17552,29 +17045,21 @@ status collapsed \end_inset following the rules of the document language. - -\change_inserted -1402925745 1514652600 \SpecialChar LaTeX does not hyphenate text in the \family sans typewriter \family default font and words immediately preceded or followed by hyphens or dashes. -\change_unchanged - \end_layout \begin_layout Standard \SpecialChar LaTeX - hyphenates almost perfectly; it only has problems with -\change_deleted -1402925745 1514652587 -text in the + hyphenates almost perfectly; it only has problems with text in the \family sans typewriter \family default - font and with -\change_unchanged -unusual constructs, like + font and with unusual constructs, like \begin_inset Quotes eld \end_inset @@ -17623,27 +17108,10 @@ A-b c \begin_inset Quotes erd \end_inset - as a -\change_deleted -1402925745 1514649694 -hyphenation -\change_inserted -1402925745 1514649696 -line break -\change_unchanged - possibility. - -\change_deleted -1402925745 1514649727 -Hyphenating -\change_inserted -1402925745 1514649729 -A line break -\change_unchanged - at this point would look ugly. - To prevent the shortcut from being -\change_deleted -1402925745 1514649715 -hyphenated -\change_inserted -1402925745 1514649716 -broken -\change_unchanged -, you can use a protected hyphen ( + as a line break possibility. + A line break at this point would look ugly. + To prevent the shortcut from being broken, you can use a protected hyphen + ( \family sans Insert\SpecialChar menuseparator Formatting\SpecialChar menuseparator @@ -38581,35 +38049,6 @@ reference "subsec:Numbering-depth" . \end_layout -\begin_layout Subsection - -\change_deleted -712698321 1514652312 - -\family sans -Start New Environment/Start New Parent Environment -\end_layout - -\begin_layout Standard - -\change_deleted -712698321 1514652312 -These menus are only visible if it is possible to have two consecutive environme -nts of the same type. - See section -\begin_inset space ~ -\end_inset - - -\begin_inset CommandInset ref -LatexCommand ref -reference "subsec:Separate-Nestings" - -\end_inset - - for an explanation. -\change_unchanged - -\end_layout - \begin_layout Section The View Menu \begin_inset Index idx @@ -40153,21 +39592,15 @@ reference "sec:Marginal-Notes" \end_inset . -\change_inserted -712698321 1514652349 - \end_layout \begin_layout Subsection -\change_inserted -712698321 1514652384 - \family sans -Separate Environment (Above/Below) +Separate (Above/Below) \end_layout \begin_layout Standard - -\change_inserted -712698321 1514652391 These menu items are only visible if it is possible to have two consecutive environments of the same type. See section @@ -40182,8 +39615,6 @@ reference "subsec:Separate-Nestings" \end_inset for an explanation. -\change_unchanged - \end_layout \begin_layout Subsection diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index 2c17dc9ddd..0195347c11 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -8597,10 +8597,12 @@ Unformatiert \end_layout \begin_layout Verbatim + Dies ist Unformatiert. \end_layout \begin_layout Verbatim + Die folgenden 2 Zeilen sind leer: \end_layout @@ -8613,6 +8615,7 @@ Die folgenden 2 Zeilen sind leer: \end_layout \begin_layout Verbatim + Fast alles ist in Unformatiert erlaubt:"%&$§#~'` \backslash }][{| @@ -8636,6 +8639,7 @@ Unformatiert \end_layout \begin_layout Verbatim* + Dies ist Unformatiert*. \end_layout @@ -13546,8 +13550,11 @@ Bzw. \end_inset - aus, nicht in Form von Ligaturen (--, ---) (vgl. - Abschnitt + aus, statt in Form von Ligaturen (--, ---) (vgl. +\begin_inset space \space{} +\end_inset + +Abschnitt \begin_inset space ~ \end_inset @@ -16468,14 +16475,33 @@ Minuszeichen \end_layout \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 Text \begin_layout Plain Layout @@ -16484,7 +16510,7 @@ Name \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -16493,7 +16519,7 @@ Aussehen \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -16504,7 +16530,7 @@ Eingefügt mit - + \begin_inset Text \begin_layout Plain Layout @@ -16545,7 +16571,7 @@ Viertelgeviertstrich - + \begin_inset Text \begin_layout Plain Layout @@ -16590,7 +16616,7 @@ literal "false" - + \begin_inset Text \begin_layout Plain Layout @@ -16635,7 +16661,7 @@ literal "false" - + \begin_inset Text \begin_layout Plain Layout @@ -16682,6 +16708,11 @@ Minuszeichen \end_inset +\end_layout + +\end_inset + + \begin_inset VSpace medskip \end_inset @@ -17018,13 +17049,13 @@ Objekte \end_inset oder -\family typewriter +\series bold \backslash nobreakdash -\family default - (als \SpecialChar TeX --Code) vor den Strich schreibt. +\series default + als \SpecialChar TeX +-Code vor den Strich schreibt. Beispiele: \end_layout @@ -17185,8 +17216,25 @@ n verhindern \begin_layout Enumerate Zeilenumbrüche sind weiterhin erlaubt, wenn auf den Strich ein Leerzeichen folgt. + Beispiel: \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 \SpecialChar LaTeX trennt mit dieser Option auch Wörter unmittelbar vor einem Halbgeviert- @@ -38863,7 +38911,7 @@ reference "sec:Randnotizen" \end_layout \begin_layout Subsection -Neue Umgebung (oberhalb/unterhalb) +Separierte Umgebung (oberhalb/unterhalb) \end_layout \begin_layout Standard diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx index 5dff7fb1ae..37a2e958cb 100644 --- a/lib/doc/es/UserGuide.lyx +++ b/lib/doc/es/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 @@ -10786,55 +10785,30 @@ enumeración Para dividir una lista existente en dos, pon el cursor al final de un ítem de la lista y usa el menú \family sans -Editar\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 +Insertar\SpecialChar menuseparator \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 Above \family default - or +\lang spanish + o \family sans - Insert\SpecialChar menuseparator + Insertar\SpecialChar menuseparator + +\lang english Separated Below \family default +\lang spanish . - This inserts a plain separator (red line in \SpecialChar LyX -) and before or behind it the - new list. - Inside nested environments, it is also possible to split the outer environment. -\end_layout - -\end_inset - - -\change_unchanged - + Se inserta un separador simple (una línea roja en \SpecialChar LyX +) y +\lang english +before or behind +\lang spanish + la nueva lista. + +\lang english +Inside nested environments, it is also possible to split the outer environment. \end_layout \begin_layout Standard @@ -13679,13 +13653,44 @@ status collapsed \end_inset . - La opción -\family sans -Salir en-guiones y &em-guiones como ligaduras -\family default - +\end_layout + +\begin_layout Standard + \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 \begin_layout Standard @@ -16745,28 +16750,10 @@ Alt \family default \family sans -/ AltGr + \family default 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_inset @@ -16877,16 +16864,13 @@ Special Character\SpecialChar menuseparator Symbols \family default - or the -\begin_inset Quotes eld -\end_inset - + or using the +\family typewriter unicode-insert -\begin_inset Quotes erd -\end_inset - +\family default \SpecialChar LyX - function. + function with the Unicode code point as argument (2013 for the em dash + and 2014 for the en dash). \end_layout \begin_layout Standard @@ -16920,7 +16904,7 @@ guión \end_layout \begin_layout Enumerate -De A–Z; paginas +A–Z; paginas \begin_inset space ~ \end_inset @@ -16994,15 +16978,19 @@ name "subsec:Dashes-and-line-breaks" \begin_layout Standard \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 \begin_layout Itemize \lang english -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). +In English, line breaks are generally allowed after the dash, but no line + break should occur if only a single character follows the dash (as in A–Z). \end_layout \begin_layout Itemize @@ -17022,22 +17010,43 @@ In French and Spanish, dashes around parenthetical statements are treated \begin_layout Standard \lang english -The dashes that are output by \SpecialChar LyX +By default, dashes are output by \SpecialChar LyX to \SpecialChar LaTeX - by default generally allow for line breaks - after en-dashes and em-dashes. -\end_layout + as +\begin_inset Quotes eld +\end_inset -\begin_layout Standard +ligature dashes +\begin_inset Quotes erd +\end_inset -\lang english -Please note: + (-- and ---). + \SpecialChar LaTeX + allows line breaks after hyphens, en-dashes and em-dashes. \end_layout \begin_layout Enumerate \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 \begin_inset Foot @@ -17059,7 +17068,7 @@ Objetos insertados \lang english -, using protected spaces or preceding with + or preceding with \series bold \backslash @@ -17100,7 +17109,7 @@ status open \begin_layout Plain Layout \lang english -368–9 +36–39 \end_layout \end_inset @@ -17110,35 +17119,39 @@ status open \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 -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 ~ \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 ~ \end_inset @@ -17162,6 +17175,7 @@ nobreakdash —un inciso con rayas— se escribe así. \end_layout +\end_deeper \begin_layout Standard \lang english @@ -17177,15 +17191,6 @@ An incorrect line break is easily overlooked because log. \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 \lang english @@ -17197,12 +17202,43 @@ Settings\SpecialChar menuseparator Fonts\SpecialChar menuseparator Disallow line breaks after dashes \family default -. - In this case optional line breaks after individual -\family sans - dashes -\family default - can be re-allowed via the menu +: +\end_layout + +\begin_layout Enumerate + +\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 Insert\SpecialChar menuseparator Formatting\SpecialChar menuseparator @@ -17211,141 +17247,197 @@ Optional line break : \end_layout +\begin_deeper \begin_layout Itemize \lang english Em-dashes without spaces—\SpecialChar allowbreak -as common in American English—\SpecialChar allowbreak -should be broken - after the dash. +common in American English—\SpecialChar allowbreak +should be followed by + a line break opportunity. \end_layout \begin_layout Standard \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 ~ \end_inset -2.1, you could insert en-dashes and em-dashes as -- and ---, respectively; - they were automatically merged to proper (breakable) dashes in the output, - but kept as consecutive hyphen characters in the LyX document. - If you inserted literal dash characters, however, they were output to \SpecialChar LaTeX +2.1, consecutive hyphen characters (-- and ---) in the LyX source were merged + to en or em dashes by LaTeX. + These +\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 \emph on non-breakable \emph default - dashes (this was actually rather by accident than intentionally, but some - used these two forms of dashes deliberately). - As of \SpecialChar LyX +. +\end_layout + +\begin_layout Standard + +\lang english +Since \SpecialChar LyX \begin_inset space ~ \end_inset -2.2, things work differently: consecutive hyphens are merged to dashes immediatel -y in the input. +2.2, consecutive hyphens in the LyX source are exported to \SpecialChar LaTeX + 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 -status collapsed +status open \begin_layout Plain Layout \lang english -The behavior was changed since it led to different look in \SpecialChar LyX -, text export, - HTML export and the PDF export. -\end_layout - +The behavior was changed since +\begin_inset Quotes eld \end_inset - If you copy consecutive hyphens, by contrast, they are output as consecutive - hyphen characters. - An unintended consequence of this change was that all dashes now were output +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. - Since furthermore, in order to maintain the output, occurrences of consecutive - hyphens in documents that were saved by \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.1 or earlier versions, were converted to literal en- and em-dash characters, - 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 -breakable -\emph default - dashes by default, so if you load a document saved previous to LyX 2.2, - you should get the identical output with LyX 2.3 for the dashes inserted - with -- and ---. - Furthermore, \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.3 provides the aforementioned option -\family sans -Disallow line breaks after dashes -\family default - in the menu -\family sans -Document\SpecialChar menuseparator -Settings\SpecialChar menuseparator -Fonts. - -\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 -\family default - to ensure unchanged behavior. + This also resulted in changed line breaks in some older documents. \end_layout -\begin_layout Itemize +\end_inset + + +\end_layout + +\begin_layout Standard \lang english -If you used both literal and --/--- dashes in pre-\SpecialChar LyX +\SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3 outputs +\emph on +breakable +\emph default + dashes by default. + When opening documents edited with \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.2 or earlier and containing literal dash characters not followed by whitespace, + the setting +\family sans +Document\SpecialChar menuseparator +Settings\SpecialChar menuseparator +Fonts\SpecialChar menuseparator +Disallow line breaks after dashes +\family default + 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 + +ligature +\begin_inset Quotes erd +\end_inset + + dashes in pre-\SpecialChar LyX \begin_inset space ~ \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. \end_layout -\begin_layout Itemize - -\lang english -Zero-width space (ZWSP) characters in older \SpecialChar LyX - documents that follow literal - em- and en-dashes are removed during the conversion to the format of \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.3. - If you used them as optional line breaks after dashes, convert them to - space insets before opening your document with \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.3 or the optional line breaks will be lost. -\end_layout - \begin_layout Subsection División de palabras con guión \begin_inset Index idx @@ -17415,6 +17487,14 @@ status collapsed \end_inset , 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 \begin_layout Standard @@ -38777,33 +38857,6 @@ reference "subsec:Profundidad-de-numeración" . \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 El menú Ver \begin_inset Index idx @@ -40221,33 +40274,16 @@ reference "sec:Notas-al-margen" \end_inset . -\change_inserted -712698321 1514711534 - \end_layout \begin_layout Subsection -\change_inserted -712698321 1514711561 -Iniciar nuevo entorno -\begin_inset Note Note -status open - -\begin_layout Plain Layout - -\change_inserted -712698321 1514711565 -above/below -\change_unchanged - -\end_layout - -\end_inset - - +\family sans +\lang english +Separate (Above/Below) \end_layout \begin_layout Standard - -\change_inserted -712698321 1514711537 Estos menús sólo están visibles si es posible tener dos entornos consecutivos del mismo tipo. Véase la sección @@ -40262,8 +40298,6 @@ reference "subsec:Anidación-separada" \end_inset para la descripción. -\change_unchanged - \end_layout \begin_layout Subsection diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index b4d8466889..0e7286f7a3 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -155,12 +155,11 @@ logicalmkup \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 false -\author -712698321 "Jürgen Spitzmüller" \end_header \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 \family sans -Édition\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 +Insertion\SpecialChar menuseparator \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 Above \family default - or +\lang french + ou \family sans - Insert\SpecialChar menuseparator +Insertion\SpecialChar menuseparator + +\lang english Separated Below \family default +\lang french . - This inserts a plain separator (red line in \SpecialChar LyX -) and before or behind it the - new list. - Inside nested environments, it is also possible to split the outer environment. -\end_layout - -\end_inset - - -\change_unchanged - + Ceci insère un séparateur ordinaire (une ligne rouge dans la fenêtre \SpecialChar LyX +) + et la nouvelle liste avant ou après. + +\lang english +Inside nested environments, it is also possible to split the outer environment. \end_layout \begin_layout Standard @@ -14454,18 +14424,44 @@ Paquetages \SpecialChar LaTeX \end_inset . - L'option +\end_layout + +\begin_layout Standard + \lang english - +The option \family sans -\lang french -Exporter les tirets de longueur en et &em comme des ligatures +Disallow line breaks after dashes \family default - utiliser les ligatures -- et --- à la place + outputs en- and em-dashes as literal characters +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout + \lang english -of a sigle character -\lang french - pour les tirets de longueur en et em. +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 \begin_layout Standard @@ -17664,32 +17660,10 @@ Alt \family default \family sans -/ AltGr + \family default 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_inset @@ -17823,16 +17797,13 @@ Special Character\SpecialChar menuseparator Symbols \family default - or the -\begin_inset Quotes eld -\end_inset - + or using the +\family typewriter unicode-insert -\begin_inset Quotes erd -\end_inset - +\family default \SpecialChar LyX - function. + function with the Unicode code point as argument (2013 for the em dash + and 2014 for the en dash). \end_layout \begin_layout Standard @@ -17927,15 +17898,19 @@ name "subsec:Dashes-and-line-breaks" \begin_layout Standard \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 \begin_layout Itemize \lang english -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). +In English, line breaks are generally allowed after the dash, but no line + break should occur if only a single character follows the dash (as in A–Z). \end_layout \begin_layout Itemize @@ -17955,22 +17930,43 @@ In French and Spanish, dashes around parenthetical statements are treated \begin_layout Standard \lang english -The dashes that are output by \SpecialChar LyX +By default, dashes are output by \SpecialChar LyX to \SpecialChar LaTeX - by default generally allow for line breaks - after en-dashes and em-dashes. -\end_layout + as +\begin_inset Quotes eld +\end_inset -\begin_layout Standard +ligature dashes +\begin_inset Quotes erd +\end_inset -\lang english -Please note: + (-- and ---). + \SpecialChar LaTeX + allows line breaks after hyphens, en-dashes and em-dashes. \end_layout \begin_layout Enumerate \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 \begin_inset Foot @@ -17992,7 +17988,7 @@ Objets insérés \lang english -, using protected spaces or preceding with + or preceding with \series bold \backslash @@ -18033,7 +18029,7 @@ status open \begin_layout Plain Layout \lang english -368–9 +36–39 \end_layout \end_inset @@ -18042,34 +18038,36 @@ 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 -\lang english -With spaced en dashes +\begin_layout Plain Layout +– \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. +même \end_layout -\begin_layout Itemize -Les incises – -\begin_inset space ~ \end_inset -même si tout le monde ne les aime pas + si tout le monde ne les aime pas \begin_inset space ~ \end_inset @@ -18095,6 +18093,7 @@ nobreakdash —un inciso con rayas— se escribe así. \end_layout +\end_deeper \begin_layout Standard \lang english @@ -18110,15 +18109,6 @@ An incorrect line break is easily overlooked because log. \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 \lang english @@ -18130,12 +18120,41 @@ Settings\SpecialChar menuseparator Fonts\SpecialChar menuseparator Disallow line breaks after dashes \family default -. - In this case optional line breaks after individual -\family sans - dashes -\family default - can be re-allowed via the menu +: +\end_layout + +\begin_layout Enumerate + +\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 Insert\SpecialChar menuseparator Formatting\SpecialChar menuseparator @@ -18144,141 +18163,197 @@ Optional line break : \end_layout +\begin_deeper \begin_layout Itemize \lang english Em-dashes without spaces—\SpecialChar allowbreak -as common in American English—\SpecialChar allowbreak -should be broken - after the dash. +common in American English—\SpecialChar allowbreak +should be followed by + a line break opportunity. \end_layout \begin_layout Standard \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 ~ \end_inset -2.1, you could insert en-dashes and em-dashes as -- and ---, respectively; - they were automatically merged to proper (breakable) dashes in the output, - but kept as consecutive hyphen characters in the LyX document. - If you inserted literal dash characters, however, they were output to \SpecialChar LaTeX +2.1, consecutive hyphen characters (-- and ---) in the LyX source were merged + to en or em dashes by LaTeX. + These +\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 \emph on non-breakable \emph default - dashes (this was actually rather by accident than intentionally, but some - used these two forms of dashes deliberately). - As of \SpecialChar LyX +. +\end_layout + +\begin_layout Standard + +\lang english +Since \SpecialChar LyX \begin_inset space ~ \end_inset -2.2, things work differently: consecutive hyphens are merged to dashes immediatel -y in the input. +2.2, consecutive hyphens in the LyX source are exported to \SpecialChar LaTeX + 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 -status collapsed +status open \begin_layout Plain Layout \lang english -The behavior was changed since it led to different look in \SpecialChar LyX -, text export, - HTML export and the PDF export. -\end_layout - +The behavior was changed since +\begin_inset Quotes eld \end_inset - If you copy consecutive hyphens, by contrast, they are output as consecutive - hyphen characters. - An unintended consequence of this change was that all dashes now were output +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. - Since furthermore, in order to maintain the output, occurrences of consecutive - hyphens in documents that were saved by \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.1 or earlier versions, were converted to literal en- and em-dash characters, - 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 -breakable -\emph default - dashes by default, so if you load a document saved previous to LyX 2.2, - you should get the identical output with LyX 2.3 for the dashes inserted - with -- and ---. - Furthermore, \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.3 provides the aforementioned option -\family sans -Disallow line breaks after dashes -\family default - in the menu -\family sans -Document\SpecialChar menuseparator -Settings\SpecialChar menuseparator -Fonts. - -\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 -\family default - to ensure unchanged behavior. + This also resulted in changed line breaks in some older documents. \end_layout -\begin_layout Itemize +\end_inset + + +\end_layout + +\begin_layout Standard \lang english -If you used both literal and --/--- dashes in pre-\SpecialChar LyX +\SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3 outputs +\emph on +breakable +\emph default + dashes by default. + When opening documents edited with \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.2 or earlier and containing literal dash characters not followed by whitespace, + the setting +\family sans +Document\SpecialChar menuseparator +Settings\SpecialChar menuseparator +Fonts\SpecialChar menuseparator +Disallow line breaks after dashes +\family default + 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 + +ligature +\begin_inset Quotes erd +\end_inset + + dashes in pre-\SpecialChar LyX \begin_inset space ~ \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. \end_layout -\begin_layout Itemize - -\lang english -Zero-width space (ZWSP) characters in older \SpecialChar LyX - documents that follow literal - em- and en-dashes are removed during the conversion to the format of \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.3. - If you used them as optional line breaks after dashes, convert them to - space insets before opening your document with \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.3 or the optional line breaks will be lost. -\end_layout - \begin_layout Subsection Césure \begin_inset Index idx @@ -18373,6 +18428,14 @@ Paramètres \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 \begin_layout Standard @@ -40018,33 +40081,6 @@ reference "subsec:Profondeur-section" . \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 Le menu Affichage \begin_inset Index idx @@ -41545,33 +41581,16 @@ reference "sec:Notes_en_Marge" \end_inset . -\change_inserted -712698321 1514711591 - \end_layout \begin_layout Subsection -\change_inserted -712698321 1514711598 -Début de nouvel environnement -\begin_inset Note Note -status open - -\begin_layout Plain Layout - -\change_inserted -712698321 1514711602 -above/below -\change_unchanged - -\end_layout - -\end_inset - - +\family sans +\lang english +Separate (Above/Below) \end_layout \begin_layout Standard - -\change_inserted -712698321 1514711591 Ces menus ne sont visibles que s'il est possible d'avoir deux environnements consécutifs de même type. Voir la section @@ -41586,8 +41605,6 @@ reference "subsec:Separate-Emboîtements" \end_inset pour une explication. -\change_unchanged - \end_layout \begin_layout Subsection diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index 2f769579d0..595afb8b06 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -173,7 +173,6 @@ End \html_math_output 0 \html_css_as_file 0 \html_be_strict true -\author -712698321 "Jürgen Spitzmüller" \end_header \begin_body @@ -9227,31 +9226,7 @@ name "subsec:入れ子の分離" \begin_layout Standard 既存の箇条書きを2つの箇条書きに分けるには，カーソルを箇条書き項目の終わりに置いて， \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 -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 Above \family default @@ -9260,18 +9235,11 @@ Separated Above Insert\SpecialChar menuseparator Separated Below \family default -. - This inserts a plain separator (red line in \SpecialChar LyX -) and before or behind it the - new list. - Inside nested environments, it is also possible to split the outer environment. -\end_layout - -\end_inset - - -\change_unchanged - +\lang japanese +．すると，分離記号が挿入され(\SpecialChar LyX +中では赤線)，その後から新規の箇条書きが始まります． +\lang english +Inside nested environments, it is also possible to split the outer environment. \end_layout \begin_layout Standard @@ -11701,14 +11669,44 @@ latexはつけじ@\SpecialChar LaTeX \end_inset ． +\end_layout + +\begin_layout Standard + \lang english -The option +The option \family sans -\lang japanese -ダッシュと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 -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 \begin_layout Standard @@ -13980,29 +13978,10 @@ Alt \family default \family sans -/ AltGr + \family default 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_inset @@ -14125,16 +14104,13 @@ Special Character\SpecialChar menuseparator Symbols \family default - or the -\begin_inset Quotes eld -\end_inset - + or using the +\family typewriter unicode-insert -\begin_inset Quotes erd -\end_inset - +\family default \SpecialChar LyX - function. + function with the Unicode code point as argument (2013 for the em dash + and 2014 for the en dash). \end_layout \begin_layout Standard @@ -14154,7 +14130,7 @@ line- and page-breaks \end_layout \begin_layout Enumerate -From A–Z; +A–Z; \lang english pages \begin_inset space ~ @@ -14219,15 +14195,19 @@ name "subsec:Dashes-and-line-breaks" \begin_layout Standard \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 \begin_layout Itemize \lang english -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). +In English, line breaks are generally allowed after the dash, but no line + break should occur if only a single character follows the dash (as in A–Z). \end_layout \begin_layout Itemize @@ -14247,22 +14227,43 @@ In French and Spanish, dashes around parenthetical statements are treated \begin_layout Standard \lang english -The dashes that are output by \SpecialChar LyX +By default, dashes are output by \SpecialChar LyX to \SpecialChar LaTeX - by default generally allow for line breaks - after en-dashes and em-dashes. -\end_layout + as +\begin_inset Quotes eld +\end_inset -\begin_layout Standard +ligature dashes +\begin_inset Quotes erd +\end_inset -\lang english -Please note: + (-- and ---). + \SpecialChar LaTeX + allows line breaks after hyphens, en-dashes and em-dashes. \end_layout \begin_layout Enumerate \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 status collapsed @@ -14286,7 +14287,7 @@ Objects \end_inset -, using protected spaces or preceding with + or preceding with \series bold \backslash @@ -14327,7 +14328,7 @@ status open \begin_layout Plain Layout \lang english -368–9 +36–39 \end_layout \end_inset @@ -14337,35 +14338,39 @@ status open \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 -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 ~ \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 ~ \end_inset @@ -14391,6 +14396,7 @@ nobreakdash —un inciso con rayas— se escribe así. \end_layout +\end_deeper \begin_layout Standard \lang english @@ -14406,15 +14412,6 @@ An incorrect line break is easily overlooked because log. \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 \lang english @@ -14426,12 +14423,43 @@ Settings\SpecialChar menuseparator Fonts\SpecialChar menuseparator Disallow line breaks after dashes \family default -. - In this case optional line breaks after individual -\family sans - dashes -\family default - can be re-allowed via the menu +: +\end_layout + +\begin_layout Enumerate + +\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 Insert\SpecialChar menuseparator Formatting\SpecialChar menuseparator @@ -14440,141 +14468,201 @@ Optional line break : \end_layout +\begin_deeper \begin_layout Itemize \lang english Em-dashes without spaces—\SpecialChar allowbreak -as common in American English—\SpecialChar allowbreak -should be broken - after the dash. +common in American English—\SpecialChar allowbreak +should be followed by + a line break opportunity. \end_layout \begin_layout Standard \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 ~ \end_inset -2.1, you could insert en-dashes and em-dashes as -- and ---, respectively; - they were automatically merged to proper (breakable) dashes in the output, - but kept as consecutive hyphen characters in the LyX document. - If you inserted literal dash characters, however, they were output to \SpecialChar LaTeX +2.1, consecutive hyphen characters (-- and ---) in the LyX source were merged + to en or em dashes by LaTeX. + These +\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 \emph on non-breakable \emph default - dashes (this was actually rather by accident than intentionally, but some - used these two forms of dashes deliberately). - As of \SpecialChar LyX +. +\end_layout + +\begin_layout Standard + +\end_layout + +\begin_layout Standard + +\lang english + Since \SpecialChar LyX \begin_inset space ~ \end_inset -2.2, things work differently: consecutive hyphens are merged to dashes immediatel -y in the input. +2.2, consecutive hyphens in the LyX source are exported to \SpecialChar LaTeX + 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 -status collapsed +status open \begin_layout Plain Layout \lang english -The behavior was changed since it led to different look in \SpecialChar LyX -, text export, - HTML export and the PDF export. -\end_layout - +The behavior was changed since +\begin_inset Quotes eld \end_inset - If you copy consecutive hyphens, by contrast, they are output as consecutive - hyphen characters. - An unintended consequence of this change was that all dashes now were output +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. - Since furthermore, in order to maintain the output, occurrences of consecutive - hyphens in documents that were saved by \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.1 or earlier versions, were converted to literal en- and em-dash characters, - 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 -breakable -\emph default - dashes by default, so if you load a document saved previous to LyX 2.2, - you should get the identical output with LyX 2.3 for the dashes inserted - with -- and ---. - Furthermore, \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.3 provides the aforementioned option -\family sans -Disallow line breaks after dashes -\family default - in the menu -\family sans -Document\SpecialChar menuseparator -Settings\SpecialChar menuseparator -Fonts. - -\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 -\family default - to ensure unchanged behavior. + This also resulted in changed line breaks in some older documents. \end_layout -\begin_layout Itemize +\end_inset + + +\end_layout + +\begin_layout Standard \lang english -If you used both literal and --/--- dashes in pre-\SpecialChar LyX +\SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.3 outputs +\emph on +breakable +\emph default + dashes by default. + When opening documents edited with \SpecialChar LyX + +\begin_inset space ~ +\end_inset + +2.2 or earlier and containing literal dash characters not followed by whitespace, + the setting +\family sans +Document\SpecialChar menuseparator +Settings\SpecialChar menuseparator +Fonts\SpecialChar menuseparator +Disallow line breaks after dashes +\family default + 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 + +ligature +\begin_inset Quotes erd +\end_inset + + dashes in pre-\SpecialChar LyX \begin_inset space ~ \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. \end_layout -\begin_layout Itemize - -\lang english -Zero-width space (ZWSP) characters in older \SpecialChar LyX - documents that follow literal - em- and en-dashes are removed during the conversion to the format of \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.3. - If you used them as optional line breaks after dashes, convert them to - space insets before opening your document with \SpecialChar LyX - -\begin_inset space ~ -\end_inset - -2.3 or the optional line breaks will be lost. -\end_layout - \begin_layout Subsection ハイフネーション \begin_inset Index idx @@ -14639,6 +14707,13 @@ latexはつけじ@\SpecialChar LaTeX \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 \begin_layout Standard @@ -32419,27 +32494,6 @@ reference "subsec:番号の付け方-深度" 節に説明されているように，環境の入れ子の階層を上げたり下げたりします． \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_inset Index idx @@ -33555,33 +33609,16 @@ reference "sec:傍注" \end_inset 節に説明されているように，傍註を挿入します． -\change_inserted -712698321 1514711647 - \end_layout \begin_layout Subsection -\change_inserted -712698321 1514711654 -新たな環境を開始 -\begin_inset Note Note -status open - -\begin_layout Plain Layout - -\change_inserted -712698321 1514711660 -above/below -\change_unchanged - -\end_layout - -\end_inset - - +\family sans +\lang english +Separate (Above/Below) \end_layout \begin_layout Standard - -\change_inserted -712698321 1514711648 これらのメニューは，同じ型の環境を2つ続けることが可能なときにのみ，表示されます．詳細については，第 \begin_inset CommandInset ref LatexCommand ref @@ -33590,8 +33627,6 @@ reference "subsec:入れ子の分離" \end_inset 節をご覧ください． -\change_unchanged - \end_layout \begin_layout Subsection