anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not separate the shortcut from the label string

Browse Source
This commit is contained in:
Juergen Spitzmueller 2012-11-23 18:26:02 +01:00
parent 6012f66146
commit 182d13ee6a
29 changed files with 149 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
lib/doc/Customization.lyx
View File

@ -10336,7 +10336,7 @@ Argument
\begin_layout Itemize
\change_inserted -712698321 1353680612
\change_inserted -712698321 1353691469
\begin_inset Flex Code
status collapsed
@ -10363,7 +10363,43 @@ status collapsed
\end_inset
The string that will appear both in the menu (to insert this argument)
and on the argument inset button
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_inset Quotes erd
\end_inset
(e.
\begin_inset space \thinspace{}
\end_inset
g.
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
\change_inserted -712698321 1353691482
\begin_inset Quotes eld
\end_inset
Short Title|S
\begin_inset Quotes erd
\end_inset
\change_unchanged
\end_layout
\end_inset
).
\end_layout
\begin_layout Itemize
@ -10398,35 +10434,6 @@ status collapsed
\begin_layout Itemize
\change_inserted -712698321 1353680719
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
\change_inserted -712698321 1353680677
Shortcut
\end_layout
\end_inset
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
\change_inserted -712698321 1353680681
[character]
\end_layout
\end_inset
An accelerator for quick access in the menu.
\end_layout
\begin_layout Itemize
\change_inserted -712698321 1353680874
\begin_inset Flex Code
status collapsed

17
lib/layouts/IEEEtran.layout
View File

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

3
lib/layouts/aastex.layout
View File

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

10
lib/layouts/achemso.layout
View File

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

3
lib/layouts/amsdefs.inc
View File

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

3
lib/layouts/apa.layout
View File

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

99
lib/layouts/beamer.layout
View File

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

6
lib/layouts/bicaption.module
View File

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

3
lib/layouts/dinbrief.layout
View File

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

9
lib/layouts/europecv.layout
View File

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

3
lib/layouts/iopart.layout
View File

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

30
lib/layouts/memoir.layout
View File

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

8
lib/layouts/revtex4-1.layout
View File

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

5
lib/layouts/revtex4.layout
View File

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

3
lib/layouts/rsphrase.module
View File

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

15
lib/layouts/scrclass.inc
View File

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

3
lib/layouts/siamltex.layout
View File

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

3
lib/layouts/simplecv.layout
View File

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

3
lib/layouts/stdinsets.inc
View File

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

9
lib/layouts/stdsections.inc
View File

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

6
lib/layouts/tufte-book.layout
View File

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

3
lib/layouts/tufte-handout.layout
View File

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

3
src/Layout.cpp
View File

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

1
src/Layout.h
View File

@ -94,7 +94,6 @@ public:
docstring ldelim;
docstring rdelim;
docstring tooltip;
std::string shortcut;
std::string requires;
};
///

2
src/frontends/qt4/Menus.cpp
View File

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

4
src/insets/InsetArgument.cpp
View File

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

3
src/insets/InsetLayout.cpp
View File

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

14
src/support/lstrings.cpp
View File

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

1
src/support/lstrings.h
View File

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