New DocBook support

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

diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 8a867ee234fc4066a81040aae14b2c4847ad46c4..c61efe6d0165138be1b477ca344a4fea14100400 100644 (file)
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -189,7 +189,7 @@ void InsetBox::metrics(MetricsInfo & mi, Dimension & dim) const
        if (hasFixedWidth())
                mi.base.textwidth = mi.base.inPixels(params_.width);
        InsetCollapsible::metrics(mi, dim);
-       // retore textwidth.
+       // restore textwidth.
        mi.base.textwidth = textwidth_backup;
 }
 
@@ -281,7 +281,7 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd)
                cur.recordUndoInset(this);
                if (change_type) {
                        params_.type = cmd.getArg(1);
-                       // set a makebox if there is no inner box but Frameless was exectued
+                       // set a makebox if there is no inner box but Frameless was executed
                        // otherwise the result would be a non existent box (no inner AND outer box)
                        // (this was LyX bug 8712)
                        if (params_.type == "Frameless" && !params_.inner_box) {
@@ -715,13 +715,13 @@ int InsetBox::plaintext(odocstringstream & os,
 }
 
 
-int InsetBox::docbook(odocstream & os, OutputParams const & runparams) const
+void InsetBox::docbook(XMLStream & xs, OutputParams const & runparams) const
 {
-       return InsetText::docbook(os, runparams);
+       InsetText::docbook(xs, runparams);
 }
 
 
-docstring InsetBox::xhtml(XHTMLStream & xs, OutputParams const & runparams) const
+docstring InsetBox::xhtml(XMLStream & xs, OutputParams const & runparams) const
 {
        // construct attributes
        string attrs = "class='" + params_.type + "'";
@@ -737,10 +737,10 @@ docstring InsetBox::xhtml(XHTMLStream & xs, OutputParams const & runparams) cons
        if (!style.empty())
                attrs += " style='" + style + "'";
 
-       xs << html::StartTag("div", attrs);
+       xs << xml::StartTag("div", attrs);
        XHTMLOptions const opts = InsetText::WriteLabel | InsetText::WriteInnerTag;
        docstring defer = InsetText::insetAsXHTML(xs, runparams, opts);
-       xs << html::EndTag("div");
+       xs << xml::EndTag("div");
        xs << defer;
        return docstring();
 }