Update my email and status.

[lyx.git] / src / output_xhtml.cpp

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 2498f13c7a6925ee738485bf70fe371a0f803626..50ba0f4b0b96774166636d48e4ed5696f6cb73e6 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -71,7 +71,8 @@ docstring escapeChar(char_type c, XHTMLStream::EscapeSettings e)
 
 
 // escape what needs escaping
-docstring htmlize(docstring const & str, XHTMLStream::EscapeSettings e) {
+docstring htmlize(docstring const & str, XHTMLStream::EscapeSettings e)
+{
        odocstringstream d;
        docstring::const_iterator it = str.begin();
        docstring::const_iterator en = str.end();
@@ -109,7 +110,8 @@ string escapeChar(char c, XHTMLStream::EscapeSettings e)
 
 
 // escape what needs escaping
-string htmlize(string const & str, XHTMLStream::EscapeSettings e) {
+string htmlize(string const & str, XHTMLStream::EscapeSettings e)
+{
        ostringstream d;
        string::const_iterator it = str.begin();
        string::const_iterator en = str.end();
@@ -125,7 +127,7 @@ string cleanAttr(string const & str)
        string::const_iterator it = str.begin();
        string::const_iterator en = str.end();
        for (; it != en; ++it)
-               newname += isalnum(*it) ? *it : '_';
+               newname += isAlnumASCII(*it) ? *it : '_';
        return newname; 
 }
 
@@ -233,8 +235,15 @@ namespace {
 
 bool XHTMLStream::closeFontTags()
 {
+       if (isTagPending(parsep_tag))
+               // we haven't had any content
+               return true;
+
+       // this may be a useless check, since we ought at least to have
+       // the parsep_tag. but it can't hurt too much to be careful.
        if (tag_stack_.empty())
                return true;
+
        // first, we close any open font tags we can close
        html::StartTag curtag = tag_stack_.back();
        while (html::isFontTag(curtag.tag_)) {
@@ -276,37 +285,27 @@ void XHTMLStream::startParagraph(bool keep_empty)
 
 void XHTMLStream::endParagraph()
 {
-       if (!isTagOpen(parsep_tag)) {
-               // is it pending?
-               TagStack::const_iterator dit = pending_tags_.begin();
-               TagStack::const_iterator const den = pending_tags_.end();
-               bool found = false;
-               for (; dit != den; ++dit) {
-                       if (dit->tag_ == parsep_tag) {
-                               found = true;
-                               break;
-                       }
-               }
-
-               if (!found) {
-                       writeError("No paragraph separation tag found in endParagraph().");
-                       return;
-               }
-               
-               // this case is normal.
+       if (isTagPending(parsep_tag)) {
+               // this case is normal. it just means we didn't have content,
+               // so the parsep_tag never got moved onto the tag stack.
                while (!pending_tags_.empty()) {
                        // clear all pending tags up to and including the parsep tag.
                        // note that we work from the back, because we want to get rid
-                       // of everything that hasnt' been used.
+                       // of everything that hasn't been used.
                        html::StartTag const cur_tag = pending_tags_.back();
                        string const & tag = cur_tag.tag_;
-                       tag_stack_.pop_back();
+                       pending_tags_.pop_back();
                        if (tag == parsep_tag)
                                break;
                }
                return;
        }
 
+       if (!isTagOpen(parsep_tag)) {
+               writeError("No paragraph separation tag found in endParagraph().");
+               return;
+       }
+
        // this case is also normal, if the parsep tag is the last one 
        // on the stack. otherwise, it's an error.
        while (!tag_stack_.empty()) {
@@ -418,7 +417,7 @@ XHTMLStream & XHTMLStream::operator<<(html::CR const &)
 }
 
 
-bool XHTMLStream::isTagOpen(string const & stag)
+bool XHTMLStream::isTagOpen(string const & stag) const
 {
        TagStack::const_iterator sit = tag_stack_.begin();
        TagStack::const_iterator const sen = tag_stack_.end();
@@ -429,6 +428,17 @@ bool XHTMLStream::isTagOpen(string const & stag)
 }
 
 
+bool XHTMLStream::isTagPending(string const & stag) const
+{
+       TagStack::const_iterator sit = pending_tags_.begin();
+       TagStack::const_iterator const sen = pending_tags_.end();
+       for (; sit != sen; ++sit)
+               if (sit->tag_ == stag)
+                       return true;
+       return false;
+}
+
+
 // this is complicated, because we want to make sure that
 // everything is properly nested. the code ought to make 
 // sure of that, but we won't assert (yet) if we run into
@@ -719,7 +729,7 @@ ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
                //   (ii) We didn't open it and html_in_par is true, 
                //        but we are in the first par, and there is a next par.
                ParagraphList::const_iterator nextpar = par;
-               nextpar++;
+               ++nextpar;
                bool const needclose = 
                        (opened && (!runparams.html_in_par || nextpar != pend))
                        || (!opened && runparams.html_in_par && par == pbegin && nextpar != pend);
@@ -907,10 +917,10 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf,
 
 
 void makeCommand(Buffer const & buf,
-                                         XHTMLStream & xs,
-                                         OutputParams const & runparams,
-                                         Text const & text,
-                                         ParagraphList::const_iterator const & pbegin)
+                XHTMLStream & xs,
+                OutputParams const & runparams,
+                Text const & text,
+                ParagraphList::const_iterator const & pbegin)
 {
        Layout const & style = pbegin->layout();
        if (!style.counter.empty())
@@ -959,11 +969,15 @@ void xhtmlParagraphs(Text const & text,
        while (bpit < epit) {
                ParagraphList::const_iterator par = paragraphs.constIterator(bpit);
                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);
+                       // We want to reset the counter corresponding to toplevel sectioning
+                       Layout const & lay =
+                               buf.masterBuffer()->params().documentClass().getTOCLayout();
+                       docstring const cnt = lay.counter;
+                       if (!cnt.empty()) {
+                               Counters & cnts =
+                                       buf.masterBuffer()->params().documentClass().counters();
+                               cnts.reset(cnt);
+                       }
                }
                Layout const & style = par->layout();
                ParagraphList::const_iterator const lastpar = par;
@@ -1008,7 +1022,8 @@ void xhtmlParagraphs(Text const & text,
 }
 
 
-string alignmentToCSS(LyXAlignment align) {
+string alignmentToCSS(LyXAlignment align)
+{
        switch (align) {
        case LYX_ALIGN_BLOCK:
                // we are NOT going to use text-align: justify!!