InsetInclude becomes an InsetCommand.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21149 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 57012dc3f802823c104b9b0df2f42c86b5bf2e9d..4792590d03f7d8d1b54041361b336b0eb1ac47ec 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -80,7 +80,7 @@ format_relation = [("0_06",    [200], minor_versions("0.6" , 4)),
                    ("1_3",     [221], minor_versions("1.3" , 7)),
                    ("1_4", range(222,246), minor_versions("1.4" , 5)),
                    ("1_5", range(246,277), minor_versions("1.5" , 2)),
-                   ("1_6", range(277,296), minor_versions("1.6" , 0))] # Uwe: htmlurl, href
+                   ("1_6", range(277,297), minor_versions("1.6" , 0))] # RGH: InsetInclude
 
 
 def formats_list():

diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py
index 31d5cb28ca429793c328af284c903f46e62aee10..a776447b563c1e95270683e10260ddd70c5f7af9 100644 (file)
--- a/lib/lyx2lyx/lyx_1_6.py
+++ b/lib/lyx2lyx/lyx_1_6.py
@@ -581,6 +581,73 @@ def revert_href(document):
         ["\\begin_inset CommandInset url", "LatexCommand url"]
       i = i + 2
 
+def convert_include(document):
+  'Converts include insets to new format.'
+  i = 0
+  r = re.compile(r'\\begin_inset Include\s+\\([^{]+){([^}]*)}(?:\[(.*)\])?')
+  while True:
+    i = find_token(document.body, "\\begin_inset Include", i)
+    if i == -1:
+      return
+    line = document.body[i]
+    previewline = document.body[i + 1]
+    m = r.match(line)
+    if m == None:
+      document.warning("Unable to match line " + str(i) + " of body!")
+      i += 1
+      continue
+    cmd = m.group(1)
+    fn  = m.group(2)
+    opt = m.group(3)
+    insertion = ["\\begin_inset CommandInset include", 
+       "LatexCommand " + cmd, previewline,
+       "filename \"" + fn + "\""]
+    newlines = 2
+    if opt:
+      insertion.append("lstparams " + '"' + opt + '"')
+      newlines += 1
+    document.body[i : i + 2] = insertion
+    i += newlines
+
+def revert_include(document):
+  'Reverts include insets to old format.'
+  i = 0
+  r1 = re.compile('LatexCommand (.+)')
+  r2 = re.compile('filename (.+)')
+  r3 = re.compile('options (.*)')
+  while True:
+    i = find_token(document.body, "\\begin_inset CommandInset include", i)
+    if i == -1:
+      return
+    previewline = document.body[i + 1]
+    m = r1.match(document.body[i + 2])
+    if m == None:
+      document.warning("Malformed LyX document: No LatexCommand line for `" +
+        document.body[i] + "' on line " + str(i) + ".")
+      i += 1
+      continue
+    cmd = m.group(1)
+    m = r2.match(document.body[i + 3])
+    if m == None:
+      document.warning("Malformed LyX document: No filename line for `" + \
+        document.body[i] + "' on line " + str(i) + ".")
+      i += 2
+      continue
+    fn = m.group(1)
+    options = ""
+    numlines = 4
+    if (cmd == "lstinputlisting"):
+      m = r3.match(document.body[i + 4])
+      if m != None:
+        options = m.group(1)
+        numlines = 5
+    newline = "\\begin_inset Include \\" + cmd + "{" + fn + "}"
+    if options:
+      newline += ("[" + options + "]")
+    insertion = [newline, previewline]
+    document.body[i : i + numlines] = insertion
+    i += 2
+       
 
 ##
 # Conversion hub
@@ -605,10 +672,12 @@ convert = [[277, [fix_wrong_tables]],
            [292, []],
            [293, []],
            [294, [convert_pdf_options]],
-           [295, [convert_htmlurl, convert_url]]
+           [295, [convert_htmlurl, convert_url]],
+           [296, [convert_include]]
           ]
 
