The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 4b4e9560d11519bee146d52a7b3a0717cc2f7db1 Author: Juergen Spitzmueller <[email protected]> Date: Sat Nov 24 16:46:44 2012 +0100 Fix splitting of layout string diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp index 80b69e0..d971a16 100644 --- a/src/insets/InsetArgument.cpp +++ b/src/insets/InsetArgument.cpp @@ -95,9 +95,10 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype) Layout::LaTeXArgMap::const_iterator const lait = args.find(convert<unsigned int>(name_)); if (lait != args.end()) { - docstring label; - support::rsplit(translateIfPossible((*lait).second.labelstring), label, '|'); - labelstring_ = label; + docstring label = translateIfPossible((*lait).second.labelstring); + docstring striplabel; + support::rsplit(label, striplabel, '|'); + labelstring_ = striplabel.empty() ? label: striplabel; tooltip_ = translateIfPossible((*lait).second.tooltip); } else { labelstring_ = _("Unknown Argument"); ----------------------------------------------------------------------- Summary of changes: src/insets/InsetArgument.cpp | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- The LyX Source Repository
