X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=3bdb4cc7bdbc49f15df849956967573d8a26ec6a;hb=3a6af2c1a49b2fc16f13bfd4f3230b0ad487237f;hp=12bc98034690fd19d32ae12b775448f0453e7c32;hpb=ef8e499821a789461b11df6994ec6b471d58dadb;p=lyx.git diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index 12bc980346..3bdb4cc7bd 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -61,6 +61,7 @@ #include "support/lstrings.h" #include "support/textutils.h" +#include #include #include @@ -283,10 +284,11 @@ private: class Paragraph::Private { - // Enforce our own "copy" constructor by declaring the standard one and - // the assignment operator private without implementing them. - Private(Private const &); - Private & operator=(Private const &); + // Enforce our own "copy" constructor + Private(Private const &) = delete; + Private & operator=(Private const &) = delete; + // Unique ID generator + static int make_id(); public: /// Private(Paragraph * owner, Layout const & layout); @@ -506,35 +508,37 @@ Paragraph::Private::Private(Paragraph * owner, Layout const & layout) } -// Initialization of the counter for the paragraph id's, -// -// FIXME: There should be a more intelligent way to generate and use the -// paragraph ids per buffer instead a global static counter for all InsetText -// in the running program. -// However, this per-session id is used in LFUN_PARAGRAPH_GOTO to -// switch to a different buffer, as used in the outliner for instance. -static int paragraph_id = -1; +//static +int Paragraph::Private::make_id() +{ + // The id is unique per session across buffers because it is used in + // LFUN_PARAGRAPH_GOTO to switch to a different buffer, for instance in the + // outliner. + // (thread-safe) + static atomic_uint next_id(0); + return next_id++; +} + Paragraph::Private::Private(Private const & p, Paragraph * owner) : owner_(owner), inset_owner_(p.inset_owner_), fontlist_(p.fontlist_), + id_(make_id()), params_(p.params_), changes_(p.changes_), insetlist_(p.insetlist_), begin_of_body_(p.begin_of_body_), text_(p.text_), words_(p.words_), layout_(p.layout_) { - id_ = ++paragraph_id; requestSpellCheck(p.text_.size()); } Paragraph::Private::Private(Private const & p, Paragraph * owner, pos_type beg, pos_type end) - : owner_(owner), inset_owner_(p.inset_owner_), + : owner_(owner), inset_owner_(p.inset_owner_), id_(make_id()), params_(p.params_), changes_(p.changes_), insetlist_(p.insetlist_, beg, end), begin_of_body_(p.begin_of_body_), words_(p.words_), layout_(p.layout_) { - id_ = ++paragraph_id; if (beg >= pos_type(p.text_.size())) return; text_ = p.text_.substr(beg, end - beg); @@ -1383,7 +1387,7 @@ void Paragraph::Private::validate(LaTeXFeatures & features) const // output is wrong if this paragraph contains content // that needs to switch encoding. odocstringstream ods; - otexstream os(ods, false); + otexstream os(ods); if (is_command) { os << '\\' << from_ascii(layout_->latexname()); // we have to provide all the optional arguments here, even though @@ -2022,7 +2026,6 @@ docstring Paragraph::expandParagraphLabel(Layout const & layout, void Paragraph::applyLayout(Layout const & new_layout) { d->layout_ = &new_layout; - setBeginOfBody(); LyXAlignment const oldAlign = d->params_.align(); if (!(oldAlign & d->layout_->alignpossible)) { @@ -2410,18 +2413,18 @@ void Paragraph::latex(BufferParams const & bparams, ++column; // Fully instantiated font - Font const font = getFont(bparams, i, outerfont); + Font const current_font = getFont(bparams, i, outerfont); Font const last_font = running_font; // Do we need to close the previous font? if (open_font && - (font != running_font || - font.language() != running_font.language())) + (current_font != running_font || + current_font.language() != running_font.language())) { column += running_font.latexWriteEndChanges( os, bparams, runparams, basefont, - (i == body_pos-1) ? basefont : font); + (i == body_pos-1) ? basefont : current_font); running_font = basefont; open_font = false; } @@ -2432,39 +2435,41 @@ void Paragraph::latex(BufferParams const & bparams, string const lang_end_command = runparams.use_polyglossia ? "\\end{$$lang}" : lyxrc.language_command_end; if (!running_lang.empty() && - font.language()->encoding()->package() == Encoding::CJK) { + current_font.language()->encoding()->package() == Encoding::CJK) { string end_tag = subst(lang_end_command, "$$lang", running_lang); os << from_ascii(end_tag); column += end_tag.length(); + if (runparams.use_polyglossia) + popPolyglossiaLang(); } // Switch file encoding if necessary (and allowed) if (!runparams.pass_thru && !style.pass_thru && runparams.encoding->package() != Encoding::none && - font.language()->encoding()->package() != Encoding::none) { + current_font.language()->encoding()->package() != Encoding::none) { pair const enc_switch = switchEncoding(os.os(), bparams, runparams, - *(font.language()->encoding())); + *(current_font.language()->encoding())); if (enc_switch.first) { column += enc_switch.second; - runparams.encoding = font.language()->encoding(); + runparams.encoding = current_font.language()->encoding(); } } char_type const c = d->text_[i]; // Do we need to change font? - if ((font != running_font || - font.language() != running_font.language()) && + if ((current_font != running_font || + current_font.language() != running_font.language()) && i != body_pos - 1) { odocstringstream ods; - column += font.latexWriteStartChanges(ods, bparams, + column += current_font.latexWriteStartChanges(ods, bparams, runparams, basefont, last_font); - running_font = font; + running_font = current_font; open_font = true; docstring fontchange = ods.str(); // check whether the fontchange ends with a \\textcolor @@ -2490,7 +2495,7 @@ void Paragraph::latex(BufferParams const & bparams, // style.pass_thru is false. if (i != body_pos - 1) { if (d->simpleTeXBlanks(runparams, os, - i, column, font, style)) { + i, column, current_font, style)) { // A surrogate pair was output. We // must not call latexSpecialChar // in this iteration, since it would output @@ -2503,7 +2508,7 @@ void Paragraph::latex(BufferParams const & bparams, OutputParams rp = runparams; rp.free_spacing = style.free_spacing; - rp.local_font = &font; + rp.local_font = ¤t_font; rp.intitle = style.intitle; // Two major modes: LaTeX or plain @@ -2753,7 +2758,7 @@ void doFontSwitch(vector & tagsToOpen, docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf, XHTMLStream & xs, OutputParams const & runparams, - Font const & outerfont, + Font const & outerfont, bool start_paragraph, bool close_paragraph, pos_type initial) const {