commit 648ddd25eca045f34569405aca15c5d638bbb723
Author: Juergen Spitzmueller <[email protected]>
Date: Mon Oct 16 10:03:05 2017 +0200
Collapsable -> Collapsible (part 1)
The current spelling is not strictly wrong, but flagged as unusual or
historical by some authorities. It is also found fault with many
spell checkers. Thus we decided to move to the more standard "-ible"
form once and for all.
See #10678 for discussion
This part only covers the usage in comments and the like. More to follow.
This will all also all be backported to 2.3.x, for the sake of backwards
compatibility (cherry-picking).
---
NEWS | 2 +-
development/FORMAT | 4 ++--
lib/lyx2lyx/lyx_1_4.py | 8 ++++----
lib/lyx2lyx/lyx_1_6.py | 4 ++--
src/BufferView.cpp | 2 +-
src/BufferView.h | 2 +-
src/insets/InsetERT.h | 2 +-
src/insets/InsetListings.h | 2 +-
src/insets/InsetText.cpp | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/NEWS b/NEWS
index 236e602..49be4c4 100644
--- a/NEWS
+++ b/NEWS
@@ -469,7 +469,7 @@ http://wiki.lyx.org/LyX/NewInLyX16
* Multiple Work Areas
* Split Views
-* User-formattable Collapsable Insets
+* User-formattable Collapsible Insets
* Layout Modules
* Layout combobox changes
* Support for the LaTeX package hyperref
diff --git a/development/FORMAT b/development/FORMAT
index 7477ae9..5e0c5bf 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -1350,7 +1350,7 @@ changes happened in particular if possible. A good
example would be
* Format incremented to 290: Add table wrap floats
2007-10-03 Martin Vermeer <[email protected]>
- * Format incremented to 289: make Index a collapsable inset.
+ * Format incremented to 289: make Index a collapsible inset.
2007-09-25 Richard Heck <[email protected]>
* Format incremented to 288: Change how command insets are
@@ -1393,7 +1393,7 @@ changes happened in particular if possible. A good
example would be
2007-08-17 Martin Vermeer <[email protected]>
* format incremented to 280: the show_label parameter
- is depreciated in favour of (Collapsable) status.
+ is depreciated in favour of (Collapsible) status.
2007-08-17 Martin Vermeer <[email protected]>
diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index f88c9a8..9c7c7a5 100644
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -889,7 +889,7 @@ def revert_box(document):
i = i + 1
-def convert_collapsable(document):
+def convert_collapsible(document):
" Convert collapsed insets. "
i = 0
while True:
@@ -924,7 +924,7 @@ def convert_collapsable(document):
i = i + 1
-def revert_collapsable(document):
+def revert_collapsible(document):
" Revert collapsed insets. "
i = 0
while True:
@@ -2474,7 +2474,7 @@ convert = [[222, [insert_tracking_changes,
add_end_header, convert_amsmath]],
convert_table_valignment_middle, convert_breaks]],
[226, [convert_note]],
[227, [convert_box]],
- [228, [convert_collapsable, convert_ert]],
+ [228, [convert_collapsible, convert_ert]],
[229, [convert_minipage]],
[230, [convert_jurabib]],
[231, [convert_float]],
@@ -2512,7 +2512,7 @@ revert = [[244, []],
[230, [revert_float]],
[229, [revert_jurabib]],
[228, []],
- [227, [revert_collapsable, revert_ert]],
+ [227, [revert_collapsible, revert_ert]],
[226, [revert_box, revert_external_2]],
[225, [revert_note]],
[224, [rm_end_layout, begin_layout2layout, revert_end_document,
diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py
index 636d4b2..0712808 100644
--- a/lib/lyx2lyx/lyx_1_6.py
+++ b/lib/lyx2lyx/lyx_1_6.py
@@ -1113,7 +1113,7 @@ def revert_wrapfig_options(document):
def convert_latexcommand_index(document):
- "Convert from LatexCommand form to collapsable form."
+ "Convert from LatexCommand form to collapsible form."
i = 0
r1 = re.compile('name "(.*)"')
while True:
@@ -1145,7 +1145,7 @@ def convert_latexcommand_index(document):
def revert_latexcommand_index(document):
- "Revert from collapsable form to LatexCommand form."
+ "Revert from collapsible form to LatexCommand form."
i = 0
while True:
i = find_token(document.body, "\\begin_inset Index", i)
diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 6b0b5e7..53d374f 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -794,7 +794,7 @@ bool BufferView::moveToPosition(pit_type bottom_pit,
pos_type bottom_pos,
if (!dit.atEnd()) {
dit.pos() = min(dit.paragraph().size(), top_pos);
// Some slices of the iterator may not be
- // reachable (e.g. closed collapsable inset)
+ // reachable (e.g. closed collapsible inset)
// so the dociterator may need to be
// shortened. Otherwise, setCursor may crash
// lyx when the cursor can not be set to these
diff --git a/src/BufferView.h b/src/BufferView.h
index 7de6985..a522259 100644
--- a/src/BufferView.h
+++ b/src/BufferView.h
@@ -260,7 +260,7 @@ public:
/// access to full cursor.
Cursor const & cursor() const;
/// sets cursor.
- /// This will also open all relevant collapsable insets.
+ /// This will also open all relevant collapsible insets.
void setCursor(DocIterator const &);
/// set the selection up to dit.
void setCursorSelectionTo(DocIterator const & dit);
diff --git a/src/insets/InsetERT.h b/src/insets/InsetERT.h
index f92304a..eb6ab91 100644
--- a/src/insets/InsetERT.h
+++ b/src/insets/InsetERT.h
@@ -18,7 +18,7 @@
namespace lyx {
-/** A collapsable text inset for LaTeX insertions.
+/** A collapsible text inset for LaTeX insertions.
To write full ert (including styles and other insets) in a given
space.
diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h
index aa46765..6c90de0 100644
--- a/src/insets/InsetListings.h
+++ b/src/insets/InsetListings.h
@@ -26,7 +26,7 @@ struct TexString;
//
/////////////////////////////////////////////////////////////////////////
-/// A captionable and collapsable text inset for program listings.
+/// A captionable and collapsible text inset for program listings.
class InsetListings : public InsetCaptionable
{
public:
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 8228fd2..28484a4 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -448,7 +448,7 @@ void InsetText::latex(otexstream & os, OutputParams const &
runparams) const
{
// This implements the standard way of handling the LaTeX
// output of a text inset, either a command or an
- // environment. Standard collapsable insets should not
+ // environment. Standard collapsible insets should not
// redefine this, non-standard ones may call this.
InsetLayout const & il = getLayout();
if (il.forceOwnlines())
