X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=4f4d9ff5630454a6e255d9183443a39fdf8786b7;hb=1acedf11da79f509da706bc8d6d2f491c9676087;hp=6684a172ee778333497b9909386338bc2e440a31;hpb=d2bfe05827644ef940f42e12717de08902422660;p=lyx.git diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index 6684a172ee..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; @@ -109,10 +100,10 @@ public: Layout const & style); /// Output consecutive unicode chars, belonging to the same script as - /// specified by the latex macro \p ltx, to \p os starting from \p c. + /// specified by the latex macro \p ltx, to \p os starting from \p i. /// \return the number of characters written. - int writeScriptChars(odocstream & os, char_type c, docstring const & ltx, - Change &, Encoding const &, pos_type &); + int writeScriptChars(odocstream & os, docstring const & ltx, + Change &, Encoding const &, pos_type & i); /// This could go to ParagraphParameters if we want to. int startTeXParParams(BufferParams const &, odocstream &, TexRow &, @@ -161,7 +152,8 @@ public: bool latexSpecialPhrase( odocstream & os, pos_type & i, - unsigned int & column); + unsigned int & column, + OutputParams & runparams); /// void validate(LaTeXFeatures & features, @@ -172,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_; @@ -208,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; @@ -228,10 +212,10 @@ struct special_phrase { }; special_phrase const special_phrases[] = { - { "LyX", from_ascii("\\protect\\LyX{}"), false }, - { "TeX", from_ascii("\\protect\\TeX{}"), true }, - { "LaTeX2e", from_ascii("\\protect\\LaTeXe{}"), true }, - { "LaTeX", from_ascii("\\protect\\LaTeX{}"), true }, + { "LyX", from_ascii("\\LyX{}"), false }, + { "TeX", from_ascii("\\TeX{}"), true }, + { "LaTeX2e", from_ascii("\\LaTeXe{}"), true }, + { "LaTeX", from_ascii("\\LaTeX{}"), true }, }; size_t const phrases_nr = sizeof(special_phrases)/sizeof(special_phrase); @@ -265,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; } @@ -307,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); } @@ -412,7 +389,7 @@ void Paragraph::Private::insertChar(pos_type pos, char_type c, // This is actually very common when parsing buffers (and // maybe inserting ascii text) - if (pos == text_.size()) { + if (pos == pos_type(text_.size())) { // when appending characters, no need to update tables text_.push_back(c); return; @@ -570,18 +547,19 @@ bool Paragraph::Private::simpleTeXBlanks(OutputParams const & runparams, int Paragraph::Private::writeScriptChars(odocstream & os, - char_type c, docstring const & ltx, Change & runningChange, Encoding const & encoding, pos_type & i) { - // We only arrive here when a proper language for character c has not - // been specified (i.e., it could not be translated in the current + // FIXME: modifying i here is not very nice... + + // 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 c as specified in + // 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 c + // 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 // single "\textXXX" macro. So, we have to retain "\textXXX{" @@ -695,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); @@ -716,10 +693,10 @@ void Paragraph::Private::latexInset(Buffer const & buf, bool close = false; odocstream::pos_type const len = os.tellp(); - if ((inset->lyxCode() == GRAPHICS_CODE - || inset->lyxCode() == MATH_CODE - || inset->lyxCode() == HYPERLINK_CODE) - && running_font.isRightToLeft()) { + if (inset->forceLTR() + && running_font.isRightToLeft() + // ERT is an exception, it should be output with no decorations at all + && inset->lyxCode() != ERT_CODE) { if (running_font.language()->lang() == "farsi") os << "\\beginL{}"; else @@ -880,7 +857,7 @@ void Paragraph::Private::latexSpecialChar( default: // LyX, LaTeX etc. - if (latexSpecialPhrase(os, i, column)) + if (latexSpecialPhrase(os, i, column, runparams)) return; if (c == '\0') @@ -899,7 +876,7 @@ void Paragraph::Private::latexSpecialChar( docstring const latex = encoding.latexChar(c); if (Encodings::isKnownScriptChar(c, script) && prefixIs(latex, from_ascii("\\" + script))) - column += writeScriptChars(os, c, latex, + column += writeScriptChars(os, latex, running_change, encoding, i) - 1; else if (latex.length() > 1 && latex[latex.length() - 1] != '}') { // Prevent eating of a following @@ -925,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; @@ -983,7 +960,7 @@ bool Paragraph::Private::latexSpecialTypewriter(char_type const c, odocstream & bool Paragraph::Private::latexSpecialPhrase(odocstream & os, pos_type & i, - unsigned int & column) + unsigned int & column, OutputParams & runparams) { // FIXME: if we have "LaTeX" with a font // change in the middle (before the 'T', then @@ -994,6 +971,8 @@ bool Paragraph::Private::latexSpecialPhrase(odocstream & os, pos_type & i, for (size_t pnr = 0; pnr < phrases_nr; ++pnr) { if (!isTextAt(special_phrases[pnr].phrase, i)) continue; + if (runparams.moving_arg) + os << "\\protect"; os << special_phrases[pnr].macro; i += special_phrases[pnr].phrase.length() - 1; column += special_phrases[pnr].macro.length() - 1; @@ -1012,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); @@ -1171,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; @@ -1215,12 +1199,12 @@ void Paragraph::appendChar(char_type c, Font const & font, void Paragraph::appendString(docstring const & s, Font const & font, Change const & change) { - size_t end = s.size(); + pos_type end = s.size(); size_t oldsize = d->text_.size(); 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); @@ -1230,7 +1214,8 @@ void Paragraph::appendString(docstring const & s, Font const & font, // track change d->changes_.insert(change, i); } - d->fontlist_.setRange(oldsize, newsize, font); + d->fontlist_.set(oldsize, font); + d->fontlist_.set(newsize - 1, font); } @@ -1276,7 +1261,9 @@ bool Paragraph::insetAllowed(InsetCode code) void Paragraph::resetFonts(Font const & font) { - d->fontlist_.setRange(0, d->text_.size(), font); + d->fontlist_.clear(); + d->fontlist_.set(0, font); + d->fontlist_.set(d->text_.size() - 1, font); } // Gets uninstantiated font setting at position. @@ -1309,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; @@ -1524,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; @@ -1818,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; @@ -1951,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(); @@ -2020,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) @@ -2063,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; } @@ -2203,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; } @@ -2229,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); } @@ -2345,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; }