Proper output of counters in appendix.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33121 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 85b58774fca76c0e156cfdade4a14b0b0ed970b7..1e57a28c45c0e25097fc1763b6f59c456c05a896 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -794,7 +794,7 @@ void makeCommand(Buffer const & buf,
        // FIXME Probably need to account for LABEL_MANUAL
        if (style.labeltype != LABEL_NO_LABEL) {
                openLabelTag(xs, style);
-               xs << pbegin->expandLabel(style, buf.params(), false);
+               xs << pbegin->expandLabel(style, buf.params());
                closeLabelTag(xs, style);
                // Otherwise the label might run together with the text
                xs << from_ascii(" ");
@@ -821,6 +821,13 @@ void xhtmlParagraphs(Text const & text,
 
        OutputParams ourparams = runparams;
        while (par != pend) {
+               if (par->params().startOfAppendix()) {
+                       // FIXME: only the counter corresponding to toplevel
+                       // sectioning should be reset
+                       Counters & cnts = buf.masterBuffer()->params().documentClass().counters();
+                       cnts.reset();
+                       cnts.appendix(true);
+               }
                Layout const & style = par->layout();
                ParagraphList::const_iterator lastpar = par;
                ParagraphList::const_iterator send;