-revert =  [[294, [revert_href]],
+revert =  [[295, [revert_include]],
+           [294, [revert_href]],
            [293, [revert_pdf_options_2]],
            [292, [revert_inset_info]],
            [291, [revert_japanese, revert_japanese_encoding]],

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index b94a7278be7de001def01065ace5fdd4fe2a665d..8e87ecbce23bf0ac8fd4677729b3a8219cdb739c 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -156,7 +156,7 @@ namespace fs = boost::filesystem;
 
 namespace {
 
-int const LYX_FORMAT = 295; //Uwe: htmlurl, href
+int const LYX_FORMAT = 296; //RGH: InsetInclude changes
 
 } // namespace anon
 
@@ -2173,7 +2173,7 @@ void Buffer::loadChildDocuments() const
        for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
                if (it->lyxCode() != INCLUDE_CODE)
                        continue;
-               InsetInclude const & inset = static_cast<InsetInclude const &>(*it);
+               InsetCommand const & inset = static_cast<InsetCommand const &>(*it);
                InsetCommandParams const & ip = inset.params();
                Buffer * child = loadIfNeeded(*this, ip);
                if (!child)

diff --git a/src/LyXFunc.cpp b/src/LyXFunc.cpp
index 247136330ddfabdd8f64cb8cac172e0f17937863..541113b58994271af250c703381a4ee51650f900 100644 (file)
--- a/src/LyXFunc.cpp
+++ b/src/LyXFunc.cpp
@@ -1434,7 +1434,7 @@ void LyXFunc::dispatch(FuncRequest const & cmd)
                                        // default type is requested
                                        data = "include";
                                InsetCommandParams p(INCLUDE_CODE, data);
-                               data = InsetIncludeMailer::params2string(p);
+                               data = InsetCommandMailer::params2string("include", p);
                                break;
                        } 
                        case BOX_CODE: {

diff --git a/src/factory.cpp b/src/factory.cpp
index 557b2be2767cdd9166c41eea71e9ffbf9095744f..347493a75039f9323ce75157df8ce4c178c38592 100644 (file)
--- a/src/factory.cpp
+++ b/src/factory.cpp
@@ -292,9 +292,9 @@ Inset * createInset(BufferView * bv, FuncRequest const & cmd)
                        }
                        
                        case INCLUDE_CODE: {
-                               InsetCommandParams iip(code);
-                               InsetIncludeMailer::string2params(to_utf8(cmd.argument()), iip);
-                               return new InsetInclude(iip);
+                               InsetCommandParams icp(code);
+                               InsetCommandMailer::string2params(name, to_utf8(cmd.argument()), icp);
+                               return new InsetInclude(icp);
                        }
                        
                        case INDEX_CODE:
@@ -434,8 +434,6 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
                        case HYPERLINK_CODE:
                                inset.reset(new InsetHyperlink(inscmd));
                                break;
-                       // FIXME Currently non-functional, since InsetInclude
-                       // does not write itself as a CommandInset.
                        case INCLUDE_CODE:
                                inset.reset(new InsetInclude(inscmd));
                                break;
@@ -498,10 +496,6 @@ Inset * readInset(Lexer & lex, Buffer const & buf)
                } else if (tmptok == "Branch") {
                        inset.reset(new InsetBranch(buf.params(),
                                                    InsetBranchParams()));
-               } else if (tmptok == "Include") {
-                       //FIXME
-                       InsetCommandParams p(INCLUDE_CODE);
-                       inset.reset(new InsetInclude(p));
                } else if (tmptok == "Environment") {
                        lex.next();
                        inset.reset(new InsetEnvironment(buf.params(), lex.getDocString()));

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 52764d154afabf782dadcefe07e934ebfeb6d3b8..66a49dfb8f007b300bc6dd8af0101e1375062457 100644 (file)
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -59,6 +59,10 @@ using support::getStringFromVector;
 using support::getVectorFromString;
 
 
+/// Flags what action is taken by Kernel::dispatch()
+static std::string const lfun_name_ = "include";
+
+
 GuiInclude::GuiInclude(LyXView & lv)
        : GuiDialog(lv, "include"), params_(INCLUDE_CODE)
 {
@@ -325,7 +329,7 @@ bool GuiInclude::isValid()
 
 bool GuiInclude::initialiseParams(string const & data)
 {
-       InsetIncludeMailer::string2params(data, params_);
+       InsetCommandMailer::string2params(lfun_name_, data, params_);
        return true;
 }
 
@@ -338,7 +342,7 @@ void GuiInclude::clearParams()
 
 void GuiInclude::dispatchParams()
 {
-       dispatch(FuncRequest(getLfun(), InsetIncludeMailer::params2string(params_)));
+       dispatch(FuncRequest(getLfun(), InsetCommandMailer::params2string(lfun_name_, params_)));
 }
 
 

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index d710082c53efa18b2a127e03ec6018311506c7b0..b7708c14fa048e9df0bcd5001f26fac252571ed6 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -93,37 +93,67 @@ docstring const uniqueID()
 }
 
 
+/// the type of inclusion
+enum Types {
+       INCLUDE = 0,
+ VERB = 1,
+ INPUT = 2,
+ VERBAST = 3,
+ LISTINGS = 4,
+};
+
+
+Types type(InsetCommandParams const & params)
+{
+       string const command_name = params.getCmdName();
+
+       if (command_name == "input")
+               return INPUT;
+       if  (command_name == "verbatiminput")
+               return VERB;
+       if  (command_name == "verbatiminput*")
+               return VERBAST;
+       if  (command_name == "lstinputlisting")
+               return LISTINGS;
+       return INCLUDE;
+}
+
+
 bool isListings(InsetCommandParams const & params)
 {
-       return params.getCmdName() == "lstinputlisting";
+       return type(params) == LISTINGS;
 }
 
-} // namespace anon
 
