X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=4f4d9ff5630454a6e255d9183443a39fdf8786b7;hb=1acedf11da79f509da706bc8d6d2f491c9676087;hp=1a1394d7840738c385fb9510efe6b0b6e5272d62;hpb=7bf4f48a4a04d30caec46b103709fb19cf654155;p=lyx.git diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index 1a1394d784..4f4d9ff563 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -24,8 +24,6 @@ #include "Changes.h" #include "Counters.h" #include "Encoding.h" -#include "debug.h" -#include "gettext.h" #include "InsetList.h" #include "Language.h" #include "LaTeXFeatures.h" @@ -34,12 +32,12 @@ #include "Font.h" #include "FontList.h" #include "LyXRC.h" -#include "Messages.h" #include "OutputParams.h" #include "output_latex.h" #include "paragraph_funcs.h" #include "ParagraphParameters.h" #include "sgml.h" +#include "TextClass.h" #include "TexRow.h" #include "VSpace.h" @@ -48,29 +46,22 @@ #include "insets/InsetBibitem.h" #include "insets/InsetLabel.h" -#include "insets/InsetOptArg.h" +#include "support/convert.h" +#include "support/debug.h" +#include "support/gettext.h" #include "support/lstrings.h" +#include "support/Messages.h" #include "support/textutils.h" -#include "support/convert.h" -#include "support/unicode.h" #include #include -using std::endl; -using std::string; -using std::ostream; +using namespace std; +using namespace lyx::support; namespace lyx { -using support::contains; -using support::lowercase; -using support::prefixIs; -using support::suffixIs; -using support::rsplit; -using support::uppercase; - namespace { /// Inset identifier (above 0x10ffff, for ucs-4) char_type const META_INSET = 0x200001; @@ -173,7 +164,7 @@ public: pos_type initial) const; /// match a string against a particular point in the paragraph - bool isTextAt(std::string const & str, pos_type pos) const; + bool isTextAt(string const & str, pos_type pos) const; /// Which Paragraph owns us? Paragraph * owner_; @@ -191,10 +182,6 @@ public: /// ParagraphParameters params_; - /// position of the paragraph in the buffer. Only macros from - /// paragraphs strictly smaller are visible in this paragraph - unsigned int macrocontext_position_; - /// for recording and looking up changes Changes changes_; @@ -213,14 +200,6 @@ public: }; - - -using std::endl; -using std::upper_bound; -using std::lower_bound; -using std::string; - - // Initialization of the counter for the paragraph id's, unsigned int Paragraph::Private::paragraph_id = 0; @@ -248,7 +227,6 @@ Paragraph::Private::Private(Paragraph * owner) : owner_(owner), inset_owner_(0), begin_of_body_(0) { id_ = paragraph_id++; - macrocontext_position_ = 0; text_.reserve(100); } @@ -271,15 +249,13 @@ bool Paragraph::isChanged(pos_type start, pos_type end) const } -bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const { +bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const +{ // keep the logic here in sync with the logic of eraseChars() - - if (!trackChanges) { + if (!trackChanges) return true; - } - - Change change = d->changes_.lookup(size()); + Change const change = d->changes_.lookup(size()); return change.type == Change::INSERTED && change.author == 0; } @@ -313,22 +289,17 @@ void Paragraph::setChange(Change const & change) void Paragraph::setChange(pos_type pos, Change const & change) { BOOST_ASSERT(pos >= 0 && pos <= size()); - d->changes_.set(change, pos); // see comment in setChange(Change const &) above - - if (change.type != Change::DELETED && - pos < size() && isInset(pos)) { + if (change.type != Change::DELETED && pos < size() && isInset(pos)) getInset(pos)->setChange(change); - } } Change const & Paragraph::lookupChange(pos_type pos) const { BOOST_ASSERT(pos >= 0 && pos <= size()); - return d->changes_.lookup(pos); } @@ -702,7 +673,6 @@ void Paragraph::Private::latexInset(Buffer const & buf, if (runparams.moving_arg) os << "\\protect "; - os << "\\\\\n"; } texrow.newline(); texrow.start(owner_->id(), i + 1); @@ -932,7 +902,7 @@ bool Paragraph::Private::latexSpecialT1(char_type const c, odocstream & os, os.put(c); // In T1 encoding, these characters exist // but we should avoid ligatures - if (i + 1 > int(text_.size()) || text_[i + 1] != c) + if (i + 1 >= int(text_.size()) || text_[i + 1] != c) return true; os << "\\,{}"; column += 3; @@ -1021,6 +991,13 @@ void Paragraph::Private::validate(LaTeXFeatures & features, // then the layouts features.useLayout(layout.name()); + if (!layout.requires().empty()) { + vector req = layout.requires(); + for (vector::const_iterator it = req.begin(); + it != req.end(); ++it) { + features.require(*it); + } + } // then the fonts fontlist_.validate(features); @@ -1180,11 +1157,9 @@ void Paragraph::write(Buffer const & buf, ostream & os, } // this check is to amend a bug. LyX sometimes // inserts '\0' this could cause problems. - if (c != '\0') { - std::vector tmp = ucs4_to_utf8(c); - tmp.push_back('\0'); - os << &tmp[0]; - } else + if (c != '\0') + os << to_utf8(docstring(1, c)); + else lyxerr << "ERROR (Paragraph::writeFile):" " NULL char in structure." << endl; ++column; @@ -1229,7 +1204,7 @@ void Paragraph::appendString(docstring const & s, Font const & font, size_t newsize = oldsize + end; size_t capacity = d->text_.capacity(); if (newsize >= capacity) - d->text_.reserve(std::max(capacity + 100, newsize)); + d->text_.reserve(max(capacity + 100, newsize)); // when appending characters, no need to update tables d->text_.append(s); @@ -1321,11 +1296,11 @@ FontSpan Paragraph::fontSpan(pos_type pos) const for (; cit != end; ++cit) { if (cit->pos() >= pos) { if (pos >= beginOfBody()) - return FontSpan(std::max(start, beginOfBody()), + return FontSpan(max(start, beginOfBody()), cit->pos()); else return FontSpan(start, - std::min(beginOfBody() - 1, + min(beginOfBody() - 1, cit->pos())); } start = cit->pos() + 1; @@ -1536,7 +1511,7 @@ void Paragraph::setLabelWidthString(docstring const & s) docstring const Paragraph::translateIfPossible(docstring const & s, BufferParams const & bparams) const { - if (!support::isAscii(s) || s.empty()) { + if (!isAscii(s) || s.empty()) { // This must be a user defined layout. We cannot translate // this, since gettext accepts only ascii keys. return s; @@ -1830,7 +1805,7 @@ bool Paragraph::latex(Buffer const & buf, odocstream & os, TexRow & texrow, OutputParams const & runparams) const { - LYXERR(Debug::LATEX) << "SimpleTeXOnePar... " << this << endl; + LYXERR(Debug::LATEX, "SimpleTeXOnePar... " << this); bool return_value = false; @@ -1963,13 +1938,22 @@ bool Paragraph::latex(Buffer const & buf, open_font = false; } + // close babel's font environment before opening CJK. + if (!running_font.language()->babel().empty() && + font.language()->encoding()->package() == Encoding::CJK) { + string end_tag = subst(lyxrc.language_command_end, + "$$lang", + running_font.language()->babel()); + os << from_ascii(end_tag); + column += end_tag.length(); + } + // Switch file encoding if necessary (and allowed) if (!runparams.verbatim && - runparams.encoding->package() == Encoding::inputenc && - font.language()->encoding()->package() == Encoding::inputenc) { - std::pair const enc_switch = switchEncoding(os, bparams, - runparams.moving_arg, *(runparams.encoding), - *(font.language()->encoding())); + 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) { column += enc_switch.second; runparams.encoding = font.language()->encoding(); @@ -2032,9 +2016,24 @@ bool Paragraph::latex(Buffer const & buf, texrow, rp, running_font, basefont, outerfont, open_font, runningChange, *style, i, column); - else - d->latexSpecialChar(os, rp, running_font, runningChange, - *style, i, column); + else { + try { + d->latexSpecialChar(os, rp, running_font, runningChange, + *style, i, column); + } catch (EncodingException & e) { + if (runparams.dryrun) { + os << "<" << _("LyX Warning: ") + << _("uncodable character") << " '"; + os.put(c); + os << "'>"; + } else { + // add location information and throw again. + e.par_id = id(); + e.pos = i; + throw(e); + } + } + } // Set the encoding to that returned from simpleTeXSpecialChars (see // comment for encoding member in OutputParams.h) @@ -2075,7 +2074,7 @@ bool Paragraph::latex(Buffer const & buf, runparams.moving_arg); } - LYXERR(Debug::LATEX) << "SimpleTeXOnePar...done " << this << endl; + LYXERR(Debug::LATEX, "SimpleTeXOnePar...done " << this); return return_value; } @@ -2215,15 +2214,13 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf, bool Paragraph::isHfill(pos_type pos) const { - return isInset(pos) - && getInset(pos)->lyxCode() == HFILL_CODE; + return isInset(pos) && getInset(pos)->lyxCode() == HFILL_CODE; } bool Paragraph::isNewline(pos_type pos) const { - return isInset(pos) - && getInset(pos)->lyxCode() == NEWLINE_CODE; + return isInset(pos) && getInset(pos)->lyxCode() == NEWLINE_CODE; } @@ -2241,10 +2238,8 @@ bool Paragraph::isLetter(pos_type pos) const { if (isInset(pos)) return getInset(pos)->isLetter(); - else { - char_type const c = d->text_[pos]; - return isLetterChar(c) || isDigit(c); - } + char_type const c = d->text_[pos]; + return isLetterChar(c) || isDigit(c); } @@ -2357,8 +2352,7 @@ Inset * Paragraph::inInset() const InsetCode Paragraph::ownerCode() const { - return d->inset_owner_ ? - d->inset_owner_->lyxCode() : NO_CODE; + return d->inset_owner_ ? d->inset_owner_->lyxCode() : NO_CODE; } @@ -2497,18 +2491,6 @@ int Paragraph::checkBiblio(bool track_changes) } -unsigned int Paragraph::macrocontextPosition() const -{ - return d->macrocontext_position_; -} - - -void Paragraph::setMacrocontextPosition(unsigned int pos) -{ - d->macrocontext_position_ = pos; -} - - void Paragraph::checkAuthors(AuthorList const & authorList) { d->changes_.checkAuthors(authorList);