InsetBox.cpp: only shaded boxes can have multiple paragraphs when there is no inner box

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

diff --git a/src/insets/InsetCommandParams.cpp b/src/insets/InsetCommandParams.cpp
index fae7ce61e45fbfbf53ff24b0bd938eb59bd25eb8..a0cbd6e785be498fdc71b2ec85d1d54b55fc3245 100644 (file)
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -27,7 +27,11 @@
 #include "InsetRef.h"
 #include "InsetTOC.h"
 
+#include "Encoding.h"
 #include "Lexer.h"
+#include "OutputParams.h"
+
+#include "frontends/alert.h"
 
 #include "support/debug.h"
 #include "support/docstream.h"
@@ -35,7 +39,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
-#include "support/assert.h"
+#include "support/lassert.h"
 
 using namespace std;
 using namespace lyx::support;
@@ -55,7 +59,7 @@ static ParamInfo const & findInfo(InsetCode code, string const & cmdName)
        case BIBTEX_CODE:
                return InsetBibtex::findInfo(cmdName);
        case CITE_CODE:
-               return InsetCitation::findInfo(cmdName);        
+               return InsetCitation::findInfo(cmdName);
        case FLOAT_LIST_CODE:
                return InsetFloatList::findInfo(cmdName);
        case HYPERLINK_CODE:
@@ -65,7 +69,7 @@ static ParamInfo const & findInfo(InsetCode code, string const & cmdName)
        case INDEX_PRINT_CODE:
                return InsetPrintIndex::findInfo(cmdName);
        case LABEL_CODE:
-               return InsetLabel::findInfo(cmdName);   
+               return InsetLabel::findInfo(cmdName);
        case NOMENCL_CODE:
                return InsetNomencl::findInfo(cmdName);
        case NOMENCL_PRINT_CODE:
@@ -88,8 +92,9 @@ static ParamInfo const & findInfo(InsetCode code, string const & cmdName)
 //
 /////////////////////////////////////////////////////////////////////
 
-ParamInfo::ParamData::ParamData(std::string const & s, ParamType t)
-       : name_(s), type_(t)
+ParamInfo::ParamData::ParamData(std::string const & s, ParamType t,
+                               ParamHandling h)
+       : name_(s), type_(t), handling_(h)
 {}
 
 
@@ -101,7 +106,8 @@ bool ParamInfo::ParamData::isOptional() const
 
 bool ParamInfo::ParamData::operator==(ParamInfo::ParamData const & rhs) const
 {
-       return name() == rhs.name() && type() == rhs.type();
+       return name() == rhs.name() && type() == rhs.type()
+               && handling() == rhs.handling();
 }
 
 
@@ -117,9 +123,10 @@ bool ParamInfo::hasParam(std::string const & name) const
 }
 
 
-void ParamInfo::add(std::string const & name, ParamType type)
+void ParamInfo::add(std::string const & name, ParamType type,
+                   ParamHandling handling)
 { 
-       info_.push_back(ParamData(name, type)); 
+       info_.push_back(ParamData(name, type, handling)); 
 }
 
 
@@ -244,7 +251,7 @@ bool InsetCommandParams::isCompatibleCommand(InsetCode code, string const & s)
 
 void InsetCommandParams::setCmdName(string const & name)
 {
-       if (!isCompatibleCommand(insetCode_, cmdName_)) {
+       if (!isCompatibleCommand(insetCode_, name)) {
                LYXERR0("InsetCommand: Incompatible command name " << 
                                name << ".");
                throw ExceptionMessage(WarningException, _("InsetCommand Error: "),
@@ -295,8 +302,8 @@ void InsetCommandParams::read(Lexer & lex)
                lex.printError("Missing \\end_inset at this point. "
                               "Read: `$$Token'");
                throw ExceptionMessage(WarningException,
-                       _("Missing \\end_inset at this point."),
-                       from_utf8(token));
+                       _("InsetCommandParams Error: "),
+                       _("Missing \\end_inset at this point: ") + from_utf8(token));
        }
 }
 
@@ -324,8 +331,9 @@ void InsetCommandParams::write(ostream & os) const
 
 bool InsetCommandParams::writeEmptyOptional(ParamInfo::const_iterator ci) const
 {
-       if (!ci->isOptional())
+       if (!ci->isOptional()) {
                LASSERT(false, /**/);
+       }
        ++ci; // we want to start with the next one
        ParamInfo::const_iterator end = info_.end();
        for (; ci != end; ++ci) {
@@ -350,7 +358,46 @@ bool InsetCommandParams::writeEmptyOptional(ParamInfo::const_iterator ci) const
 }
 
 
-docstring InsetCommandParams::getCommand() const
+
+docstring InsetCommandParams::prepareCommand(OutputParams const & runparams,
+                                            docstring const & command,
+                                            ParamInfo::ParamHandling handling) const
+{
+       docstring result;
+       if (handling == ParamInfo::HANDLING_LATEXIFY) {
+               docstring uncodable;
+               for (size_t n = 0; n < command.size(); ++n) {
+                       try {
+                               result += runparams.encoding->latexChar(command[n]);
+                       } catch (EncodingException & /* e */) {
+                               LYXERR0("Uncodable character in command inset!");
+                               if (runparams.dryrun) {
+                                       result += "<" + _("LyX Warning: ")
+                                               + _("uncodable character") + " '";
+                                       result += docstring(1, command[n]);
+                                       result += "'>";
+                               } else
+                                       uncodable += command[n];
+                       }
+               }
+               if (!uncodable.empty()) {
+                       // issue a warning about omitted characters
+                       // FIXME: should be passed to the error dialog
+                       frontend::Alert::warning(_("Uncodable characters"),
+                               bformat(_("The following characters that are used in the inset %1$s are not\n"
+                                         "representable in the current encoding and therefore have been omitted:\n%2$s."),
+                                       from_utf8(insetType()), uncodable));
+               }
+       } else if (handling == ParamInfo::HANDLING_ESCAPE)
+               result = escape(command);
+       else
+               result = command;
+
+       return result;
+}
+
+
+docstring InsetCommandParams::getCommand(OutputParams const & runparams) const
 {
        docstring s = '\\' + from_ascii(cmdName_);
        bool noparam = true;
@@ -363,13 +410,15 @@ docstring InsetCommandParams::getCommand() const
                        break;
 
                case ParamInfo::LATEX_REQUIRED: {
-                       docstring const & data = (*this)[name];
+                       docstring const & data =
+                               prepareCommand(runparams, (*this)[name], it->handling());
                        s += '{' + data + '}';
                        noparam = false;
                        break;
                }
                case ParamInfo::LATEX_OPTIONAL: {
-                       docstring const & data = (*this)[name];
+                       docstring const & data =
+                               prepareCommand(runparams, (*this)[name], it->handling());
                        if (!data.empty()) {
                                s += '[' + data + ']';
                                noparam = false;
@@ -394,8 +443,9 @@ docstring InsetCommandParams::getFirstNonOptParam() const
        ParamInfo::const_iterator it = 
                find_if(info_.begin(), info_.end(), 
                        not1(mem_fun_ref(&ParamInfo::ParamData::isOptional)));
-       if (it == info_.end())
+       if (it == info_.end()) {
                LASSERT(false, return docstring());
+       }
        return (*this)[it->name()];
 }