mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-21 17:51:03 +00:00
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).
(cherry picked from commit 648ddd25ec
)
This commit is contained in:
parent
402d41b82d
commit
e040ccb0e8
2
NEWS
2
NEWS
@ -469,7 +469,7 @@ http://wiki.lyx.org/LyX/NewInLyX16
|
|||||||
|
|
||||||
* Multiple Work Areas
|
* Multiple Work Areas
|
||||||
* Split Views
|
* Split Views
|
||||||
* User-formattable Collapsable Insets
|
* User-formattable Collapsible Insets
|
||||||
* Layout Modules
|
* Layout Modules
|
||||||
* Layout combobox changes
|
* Layout combobox changes
|
||||||
* Support for the LaTeX package hyperref
|
* Support for the LaTeX package hyperref
|
||||||
|
@ -1350,7 +1350,7 @@ changes happened in particular if possible. A good example would be
|
|||||||
* Format incremented to 290: Add table wrap floats
|
* Format incremented to 290: Add table wrap floats
|
||||||
|
|
||||||
2007-10-03 Martin Vermeer <martin.vermeer@tkk.fi>
|
2007-10-03 Martin Vermeer <martin.vermeer@tkk.fi>
|
||||||
* Format incremented to 289: make Index a collapsable inset.
|
* Format incremented to 289: make Index a collapsible inset.
|
||||||
|
|
||||||
2007-09-25 Richard Heck <rgheck@lyx.org>
|
2007-09-25 Richard Heck <rgheck@lyx.org>
|
||||||
* Format incremented to 288: Change how command insets are
|
* 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 <martin.vermeer@tkk.fi>
|
2007-08-17 Martin Vermeer <martin.vermeer@tkk.fi>
|
||||||
|
|
||||||
* format incremented to 280: the show_label parameter
|
* 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 <martin.vermeer@tkk.fi>
|
2007-08-17 Martin Vermeer <martin.vermeer@tkk.fi>
|
||||||
|
|
||||||
|
@ -889,7 +889,7 @@ def revert_box(document):
|
|||||||
i = i + 1
|
i = i + 1
|
||||||
|
|
||||||
|
|
||||||
def convert_collapsable(document):
|
def convert_collapsible(document):
|
||||||
" Convert collapsed insets. "
|
" Convert collapsed insets. "
|
||||||
i = 0
|
i = 0
|
||||||
while True:
|
while True:
|
||||||
@ -924,7 +924,7 @@ def convert_collapsable(document):
|
|||||||
i = i + 1
|
i = i + 1
|
||||||
|
|
||||||
|
|
||||||
def revert_collapsable(document):
|
def revert_collapsible(document):
|
||||||
" Revert collapsed insets. "
|
" Revert collapsed insets. "
|
||||||
i = 0
|
i = 0
|
||||||
while True:
|
while True:
|
||||||
@ -2474,7 +2474,7 @@ convert = [[222, [insert_tracking_changes, add_end_header, convert_amsmath]],
|
|||||||
convert_table_valignment_middle, convert_breaks]],
|
convert_table_valignment_middle, convert_breaks]],
|
||||||
[226, [convert_note]],
|
[226, [convert_note]],
|
||||||
[227, [convert_box]],
|
[227, [convert_box]],
|
||||||
[228, [convert_collapsable, convert_ert]],
|
[228, [convert_collapsible, convert_ert]],
|
||||||
[229, [convert_minipage]],
|
[229, [convert_minipage]],
|
||||||
[230, [convert_jurabib]],
|
[230, [convert_jurabib]],
|
||||||
[231, [convert_float]],
|
[231, [convert_float]],
|
||||||
@ -2512,7 +2512,7 @@ revert = [[244, []],
|
|||||||
[230, [revert_float]],
|
[230, [revert_float]],
|
||||||
[229, [revert_jurabib]],
|
[229, [revert_jurabib]],
|
||||||
[228, []],
|
[228, []],
|
||||||
[227, [revert_collapsable, revert_ert]],
|
[227, [revert_collapsible, revert_ert]],
|
||||||
[226, [revert_box, revert_external_2]],
|
[226, [revert_box, revert_external_2]],
|
||||||
[225, [revert_note]],
|
[225, [revert_note]],
|
||||||
[224, [rm_end_layout, begin_layout2layout, revert_end_document,
|
[224, [rm_end_layout, begin_layout2layout, revert_end_document,
|
||||||
|
@ -1113,7 +1113,7 @@ def revert_wrapfig_options(document):
|
|||||||
|
|
||||||
|
|
||||||
def convert_latexcommand_index(document):
|
def convert_latexcommand_index(document):
|
||||||
"Convert from LatexCommand form to collapsable form."
|
"Convert from LatexCommand form to collapsible form."
|
||||||
i = 0
|
i = 0
|
||||||
r1 = re.compile('name "(.*)"')
|
r1 = re.compile('name "(.*)"')
|
||||||
while True:
|
while True:
|
||||||
@ -1145,7 +1145,7 @@ def convert_latexcommand_index(document):
|
|||||||
|
|
||||||
|
|
||||||
def revert_latexcommand_index(document):
|
def revert_latexcommand_index(document):
|
||||||
"Revert from collapsable form to LatexCommand form."
|
"Revert from collapsible form to LatexCommand form."
|
||||||
i = 0
|
i = 0
|
||||||
while True:
|
while True:
|
||||||
i = find_token(document.body, "\\begin_inset Index", i)
|
i = find_token(document.body, "\\begin_inset Index", i)
|
||||||
|
@ -787,7 +787,7 @@ bool BufferView::moveToPosition(pit_type bottom_pit, pos_type bottom_pos,
|
|||||||
if (!dit.atEnd()) {
|
if (!dit.atEnd()) {
|
||||||
dit.pos() = min(dit.paragraph().size(), top_pos);
|
dit.pos() = min(dit.paragraph().size(), top_pos);
|
||||||
// Some slices of the iterator may not be
|
// 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
|
// so the dociterator may need to be
|
||||||
// shortened. Otherwise, setCursor may crash
|
// shortened. Otherwise, setCursor may crash
|
||||||
// lyx when the cursor can not be set to these
|
// lyx when the cursor can not be set to these
|
||||||
|
@ -257,7 +257,7 @@ public:
|
|||||||
/// access to full cursor.
|
/// access to full cursor.
|
||||||
Cursor const & cursor() const;
|
Cursor const & cursor() const;
|
||||||
/// sets cursor.
|
/// sets cursor.
|
||||||
/// This will also open all relevant collapsable insets.
|
/// This will also open all relevant collapsible insets.
|
||||||
void setCursor(DocIterator const &);
|
void setCursor(DocIterator const &);
|
||||||
/// set the selection up to dit.
|
/// set the selection up to dit.
|
||||||
void setCursorSelectionTo(DocIterator const & dit);
|
void setCursorSelectionTo(DocIterator const & dit);
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
namespace lyx {
|
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
|
To write full ert (including styles and other insets) in a given
|
||||||
space.
|
space.
|
||||||
|
@ -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
|
class InsetListings : public InsetCaptionable
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
@ -448,7 +448,7 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
|
|||||||
{
|
{
|
||||||
// This implements the standard way of handling the LaTeX
|
// This implements the standard way of handling the LaTeX
|
||||||
// output of a text inset, either a command or an
|
// 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.
|
// redefine this, non-standard ones may call this.
|
||||||
InsetLayout const & il = getLayout();
|
InsetLayout const & il = getLayout();
|
||||||
if (il.forceOwnlines())
|
if (il.forceOwnlines())
|
||||||
|
Loading…
Reference in New Issue
Block a user