Do not separate the shortcut from the label string

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index 209b3352a07aa9a8bf4e437ffce48b318a034780..388af4ff01f70726c36c3917b54f6e90c0771a26 100644 (file)
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -10336,7 +10336,7 @@ Argument
 
 \begin_layout Itemize
 
 
 \begin_layout Itemize
 

-\change_inserted -712698321 1353680612
+\change_inserted -712698321 1353691469

 \begin_inset Flex Code
 status collapsed
 
 \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)
 \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
 
 \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
 
 \end_inset
 

- 
-\begin_inset Flex Code
-status collapsed

 
 

-\begin_layout Plain Layout
+\change_unchanged

 
 

-\change_inserted -712698321 1353680623
-[string]

 \end_layout
 
 \end_inset
 
 \end_layout
 
 \end_inset
 

- A longer explanatory text that appears in the tooltip when hovering over
- the argument inset.
+).

 \end_layout
 
 \begin_layout Itemize
 
 \end_layout
 
 \begin_layout Itemize
 

-\change_inserted -712698321 1353680719
+\change_inserted -712698321 1353680665

 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
 
 \begin_inset Flex Code
 status collapsed
 
 \begin_layout Plain Layout
 

-\change_inserted -712698321 1353680677
-Shortcut
+\change_inserted -712698321 1353680616
+Tooltip

 \end_layout
 
 \end_inset
 \end_layout
 
 \end_inset


@@ -10416,13 +10422,14 @@ status collapsed
 
 \begin_layout Plain Layout
 
 
 \begin_layout Plain Layout
 

-\change_inserted -712698321 1353680681
-[character]
+\change_inserted -712698321 1353680623
+[string]

 \end_layout
 
 \end_inset
 
 \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
 \end_layout
 
 \begin_layout Itemize

diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index c820b60d6f0ef81476769edbb565be198c1f0565..7c8f057b371427bc14c4de8b11fc31efd36aefc0 100644 (file)
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -118,9 +118,8 @@ Style Author
   Category     FrontMatter
   InTitle      1
   Argument 1
   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
   EndArgument
   LatexName    author
   LabelSep     xxx


@@ -241,8 +240,8 @@ Style Appendix
   LatexName    appendix
   LabelString  "Appendix"
   Argument 1
   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
 
  EndArgument
 End
 


@@ -276,8 +275,8 @@ Style Biography
   LaTeXName    IEEEbiography
   Category     BackMatter
   Argument 1
   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
   EndArgument
   Align        Block
   TextFont


@@ -304,8 +303,8 @@ Style Proof
   LatexName    IEEEproof
   NextNoIndent 1
   Argument 1
   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
   EndArgument
   LabelSep     xx
   ParIndent    MMM

diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 2afb7508790d989e6b69cb041a8e8ad360ca41c2..fd8c9c9d30c0454c6d5a480316bc7f360e869357 100644 (file)
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -620,8 +620,7 @@ Style FigCaption
        LabelType             Static
        LabelString           "Fig. ---"
        Argument 1
        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
                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 306a348ab6f5dcdbdd85721f8277c08547cd1e9b..564574fa94c2076fb3f5838e51f7611476d11661 100644 (file)
--- a/lib/layouts/achemso.layout
+++ b/lib/layouts/achemso.layout
@@ -73,9 +73,8 @@ Style Title
   HTMLTag               h1
   HTMLTitle             true
   Argument 1
   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  
 
   EndArgument
 End  
 


@@ -100,9 +99,8 @@ Style Affiliation
   CopyStyle             Author
   LatexName             affiliation
   Argument 1
   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
 
   EndArgument
 End
 

diff --git a/lib/layouts/amsdefs.inc b/lib/layouts/amsdefs.inc
index f8737b7d45ee52c55bb4af0aa28f0e022b1ebd65..4e71d008c84ff714cf5f3a1d5420f7d0670b73ad 100644 (file)
--- a/lib/layouts/amsdefs.inc
+++ b/lib/layouts/amsdefs.inc
@@ -35,8 +35,7 @@ Style Title
        Align                 Center
        LabelType             No_Label
        Argument shorttitle
        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
                Tooltip       "Short title which appears in the running headers"
        EndArgument
        Font

diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index 5ce8da1e52c681a9169068146e03c2c6a1c22bf9..f3be8246d34e2d6dd963d67efe54015371bd6fa4 100644 (file)
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -245,8 +245,7 @@ Style CenteredCaption
        LabelType             Sensitive
        LabelString           "Senseless!"
        Argument 1
        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
                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 0c1e210d30e391c2af162e425e9189130e8fd27b..60f5b43011ecf8754d31693ab845f33592d98014 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -52,9 +52,8 @@ Style Itemize
   LatexType        Item_Environment
   LatexName        itemize
   Argument 1
   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
   EndArgument
   NextNoIndent     1
   LeftMargin       MMN


@@ -74,13 +73,12 @@ Style Enumerate
   LatexType        Item_Environment
   LatexName        enumerate
   Argument 1
   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
   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
   EndArgument
   NextNoIndent     1
   LeftMargin       MMN


@@ -102,13 +100,12 @@ Style Description
   LatexType        Item_environment
   LatexName        description
   Argument 1
   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
   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
   EndArgument
   NextNoIndent     1
   LeftMargin       MM


@@ -133,9 +130,8 @@ Style Part
   LatexType        Command
   LatexName        part
   Argument 1
   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
   EndArgument
   NeedProtect      1
   NextNoIndent     1


@@ -147,7 +143,7 @@ Style Part
   Align            Center
   LabelType        Static
   LabelString      "Part"
   Align            Center
   LabelType        Static
   LabelString      "Part"

-       RefPrefix        part
+  RefPrefix        part

 
   # standard font definition
   Font 
 
   # standard font definition
   Font 


@@ -181,9 +177,8 @@ Style Section
   LabelString      "Section \arabic{section}"
   RefPrefix        sec
   Argument 1
   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 
   EndArgument
 
   Font 


@@ -226,11 +221,10 @@ Style Subsection
   LabelType        Counter
   LabelCounter     subsection
   LabelString      "Subsection \arabic{section}.\arabic{subsection}"
   LabelType        Counter
   LabelCounter     subsection
   LabelString      "Subsection \arabic{section}.\arabic{subsection}"

-       RefPrefix        sub
+  RefPrefix        sub

   Argument 1
   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
   EndArgument
 
   # standard font definition


@@ -274,11 +268,10 @@ Style Subsubsection
   LabelType        Counter
   LabelCounter     subsubsection
   LabelString      "Subsubsection \arabic{section}.\arabic{subsection}.\arabic{subsubsection}"
   LabelType        Counter
   LabelCounter     subsubsection
   LabelString      "Subsubsection \arabic{section}.\arabic{subsection}.\arabic{subsubsection}"

-       RefPrefix        sub
+  RefPrefix        sub

   Argument 1
   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
   EndArgument
 
   # standard font definition


@@ -313,8 +306,8 @@ Style BeginFrame
   LatexType        Command
   LatexName        lyxframeend{}\lyxframe
   Argument 1
   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
   EndArgument
   Margin           First_Dynamic
   NextNoIndent     1


@@ -395,13 +388,12 @@ Style AgainFrame
   LatexType         Command
   LatexName         lyxframeend{}\lyxagainframe
   Argument 1
   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
   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
   EndArgument
   Margin            First_Dynamic
   NextNoIndent      1


@@ -502,8 +494,8 @@ Style Column
   LabelSep         xx
   LabelString      "Start column (increase depth!), width:"
   Argument 1
   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"
 
   EndArgument
   LeftMargin       "Start column (increase depth!), width:xx"
 


@@ -531,8 +523,8 @@ Style Columns
   LeftMargin       "Columnsxx"
   
   Argument 1
   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
   EndArgument
 
   ParSkip          0.5


@@ -619,8 +611,8 @@ Style Pause
   LatexName         pause
   Margin            First_Dynamic
   Argument 1
   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
   EndArgument
   NextNoIndent      1
   ParSkip           0


@@ -849,9 +841,8 @@ Style Title
   Align            Center
   LabelType        No_Label
   Argument 1
   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
   EndArgument
 
   # standard font definition


@@ -885,9 +876,8 @@ Style Subtitle
   Align            Center
   LabelType        No_Label
   Argument 1
   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
   EndArgument
 
   # standard font definition


