Fix ChkTeX error reporting (#8639)

[lyx.git] / src / output_xhtml.cpp

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 50ba0f4b0b96774166636d48e4ed5696f6cb73e6..d3386ee1a55bb86b40bd1e2297d6839351448232 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -147,8 +147,9 @@ docstring cleanAttr(docstring const & str)
 
 bool isFontTag(string const & s)
 {
-       // others?
-       return s == "em" || s == "strong" || s == "i" || s == "b";
+       return s == "em" || s == "strong" || s == "i" || s == "b"
+           || s == "dfn" || s == "kbd" || s == "var" || s == "samp"
+           || s == "del" || s == "u";
 }
 
 
@@ -706,7 +707,8 @@ ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
        for (; par != pend; ++par) {
                Layout const & lay = par->layout();
                if (!lay.counter.empty())
-                       buf.params().documentClass().counters().step(lay.counter, OutputUpdate);
+                       buf.masterBuffer()->params().
+                           documentClass().counters().step(lay.counter, OutputUpdate);
                // FIXME We should see if there's a label to be output and
                // do something with it.
                if (par != pbegin)
@@ -800,7 +802,7 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
                // FIXME There may be a bug here about user defined enumeration
                // types. If so, then we'll need to take the counter and add "i",
                // "ii", etc, as with enum.
-               Counters & cnts = buf.params().documentClass().counters();
+               Counters & cnts = buf.masterBuffer()->params().documentClass().counters();
                docstring const & cntr = style.counter;
                if (!style.counter.empty() 
                    && (par == pbegin || !isNormalEnv(style)) 
@@ -924,12 +926,14 @@ void makeCommand(Buffer const & buf,
 {
        Layout const & style = pbegin->layout();
        if (!style.counter.empty())
-               buf.params().documentClass().counters().step(style.counter, OutputUpdate);
+               buf.masterBuffer()->params().
+                   documentClass().counters().step(style.counter, OutputUpdate);
 
        openTag(xs, style, pbegin->params());
 
        // Label around sectioning number:
        // FIXME Probably need to account for LABEL_MANUAL
+       // FIXME Probably also need now to account for labels ABOVE and CENTERED.
        if (style.labeltype != LABEL_NO_LABEL) {
                openLabelTag(xs, style);
                xs << pbegin->params().labelString();