X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=1b6a766fb54f6a7d289bc7eeb443260ff0f25c7f;hb=d9082639080b9de993742bd352f92e5183058cf5;hp=e81eb2fc895b99aa1ce350aeee2d8740e0cc7d13;hpb=fb2077df118bbb0ff32f81d80150dd068efb2f3a;p=lyx.git diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index e81eb2fc89..1b6a766fb5 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -5,7 +5,7 @@ * * \author Asger Alstrup * \author Lars Gullik Bjønnes - * \author Richard Heck (XHTML output) + * \author Richard Kimberly Heck (XHTML output) * \author Jean-Marc Lasgouttes * \author Angus Leeming * \author John Levon @@ -20,12 +20,11 @@ #include "Paragraph.h" -#include "LayoutFile.h" #include "Buffer.h" #include "BufferParams.h" +#include "BufferEncodings.h" #include "Changes.h" #include "Counters.h" -#include "BufferEncodings.h" #include "InsetList.h" #include "Language.h" #include "LaTeXFeatures.h" @@ -39,11 +38,10 @@ #include "output_docbook.h" #include "ParagraphParameters.h" #include "SpellChecker.h" -#include "xml.h" #include "texstream.h" -#include "TextClass.h" #include "TexRow.h" #include "Text.h" +#include "TextClass.h" #include "WordLangTuple.h" #include "WordList.h" @@ -58,13 +56,10 @@ #include "support/debug.h" #include "support/docstring_list.h" -#include "support/ExceptionMessage.h" #include "support/gettext.h" #include "support/lassert.h" -#include "support/Length.h" #include "support/lstrings.h" #include "support/textutils.h" -#include "output_docbook.h" #include #include @@ -364,19 +359,19 @@ public: char_type const c, otexstream & os, pos_type i, - unsigned int & column); + unsigned int & column) const; /// bool latexSpecialTU( char_type const c, otexstream & os, pos_type i, - unsigned int & column); + unsigned int & column) const; /// bool latexSpecialT3( char_type const c, otexstream & os, pos_type i, - unsigned int & column); + unsigned int & column) const; /// void validate(LaTeXFeatures & features) const; @@ -870,6 +865,7 @@ int Paragraph::eraseChars(pos_type start, pos_type end, bool trackChanges) return end - i; } + // Handle combining characters int Paragraph::Private::latexSurrogatePair(BufferParams const & bparams, otexstream & os, char_type c, char_type next, @@ -1033,10 +1029,10 @@ void Paragraph::Private::latexInset(BufferParams const & bparams, close = true; } - if (open_font && (!inset->inheritFont() || fontswitch_inset)) { + if (open_font && fontswitch_inset) { bool lang_closed = false; // Close language if needed - if (closeLanguage) { + if (closeLanguage && !lang_switched_at_inset) { // We need prev_font here as language changes directly at inset // will only be started inside the inset. Font const prev_font = (i > 0) ? @@ -1060,6 +1056,8 @@ void Paragraph::Private::latexInset(BufferParams const & bparams, running_font = basefont; if (!closeLanguage) running_font.setLanguage(copy_font.language()); + OutputParams rp = runparams; + rp.encoding = basefont.language()->encoding(); // For these, we use switches, so they should be taken as // base inside the inset. basefont.fontInfo().setSize(copy_font.fontInfo().size()); @@ -1073,9 +1071,10 @@ void Paragraph::Private::latexInset(BufferParams const & bparams, && !textinset->text().isMainText() : false; unsigned int count2 = basefont.latexWriteStartChanges(os, bparams, - runparams, running_font, + rp, running_font, basefont, true, cprotect); + open_font = true; column += count2; if (count2 == 0 && (lang_closed || lang_switched_at_inset)) // All fonts closed @@ -1084,6 +1083,12 @@ void Paragraph::Private::latexInset(BufferParams const & bparams, runparams.local_font = &basefont; } + if (fontswitch_inset && !closeLanguage) { + // The directionality has been switched at inset. + // Force markup inside. + runparams.local_font = &basefont; + } + size_t const previous_row_count = os.texrow().rows(); try { @@ -1094,7 +1099,7 @@ void Paragraph::Private::latexInset(BufferParams const & bparams, // add location information and throw again. e.par_id = id_; e.pos = i; - throw(e); + throw; } if (close) @@ -1124,10 +1129,12 @@ void Paragraph::Private::latexSpecialChar(otexstream & os, { char_type const c = owner_->getUChar(bparams, runparams, i); - if (style.pass_thru || runparams.pass_thru + if (style.pass_thru || runparams.pass_thru || runparams.for_search || contains(style.pass_thru_chars, c) || contains(runparams.pass_thru_chars, c)) { - if (c != '\0') { + if ((c == '\\') && runparams.for_search) + os << "\\\\"; + else if (c != '\0') { Encoding const * const enc = runparams.encoding; if (enc && !enc->encodable(c)) throw EncodingException(c); @@ -1231,7 +1238,7 @@ void Paragraph::Private::latexSpecialChar(otexstream & os, && !runparams.inIPA // TODO #10961: && not in inset Flex Code // TODO #10961: && not in layout LyXCode - && (!bparams.useNonTeXFonts || runparams.flavor != OutputParams::XETEX)) { + && (!bparams.useNonTeXFonts || runparams.flavor != Flavor::XeTeX)) { if (c == 0x2013) { // en-dash os << "--"; @@ -1312,7 +1319,7 @@ void Paragraph::Private::latexSpecialChar(otexstream & os, bool Paragraph::Private::latexSpecialT1(char_type const c, otexstream & os, - pos_type i, unsigned int & column) + pos_type i, unsigned int & column) const { switch (c) { case '>': @@ -1340,7 +1347,7 @@ bool Paragraph::Private::latexSpecialT1(char_type const c, otexstream & os, bool Paragraph::Private::latexSpecialTU(char_type const c, otexstream & os, - pos_type i, unsigned int & column) + pos_type i, unsigned int & column) const { // TU encoding is currently on par with T1. return latexSpecialT1(c, os, i, column); @@ -1348,7 +1355,7 @@ bool Paragraph::Private::latexSpecialTU(char_type const c, otexstream & os, bool Paragraph::Private::latexSpecialT3(char_type const c, otexstream & os, - pos_type /*i*/, unsigned int & column) + pos_type /*i*/, unsigned int & column) const { switch (c) { case '*': @@ -1385,7 +1392,7 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const features.addPreambleSnippet(os.release(), true); } - if (features.runparams().flavor == OutputParams::HTML + if (features.runparams().flavor == Flavor::Html && layout_->htmltitle()) { features.setHTMLTitle(owner_->asString(AS_STR_INSETS | AS_STR_SKIPDELETE)); } @@ -1480,7 +1487,7 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const } else if (!bp.use_dash_ligatures && (c == 0x2013 || c == 0x2014) && bp.useNonTeXFonts - && features.runparams().flavor == OutputParams::XETEX) + && features.runparams().flavor == Flavor::XeTeX) // XeTeX's dash behaviour is determined via a global setting features.require("xetexdashbreakstate"); BufferEncodings::validate(c, features); @@ -1556,19 +1563,19 @@ void flushString(ostream & os, docstring & s) void Paragraph::write(ostream & os, BufferParams const & bparams, - depth_type & dth) const + depth_type & depth) const { // The beginning or end of a deeper (i.e. nested) area? - if (dth != d->params_.depth()) { - if (d->params_.depth() > dth) { - while (d->params_.depth() > dth) { + if (depth != d->params_.depth()) { + if (d->params_.depth() > depth) { + while (d->params_.depth() > depth) { os << "\n\\begin_deeper"; - ++dth; + ++depth; } } else { - while (d->params_.depth() < dth) { + while (d->params_.depth() < depth) { os << "\n\\end_deeper"; - --dth; + --depth; } } } @@ -1681,11 +1688,11 @@ void Paragraph::validate(LaTeXFeatures & features) const } -void Paragraph::insert(pos_type start, docstring const & str, +void Paragraph::insert(pos_type pos, docstring const & str, Font const & font, Change const & change) { for (size_t i = 0, n = str.size(); i != n ; ++i) - insertChar(start + i, str[i], font, change); + insertChar(pos + i, str[i], font, change); } @@ -2505,7 +2512,7 @@ void Paragraph::latex(BufferParams const & bparams, if (c == META_INSET && i >= start_pos && (end_pos == -1 || i < end_pos)) { if (isDeleted(i)) - runparams.ctObject = getInset(i)->CtObject(runparams); + runparams.ctObject = getInset(i)->getCtObject(runparams); InsetMath const * im = getInset(i)->asInsetMath(); if (im && im->asHullInset() @@ -2570,7 +2577,7 @@ void Paragraph::latex(BufferParams const & bparams, ++column; // Fully instantiated font - Font const current_font = getFont(bparams, i, outerfont); + Font current_font = getFont(bparams, i, outerfont); // Previous font Font const prev_font = (i > 0) ? getFont(bparams, i - 1, outerfont) @@ -2586,15 +2593,33 @@ void Paragraph::latex(BufferParams const & bparams, c == META_INSET && getInset(i) && getInset(i)->allowMultiPar() - && !getInset(i)->isPassThru(); + && getInset(i)->lyxCode() != ERT_CODE + && getInset(i)->producesOutput(); + + bool closeLanguage = false; + bool lang_switched_at_inset = false; + if (fontswitch_inset) { + // Some insets cannot be inside a font change command. + // However, even such insets *can* be placed in \L or \R + // or their equivalents (for RTL language switches), + // so we don't close the language in those cases + // (= differing isRightToLeft()). + // ArabTeX, though, doesn't seem to handle this special behavior. + closeLanguage = basefont.isRightToLeft() == current_font.isRightToLeft() + || basefont.language()->lang() == "arabic_arabtex" + || current_font.language()->lang() == "arabic_arabtex"; + // We need to check prev_font as language changes directly at inset + // will only be started inside the inset. + lang_switched_at_inset = prev_font.language() != current_font.language(); + } // Do we need to close the previous font? + bool langClosed = false; if (open_font && ((current_font != running_font || current_font.language() != running_font.language()) || (fontswitch_inset - && (current_font == prev_font - || current_font.language() == prev_font.language())))) + && (current_font == prev_font)))) { // ensure there is no open script-wrapper if (!alien_script.empty()) { @@ -2602,17 +2627,20 @@ void Paragraph::latex(BufferParams const & bparams, os << "}"; alien_script.clear(); } - bool needPar = false; if (in_ct_deletion) { // We have to close and then reopen \lyxdeleted, // as strikeout needs to be on lowest level. os << '}'; column += 1; } + if (closeLanguage) + // Force language closing + current_font.setLanguage(basefont.language()); + Font const nextfont = (i == body_pos-1) ? basefont : current_font; + bool needPar = false; column += running_font.latexWriteEndChanges( os, bparams, runparams, basefont, - (i == body_pos-1) ? basefont : current_font, - needPar); + nextfont, needPar); if (in_ct_deletion) { // We have to close and then reopen \lyxdeleted, // as strikeout needs to be on lowest level. @@ -2620,8 +2648,12 @@ void Paragraph::latex(BufferParams const & bparams, column += Changes::latexMarkChange(os, bparams, Change(Change::UNCHANGED), Change(Change::DELETED), rp); } - running_font = basefont; open_font = false; + // Has the language been closed in the latexWriteEndChanges() call above? + langClosed = running_font.language() != basefont.language() + && running_font.language() != nextfont.language() + && (running_font.language()->encoding()->package() != Encoding::CJK); + running_font = basefont; } // if necessary, close language environment before opening CJK @@ -2638,7 +2670,8 @@ void Paragraph::latex(BufferParams const & bparams, } // Switch file encoding if necessary (and allowed) - if (!runparams.pass_thru && !style.pass_thru && + if ((!fontswitch_inset || closeLanguage) + && !runparams.pass_thru && !style.pass_thru && runparams.encoding->package() != Encoding::none && current_font.language()->encoding()->package() != Encoding::none) { pair const enc_switch = @@ -2668,19 +2701,19 @@ void Paragraph::latex(BufferParams const & bparams, current_font.language() != running_font.language()) && i != body_pos - 1) { - if (in_ct_deletion) { - // We have to close and then reopen \lyxdeleted, - // as strikeout needs to be on lowest level. - bool needPar = false; - OutputParams rp = runparams; - column += running_font.latexWriteEndChanges( - os, bparams, rp, basefont, - basefont, needPar); - os << '}'; - column += 1; - } - otexstringstream ots; if (!fontswitch_inset) { + if (in_ct_deletion) { + // We have to close and then reopen \lyxdeleted, + // as strikeout needs to be on lowest level. + OutputParams rp = runparams; + bool needPar = false; + column += running_font.latexWriteEndChanges( + os, bparams, rp, basefont, + basefont, needPar); + os << '}'; + column += 1; + } + otexstringstream ots; InsetText const * textinset = inInset().asInsetText(); bool const cprotect = textinset ? textinset->hasCProtectContent(runparams.moving_arg) @@ -2689,35 +2722,38 @@ void Paragraph::latex(BufferParams const & bparams, column += current_font.latexWriteStartChanges(ots, bparams, runparams, basefont, last_font, false, cprotect); - } - // Check again for display math in ulem commands as a - // font change may also occur just before a math inset. - if (runparams.inDisplayMath && !deleted_display_math - && runparams.inulemcmd) { - if (os.afterParbreak()) - os << "\\noindent"; - else - os << "\\\\\n"; - } - running_font = current_font; - open_font = true; - docstring fontchange = ots.str(); - os << fontchange; - // check whether the fontchange ends with a \\textcolor - // modifier and the text starts with a space. If so we - // need to add } in order to prevent \\textcolor from gobbling - // the space (bug 4473). - docstring const last_modifier = rsplit(fontchange, '\\'); - if (prefixIs(last_modifier, from_ascii("textcolor")) && c == ' ') - os << from_ascii("{}"); - else if (ots.terminateCommand()) - os << termcmd; - if (in_ct_deletion) { - // We have to close and then reopen \lyxdeleted, - // as strikeout needs to be on lowest level. - OutputParams rp = runparams; - column += Changes::latexMarkChange(os, bparams, - Change(Change::UNCHANGED), change, rp); + // Check again for display math in ulem commands as a + // font change may also occur just before a math inset. + if (runparams.inDisplayMath && !deleted_display_math + && runparams.inulemcmd) { + if (os.afterParbreak()) + os << "\\noindent"; + else + os << "\\\\\n"; + } + running_font = current_font; + open_font = true; + docstring fontchange = ots.str(); + os << fontchange; + // check whether the fontchange ends with a \\textcolor + // modifier and the text starts with a space. If so we + // need to add } in order to prevent \\textcolor from gobbling + // the space (bug 4473). + docstring const last_modifier = rsplit(fontchange, '\\'); + if (prefixIs(last_modifier, from_ascii("textcolor")) && c == ' ') + os << from_ascii("{}"); + else if (ots.terminateCommand()) + os << termcmd; + if (in_ct_deletion) { + // We have to close and then reopen \lyxdeleted, + // as strikeout needs to be on lowest level. + OutputParams rp = runparams; + column += Changes::latexMarkChange(os, bparams, + Change(Change::UNCHANGED), change, rp); + } + } else { + running_font = current_font; + open_font = !langClosed; } } @@ -2783,27 +2819,10 @@ void Paragraph::latex(BufferParams const & bparams, // We need to restore parts of this after insets with // allowMultiPar() true Font const save_basefont = basefont; - Font const save_runningfont = running_font; - bool closeLanguage = false; - bool lang_switched_at_inset = false; - if (fontswitch_inset) { - // Some insets cannot be inside a font change command. - // However, even such insets *can* be placed in \L or \R - // or their equivalents (for RTL language switches), - // so we don't close the language in those cases - // (= differing isRightToLeft()). - // ArabTeX, though, doesn't seem to handle this special behavior. - closeLanguage = basefont.isRightToLeft() != running_font.isRightToLeft() - && basefont.language()->lang() != "arabic_arabtex" - && running_font.language()->lang() != "arabic_arabtex"; - // We need to check prev_font as language changes directly at inset - // will only be started inside the inset. - lang_switched_at_inset = prev_font.language() != running_font.language(); - } d->latexInset(bparams, os, rp, running_font, basefont, real_outerfont, open_font, - runningChange, style, i, column, - fontswitch_inset, closeLanguage, lang_switched_at_inset); + runningChange, style, i, column, fontswitch_inset, + closeLanguage, lang_switched_at_inset); if (fontswitch_inset) { if (open_font) { bool needPar = false; @@ -2819,14 +2838,14 @@ void Paragraph::latex(BufferParams const & bparams, if (incremented) --parInline; - if (runparams.ctObject == OutputParams::CT_DISPLAYOBJECT - || runparams.ctObject == OutputParams::CT_UDISPLAYOBJECT) { + if (runparams.ctObject == CtObject::DisplayObject + || runparams.ctObject == CtObject::UDisplayObject) { // Close \lyx*deleted and force its // reopening (if needed) os << '}'; column++; runningChange = Change(Change::UNCHANGED); - runparams.ctObject = OutputParams::CT_NORMAL; + runparams.ctObject = CtObject::Normal; } } } else if (i >= start_pos && (end_pos == -1 || i < end_pos)) { @@ -2858,7 +2877,7 @@ void Paragraph::latex(BufferParams const & bparams, // add location information and throw again. e.par_id = id(); e.pos = i; - throw(e); + throw; } } } @@ -2886,6 +2905,31 @@ void Paragraph::latex(BufferParams const & bparams, alien_script.clear(); } + Font const font = empty() + ? getLayoutFont(bparams, real_outerfont) + : getFont(bparams, size() - 1, real_outerfont); + + InsetText const * textinset = inInset().asInsetText(); + + bool const maintext = textinset + ? textinset->text().isMainText() + : false; + + size_t const numpars = textinset + ? textinset->text().paragraphs().size() + : 0; + + bool needPar = false; + + if (style.resfont.size() != font.fontInfo().size() + && (!runparams.isLastPar || maintext + || (numpars > 1 && d->ownerCode() != CELL_CODE + && (inInset().getLayout().isDisplay() + || parInline))) + && !style.isCommand()) { + needPar = true; + } + // If we have an open font definition, we have to close it if (open_font) { // Make sure that \\par is done with the font of the last @@ -2897,31 +2941,6 @@ void Paragraph::latex(BufferParams const & bparams, // We must not change the font for the last paragraph // of non-multipar insets, tabular cells or commands, // since this produces unwanted whitespace. - - Font const font = empty() - ? getLayoutFont(bparams, real_outerfont) - : getFont(bparams, size() - 1, real_outerfont); - - InsetText const * textinset = inInset().asInsetText(); - - bool const maintext = textinset - ? textinset->text().isMainText() - : false; - - size_t const numpars = textinset - ? textinset->text().paragraphs().size() - : 0; - - bool needPar = false; - - if (style.resfont.size() != font.fontInfo().size() - && (!runparams.isLastPar || maintext - || (numpars > 1 && d->ownerCode() != CELL_CODE - && (inInset().getLayout().isDisplay() - || parInline))) - && !style.isCommand()) { - needPar = true; - } #ifdef FIXED_LANGUAGE_END_DETECTION if (next_) { running_font.latexWriteEndChanges(os, bparams, @@ -2939,11 +2958,11 @@ void Paragraph::latex(BufferParams const & bparams, running_font.latexWriteEndChanges(os, bparams, runparams, basefont, basefont, needPar); #endif - if (needPar) { - // The \par could not be inserted at the same nesting - // level of the font size change, so do it now. - os << "{\\" << font.latexSize() << "\\par}"; - } + } + if (needPar) { + // The \par could not be inserted at the same nesting + // level of the font size change, so do it now. + os << "{\\" << font.latexSize() << "\\par}"; } column += Changes::latexMarkChange(os, bparams, runningChange, @@ -3312,19 +3331,16 @@ std::tuple, vector> computeDocBookFontSwit } // anonymous namespace -void Paragraph::simpleDocBookOnePar(Buffer const & buf, - XMLStream & xs, - OutputParams const & runparams, - Font const & outerfont, - bool start_paragraph, bool close_paragraph, - pos_type initial) const +std::vector Paragraph::simpleDocBookOnePar(Buffer const & buf, + OutputParams const & runparams, + Font const & outerfont, + pos_type initial, + bool is_last_par, + bool ignore_fonts) const { - // track whether we have opened these tags + // Track whether we have opened these tags DocBookFontState fs; - if (start_paragraph) - xs.startDivision(allowEmpty()); - Layout const & style = *d->layout_; FontInfo font_old = style.labeltype == LABEL_MANUAL ? style.labelfont : style.font; @@ -3335,48 +3351,88 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf, vector tagsToOpen; vector tagsToClose; - // parsing main loop + std::vector generatedParagraphs; + DocBookFontState old_fs = fs; + odocstringstream os; + auto * xs = new XMLStream(os); // XMLStream has no copy constructor: to create a new object, the only solution + // is to hold a pointer to the XMLStream (xs = XMLStream(os) is not allowed once the first object is built). + + // When a font tag ends with a space, output it after the closing font tag. This requires to store delayed + // characters at some point. + std::vector delayedChars; + + // Parsing main loop. for (pos_type i = initial; i < size(); ++i) { - // let's not show deleted material in the output + // Don't show deleted material in the output. if (isDeleted(i)) continue; - Font const font = getFont(buf.masterBuffer()->params(), i, outerfont); - - // Determine which tags should be opened or closed. - tie(tagsToOpen, tagsToClose) = computeDocBookFontSwitch(font_old, font, default_family, fs); - - // FIXME XHTML - // Other such tags? What about the other text ranges? + // If this is an InsetNewline, generate a new paragraph. Also reset the fonts, so that tags are closed in + // this paragraph. + if (getInset(i) && getInset(i)->lyxCode() == NEWLINE_CODE) { + if (!ignore_fonts) + xs->closeFontTags(); + + // Output one paragraph (i.e. one string entry in generatedParagraphs). + generatedParagraphs.push_back(os.str()); + + // Create a new XMLStream for the new paragraph, completely independent from the previous one. This implies + // that the string stream must be reset. + os.str(from_ascii("")); + delete xs; + xs = new XMLStream(os); + + // Restore the fonts for the new paragraph, so that the right tags are opened for the new entry. + if (!ignore_fonts) { + font_old = outerfont.fontInfo(); + fs = old_fs; + } + } - vector::const_iterator cit = tagsToClose.begin(); - vector::const_iterator cen = tagsToClose.end(); - for (; cit != cen; ++cit) - xs << *cit; + // Determine which tags should be opened or closed regarding fonts. + Font const font = getFont(buf.masterBuffer()->params(), i, outerfont); + if (!ignore_fonts) { + tie(tagsToOpen, tagsToClose) = computeDocBookFontSwitch(font_old, font, default_family, fs); + + // FIXME XHTML + // Other such tags? What about the other text ranges? + + vector::const_iterator cit = tagsToClose.begin(); + vector::const_iterator cen = tagsToClose.end(); + for (; cit != cen; ++cit) + *xs << *cit; + + // Deal with the delayed characters *after* closing font tags. + if (!delayedChars.empty()) { + for (char_type c: delayedChars) + *xs << c; + delayedChars.clear(); + } - vector::const_iterator sit = tagsToOpen.begin(); - vector::const_iterator sen = tagsToOpen.end(); - for (; sit != sen; ++sit) - xs << *sit; + vector::const_iterator sit = tagsToOpen.begin(); + vector::const_iterator sen = tagsToOpen.end(); + for (; sit != sen; ++sit) + *xs << *sit; - tagsToClose.clear(); - tagsToOpen.clear(); + tagsToClose.clear(); + tagsToOpen.clear(); + } if (Inset const * inset = getInset(i)) { if (!runparams.for_toc || inset->isInToc()) { OutputParams np = runparams; np.local_font = &font; - // If the paragraph has size 1, then we are in the "special - // case" where we do not output the containing paragraph info. - // This "special case" is defined in more details in output_docbook.cpp, makeParagraphs. The results - // of that brittle logic is passed to this function through open_par. - if (!inset->getLayout().htmlisblock() && size() != 1) // TODO: htmlisblock here too! - np.docbook_in_par = true; - inset->docbook(xs, np); + + // TODO: special case will bite here. + np.docbook_in_par = true; + inset->docbook(*xs, np); } } else { char_type c = getUChar(buf.masterBuffer()->params(), runparams, i); - xs << c; + if (lyx::isSpace(c) && !ignore_fonts) + delayedChars.push_back(c); + else + *xs << c; } font_old = font.fontInfo(); } @@ -3384,11 +3440,24 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf, // FIXME, this code is just imported from XHTML // I'm worried about what happens if a branch, say, is itself // wrapped in some font stuff. I think that will not work. - xs.closeFontTags(); - if (runparams.docbook_in_listing) - xs << xml::CR(); - if (close_paragraph) - xs.endDivision(); + if (!ignore_fonts) + xs->closeFontTags(); + + // Deal with the delayed characters *after* closing font tags. + if (!delayedChars.empty()) + for (char_type c: delayedChars) + *xs << c; + + // In listings, new lines (i.e. \n characters in the output) are very important. Avoid generating one for the + // last line to get a clean output. + if (runparams.docbook_in_listing && !is_last_par) + *xs << xml::CR(); + + // Finalise the last (and most likely only) paragraph. + generatedParagraphs.push_back(os.str()); + delete xs; + + return generatedParagraphs; } @@ -3823,8 +3892,8 @@ bool Paragraph::isHardHyphenOrApostrophe(pos_type pos) const char_type const c = d->text_[pos]; if (c != '-' && c != '\'') return false; - int nextpos = pos + 1; - int prevpos = pos > 0 ? pos - 1 : 0; + pos_type nextpos = pos + 1; + pos_type prevpos = pos > 0 ? pos - 1 : 0; if ((nextpos == psize || isSpace(nextpos)) && (pos == 0 || isSpace(prevpos))) return false; @@ -3865,9 +3934,6 @@ bool Paragraph::needsCProtection(bool const fragile) const Inset const * ins = getInset(i); if (ins->needsCProtection(maintext, fragile)) return true; - if (ins->getLayout().latextype() == InsetLayout::ENVIRONMENT) - // Environments need cprotection regardless the content - return true; // Now check math environments InsetMath const * im = getInset(i)->asInsetMath(); if (!im || im->cell(0).empty()) @@ -4067,12 +4133,12 @@ void Paragraph::setPlainLayout(DocumentClass const & tc) } -void Paragraph::setPlainOrDefaultLayout(DocumentClass const & tclass) +void Paragraph::setPlainOrDefaultLayout(DocumentClass const & tc) { if (usePlainLayout()) - setPlainLayout(tclass); + setPlainLayout(tc); else - setDefaultLayout(tclass); + setDefaultLayout(tc); } @@ -4301,10 +4367,8 @@ void Paragraph::changeCase(BufferParams const & bparams, pos_type pos, } int erasePos = pos - changes.size(); - for (size_t i = 0; i < changes.size(); i++) { - insertChar(pos, changes[i].first, - changes[i].second, - trackChanges); + for (auto const & change : changes) { + insertChar(pos, change.first, change.second, trackChanges); if (!eraseChar(erasePos, trackChanges)) { ++erasePos; ++pos; // advance @@ -4527,7 +4591,7 @@ Language * Paragraph::Private::locateSpellRange( // hop to end of word while (last < to && !owner_->isWordSeparator(last)) { Inset const * inset = owner_->getInset(last); - if (inset && inset->lyxCode() == SPECIALCHAR_CODE) { + if (inset && dynamic_cast(inset)) { // check for "invisible" letters such as ligature breaks odocstringstream os; inset->toString(os); @@ -4763,7 +4827,7 @@ void Paragraph::spellCheck() const // start the spell checker on the unit of meaning docstring word = asString(first, last, AS_STR_INSETS + AS_STR_SKIPDELETE); WordLangTuple wl = WordLangTuple(word, lang); - SpellChecker::Result result = word.size() ? + SpellChecker::Result result = !word.empty() ? speller->check(wl) : SpellChecker::WORD_OK; d->markMisspelledWords(first, last, result, word, skips); first = ++last;