The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 182d13ee6aa68c306aa3b2788f6d9ed6c1741f51 Author: Juergen Spitzmueller <[email protected]> Date: Fri Nov 23 18:26:02 2012 +0100 Do not separate the shortcut from the label string diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index 209b335..388af4f 100644 --- a/lib/doc/Customization.lyx +++ b/lib/doc/Customization.lyx @@ -10336,7 +10336,7 @@ Argument \begin_layout Itemize -\change_inserted -712698321 1353680612 +\change_inserted -712698321 1353691469 \begin_inset Flex Code status collapsed @@ -10363,49 +10363,55 @@ status collapsed \end_inset The string that will appear both in the menu (to insert this argument) - and on the argument inset button -\end_layout + and on the argument inset button. + For the menu, you can define an accelerator by appending the respective + character to the string, divided by +\begin_inset Quotes eld +\end_inset -\begin_layout Itemize +| +\begin_inset Quotes erd +\end_inset -\change_inserted -712698321 1353680665 + (e. +\begin_inset space \thinspace{} +\end_inset + +g. + \begin_inset Flex Code status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1353680616 -Tooltip -\end_layout +\change_inserted -712698321 1353691482 +\begin_inset Quotes eld +\end_inset +Short Title|S +\begin_inset Quotes erd \end_inset - -\begin_inset Flex Code -status collapsed -\begin_layout Plain Layout +\change_unchanged -\change_inserted -712698321 1353680623 -[string] \end_layout \end_inset - A longer explanatory text that appears in the tooltip when hovering over - the argument inset. +). \end_layout \begin_layout Itemize -\change_inserted -712698321 1353680719 +\change_inserted -712698321 1353680665 \begin_inset Flex Code status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1353680677 -Shortcut +\change_inserted -712698321 1353680616 +Tooltip \end_layout \end_inset @@ -10416,13 +10422,14 @@ status collapsed \begin_layout Plain Layout -\change_inserted -712698321 1353680681 -[character] +\change_inserted -712698321 1353680623 +[string] \end_layout \end_inset - An accelerator for quick access in the menu. + A longer explanatory text that appears in the tooltip when hovering over + the argument inset. \end_layout \begin_layout Itemize diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout index c820b60..7c8f057 100644 --- a/lib/layouts/IEEEtran.layout +++ b/lib/layouts/IEEEtran.layout @@ -118,9 +118,8 @@ Style Author Category FrontMatter InTitle 1 Argument 1 - LabelString "Short Author" - Shortcut S - Tooltip "A short version of the author name" + LabelString "Short Author|S" + Tooltip "A short version of the author name" EndArgument LatexName author LabelSep xxx @@ -241,8 +240,8 @@ Style Appendix LatexName appendix LabelString "Appendix" Argument 1 - LabelString "Appendix Title" - Tooltip "Optional title of the appendix" + LabelString "Appendix Title" + Tooltip "Optional title of the appendix" EndArgument End @@ -276,8 +275,8 @@ Style Biography LaTeXName IEEEbiography Category BackMatter Argument 1 - LabelString "Biography Photo" - Tooltip "Insert a photo to your biography" + LabelString "Biography Photo" + Tooltip "Insert a photo to your biography" EndArgument Align Block TextFont @@ -304,8 +303,8 @@ Style Proof LatexName IEEEproof NextNoIndent 1 Argument 1 - LabelString "Alternative Proof String" - Tooltip "An alternative proof string" + LabelString "Alternative Proof String" + Tooltip "An alternative proof string" EndArgument LabelSep xx ParIndent MMM diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout index 2afb750..fd8c9c9 100644 --- a/lib/layouts/aastex.layout +++ b/lib/layouts/aastex.layout @@ -620,8 +620,7 @@ Style FigCaption LabelType Static LabelString "Fig. ---" Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The caption as it appears in the list of figures" EndArgument End diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout index 306a348..564574f 100644 --- a/lib/layouts/achemso.layout +++ b/lib/layouts/achemso.layout @@ -73,9 +73,8 @@ Style Title HTMLTag h1 HTMLTitle true Argument 1 - LabelString "Short Title" - Shortcut S - Tooltip "Short title which appears in the running headers" + LabelString "Short Title|S" + Tooltip "Short title which appears in the running headers" EndArgument End @@ -100,9 +99,8 @@ Style Affiliation CopyStyle Author LatexName affiliation Argument 1 - LabelString "Short Affiliation" - Shortcut S - Tooltip "Short version of the affiliation" + LabelString "Short Affiliation|S" + Tooltip "Short version of the affiliation" EndArgument End diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc index f8737b7..4e71d00 100644 --- a/lib/layouts/amsdefs.inc +++ b/lib/layouts/amsdefs.inc @@ -35,8 +35,7 @@ Style Title Align Center LabelType No_Label Argument shorttitle - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "Short title which appears in the running headers" EndArgument Font diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout index 5ce8da1..f3be824 100644 --- a/lib/layouts/apa.layout +++ b/lib/layouts/apa.layout @@ -245,8 +245,7 @@ Style CenteredCaption LabelType Sensitive LabelString "Senseless!" Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The caption as it appears in the list of figures/tables" EndArgument LabelFont diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 0c1e210..60f5b43 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -52,9 +52,8 @@ Style Itemize LatexType Item_Environment LatexName itemize Argument 1 - LabelString "Overlay Specifications" - Shortcut S - Tooltip "Overlay specifications for this list" + LabelString "Overlay Specifications|S" + Tooltip "Overlay specifications for this list" EndArgument NextNoIndent 1 LeftMargin MMN @@ -74,13 +73,12 @@ Style Enumerate LatexType Item_Environment LatexName enumerate Argument 1 - LabelString "Overlay Specifications" - Shortcut S - Tooltip "Overlay specifications for this list" + LabelString "Overlay Specifications|S" + Tooltip "Overlay specifications for this list" EndArgument Argument 2 - LabelString "Mini template" - Tooltip "Mini template for this List" + LabelString "Mini template" + Tooltip "Mini template for this List" EndArgument NextNoIndent 1 LeftMargin MMN @@ -102,13 +100,12 @@ Style Description LatexType Item_environment LatexName description Argument 1 - LabelString "Overlay Specifications" - Shortcut S - Tooltip "Overlay specifications for this list" + LabelString "Overlay Specifications|S" + Tooltip "Overlay specifications for this list" EndArgument Argument 2 - LabelString "Longest label" - Tooltip "The longest label in this list" + LabelString "Longest label|s" + Tooltip "The longest label in this list" EndArgument NextNoIndent 1 LeftMargin MM @@ -133,9 +130,8 @@ Style Part LatexType Command LatexName part Argument 1 - LabelString "Short Title" - Shortcut S - Tooltip "The part as it appears in the table of contents/running headers" + LabelString "Short Title|S" + Tooltip "The part as it appears in the table of contents/running headers" EndArgument NeedProtect 1 NextNoIndent 1 @@ -147,7 +143,7 @@ Style Part Align Center LabelType Static LabelString "Part" - RefPrefix part + RefPrefix part # standard font definition Font @@ -181,9 +177,8 @@ Style Section LabelString "Section \arabic{section}" RefPrefix sec Argument 1 - LabelString "Short Title" - Shortcut S - Tooltip "The section as it appears in the table of contents/running headers" + LabelString "Short Title|S" + Tooltip "The section as it appears in the table of contents/running headers" EndArgument Font @@ -226,11 +221,10 @@ Style Subsection LabelType Counter LabelCounter subsection LabelString "Subsection \arabic{section}.\arabic{subsection}" - RefPrefix sub + RefPrefix sub Argument 1 - LabelString "Short Title" - Shortcut S - Tooltip "The subsection as it appears in the table of contents/running headers" + LabelString "Short Title|S" + Tooltip "The subsection as it appears in the table of contents/running headers" EndArgument # standard font definition @@ -274,11 +268,10 @@ Style Subsubsection LabelType Counter LabelCounter subsubsection LabelString "Subsubsection \arabic{section}.\arabic{subsection}.\arabic{subsubsection}" - RefPrefix sub + RefPrefix sub Argument 1 - LabelString "Short Title" - Shortcut S - Tooltip "The subsubsection as it appears in the table of contents/running headers" + LabelString "Short Title|S" + Tooltip "The subsubsection as it appears in the table of contents/running headers" EndArgument # standard font definition @@ -313,8 +306,8 @@ Style BeginFrame LatexType Command LatexName lyxframeend{}\lyxframe Argument 1 - LabelString "Frame Options" - Tooltip "Frame options (see beamer manual)" + LabelString "Frame Options" + Tooltip "Frame options (see beamer manual)" EndArgument Margin First_Dynamic NextNoIndent 1 @@ -395,13 +388,12 @@ Style AgainFrame LatexType Command LatexName lyxframeend{}\lyxagainframe Argument 1 - LabelString "Overlay Specifications" - Shortcut S - Tooltip "Overlay specifications for this list" + LabelString "Overlay Specifications|S" + Tooltip "Overlay specifications for this list" EndArgument Argument 2 - LabelString "Frame Options" - Tooltip "Frame options (see beamer manual)" + LabelString "Frame Options" + Tooltip "Frame options (see beamer manual)" EndArgument Margin First_Dynamic NextNoIndent 1 @@ -502,8 +494,8 @@ Style Column LabelSep xx LabelString "Start column (increase depth!), width:" Argument 1 - LabelString "Column Options" - Tooltip "Column options (see beamer manual)" + LabelString "Column Options" + Tooltip "Column options (see beamer manual)" EndArgument LeftMargin "Start column (increase depth!), width:xx" @@ -531,8 +523,8 @@ Style Columns LeftMargin "Columnsxx" Argument 1 - LabelString "Columns Options" - Tooltip "Columns options (see beamer manual)" + LabelString "Columns Options" + Tooltip "Columns options (see beamer manual)" EndArgument ParSkip 0.5 @@ -619,8 +611,8 @@ Style Pause LatexName pause Margin First_Dynamic Argument 1 - LabelString "Pause number" - Tooltip "Number of slide where the pause takes effect" + LabelString "Pause number" + Tooltip "Number of slide where the pause takes effect" EndArgument NextNoIndent 1 ParSkip 0 @@ -849,9 +841,8 @@ Style Title Align Center LabelType No_Label Argument 1 - LabelString "Short Title" - Shortcut S - Tooltip "Short title which appears in the sidebar/header" + LabelString "Short Title|S" + Tooltip "Short title which appears in the sidebar/header" EndArgument # standard font definition @@ -885,9 +876,8 @@ Style Subtitle Align Center LabelType No_Label Argument 1 - LabelString "Short Subtitle" - Shortcut S - Tooltip "Short subtitle which appears in the sidebar/header" + LabelString "Short Subtitle|S" + Tooltip "Short subtitle which appears in the sidebar/header" EndArgument # standard font definition @@ -913,9 +903,8 @@ Style Author Align Center LabelType No_Label Argument 1 - LabelString "Short Author" - Shortcut S - Tooltip "Short author which appears in the sidebar/header" + LabelString "Short Author|S" + Tooltip "Short author which appears in the sidebar/header" EndArgument # standard font definition @@ -939,9 +928,8 @@ Style Institute Align Center LabelType No_Label Argument 1 - LabelString "Short Institute" - Shortcut S - Tooltip "Short institute which appears in the sidebar/header" + LabelString "Short Institute|S" + Tooltip "Short institute which appears in the sidebar/header" EndArgument # standard font definition @@ -986,9 +974,8 @@ Style Date Align Center LabelType No_Label Argument 1 - LabelString "Short Date" - Shortcut S - Tooltip "Short date which appears in the sidebar/header" + LabelString "Short Date|S" + Tooltip "Short date which appears in the sidebar/header" EndArgument # standard font definition diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module index 774d999..2f5d2e1 100644 --- a/lib/layouts/bicaption.module +++ b/lib/layouts/bicaption.module @@ -12,8 +12,7 @@ Style "Caption setup" LatexName captionsetup Category FrontMatter Argument 1 - LabelString "Caption Setup Options" - Shortcut S + LabelString "Caption Setup Options|S" Tooltip "Options for the caption setup command (see bicaption manual)" EndArgument Margin Dynamic @@ -45,8 +44,7 @@ Style Bicaption EndArgument Argument 2 Mandatory 1 - LabelString "Second Language Caption Text" - Shortcut S + LabelString "Second Language Caption Text|S" Tooltip "The caption text in the second language" EndArgument Argument 3 diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout index f515d65..0fd66e8 100644 --- a/lib/layouts/dinbrief.layout +++ b/lib/layouts/dinbrief.layout @@ -194,8 +194,7 @@ Style Closing LabelString "Closing:" LatexName closing Argument 1 - LabelString "Signature" - Shortcut S + LabelString "Signature|S" Tooltip "Here you can insert a signature scan" EndArgument KeepEmpty 1 diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout index ede9d4b..7a01df9 100644 --- a/lib/layouts/europecv.layout +++ b/lib/layouts/europecv.layout @@ -34,8 +34,7 @@ Style Section NeedProtect 1 NextNoIndent 1 Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The title as it appears in the header" EndArgument ParSkip 0.4 @@ -57,8 +56,7 @@ Style Item LatexType Command LatexName ecvitem Argument 1 - LabelString "Vertical Space (Item)" - Shortcut S + LabelString "Vertical Space (Item)|S" Tooltip "Adjust the vertical space of this item" EndArgument ParSkip 0.4 @@ -107,8 +105,7 @@ Style MotherTongue LatexType Command LatexName ecvmothertongue Argument 1 - LabelString "Vertical Space (Item)" - Shortcut S + LabelString "Vertical Space (Item)|S" Tooltip "Adjust the vertical space of this item" EndArgument ParSkip 0.4 diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout index 1e4a43a..8db813a 100644 --- a/lib/layouts/iopart.layout +++ b/lib/layouts/iopart.layout @@ -61,8 +61,7 @@ Style Title Category FrontMatter InTitle 1 Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The title as it appears in the running headers" EndArgument ParSkip 0.4 diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout index 4e40004..6f00a04 100644 --- a/lib/layouts/memoir.layout +++ b/lib/layouts/memoir.layout @@ -52,8 +52,7 @@ Input numreport.inc Style Part Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The part as it appears in the table of contents/running headers" EndArgument TocLevel -1 @@ -63,8 +62,7 @@ End Style Chapter Argument 1 - LabelString "Short Title (TOC)" - Shortcut S + LabelString "Short Title (TOC)|S" Tooltip "The chapter as it appears in the table of contents" EndArgument Argument 2 @@ -78,8 +76,7 @@ End Style Chapter* Argument 1 - LabelString "Short Title (TOC)" - Shortcut S + LabelString "Short Title (TOC)|S" Tooltip "The chapter as it appears in the table of contents" EndArgument End @@ -87,8 +84,7 @@ End Style Section Argument 1 - LabelString "Short Title (TOC)" - Shortcut S + LabelString "Short Title (TOC)|S" Tooltip "The section as it appears in the table of contents" EndArgument Argument 2 @@ -102,8 +98,7 @@ End Style Subsection Argument 1 - LabelString "Short Title (TOC)" - Shortcut S + LabelString "Short Title (TOC)|S" Tooltip "The subsection as it appears in the table of contents" EndArgument Argument 2 @@ -117,8 +112,7 @@ End Style Subsubsection Argument 1 - LabelString "Short Title (TOC)" - Shortcut S + LabelString "Short Title (TOC)|S" Tooltip "The subsubsection as it appears in the table of contents" EndArgument Argument 2 @@ -132,8 +126,7 @@ End Style Paragraph Argument 1 - LabelString "Short Title (TOC)" - Shortcut S + LabelString "Short Title (TOC)|S" Tooltip "The paragraph as it appears in the table of contents" EndArgument Argument 2 @@ -147,8 +140,7 @@ End Style Subparagraph Argument 1 - LabelString "Short Title (TOC)" - Shortcut S + LabelString "Short Title (TOC)|S" Tooltip "The subparagraph as it appears in the table of contents" EndArgument Argument 2 @@ -203,8 +195,7 @@ Style Poemtitle ParSep 0.4 Align center Argument 1 - LabelString "Short Title (TOC)" - Shortcut S + LabelString "Short Title (TOC)|S" Tooltip "The poem title as it appears in the table of contents" EndArgument Argument 2 @@ -223,8 +214,7 @@ Style Poemtitle* Category Unnumbered LatexName PoemTitle* Argument 1 - LabelString "Short Title (TOC)" - Shortcut S + LabelString "Short Title (TOC)|S" Tooltip "The poem title as it appears in the table of contents" EndArgument End diff --git a/lib/layouts/revtex4-1.layout b/lib/layouts/revtex4-1.layout index 24a06cf..6c2519d 100644 --- a/lib/layouts/revtex4-1.layout +++ b/lib/layouts/revtex4-1.layout @@ -101,7 +101,6 @@ Style Affiliation_(alternate) LabelString "Affiliation (alternate):" Argument 1 LabelString "Alternate Affiliation Option" - Shortcut S Tooltip "Optional argument to the altaffiliation command" EndArgument PassThru 1 @@ -130,8 +129,7 @@ Style Author_Email LatexName email LabelString "Electronic Address:" Argument 1 - LabelString "Electronic Address Option" - Shortcut S + LabelString "Electronic Address Option|s" Tooltip "Optional argument to the email command" EndArgument PassThru 1 @@ -150,7 +148,6 @@ Style Author_URL LabelString "URL:" Argument 1 LabelString "Author URL Option" - Shortcut S Tooltip "Optional argument to the homepage command" EndArgument PassThru 1 @@ -214,8 +211,7 @@ End Style Title Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "Short title as it appears in the running headers" EndArgument Font diff --git a/lib/layouts/revtex4.layout b/lib/layouts/revtex4.layout index e21ff48..54e7058 100644 --- a/lib/layouts/revtex4.layout +++ b/lib/layouts/revtex4.layout @@ -156,7 +156,6 @@ Style Affiliation_(alternate) LatexName altaffiliation Argument 1 LabelString "Alternate Affiliation Option" - Shortcut S Tooltip "Optional argument to the altaffiliation command" EndArgument LabelString "Affiliation (alternate):" @@ -205,8 +204,7 @@ Style Author_Email ParbreakIsNewline 1 LatexName email Argument 1 - LabelString "Electronic Address Option" - Shortcut S + LabelString "Electronic Address Option|s" Tooltip "Optional argument to the email command" EndArgument LabelString "Electronic Address:" @@ -226,7 +224,6 @@ Style Author_URL LatexName homepage Argument 1 LabelString "Author URL Option" - Shortcut S Tooltip "Optional argument to the homepage command" EndArgument LabelString "URL:" diff --git a/lib/layouts/rsphrase.module b/lib/layouts/rsphrase.module index 94732b0..0704e43 100644 --- a/lib/layouts/rsphrase.module +++ b/lib/layouts/rsphrase.module @@ -45,8 +45,7 @@ Style "Safety phrase" Category MainText NextNoIndent 1 Argument 1 - LabelString "Safety Phrase Option" - Shortcut S + LabelString "Safety Phrase Option|S" Tooltip "Optional argument to the rsphrase command" EndArgument KeepEmpty 1 diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc index 981820a..3ad2071 100644 --- a/lib/layouts/scrclass.inc +++ b/lib/layouts/scrclass.inc @@ -111,8 +111,7 @@ Style Addpart CopyStyle Part* LatexName addpart Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The part as it appears in the table of contents/running headers" EndArgument End @@ -122,8 +121,7 @@ Style Addchap CopyStyle Chapter* LatexName addchap Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The chapter as it appears in the table of contents/running headers" EndArgument End @@ -133,8 +131,7 @@ Style Addsec CopyStyle Section* LatexName addsec Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The section as it appears in the table of contents/running headers" EndArgument End @@ -276,8 +273,7 @@ Style Captionabove LabelType Sensitive LabelString "Senseless!" Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The caption as it appears in the list of figures/tables" EndArgument LabelFont @@ -300,8 +296,7 @@ Style Captionbelow LabelType Sensitive LabelString "Senseless!" Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The caption as it appears in the list of figures/tables" EndArgument LabelFont diff --git a/lib/layouts/siamltex.layout b/lib/layouts/siamltex.layout index fcf5954..1b78fc4 100644 --- a/lib/layouts/siamltex.layout +++ b/lib/layouts/siamltex.layout @@ -202,8 +202,7 @@ Style Title Align Center LabelType No_Label Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The title as it appears in the running headers" EndArgument Font diff --git a/lib/layouts/simplecv.layout b/lib/layouts/simplecv.layout index 73af2ab..741de0d 100644 --- a/lib/layouts/simplecv.layout +++ b/lib/layouts/simplecv.layout @@ -46,8 +46,7 @@ Style Section EndFont TocLevel 1 Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The section as it appears in the table of contents/running headers" EndArgument End diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc index cb7f980..76eeee8 100644 --- a/lib/layouts/stdinsets.inc +++ b/lib/layouts/stdinsets.inc @@ -470,8 +470,7 @@ End InsetLayout Caption Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The caption as it appears in the list of figures/tables" EndArgument HTMLStyle diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc index a23d896..74470e3 100644 --- a/lib/layouts/stdsections.inc +++ b/lib/layouts/stdsections.inc @@ -28,8 +28,7 @@ Style Part Align Center Alignpossible Center Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The part as it appears in the table of contents/running headers" EndArgument Font @@ -58,8 +57,7 @@ Style Chapter ParSep 0.8 Align Block Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The chapter as it appears in the table of contents/running headers" EndArgument Font @@ -87,8 +85,7 @@ Style Section ParSep 0.7 Align Block Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The section as it appears in the table of contents/running headers" EndArgument Font diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout index d102f2a..942b132 100644 --- a/lib/layouts/tufte-book.layout +++ b/lib/layouts/tufte-book.layout @@ -77,8 +77,7 @@ Style Chapter Align Block RefPrefix chap Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The chapter as it appears in the table of contents/running headers" EndArgument Font @@ -105,8 +104,7 @@ Style Section Align Block RefPrefix sec Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The section as it appears in the table of contents/running headers" EndArgument Font diff --git a/lib/layouts/tufte-handout.layout b/lib/layouts/tufte-handout.layout index 8da83b4..07b053a 100644 --- a/lib/layouts/tufte-handout.layout +++ b/lib/layouts/tufte-handout.layout @@ -37,8 +37,7 @@ Style Part Align Center Alignpossible Center Argument 1 - LabelString "Short Title" - Shortcut S + LabelString "Short Title|S" Tooltip "The part as it appears in the table of contents/running headers" EndArgument Font diff --git a/src/Layout.cpp b/src/Layout.cpp index 1524f9c..a2c98ac 100644 --- a/src/Layout.cpp +++ b/src/Layout.cpp @@ -890,9 +890,6 @@ void Layout::readArgument(Lexer & lex) } else if (tok == "tooltip") { lex.next(); arg.tooltip = lex.getDocString(); - } else if (tok == "shortcut") { - lex.next(); - arg.shortcut = lex.getString(); } else if (tok == "requires") { lex.next(); arg.requires = lex.getString(); diff --git a/src/Layout.h b/src/Layout.h index c115c54..469cbf0 100644 --- a/src/Layout.h +++ b/src/Layout.h @@ -94,7 +94,6 @@ public: docstring ldelim; docstring rdelim; docstring tooltip; - std::string shortcut; std::string requires; }; /// diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp index 467d23b..aa3d860 100644 --- a/src/frontends/qt4/Menus.cpp +++ b/src/frontends/qt4/Menus.cpp @@ -1566,8 +1566,6 @@ void MenuDefinition::expandArguments(BufferView const * bv, bool switcharg) for (; lait != laend; ++lait) { Layout::latexarg arg = (*lait).second; QString item = toqstr(translateIfPossible(arg.labelstring)); - if (!arg.shortcut.empty()) - item += "|" + toqstr(arg.shortcut); if (switcharg) add(MenuItem(MenuItem::Command, item, FuncRequest(LFUN_INSET_MODIFY, diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp index de239e1..91ae4aa 100644 --- a/src/insets/InsetArgument.cpp +++ b/src/insets/InsetArgument.cpp @@ -95,7 +95,9 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype) Layout::LaTeXArgMap::const_iterator const lait = args.find(convert<unsigned int>(name_)); if (lait != args.end()) { - labelstring_ = translateIfPossible((*lait).second.labelstring); + docstring label; + support::rsplit(translateIfPossible((*lait).second.labelstring), label, '|'); + labelstring_ = label; tooltip_ = translateIfPossible((*lait).second.tooltip); } else { labelstring_ = _("Unknown Argument"); diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp index 8c34f07..87be22c 100644 --- a/src/insets/InsetLayout.cpp +++ b/src/insets/InsetLayout.cpp @@ -511,9 +511,6 @@ void InsetLayout::readArgument(Lexer & lex) } else if (tok == "tooltip") { lex.next(); arg.tooltip = lex.getDocString(); - } else if (tok == "shortcut") { - lex.next(); - arg.shortcut = lex.getString(); } else if (tok == "requires") { lex.next(); arg.requires = lex.getString(); diff --git a/src/support/lstrings.cpp b/src/support/lstrings.cpp index 346e4e1..e57d873 100644 --- a/src/support/lstrings.cpp +++ b/src/support/lstrings.cpp @@ -1063,6 +1063,20 @@ string const rsplit(string const & a, string & piece, char delim) } +docstring const rsplit(docstring const & a, docstring & piece, char_type delim) +{ + docstring tmp; + size_t i = a.rfind(delim); + if (i != string::npos) { // delimiter was found + piece = a.substr(0, i); + tmp = a.substr(i + 1); + } else { // delimiter was not found + piece.erase(); + } + return tmp; +} + + docstring const rsplit(docstring const & a, char_type delim) { docstring tmp; diff --git a/src/support/lstrings.h b/src/support/lstrings.h index 66ea9df..4845bc6 100644 --- a/src/support/lstrings.h +++ b/src/support/lstrings.h @@ -243,6 +243,7 @@ std::string const split(std::string const & a, char delim); /// Same as split but uses the last delim. std::string const rsplit(std::string const & a, std::string & piece, char delim); +docstring const rsplit(docstring const & a, docstring & piece, char_type delim); docstring const rsplit(docstring const & a, char_type delim); /// Escapes non ASCII chars and other problematic characters that cause ----------------------------------------------------------------------- Summary of changes: lib/doc/Customization.lyx | 51 +++++++++++-------- lib/layouts/IEEEtran.layout | 17 +++---- lib/layouts/aastex.layout | 3 +- lib/layouts/achemso.layout | 10 ++-- lib/layouts/amsdefs.inc | 3 +- lib/layouts/apa.layout | 3 +- lib/layouts/beamer.layout | 99 ++++++++++++++++--------------------- lib/layouts/bicaption.module | 6 +-- lib/layouts/dinbrief.layout | 3 +- lib/layouts/europecv.layout | 9 +-- lib/layouts/iopart.layout | 3 +- lib/layouts/memoir.layout | 30 ++++-------- lib/layouts/revtex4-1.layout | 8 +-- lib/layouts/revtex4.layout | 5 +-- lib/layouts/rsphrase.module | 3 +- lib/layouts/scrclass.inc | 15 ++---- lib/layouts/siamltex.layout | 3 +- lib/layouts/simplecv.layout | 3 +- lib/layouts/stdinsets.inc | 3 +- lib/layouts/stdsections.inc | 9 +-- lib/layouts/tufte-book.layout | 6 +-- lib/layouts/tufte-handout.layout | 3 +- src/Layout.cpp | 3 - src/Layout.h | 1 - src/frontends/qt4/Menus.cpp | 2 - src/insets/InsetArgument.cpp | 4 +- src/insets/InsetLayout.cpp | 3 - src/support/lstrings.cpp | 14 +++++ src/support/lstrings.h | 1 + 29 files changed, 140 insertions(+), 183 deletions(-) hooks/post-receive -- The LyX Source Repository