@@ -913,9 +903,8 @@ Style Author
   Align            Center
   LabelType        No_Label
   Argument 1
   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
   EndArgument
 
   # standard font definition


@@ -939,9 +928,8 @@ Style Institute
   Align            Center
   LabelType        No_Label
   Argument 1
   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
   EndArgument
 
   # standard font definition


@@ -986,9 +974,8 @@ Style Date
   Align            Center
   LabelType        No_Label
   Argument 1
   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
   EndArgument
 
   # standard font definition

diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module
index 774d999dc3d43e08991d5198c76d0154dd5ec3c0..2f5d2e15dde2da889e51b226aff9459bcf85977d 100644 (file)
--- a/lib/layouts/bicaption.module
+++ b/lib/layouts/bicaption.module
@@ -12,8 +12,7 @@ Style "Caption setup"
        LatexName               captionsetup
        Category                FrontMatter
        Argument 1
        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
                Tooltip       "Options for the caption setup command (see bicaption manual)"
        EndArgument
        Margin                  Dynamic


@@ -45,8 +44,7 @@ Style Bicaption
        EndArgument
        Argument 2
                Mandatory     1
        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
                Tooltip       "The caption text in the second language"
        EndArgument
        Argument 3

diff --git a/lib/layouts/dinbrief.layout b/lib/layouts/dinbrief.layout
index f515d65f756853c9a8cfb9519f4ba41fd68bc34a..0fd66e8f8adb42404dd6dc534a982a14eeca5379 100644 (file)
--- a/lib/layouts/dinbrief.layout
+++ b/lib/layouts/dinbrief.layout
@@ -194,8 +194,7 @@ Style Closing
        LabelString     "Closing:"
        LatexName       closing
        Argument 1
        LabelString     "Closing:"
        LatexName       closing
        Argument 1

-               LabelString   "Signature"
-               Shortcut      S
+               LabelString   "Signature|S"

                Tooltip       "Here you can insert a signature scan"
        EndArgument
        KeepEmpty       1
                Tooltip       "Here you can insert a signature scan"
        EndArgument
        KeepEmpty       1

diff --git a/lib/layouts/europecv.layout b/lib/layouts/europecv.layout
index ede9d4bfd1195ad3d5e2f130095dbadc79d85af7..7a01df9b78c6eb5082f2cee1a174fb26ce9438c8 100644 (file)
--- a/lib/layouts/europecv.layout
+++ b/lib/layouts/europecv.layout
@@ -34,8 +34,7 @@ Style Section
        NeedProtect             1
        NextNoIndent            1
        Argument 1
        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
                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
        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
                Tooltip       "Adjust the vertical space of this item"
        EndArgument
        ParSkip                 0.4


@@ -107,8 +105,7 @@ Style MotherTongue
        LatexType               Command
        LatexName               ecvmothertongue
        Argument 1
        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
                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 1e4a43a5d7d90b38b8027d6541d324b921c5f4ae..8db813a19dccd96d3df10a8482bb694ef89b1e42 100644 (file)
--- a/lib/layouts/iopart.layout
+++ b/lib/layouts/iopart.layout
@@ -61,8 +61,7 @@ Style Title
        Category                FrontMatter
        InTitle                 1
        Argument 1
        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
                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 4e40004d44cbc3436117f9b76a550105d6ba8f2f..6f00a041121aa5b4a077e7533ba4ff1010a1d35c 100644 (file)
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -52,8 +52,7 @@ Input numreport.inc
 
 Style Part
        Argument 1
 
 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
                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
 
 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
                Tooltip       "The chapter as it appears in the table of contents"
        EndArgument
        Argument 2


@@ -78,8 +76,7 @@ End
 
 Style Chapter*
        Argument 1
 
 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
                Tooltip       "The chapter as it appears in the table of contents"
        EndArgument
 End


@@ -87,8 +84,7 @@ End
 
 Style Section
        Argument 1
 
 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
                Tooltip       "The section as it appears in the table of contents"
        EndArgument
        Argument 2


@@ -102,8 +98,7 @@ End
 
 Style Subsection
        Argument 1
 
 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
                Tooltip       "The subsection as it appears in the table of contents"
        EndArgument
        Argument 2


