Rename LFUN_OPTIONAL_INSERT as LFUN_ARGUMENT_INSERT.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34597 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3190a74dd5976b153cfe922eabb8b558320184b6..d77710164772cc40459cb96fb3fd12acbf4a46be 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -126,6 +126,9 @@ The following LyX functions have been changed:
   arguments have been inverted in order to allow the replacement of the word
   at current cursor position, even if it is not selected.
 
   arguments have been inverted in order to allow the replacement of the word
   at current cursor position, even if it is not selected.
 

+- LFUN_OPTIONAL_INSERT ("optional-insert") has been renamed LFUN_ARGUMENT_INSERT
+  ("argument-insert").
+

 
 New external programs and libaries:
 -----------------------------------
 
 New external programs and libaries:
 -----------------------------------

diff --git a/lib/ui/classic.ui b/lib/ui/classic.ui
index b531e26a44386174970fda8e7e2b06a78f657ba1..bf5dc1d6c8968c5fc35c397241af63bf85e01458 100644 (file)
--- a/lib/ui/classic.ui
+++ b/lib/ui/classic.ui
@@ -219,7 +219,7 @@ Menuset
                Item "Label...|L" "label-insert"
                Item "Footnote|F" "footnote-insert"
                Item "Marginal Note|M" "marginalnote-insert"
                Item "Label...|L" "label-insert"
                Item "Footnote|F" "footnote-insert"
                Item "Marginal Note|M" "marginalnote-insert"

-               Item "Short Title" "optional-insert"
+               Item "Short Title" "argument-insert"

                Item "Index Entry|I" "index-insert"
                Item "Nomenclature Entry" "nomencl-insert"
                Item "URL...|U" "url-insert"
                Item "Index Entry|I" "index-insert"
                Item "Nomenclature Entry" "nomencl-insert"
                Item "URL...|U" "url-insert"

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index 50486b6993902bb72944ccada3e4769e89fd17c1..bfafa9fe4ee43df74cab30e765bde0071b2d0f5a 100644 (file)
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -308,7 +308,7 @@ Menuset
                OptItem "Demote Section|m" "outline-in"
                OptItem "Move Section Down|D" "outline-down"
                OptItem "Move Section Up|U" "outline-up"
                OptItem "Demote Section|m" "outline-in"
                OptItem "Move Section Down|D" "outline-down"
                OptItem "Move Section Up|U" "outline-up"

-               OptItem "Insert Short Title|T" "optional-insert"
+               OptItem "Insert Short Title|T" "argument-insert"

                OptSubMenu "Insert Regular Expression..." "context-edit-regexp"
                Separator
                OptItem "Accept Change|c" "change-accept"
                OptSubMenu "Insert Regular Expression..." "context-edit-regexp"
                Separator
                OptItem "Accept Change|c" "change-accept"

diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index 9190f516156a7e118c41ee876af264262b1b1557..c5d38a6a794cdef434bf309a91056a623e6e630c 100644 (file)
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -362,7 +362,7 @@ Menuset
                Item "Hyperlink...|k" "href-insert"
                Item "Footnote|F" "footnote-insert"
                Item "Marginal Note|M" "marginalnote-insert"
                Item "Hyperlink...|k" "href-insert"
                Item "Footnote|F" "footnote-insert"
                Item "Marginal Note|M" "marginalnote-insert"

-               Item "Short Title|S" "optional-insert"
+               Item "Short Title|S" "argument-insert"

                Item "TeX Code|X" "ert-insert"
                Item "Program Listing[[Menu]]" "listing-insert"
                Item "Date" "date-insert"
                Item "TeX Code|X" "ert-insert"
                Item "Program Listing[[Menu]]" "listing-insert"
                Item "Date" "date-insert"

diff --git a/src/FuncCode.h b/src/FuncCode.h
index 573a441812a832d517a3b52ce2b73c6000bdb78a..4b5d94a84770e48848b67cc57a028ff60e411829 100644 (file)
--- a/src/FuncCode.h
+++ b/src/FuncCode.h
@@ -274,7 +274,7 @@ enum FuncCode
        LFUN_CHARS_TRANSPOSE,           // Lgb 20010425
        LFUN_ESCAPE,                    // Lgb 20010517
        LFUN_THESAURUS_ENTRY,           // Levon 20010720
        LFUN_CHARS_TRANSPOSE,           // Lgb 20010425
        LFUN_ESCAPE,                    // Lgb 20010517
        LFUN_THESAURUS_ENTRY,           // Levon 20010720

