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
This commit is contained in:
Daniel Ramoeller 2022-06-08 08:20:37 +02:00 committed by Juergen Spitzmueller
parent ed225b8e04
commit b2a7b715a2
11 changed files with 743 additions and 196 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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.

File diff suppressed because it is too large Load Diff

View File

@ -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{}"

View File

@ -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"

View File

@ -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);
}

View File

@ -1,138 +1,133 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>HSpaceUi</class>
<widget class="QWidget" name="HSpaceUi" >
<property name="geometry" >
<widget class="QWidget" name="HSpaceUi">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>239</width>
<height>110</height>
<width>329</width>
<height>148</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string/>
</property>
<property name="sizeGripEnabled" stdset="0" >
<property name="sizeGripEnabled" stdset="0">
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="1" >
<widget class="QComboBox" name="fillPatternCO" >
<property name="toolTip" >
<layout class="QGridLayout">
<item row="2" column="1">
<widget class="QComboBox" name="fillPatternCO">
<property name="toolTip">
<string>Select a fill pattern style for HFills</string>
</property>
<item>
<property name="text" >
<property name="text">
<string>None</string>
</property>
</item>
<item>
<property name="text" >
<property name="text">
<string>...............</string>
</property>
</item>
<item>
<property name="text" >
<property name="text">
<string>________</string>
</property>
</item>
<item>
<property name="text" >
<property name="text">
<string>&lt;-----------</string>
</property>
</item>
<item>
<property name="text" >
<string>-----------></string>
<property name="text">
<string>-----------&gt;</string>
</property>
</item>
<item>
<property name="text" >
<property name="text">
<string>\-----v-----/</string>
</property>
</item>
<item>
<property name="text" >
<property name="text">
<string>/-----^-----\</string>
</property>
</item>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="spacingL" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="spacingL">
<property name="text">
<string>&amp;Spacing:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>spacingCO</cstring>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2" >
<widget class="QComboBox" name="spacingCO" >
<property name="toolTip" >
<item row="0" column="1" colspan="2">
<widget class="QComboBox" name="spacingCO">
<property name="toolTip">
<string>Supported spacing types</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QLabel" name="valueL" >
<property name="text" >
<item row="1" column="0">
<widget class="QLabel" name="valueL">
<property name="text">
<string>&amp;Value:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>valueLE</cstring>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QLineEdit" name="valueLE" >
<property name="enabled" >
<item row="1" column="1">
<widget class="QLineEdit" name="valueLE">
<property name="enabled">
<bool>false</bool>
</property>
<property name="toolTip" >
<string>Custom value. Needs spacing type "Custom".</string>
<property name="toolTip">
<string>Custom value. Needs spacing type &quot;Custom&quot;.</string>
</property>
</widget>
</item>
<item row="1" column="2" >
<widget class="lyx::frontend::LengthCombo" name="unitCO" />
<item row="1" column="2">
<widget class="lyx::frontend::LengthCombo" name="unitCO"/>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="fillPatternL" >
<property name="text" >
<item row="2" column="0">
<widget class="QLabel" name="fillPatternL">
<property name="text">
<string>&amp;Fill Pattern:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>fillPatternCO</cstring>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="keepL" >
<property name="toolTip" >
<item row="3" column="0">
<widget class="QLabel" name="keepL">
<property name="toolTip">
<string/>
</property>
<property name="text" >
<string>&amp;Protect:</string>
<property name="text">
<string>&amp;Non-Breaking:</string>
</property>
<property name="buddy" >
<property name="buddy">
<cstring>keepCB</cstring>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2" >
<widget class="QCheckBox" name="keepCB" >
<property name="toolTip" >
<string>Insert the spacing even after a line break</string>
<item row="3" column="1" colspan="2">
<widget class="QCheckBox" name="keepCB">
<property name="toolTip">
<string>Prevent automatic line break at the space</string>
</property>
<property name="text" >
<property name="text">
<string/>
</property>
</widget>
@ -152,7 +147,7 @@
<tabstop>keepCB</tabstop>
</tabstops>
<includes>
<include location="local" >qt_i18n.h</include>
<include location="local">qt_i18n.h</include>
</includes>
<resources/>
<connections/>

View File

@ -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;
}