@@ -117,8 +112,7 @@ End
 
 Style Subsubsection
        Argument 1
 
 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
                Tooltip       "The subsubsection as it appears in the table of contents"
        EndArgument
        Argument 2


@@ -132,8 +126,7 @@ End
 
 Style Paragraph
        Argument 1
 
 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
                Tooltip       "The paragraph as it appears in the table of contents"
        EndArgument
        Argument 2


@@ -147,8 +140,7 @@ End
 
 Style Subparagraph
        Argument 1
 
 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
                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
        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
                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
        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
                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 24a06cf2efa7f99a8369bfd1fc81495a2d97c616..6c2519d13e66fb618aaab034ddcdfd50c674b04e 100644 (file)
--- 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"
        LabelString           "Affiliation (alternate):"
        Argument 1
                LabelString   "Alternate Affiliation Option"

-               Shortcut      S

                Tooltip       "Optional argument to the altaffiliation command"
        EndArgument
        PassThru              1
                Tooltip       "Optional argument to the altaffiliation command"
        EndArgument
        PassThru              1


@@ -130,8 +129,7 @@ Style Author_Email
        LatexName             email
        LabelString           "Electronic Address:"
        Argument 1
        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
                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"
        LabelString           "URL:"
        Argument 1
                LabelString   "Author URL Option"

-               Shortcut      S

                Tooltip       "Optional argument to the homepage command"
        EndArgument
        PassThru              1
                Tooltip       "Optional argument to the homepage command"
        EndArgument
        PassThru              1


@@ -214,8 +211,7 @@ End
 
 Style Title
        Argument 1
 
 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
                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 e21ff48ec149d0c62bf7c85c2acb9d87daf59145..54e7058aaf72d822a77a31b0484fc8ca7bf94664 100644 (file)
--- 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"
        LatexName             altaffiliation
        Argument 1
                LabelString   "Alternate Affiliation Option"

-               Shortcut      S

                Tooltip       "Optional argument to the altaffiliation command"
        EndArgument
        LabelString           "Affiliation (alternate):"
                Tooltip       "Optional argument to the altaffiliation command"
        EndArgument
        LabelString           "Affiliation (alternate):"


@@ -205,8 +204,7 @@ Style Author_Email
        ParbreakIsNewline     1
        LatexName             email
        Argument 1
        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:"
                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"
        LatexName             homepage
        Argument 1
                LabelString   "Author URL Option"

-               Shortcut      S

                Tooltip       "Optional argument to the homepage command"
        EndArgument
        LabelString           "URL:"
                Tooltip       "Optional argument to the homepage command"
        EndArgument
        LabelString           "URL:"

diff --git a/lib/layouts/rsphrase.module b/lib/layouts/rsphrase.module
index 94732b0527ea7cfde72ab2aa6b87c3c362b74a39..0704e434ee59047422ee2789164297ee73745665 100644 (file)
--- a/lib/layouts/rsphrase.module
+++ b/lib/layouts/rsphrase.module
@@ -45,8 +45,7 @@ Style "Safety phrase"
        Category                MainText
        NextNoIndent            1
        Argument 1
        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
                Tooltip       "Optional argument to the rsphrase command"
        EndArgument
        KeepEmpty               1

diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 981820a8cef6ed93225753d23d5cf981ec88ae98..3ad207181362c82e75217e605a62505ecd3c708e 100644 (file)
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -111,8 +111,7 @@ Style Addpart
        CopyStyle             Part*
        LatexName             addpart
        Argument 1
        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
                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
        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
                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
        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
                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
        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
                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
        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
                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 fcf59549be1a39f1a9bdae380bc71c84867c743a..1b78fc4eb11b09598d840da4a4e19c2bbc174601 100644 (file)
--- a/lib/layouts/siamltex.layout
+++ b/lib/layouts/siamltex.layout
@@ -202,8 +202,7 @@ Style Title
        Align                 Center
        LabelType             No_Label
        Argument 1
        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
                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 73af2ab3515cfa8be0a9558fcda4b0d10d57545b..741de0d27a2564f5d3b19516c0971eba9134b72f 100644 (file)
