X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.cpp;h=d3386ee1a55bb86b40bd1e2297d6839351448232;hb=4e6932e44f892a4167912bd904ba396efe7f88a8;hp=3a157c6f4d68c781da5b7fe65c35a39351c27c71;hpb=c8c5ae29aa86d5837e44a03048d127e7d62f7648;p=lyx.git diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp index 3a157c6f4d..d3386ee1a5 100644 --- 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; } @@ -145,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"; } @@ -198,10 +201,30 @@ XHTMLStream::XHTMLStream(odocstream & os) {} -void XHTMLStream::writeError(std::string const & s) +#if 0 +void XHTMLStream::dumpTagStack(string const & msg) const +{ + writeError(msg + ": Tag Stack"); + TagStack::const_reverse_iterator it = tag_stack_.rbegin(); + TagStack::const_reverse_iterator en = tag_stack_.rend(); + for (; it != en; ++it) { + writeError(it->tag_); + } + writeError("Pending Tags"); + it = pending_tags_.rbegin(); + en = pending_tags_.rend(); + for (; it != en; ++it) { + writeError(it->tag_); + } + writeError("End Tag Stack"); +} +#endif + + +void XHTMLStream::writeError(std::string const & s) const { LYXERR0(s); - os_ << from_utf8(""); + os_ << from_utf8("\n"); } @@ -213,8 +236,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_)) { @@ -227,7 +257,7 @@ bool XHTMLStream::closeFontTags() return true; curtag = tag_stack_.back(); } - + if (curtag.tag_ == parsep_tag) return true; @@ -246,45 +276,37 @@ bool XHTMLStream::closeFontTags() } -void XHTMLStream::startParagraph() +void XHTMLStream::startParagraph(bool keep_empty) { pending_tags_.push_back(html::StartTag(parsep_tag)); + if (keep_empty) + clearTagDeque(); } 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()) { @@ -396,7 +418,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(); @@ -407,6 +429,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 @@ -674,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) @@ -697,7 +731,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); @@ -768,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)) @@ -885,19 +919,21 @@ 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()) - 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(); @@ -922,20 +958,33 @@ void xhtmlParagraphs(Text const & text, OutputParams const & runparams) { ParagraphList const & paragraphs = text.paragraphs(); - ParagraphList::const_iterator par = paragraphs.begin(); - ParagraphList::const_iterator pend = paragraphs.end(); + if (runparams.par_begin == runparams.par_end) { + runparams.par_begin = 0; + runparams.par_end = paragraphs.size(); + } + pit_type bpit = runparams.par_begin; + pit_type const epit = runparams.par_end; + LASSERT(bpit < epit, /* */); OutputParams ourparams = runparams; - while (par != pend) { + ParagraphList::const_iterator const pend = + (epit == (int) paragraphs.size()) ? + paragraphs.end() : paragraphs.constIterator(epit); + 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 lastpar = par; + ParagraphList::const_iterator const lastpar = par; ParagraphList::const_iterator send; switch (style.latextype) { @@ -972,15 +1021,13 @@ void xhtmlParagraphs(Text const & text, par = makeParagraphs(buf, xs, ourparams, text, par, send); break; } - // FIXME?? - // makeEnvironment may process more than one paragraphs and bypass pend - if (distance(lastpar, par) >= distance(lastpar, pend)) - break; + bpit += distance(lastpar, par); } } -string alignmentToCSS(LyXAlignment align) { +string alignmentToCSS(LyXAlignment align) +{ switch (align) { case LYX_ALIGN_BLOCK: // we are NOT going to use text-align: justify!!