X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.cpp;h=0a8222c8fb31cad5d0b96ffa946a73877ee44ecd;hb=3c957e1bb1ca487cb5bb9b02145c009a7f5fe02d;hp=a27a9f4bf74d72752817e138eb3c42e942dce053;hpb=dfe5bd2e40a85c22b9f70ace59ef981aefc9f561;p=lyx.git diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp index a27a9f4bf7..0a8222c8fb 100644 --- a/src/output_xhtml.cpp +++ b/src/output_xhtml.cpp @@ -18,6 +18,7 @@ #include "buffer_funcs.h" #include "BufferParams.h" #include "Counters.h" +#include "Font.h" #include "Layout.h" #include "OutputParams.h" #include "Paragraph.h" @@ -27,11 +28,11 @@ #include "Text.h" #include "TextClass.h" -#include "support/lassert.h" +#include "support/convert.h" #include "support/debug.h" +#include "support/lassert.h" #include "support/lstrings.h" -#include #include using namespace std; @@ -65,111 +66,465 @@ docstring escapeChar(char_type c) } -// FIXME do something here. +// escape what needs escaping docstring htmlize(docstring const & str) { + odocstringstream d; + docstring::const_iterator it = str.begin(); + docstring::const_iterator en = str.end(); + for (; it != en; ++it) + d << escapeChar(*it); + return d.str(); +} + + +string escapeChar(char c) +{ + string str; + switch (c) { + case ' ': + str += " "; + break; + case '&': + str += "&"; + break; + case '<': + str += "<"; + break; + case '>': + str += ">"; + break; + default: + str += c; + break; + } return str; } -// FIXME This needs to be protected somehow. -static vector taglist; -bool openTag(odocstream & os, string const & tag, string const & attr) +// escape what needs escaping +string htmlize(string const & str) { + ostringstream d; + string::const_iterator it = str.begin(); + string::const_iterator en = str.end(); + for (; it != en; ++it) + d << escapeChar(*it); + return d.str(); +} + + +string cleanAttr(string const & str) +{ + string newname; + string::const_iterator it = str.begin(); + string::const_iterator en = str.end(); + for (; it != en; ++it) + newname += isalnum(*it) ? *it : '_'; + return newname; +} + + +docstring cleanAttr(docstring const & str) +{ + docstring newname; + docstring::const_iterator it = str.begin(); + docstring::const_iterator en = str.end(); + for (; it != en; ++it) + if (isalnum(*it)) + newname += *it; + else + newname += '_'; + return newname; +} + + +bool isFontTag(string const & s) +{ + return s == "em" || s == "strong"; // others? +} + + +docstring StartTag::asTag() const +{ + string output = "<" + tag_; + if (!attr_.empty()) + output += " " + html::htmlize(attr_); + output += ">"; + return from_utf8(output); +} + + +docstring StartTag::asEndTag() const +{ + string output = ""; + return from_utf8(output); +} + + +docstring EndTag::asEndTag() const { - if (tag.empty()) - return false; - // FIXME This is completely primitive. We need something - // a lot better. - // Now do some checks on nesting of tags. - if (tag == "p") - if (find(taglist.begin(), taglist.end(), "p") != taglist.end()) - return false; - os << from_ascii("<" + tag + (attr.empty() ? "" : " " + attr) + ">"); - taglist.push_back(tag); - return true; + string output = ""; + return from_utf8(output); } -bool closeTag(odocstream & os, string const & tag) +docstring CompTag::asTag() const { - if (tag.empty()) - return false; - // FIXME Check for proper nesting - if (taglist.empty()){ - LYXERR0("Last tag not found when closing `" << tag << "'!"); - return false; + string output = "<" + tag_; + if (!attr_.empty()) + output += " " + html::htmlize(attr_); + output += " />"; + return from_utf8(output); +} + +} // namespace html + + + +//////////////////////////////////////////////////////////////// +/// +/// XHTMLStream +/// +//////////////////////////////////////////////////////////////// + +XHTMLStream::XHTMLStream(odocstream & os) + : os_(os), nextraw_(false) +{} + + +void XHTMLStream::cr() +{ + // tabs? + os_ << from_ascii("\n"); +} + + +void XHTMLStream::writeError(std::string const & s) +{ + LYXERR0(s); + os_ << from_utf8(""); +} + + +bool XHTMLStream::closeFontTags() +{ + 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_)) { + os_ << curtag.asEndTag(); + tag_stack_.pop_back(); + if (tag_stack_.empty()) + // this probably shouldn't happen, since then the + // font tags weren't in any other tag. but that + // problem will likely be caught elsewhere. + return true; + curtag = tag_stack_.back(); + } + // so we've hit a non-font tag. let's see if any of the + // remaining tags are font tags. + TagStack::const_iterator it = tag_stack_.begin(); + TagStack::const_iterator en = tag_stack_.end(); + bool noFontTags = true; + for (; it != en; ++it) { + if (html::isFontTag(it->tag_)) { + writeError("Font tag `" + it->tag_ + "' still open in closeFontTags().\n" + "This is likely not a problem, but you might want to check."); + noFontTags = false; + } } - string const & lasttag = taglist.back(); - if (lasttag != tag) { - LYXERR0("Last tag was `" << lasttag << "' when closing `" << tag << "'!"); - return false; + return noFontTags; +} + + +void XHTMLStream::clearTagDeque() +{ + while (!pending_tags_.empty()) { + html::StartTag const & tag = pending_tags_.front(); + // tabs? + os_ << tag.asTag(); + tag_stack_.push_back(tag); + pending_tags_.pop_front(); } - taglist.pop_back(); - os << from_ascii(""); - return true; } +XHTMLStream & XHTMLStream::operator<<(docstring const & d) +{ + clearTagDeque(); + if (nextraw_) { + os_ << d; + nextraw_ = false; + } else + os_ << html::htmlize(d); + return *this; +} + + +XHTMLStream & XHTMLStream::operator<<(const char * s) +{ + clearTagDeque(); + docstring const d = from_ascii(s); + if (nextraw_) { + os_ << d; + nextraw_ = false; + } else + os_ << html::htmlize(d); + return *this; +} + -} // html +XHTMLStream & XHTMLStream::operator<<(char_type c) +{ + clearTagDeque(); + if (nextraw_) { + os_ << c; + nextraw_ = false; + } else + os_ << html::escapeChar(c); + return *this; +} + + +XHTMLStream & XHTMLStream::operator<<(int i) +{ + clearTagDeque(); + os_ << i; + nextraw_ = false; + return *this; +} + + +XHTMLStream & XHTMLStream::operator<<(NextRaw const &) +{ + nextraw_ = true; + return *this; +} + + +XHTMLStream & XHTMLStream::operator<<(html::StartTag const & tag) +{ + if (tag.tag_.empty()) + return *this; + pending_tags_.push_back(tag); + if (tag.keepempty_) + clearTagDeque(); + return *this; +} + + +XHTMLStream & XHTMLStream::operator<<(html::CompTag const & tag) +{ + if (tag.tag_.empty()) + return *this; + clearTagDeque(); + // tabs? + os_ << tag.asTag(); + cr(); + return *this; +} + + +bool XHTMLStream::isTagOpen(string const & stag) +{ + TagStack::const_iterator sit = tag_stack_.begin(); + TagStack::const_iterator const sen = tag_stack_.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 +// a problem. we'll just output error messages and try our +// best to make things work. +XHTMLStream & XHTMLStream::operator<<(html::EndTag const & etag) +{ + if (etag.tag_.empty()) + return *this; + + // make sure there are tags to be closed + if (tag_stack_.empty()) { + writeError("Tried to close `" + etag.tag_ + + "' when no tags were open!"); + return *this; + } + + // first make sure we're not closing an empty tag + if (!pending_tags_.empty()) { + html::StartTag const & stag = pending_tags_.back(); + if (etag.tag_ == stag.tag_) { + // we have , so we discard it and remove it + // from the pending_tags_. + pending_tags_.pop_back(); + return *this; + } + // there is a pending tag that isn't the one we are trying + // to close. + // is this tag itself pending? + // non-const iterators because we may call erase(). + TagDeque::iterator dit = pending_tags_.begin(); + TagDeque::iterator const den = pending_tags_.end(); + for (; dit != den; ++dit) { + if (dit->tag_ == etag.tag_) { + // it was pending, so we just erase it + writeError("Tried to close pending tag `" + etag.tag_ + + "' when other tags were pending. Last pending tag is `" + + pending_tags_.back().tag_ + "'. Tag discarded."); + pending_tags_.erase(dit); + return *this; + } + } + // so etag isn't itself pending. is it even open? + if (!isTagOpen(etag.tag_)) { + writeError("Tried to close `" + etag.tag_ + + "' when tag was not open. Tag discarded."); + return *this; + } + // ok, so etag is open. + // our strategy will be as below: we will do what we need to + // do to close this tag. + string estr = "Closing tag `" + etag.tag_ + + "' when other tags are pending. Discarded pending tags:\n"; + for (dit = pending_tags_.begin(); dit != den; ++dit) + estr += dit->tag_ + "\n"; + writeError(estr); + // clear the pending tags... + pending_tags_.clear(); + // ...and then just fall through. + } + + // is the tag we are closing the last one we opened? + if (etag.tag_ == tag_stack_.back().tag_) { + // output it... + os_ << etag.asEndTag(); + // ...and forget about it + tag_stack_.pop_back(); + return *this; + } + + // we are trying to close a tag other than the one last opened. + // let's first see if this particular tag is still open somehow. + if (!isTagOpen(etag.tag_)) { + writeError("Tried to close `" + etag.tag_ + + "' when tag was not open. Tag discarded."); + return *this; + } + + // so the tag was opened, but other tags have been opened since + // and not yet closed. + // if it's a font tag, though... + if (html::isFontTag(etag.tag_)) { + // it won't be a problem if the other tags open since this one + // are also font tags. + TagStack::const_reverse_iterator rit = tag_stack_.rbegin(); + TagStack::const_reverse_iterator ren = tag_stack_.rend(); + for (; rit != ren; ++rit) { + if (rit->tag_ == etag.tag_) + break; + if (!html::isFontTag(rit->tag_)) { + // we'll just leave it and, presumably, have to close it later. + writeError("Unable to close font tag `" + etag.tag_ + + "' due to open non-font tag `" + rit->tag_ + "'."); + return *this; + } + } + + // so we have e.g.: + // this is bold + // and are being asked to closed em. we want: + // this is bold + // first, we close the intervening tags... + html::StartTag curtag = tag_stack_.back(); + // ...remembering them in a stack. + TagStack fontstack; + while (curtag.tag_ != etag.tag_) { + os_ << curtag.asEndTag(); + fontstack.push_back(curtag); + tag_stack_.pop_back(); + curtag = tag_stack_.back(); + } + // now close our tag... + os_ << etag.asEndTag(); + tag_stack_.pop_back(); + + // ...and restore the other tags. + rit = fontstack.rbegin(); + ren = fontstack.rend(); + for (; rit != ren; ++rit) + pending_tags_.push_back(*rit); + return *this; + } + + // it wasn't a font tag. + // so other tags were opened before this one and not properly closed. + // so we'll close them, too. that may cause other issues later, but it + // at least guarantees proper nesting. + writeError("Closing tag `" + etag.tag_ + + "' when other tags are open, namely:"); + html::StartTag curtag = tag_stack_.back(); + while (curtag.tag_ != etag.tag_) { + writeError(curtag.tag_); + os_ << curtag.asEndTag(); + tag_stack_.pop_back(); + curtag = tag_stack_.back(); + } + // curtag is now the one we actually want. + os_ << curtag.asEndTag(); + tag_stack_.pop_back(); + + return *this; +} + +// End code for XHTMLStream namespace { + +// convenience functions -bool openTag(odocstream & os, Layout const & lay) +inline void openTag(XHTMLStream & xs, Layout const & lay) { - string const tag = lay.htmltag().empty() - ? "div" : lay.htmltag(); - string const attr = lay.htmlattr().empty() - ? "class=\"" + to_utf8(lay.name()) + "\"" : lay.htmlattr(); - return html::openTag(os, tag, attr); + xs << html::StartTag(lay.htmltag(), lay.htmlattr()); } -bool closeTag(odocstream & os, Layout const & lay) +inline void closeTag(XHTMLStream & xs, Layout const & lay) { - string const tag = lay.htmltag().empty() - ? "div" : lay.htmltag(); - return html::closeTag(os, tag); + xs << html::EndTag(lay.htmltag()); } -bool openLabelTag(odocstream & os, Layout const & lay) +inline void openLabelTag(XHTMLStream & xs, Layout const & lay) { - string const tag = lay.htmllabel().empty() - ? "span" : lay.htmllabel(); - string const attr = lay.htmllabelattr().empty() - ? "class=\"" + to_utf8(lay.name()) + "label\"" : lay.htmllabelattr(); - return html::openTag(os, tag, attr); + xs << html::StartTag(lay.htmllabeltag(), lay.htmllabelattr()); } -bool closeLabelTag(odocstream & os, Layout const & lay) +inline void closeLabelTag(XHTMLStream & xs, Layout const & lay) { - string const tag = lay.htmllabel().empty() - ? "span" : lay.htmllabel(); - return html::closeTag(os, tag); + xs << html::EndTag(lay.htmllabeltag()); } -bool openItemTag(odocstream & os, Layout const & lay) +inline void openItemTag(XHTMLStream & xs, Layout const & lay) { - string const tag = lay.htmlitem().empty() - ? "div" : lay.htmlitem(); - string const attr = lay.htmlitemattr().empty() - ? "class=\"" + to_utf8(lay.name()) + "item\"" : lay.htmllabelattr(); - return html::openTag(os, tag, attr); + xs << html::StartTag(lay.htmlitemtag(), lay.htmlitemattr(), true); } -bool closeItemTag(odocstream & os, Layout const & lay) +inline void closeItemTag(XHTMLStream & xs, Layout const & lay) { - string const tag = lay.htmlitem().empty() - ? "div" : lay.htmlitem(); - return html::closeTag(os, tag); + xs << html::EndTag(lay.htmlitemtag()); } +// end of convenience functions + ParagraphList::const_iterator searchParagraphHtml( ParagraphList::const_iterator p, - ParagraphList::const_iterator const & pend) + ParagraphList::const_iterator const & pend) { for (++p; p != pend && p->layout().latextype == LATEX_PARAGRAPH; ++p) ; @@ -208,7 +563,7 @@ ParagraphList::const_iterator searchEnvironmentHtml( ParagraphList::const_iterator makeParagraphs(Buffer const & buf, - odocstream & os, + XHTMLStream & xs, OutputParams const & runparams, Text const & text, ParagraphList::const_iterator const & pbegin, @@ -219,51 +574,76 @@ 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); + buf.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) - os << '\n'; - bool const opened = openTag(os, lay); - docstring const deferred = par->simpleLyXHTMLOnePar(buf, os, runparams, - text.outerFont(distance(begin, par))); - if (opened) { - closeTag(os, lay); - os << '\n'; + xs.cr(); + + // If we are already in a paragraph, and this is the first one, then we + // do not want to open the paragraph tag. + // we also do not want to open it if the current layout does not permit + // multiple paragraphs. + bool const opened = runparams.html_make_pars && + (par != pbegin || !runparams.html_in_par); + if (opened) + openTag(xs, lay); + docstring const deferred = + par->simpleLyXHTMLOnePar(buf, xs, runparams, text.outerFont(distance(begin, par))); + + // We want to issue the closing tag if either: + // (i) We opened it, and either html_in_par is false, + // or we're not in the last paragraph, anyway. + // (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++; + bool const needclose = + (opened && (!runparams.html_in_par || nextpar != pend)) + || (!opened && runparams.html_in_par && par == pbegin && nextpar != pend); + if (needclose) { + closeTag(xs, lay); + xs.cr(); + } + if (!deferred.empty()) { + xs << XHTMLStream::NextRaw() << deferred; + xs.cr(); } - if (!deferred.empty()) - os << deferred << '\n'; } return pend; } ParagraphList::const_iterator makeBibliography(Buffer const & buf, - odocstream & os, + XHTMLStream & xs, OutputParams const & runparams, Text const & text, ParagraphList::const_iterator const & pbegin, ParagraphList::const_iterator const & pend) { - os << "