--- a/lib/layouts/simplecv.layout
+++ b/lib/layouts/simplecv.layout
@@ -46,8 +46,7 @@ Style Section
        EndFont
                TocLevel 1
        Argument 1
        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
                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 cb7f980a003c3f359d293311ce59799dec853bae..76eeee84e2a7bc908c7153221f81917e1ddcf6db 100644 (file)
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -470,8 +470,7 @@ End
 
 InsetLayout Caption
        Argument 1
 
 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
                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 a23d896560496fdda12983006b1ce6852068998d..74470e3cfcf52f75312dbbf3bb9499085ddbd017 100644 (file)
--- a/lib/layouts/stdsections.inc
+++ b/lib/layouts/stdsections.inc
@@ -28,8 +28,7 @@ Style Part
        Align                 Center
        Alignpossible         Center
        Argument 1
        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
                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
        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
                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
        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
                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 d102f2a0ba9173083b8734b89d9120f9cfb491d4..942b13250e86e4c3b3bd1bee55de1ee27f7e15bf 100644 (file)
--- a/lib/layouts/tufte-book.layout
+++ b/lib/layouts/tufte-book.layout
@@ -77,8 +77,7 @@ Style Chapter
        Align           Block
        RefPrefix chap
        Argument 1
        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
                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
        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
                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 8da83b4dd7e68eb4e9d728757038e069c28c8a7c..07b053a41728b0a26e96ca25ad9682f1ce6441aa 100644 (file)
--- a/lib/layouts/tufte-handout.layout
+++ b/lib/layouts/tufte-handout.layout
@@ -37,8 +37,7 @@ Style Part
        Align           Center
        Alignpossible   Center
        Argument 1
        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
                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 1524f9c640e6449e506b9fd67d588e9ba9abd76b..a2c98ac4610fb3d6dd94322b85837816a9462f0f 100644 (file)
--- 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 == "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();
                } else if (tok == "requires") {
                        lex.next();
                        arg.requires = lex.getString();

diff --git a/src/Layout.h b/src/Layout.h
index c115c549a8b569b4fe8667bddcde694e86b41dba..469cbf0f5517c3a3ff3776516a92e018aad7eae7 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -94,7 +94,6 @@ public:
                docstring ldelim;
                docstring rdelim;
                docstring tooltip;
                docstring ldelim;
                docstring rdelim;
                docstring tooltip;

-               std::string shortcut;

                std::string requires;
        };
        ///
                std::string requires;
        };
        ///

diff --git a/src/frontends/qt4/Menus.cpp b/src/frontends/qt4/Menus.cpp
index 467d23bcf1efb533b52e790adc297bd65a980527..aa3d86000427005e005fcb4374e809904ec61be8 100644 (file)
--- 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));
        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,
                if (switcharg)
                        add(MenuItem(MenuItem::Command, item,
                                     FuncRequest(LFUN_INSET_MODIFY,

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index de239e157e6dd6257acd2615e954877041010e40..91ae4aa5a64e92e647e568bc6cb533708ab896df 100644 (file)
--- 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()) {
        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");
                tooltip_ = translateIfPossible((*lait).second.tooltip);
        } else {
                labelstring_ = _("Unknown Argument");

diff --git a/src/insets/InsetLayout.cpp b/src/insets/InsetLayout.cpp
index 8c34f0769c4e8f57713f6b75b3a1f701953d0f10..87be22cc81b38848e3ffff6b605371a7f520fe48 100644 (file)
--- 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 == "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();
                } else if (tok == "requires") {
                        lex.next();
                        arg.requires = lex.getString();

diff --git a/src/support/lstrings.cpp b/src/support/lstrings.cpp
index 346e4e171ad0c3d4bea53ea6881a0c74388a6f9d..e57d873f5435567c9f07ca8d0ac616f54a54a135 100644 (file)
--- 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;
 docstring const rsplit(docstring const & a, char_type delim)
 {
        docstring tmp;

diff --git a/src/support/lstrings.h b/src/support/lstrings.h
index 66ea9df7057821894b6b816839503353f037b9b0..4845bc6120db9fa922301e7a56c5e508357c4008 100644 (file)
--- 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);
 
 /// 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
 docstring const rsplit(docstring const & a, char_type delim);
 
 /// Escapes non ASCII chars and other problematic characters that cause