Update it.po

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index ca3b3414ec7d32442c1ac571fa3a1be35a48117d..e56284bf18083fd400af61e35e97e1a25827eec3 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2394,9 +2394,6 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
        FontInfo font_old =
                style.labeltype == LABEL_MANUAL ? style.labelfont : style.font;
 
-       //if (style.pass_thru && !d->onlyText(buf, outerfont, initial))
-       //      os << "]]>";
-
        // parsing main loop
        for (pos_type i = initial; i < size(); ++i) {
                Font font = getFont(buf.params(), i, outerfont);
@@ -2423,8 +2420,13 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
                }
                // FIXME Other such tags? 
 
-               if (Inset const * inset = getInset(i)) {
-                       retval += inset->xhtml(os, runparams);
+               Inset const * inset = getInset(i);
+               if (inset) {
+                       InsetLayout const & il = inset->getLayout();
+                       OutputParams np = runparams;
+                       if (!il.htmlisblock())
+                               np.html_in_par = true;
+                       retval += inset->xhtml(os, np);
                } else {
                        char_type c = d->text_[i];
 
@@ -2797,7 +2799,7 @@ int Paragraph::checkBiblio(Buffer const & buffer)
        // There was no inset at the beginning, so we need to create one with
        // the key and label of the one we erased.
        InsetBibitem * inset = 
-               new InsetBibitem(buffer, InsetCommandParams(BIBITEM_CODE));
+               new InsetBibitem(const_cast<Buffer *>(&buffer), InsetCommandParams(BIBITEM_CODE));
        // restore values of previously deleted item in this par.
        if (!oldkey.empty())
                inset->setParam("key", oldkey);