On 2017-10-22, Uwe Stöhr wrote: > El 22.10.2017 a las 20:08, Scott Kostyshak escribió:
>> I would like to propose to freeze the 2.3.x branch at 23:59 UTC on >> Wednesday, for releasing rc1. > +1 > I just checked the docs that all changes are now accepted. There is still the pending patch with the dash documentation update. Günter Exec: git 'diff' 'UserGuide.lyx' 2>&1 Dir: /usr/local/src/lyx/lib/doc/ diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 188a16dc6f..e19bd5a5d8 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -140,11 +140,12 @@ enumitem \papercolumns 1 \papersides 2 \paperpagestyle default -\tracking_changes false +\tracking_changes true \output_changes false \html_math_output 0 \html_css_as_file 0 \html_be_strict true +\author -1402925745 "Günter Milde" \end_header \begin_body @@ -16114,6 +16115,8 @@ minus sign \end_layout \begin_layout Standard + +\change_deleted -1402925745 1508170801 \begin_inset Box Frameless position "t" hor_pos "c" @@ -16402,6 +16405,279 @@ minus sign \end_inset +\change_inserted -1402925745 1508170773 + +\begin_inset Tabular +<lyxtabular version="3" rows="5" columns="3"> +<features tabularvalignment="middle"> +<column alignment="left" valignment="top" width="0pt"> +<column alignment="left" valignment="top"> +<column alignment="left" valignment="top"> +<row interlinespace="3mm"> +<cell alignment="left" valignment="top" bottomline="true" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +name +\end_layout + +\end_inset +</cell> +<cell alignment="center" valignment="top" bottomline="true" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +output +\end_layout + +\end_inset +</cell> +<cell alignment="center" valignment="top" bottomline="true" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +inserted with +\end_layout + +\end_inset +</cell> +</row> +<row interlinespace="3mm"> +<cell alignment="left" valignment="top" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +hyphen +\end_layout + +\end_inset +</cell> +<cell alignment="center" valignment="top" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +- +\end_layout + +\end_inset +</cell> +<cell alignment="center" valignment="top" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +\begin_inset Quotes eld +\end_inset + + +\family typewriter +- +\family default + +\begin_inset Quotes erd +\end_inset + + in text +\end_layout + +\end_inset +</cell> +</row> +<row interlinespace="3mm"> +<cell alignment="left" valignment="top" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +en dash +\end_layout + +\end_inset +</cell> +<cell alignment="center" valignment="top" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +– +\end_layout + +\end_inset +</cell> +<cell alignment="center" valignment="top" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +\begin_inset CommandInset href +LatexCommand href +name "system key combination" +target "https://en.wikipedia.org/wiki/Dash#Encoding.2C_substitution.2C_and_keyboard_shortcuts"; +literal "false" + +\end_inset + + +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +note to translators: Please change the link to point to a version in your + language (see left side-bar in the wikipedia page). +\end_layout + +\end_inset + + or +\begin_inset Quotes eld +\end_inset + +-- +\begin_inset Quotes erd +\end_inset + + in text +\end_layout + +\end_inset +</cell> +</row> +<row interlinespace="3mm"> +<cell alignment="left" valignment="top" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +em dash +\end_layout + +\end_inset +</cell> +<cell alignment="center" valignment="top" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +— +\end_layout + +\end_inset +</cell> +<cell alignment="center" valignment="top" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +\begin_inset CommandInset href +LatexCommand href +name "system key combination" +target "https://en.wikipedia.org/wiki/Dash#Encoding.2C_substitution.2C_and_keyboard_shortcuts"; +literal "false" + +\end_inset + + +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +note to translators: Please change the link to point to a version in your + language (see left side-bar in the wikipedia page). +\end_layout + +\end_inset + + or +\begin_inset Quotes eld +\end_inset + +--- +\begin_inset Quotes erd +\end_inset + + in text +\end_layout + +\end_inset +</cell> +</row> +<row> +<cell alignment="left" valignment="top" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +minus sign +\end_layout + +\end_inset +</cell> +<cell alignment="center" valignment="top" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +\begin_inset Formula $-$ +\end_inset + + +\end_layout + +\end_inset +</cell> +<cell alignment="center" valignment="top" usebox="none"> +\begin_inset Text + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508170773 +\begin_inset Quotes eld +\end_inset + + +\family typewriter +- +\family default + +\begin_inset Quotes erd +\end_inset + + in math mode +\end_layout + +\end_inset +</cell> +</row> +</lyxtabular> + +\end_inset + + +\change_unchanged + \begin_inset VSpace defskip \end_inset @@ -16428,7 +16704,40 @@ unicode-insert \end_inset \SpecialChar LyX - function. + function +\change_inserted -1402925745 1508169009 + (with argument 2013 for the em dash and 2014 for the en dash) +\change_unchanged +. +\change_inserted -1402925745 1508169032 + +\begin_inset Foot +status collapsed + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508169093 +\begin_inset Quotes eld +\end_inset + +unicode-insert +\begin_inset Quotes erd +\end_inset + + can also be used to define shortcuts in +\family sans +Tools\SpecialChar menuseparator +Preferences\SpecialChar menuseparator +Edit +\change_unchanged + +\end_layout + +\end_inset + + +\change_unchanged + \end_layout \begin_layout Standard @@ -16450,7 +16759,11 @@ hyphen \end_layout \begin_layout Enumerate -From A–Z; pages + +\change_deleted -1402925745 1508170862 +From A–Z; +\change_unchanged +pages \begin_inset space ~ \end_inset @@ -16466,7 +16779,11 @@ en dash \end_layout \begin_layout Enumerate -The em dash is used without spaces: Oh—there's a dash. + +\change_deleted -1402925745 1508186214 +The em dash is used without spaces: +\change_unchanged +Oh—there's a dash. \begin_inset space \hfill{} \end_inset @@ -16475,6 +16792,25 @@ The em dash is used without spaces: Oh—there's a dash. em dash \emph default ) +\change_inserted -1402925745 1508186251 + +\begin_inset Foot +status open + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508191091 +Contemporary style guides outside the US favour a spaced en dash in this + place. +\change_unchanged + +\end_layout + +\end_inset + + +\change_unchanged + \end_layout \begin_layout Enumerate @@ -16503,6 +16839,25 @@ literal "false" \end_inset . +\change_inserted -1402925745 1508166373 + +\begin_inset Note Note +status open + +\begin_layout Plain Layout + +\change_inserted -1402925745 1508169366 +note to translators: Please change the link to point to a version in your + language (see left side-bar in the Wikipedia page). +\change_unchanged + +\end_layout + +\end_inset + + +\change_unchanged + \end_layout \begin_layout Subsection @@ -16638,7 +16993,13 @@ nobreakdash \begin_deeper \begin_layout Itemize -Pages + +\change_deleted -1402925745 1508170597 +P +\change_inserted -1402925745 1508170599 +p +\change_unchanged +ages \begin_inset space ~ \end_inset @@ -16805,6 +17166,8 @@ Since \SpecialChar LyX 2.2, -- and --- are exported to LaTeX as -{}- and -{}-{}- to prevent ligation to dashes. +\change_deleted -1402925745 1508192656 + \begin_inset Foot status collapsed @@ -16821,6 +17184,8 @@ Up to \SpecialChar LyX \end_inset + +\change_unchanged Occurrences in older documents are converted to literal Unicode dashes. This led to different line breaks in some documents. \SpecialChar LyX