+bool isVerbatim(InsetCommandParams const & params)
+{
+       Types const t = type(params);
+       return (t == VERB) || (t == VERBAST);
+}
 
-InsetInclude::InsetInclude(InsetCommandParams const & p)
-       : params_(p), include_label(uniqueID()),
-         preview_(new RenderMonitoredPreview(this)),
-         set_label_(false)
+
+bool isInputOrInclude(InsetCommandParams const & params)
 {
-       preview_->fileChanged(boost::bind(&InsetInclude::fileChanged, this));
+       Types const t = type(params);
+       return (t == INPUT) || (t == INCLUDE);
 }
 
+} // namespace anon
 
-InsetInclude::InsetInclude(InsetInclude const & other)
-       : Inset(other),
-         params_(other.params_),
-         include_label(other.include_label),
-         preview_(new RenderMonitoredPreview(this)),
-         set_label_(false)
+
+InsetInclude::InsetInclude(InsetCommandParams const & p)
+       : InsetCommand(p, "include"), include_label(uniqueID()),
+         preview_(new RenderMonitoredPreview(this)), set_label_(false)
 {
        preview_->fileChanged(boost::bind(&InsetInclude::fileChanged, this));
 }
 
 
-InsetInclude::~InsetInclude()
+InsetInclude::InsetInclude(InsetInclude const & other)
+       : InsetCommand(other), include_label(other.include_label),
+         preview_(new RenderMonitoredPreview(this)), set_label_(false)
 {
-       InsetIncludeMailer(*this).hideDialog();
+       preview_->fileChanged(boost::bind(&InsetInclude::fileChanged, this));
 }
 
 
@@ -133,7 +163,7 @@ void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p(INCLUDE_CODE);
-               InsetIncludeMailer::string2params(to_utf8(cmd.argument()), p);
+               InsetCommandMailer::string2params("include", to_utf8(cmd.argument()), p);
                if (!p.getCmdName().empty()) {
                        if (isListings(p)){
                                InsetListingsParams par_old(params().getOptions());
@@ -153,87 +183,16 @@ void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_INSET_DIALOG_UPDATE:
-               InsetIncludeMailer(*this).updateDialog(&cur.bv());
-               break;
-
-       case LFUN_MOUSE_RELEASE:
-               if (!cur.selection())
-                       InsetIncludeMailer(*this).showDialog(&cur.bv());
-               break;
-
+       //pass everything else up the chain
        default:
-               Inset::doDispatch(cur, cmd);
+               InsetCommand::doDispatch(cur, cmd);
                break;
        }
 }
 
 
