X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.cpp;h=e8f77e3f99ca0fe5673808b9317143ec55c97292;hb=2d7cf039351fba0d91746dce8cbf1f9e31cdc224;hp=d66b8fd915e6ef96657d3a5ca9f30a89281cfa59;hpb=8745fd6caa9620b587fe9a409d12b95b5dbdcd1e;p=lyx.git diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp index d66b8fd915..e8f77e3f99 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,9 +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 "support/textutils.h" #include @@ -40,47 +43,149 @@ namespace lyx { namespace html { -docstring escapeChar(char_type c) +docstring escapeChar(char_type c, XHTMLStream::EscapeSettings e) { docstring str; - switch (c) { - case ' ': - str += " "; - break; - case '&': - str += "&"; - break; - case '<': - str += "<"; - break; - case '>': - str += ">"; - break; - default: + switch (e) { + case XHTMLStream::ESCAPE_NONE: str += c; break; + case XHTMLStream::ESCAPE_ALL: + if (c == '<') { + str += "<"; + break; + } else if (c == '>') { + str += ">"; + break; + } + // fall through + case XHTMLStream::ESCAPE_AND: + if (c == '&') + str += "&"; + else + str +=c ; + break; } return str; } // escape what needs escaping -docstring htmlize(docstring const & str) { +docstring htmlize(docstring const & str, XHTMLStream::EscapeSettings e) { odocstringstream d; docstring::const_iterator it = str.begin(); docstring::const_iterator en = str.end(); for (; it != en; ++it) - d << escapeChar(*it); + d << escapeChar(*it, e); + return d.str(); +} + + +string escapeChar(char c, XHTMLStream::EscapeSettings e) +{ + string str; + switch (e) { + case XHTMLStream::ESCAPE_NONE: + str += c; + break; + case XHTMLStream::ESCAPE_ALL: + if (c == '<') { + str += "<"; + break; + } else if (c == '>') { + str += ">"; + break; + } + // fall through + case XHTMLStream::ESCAPE_AND: + if (c == '&') + str += "&"; + else + str +=c ; + break; + } + return str; +} + + +// escape what needs escaping +string htmlize(string const & str, XHTMLStream::EscapeSettings e) { + ostringstream d; + string::const_iterator it = str.begin(); + string::const_iterator en = str.end(); + for (; it != en; ++it) + d << escapeChar(*it, e); 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) { + char_type const c = *it; + newname += isAlnumASCII(c) ? c : char_type('_'); + } + 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_, XHTMLStream::ESCAPE_NONE); + output += ">"; + return from_utf8(output); +} + + +docstring StartTag::asEndTag() const +{ + string output = ""; + return from_utf8(output); +} + + +docstring EndTag::asEndTag() const +{ + string output = ""; + return from_utf8(output); +} + + +docstring CompTag::asTag() const +{ + string output = "<" + tag_; + if (!attr_.empty()) + output += " " + html::htmlize(attr_, XHTMLStream::ESCAPE_NONE); + output += " />"; + return from_utf8(output); +} + +} // namespace html + + + //////////////////////////////////////////////////////////////// /// /// XHTMLStream @@ -88,23 +193,32 @@ bool isFontTag(string const & s) //////////////////////////////////////////////////////////////// XHTMLStream::XHTMLStream(odocstream & os) - :os_(os) + : os_(os), escape_(ESCAPE_ALL) {} void XHTMLStream::cr() { // tabs? - os_ << std::endl; + 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 - StartTag curtag = tag_stack_.back(); - while (isFontTag(curtag.tag_)) { - os_ << ""; + 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 @@ -119,8 +233,9 @@ bool XHTMLStream::closeFontTags() TagStack::const_iterator en = tag_stack_.end(); bool noFontTags = true; for (; it != en; ++it) { - if (isFontTag(it->tag_)) { - LYXERR0("Font tag `" << it->tag_ << "' still open in closeFontTags()."); + 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; } } @@ -131,35 +246,72 @@ bool XHTMLStream::closeFontTags() void XHTMLStream::clearTagDeque() { while (!pending_tags_.empty()) { - StartTag const & tag = pending_tags_.front(); + html::StartTag const & tag = pending_tags_.front(); // tabs? - os_ << "<" << tag.tag_ << " " << tag.attr_ << ">"; + os_ << tag.asTag(); tag_stack_.push_back(tag); pending_tags_.pop_front(); } } + XHTMLStream & XHTMLStream::operator<<(docstring const & d) { - // I'm tempted to make sure here that there are no tags in the input clearTagDeque(); - os_ << htmlize(d); + os_ << html::htmlize(d, escape_); + escape_ = ESCAPE_ALL; + return *this; +} + + +XHTMLStream & XHTMLStream::operator<<(const char * s) +{ + clearTagDeque(); + docstring const d = from_ascii(s); + os_ << html::htmlize(d, escape_); + escape_ = ESCAPE_ALL; return *this; } -/* XHTMLStream & XHTMLStream::operator<<(char_type c) { clearTagDeque(); - os_ << escapeChar(c); + os_ << html::escapeChar(c, escape_); + escape_ = ESCAPE_ALL; return *this; } -*/ -XHTMLStream & XHTMLStream::operator<<(StartTag const & tag) +XHTMLStream & XHTMLStream::operator<<(char c) { + clearTagDeque(); + string const d = html::escapeChar(c, escape_); + escape_ = ESCAPE_ALL; + return *this; +} + + +XHTMLStream & XHTMLStream::operator<<(int i) +{ + clearTagDeque(); + os_ << i; + escape_ = ESCAPE_ALL; + return *this; +} + + +XHTMLStream & XHTMLStream::operator<<(EscapeSettings e) +{ + escape_ = e; + return *this; +} + + +XHTMLStream & XHTMLStream::operator<<(html::StartTag const & tag) +{ + if (tag.tag_.empty()) + return *this; pending_tags_.push_back(tag); if (tag.keepempty_) clearTagDeque(); @@ -167,21 +319,23 @@ XHTMLStream & XHTMLStream::operator<<(StartTag const & tag) } -XHTMLStream & XHTMLStream::operator<<(CompTag const & tag) +XHTMLStream & XHTMLStream::operator<<(html::CompTag const & tag) { + if (tag.tag_.empty()) + return *this; clearTagDeque(); // tabs? - os_ << "<" << tag.tag_ << " " << tag.attr_ << " />"; + os_ << tag.asTag(); + cr(); return *this; } -bool XHTMLStream::isTagOpen(string const & stag) +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) - // we could check for the if (sit->tag_ == stag) return true; return false; @@ -193,11 +347,21 @@ bool XHTMLStream::isTagOpen(string const & stag) // 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<<(EndTag const & etag) +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()) { - StartTag const & stag = pending_tags_.back(); + 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_. @@ -208,30 +372,32 @@ XHTMLStream & XHTMLStream::operator<<(EndTag const & etag) // 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(); + TagStack::iterator dit = pending_tags_.begin(); + TagStack::iterator const den = pending_tags_.end(); for (; dit != den; ++dit) { if (dit->tag_ == etag.tag_) { // it was pending, so we just erase it - LYXERR0("Tried to close pending tag `" << etag.tag_ - << "' when other tags were pending. Tag discarded."); + 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_)) { - LYXERR0("Tried to close `" << etag.tag_ - << "' when tag was not open. Tag discarded."); + 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. - LYXERR0("Closing tag `" << etag.tag_ - << "' when other tags are pending. Discarded pending tags:"); + string estr = "Closing tag `" + etag.tag_ + + "' when other tags are pending. Discarded pending tags:\n"; for (dit = pending_tags_.begin(); dit != den; ++dit) - LYXERR0(dit->tag_); + estr += dit->tag_ + "\n"; + writeError(estr); // clear the pending tags... pending_tags_.clear(); // ...and then just fall through. @@ -240,7 +406,7 @@ XHTMLStream & XHTMLStream::operator<<(EndTag const & etag) // is the tag we are closing the last one we opened? if (etag.tag_ == tag_stack_.back().tag_) { // output it... - os_ << ""; + os_ << etag.asEndTag(); // ...and forget about it tag_stack_.pop_back(); return *this; @@ -249,24 +415,26 @@ XHTMLStream & XHTMLStream::operator<<(EndTag const & etag) // 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_)) { - LYXERR0("Tried to close `" << etag.tag_ - << "' when tag was not open. Tag discarded."); + 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 (isFontTag(etag.tag_)) { + 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 (!isFontTag(rit->tag_)) { + if (rit->tag_ == etag.tag_) + break; + if (!html::isFontTag(rit->tag_)) { // we'll just leave it and, presumably, have to close it later. - LYXERR0("Unable to close font tag `" << etag.tag_ - << "' due to open non-font tags."); + writeError("Unable to close font tag `" + etag.tag_ + + "' due to open non-font tag `" + rit->tag_ + "'."); return *this; } } @@ -276,17 +444,19 @@ XHTMLStream & XHTMLStream::operator<<(EndTag const & etag) // and are being asked to closed em. we want: // this is bold // first, we close the intervening tags... - StartTag curtag = tag_stack_.back(); + html::StartTag curtag = tag_stack_.back(); // ...remembering them in a stack. TagStack fontstack; while (curtag.tag_ != etag.tag_) { - os_ << ""; + os_ << curtag.asEndTag(); fontstack.push_back(curtag); tag_stack_.pop_back(); curtag = tag_stack_.back(); } // now close our tag... - os_ << ""; + os_ << etag.asEndTag(); + tag_stack_.pop_back(); + // ...and restore the other tags. rit = fontstack.rbegin(); ren = fontstack.rend(); @@ -299,101 +469,92 @@ XHTMLStream & XHTMLStream::operator<<(EndTag const & etag) // 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. - LYXERR0("Closing tag `" << etag.tag_ - << "' when other tags are open, namely:"); - StartTag curtag = tag_stack_.back(); + writeError("Closing tag `" + etag.tag_ + + "' when other tags are open, namely:"); + html::StartTag curtag = tag_stack_.back(); while (curtag.tag_ != etag.tag_) { - LYXERR0(curtag.tag_); - os_ << ""; + writeError(curtag.tag_); + os_ << curtag.asEndTag(); tag_stack_.pop_back(); curtag = tag_stack_.back(); } // curtag is now the one we actually want. - os_ << ""; + os_ << curtag.asEndTag(); tag_stack_.pop_back(); return *this; } +// End code for XHTMLStream -/////////////////////////////////////////////////////////////// -// OLD STUFF to be replaced - -// FIXME This needs to be protected somehow. -static vector taglist; +namespace { + +// convenience functions -bool openTag(odocstream & os, string const & tag, string const & attr) +inline void openTag(XHTMLStream & xs, Layout const & lay) { - if (tag.empty()) - return false; - os << from_ascii("<" + tag + (attr.empty() ? "" : " " + attr) + ">"); - taglist.push_back(tag); - return true; + xs << html::StartTag(lay.htmltag(), lay.htmlattr()); } -bool closeTag(odocstream & os, string const & tag) +void openTag(XHTMLStream & xs, Layout const & lay, + ParagraphParameters const & params) { - if (tag.empty()) - return false; - // FIXME Check for proper nesting - if (taglist.empty()){ - LYXERR0("Last tag not found when closing `" << tag << "'!"); - return false; + // FIXME Are there other things we should handle here? + string const align = alignmentToCSS(params.align()); + if (align.empty()) { + openTag(xs, lay); + return; } - string const & lasttag = taglist.back(); - if (lasttag != tag) { - LYXERR0("Last tag was `" << lasttag << "' when closing `" << tag << "'!"); - return false; - } - taglist.pop_back(); - os << from_ascii(""); - return true; + string attrs = lay.htmlattr() + " style='text-align: " + align + ";'"; + xs << html::StartTag(lay.htmltag(), attrs); } - -} // html - -namespace { - -bool openTag(odocstream & os, Layout const & lay) +inline void closeTag(XHTMLStream & xs, Layout const & lay) { - return html::openTag(os, lay.htmltag(), lay.htmlattr()); + xs << html::EndTag(lay.htmltag()); } -bool closeTag(odocstream & os, Layout const & lay) +inline void openLabelTag(XHTMLStream & xs, Layout const & lay) { - return html::closeTag(os, lay.htmltag()); + xs << html::StartTag(lay.htmllabeltag(), lay.htmllabelattr()); } -bool openLabelTag(odocstream & os, Layout const & lay) +inline void closeLabelTag(XHTMLStream & xs, Layout const & lay) { - return html::openTag(os, lay.htmllabeltag(), lay.htmllabelattr()); + xs << html::EndTag(lay.htmllabeltag()); } -bool closeLabelTag(odocstream & os, Layout const & lay) +inline void openItemTag(XHTMLStream & xs, Layout const & lay) { - return html::closeTag(os, lay.htmllabeltag()); + xs << html::StartTag(lay.htmlitemtag(), lay.htmlitemattr(), true); } -bool openItemTag(odocstream & os, Layout const & lay) +void openItemTag(XHTMLStream & xs, Layout const & lay, + ParagraphParameters const & params) { - return html::openTag(os, lay.htmlitemtag(), lay.htmlitemattr()); + // FIXME Are there other things we should handle here? + string const align = alignmentToCSS(params.align()); + if (align.empty()) { + openItemTag(xs, lay); + return; + } + string attrs = lay.htmlattr() + " style='text-align: " + align + ";'"; + xs << html::StartTag(lay.htmlitemtag(), attrs); } -bool closeItemTag(odocstream & os, Layout const & lay) +inline void closeItemTag(XHTMLStream & xs, Layout const & lay) { - return html::closeTag(os, lay.htmlitemtag()); + xs << html::EndTag(lay.htmlitemtag()); } -// end of old stuff to be replaced -/////////////////////////////////////////////////////////////// +// end of convenience functions ParagraphList::const_iterator searchParagraphHtml( ParagraphList::const_iterator p, @@ -436,7 +597,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, @@ -447,20 +608,22 @@ 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'; + xs.cr(); - // FIXME Should we really allow anything other than 'p' here? - // If we are already in a paragraph, and this is the first one, then we // do not want to open the paragraph tag. - bool const opened = - (par == pbegin && runparams.html_in_par) ? false : openTag(os, lay); - docstring const deferred = par->simpleLyXHTMLOnePar(buf, os, runparams, - text.outerFont(distance(begin, par))); + // 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, par->params()); + 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, @@ -469,46 +632,52 @@ ParagraphList::const_iterator makeParagraphs(Buffer const & buf, // but we are in the first par, and there is a next par. ParagraphList::const_iterator nextpar = par; nextpar++; - bool const needClose = + bool const needclose = (opened && (!runparams.html_in_par || nextpar != pend)) || (!opened && runparams.html_in_par && par == pbegin && nextpar != pend); - if (needClose) { - closeTag(os, lay); - os << '\n'; + if (needclose) { + closeTag(xs, lay); + xs.cr(); + } + if (!deferred.empty()) { + xs << XHTMLStream::ESCAPE_NONE << 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, @@ -519,9 +688,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; @@ -530,8 +699,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). @@ -547,89 +725,84 @@ 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.htmllabeltag() != "NONE") { - docstring const lbl = - pbegin->expandLabel(style, buf.params(), false); - if (!lbl.empty()) { - bool const label_tag_opened = openLabelTag(os, style); - os << lbl; - if (label_tag_opened) - closeLabelTag(os, style); + if (!labelfirst) + openItemTag(xs, style, par->params()); + + // label output + if (style.labeltype != LABEL_NO_LABEL && + style.htmllabeltag() != "NONE") { + if (isNormalEnv(style)) { + // in this case, we print the label only for the first + // paragraph (as in a theorem). + if (par == pbegin) { + docstring const lbl = + pbegin->params().labelString(); + if (!lbl.empty()) { + openLabelTag(xs, style); + xs << lbl; + closeLabelTag(xs, style); + } + xs.cr(); + } + } else { // some kind of list + if (style.labeltype == LABEL_MANUAL) { + openLabelTag(xs, style); + sep = par->firstWordLyXHTML(xs, runparams); + closeLabelTag(xs, style); + xs.cr(); + } + else { + openLabelTag(xs, style); + xs << par->params().labelString(); + closeLabelTag(xs, style); + xs.cr(); } - os << '\n'; - } - } else { // some kind of list - if (!labelfirst) - item_tag_opened = openItemTag(os, style); - if (style.labeltype == LABEL_MANUAL - && style.htmllabeltag() != "NONE") { - madelabel = openLabelTag(os, style); - sep = par->firstWordLyXHTML(os, runparams); - if (madelabel) - closeLabelTag(os, style); - os << '\n'; - } - else if (style.labeltype != LABEL_NO_LABEL - && style.htmllabeltag() != "NONE") { - madelabel = openLabelTag(os, style); - os << par->expandLabel(style, buf.params(), false); - if (madelabel) - closeLabelTag(os, style); - os << '\n'; } - if (labelfirst) - item_tag_opened = openItemTag(os, style); - else if (madelabel) - os << ""; - } - par->simpleLyXHTMLOnePar(buf, os, runparams, + } // end label output + + if (labelfirst) + openItemTag(xs, style, par->params()); + + 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: @@ -639,43 +812,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, pbegin->params()); // 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 @@ -683,7 +853,7 @@ 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(); @@ -692,6 +862,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; @@ -707,7 +884,7 @@ void xhtmlParagraphs(Text const & text, // can communicate that back. // FIXME Maybe this fix should be in the routines themselves, in case // they are called from elsewhere. - makeCommand(buf, os, ourparams, text, par); + makeCommand(buf, xs, ourparams, text, par); ++par; break; } @@ -716,18 +893,18 @@ void xhtmlParagraphs(Text const & text, case LATEX_ITEM_ENVIRONMENT: { // FIXME Same fix here. send = searchEnvironmentHtml(par, pend); - par = makeEnvironmentHtml(buf, os, ourparams, 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, ourparams, text, par, send); + par = makeBibliography(buf, xs, ourparams, text, par, send); break; } case LATEX_PARAGRAPH: send = searchParagraphHtml(par, pend); - par = makeParagraphs(buf, os, ourparams, text, par, send); + par = makeParagraphs(buf, xs, ourparams, text, par, send); break; } // FIXME?? @@ -738,4 +915,20 @@ void xhtmlParagraphs(Text const & text, } +string alignmentToCSS(LyXAlignment align) { + switch (align) { + case LYX_ALIGN_BLOCK: + // we are NOT going to use text-align: justify!! + case LYX_ALIGN_LEFT: + return "left"; + case LYX_ALIGN_RIGHT: + return "right"; + case LYX_ALIGN_CENTER: + return "center"; + default: + break; + } + return ""; +} + } // namespace lyx