#include "support/convert.h"
#include "support/unicode.h"
-#include <boost/bind.hpp>
-#include <boost/next_prior.hpp>
-
-#include <algorithm>
#include <sstream>
-using std::distance;
using std::endl;
using std::string;
using std::ostream;
/// \return whether a surrogate pair was output.
bool simpleTeXBlanks(Encoding const &,
odocstream &, TexRow & texrow,
- pos_type & i,
+ pos_type i,
unsigned int & column,
Font const & font,
Layout const & style);
/// \return the number of characters written.
int knownLangChars(odocstream & os, value_type c, string & preamble,
Change &, Encoding const &, pos_type &);
+
+ /// This could go to ParagraphParameters if we want to.
+ int startTeXParParams(BufferParams const &, odocstream &, TexRow &,
+ bool) const;
+
+ /// This could go to ParagraphParameters if we want to.
+ int endTeXParParams(BufferParams const &, odocstream &, TexRow &,
+ bool) const;
+
///
- void simpleTeXSpecialChars(Buffer const &, BufferParams const &,
+ void latexInset(Buffer const &, BufferParams const &,
odocstream &,
TexRow & texrow, OutputParams &,
Font & running_font,
Change & running_change,
Layout const & style,
pos_type & i,
- unsigned int & column, value_type const c);
+ unsigned int & column);
+
+ ///
+ void latexSpecialChar(
+ odocstream & os,
+ OutputParams & runparams,
+ Font & running_font,
+ Change & running_change,
+ Layout const & style,
+ pos_type & i,
+ unsigned int & column);
+
+ ///
+ bool latexSpecialT1(
+ char_type const c,
+ odocstream & os,
+ pos_type & i,
+ unsigned int & column);
+ ///
+ bool latexSpecialTypewriter(
+ char_type const c,
+ odocstream & os,
+ pos_type & i,
+ unsigned int & column);
+ ///
+ bool latexSpecialPhrase(
+ odocstream & os,
+ pos_type & i,
+ unsigned int & column);
///
void validate(LaTeXFeatures & features,
///
InsetList insetlist_;
+
+ ///
+ LayoutPtr layout_;
+
+ /// end of label
+ pos_type begin_of_body_;
};
};
special_phrase const special_phrases[] = {
- { "LyX", from_ascii("\\LyX{}"), false },
- { "TeX", from_ascii("\\TeX{}"), true },
- { "LaTeX2e", from_ascii("\\LaTeXe{}"), true },
- { "LaTeX", from_ascii("\\LaTeX{}"), true },
+ { "LyX", from_ascii("\\protect\\LyX{}"), false },
+ { "TeX", from_ascii("\\protect\\TeX{}"), true },
+ { "LaTeX2e", from_ascii("\\protect\\LaTeXe{}"), true },
+ { "LaTeX", from_ascii("\\protect\\LaTeX{}"), true },
};
size_t const phrases_nr = sizeof(special_phrases)/sizeof(special_phrase);
Paragraph::Private::Private(Paragraph * owner)
- : owner_(owner)
+ : owner_(owner), inset_owner_(0), begin_of_body_(0)
{
- inset_owner_ = 0;
id_ = paragraph_id++;
}
Paragraph::Private::Private(Private const & p, Paragraph * owner)
: owner_(owner), inset_owner_(p.inset_owner_), fontlist_(p.fontlist_),
- params_(p.params_), changes_(p.changes_), insetlist_(p.insetlist_)
+ params_(p.params_), changes_(p.changes_), insetlist_(p.insetlist_),
+ layout_(p.layout_), begin_of_body_(p.begin_of_body_)
{
id_ = paragraph_id++;
}
bool Paragraph::Private::simpleTeXBlanks(Encoding const & encoding,
odocstream & os, TexRow & texrow,
- pos_type & i,
+ pos_type i,
unsigned int & column,
Font const & font,
Layout const & style)
if (Encodings::isCombiningChar(next)) {
// This space has an accent, so we must always output it.
column += latexSurrogatePair(os, ' ', next, encoding) - 1;
- ++i;
return true;
}
}
return false;
}
- // is there a font change in middle of the word?
- FontList::const_iterator cit = fontlist_.begin();
- FontList::const_iterator end = fontlist_.end();
- for (; cit != end; ++cit) {
- if (cit->pos() >= pos)
- break;
- }
- if (cit != end && pos + len - 1 > cit->pos())
- return false;
-
- return true;
+ return fontlist_.hasChangeInRange(pos, len);
}
-void Paragraph::Private::simpleTeXSpecialChars(Buffer const & buf,
+void Paragraph::Private::latexInset(Buffer const & buf,
BufferParams const & bparams,
odocstream & os,
TexRow & texrow,
Change & running_change,
Layout const & style,
pos_type & i,
- unsigned int & column,
- value_type const c)
+ unsigned int & column)
{
+ Inset * inset = owner_->getInset(i);
+ BOOST_ASSERT(inset);
+
if (style.pass_thru) {
- if (c != Paragraph::META_INSET) {
- if (c != '\0')
- // FIXME UNICODE: This can fail if c cannot
- // be encoded in the current encoding.
- os.put(c);
- } else
- owner_->getInset(i)->plaintext(buf, os, runparams);
+ inset->plaintext(buf, os, runparams);
return;
}
- // Two major modes: LaTeX or plain
- // Handle here those cases common to both modes
- // and then split to handle the two modes separately.
- switch (c) {
- case Paragraph::META_INSET: {
- Inset * inset = owner_->getInset(i);
+ // FIXME: move this to InsetNewline::latex
+ if (inset->lyxCode() == NEWLINE_CODE) {
+ // newlines are handled differently here than
+ // the default in simpleTeXSpecialChars().
+ if (!style.newline_allowed) {
+ os << '\n';
+ } else {
+ if (open_font) {
+ column += running_font.latexWriteEndChanges(
+ os, bparams, runparams,
+ basefont, basefont);
+ open_font = false;
+ }
- // FIXME: remove this check
- if (!inset)
- break;
+ if (running_font.family() == Font::TYPEWRITER_FAMILY)
+ os << '~';
- // FIXME: move this to InsetNewline::latex
- if (inset->lyxCode() == NEWLINE_CODE) {
- // newlines are handled differently here than
- // the default in simpleTeXSpecialChars().
- if (!style.newline_allowed) {
- os << '\n';
- } else {
- if (open_font) {
- column += running_font.latexWriteEndChanges(
- os, bparams, runparams,
- basefont, basefont);
- open_font = false;
- }
+ basefont = owner_->getLayoutFont(bparams, outerfont);
+ running_font = basefont;
- if (running_font.family() == Font::TYPEWRITER_FAMILY)
- os << '~';
+ if (runparams.moving_arg)
+ os << "\\protect ";
- basefont = owner_->getLayoutFont(bparams, outerfont);
- running_font = basefont;
+ os << "\\\\\n";
+ }
+ texrow.newline();
+ texrow.start(owner_->id(), i + 1);
+ column = 0;
+ }
- if (runparams.moving_arg)
- os << "\\protect ";
+ if (owner_->lookupChange(i).type == Change::DELETED) {
+ if( ++runparams.inDeletedInset == 1)
+ runparams.changeOfDeletedInset = owner_->lookupChange(i);
+ }
- os << "\\\\\n";
- }
- texrow.newline();
- texrow.start(owner_->id(), i + 1);
- column = 0;
- break;
- }
+ if (inset->canTrackChanges()) {
+ column += Changes::latexMarkChange(os, bparams, running_change,
+ Change(Change::UNCHANGED));
+ running_change = Change(Change::UNCHANGED);
+ }
- if (owner_->lookupChange(i).type == Change::DELETED) {
- if( ++runparams.inDeletedInset == 1)
- runparams.changeOfDeletedInset = owner_->lookupChange(i);
- }
+ bool close = false;
+ odocstream::pos_type const len = os.tellp();
- if (inset->canTrackChanges()) {
- column += Changes::latexMarkChange(os, bparams, running_change,
- Change(Change::UNCHANGED));
- running_change = Change(Change::UNCHANGED);
+ if ((inset->lyxCode() == GRAPHICS_CODE
+ || inset->lyxCode() == MATH_CODE
+ || inset->lyxCode() == HYPERLINK_CODE)
+ && running_font.isRightToLeft()) {
+ if (running_font.language()->lang() == "farsi")
+ os << "\\beginL{}";
+ else
+ os << "\\L{";
+ close = true;
+ }
+
+ // FIXME: Bug: we can have an empty font change here!
+ // if there has just been a font change, we are going to close it
+ // right now, which means stupid latex code like \textsf{}. AFAIK,
+ // this does not harm dvi output. A minor bug, thus (JMarc)
+
+ // 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.
+ // ArabTeX, though, cannot handle this special behavior, it seems.
+ bool arabtex = basefont.language()->lang() == "arabic_arabtex"
+ || running_font.language()->lang() == "arabic_arabtex";
+ if (open_font && inset->noFontChange()) {
+ bool closeLanguage = arabtex
+ || basefont.isRightToLeft() == running_font.isRightToLeft();
+ unsigned int count = running_font.latexWriteEndChanges(os,
+ bparams, runparams, basefont, basefont, closeLanguage);
+ column += count;
+ // if any font properties were closed, update the running_font,
+ // making sure, however, to leave the language as it was
+ if (count > 0) {
+ // FIXME: probably a better way to keep track of the old
+ // language, than copying the entire font?
+ Font const copy_font(running_font);
+ basefont = owner_->getLayoutFont(bparams, outerfont);
+ running_font = basefont;
+ if (!closeLanguage)
+ running_font.setLanguage(copy_font.language());
+ // leave font open if language is still open
+ open_font = (running_font.language() == basefont.language());
+ if (closeLanguage)
+ runparams.local_font = &basefont;
}
+ }
- bool close = false;
- odocstream::pos_type const len = os.tellp();
+ int tmp = inset->latex(buf, os, runparams);
- if ((inset->lyxCode() == GRAPHICS_CODE
- || inset->lyxCode() == MATH_CODE
- || inset->lyxCode() == HYPERLINK_CODE)
- && running_font.isRightToLeft()) {
- if (running_font.language()->lang() == "farsi")
- os << "\\beginL{}";
- else
- os << "\\L{";
- close = true;
- }
+ if (close) {
+ if (running_font.language()->lang() == "farsi")
+ os << "\\endL{}";
+ else
+ os << '}';
+ }
-// FIXME: Bug: we can have an empty font change here!
-// if there has just been a font change, we are going to close it
-// right now, which means stupid latex code like \textsf{}. AFAIK,
-// this does not harm dvi output. A minor bug, thus (JMarc)
- // 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.
- // ArabTeX, though, cannot handle this special behavior, it seems.
- bool arabtex = basefont.language()->lang() == "arabic_arabtex" ||
- running_font.language()->lang() == "arabic_arabtex";
- if (open_font && inset->noFontChange()) {
- bool closeLanguage = arabtex ||
- basefont.isRightToLeft() == running_font.isRightToLeft();
- unsigned int count = running_font.latexWriteEndChanges(
- os, bparams, runparams,
- basefont, basefont, closeLanguage);
- column += count;
- // if any font properties were closed, update the running_font,
- // making sure, however, to leave the language as it was
- if (count > 0) {
- // FIXME: probably a better way to keep track of the old
- // language, than copying the entire font?
- Font const copy_font(running_font);
- basefont = owner_->getLayoutFont(bparams, outerfont);
- running_font = basefont;
- if (!closeLanguage)
- running_font.setLanguage(copy_font.language());
- // leave font open if language is still open
- open_font = (running_font.language() == basefont.language());
- if (closeLanguage)
- runparams.local_font = &basefont;
- }
- }
+ if (tmp) {
+ for (int j = 0; j < tmp; ++j)
+ texrow.newline();
- int tmp = inset->latex(buf, os, runparams);
+ texrow.start(owner_->id(), i + 1);
+ column = 0;
+ } else {
+ column += os.tellp() - len;
+ }
- if (close) {
- if (running_font.language()->lang() == "farsi")
- os << "\\endL{}";
- else
- os << '}';
- }
+ if (owner_->lookupChange(i).type == Change::DELETED)
+ --runparams.inDeletedInset;
+}
- if (tmp) {
- for (int j = 0; j < tmp; ++j) {
- texrow.newline();
- }
- texrow.start(owner_->id(), i + 1);
- column = 0;
- } else {
- column += os.tellp() - len;
- }
- if (owner_->lookupChange(i).type == Change::DELETED) {
- --runparams.inDeletedInset;
- }
+void Paragraph::Private::latexSpecialChar(
+ odocstream & os,
+ OutputParams & runparams,
+ Font & running_font,
+ Change & running_change,
+ Layout const & style,
+ pos_type & i,
+ unsigned int & column)
+{
+ value_type const c = getChar(i);
+
+ if (style.pass_thru) {
+ if (c != '\0')
+ // FIXME UNICODE: This can fail if c cannot
+ // be encoded in the current encoding.
+ os.put(c);
+ return;
}
- break;
- default:
- // And now for the special cases within each mode
+ if (runparams.verbatim) {
+ os.put(c);
+ return;
+ }
- switch (c) {
- case '\\':
- os << "\\textbackslash{}";
- column += 15;
- break;
+ if (lyxrc.fontenc == "T1" && latexSpecialT1(c, os, i, column))
+ return;
- case '|': case '<': case '>':
- // In T1 encoding, these characters exist
- if (lyxrc.fontenc == "T1") {
- os.put(c);
- //... but we should avoid ligatures
- if ((c == '>' || c == '<')
- && i <= size() - 2
- && getChar(i + 1) == c) {
- //os << "\\textcompwordmark{}";
- //column += 19;
- // Jean-Marc, have a look at
- // this. IÂ think this works
- // equally well:
- os << "\\,{}";
- // Lgb
- column += 3;
- }
- break;
- }
- // Typewriter font also has them
- if (running_font.family() == Font::TYPEWRITER_FAMILY) {
- os.put(c);
- break;
- }
- // Otherwise, we use what LaTeX
- // provides us.
- switch (c) {
- case '<':
- os << "\\textless{}";
- column += 10;
- break;
- case '>':
- os << "\\textgreater{}";
- column += 13;
- break;
- case '|':
- os << "\\textbar{}";
- column += 9;
- break;
- }
- break;
+ if (running_font.family() == Font::TYPEWRITER_FAMILY
+ && latexSpecialTypewriter(c, os, i, column))
+ return;
- case '-': // "--" in Typewriter mode -> "-{}-"
- if (i <= size() - 2 &&
- getChar(i + 1) == '-' &&
- running_font.family() == Font::TYPEWRITER_FAMILY) {
- os << "-{}";
- column += 2;
- } else {
- os << '-';
- }
- break;
+ // Otherwise, we use what LaTeX provides us.
+ switch (c) {
+ case '\\':
+ os << "\\textbackslash{}";
+ column += 15;
+ break;
+ case '<':
+ os << "\\textless{}";
+ column += 10;
+ break;
+ case '>':
+ os << "\\textgreater{}";
+ column += 13;
+ break;
+ case '|':
+ os << "\\textbar{}";
+ column += 9;
+ break;
+ case '-':
+ os << '-';
+ break;
+ case '\"':
+ os << "\\char`\\\"{}";
+ column += 9;
+ break;
- case '\"':
- os << "\\char`\\\"{}";
- column += 9;
- break;
+ case '$': case '&':
+ case '%': case '#': case '{':
+ case '}': case '_':
+ os << '\\';
+ os.put(c);
+ column += 1;
+ break;
- case '$': case '&':
- case '%': case '#': case '{':
- case '}': case '_':
- os << '\\';
- os.put(c);
- column += 1;
- break;
+ case '~':
+ os << "\\textasciitilde{}";
+ column += 16;
+ break;
- case '~':
- os << "\\textasciitilde{}";
- column += 16;
- break;
+ case '^':
+ os << "\\textasciicircum{}";
+ column += 17;
+ break;
- case '^':
- os << "\\textasciicircum{}";
- column += 17;
- break;
+ case '*': case '[':
+ // avoid being mistaken for optional arguments
+ os << '{';
+ os.put(c);
+ os << '}';
+ column += 2;
+ break;
- case '*': case '[':
- // avoid being mistaken for optional arguments
- os << '{';
- os.put(c);
- os << '}';
- column += 2;
- break;
+ case ' ':
+ // Blanks are printed before font switching.
+ // Sure? I am not! (try nice-latex)
+ // I am sure it's correct. LyX might be smarter
+ // in the future, but for now, nothing wrong is
+ // written. (Asger)
+ break;
- case ' ':
- // Blanks are printed before font switching.
- // Sure? I am not! (try nice-latex)
- // I am sure it's correct. LyX might be smarter
- // in the future, but for now, nothing wrong is
- // written. (Asger)
- break;
+ default:
- default:
+ // LyX, LaTeX etc.
+ if (latexSpecialPhrase(os, i, column))
+ return;
- // I assume this is hack treating typewriter as verbatim
- // FIXME UNICODE: This can fail if c cannot be encoded
- // in the current encoding.
- if (running_font.family() == Font::TYPEWRITER_FAMILY) {
- if (c != '\0') {
- os.put(c);
- }
+ if (c == '\0')
+ return;
+
+ Encoding const & encoding = *(runparams.encoding);
+ if (i + 1 < size()) {
+ char_type next = getChar(i + 1);
+ if (Encodings::isCombiningChar(next)) {
+ column += latexSurrogatePair(os, c, next, encoding) - 1;
+ ++i;
break;
}
+ }
+ string preamble;
+ if (Encodings::isKnownLangChar(c, preamble)) {
+ column += knownLangChars(os, c, preamble, running_change,
+ encoding, i) - 1;
+ break;
+ }
+ docstring const latex = encoding.latexChar(c);
+ if (latex.length() > 1 && latex[latex.length() - 1] != '}') {
+ // Prevent eating of a following
+ // space or command corruption by
+ // following characters
+ column += latex.length() + 1;
+ os << latex << "{}";
+ } else {
+ column += latex.length() - 1;
+ os << latex;
+ }
+ break;
+ }
+}
+
+
+bool Paragraph::Private::latexSpecialT1(char_type const c, odocstream & os,
+ pos_type & i, unsigned int & column)
+{
+ switch (c) {
+ case '>':
+ case '<':
+ os.put(c);
+ // In T1 encoding, these characters exist
+ // but we should avoid ligatures
+ if (i + 1 > size() || getChar(i + 1) != c)
+ return true;
+ os << "\\,{}";
+ column += 3;
+ // Alternative code:
+ //os << "\\textcompwordmark{}";
+ //column += 19;
+ return true;
+ case '|':
+ os.put(c);
+ return true;
+ default:
+ return false;
+ }
+}
- // LyX, LaTeX etc.
- // FIXME: if we have "LaTeX" with a font
- // change in the middle (before the 'T', then
- // the "TeX" part is still special cased.
- // Really we should only operate this on
- // "words" for some definition of word
+bool Paragraph::Private::latexSpecialTypewriter(char_type const c, odocstream & os,
+ pos_type & i, unsigned int & column)
+{
+ switch (c) {
+ case '-':
+ if (i + 1 < size() && getChar(i + 1) == '-') {
+ // "--" in Typewriter mode -> "-{}-"
+ os << "-{}";
+ column += 2;
+ } else
+ os << '-';
+ return true;
- size_t pnr = 0;
+ // I assume this is hack treating typewriter as verbatim
+ // FIXME UNICODE: This can fail if c cannot be encoded
+ // in the current encoding.
- for (; pnr < phrases_nr; ++pnr) {
- if (isTextAt(special_phrases[pnr].phrase, i)) {
- os << special_phrases[pnr].macro;
- i += special_phrases[pnr].phrase.length() - 1;
- column += special_phrases[pnr].macro.length() - 1;
- break;
- }
- }
+ case '\0':
+ return true;
- if (pnr == phrases_nr && c != '\0') {
- Encoding const & encoding = *(runparams.encoding);
- if (i + 1 < size()) {
- char_type next = getChar(i + 1);
- if (Encodings::isCombiningChar(next)) {
- column += latexSurrogatePair(os, c, next, encoding) - 1;
- ++i;
- break;
- }
- }
- string preamble;
- if (Encodings::isKnownLangChar(c, preamble)) {
- column +=
- knownLangChars(os, c, preamble,
- running_change,
- encoding, i) - 1;
- break;
- }
- docstring const latex = encoding.latexChar(c);
- if (latex.length() > 1 &&
- latex[latex.length() - 1] != '}') {
- // Prevent eating of a following
- // space or command corruption by
- // following characters
- column += latex.length() + 1;
- os << latex << "{}";
- } else {
- column += latex.length() - 1;
- os << latex;
- }
- }
- break;
- }
+ // Those characters are not directly supported.
+ case '\\':
+ case '\"':
+ case '$': case '&':
+ case '%': case '#': case '{':
+ case '}': case '_':
+ case '~':
+ case '^':
+ case '*': case '[':
+ case ' ':
+ return false;
+
+ default:
+ // With Typewriter font, these characters exist.
+ os.put(c);
+ return true;
}
}
+bool Paragraph::Private::latexSpecialPhrase(odocstream & os, pos_type & i,
+ unsigned int & column)
+{
+ // FIXME: if we have "LaTeX" with a font
+ // change in the middle (before the 'T', then
+ // the "TeX" part is still special cased.
+ // Really we should only operate this on
+ // "words" for some definition of word
+
+ for (size_t pnr = 0; pnr < phrases_nr; ++pnr) {
+ if (!isTextAt(special_phrases[pnr].phrase, i))
+ continue;
+ os << special_phrases[pnr].macro;
+ i += special_phrases[pnr].phrase.length() - 1;
+ column += special_phrases[pnr].macro.length() - 1;
+ return true;
+ }
+ return false;
+}
+
+
void Paragraph::Private::validate(LaTeXFeatures & features,
Layout const & layout) const
{
- BufferParams const & bparams = features.bufferParams();
-
// check the params.
if (!params_.spacing().isDefault())
features.require("setspace");
features.useLayout(layout.name());
// then the fonts
- Language const * doc_language = bparams.language;
-
- FontList::const_iterator fcit = fontlist_.begin();
- FontList::const_iterator fend = fontlist_.end();
- for (; fcit != fend; ++fcit) {
- if (fcit->font().noun() == Font::ON) {
- LYXERR(Debug::LATEX) << "font.noun: "
- << fcit->font().noun()
- << endl;
- features.require("noun");
- LYXERR(Debug::LATEX) << "Noun enabled. Font: "
- << to_utf8(fcit->font().stateText(0))
- << endl;
- }
- switch (fcit->font().color()) {
- case Color::none:
- case Color::inherit:
- case Color::ignore:
- // probably we should put here all interface colors used for
- // font displaying! For now I just add this ones I know of (Jug)
- case Color::latex:
- case Color::note:
- break;
- default:
- features.require("color");
- LYXERR(Debug::LATEX) << "Color enabled. Font: "
- << to_utf8(fcit->font().stateText(0))
- << endl;
- }
-
- Language const * language = fcit->font().language();
- if (language->babel() != doc_language->babel() &&
- language != ignore_language &&
- language != latex_language)
- {
- features.useLanguage(language);
- LYXERR(Debug::LATEX) << "Found language "
- << language->lang() << endl;
- }
- }
+ fontlist_.validate(features);
+ // then the indentation
if (!params_.leftIndent().zero())
features.require("ParagraphLeftIndent");
}
}
-
-} // namespace lyx
-
-
/////////////////////////////////////////////////////////////////////
//
// Paragraph
//
/////////////////////////////////////////////////////////////////////
-namespace lyx {
-
Paragraph::Paragraph()
- : begin_of_body_(0), d(new Paragraph::Private(this))
+ : d(new Paragraph::Private(this))
{
itemdepth = 0;
d->params_.clear();
+ text_.reserve(100);
}
Paragraph::Paragraph(Paragraph const & par)
- : itemdepth(par.itemdepth),
- layout_(par.layout_),
- text_(par.text_), begin_of_body_(par.begin_of_body_),
+ : itemdepth(par.itemdepth), text_(par.text_),
d(new Paragraph::Private(*par.d, this))
{
}
// needed as we will destroy the private part before copying it
if (&par != this) {
itemdepth = par.itemdepth;
- layout_ = par.layout();
text_ = par.text_;
- begin_of_body_ = par.begin_of_body_;
delete d;
d = new Private(*par.d, this);
}
+void Paragraph::appendChar(value_type c, Font const & font,
+ Change const & change)
+{
+ // track change
+ d->changes_.insert(change, text_.size());
+ // when appending characters, no need to update tables
+ text_.push_back(c);
+ setFont(text_.size() - 1, font);
+}
+
+
+void Paragraph::appendString(docstring const & s, Font const & font,
+ Change const & change)
+{
+ size_t end = s.size();
+ size_t oldsize = text_.size();
+ size_t newsize = oldsize + end;
+ size_t capacity = text_.capacity();
+ if (newsize >= capacity)
+ text_.reserve(std::max(capacity + 100, newsize));
+
+ // FIXME: Optimize this!
+ for (pos_type i = 0; i != end; ++i) {
+ // track change
+ d->changes_.insert(change, i);
+ // when appending characters, no need to update tables
+ text_.push_back(s[i]);
+ }
+ d->fontlist_.setRange(oldsize, newsize, font);
+}
+
+
void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
bool trackChanges)
{
BOOST_ASSERT(pos <= size());
}
- FontList::const_iterator cit = d->fontlist_.begin();
- FontList::const_iterator end = d->fontlist_.end();
- for (; cit != end; ++cit)
- if (cit->pos() >= pos)
- break;
-
- if (cit != end)
+ FontList::const_iterator cit = d->fontlist_.fontIterator(pos);
+ if (cit != d->fontlist_.end())
return cit->font();
if (pos == size() && !empty())
pos_type const body_pos = beginOfBody();
if (pos < body_pos)
- font.realize(layout_->labelfont);
+ font.realize(d->layout_->labelfont);
else
- font.realize(layout_->font);
+ font.realize(d->layout_->font);
font.realize(outerfont);
font.realize(bparams.getFont());
Font_size Paragraph::highestFontInRange
(pos_type startpos, pos_type endpos, Font_size def_size) const
{
- if (d->fontlist_.empty())
- return def_size;
-
- FontList::const_iterator end_it = d->fontlist_.begin();
- FontList::const_iterator const end = d->fontlist_.end();
- for (; end_it != end; ++end_it) {
- if (end_it->pos() >= endpos)
- break;
- }
-
- if (end_it != end)
- ++end_it;
-
- FontList::const_iterator cit = d->fontlist_.begin();
- for (; cit != end; ++cit) {
- if (cit->pos() >= startpos)
- break;
- }
-
- Font::FONT_SIZE maxsize = Font::SIZE_TINY;
- for (; cit != end_it; ++cit) {
- Font::FONT_SIZE size = cit->font().size();
- if (size == Font::INHERIT_SIZE)
- size = def_size;
- if (size > maxsize && size <= Font::SIZE_HUGER)
- maxsize = size;
- }
- return maxsize;
+ return d->fontlist_.highestInRange(startpos, endpos, def_size);
}
pos_type Paragraph::beginOfBody() const
{
- return begin_of_body_;
+ return d->begin_of_body_;
}
void Paragraph::setBeginOfBody()
{
if (layout()->labeltype != LABEL_MANUAL) {
- begin_of_body_ = 0;
+ d->begin_of_body_ = 0;
return;
}
}
}
- begin_of_body_ = i;
-}
-
-
-// returns -1 if inset not found
-int Paragraph::getPositionOfInset(Inset const * inset) const
-{
- // Find the entry.
- InsetList::const_iterator it = d->insetlist_.begin();
- InsetList::const_iterator end = d->insetlist_.end();
- for (; it != end; ++it)
- if (it->inset == inset)
- return it->pos;
- return -1;
+ d->begin_of_body_ = i;
}
} // namespace anon
-// This could go to ParagraphParameters if we want to
-int Paragraph::startTeXParParams(BufferParams const & bparams,
+int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
odocstream & os, TexRow & texrow,
bool moving_arg) const
{
int column = 0;
- if (params().noindent()) {
+ if (params_.noindent()) {
os << "\\noindent ";
column += 10;
}
- LyXAlignment const curAlign = params().align();
+ LyXAlignment const curAlign = params_.align();
- if (curAlign == layout()->align)
+ if (curAlign == layout_->align)
return column;
switch (curAlign) {
break;
case LYX_ALIGN_LEFT: {
string output;
- if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\begin", "flushleft", ownerCode());
+ if (owner_->getParLanguage(bparams)->babel() != "hebrew")
+ output = corrected_env("\\begin", "flushleft", owner_->ownerCode());
else
- output = corrected_env("\\begin", "flushright", ownerCode());
+ output = corrected_env("\\begin", "flushright", owner_->ownerCode());
os << from_ascii(output);
adjust_row_column(output, texrow, column);
break;
} case LYX_ALIGN_RIGHT: {
string output;
- if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\\begin", "flushright", ownerCode());
+ if (owner_->getParLanguage(bparams)->babel() != "hebrew")
+ output = corrected_env("\\begin", "flushright", owner_->ownerCode());
else
- output = corrected_env("\\begin", "flushleft", ownerCode());
+ output = corrected_env("\\begin", "flushleft", owner_->ownerCode());
os << from_ascii(output);
adjust_row_column(output, texrow, column);
break;
} case LYX_ALIGN_CENTER: {
string output;
- output = corrected_env("\\begin", "center", ownerCode());
+ output = corrected_env("\\begin", "center", owner_->ownerCode());
os << from_ascii(output);
adjust_row_column(output, texrow, column);
break;
}
-// This could go to ParagraphParameters if we want to
-int Paragraph::endTeXParParams(BufferParams const & bparams,
+int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
odocstream & os, TexRow & texrow,
bool moving_arg) const
{
int column = 0;
- switch (params().align()) {
+ switch (params_.align()) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK:
case LYX_ALIGN_LAYOUT:
break;
}
- switch (params().align()) {
+ switch (params_.align()) {
case LYX_ALIGN_NONE:
case LYX_ALIGN_BLOCK:
case LYX_ALIGN_LAYOUT:
break;
case LYX_ALIGN_LEFT: {
string output;
- if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\n\\par\\end", "flushleft", ownerCode());
+ if (owner_->getParLanguage(bparams)->babel() != "hebrew")
+ output = corrected_env("\n\\par\\end", "flushleft", owner_->ownerCode());
else
- output = corrected_env("\n\\par\\end", "flushright", ownerCode());
+ output = corrected_env("\n\\par\\end", "flushright", owner_->ownerCode());
os << from_ascii(output);
adjust_row_column(output, texrow, column);
break;
} case LYX_ALIGN_RIGHT: {
string output;
- if (getParLanguage(bparams)->babel() != "hebrew")
- output = corrected_env("\n\\par\\end", "flushright", ownerCode());
+ if (owner_->getParLanguage(bparams)->babel() != "hebrew")
+ output = corrected_env("\n\\par\\end", "flushright", owner_->ownerCode());
else
- output = corrected_env("\n\\par\\end", "flushleft", ownerCode());
+ output = corrected_env("\n\\par\\end", "flushleft", owner_->ownerCode());
os << from_ascii(output);
adjust_row_column(output, texrow, column);
break;
} case LYX_ALIGN_CENTER: {
string output;
- output = corrected_env("\n\\par\\end", "center", ownerCode());
+ output = corrected_env("\n\\par\\end", "center", owner_->ownerCode());
os << from_ascii(output);
adjust_row_column(output, texrow, column);
break;
// This one spits out the text of the paragraph
-bool Paragraph::simpleTeXOnePar(Buffer const & buf,
+bool Paragraph::latex(Buffer const & buf,
BufferParams const & bparams,
Font const & outerfont,
odocstream & os, TexRow & texrow,
++column;
}
if (!asdefault)
- column += startTeXParParams(bparams, os, texrow,
+ column += d->startTeXParParams(bparams, os, texrow,
runparams.moving_arg);
}
}
if (!asdefault)
- column += startTeXParParams(bparams, os,
+ column += d->startTeXParParams(bparams, os,
texrow,
runparams.moving_arg);
}
++column;
- value_type const c = getChar(i);
-
// Fully instantiated font
Font const font = getFont(bparams, i, outerfont);
}
}
+ value_type const c = getChar(i);
+
// Do we need to change font?
if ((font != running_font ||
font.language() != running_font.language()) &&
}
if (c == ' ') {
+ // FIXME: integrate this case in latexSpecialChar
// Do not print the separation of the optional argument
// if style->pass_thru is false. This works because
- // simpleTeXSpecialChars ignores spaces if
+ // latexSpecialChar ignores spaces if
// style->pass_thru is false.
if (i != body_pos - 1) {
if (d->simpleTeXBlanks(
*(runparams.encoding), os, texrow,
- i, column, font, *style))
+ i, column, font, *style)) {
// A surrogate pair was output. We
- // must not call simpleTeXSpecialChars
- // in this iteration, since
- // simpleTeXBlanks incremented i, and
- // simpleTeXSpecialChars would output
+ // must not call latexSpecialChar
+ // in this iteration, since it would output
// the combining character again.
+ ++i;
continue;
+ }
}
}
rp.free_spacing = style->free_spacing;
rp.local_font = &font;
rp.intitle = style->intitle;
- d->simpleTeXSpecialChars(buf, bparams, os,
+
+ // Two major modes: LaTeX or plain
+ // Handle here those cases common to both modes
+ // and then split to handle the two modes separately.
+ if (c == Paragraph::META_INSET)
+ d->latexInset(buf, bparams, os,
texrow, rp, running_font,
basefont, outerfont, open_font,
- runningChange, *style, i, column, c);
+ runningChange, *style, i, column);
+ else
+ d->latexSpecialChar(os, rp, running_font, runningChange,
+ *style, i, column);
// Set the encoding to that returned from simpleTeXSpecialChars (see
// comment for encoding member in OutputParams.h)
}
if (!asdefault) {
- column += endTeXParParams(bparams, os, texrow,
+ column += d->endTeXParParams(bparams, os, texrow,
runparams.moving_arg);
}
LayoutPtr const & Paragraph::layout() const
{
- return layout_;
+ return d->layout_;
}
void Paragraph::layout(LayoutPtr const & new_layout)
{
- layout_ = new_layout;
+ d->layout_ = new_layout;
}
//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")));
+ InsetBibitem * inset(new InsetBibitem(InsetCommandParams(BIBITEM_CODE)));
// restore values of previously deleted item in this par.
if (!oldkey.empty())
inset->setParam("key", oldkey);
return d->insetlist_.get(pos);
}
+
+int Paragraph::numberOfOptArgs() const
+{
+ int num = 0;
+ InsetList::const_iterator it = insetList().begin();
+ InsetList::const_iterator end = insetList().end();
+ for (; it != end ; ++it) {
+ if (it->inset->lyxCode() == OPTARG_CODE)
+ ++num;
+ }
+ return num;
+}
+
+
} // namespace lyx
projects / lyx.git / blobdiff