-       LFUN_OPTIONAL_INSERT,           // Martin 12 Aug 2002
+       LFUN_ARGUMENT_INSERT,           // Martin 12 Aug 2002

        // 205
        LFUN_MOUSE_PRESS,               // André 9 Aug 2002
        LFUN_MOUSE_MOTION,              // André 9 Aug 2002
        // 205
        LFUN_MOUSE_PRESS,               // André 9 Aug 2002
        LFUN_MOUSE_MOTION,              // André 9 Aug 2002

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 6d5c1a590856a6a6357a063c9eca5d688da0495e..7a82a6b7cc12641cf26b5672d2f02bc6cd4d751a 100644 (file)
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -317,13 +317,13 @@ void LyXAction::init()
  */
                { LFUN_WRAP_INSERT, "wrap-insert", Noop, Edit },
 /*!
  */
                { LFUN_WRAP_INSERT, "wrap-insert", Noop, Edit },
 /*!

- * \var lyx::FuncCode lyx::LFUN_OPTIONAL_INSERT
- * \li Action: Inserts an optional-argument (short title) inset.
- * \li Syntax: optional-insert
+ * \var lyx::FuncCode lyx::LFUN_ARGUMENT_INSERT
+ * \li Action: Inserts an argument (short title) inset.
+ * \li Syntax: argument-insert

  * \li Origin: vermeer, 12 Aug 2002
  * \endvar
  */
  * \li Origin: vermeer, 12 Aug 2002
  * \endvar
  */

-               { LFUN_OPTIONAL_INSERT, "optional-insert", Noop, Edit },
+               { LFUN_ARGUMENT_INSERT, "argument-insert", Noop, Edit },

 /*!
  * \var lyx::FuncCode lyx::LFUN_LINE_INSERT
  * \li Action: Inserts a horizontal line.
 /*!
  * \var lyx::FuncCode lyx::LFUN_LINE_INSERT
  * \li Action: Inserts a horizontal line.

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 6b13972cc68f7870c1def6d5e8604664cdf89a60..e5a1814b0e5cc8300698d59ad4ee605cec33ad95 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1570,7 +1570,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_ERT_INSERT:
        case LFUN_LISTING_INSERT:
        case LFUN_MARGINALNOTE_INSERT:
        case LFUN_ERT_INSERT:
        case LFUN_LISTING_INSERT:
        case LFUN_MARGINALNOTE_INSERT:

-       case LFUN_OPTIONAL_INSERT:
+       case LFUN_ARGUMENT_INSERT:

        case LFUN_INDEX_INSERT:
        case LFUN_PREVIEW_INSERT:
                // Open the inset, and move the current selection
        case LFUN_INDEX_INSERT:
        case LFUN_PREVIEW_INSERT:
                // Open the inset, and move the current selection


@@ -2341,7 +2341,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_INFO_INSERT:
                code = INFO_CODE;
                break;
        case LFUN_INFO_INSERT:
                code = INFO_CODE;
                break;

-       case LFUN_OPTIONAL_INSERT: {
+       case LFUN_ARGUMENT_INSERT: {

                code = ARG_CODE;
                Layout const & lay = cur.paragraph().layout();
                int const numargs = lay.reqargs + lay.optargs;
                code = ARG_CODE;
                Layout const & lay = cur.paragraph().layout();
                int const numargs = lay.reqargs + lay.optargs;

diff --git a/src/factory.cpp b/src/factory.cpp
index f2af52459e0ceb7d9cddf3ebbc7b6bbb9a494461..4701f9a9abaf7145ef85993e3d26f2fcc17b3fac 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -144,7 +144,7 @@ Inset * createInsetHelper(Buffer * buf, FuncRequest const & cmd)
                case LFUN_MARGINALNOTE_INSERT:
                        return new InsetMarginal(buf);
 
                case LFUN_MARGINALNOTE_INSERT:
                        return new InsetMarginal(buf);
 

-               case LFUN_OPTIONAL_INSERT:
+               case LFUN_ARGUMENT_INSERT:

                        return new InsetArgument(buf);
 
                case LFUN_FLOAT_INSERT:
                        return new InsetArgument(buf);
 
                case LFUN_FLOAT_INSERT:

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 09c78557085a66f6b346c86abdaaeb78ef622484..10471841c727ece08e26e91f484decc2d93c54b3 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -198,7 +198,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
                status.setEnabled(false);
                return true;
 
                status.setEnabled(false);
                return true;
 

-       case LFUN_OPTIONAL_INSERT:
+       case LFUN_ARGUMENT_INSERT:

                status.setEnabled(cur.paragraph().insetList().find(ARG_CODE) == -1);
                return true;
 
                status.setEnabled(cur.paragraph().insetList().find(ARG_CODE) == -1);
                return true;
 

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index f17275ddc3c140862ec574eca193504d8b0b6688..77c1fa63654c2bf775227e1bd78a6c738de6f1c9 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -4296,7 +4296,7 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_MATH_MUTATE:
        case LFUN_MATH_DISPLAY:
        case LFUN_NOTE_INSERT:
        case LFUN_MATH_MUTATE:
        case LFUN_MATH_DISPLAY:
        case LFUN_NOTE_INSERT:

-       case LFUN_OPTIONAL_INSERT:
+       case LFUN_ARGUMENT_INSERT:

        case LFUN_BOX_INSERT:
        case LFUN_BRANCH_INSERT:
        case LFUN_PHANTOM_INSERT:
        case LFUN_BOX_INSERT:
        case LFUN_BRANCH_INSERT:
        case LFUN_PHANTOM_INSERT: