Allow MTag to take attributes.

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index ed53d8088cee303c3cd2330e42776a5d86e6f1ca..2e72ff23140047c26cc7131e2519f2eb74ef93db 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1656,7 +1656,21 @@ void Paragraph::setLabelWidthString(docstring const & s)
 }
 
 
-docstring Paragraph::expandLabel(Layout const & layout,
+docstring Paragraph::expandLabel(Layout const & layout, 
+               BufferParams const & bparams) const
+{ 
+       return expandParagraphLabel(layout, bparams, true); 
+}
+
+
+docstring Paragraph::expandDocBookLabel(Layout const & layout, 
+               BufferParams const & bparams) const
+{
+       return expandParagraphLabel(layout, bparams, false);
+}
+
+
+docstring Paragraph::expandParagraphLabel(Layout const & layout,
                BufferParams const & bparams, bool process_appendix) const
 {
        DocumentClass const & tclass = bparams.documentClass();
@@ -1677,7 +1691,7 @@ docstring Paragraph::expandLabel(Layout const & layout,
                        docstring parent(fmt, i + 1, j - i - 1);
                        docstring label = from_ascii("??");
                        if (tclass.hasLayout(parent))
-                               docstring label = expandLabel(tclass[parent], bparams,
+                               docstring label = expandParagraphLabel(tclass[parent], bparams,
                                                      process_appendix);
                        fmt = docstring(fmt, 0, i) + label 
                                + docstring(fmt, j + 1, docstring::npos);
@@ -2422,6 +2436,10 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 
        // parsing main loop
        for (pos_type i = initial; i < size(); ++i) {
+               // let's not show deleted material in the output
+               if (isDeleted(i))
+                       continue;
+       
                Font font = getFont(buf.params(), i, outerfont);
 
                // emphasis