" - << pbegin->layout().labelstring(false) - << "

\n" - << "
\n"; - makeParagraphs(buf, os, runparams, text, pbegin, pend); - os << "
"; + // FIXME XHTML + // Use TextClass::htmlTOCLayout() to figure out how we should look. + xs << html::StartTag("h2", "class='bibliography'"); + xs << pbegin->layout().labelstring(false); + xs << html::EndTag("h2"); + xs.cr(); + xs << html::StartTag("div", "class='bibliography'"); + xs.cr(); + makeParagraphs(buf, xs, runparams, text, pbegin, pend); + xs << html::EndTag("div"); return pend; } -namespace { - bool isNormalEnv(Layout const & lay) - { - return lay.latextype == LATEX_ENVIRONMENT; - } +bool isNormalEnv(Layout const & lay) +{ + return lay.latextype == LATEX_ENVIRONMENT + || lay.latextype == LATEX_BIB_ENVIRONMENT; } + ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf, - odocstream & os, + XHTMLStream & xs, OutputParams const & runparams, Text const & text, ParagraphList::const_iterator const & pbegin, @@ -274,9 +654,9 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf, Layout const & bstyle = par->layout(); depth_type const origdepth = pbegin->params().depth(); - // Open tag for this environment - bool const main_tag_opened = openTag(os, bstyle); - os << '\n'; + // open tag for this environment + openTag(xs, bstyle); + xs.cr(); // we will on occasion need to remember a layout from before. Layout const * lastlay = 0; @@ -285,8 +665,17 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf, Layout const & style = par->layout(); // the counter only gets stepped if we're in some kind of list, // or if it's the first time through. - if (!style.counter.empty() && (par == pbegin || !isNormalEnv(style))) - buf.params().documentClass().counters().step(style.counter); + // note that enum, etc, are handled automatically. + // 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(); + docstring const & cntr = style.counter; + if (!style.counter.empty() + && (par == pbegin || !isNormalEnv(style)) + && cnts.hasCounter(cntr) + ) + cnts.step(cntr, OutputUpdate); ParagraphList::const_iterator send; // this will be positive, if we want to skip the initial word // (if it's been taken for the label). @@ -302,89 +691,78 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf, if (par->params().depth() == origdepth) { LASSERT(bstyle == style, /* */); if (lastlay != 0) { - closeItemTag(os, *lastlay); + closeItemTag(xs, *lastlay); lastlay = 0; } - bool item_tag_opened = false; - bool const labelfirst = style.htmllabelfirst(); - bool madelabel = false; if (isNormalEnv(style)) { // in this case, we print the label only for the first // paragraph (as in a theorem). - item_tag_opened = openItemTag(os, style); - if (par == pbegin && style.htmllabel() != "NONE") { + openItemTag(xs, style); + if (par == pbegin && style.htmllabeltag() != "NONE") { docstring const lbl = - pbegin->expandLabel(style, buf.params(), false); + pbegin->params().labelString(); if (!lbl.empty()) { - bool const label_tag_opened = openLabelTag(os, style); - os << lbl; - if (label_tag_opened) - closeLabelTag(os, style); + openLabelTag(xs, style); + xs << lbl; + closeLabelTag(xs, style); } - os << '\n'; + xs.cr(); } } else { // some kind of list + bool const labelfirst = style.htmllabelfirst(); if (!labelfirst) - item_tag_opened = openItemTag(os, style); + openItemTag(xs, style); if (style.labeltype == LABEL_MANUAL - && style.htmllabel() != "NONE") { - madelabel = openLabelTag(os, style); - sep = par->firstWordLyXHTML(os, runparams); - if (madelabel) - closeLabelTag(os, style); - os << '\n'; + && style.htmllabeltag() != "NONE") { + openLabelTag(xs, style); + sep = par->firstWordLyXHTML(xs, runparams); + closeLabelTag(xs, style); + xs.cr(); } else if (style.labeltype != LABEL_NO_LABEL - && style.htmllabel() != "NONE") { - madelabel = openLabelTag(os, style); - os << par->expandLabel(style, buf.params(), false); - if (madelabel) - closeLabelTag(os, style); - os << '\n'; + && style.htmllabeltag() != "NONE") { + openLabelTag(xs, style); + xs << par->params().labelString(); + closeLabelTag(xs, style); + xs.cr(); } if (labelfirst) - item_tag_opened = openItemTag(os, style); - else if (madelabel) - os << ""; + openItemTag(xs, style); } - par->simpleLyXHTMLOnePar(buf, os, runparams, + par->simpleLyXHTMLOnePar(buf, xs, runparams, text.outerFont(distance(begin, par)), sep); - if (!isNormalEnv(style) && !labelfirst && madelabel) - os << ""; ++par; - if (item_tag_opened) { - // We may not want to close the tag yet, in particular, - // if we're not at the end... - if (par != pend - // and are doing items... - && style.latextype == LATEX_ITEM_ENVIRONMENT - // and if the depth has changed... - && par->params().depth() != origdepth) { - // then we'll save this layout for later, and close it when - // we get another item. - lastlay = &style; - } else - closeItemTag(os, style); - os << '\n'; - } + // We may not want to close the tag yet, in particular, + // if we're not at the end... + if (par != pend + // and are doing items... + && !isNormalEnv(style) + // and if the depth has changed... + && par->params().depth() != origdepth) { + // then we'll save this layout for later, and close it when + // we get another item. + lastlay = &style; + } else + closeItemTag(xs, style); + xs.cr(); } // The other possibility is that the depth has increased, in which // case we need to recurse. else { send = searchEnvironmentHtml(par, pend); - par = makeEnvironmentHtml(buf, os, runparams, text, par, send); + par = makeEnvironmentHtml(buf, xs, runparams, text, par, send); } break; } case LATEX_PARAGRAPH: send = searchParagraphHtml(par, pend); - par = makeParagraphs(buf, os, runparams, text, par, send); + par = makeParagraphs(buf, xs, runparams, text, par, send); break; // Shouldn't happen case LATEX_BIB_ENVIRONMENT: send = par; ++send; - par = makeParagraphs(buf, os, runparams, text, par, send); + par = makeParagraphs(buf, xs, runparams, text, par, send); break; // Shouldn't happen case LATEX_COMMAND: @@ -394,43 +772,40 @@ ParagraphList::const_iterator makeEnvironmentHtml(Buffer const & buf, } if (lastlay != 0) - closeItemTag(os, *lastlay); - if (main_tag_opened) - closeTag(os, bstyle); - os << '\n'; + closeItemTag(xs, *lastlay); + closeTag(xs, bstyle); + xs.cr(); return pend; } void makeCommand(Buffer const & buf, - odocstream & os, + XHTMLStream & xs, OutputParams const & runparams, Text const & text, ParagraphList::const_iterator const & pbegin) { Layout const & style = pbegin->layout(); if (!style.counter.empty()) - buf.params().documentClass().counters().step(style.counter); + buf.params().documentClass().counters().step(style.counter, OutputUpdate); - bool const main_tag_opened = openTag(os, style); + openTag(xs, style); // Label around sectioning number: // FIXME Probably need to account for LABEL_MANUAL if (style.labeltype != LABEL_NO_LABEL) { - bool const label_tag_opened = openLabelTag(os, style); - os << pbegin->expandLabel(style, buf.params(), false); - if (label_tag_opened) - closeLabelTag(os, style); + openLabelTag(xs, style); + xs << pbegin->params().labelString(); + closeLabelTag(xs, style); // Otherwise the label might run together with the text - os << ' '; + xs << from_ascii(" "); } ParagraphList::const_iterator const begin = text.paragraphs().begin(); - pbegin->simpleLyXHTMLOnePar(buf, os, runparams, + pbegin->simpleLyXHTMLOnePar(buf, xs, runparams, text.outerFont(distance(begin, pbegin))); - if (main_tag_opened) - closeTag(os, style); - os << '\n'; + closeTag(xs, style); + xs.cr(); } } // end anonymous namespace @@ -438,14 +813,22 @@ void makeCommand(Buffer const & buf, void xhtmlParagraphs(Text const & text, Buffer const & buf, - odocstream & os, + XHTMLStream & xs, OutputParams const & runparams) { ParagraphList const & paragraphs = text.paragraphs(); ParagraphList::const_iterator par = paragraphs.begin(); ParagraphList::const_iterator pend = paragraphs.end(); + 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; @@ -454,25 +837,34 @@ void xhtmlParagraphs(Text const & text, case LATEX_COMMAND: { // The files with which we are working never have more than // one paragraph in a command structure. - makeCommand(buf, os, runparams, text, par); + // FIXME + // if (ourparams.html_in_par) + // fix it so we don't get sections inside standard, e.g. + // note that we may then need to make runparams not const, so we + // can communicate that back. + // FIXME Maybe this fix should be in the routines themselves, in case + // they are called from elsewhere. + makeCommand(buf, xs, ourparams, text, par); ++par; break; } case LATEX_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT: case LATEX_ITEM_ENVIRONMENT: { + // FIXME Same fix here. send = searchEnvironmentHtml(par, pend); - par = makeEnvironmentHtml(buf, os, runparams, text, par, send); + par = makeEnvironmentHtml(buf, xs, ourparams, text, par, send); break; } case LATEX_BIB_ENVIRONMENT: { + // FIXME Same fix here. send = searchEnvironmentHtml(par, pend); - par = makeBibliography(buf, os, runparams, text, par, send); + par = makeBibliography(buf, xs, ourparams, text, par, send); break; } case LATEX_PARAGRAPH: send = searchParagraphHtml(par, pend); - par = makeParagraphs(buf, os, runparams, text, par, send); + par = makeParagraphs(buf, xs, ourparams, text, par, send); break; } // FIXME??