X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=991ab14a7527d65083207e171b9e34b8fb720fce;hb=ea6aed5b8bf38366aaa1eb15ce1b9f13de76987f;hp=4555e4289e6bff7af1dfc6065862edf0d99c2628;hpb=9b4a26a252b2da164fcd6aa84feed0a738b16c10;p=lyx.git diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index 4555e4289e..991ab14a75 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -83,6 +83,8 @@ public: Private(Paragraph * owner, Layout const & layout); /// "Copy constructor" Private(Private const &, Paragraph * owner); + /// Copy constructor from \p beg to \p end + Private(Private const &, Paragraph * owner, pos_type beg, pos_type end); /// void insertChar(pos_type pos, char_type c, Change const & change); @@ -247,6 +249,35 @@ Paragraph::Private::Private(Private const & p, Paragraph * owner) } +Paragraph::Private::Private(Private const & p, Paragraph * owner, + pos_type beg, pos_type end) + : owner_(owner), inset_owner_(p.inset_owner_), + insetlist_(p.insetlist_, beg, end), + params_(p.params_), changes_(p.changes_), + 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); + + FontList::const_iterator fcit = fontlist_.begin(); + FontList::const_iterator fend = fontlist_.end(); + for (; fcit != fend; ++fcit) { + if (fcit->pos() < beg) + continue; + if (fcit->pos() >= end) { + // Add last entry in the fontlist_. + fontlist_.set(text_.size() - 1, fcit->font()); + break; + } + // Add a new entry in the fontlist_. + fontlist_.set(fcit->pos() - beg, fcit->font()); + } +} + + bool Paragraph::isChanged(pos_type start, pos_type end) const { LASSERT(start >= 0 && start <= size(), /**/); @@ -499,7 +530,12 @@ int Paragraph::Private::latexSurrogatePair(odocstream & os, char_type c, // Is this correct WRT change tracking? docstring const latex1 = encoding.latexChar(next); docstring const latex2 = encoding.latexChar(c); - os << latex1 << '{' << latex2 << '}'; + if (docstring(1, next) == latex1) { + // the encoding supports the combination + os << latex2 << latex1; + return latex1.length() + latex2.length(); + } else + os << latex1 << '{' << latex2 << '}'; return latex1.length() + latex2.length() + 2; } @@ -561,9 +597,10 @@ int Paragraph::Private::writeScriptChars(odocstream & os, // We only arrive here when a proper language for character text_[i] has // not been specified (i.e., it could not be translated in the current - // latex encoding) and it belongs to a known script. - // Parameter ltx contains the latex translation of text_[i] as specified in - // the unicodesymbols file and is something like "\textXXX{}". + // latex encoding) or its latex translation has been forced, and it + // belongs to a known script. + // Parameter ltx contains the latex translation of text_[i] as specified + // in the unicodesymbols file and is something like "\textXXX{}". // The latex macro name "textXXX" specifies the script to which text_[i] // belongs and we use it in order to check whether characters from the // same script immediately follow, such that we can collect them in a @@ -572,8 +609,16 @@ int Paragraph::Private::writeScriptChars(odocstream & os, docstring::size_type const brace1 = ltx.find_first_of(from_ascii("{")); docstring::size_type const brace2 = ltx.find_last_of(from_ascii("}")); string script = to_ascii(ltx.substr(1, brace1 - 1)); - int length = ltx.substr(0, brace2).length(); - os << ltx.substr(0, brace2); + int pos = 0; + int length = brace2; + bool closing_brace = true; + if (script == "textgreek" && encoding.latexName() == "iso-8859-7") { + // Correct encoding is being used, so we can avoid \textgreek. + pos = brace1 + 1; + length -= pos; + closing_brace = false; + } + os << ltx.substr(pos, length); int size = text_.size(); while (i + 1 < size) { char_type const next = text_[i + 1]; @@ -607,8 +652,10 @@ int Paragraph::Private::writeScriptChars(odocstream & os, length += len; ++i; } - os << '}'; - ++length; + if (closing_brace) { + os << '}'; + ++length; + } return length; } @@ -744,7 +791,16 @@ void Paragraph::Private::latexInset( } } - int tmp = inset->latex(os, runparams); + int tmp; + + try { + tmp = inset->latex(os, runparams); + } catch (EncodingException & e) { + // add location information and throw again. + e.par_id = id_; + e.pos = i; + throw(e); + } if (close) { if (running_font.language()->lang() == "farsi") @@ -788,6 +844,8 @@ void Paragraph::Private::latexSpecialChar( } if (runparams.verbatim) { + // FIXME UNICODE: This can fail if c cannot + // be encoded in the current encoding. os.put(c); return; } @@ -860,7 +918,6 @@ void Paragraph::Private::latexSpecialChar( break; default: - // LyX, LaTeX etc. if (latexSpecialPhrase(os, i, column, runparams)) return; @@ -909,11 +966,8 @@ bool Paragraph::Private::latexSpecialT1(char_type const c, odocstream & os, // but we should avoid ligatures if (i + 1 >= int(text_.size()) || text_[i + 1] != c) return true; - os << "\\,{}"; - column += 3; - // Alternative code: - //os << "\\textcompwordmark{}"; - //column += 19; + os << "\\textcompwordmark{}"; + column += 19; return true; case '|': os.put(c); @@ -929,37 +983,19 @@ bool Paragraph::Private::latexSpecialTypewriter(char_type const c, odocstream & { switch (c) { case '-': + // within \ttfamily, "--" is merged to "-" (no endash) + // so we avoid this rather irritating ligature if (i + 1 < int(text_.size()) && text_[i + 1] == '-') { - // "--" in Typewriter mode -> "-{}-" os << "-{}"; column += 2; } else os << '-'; return true; - // I assume this is hack treating typewriter as verbatim - // FIXME UNICODE: This can fail if c cannot be encoded - // in the current encoding. - - case '\0': - return true; - - // Those characters are not directly supported. - case '\\': - case '\"': - case '$': case '&': - case '%': case '#': case '{': - case '}': case '_': - case '~': - case '^': - case '*': case '[': - case ' ': - return false; - + // everything else has to be checked separately + // (depending on the encoding) default: - // With Typewriter font, these characters exist. - os.put(c); - return true; + return false; } } @@ -1055,6 +1091,14 @@ Paragraph::Paragraph(Paragraph const & par) } +Paragraph::Paragraph(Paragraph const & par, pos_type beg, pos_type end) + : itemdepth(par.itemdepth), + d(new Paragraph::Private(*par.d, this, beg, end)) +{ + registerWords(); +} + + Paragraph & Paragraph::operator=(Paragraph const & par) { // needed as we will destroy the private part before copying it @@ -1212,7 +1256,7 @@ void Paragraph::appendString(docstring const & s, Font const & font, d->text_.append(s); // FIXME: Optimize this! - for (pos_type i = 0; i != end; ++i) { + for (pos_type i = oldsize; i != newsize; ++i) { // track change d->changes_.insert(change, i); } @@ -1611,12 +1655,12 @@ void Paragraph::setBeginOfBody() } -bool Paragraph::forceEmptyLayout() const +bool Paragraph::forcePlainLayout() const { Inset const * const inset = inInset(); if (!inset) return true; - return inset->forceEmptyLayout(); + return inset->forcePlainLayout(); } @@ -1629,12 +1673,12 @@ bool Paragraph::allowParagraphCustomization() const } -bool Paragraph::useEmptyLayout() const +bool Paragraph::usePlainLayout() const { Inset const * const inset = inInset(); if (!inset) return false; - return inset->useEmptyLayout(); + return inset->usePlainLayout(); } @@ -1828,10 +1872,10 @@ bool Paragraph::latex(BufferParams const & bparams, bool return_value = false; - bool asdefault = forceEmptyLayout(); + bool asdefault = forcePlainLayout(); Layout const & style = asdefault ? - bparams.documentClass().emptyLayout() : + bparams.documentClass().plainLayout() : *d->layout_; // Current base font for all inherited font changes, without any @@ -1960,8 +2004,8 @@ bool Paragraph::latex(BufferParams const & bparams, // Switch file encoding if necessary (and allowed) if (!runparams.verbatim && - runparams.encoding->package() == Encoding::none && - font.language()->encoding()->package() == Encoding::none) { + runparams.encoding->package() != Encoding::none && + font.language()->encoding()->package() != Encoding::none) { pair const enc_switch = switchEncoding(os, bparams, runparams, *(font.language()->encoding())); if (enc_switch.first) { @@ -2045,7 +2089,7 @@ bool Paragraph::latex(BufferParams const & bparams, } } - // Set the encoding to that returned from simpleTeXSpecialChars (see + // Set the encoding to that returned from latexSpecialChar (see // comment for encoding member in OutputParams.h) runparams.encoding = rp.encoding; } @@ -2254,6 +2298,24 @@ bool Paragraph::isLetter(pos_type pos) const } +bool Paragraph::isChar(pos_type pos) const +{ + if (Inset const * inset = getInset(pos)) + return inset->isChar(); + char_type const c = d->text_[pos]; + return !isLetterChar(c) && !isDigit(c) && !lyx::isSpace(c); +} + + +bool Paragraph::isSpace(pos_type pos) const +{ + if (Inset const * inset = getInset(pos)) + return inset->isSpace(); + char_type const c = d->text_[pos]; + return lyx::isSpace(c); +} + + Language const * Paragraph::getParLanguage(BufferParams const & bparams) const { @@ -2302,25 +2364,26 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams) const } -docstring Paragraph::asString(bool label) const +docstring Paragraph::asString(int options) const { - return asString(0, size(), label); + return asString(0, size(), options); } -docstring Paragraph::asString(pos_type beg, pos_type end, bool label) const +docstring Paragraph::asString(pos_type beg, pos_type end, int options) const { - odocstringstream os; - if (beg == 0 && label && !d->params_.labelString().empty()) + if (beg == 0 + && options & AS_STR_LABEL + && !d->params_.labelString().empty()) os << d->params_.labelString() << ' '; for (pos_type i = beg; i < end; ++i) { char_type const c = d->text_[i]; if (isPrintable(c)) os.put(c); - else if (c == META_INSET) + else if (c == META_INSET && options & AS_STR_INSETS) getInset(i)->textString(os); } @@ -2352,10 +2415,10 @@ void Paragraph::setLayout(Layout const & layout) } -void Paragraph::setEmptyOrDefaultLayout(DocumentClass const & tclass) +void Paragraph::setPlainOrDefaultLayout(DocumentClass const & tclass) { - if (useEmptyLayout()) - setLayout(tclass.emptyLayout()); + if (usePlainLayout()) + setLayout(tclass.plainLayout()); else setLayout(tclass.defaultLayout()); } @@ -2498,8 +2561,8 @@ int Paragraph::checkBiblio(Buffer const & buffer) // There was no inset at the beginning, so we need to create one with // the key and label of the one we erased. - InsetBibitem * inset = new InsetBibitem(InsetCommandParams(BIBITEM_CODE)); - inset->setBuffer(const_cast(buffer)); + InsetBibitem * inset = + new InsetBibitem(buffer, InsetCommandParams(BIBITEM_CODE)); // restore values of previously deleted item in this par. if (!oldkey.empty()) inset->setParam("key", oldkey); @@ -2541,6 +2604,12 @@ InsetList const & Paragraph::insetList() const } +void Paragraph::setBuffer(Buffer & b) +{ + d->insetlist_.setBuffer(b); +} + + Inset * Paragraph::releaseInset(pos_type pos) { Inset * inset = d->insetlist_.release(pos);