-bool InsetInclude::getStatus(Cursor & cur, FuncRequest const & cmd,
-               FuncStatus & flag) const
-{
-       switch (cmd.action) {
-
-       case LFUN_INSET_MODIFY:
-       case LFUN_INSET_DIALOG_UPDATE:
-               flag.enabled(true);
-               return true;
-
-       default:
-               return Inset::getStatus(cur, cmd, flag);
-       }
-}
-
-
-InsetCommandParams const & InsetInclude::params() const
-{
-       return params_;
-}
-
-
 namespace {
 
-/// the type of inclusion
-enum Types {
-       INCLUDE = 0,
-       VERB = 1,
-       INPUT = 2,
-       VERBAST = 3,
-       LISTINGS = 4,
-};
-
-
-Types type(InsetCommandParams const & params)
-{
-       string const command_name = params.getCmdName();
-
-       if (command_name == "input")
-               return INPUT;
-       if  (command_name == "verbatiminput")
-               return VERB;
-       if  (command_name == "verbatiminput*")
-               return VERBAST;
-       if  (command_name == "lstinputlisting")
-               return LISTINGS;
-       return INCLUDE;
-}
-
-
-bool isVerbatim(InsetCommandParams const & params)
-{
-       string const command_name = params.getCmdName();
-       return command_name == "verbatiminput" ||
-               command_name == "verbatiminput*";
-}
-
-
-bool isInputOrInclude(InsetCommandParams const & params)
-{
-       Types const t = type(params);
-       return (t == INPUT) || (t == INCLUDE);
-}
-
-
 string const masterFilename(Buffer const & buffer)
 {
        return buffer.masterBuffer()->absFileName();
@@ -250,7 +209,7 @@ FileName const includedFilename(Buffer const & buffer,
                              InsetCommandParams const & params)
 {
        return makeAbsPath(to_utf8(params["filename"]),
-                          onlyPath(parentFilename(buffer)));
+              onlyPath(parentFilename(buffer)));
 }
 
 
@@ -261,13 +220,13 @@ void add_preview(RenderMonitoredPreview &, InsetInclude const &, Buffer const &)
 
 void InsetInclude::set(InsetCommandParams const & p, Buffer const & buffer)
 {
-       params_ = p;
+       setParams(p);
        set_label_ = false;
 
        if (preview_->monitoring())
                preview_->stopMonitoring();
 
-       if (type(params_) == INPUT)
+       if (type(params()) == INPUT)
                add_preview(*preview_, *this, buffer);
 }
 
@@ -278,56 +237,11 @@ Inset * InsetInclude::clone() const
 }
 
 
