From: Daniel Ramoeller Date: Wed, 8 Jun 2022 06:20:37 +0000 (+0200) Subject: Make space names more standard X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b2a7b715a2c;p=features.git Make space names more standard Fix for bug #12547. - "Interword" becomes "Normal" - "Protected" becomes "Non-Breaking" Plus a minor fixes to the "Horizontal Space Settings" dialog: - Indicate that when "Non-Breaking" is disabled, the space will be non-breaking --- diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index 7d6000ad7b..a1c105e606 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 608 +\lyxformat 609 \begin_document \begin_header \save_transient_properties true @@ -129,6 +129,7 @@ shapepar \docbook_table_output 0 \docbook_mathml_prefix 1 \author -712698321 "Jürgen Spitzmüller" +\author 177693 "x" \author 5863208 "ab" \author 244031559 "Yuriy" \author 630872221 "Jean-Pierre Chrétien" jeanpierre.chretien@free.fr @@ -2214,11 +2215,23 @@ misuse status collapsed \begin_layout Plain Layout + +\change_deleted 177693 1654669036 Protected +\change_inserted 177693 1654669038 +Non-Breaking +\change_unchanged + \begin_inset space ~ \end_inset + +\change_deleted 177693 1654669040 Blanks +\change_inserted 177693 1654669041 +Spaces +\change_unchanged + \end_layout \end_inset diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index cd5d71d0b3..abc6f2399c 100644 --- a/lib/doc/Customization.lyx +++ b/lib/doc/Customization.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 608 +\lyxformat 609 \begin_document \begin_header \save_transient_properties true @@ -141,6 +141,7 @@ logicalmkup \author -712698321 "Jürgen Spitzmüller" \author -584632292 "Richard Kimberly Heck" \author -495245474 "Jean-Marc Lasgouttes" +\author 177693 "x" \author 5863208 "ab" \author 34634807 "Jean-Pierre" \author 232239728 "Owner" @@ -14597,7 +14598,19 @@ FreeSpacing Note that \change_unchanged \SpecialChar LyX - will create protected blanks for the additional blanks when + will create +\change_deleted 177693 1654669077 +protected +\change_inserted 177693 1654669079 +non-breaking +\change_unchanged + +\change_deleted 177693 1654669082 +blanks +\change_inserted 177693 1654669082 +spaces +\change_unchanged + for the additional blanks when \change_deleted 34634807 1619626461 in \change_unchanged @@ -15544,7 +15557,13 @@ Manual \end_inset means the label is the very first word (up to the first real blank). - Use protected spaces if you want more than one word as the label. + Use +\change_deleted 177693 1654669087 +protected +\change_inserted 177693 1654669089 +non-breaking +\change_unchanged + spaces if you want more than one word as the label. \end_layout diff --git a/lib/doc/EmbeddedObjects.lyx b/lib/doc/EmbeddedObjects.lyx index b293f753f0..e9a893796f 100644 --- a/lib/doc/EmbeddedObjects.lyx +++ b/lib/doc/EmbeddedObjects.lyx @@ -252,6 +252,7 @@ varwidth \docbook_mathml_prefix 1 \author -1382599118 "Daniel" \author -712698321 "Jürgen Spitzmüller" +\author 177693 "x" \author 630872221 "Jean-Pierre Chrétien" jeanpierre.chretien@free.fr \end_header @@ -26539,8 +26540,14 @@ arg "dialog-show-new-inset ref" \end_layout \begin_layout Standard -It is recommended that you use a protected space between the cross-reference - name and its number to avoid line breaks between them. +It is recommended that you use a +\change_deleted 177693 1654669168 +protected +\change_inserted 177693 1654669170 +non-breaking +\change_unchanged + space between the cross-reference name and its number to avoid line breaks + between them. If a cross-reference refers to a non-existing label, you will see two question marks in the output instead of the reference. \end_layout @@ -29608,7 +29615,13 @@ thefigure \begin_inset Quotes erd \end_inset - creates a protected space. + creates a +\change_deleted 177693 1654669177 +protected +\change_inserted 177693 1654669179 +non-breaking +\change_unchanged + space. \end_layout \begin_layout Standard diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index 29577b2bd7..977f36ef65 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 606 +\lyxformat 609 \begin_document \begin_header \save_transient_properties true @@ -232,7 +232,9 @@ subequations \html_css_as_file 0 \html_be_strict false \docbook_table_output 0 +\docbook_mathml_prefix 1 \author -563046850 "Jean-Marc LASGOUTTES" +\author 177693 "x" \author 5863208 "ab" \author 47243155 "Jean-Marc" \author 232239728 "Owner" @@ -1028,11 +1030,23 @@ always be behind the command to end it. This space doesn't appear in the output. When the space should appear in the output, the space must be followed - by a protected space in normal text. + by a +\change_deleted 177693 1654668848 +protected +\change_inserted 177693 1654668851 +non-breaking +\change_unchanged + space in normal text. \end_layout \begin_layout Standard -A protected space is inserted with +A +\change_deleted 177693 1654668857 +protected +\change_inserted 177693 1654668860 +non-breaking +\change_unchanged + space is inserted with \change_inserted 232239728 1610908934 \change_deleted 5863208 1612729787 @@ -1060,7 +1074,13 @@ or with the menu selection \change_inserted 232239728 1610908897 Insert\SpecialChar menuseparator Formatting\SpecialChar menuseparator -Protected Space + +\change_deleted 177693 1654668863 +Protected +\change_inserted 177693 1654668975 +Non-Breaking Normal +\change_inserted 232239728 1610908897 + Space \family default or \change_inserted 5863208 1612729638 @@ -11215,7 +11235,13 @@ Space ! horizontal ! predefined \begin_layout Standard Sometimes it is necessary to insert horizontal space into a formula. - This is done by inserting a protected space (shortcut + This is done by inserting a +\change_deleted 177693 1654668870 +protected +\change_inserted 177693 1654668872 +non-breaking +\change_unchanged + space (shortcut \change_inserted 5863208 1612729962 \begin_inset Info @@ -11812,7 +11838,13 @@ Number of \family sans Space \family default - keystrokes after inserting the protected space + keystrokes after inserting the +\change_deleted 177693 1654668881 +protected +\change_inserted 177693 1654668883 +non-breaking +\change_unchanged + space \end_layout \end_inset diff --git a/lib/doc/Tutorial.lyx b/lib/doc/Tutorial.lyx index 2f7de8688f..f07252a2c6 100644 --- a/lib/doc/Tutorial.lyx +++ b/lib/doc/Tutorial.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 600 +\lyxformat 609 \begin_document \begin_header \save_transient_properties true @@ -21,9 +21,9 @@ logicalmkup \font_default_family default \use_non_tex_fonts false \font_sc false +\font_roman_osf false \font_sans_osf false \font_typewriter_osf false -\font_roman_osf false \font_sf_scale 100 100 \font_tt_scale 100 100 \use_microtype false @@ -88,14 +88,19 @@ logicalmkup \papercolumns 1 \papersides 2 \paperpagestyle headings +\tablestyle default \tracking_changes true -\postpone_fragile_content false \output_changes false +\change_bars false +\postpone_fragile_content false \html_math_output 0 \html_css_as_file 0 \html_be_strict false +\docbook_table_output 0 +\docbook_mathml_prefix 1 \author -712698321 "Jürgen Spitzmüller" \author -131811572 "Yuriy Skalko" +\author 177693 "x" \end_header \begin_body @@ -1630,11 +1635,25 @@ Return item \emph default , one way is to use the +\change_deleted 177693 1654668928 + \family sans Protected +\change_inserted 177693 1654668930 +Non-Breaking +\change_deleted 177693 1654668945 + \begin_inset space ~ \end_inset + +\change_inserted 177693 1654668949 +Normal +\begin_inset space ~ +\end_inset + + +\change_unchanged Break \family default , which you get by typing @@ -1773,11 +1792,25 @@ List ) from the rest of the paragraph. If you want to have more than one word in the definition, then separate the words with +\change_deleted 177693 1654668936 + \family sans Protected +\change_inserted 177693 1654668939 +Non-Breaking +\change_unchanged + +\begin_inset space ~ +\end_inset + + +\change_inserted 177693 1654668953 +Normal \begin_inset space ~ \end_inset + +\change_unchanged Space \family default s. diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 94047f1fef..b68195b7bd 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -161,6 +161,7 @@ logicalmkup \author -584632292 "Richard Kimberly Heck" \author -563046850 "Jean-Marc LASGOUTTES" \author -131811572 "Yuriy Skalko" +\author 177693 "x" \author 5863208 "ab" \author 5863344 "Enrico Forestieri" \author 244031559 "Yuriy" @@ -6884,8 +6885,14 @@ Space key ends the label if you are at the beginning of the first line of an item. If you need to use more than one word in a label use a +\change_deleted 177693 1654619261 + \family sans -Protected Space +Protected +\change_inserted 177693 1654619261 +Non-Breaking +\change_unchanged + Space \family default . (Use either @@ -6898,7 +6905,13 @@ arg "command-alternatives math-space ; space-insert protected" \family sans Insert\SpecialChar menuseparator Formatting\SpecialChar menuseparator + +\change_deleted 177693 1654619271 Protected +\change_inserted 177693 1654619271 +Non-Breaking +\change_unchanged + \begin_inset space ~ \end_inset @@ -6924,8 +6937,14 @@ Second \end_inset Example: This one shows how to use a +\change_deleted 177693 1654619281 + \family sans Protected +\change_inserted 177693 1654619281 +Non-Breaking +\change_unchanged + \begin_inset space ~ \end_inset @@ -7040,7 +7059,12 @@ word Space \family default after the beginning of the first line of an item marks the end of the label. - If you need to use more than one word in an item label, use a protected + If you need to use more than one word in an item label, use a +\change_deleted 177693 1654619285 +protected +\change_inserted 177693 1654619287 +non-breaking +\change_unchanged space as described above. \end_layout @@ -7216,13 +7240,25 @@ Labeling default. You can use additional \family sans -HFills +H +\change_inserted 177693 1654621595 +orizontal +\change_unchanged +Fills \family default to change how \SpecialChar LyX justifies the item label. \family sans -Hfills +H +\change_inserted 177693 1654621600 +orizontal +\change_deleted 177693 1654621601 +f +\change_inserted 177693 1654621603 +F +\change_unchanged +ills \family default are documented in section \begin_inset space ~ @@ -7255,7 +7291,11 @@ Labeling Right One \family sans -HFill +H +\change_inserted 177693 1654621610 +orizontal +\change_unchanged +Fill \family default at the beginning of the label right justifies it. \end_layout @@ -7271,7 +7311,11 @@ Center One \family sans -HFill +H +\change_inserted 177693 1654621617 +orizontal +\change_unchanged +Fill \family default at the beginning of the label and one at the end centers it. \end_layout @@ -8668,12 +8712,24 @@ In the Space \family default key is treated as a +\change_deleted 177693 1654619837 + \family sans Protected +\change_inserted 177693 1654619839 +Non-Breaking +\change_unchanged + \begin_inset space ~ \end_inset + +\change_deleted 177693 1654619842 Blank +\change_inserted 177693 1654619844 +Space +\change_unchanged + \family default instead of an end-of-word marker. \end_layout @@ -8940,8 +8996,13 @@ Return \family sans Space \family default - key is treated like a normal space in text (not as a protected space) and - you can have empty lines. + key is treated like a normal space in text (not as a +\change_deleted 177693 1654619849 +protected +\change_inserted 177693 1654619851 +non-breaking +\change_unchanged + space) and you can have empty lines. In contrary to \family sans \SpecialChar LyX @@ -8975,12 +9036,14 @@ 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 @@ -8993,6 +9056,7 @@ The following 2 lines are empty: \end_layout \begin_layout Verbatim + Almost everything is allowed in Verbatim:"%&$§#~'` \backslash }][{| @@ -9016,6 +9080,7 @@ Verbatim \end_layout \begin_layout Verbatim* + This is Verbatim*. \end_layout @@ -11226,7 +11291,13 @@ What is a space? While you might be used to pressing the space key anytime \end_layout \begin_layout Subsection -Protected Space + +\change_deleted 177693 1654619480 +Protected +\change_inserted 177693 1654619480 +Non-Breaking +\change_unchanged + Space \begin_inset CommandInset label LatexCommand label name "subsec:Protected-Space" @@ -11238,7 +11309,13 @@ name "subsec:Protected-Space" status collapsed \begin_layout Plain Layout -Spaces ! Protected +Spaces ! +\change_deleted 177693 1654619483 +Protected +\change_inserted 177693 1654619483 +Non-Breaking +\change_unchanged + \end_layout \end_inset @@ -11247,10 +11324,19 @@ Spaces ! Protected \end_layout \begin_layout Standard -The protected space: It is used to tell \SpecialChar LyX +The +\change_deleted 177693 1654619488 +protected +\change_inserted 177693 1654619490 +non-breaking +\change_unchanged + space: It is used to tell \SpecialChar LyX (and \SpecialChar LaTeX -) not to break the line at - that point. +) not to +\change_inserted 177693 1654619513 +automatically +\change_unchanged +break the line at that point. This may be necessary to avoid unlucky line breaks, like in: \end_layout @@ -11270,7 +11356,13 @@ reference "sec:Bibliography" \end_layout \begin_layout Standard -Obviously, it would be a good thing to put a protected space between +Obviously, it would be a good thing to put a +\change_deleted 177693 1654619535 +protected +\change_inserted 177693 1654619537 +non-breaking +\change_unchanged + space between \begin_inset Quotes eld \end_inset @@ -11294,11 +11386,23 @@ reference "sec:Bibliography" \end_inset . - A protected space is set with + A +\change_deleted 177693 1654619542 +protected +\change_inserted 177693 1654619544 +non-breaking +\change_unchanged + space is set with \family sans Insert\SpecialChar menuseparator Formatting\SpecialChar menuseparator + +\change_deleted 177693 1654619548 Protected +\change_inserted 177693 1654619548 +Non-Breaking +\change_unchanged + \begin_inset space ~ \end_inset @@ -11357,7 +11461,24 @@ reference "chap:Units-available-in" \end_layout \begin_layout Subsubsection -Inter-word Space + +\change_deleted 177693 1654667894 +Inter-word +\change_inserted 177693 1654667898 +Normal +\change_unchanged + Space +\change_inserted 177693 1654667914 + +\begin_inset CommandInset label +LatexCommand label +name "subsec:Normal-Space" + +\end_inset + + +\change_deleted 177693 1654667914 + \begin_inset CommandInset label LatexCommand label name "subsec:Inter-word-Space" @@ -11365,11 +11486,19 @@ name "subsec:Inter-word-Space" \end_inset +\change_unchanged + \begin_inset Index idx status collapsed \begin_layout Plain Layout -Spaces ! Inter-word +Spaces ! +\change_deleted 177693 1654667939 +Inter-word +\change_inserted 177693 1654667939 +Normal +\change_unchanged + \end_layout \end_inset @@ -11400,7 +11529,13 @@ reference "subsec:Abbreviations" \family sans Insert\SpecialChar menuseparator Formatting\SpecialChar menuseparator + +\change_deleted 177693 1654667953 Interword +\change_inserted 177693 1654667953 +Normal +\change_unchanged + \begin_inset space ~ \end_inset @@ -11416,6 +11551,10 @@ arg "space-insert normal" \end_layout \begin_layout Subsubsection + +\change_inserted 177693 1654668020 +Non-Breaking +\change_unchanged Thin Space \begin_inset CommandInset label LatexCommand label @@ -11441,6 +11580,10 @@ A \begin_inset Quotes eld \end_inset + +\change_inserted 177693 1654668039 +non-breaking +\change_unchanged thin space \begin_inset Quotes erd \end_inset @@ -11449,7 +11592,13 @@ thin space \begin_inset Quotes eld \end_inset + +\change_deleted 177693 1654619681 protected +\change_inserted 177693 1654619683 +non-breaking +\change_unchanged + \begin_inset Quotes erd \end_inset @@ -11483,6 +11632,10 @@ kg (thin space) \end_inset 10 kg (normal space +\change_inserted 177693 1654668105 +) +\change_unchanged + \end_layout \begin_layout Standard @@ -11490,6 +11643,14 @@ You can insert thin spaces with the menu \family sans Insert\SpecialChar menuseparator Formatting\SpecialChar menuseparator + +\change_inserted 177693 1654668120 +Non-Breaking +\begin_inset space ~ +\end_inset + + +\change_unchanged Thin \begin_inset space ~ \end_inset @@ -11650,7 +11811,17 @@ space A line with a \end_layout \begin_layout Description + +\change_deleted 177693 1654668288 Enspace +\change_inserted 177693 1654668297 +Half +\begin_inset space ~ +\end_inset + +Quad +\change_unchanged + \begin_inset space ~ \end_inset @@ -11670,7 +11841,17 @@ em) A line with an \begin_inset Formula $\gets$ \end_inset - enspace + +\change_deleted 177693 1654668308 +enspace +\change_inserted 177693 1654668324 +half +\begin_inset space ~ +\end_inset + +quad +\change_unchanged + \begin_inset space ~ \end_inset @@ -11702,7 +11883,13 @@ em) A line with a \begin_inset Formula $\gets$ \end_inset - Quad + +\change_deleted 177693 1654668332 +Q +\change_inserted 177693 1654668332 +q +\change_unchanged +uad \begin_inset space ~ \end_inset @@ -11714,7 +11901,17 @@ em) space between the arrows. \end_layout \begin_layout Description -QQuad + +\change_deleted 177693 1654668340 +Q +\change_inserted 177693 1654668345 +Double +\begin_inset space ~ +\end_inset + + +\change_unchanged +Quad \begin_inset space ~ \end_inset @@ -11734,7 +11931,19 @@ em) A line with a \begin_inset Formula $\gets$ \end_inset - QQuad + +\change_deleted 177693 1654668349 +Q +\change_inserted 177693 1654668352 +double +\begin_inset space ~ +\end_inset + +q +\change_deleted 177693 1654668352 +Q +\change_unchanged +uad \begin_inset space ~ \end_inset @@ -11816,10 +12025,10 @@ Width of the different horizontal spaces. \begin_inset Tabular - - + + - + \begin_inset Text \begin_layout Plain Layout @@ -11830,7 +12039,7 @@ Space \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -11843,7 +12052,7 @@ Width - + \begin_inset Text \begin_layout Plain Layout @@ -11852,7 +12061,7 @@ Normal \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -11867,16 +12076,22 @@ em - + \begin_inset Text \begin_layout Plain Layout + +\change_deleted 177693 1654619715 Protected +\change_inserted 177693 1654621248 +Non-breaking Normal +\change_unchanged + \end_layout \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -11891,7 +12106,7 @@ em - + \begin_inset Text \begin_layout Plain Layout @@ -11900,7 +12115,7 @@ Thin \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -11909,13 +12124,25 @@ Thin \end_inset em +\change_inserted 177693 1654620497 + +\begin_inset Formula $\thinspace=\thinspace$ +\end_inset + +3 +\begin_inset space \thinspace{} +\end_inset + +mu +\change_unchanged + \end_layout \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -11926,7 +12153,7 @@ Medium \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -11943,7 +12170,7 @@ mu - + \begin_inset Text \begin_layout Plain Layout @@ -11954,7 +12181,7 @@ Thick \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -11971,7 +12198,7 @@ mu - + \begin_inset Text \begin_layout Plain Layout @@ -11980,10 +12207,12 @@ Negative thin \end_inset - + \begin_inset Text \begin_layout Plain Layout + +\change_deleted 177693 1654620640 -1/6 \begin_inset space \thinspace{} \end_inset @@ -11992,6 +12221,8 @@ em \begin_inset Formula $\thinspace=\thinspace$ \end_inset + +\change_unchanged -3 \begin_inset space \thinspace{} \end_inset @@ -12003,7 +12234,7 @@ mu - + \begin_inset Text \begin_layout Plain Layout @@ -12012,7 +12243,7 @@ Negative medium \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -12027,7 +12258,7 @@ mu - + \begin_inset Text \begin_layout Plain Layout @@ -12036,7 +12267,7 @@ Negative thick \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -12051,11 +12282,23 @@ mu - + \begin_inset Text \begin_layout Plain Layout -Enspace (0.5 + +\change_deleted 177693 1654620687 +Enspace +\change_inserted 177693 1654620689 +Half Quad +\change_unchanged + ( +\change_deleted 177693 1654620678 +0.5 +\change_inserted 177693 1654620679 +1/2 +\change_unchanged + \begin_inset space \thinspace{} \end_inset @@ -12064,22 +12307,40 @@ em) \end_inset - + \begin_inset Text \begin_layout Plain Layout + +\change_deleted 177693 1654620674 0.5 +\change_inserted 177693 1654620676 +1/2 +\change_unchanged + \begin_inset space \thinspace{} \end_inset em +\change_inserted 177693 1654620708 + +\begin_inset Formula $\thinspace=\thinspace$ +\end_inset + +1 +\begin_inset space \thinspace{} +\end_inset + +en +\change_unchanged + \end_layout \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -12092,7 +12353,7 @@ em) \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -12107,11 +12368,17 @@ em - + \begin_inset Text \begin_layout Plain Layout -QQuad (2 + +\change_deleted 177693 1654668383 +Q +\change_inserted 177693 1654668384 +Double +\change_unchanged +Quad (2 \begin_inset space \thinspace{} \end_inset @@ -12120,7 +12387,7 @@ em) \end_inset - + \begin_inset Text \begin_layout Plain Layout @@ -12161,13 +12428,23 @@ Spacing ! Fills \end_layout \begin_layout Standard -Horizontal fills (HFills) are a special \SpecialChar LyX - feature for adding extra space - in a uniform fashion. - An HFill is actually a variable length space, whose length always equals - the remaining space between the left and right margins. - If there is more than one HFill on a line, they divide the available space - equally between themselves. +Horizontal fills (H +\change_inserted 177693 1654621638 +orizontal +\change_unchanged +Fills) are a special \SpecialChar LyX + feature for adding extra space in a uniform fashion. + An H +\change_inserted 177693 1654621642 +orizontal +\change_unchanged +Fill is actually a variable length space, whose length always equals the + remaining space between the left and right margins. + If there is more than one H +\change_inserted 177693 1654621633 +orizontal +\change_unchanged +Fill on a line, they divide the available space equally between themselves. \end_layout \begin_layout Standard @@ -12240,7 +12517,13 @@ is \end_layout \begin_layout Standard -HFills can be made visible when you choose one of the + +\change_deleted 177693 1654621654 +HFill +\change_inserted 177693 1654621654 +Horizontal Fill +\change_unchanged +s can be made visible when you choose one of the \family sans Fill \begin_inset space ~ @@ -12352,16 +12635,34 @@ status open \series bold Note: \series default - If an HFill is at the beginning of a line, and + If an +\change_deleted 177693 1654621656 +HFill +\change_inserted 177693 1654621656 +Horizontal Fill +\change_unchanged + is at the beginning of a line, and \emph on not \emph default in the first line in a paragraph, \SpecialChar LyX ignores it. - This prevents HFills from accidentally being wrapped onto a new line. + This prevents +\change_deleted 177693 1654621657 +HFill +\change_inserted 177693 1654621657 +Horizontal Fill +\change_unchanged +s from accidentally being wrapped onto a new line. If you need space in this case anyway, set the +\change_deleted 177693 1654668432 + \family sans Protect +\change_inserted 177693 1654668434 +Non-Breaking +\change_unchanged + \family default option in the space dialog. \end_layout @@ -12556,21 +12857,37 @@ Space \begin_layout Standard \family sans -SmallSkip +Small +\change_inserted 177693 1654621302 + +\change_unchanged +Skip \family default , \family sans -MedSkip +Med +\change_inserted 177693 1654621304 +ium +\change_unchanged +Skip \family default and \family sans -BigSkip +Big +\change_inserted 177693 1654621306 + +\change_unchanged +Skip \family default are \SpecialChar LaTeX sizes which depend on the font size of the document. \family sans -DefSkip +Def +\change_inserted 177693 1654621298 +ault +\change_unchanged +Skip \family default is the skip adjusted in the dialog \family sans @@ -12595,11 +12912,19 @@ Document ! Settings for the paragraph separation. If you use indentation to separate paragraphs \family sans -DefSkip +Def +\change_inserted 177693 1654621292 +ault +\change_unchanged +Skip \family default is equal to \family sans -MedSkip +Med +\change_inserted 177693 1654621294 +ium +\change_unchanged +Skip \family default . \change_inserted -712698321 1593360527 @@ -12626,7 +12951,11 @@ Line height \begin_layout Standard \family sans -VFill +V +\change_inserted 177693 1654621333 +ertical +\change_unchanged +Fill \family default \begin_inset Index idx @@ -12648,11 +12977,19 @@ Vfill one at the bottom, because the space between them is then maximal. \family sans -VFill +V +\change_inserted 177693 1654621321 +ertical +\change_unchanged +Fill \family default s work like \family sans -HFill +H +\change_inserted 177693 1654621325 +orizontal +\change_unchanged +Fill \family default s: they fill the remaining vertical space on a page with blank space. \begin_inset Foot @@ -12661,7 +12998,11 @@ status collapsed \begin_layout Plain Layout \family sans -HFill +H +\change_inserted 177693 1654621587 +orizontal +\change_unchanged +Fill \family default s are described in section \begin_inset space ~ @@ -12681,12 +13022,20 @@ reference "subsec:Horizontal-Space" If there are several \family sans -VFill +V +\change_inserted 177693 1654621344 +ertical +\change_unchanged +Fill \family default s on a page, they divide the remaining vertical space equally between themselves. You can therefore use \family sans -VFill +V +\change_inserted 177693 1654621329 +ertical +\change_unchanged +Fill \family default s to center text on a page, or even place text 2/3 down a page. \end_layout @@ -19037,7 +19386,13 @@ The Elements of Typographic Style \begin_inset space ~ \end_inset -– can be prevented using protected spaces. +– can be prevented using +\change_deleted 177693 1654619779 +protected +\change_inserted 177693 1654619781 +non-breaking +\change_unchanged + spaces. \end_layout \begin_layout Enumerate @@ -19082,7 +19437,13 @@ nobreakdash in \SpecialChar TeX code \change_inserted -1402925745 1558782753 -, a protected space does not suffice +, a +\change_deleted 177693 1654619787 +protected +\change_inserted 177693 1654619789 +non-breaking +\change_inserted -1402925745 1558782753 + space does not suffice \change_unchanged . Examples @@ -19225,8 +19586,13 @@ Disallow line breaks after dashes \begin_layout Enumerate Line breaks are still allowed after spaced dashes. - They can be prevented using protected spaces (without need for a makebox - or \SpecialChar TeX + They can be prevented using +\change_deleted 177693 1654619794 +protected +\change_inserted 177693 1654619796 +non-breaking +\change_unchanged + spaces (without need for a makebox or \SpecialChar TeX code). Example: \end_layout @@ -19565,12 +19931,23 @@ A-b c 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 - ( + To prevent the shortcut from being broken, you can use a +\change_deleted 177693 1654619800 +protected +\change_inserted 177693 1654619804 +non-breaking +\change_unchanged + hyphen ( \family sans Insert\SpecialChar menuseparator Formatting\SpecialChar menuseparator -Protected Hyphen + +\change_deleted 177693 1654619809 +Protected +\change_inserted 177693 1654619812 +Non-Breaking +\change_unchanged + Hyphen \family default ) or put it into a makebox as described in section \emph on @@ -19710,12 +20087,25 @@ Space \end_inset +\change_inserted 177693 1654667914 + +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:Normal-Space" + +\end_inset + + +\change_deleted 177693 1654667914 + \begin_inset CommandInset ref LatexCommand ref reference "subsec:Inter-word-Space" \end_inset + +\change_unchanged ). \begin_inset Index idx status collapsed @@ -29551,7 +29941,12 @@ When you use a typeface, a blue box is inserted in the formula. \family sans Space \family default - within the box will set the cursor outside, so that you have to use a protected + within the box will set the cursor outside, so that you have to use a +\change_deleted 177693 1654619816 +protected +\change_inserted 177693 1654619818 +non-breaking +\change_unchanged space when you need a space in the box. Here is an example where \begin_inset Quotes eld @@ -30203,7 +30598,13 @@ reference "enu:Second-item" \end_layout \begin_layout Standard -It is recommended to use a protected space +It is recommended to use a +\change_deleted 177693 1654619823 +protected +\change_inserted 177693 1654619826 +non-breaking +\change_unchanged + space \begin_inset Foot status collapsed @@ -42594,11 +42995,23 @@ Language \end_layout \begin_layout Description + +\change_deleted 177693 1654619391 Protected +\change_inserted 177693 1654619396 +Non-Breaking +\change_unchanged + \begin_inset space ~ \end_inset -Hyphen Inserts a hyphen that is protected from line breaks: \SpecialChar nobreakdash +Hyphen Inserts a hyphen that +\change_deleted 177693 1654619439 +is protected from +\change_inserted 177693 1654619443 +prevents automatic +\change_unchanged + line breaks: \SpecialChar nobreakdash \end_layout @@ -42785,11 +43198,23 @@ Subscript Inserts a subscript: test \end_layout \begin_layout Description + +\change_deleted 177693 1654619456 Protected +\change_inserted 177693 1654619456 +Non-Breaking +\change_unchanged + \begin_inset space ~ \end_inset -Space Inserts a protected space as described in section +Space Inserts a +\change_deleted 177693 1654619466 +protected +\change_inserted 177693 1654619468 +non-breaking +\change_unchanged + space as described in section \begin_inset space ~ \end_inset @@ -42813,12 +43238,25 @@ Space Inserts an inter-word space as described in section \end_inset +\change_inserted 177693 1654667914 + +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:Normal-Space" + +\end_inset + + +\change_deleted 177693 1654667914 + \begin_inset CommandInset ref LatexCommand ref reference "subsec:Inter-word-Space" \end_inset + +\change_unchanged . \end_layout diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index e8a1d0a08b..a0ab5a57f8 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -261,21 +261,21 @@ Menuset # InsetSpace context menu # Menu "context-space" - Item "Interword Space|w" "inset-modify space \space{}" - Item "Protected Space|o" "inset-modify space ~" + Item "Normal Space|w" "inset-modify space \space{}" + Item "Non-Breaking Normal Space|o" "inset-modify space ~" Item "Visible Space|a" "inset-modify space \textvisiblespace{}" - Item "Thin Space|T" "inset-modify space \thinspace{}" - Item "Medium Space|M" "inset-modify space \medspace{}" - Item "Thick Space|i" "inset-modify space \thickspace{}" - Item "Negative Thin Space|N" "inset-modify space \negthinspace{}" - Item "Negative Medium Space|v" "inset-modify space \negmedspace{}" - Item "Negative Thick Space|h" "inset-modify space \negthickspace{}" - Item "Half Quad Space (Enskip)|k" "inset-modify space \enskip{}" - Item "Protected Half Quad Space (Enspace)|E" "inset-modify space \enspace{}" - Item "Quad Space|Q" "inset-modify space \quad{}" - Item "Double Quad Space|u" "inset-modify space \qquad{}" + Item "Non-Breaking Thin Space (1/6 em)|T" "inset-modify space \thinspace{}" + Item "Non-Breaking Medium Space (3/9 em)|M" "inset-modify space \medspace{}" + Item "Non-Breaking Thick Space (5/18 em Non-Breaking )|i" "inset-modify space \thickspace{}" + Item "Non-Breaking Negative Thin Space (-1/6 em)|N" "inset-modify space \negthinspace{}" + Item "Non-Breaking Negative Medium Space (-2/9 em)|v" "inset-modify space \negmedspace{}" + Item "Non-Breaking Negative Thick Space (-5/18 em)|h" "inset-modify space \negthickspace{}" + Item "Half Quad Space (1/2 em)|k" "inset-modify space \enskip{}" + Item "Non-Breaking Half Quad Space (1/2 em)|E" "inset-modify space \enspace{}" + Item "Quad Space (1 em)|Q" "inset-modify space \quad{}" + Item "Double Quad Space (2 em)|u" "inset-modify space \qquad{}" Item "Horizontal Fill|F" "inset-modify space \hfill{}" - Item "Protected Horizontal Fill|z" "inset-modify space \hspace*{\fill}" + Item "Non-Breaking Horizontal Fill|z" "inset-modify space \hspace*{\fill}" Item "Horizontal Fill (Dots)|D" "inset-modify space \dotfill{}" Item "Horizontal Fill (Rule)|R" "inset-modify space \hrulefill{}" Item "Horizontal Fill (Left Arrow)|L" "inset-modify space \leftarrowfill{}" diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index ec5c5c0ed6..3cce8aa251 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -415,7 +415,7 @@ Menuset Item "End of Sentence|E" "specialchar-insert end-of-sentence" Item "Plain Quotation Mark|Q" "quote-insert outer auto plain" Item "Inner Quotation Mark|n" "quote-insert inner" - Item "Protected Hyphen|y" "specialchar-insert nobreakdash" + Item "Non-Breaking Hyphen|y" "specialchar-insert nobreakdash" Item "Breakable Slash|a" "specialchar-insert slash" Item "Visible Space|V" "space-insert visible" Item "Menu Separator|M" "specialchar-insert menu-separator" @@ -451,9 +451,9 @@ Menuset Item "Superscript|S" "script-insert superscript" Item "Subscript|u" "script-insert subscript" Separator - Item "Protected Space|P" "space-insert protected" - Item "Interword Space|w" "space-insert normal" - Item "Thin Space|T" "space-insert thin" + Item "Normal Space|w" "space-insert normal" + Item "Non-breaking Normal Space|P" "space-insert protected" + Item "Non-breaking Thin Space|T" "space-insert thin" Item "Horizontal Space...|o" "command-alternatives dialog-show-new-inset space;dialog-show-new-inset mathspace" Item "Horizontal Line...|L" "dialog-show-new-inset line" Item "Vertical Space...|V" "dialog-show-new-inset vspace" diff --git a/src/frontends/qt/GuiHSpace.cpp b/src/frontends/qt/GuiHSpace.cpp index 3c4c62a5d7..bc2696dfc9 100644 --- a/src/frontends/qt/GuiHSpace.cpp +++ b/src/frontends/qt/GuiHSpace.cpp @@ -41,7 +41,7 @@ GuiHSpace::GuiHSpace(bool math_mode, QWidget * parent) setupUi(this); spacingCO->clear(); - spacingCO->addItem(qt_("Interword Space"), "normal"); + spacingCO->addItem(qt_("Normal Space"), "normal"); spacingCO->addItem(qt_("Thin Space (1/6 em)"), "thinspace"); spacingCO->addItem(qt_("Medium Space (2/9 em)"), "medspace"); spacingCO->addItem(qt_("Thick Space (5/18 em)"), "thickspace"); @@ -112,6 +112,10 @@ void GuiHSpace::enableWidgets() const || (selection == "hfill" && no_pattern) || custom; keepCB->setEnabled(enable_keep); keepL->setEnabled(enable_keep); + // When Non-Breaking is disabled indicate that this is a non-breaking state + // by enabling the check-box + if (!enable_keep) + keepCB->setCheckState(Qt::Checked); } diff --git a/src/frontends/qt/ui/HSpaceUi.ui b/src/frontends/qt/ui/HSpaceUi.ui index 026b1577bf..982488acb5 100644 --- a/src/frontends/qt/ui/HSpaceUi.ui +++ b/src/frontends/qt/ui/HSpaceUi.ui @@ -1,138 +1,133 @@ - + + HSpaceUi - - + + 0 0 - 239 - 110 + 329 + 148 - + - + true - - - 9 - - - 6 - - - - + + + + Select a fill pattern style for HFills - + None - + ............... - + ________ - + <----------- - - -----------> + + -----------> - + \-----v-----/ - + /-----^-----\ - - - + + + &Spacing: - + spacingCO - - - + + + Supported spacing types - - - + + + &Value: - + valueLE - - - + + + false - - Custom value. Needs spacing type "Custom". + + Custom value. Needs spacing type "Custom". - - + + - - - + + + &Fill Pattern: - + fillPatternCO - - - + + + - - &Protect: + + &Non-Breaking: - + keepCB - - - - Insert the spacing even after a line break + + + + Prevent automatic line break at the space - + @@ -152,7 +147,7 @@ keepCB - qt_i18n.h + qt_i18n.h diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp index c8d304ecd5..86c8670420 100644 --- a/src/insets/InsetSpace.cpp +++ b/src/insets/InsetSpace.cpp @@ -65,67 +65,67 @@ docstring InsetSpace::toolTip(BufferView const &, int, int) const docstring message; switch (params_.kind) { case InsetSpaceParams::NORMAL: - message = _("Interword Space"); + message = _("Normal Space"); break; case InsetSpaceParams::PROTECTED: - message = _("Protected Space"); + message = _("Non-Breaking Normal Space"); break; case InsetSpaceParams::VISIBLE: - message = _("Visible Space"); + message = _("Non-Breaking Visible Normal Space"); break; case InsetSpaceParams::THIN: - message = _("Thin Space"); + message = _("Non-Breaking Thin Space (1/6 em)"); break; case InsetSpaceParams::MEDIUM: - message = _("Medium Space"); + message = _("Non-Breaking Medium Space (2/9 em)"); break; case InsetSpaceParams::THICK: - message = _("Thick Space"); + message = _("Non-Breaking Thick Space (5/18 em)"); break; case InsetSpaceParams::QUAD: - message = _("Quad Space"); + message = _("Quad Space (1 em)"); break; case InsetSpaceParams::QQUAD: - message = _("Double Quad Space"); + message = _("Double Quad Space (2 em)"); break; case InsetSpaceParams::ENSPACE: - message = _("Enspace"); + message = _("Non-Breaking Half Quad Space (1/2 em)"); break; case InsetSpaceParams::ENSKIP: - message = _("Enskip"); + message = _("Half Quad Space (1/2 em)"); break; case InsetSpaceParams::NEGTHIN: - message = _("Negative Thin Space"); + message = _("Non-Breaking Negative Thin Space (-1/6 em)"); break; case InsetSpaceParams::NEGMEDIUM: - message = _("Negative Medium Space"); + message = _("Non-Breaking Negative Medium Space (-2/9 em)"); break; case InsetSpaceParams::NEGTHICK: - message = _("Negative Thick Space"); + message = _("Non-Breaking Negative Thick Space (-5/18 em)"); break; case InsetSpaceParams::HFILL: message = _("Horizontal Fill"); break; case InsetSpaceParams::HFILL_PROTECTED: - message = _("Protected Horizontal Fill"); + message = _("Non-Breaking Horizontal Fill"); break; case InsetSpaceParams::DOTFILL: - message = _("Horizontal Fill (Dots)"); + message = _("Non-Breaking Horizontal Fill (Dots)"); break; case InsetSpaceParams::HRULEFILL: - message = _("Horizontal Fill (Rule)"); + message = _("Non-Breaking Horizontal Fill (Rule)"); break; case InsetSpaceParams::LEFTARROWFILL: - message = _("Horizontal Fill (Left Arrow)"); + message = _("Non-Breaking Horizontal Fill (Left Arrow)"); break; case InsetSpaceParams::RIGHTARROWFILL: - message = _("Horizontal Fill (Right Arrow)"); + message = _("Non-Breaking Horizontal Fill (Right Arrow)"); break; case InsetSpaceParams::UPBRACEFILL: - message = _("Horizontal Fill (Up Brace)"); + message = _("Non-Breaking Horizontal Fill (Up Brace)"); break; case InsetSpaceParams::DOWNBRACEFILL: - message = _("Horizontal Fill (Down Brace)"); + message = _("Non-Breaking Horizontal Fill (Down Brace)"); break; case InsetSpaceParams::CUSTOM: // FIXME unicode @@ -134,7 +134,7 @@ docstring InsetSpace::toolTip(BufferView const &, int, int) const break; case InsetSpaceParams::CUSTOM_PROTECTED: // FIXME unicode - message = support::bformat(_("Protected Horizontal Space (%1$s)"), + message = support::bformat(_("Non-Breaking Horizontal Space (%1$s)"), from_ascii(params_.length.asString())); break; }