Math.lyx, Tutorial.lyx: fix some typos spotted by a user

[lyx.git] / src / insets / InsetArgument.cpp

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index b113878f062e9c60eee7c65702ac86daa6fedc5b..c5d5138da2ac9d727e36bbf8300b8be81e9382bb 100644 (file)
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -13,10 +13,13 @@
 
 #include "InsetArgument.h"
 
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "Cursor.h"
 #include "FuncStatus.h"
 #include "FuncRequest.h"
 #include "InsetList.h"
+#include "Language.h"
 #include "Layout.h"
 #include "Lexer.h"
 #include "OutputParams.h"
@@ -35,7 +38,8 @@ namespace lyx {
 
 InsetArgument::InsetArgument(Buffer * buf, string const & name)
     : InsetCollapsable(buf), name_(name), labelstring_(docstring()),
-      font_(inherit_font), labelfont_(inherit_font), decoration_(string())
+      font_(inherit_font), labelfont_(inherit_font), decoration_(string()),
+      pass_thru_(false)
 {}
 
 
@@ -53,18 +57,19 @@ void InsetArgument::read(Lexer & lex)
 
 void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
 {
-       Layout::LaTeXArgMap args;
-       bool const insetlayout = &it.inset() && it.paragraph().layout().latexargs().empty();
-       if (insetlayout)
-               args = it.inset().getLayout().latexargs();
-       else
-               args = it.paragraph().layout().latexargs();
-
+       Layout::LaTeXArgMap args = it.paragraph().layout().args();
+       pass_thru_ = it.paragraph().layout().pass_thru;
+       bool const insetlayout = &it.inset() && args.empty();
+       if (insetlayout) {
+               args = it.inset().getLayout().args();
+               pass_thru_ = it.inset().getLayout().isPassThru();
+       }
+       
        // Handle pre 2.1 ArgInsets (lyx2lyx cannot classify them)
        if (name_ == "999") {
-               unsigned int const req = insetlayout ? it.inset().getLayout().numRequiredArgs()
+               unsigned int const req = insetlayout ? it.inset().getLayout().requiredArgs()
                                      : it.paragraph().layout().requiredArgs();
-               unsigned int const opts = insetlayout ? it.inset().getLayout().numOptArgs()
+               unsigned int const opts = insetlayout ? it.inset().getLayout().optArgs()
                                      : it.paragraph().layout().optArgs();
                unsigned int nr = 0;
                unsigned int ours = 0;
@@ -95,8 +100,7 @@ void InsetArgument::updateBuffer(ParIterator const & it, UpdateType utype)
                        name_ = convert<string>(ours);
                }
        }
-       Layout::LaTeXArgMap::const_iterator const lait =
-                       args.find(convert<unsigned int>(name_));
+       Layout::LaTeXArgMap::const_iterator const lait = args.find(name_);
        if (lait != args.end()) {
                docstring label = translateIfPossible((*lait).second.labelstring);
                docstring striplabel;
@@ -172,8 +176,7 @@ bool InsetArgument::getStatus(Cursor & cur, FuncRequest const & cmd,
                                args = cur.inset().getLayout().latexargs();
                        else
                                args = cur.paragraph().layout().latexargs();
-                       Layout::LaTeXArgMap::const_iterator const lait =
-                                       args.find(convert<unsigned int>(type));
+                       Layout::LaTeXArgMap::const_iterator const lait = args.find(type);
                        if (lait != args.end()) {
                                flag.setEnabled(true);
                                InsetList::const_iterator it = cur.paragraph().insetList().begin();
@@ -220,21 +223,6 @@ FontInfo InsetArgument::getLabelfont() const
        return getLayout().labelfont();
 }
 
-namespace {
-
-InsetLayout::InsetDecoration translateDecoration(std::string const & str) 
-{
-       if (support::compare_ascii_no_case(str, "classic") == 0)
-               return InsetLayout::CLASSIC;
-       if (support::compare_ascii_no_case(str, "minimalistic") == 0)
-               return InsetLayout::MINIMALISTIC;
-       if (support::compare_ascii_no_case(str, "conglomerate") == 0)
-               return InsetLayout::CONGLOMERATE;
-       return InsetLayout::DEFAULT;
-}
-
-}// namespace anon
-
 InsetLayout::InsetDecoration InsetArgument::decoration() const
 {
        InsetLayout::InsetDecoration dec = getLayout().decoration();
@@ -245,16 +233,17 @@ InsetLayout::InsetDecoration InsetArgument::decoration() const
 
 void InsetArgument::latexArgument(otexstream & os,
                OutputParams const & runparams_in, docstring const & ldelim,
-               docstring const & rdelim) const
+               docstring const & rdelim, docstring const & presetarg) const
 {
        TexRow texrow;
        odocstringstream ss;
        otexstream ots(ss, texrow);
        OutputParams runparams = runparams_in;
-       if (getLayout().isPassThru())
-               runparams.pass_thru = true;
        InsetText::latex(ots, runparams);
        docstring str = ss.str();
+       docstring const sep = str.empty() ? docstring() : from_ascii(", ");
+       if (!presetarg.empty())
+               str = presetarg + sep + str;
        if (ldelim != "{" && support::contains(str, rdelim))
                str = '{' + str + '}';
        os << ldelim << str << rdelim;