Fix wrongly copy-pasted entries in SpellcheckerUi.ui

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

diff --git a/src/insets/InsetListingsParams.cpp b/src/insets/InsetListingsParams.cpp
index 2c87a4095c941e2a72eefca0544cab622b7f4dda..d055fd01ddff8ccb704aab0d61d4ee26dedf2171 100644 (file)
--- a/src/insets/InsetListingsParams.cpp
+++ b/src/insets/InsetListingsParams.cpp
@@ -18,7 +18,6 @@
 
 #include "support/convert.h"
 #include "support/gettext.h"
-#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
@@ -37,7 +36,7 @@ enum param_type {
        INTEGER, // accept an integer
        LENGTH,  // accept a latex length
        ONEOF,  // accept one of a few values
-       SUBSETOF, // accept a string composed of given characters
+       SUBSETOF // accept a string composed of given characters
 };
 
 
@@ -99,13 +98,19 @@ docstring ListingsParam::validate(string const & par) const
        bool unclosed = false;
        string par2 = par;
        // braces are allowed
-       if (prefixIs(par, "{") && suffixIs(par, "}"))
+       if (prefixIs(par, "{") && suffixIs(par, "}") && !suffixIs(par, "\\}"))  
                par2 = par.substr(1, par.size() - 2);
-       else if (prefixIs(par, "{")) {
-               par2 = par.substr(1);
-               unclosed = true;
-       }
 
+       // check for unmatched braces
+       int braces = 0;
+       for (size_t i = 0; i < par2.size(); ++i) {
+               if (par2[i] == '{' && (i == 0 || par2[i-1] != '\\'))
+                       ++braces;
+               else if (par2[i] == '}' && (i == 0 || par2[i-1] != '\\'))
+                       --braces;
+       }
+       unclosed = braces != 0;
+       
        switch (type_) {
 
        case ALL:
@@ -116,7 +121,7 @@ docstring ListingsParam::validate(string const & par) const
                                return _("A value is expected.");
                }
                if (unclosed)
-                               return _("Unbalanced braces!");
+                       return _("Unbalanced braces!");
                return docstring();
 
        case TRUEFALSE:
@@ -431,6 +436,8 @@ ParValidator::ParValidator()
                ListingsParam("", false, TRUEFALSE, "", empty_hint);
        all_params_["breaklines"] =
                ListingsParam("", false, TRUEFALSE, "", empty_hint);
+       all_params_["breakatwhitespace"] =
+               ListingsParam("", false, TRUEFALSE, "", empty_hint);
        all_params_["prebreak"] =
                ListingsParam("", false, ALL, "", empty_hint);
        all_params_["postbreak"] =
@@ -709,7 +716,7 @@ void InsetListingsParams::write(ostream & os) const
 void InsetListingsParams::read(Lexer & lex)
 {
        lex >> inline_;
-       int s = Inset::Collapsed;
+       int s = InsetCollapsable::Collapsed;
        lex >> s;
        status_ = static_cast<InsetCollapsable::CollapseStatus>(s);
        string par;
@@ -735,14 +742,15 @@ string InsetListingsParams::params(string const & sep) const
 }
 
 
-void InsetListingsParams::addParam(string const & key, string const & value)
+void InsetListingsParams::addParam(string const & key, 
+               string const & value, bool replace)
 {
        if (key.empty())
                return;
 
        // duplicate parameters!
        string keyname = key;
-       if (params_.find(key) != params_.end())
+       if (!replace && params_.find(key) != params_.end())
                // key=value,key=value1 is allowed in listings
                // use key_, key__, key___ etc to avoid name conflict
                while (params_.find(keyname += '_') != params_.end()) { }
@@ -760,7 +768,7 @@ void InsetListingsParams::addParam(string const & key, string const & value)
        else {
                bool has_special_char = false;
                for (size_t i = 0; i < value.size(); ++i)
-                       if (!isAlphaASCII(value[i]) && !isDigit(value[i])) {
+                       if (!isAlnumASCII(value[i])) {
                                has_special_char = true;
                                break;
                        }
@@ -795,11 +803,12 @@ void InsetListingsParams::addParams(string const & par)
                } else if (par[i] == '=' && braces == 0) {
                        isValue = true;
                        continue;
-               } else if (par[i] == '{' && i > 0 && par[i - 1] == '=')
-                       braces ++;
-               else if (par[i] == '}'
-                       && (i == par.size() - 1 || par[i + 1] == ',' || par[i + 1] == '\n'))
-                       braces --;
+               } else if (par[i] == '{' && i > 0 && par[i-1] != '\\')
+                       // don't count a brace in first position
+                       ++braces;
+               else if (par[i] == '}' && i != par.size() - 1 
+                        && (i == 0 || (i > 0 && par[i-1] != '\\')))
+                       --braces;
 
                if (isValue)
                        value += par[i];