-void InsetInclude::write(Buffer const &, ostream & os) const
-{
-       write(os);
-}
-
-
-void InsetInclude::write(ostream & os) const
-{
-       os << "Include " << to_utf8(params_.getCommand()) << '\n'
-          << "preview " << convert<string>(params_.preview()) << '\n';
-}
-
-
-void InsetInclude::read(Buffer const &, Lexer & lex)
-{
-       read(lex);
-}
-
-
-void InsetInclude::read(Lexer & lex)
-{
-       if (lex.isOK()) {
-               lex.eatLine();
-               string const command = lex.getString();
-               params_.scanCommand(command);
-       }
-       string token;
-       while (lex.isOK()) {
-               lex.next();
-               token = lex.getString();
-               if (token == "\\end_inset")
-                       break;
-               if (token == "preview") {
-                       lex.next();
-                       params_.preview(lex.getBool());
-               } else
-                       lex.printError("Unknown parameter name `$$Token' for command " + params_.getCmdName());
-       }
-       if (token != "\\end_inset") {
-               lex.printError("Missing \\end_inset at this point. "
-                              "Read: `$$Token'");
-       }
-}
-
-
 docstring const InsetInclude::getScreenLabel(Buffer const & buf) const
 {
        docstring temp;
 
-       switch (type(params_)) {
+       switch (type(params())) {
                case INPUT:
                        temp = buf.B_("Input");
                        break;
@@ -347,10 +261,10 @@ docstring const InsetInclude::getScreenLabel(Buffer const & buf) const
 
        temp += ": ";
 
-       if (params_["filename"].empty())
+       if (params()["filename"].empty())
                temp += "???";
        else
-               temp += from_utf8(onlyFilename(to_utf8(params_["filename"])));
+               temp += from_utf8(onlyFilename(to_utf8(params()["filename"])));
 
        return temp;
 }
@@ -414,19 +328,19 @@ Buffer * loadIfNeeded(Buffer const & parent, InsetCommandParams const & params)
 int InsetInclude::latex(Buffer const & buffer, odocstream & os,
                        OutputParams const & runparams) const
 {
-       string incfile(to_utf8(params_["filename"]));
+       string incfile(to_utf8(params()["filename"]));
 
        // Do nothing if no file name has been specified
        if (incfile.empty())
                return 0;
 
-       FileName const included_file = includedFilename(buffer, params_);
+       FileName const included_file = includedFilename(buffer, params());
 
        //Check we're not trying to include ourselves.
        //FIXME RECURSIVE INCLUDE
        //This isn't sufficient, as the inclusion could be downstream.
        //But it'll have to do for now.
-       if (isInputOrInclude(params_) &&
+       if (isInputOrInclude(params()) &&
                buffer.absFileName() == included_file.absFilename())
        {
                Alert::error(_("Recursive input"),
@@ -467,11 +381,11 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
        if (runparams.inComment || runparams.dryrun) {
                //Don't try to load or copy the file if we're
                //in a comment or doing a dryrun
-       } else if (isInputOrInclude(params_) &&
+       } else if (isInputOrInclude(params()) &&
                 isLyXFilename(included_file.absFilename())) {
                //if it's a LyX file and we're inputting or including,
                //try to load it so we can write the associated latex
-               if (!loadIfNeeded(buffer, params_))
+               if (!loadIfNeeded(buffer, params()))
                        return false;
 
                Buffer * tmp = theBufferList().getBuffer(included_file.absFilename());
@@ -545,12 +459,12 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
 
        string const tex_format = (runparams.flavor == OutputParams::LATEX) ?
                        "latex" : "pdflatex";
-       if (isVerbatim(params_)) {
+       if (isVerbatim(params())) {
                incfile = latex_path(incfile);
                // FIXME UNICODE
-               os << '\\' << from_ascii(params_.getCmdName()) << '{'
+               os << '\\' << from_ascii(params().getCmdName()) << '{'
                   << from_utf8(incfile) << '}';
-       } else if (type(params_) == INPUT) {
+       } else if (type(params()) == INPUT) {
                runparams.exportdata->addExternalFile(tex_format, writefile,
                                                      exportfile);
 
@@ -558,18 +472,18 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
                if (!isLyXFilename(included_file.absFilename())) {
                        incfile = latex_path(incfile);
                        // FIXME UNICODE
-                       os << '\\' << from_ascii(params_.getCmdName())
+                       os << '\\' << from_ascii(params().getCmdName())
                           << '{' << from_utf8(incfile) << '}';
                } else {
                incfile = changeExtension(incfile, ".tex");
                incfile = latex_path(incfile);
                        // FIXME UNICODE
-                       os << '\\' << from_ascii(params_.getCmdName())
+                       os << '\\' << from_ascii(params().getCmdName())
                           << '{' << from_utf8(incfile) <<  '}';
                }
-       } else if (type(params_) == LISTINGS) {
-               os << '\\' << from_ascii(params_.getCmdName());
-               string opt = params_.getOptions();
+       } else if (type(params()) == LISTINGS) {
+               os << '\\' << from_ascii(params().getCmdName());
+               string opt = params().getOptions();
                // opt is set in QInclude dialog and should have passed validation.
                InsetListingsParams params(opt);
                if (!params.params().empty())
@@ -584,7 +498,7 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
                incfile = changeExtension(incfile, string());
                incfile = latex_path(incfile);
                // FIXME UNICODE
-               os << '\\' << from_ascii(params_.getCmdName()) << '{'
+               os << '\\' << from_ascii(params().getCmdName()) << '{'
                   << from_utf8(incfile) << '}';
        }
 
@@ -595,11 +509,11 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
 int InsetInclude::plaintext(Buffer const & buffer, odocstream & os,
                            OutputParams const &) const
 {
-       if (isVerbatim(params_) || isListings(params_)) {
+       if (isVerbatim(params()) || isListings(params())) {
                os << '[' << getScreenLabel(buffer) << '\n';
                // FIXME: We don't know the encoding of the file
                docstring const str =
-                    from_utf8(includedFilename(buffer, params_).fileContents());
+                    from_utf8(includedFilename(buffer, params()).fileContents());
                os << str;
                os << "\n]";
                return PLAINTEXT_NEWLINE + 1; // one char on a separate line
@@ -614,13 +528,13 @@ int InsetInclude::plaintext(Buffer const & buffer, odocstream & os,
 int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
                          OutputParams const & runparams) const
 {
-       string incfile = to_utf8(params_["filename"]);
+       string incfile = to_utf8(params()["filename"]);
 
        // Do nothing if no file name has been specified
        if (incfile.empty())
                return 0;
 
-       string const included_file = includedFilename(buffer, params_).absFilename();
+       string const included_file = includedFilename(buffer, params()).absFilename();
 
        //Check we're not trying to include ourselves.
        //FIXME RECURSIVE INCLUDE
@@ -637,7 +551,7 @@ int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
        string const exportfile = changeExtension(incfile, ".sgml");
        DocFileName writefile(changeExtension(included_file, ".sgml"));
 
-       if (loadIfNeeded(buffer, params_)) {
+       if (loadIfNeeded(buffer, params())) {
                Buffer * tmp = theBufferList().getBuffer(included_file);
 
                string const mangled = writefile.mangledFilename();
@@ -658,7 +572,7 @@ int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
        runparams.exportdata->addExternalFile("docbook-xml", writefile,
                                              exportfile);
 
-       if (isVerbatim(params_) || isListings(params_)) {
+       if (isVerbatim(params()) || isListings(params())) {
                os << "<inlinegraphic fileref=\""
                   << '&' << include_label << ';'
                   << "\" format=\"linespecific\">";
@@ -671,19 +585,19 @@ int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
 
 void InsetInclude::validate(LaTeXFeatures & features) const
 {
-       string incfile(to_utf8(params_["filename"]));
+       string incfile(to_utf8(params()["filename"]));
        string writefile;
 
        Buffer const & buffer = features.buffer();
 
-       string const included_file = includedFilename(buffer, params_).absFilename();
+       string const included_file = includedFilename(buffer, params()).absFilename();
 
        if (isLyXFilename(included_file))
                writefile = changeExtension(included_file, ".sgml");
        else
                writefile = included_file;
 
-       if (!features.runparams().nice && !isVerbatim(params_) && !isListings(params_)) {
+       if (!features.runparams().nice && !isVerbatim(params()) && !isListings(params())) {
                incfile = DocFileName(writefile).mangledFilename();
                writefile = makeAbsPath(incfile,
                                        buffer.masterBuffer()->temppath()).absFilename();
@@ -691,15 +605,15 @@ void InsetInclude::validate(LaTeXFeatures & features) const
 
        features.includeFile(include_label, writefile);
 
-       if (isVerbatim(params_))
+       if (isVerbatim(params()))
                features.require("verbatim");
-       else if (isListings(params_))
+       else if (isListings(params()))
                features.require("listings");
 
        // Here we must do the fun stuff...
        // Load the file in the include if it needs
        // to be loaded:
-       if (loadIfNeeded(buffer, params_)) {
+       if (loadIfNeeded(buffer, params())) {
                // a file got loaded
                Buffer * const tmp = theBufferList().getBuffer(included_file);
                // make sure the buffer isn't us
@@ -721,14 +635,14 @@ void InsetInclude::validate(LaTeXFeatures & features) const
 void InsetInclude::getLabelList(Buffer const & buffer,
                                std::vector<docstring> & list) const
 {
-       if (isListings(params_)) {
-               InsetListingsParams params(params_.getOptions());
-               string label = params.getParamValue("label");
+       if (isListings(params())) {
+               InsetListingsParams p(params().getOptions());
+               string label = p.getParamValue("label");
                if (!label.empty())
                        list.push_back(from_utf8(label));
        }
-       else if (loadIfNeeded(buffer, params_)) {
-               string const included_file = includedFilename(buffer, params_).absFilename();
+       else if (loadIfNeeded(buffer, params())) {
+               string const included_file = includedFilename(buffer, params()).absFilename();
                Buffer * tmp = theBufferList().getBuffer(included_file);
                tmp->setParentName("");
                tmp->getLabelList(list);
@@ -740,8 +654,8 @@ void InsetInclude::getLabelList(Buffer const & buffer,
 void InsetInclude::fillWithBibKeys(Buffer const & buffer,
                BiblioInfo & keys, InsetIterator const & /*di*/) const
 {
-       if (loadIfNeeded(buffer, params_)) {
-               string const included_file = includedFilename(buffer, params_).absFilename();
+       if (loadIfNeeded(buffer, params())) {
+               string const included_file = includedFilename(buffer, params()).absFilename();
                Buffer * tmp = theBufferList().getBuffer(included_file);
                //FIXME This is kind of a dirty hack and should be made reasonable.
                tmp->setParentName("");
@@ -753,7 +667,7 @@ void InsetInclude::fillWithBibKeys(Buffer const & buffer,
 
 void InsetInclude::updateBibfilesCache(Buffer const & buffer)
 {
-       Buffer * const tmp = getChildBuffer(buffer, params_);
+       Buffer * const tmp = getChildBuffer(buffer, params());
        if (tmp) {
                tmp->setParentName("");
                tmp->updateBibfilesCache();
@@ -765,7 +679,7 @@ void InsetInclude::updateBibfilesCache(Buffer const & buffer)
 std::vector<FileName> const &
 InsetInclude::getBibfilesCache(Buffer const & buffer) const
 {
-       Buffer * const tmp = getChildBuffer(buffer, params_);
+       Buffer * const tmp = getChildBuffer(buffer, params());
        if (tmp) {
                tmp->setParentName("");
                std::vector<FileName> const & cache = tmp->getBibfilesCache();
@@ -824,7 +738,7 @@ void InsetInclude::draw(PainterInfo & pi, int x, int y) const
 
 Inset::DisplayType InsetInclude::display() const
 {
-       return type(params_) == INPUT ? Inline : AlignCenter;
+       return type(params()) == INPUT ? Inline : AlignCenter;
 }
 
 
@@ -899,9 +813,9 @@ void InsetInclude::addPreview(graphics::PreviewLoader & ploader) const
 void InsetInclude::addToToc(TocList & toclist, Buffer const & buffer,
        ParConstIterator const & pit) const
 {
-       if (isListings(params_)) {
-               InsetListingsParams params(params_.getOptions());
-               string caption = params.getParamValue("caption");
+       if (isListings(params())) {
+               InsetListingsParams p(params().getOptions());
+               string caption = p.getParamValue("caption");
                if (caption.empty())
                        return;
                Toc & toc = toclist["listing"];
@@ -912,7 +826,7 @@ void InsetInclude::addToToc(TocList & toclist, Buffer const & buffer,
                toc.push_back(TocItem(pit, 0, str));
                return;
        }
-       Buffer const * const childbuffer = getChildBuffer(buffer, params_);
+       Buffer const * const childbuffer = getChildBuffer(buffer, params());
        if (!childbuffer)
                return;
 
@@ -927,11 +841,11 @@ void InsetInclude::addToToc(TocList & toclist, Buffer const & buffer,
 
 void InsetInclude::updateLabels(Buffer const & buffer, ParIterator const &)
 {
-       Buffer const * const childbuffer = getChildBuffer(buffer, params_);
+       Buffer const * const childbuffer = getChildBuffer(buffer, params());
        if (childbuffer)
                lyx::updateLabels(*childbuffer, true);
-       else if (isListings(params_)) {
-               InsetListingsParams const par = params_.getOptions();
+       else if (isListings(params())) {
+               InsetListingsParams const par = params().getOptions();
                if (par.getParamValue("caption").empty())
                        listings_label_.clear();
                else {
@@ -952,65 +866,9 @@ void InsetInclude::registerEmbeddedFiles(Buffer const & buffer,
        EmbeddedFiles & files) const
 {
        // include and input are temprarily not considered.
-       if (isVerbatim(params_) || isListings(params_))
-               files.registerFile(includedFilename(buffer, params_).absFilename(),
+       if (isVerbatim(params()) || isListings(params()))
+               files.registerFile(includedFilename(buffer, params()).absFilename(),
                        false, this);
 }
 
-
-string const InsetIncludeMailer::name_("include");
-
-
-InsetIncludeMailer::InsetIncludeMailer(InsetInclude & inset)
-       : inset_(inset)
-{}
-
-
-string const InsetIncludeMailer::inset2string(Buffer const &) const
-{
-       return params2string(inset_.params());
-}
-
-
-void InsetIncludeMailer::string2params(string const & in,
-       InsetCommandParams & params)
-{
-       params.clear();
-       if (in.empty())
-               return;
-
-       istringstream data(in);
-       Lexer lex(0,0);
-       lex.setStream(data);
-
-       string name;
-       lex >> name;
-       if (!lex || name != name_)
-               return print_mailer_error("InsetIncludeMailer", in, 1, name_);
-
-       // This is part of the inset proper that is usually swallowed
-       // by Text::readInset
-       string id;
-       lex >> id;
-       if (!lex || id != "Include")
-               return print_mailer_error("InsetIncludeMailer", in, 2, "Include");
-
-       InsetInclude inset(params);
-       inset.read(lex);
-       params = inset.params();
-}
-
-
-string const
-InsetIncludeMailer::params2string(InsetCommandParams const & params)
-{
-       InsetInclude inset(params);
-       ostringstream data;
-       data << name_ << ' ';
-       inset.write(data);
-       data << "\\end_inset\n";
-       return data.str();
-}
-
-
 } // namespace lyx

diff --git a/src/insets/InsetInclude.h b/src/insets/InsetInclude.h
index 8a45ef22ef7aa86502457720fc7b83ccd7197260..225bbd4bbef213b2b601707f3cd926badbdb1edc 100644 (file)
--- a/src/insets/InsetInclude.h
+++ b/src/insets/InsetInclude.h
@@ -13,7 +13,7 @@
 #define INSET_INCLUDE_H
 
 #include "BiblioInfo.h"
-#include "Inset.h"
+#include "InsetCommand.h"
 #include "InsetCommandParams.h"
 #include "RenderButton.h"
 #include "MailInset.h"
@@ -33,11 +33,10 @@ class RenderMonitoredPreview;
 
 
 /// for including tex/lyx files
-class InsetInclude : public Inset {
+class InsetInclude : public InsetCommand {
 public:
        ///
        InsetInclude(InsetCommandParams const &);
-       ~InsetInclude();
 
        /// Override these InsetButton methods if Previewing
        void metrics(MetricsInfo & mi, Dimension & dim) const;
@@ -45,10 +44,6 @@ public:
        void draw(PainterInfo & pi, int x, int y) const;
        ///
        virtual DisplayType display() const;
-
-       /// get the parameters
-       InsetCommandParams const & params() const;
-
        ///
        InsetCode lyxCode() const { return INCLUDE_CODE; }
        /** Fills \c list
@@ -78,14 +73,10 @@ public:
         *  \param buffer the Buffer containing this inset.
         */
        std::vector<support::FileName> const &
-       getBibfilesCache(Buffer const & buffer) const;
+               getBibfilesCache(Buffer const & buffer) const;
        ///
        EDITABLE editable() const { return IS_EDITABLE; }
        ///
-       void write(Buffer const &, std::ostream &) const;
-       ///
-       void read(Buffer const &, Lexer &);
-       ///
        int latex(Buffer const &, odocstream &,
                  OutputParams const &) const;
        ///
@@ -101,8 +92,6 @@ public:
        ///
        void addToToc(TocList &, Buffer const &, ParConstIterator const &) const;
        ///
-       bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
-       ///
        void updateLabels(Buffer const & buffer, ParIterator const &);
        /// child document can be embedded
        void registerEmbeddedFiles(Buffer const &, EmbeddedFiles &) const;
@@ -118,19 +107,10 @@ private:
         */
        void fileChanged() const;
 
-       friend class InsetIncludeMailer;
-
        /// set the parameters
        void set(InsetCommandParams const & params, Buffer const &);
        /// get the text displayed on the button
        docstring const getScreenLabel(Buffer const &) const;
-       ///
-       void write(std::ostream &) const;
-       ///
-       void read(Lexer &);
-
-       /// the parameters
-       InsetCommandParams params_;
        /// holds the entity name that defines the file location (SGML)
        docstring const include_label;
 
@@ -144,27 +124,6 @@ private:
 };
 
 
-class InsetIncludeMailer : public MailInset {
-public:
-       ///
-       InsetIncludeMailer(InsetInclude & inset);
-       ///
-       virtual Inset & inset() const { return inset_; }
-       ///
-       virtual std::string const & name() const { return name_; }
-       ///
-       virtual std::string const inset2string(Buffer const &) const;
-       ///
-       static void string2params(std::string const &, InsetCommandParams &);
-       ///
-       static std::string const params2string(InsetCommandParams const &);
-private:
-       ///
-       static std::string const name_;
-       ///
-       InsetInclude & inset_;
-};
-
 /// return loaded Buffer or zero if the file loading did not proceed.
 Buffer * loadIfNeeded(Buffer const & parent, InsetCommandParams const & params);