Pure HTML output for math macros.

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

diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index cb6734aa67599a61178c0f8ce1b2543a752de0c7..e5b3e1308bec44d83b34b9808769d2f9fff148fa 100644 (file)
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -298,17 +298,6 @@ bool InsetText::getStatus(Cursor & cur, FuncRequest const & cmd,
        FuncStatus & status) const
 {
        switch (cmd.action) {
-       case LFUN_LAYOUT:
-               status.setEnabled(!forcePlainLayout());
-               return true;
-
-       case LFUN_LAYOUT_PARAGRAPH:
-       case LFUN_PARAGRAPH_PARAMS:
-       case LFUN_PARAGRAPH_PARAMS_APPLY:
-       case LFUN_PARAGRAPH_UPDATE:
-               status.setEnabled(allowParagraphCustomization());
-               return true;
-
        case LFUN_INSET_DISSOLVE: {
                bool const main_inset = &buffer().inset() == this;
                bool const target_inset = cmd.argument().empty() 
@@ -500,34 +489,34 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, OutputParams const & runpara
 
        InsetLayout const & il = getLayout();
        if (opts & WriteOuterTag)
-               xs << StartTag(il.htmltag(), il.htmlattr());
+               xs << html::StartTag(il.htmltag(), il.htmlattr());
        if ((opts & WriteLabel) && !il.counter().empty()) {
                BufferParams const & bp = buffer().masterBuffer()->params();
                Counters & cntrs = bp.documentClass().counters();
-               cntrs.step(il.counter());
+               cntrs.step(il.counter(), OutputUpdate);
                // FIXME: translate to paragraph language
                if (!il.htmllabel().empty()) {
                        docstring const lbl = 
                                cntrs.counterLabel(from_utf8(il.htmllabel()), bp.language->code());
                        // FIXME is this check necessary?
                        if (!lbl.empty()) {
-                               xs << StartTag(il.htmllabeltag(), il.htmllabelattr());
+                               xs << html::StartTag(il.htmllabeltag(), il.htmllabelattr());
                                xs << lbl;
-                               xs << EndTag(il.htmllabeltag());
+                               xs << html::EndTag(il.htmllabeltag());
                        }
                }
        }
 
        if (opts & WriteInnerTag)
-               xs << StartTag(il.htmlinnertag(), il.htmlinnerattr());
+               xs << html::StartTag(il.htmlinnertag(), il.htmlinnerattr());
        OutputParams ours = runparams;
        if (!il.isMultiPar() || opts == JustText)
                ours.html_make_pars = false;
        xhtmlParagraphs(text_, buffer(), xs, ours);
        if (opts & WriteInnerTag)
-               xs << EndTag(il.htmlinnertag());
+               xs << html::EndTag(il.htmlinnertag());
        if (opts & WriteOuterTag)
-               xs << EndTag(il.htmltag());
+               xs << html::EndTag(il.htmltag());
        return docstring();
 }
 
@@ -540,12 +529,6 @@ void InsetText::cursorPos(BufferView const & bv,
 }
 
 
-bool InsetText::showInsetDialog(BufferView *) const
-{
-       return false;
-}
-
-
 void InsetText::setText(docstring const & data, Font const & font, bool trackChanges)
 {
        clear();
@@ -648,17 +631,33 @@ ParagraphList & InsetText::paragraphs()
 }
 
 
-void InsetText::updateLabels(ParIterator const & it, bool out)
+void InsetText::updateBuffer(ParIterator const & it, UpdateType utype)
 {
        ParIterator it2 = it;
        it2.forwardPos();
        LASSERT(&it2.inset() == this && it2.pit() == 0, return);
-       if (producesOutput())
-               buffer().updateLabels(it2, out);
-       else {
+       if (producesOutput()) {
+               InsetLayout const & il = getLayout();
+               bool const save_layouts = utype == OutputUpdate && il.htmlisblock();
+               Counters & cnt = buffer().masterBuffer()->params().documentClass().counters();
+               if (save_layouts) {
+                       // LYXERR0("Entering " << name());
+                       cnt.clearLastLayout();
+                       // FIXME cnt.saveLastCounter()?
+               }
+               buffer().updateBuffer(it2, utype);
+               if (save_layouts) {
+                       // LYXERR0("Exiting " << name());
+                       cnt.restoreLastLayout();
+                       // FIXME cnt.restoreLastCounter()?
+               }
+       } else {
                DocumentClass const & tclass = buffer().masterBuffer()->params().documentClass();
+               // Note that we do not need to call:
+               //      tclass.counters().clearLastLayout()
+               // since we are saving and restoring the existing counters, etc.
                Counters const savecnt = tclass.counters();
-               buffer().updateLabels(it2, out);
+               buffer().updateBuffer(it2, utype);
                tclass.counters() = savecnt;
        }
 }