Update my email and status.

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

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index ed2633b429dad7d29596470ea797a273a36964de..3ec6f40492288ea6c56736bfa6336c8db74c141b 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -266,7 +266,10 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        LYXERR(Debug::ACTION, "InsetText::doDispatch(): cmd: " << cmd);
 
-       if (isPassThru()) {
+#if 0
+// FIXME: This code does not seem to be necessary anymore
+// Remove for 2.1 if no counter-evidence is found.
+       if (isPassThru() && lyxCode() != ARG_CODE) {
                // Force any new text to latex_language FIXME: This
                // should only be necessary in constructor, but new
                // paragraphs that are created by pressing enter at
@@ -276,6 +279,7 @@ void InsetText::doDispatch(Cursor & cur, FuncRequest & cmd)
                cur.current_font.setLanguage(latex_language);
                cur.real_current_font.setLanguage(latex_language);
        }
+#endif
 
        switch (cmd.action()) {
        case LFUN_PASTE:
@@ -338,11 +342,10 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
                        status.setEnabled(false);
                        return true;
                }
-               if (&buffer().inset() == this || !cur.paragraph().layout().latexargs().empty()
-                   || !cur.paragraph().layout().itemargs().empty())
+               if (&buffer().inset() == this || !cur.paragraph().layout().args().empty())
                        return text_.getStatus(cur, cmd, status);
 
-               Layout::LaTeXArgMap args = getLayout().latexargs();
+               Layout::LaTeXArgMap args = getLayout().args();
                Layout::LaTeXArgMap::const_iterator const lait = args.find(arg);
                if (lait != args.end()) {
                        status.setEnabled(true);
@@ -441,7 +444,7 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
                                os << "\\protect";
                        os << '\\' << from_utf8(il.latexname());
                        if (!il.latexargs().empty())
-                               getOptArg(os, runparams);
+                               getArgs(os, runparams);
                        if (!il.latexparam().empty())
                                os << from_utf8(il.latexparam());
                        os << '{';
@@ -455,14 +458,14 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
                                                  runparams.lastpos);
                        os << "\\begin{" << from_utf8(il.latexname()) << "}";
                        if (!il.latexargs().empty())
-                               getOptArg(os, runparams);
+                               getArgs(os, runparams);
                        if (!il.latexparam().empty())
                                os << from_utf8(il.latexparam());
                        os << '\n';
                }
        } else {
                if (!il.latexargs().empty())
-                       getOptArg(os, runparams);
+                       getArgs(os, runparams);
                if (!il.latexparam().empty())
                        os << from_utf8(il.latexparam());
        }
@@ -488,12 +491,14 @@ void InsetText::latex(otexstream & os, OutputParams const & runparams) const
        if (!il.latexname().empty()) {
                if (il.latextype() == InsetLayout::COMMAND) {
                        os << "}";
+                       if (!il.postcommandargs().empty())
+                               getArgs(os, runparams, true);
                } else if (il.latextype() == InsetLayout::ENVIRONMENT) {
                        // A comment environment doesn't need a % before \n\end
                        if (il.isDisplay() || runparams.inComment)
-                           os << breakln;
+                               os << breakln;
                        else
-                           os << safebreakln;
+                               os << safebreakln;
                        os << "\\end{" << from_utf8(il.latexname()) << "}\n";
                        if (!il.isDisplay())
                                os.protectSpace(true);
@@ -581,6 +586,7 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
        InsetLayout const & il = getLayout();
        if (opts & WriteOuterTag)
                xs << html::StartTag(il.htmltag(), il.htmlattr());
+
        if ((opts & WriteLabel) && !il.counter().empty()) {
                BufferParams const & bp = buffer().masterBuffer()->params();
                Counters & cntrs = bp.documentClass().counters();
@@ -600,26 +606,36 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & rp,
 
        if (opts & WriteInnerTag)
                xs << html::StartTag(il.htmlinnertag(), il.htmlinnerattr());
-       OutputParams ours = runparams;
+
+       // we will eventually lose information about the containing inset
        if (!il.isMultiPar() || opts == JustText)
-               ours.html_make_pars = false;
-       xhtmlParagraphs(text_, buffer(), xs, ours);
+               runparams.html_make_pars = false;
+       if (il.isPassThru())
+               runparams.pass_thru = true;
+
+       xhtmlParagraphs(text_, buffer(), xs, runparams);
+
        if (opts & WriteInnerTag)
                xs << html::EndTag(il.htmlinnertag());
+
        if (opts & WriteOuterTag)
                xs << html::EndTag(il.htmltag());
+
        return docstring();
 }
 
-void InsetText::getOptArg(otexstream & os,
-                       OutputParams const & runparams_in) const
+void InsetText::getArgs(otexstream & os, OutputParams const & runparams_in,
+                       bool const post) const
 {
        OutputParams runparams = runparams_in;
        runparams.local_font =
                &paragraphs()[0].getFirstFontSettings(buffer().masterBuffer()->params());
        if (isPassThru())
                runparams.pass_thru = true;
-       latexArgInsets(paragraphs()[0], os, runparams, getLayout().latexargs());
+       if (post)
+               latexArgInsets(paragraphs(), paragraphs().begin(), os, runparams, getLayout().postcommandargs(), "post:");
+       else
+               latexArgInsets(paragraphs(), paragraphs().begin(), os, runparams, getLayout().latexargs());
 }
 
 
@@ -821,7 +837,7 @@ void InsetText::addToToc(DocIterator const & cdit) const
                                arginset = inset.asInsetText();
                }
                // now the toc entry for the paragraph
-               int const toclevel = par.layout().toclevel;
+               int const toclevel = text().getTocLevel(pit);
                if (toclevel != Layout::NOT_IN_TOC && toclevel >= min_toclevel) {
                        // insert this into the table of contents
                        docstring tocstring;