X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.C;h=1a6cdfc35a5a61713500709dde8b7fd92b9414e3;hb=b1be8f3cb0486b659ff7e35601d2ed74d3ce29e0;hp=ac39aeb88287d2c636d3e9fc65898cd2b983b4c0;hpb=69fae0531d533ce87aaf0962b6a3138009a5fa76;p=lyx.git diff --git a/src/paragraph.C b/src/paragraph.C index ac39aeb882..1a6cdfc35a 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -22,14 +22,18 @@ #include "buffer.h" #include "bufferparams.h" +#include "counters.h" #include "encoding.h" #include "debug.h" #include "gettext.h" #include "language.h" -#include "latexrunparams.h" #include "lyxfont.h" #include "lyxrc.h" #include "lyxrow.h" +#include "outputparams.h" +#include "paragraph_funcs.h" +#include "ParagraphList_fwd.h" +#include "sgml.h" #include "texrow.h" #include "vspace.h" @@ -38,74 +42,85 @@ #include "support/lstrings.h" #include "support/textutils.h" -#include "support/std_sstream.h" +#include "support/tostr.h" + +#include +#include + +#include +#include +#include using lyx::pos_type; using lyx::support::contains; using lyx::support::subst; +using std::distance; using std::endl; +using std::list; +using std::stack; using std::string; using std::ostream; using std::ostringstream; +ParagraphList::ParagraphList() +{} + + Paragraph::Paragraph() - : y(0), height(0), pimpl_(new Paragraph::Pimpl(this)) + : y(0), height(0), begin_of_body_(0), + pimpl_(new Paragraph::Pimpl(this)) { + //lyxerr << "sizeof Paragraph::Pimpl: " << sizeof(Paragraph::Pimpl) << endl; itemdepth = 0; params().clear(); } -Paragraph::Paragraph(Paragraph const & lp) - : y(0), height(0), text_(lp.text_), pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this)) +Paragraph::Paragraph(Paragraph const & par) + : itemdepth(par.itemdepth), insetlist(par.insetlist), + rows(par.rows), y(par.y), height(par.height), + width(par.width), layout_(par.layout_), + text_(par.text_), begin_of_body_(par.begin_of_body_), + pimpl_(new Paragraph::Pimpl(*par.pimpl_, this)) { - itemdepth = 0; - // this is because of the dummy layout of the paragraphs that - // follow footnotes - layout_ = lp.layout(); - - // copy everything behind the break-position to the new paragraph - insetlist = lp.insetlist; + //lyxerr << "Paragraph::Paragraph(Paragraph const&)" << endl; InsetList::iterator it = insetlist.begin(); InsetList::iterator end = insetlist.end(); - for (; it != end; ++it) { - // currently we hold Inset*, not InsetBase* - it->inset = static_cast(it->inset->clone().release()); - } + for (; it != end; ++it) + it->inset = it->inset->clone().release(); } -void Paragraph::operator=(Paragraph const & lp) +Paragraph & Paragraph::operator=(Paragraph const & par) { // needed as we will destroy the pimpl_ before copying it - if (&lp != this) - return; - - lyxerr << "Paragraph::operator=()" << endl; - - text_ = lp.text_; - - delete pimpl_; - pimpl_ = new Pimpl(*lp.pimpl_, this); - - itemdepth = lp.itemdepth; - // this is because of the dummy layout of the paragraphs that - // follow footnotes - layout_ = lp.layout(); - - // copy everything behind the break-position to the new paragraph - insetlist = lp.insetlist; - InsetList::iterator it = insetlist.begin(); - InsetList::iterator end = insetlist.end(); - for (; it != end; ++it) { - it->inset = static_cast(it->inset->clone().release()); + if (&par != this) { + itemdepth = par.itemdepth; + + insetlist = par.insetlist; + InsetList::iterator it = insetlist.begin(); + InsetList::iterator end = insetlist.end(); + for (; it != end; ++it) + it->inset = it->inset->clone().release(); + + rows = par.rows; + y = par.y; + height = par.height; + width = par.width; + layout_ = par.layout(); + text_ = par.text_; + begin_of_body_ = par.begin_of_body_; + + delete pimpl_; + pimpl_ = new Pimpl(*par.pimpl_, this); } + return *this; } -// the destructor removes the new paragraph from the list + Paragraph::~Paragraph() { delete pimpl_; @@ -167,7 +182,7 @@ void Paragraph::write(Buffer const & buf, ostream & os, switch (c) { case META_INSET: { - InsetOld const * inset = getInset(i); + InsetBase const * inset = getInset(i); if (inset) if (inset->directWrite()) { // international char, let it write @@ -248,10 +263,17 @@ int Paragraph::erase(pos_type start, pos_type end) } -bool Paragraph::checkInsertChar(LyXFont & font) +void Paragraph::insert(pos_type start, string const & str, + LyXFont const & font) +{ + int size = str.size(); + for (int i = 0 ; i < size ; ++i) + insertChar(start + i, str[i], font); +} + + +bool Paragraph::checkInsertChar(LyXFont &) { - if (pimpl_->inset_owner) - return pimpl_->inset_owner->checkInsertChar(font); return true; } @@ -269,13 +291,13 @@ void Paragraph::insertChar(pos_type pos, Paragraph::value_type c, } -void Paragraph::insertInset(pos_type pos, InsetOld * inset) +void Paragraph::insertInset(pos_type pos, InsetBase * inset) { insertInset(pos, inset, LyXFont(LyXFont::ALL_INHERIT)); } -void Paragraph::insertInset(pos_type pos, InsetOld * inset, +void Paragraph::insertInset(pos_type pos, InsetBase * inset, LyXFont const & font, Change change) { pimpl_->insertInset(pos, inset, font, change); @@ -284,21 +306,18 @@ void Paragraph::insertInset(pos_type pos, InsetOld * inset, bool Paragraph::insetAllowed(InsetOld_code code) { - //lyxerr << "Paragraph::InsertInsetAllowed" << endl; - if (pimpl_->inset_owner) - return pimpl_->inset_owner->insetAllowed(code); - return true; + return !pimpl_->inset_owner || pimpl_->inset_owner->insetAllowed(code); } -InsetOld * Paragraph::getInset(pos_type pos) +InsetBase * Paragraph::getInset(pos_type pos) { BOOST_ASSERT(pos < size()); return insetlist.get(pos); } -InsetOld const * Paragraph::getInset(pos_type pos) const +InsetBase const * Paragraph::getInset(pos_type pos) const { BOOST_ASSERT(pos < size()); return insetlist.get(pos); @@ -309,7 +328,10 @@ InsetOld const * Paragraph::getInset(pos_type pos) const LyXFont const Paragraph::getFontSettings(BufferParams const & bparams, pos_type pos) const { - BOOST_ASSERT(pos <= size()); + if (pos > size()) { + lyxerr << " pos: " << pos << " size: " << size() << endl; + BOOST_ASSERT(pos <= size()); + } Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin(); Pimpl::FontList::const_iterator end = pimpl_->fontlist.end(); @@ -366,7 +388,7 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams, pos_type pos, LyXLayout_ptr const & lout = layout(); - pos_type const body_pos = beginningOfBody(); + pos_type const body_pos = beginOfBody(); LyXFont layoutfont; if (pos < body_pos) @@ -500,7 +522,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font) if (it->pos() >= pos) break; } - unsigned int i = std::distance(beg, it); + unsigned int i = distance(beg, it); bool notfound = (it == endit); if (!notfound && pimpl_->fontlist[i].font() == font) @@ -570,9 +592,7 @@ int Paragraph::stripLeadingSpaces() bool Paragraph::hasSameLayout(Paragraph const & par) const { - return - par.layout() == layout() && - params().sameLayout(par.params()); + return par.layout() == layout() && params().sameLayout(par.params()); } @@ -624,34 +644,40 @@ void Paragraph::applyLayout(LyXLayout_ptr const & new_layout) layout(new_layout); params().labelWidthString(string()); params().align(LYX_ALIGN_LAYOUT); - params().spaceTop(VSpace(VSpace::NONE)); - params().spaceBottom(VSpace(VSpace::NONE)); params().spacing(Spacing(Spacing::Default)); } -int Paragraph::beginningOfBody() const +pos_type Paragraph::beginOfBody() const { - if (layout()->labeltype != LABEL_MANUAL) - return 0; + return begin_of_body_; +} + + +void Paragraph::setBeginOfBody() +{ + if (layout()->labeltype != LABEL_MANUAL) { + begin_of_body_ = 0; + return; + } // Unroll the first two cycles of the loop // and remember the previous character to // remove unnecessary getChar() calls pos_type i = 0; - if (i < size() && !isNewline(i)) { + pos_type end = size(); + if (i < end && !isNewline(i)) { ++i; char previous_char = 0; char temp = 0; - if (i < size()) { - previous_char = getChar(i); + if (i < end) { + previous_char = text_[i]; if (!isNewline(i)) { ++i; - while (i < size() && previous_char != ' ') { - temp = getChar(i); + while (i < end && previous_char != ' ') { + temp = text_[i]; if (isNewline(i)) break; - ++i; previous_char = temp; } @@ -659,12 +685,12 @@ int Paragraph::beginningOfBody() const } } - return i; + begin_of_body_ = i; } // returns -1 if inset not found -int Paragraph::getPositionOfInset(InsetOld const * inset) const +int Paragraph::getPositionOfInset(InsetBase const * inset) const { // Find the entry. InsetList::const_iterator it = insetlist.begin(); @@ -678,26 +704,35 @@ int Paragraph::getPositionOfInset(InsetOld const * inset) const InsetBibitem * Paragraph::bibitem() const { - InsetList::const_iterator it = insetlist.begin(); - if (it != insetlist.end() && it->inset->lyxCode() == InsetOld::BIBTEX_CODE) - return static_cast(it->inset); + if (!insetlist.empty()) { + InsetBase * inset = insetlist.begin()->inset; + if (inset->lyxCode() == InsetBase::BIBTEX_CODE) + return static_cast(inset); + } return 0; } +bool Paragraph::forceDefaultParagraphs() const +{ + return inInset() && inInset()->forceDefaultParagraphs(inInset()); +} + + +bool Paragraph::autoBreakRows() const +{ + return inInset() && static_cast(inInset())->getAutoBreakRows(); +} + + namespace { -/* paragraphs inside floats need different alignment tags to avoid -unwanted space */ +// paragraphs inside floats need different alignment tags to avoid +// unwanted space -bool noTrivlistCentering(UpdatableInset const * inset) +bool noTrivlistCentering(InsetBase::Code code) { - if (inset && inset->owner()) { - InsetOld::Code const code = inset->owner()->lyxCode(); - return code == InsetOld::FLOAT_CODE || - code == InsetOld::WRAP_CODE; - } - return false; + return code == InsetBase::FLOAT_CODE || code == InsetBase::WRAP_CODE; } @@ -714,10 +749,10 @@ string correction(string const & orig) string const corrected_env(string const & suffix, string const & env, - UpdatableInset const * inset) + InsetBase::Code code) { string output = suffix + "{"; - if (noTrivlistCentering(inset)) + if (noTrivlistCentering(code)) output += correction(env); else output += env; @@ -749,7 +784,7 @@ int Paragraph::startTeXParParams(BufferParams const & bparams, case LYX_ALIGN_CENTER: if (moving_arg) { os << "\\protect"; - column = 8; + column += 8; } break; } @@ -762,27 +797,25 @@ int Paragraph::startTeXParParams(BufferParams const & bparams, break; case LYX_ALIGN_LEFT: { string output; - UpdatableInset const * const inset = pimpl_->inset_owner; if (getParLanguage(bparams)->babel() != "hebrew") - output = corrected_env("\\begin", "flushleft", inset); + output = corrected_env("\\begin", "flushleft", ownerCode()); else - output = corrected_env("\\begin", "flushright", inset); + output = corrected_env("\\begin", "flushright", ownerCode()); os << output; column += output.size(); break; } case LYX_ALIGN_RIGHT: { string output; - UpdatableInset const * const inset = pimpl_->inset_owner; if (getParLanguage(bparams)->babel() != "hebrew") - output = corrected_env("\\begin", "flushright", inset); + output = corrected_env("\\begin", "flushright", ownerCode()); else - output = corrected_env("\\begin", "flushleft", inset); + output = corrected_env("\\begin", "flushleft", ownerCode()); os << output; column += output.size(); break; } case LYX_ALIGN_CENTER: { string output; - output = corrected_env("\\begin", "center", pimpl_->inset_owner); + output = corrected_env("\\begin", "center", ownerCode()); os << output; column += output.size(); break; @@ -823,27 +856,25 @@ int Paragraph::endTeXParParams(BufferParams const & bparams, break; case LYX_ALIGN_LEFT: { string output; - UpdatableInset const * const inset = pimpl_->inset_owner; if (getParLanguage(bparams)->babel() != "hebrew") - output = corrected_env("\\par\\end", "flushleft", inset); + output = corrected_env("\\par\\end", "flushleft", ownerCode()); else - output = corrected_env("\\par\\end", "flushright", inset); + output = corrected_env("\\par\\end", "flushright", ownerCode()); os << output; column += output.size(); break; } case LYX_ALIGN_RIGHT: { string output; - UpdatableInset const * const inset = pimpl_->inset_owner; if (getParLanguage(bparams)->babel() != "hebrew") - output = corrected_env("\\par\\end", "flushright", inset); + output = corrected_env("\\par\\end", "flushright", ownerCode()); else - output = corrected_env("\\par\\end", "flushleft", inset); + output = corrected_env("\\par\\end", "flushleft", ownerCode()); os << output; column += output.size(); break; } case LYX_ALIGN_CENTER: { string output; - output = corrected_env("\\par\\end", "center", pimpl_->inset_owner); + output = corrected_env("\\par\\end", "center", ownerCode()); os << output; column += output.size(); break; @@ -859,7 +890,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf, BufferParams const & bparams, LyXFont const & outerfont, ostream & os, TexRow & texrow, - LatexRunParams const & runparams) + OutputParams const & runparams) const { lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl; @@ -871,8 +902,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf, // length (all in one row) if that is true then we don't allow // any special options in the paragraph and also we don't allow // any environment other then "Standard" to be valid! - bool asdefault = - (inInset() && inInset()->forceDefaultParagraphs(inInset())); + bool asdefault = forceDefaultParagraphs(); if (asdefault) { style = bparams.getLyXTextClass().defaultLayout(); @@ -883,16 +913,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf, LyXFont basefont; // Maybe we have to create a optional argument. - pos_type body_pos; - - // FIXME: can we actually skip this check and just call - // beginningOfBody() ?? - if (style->labeltype != LABEL_MANUAL) { - body_pos = 0; - } else { - body_pos = beginningOfBody(); - } - + pos_type body_pos = beginOfBody(); unsigned int column = 0; if (body_pos > 0) { @@ -903,8 +924,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf, basefont = getLayoutFont(bparams, outerfont); } - bool moving_arg = runparams.moving_arg; - moving_arg |= style->needprotect; + bool const moving_arg = runparams.moving_arg | style->needprotect; // Which font is currently active? LyXFont running_font(basefont); @@ -923,7 +943,6 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf, } if (!asdefault) column += startTeXParParams(bparams, os, moving_arg); - } for (pos_type i = 0; i < size(); ++i) { @@ -962,8 +981,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf, // rather than "\textXX{text }". (Asger) if (open_font && c == ' ' && i <= size() - 2) { LyXFont const & next_font = getFont(bparams, i + 1, outerfont); - if (next_font != running_font - && next_font != font) { + if (next_font != running_font && next_font != font) { font = next_font; } } @@ -1005,11 +1023,13 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf, column += Changes::latexMarkChange(os, running_change, change); running_change = change; - LatexRunParams rp = runparams; + OutputParams rp = runparams; rp.moving_arg = moving_arg; rp.free_spacing = style->free_spacing; + rp.lang = font.language()->babel(); + rp.intitle = style->intitle; pimpl_->simpleTeXSpecialChars(buf, bparams, - os, texrow, runparams, + os, texrow, rp, font, running_font, basefont, outerfont, open_font, running_change, @@ -1056,6 +1076,391 @@ bool Paragraph::simpleTeXOnePar(Buffer const & buf, } +namespace { + +// checks, if newcol chars should be put into this line +// writes newline, if necessary. +void sgmlLineBreak(ostream & os, string::size_type & colcount, + string::size_type newcol) +{ + colcount += newcol; + if (colcount > lyxrc.ascii_linelen) { + os << "\n"; + colcount = newcol; // assume write after this call + } +} + +enum PAR_TAG { + PAR_NONE=0, + TT = 1, + SF = 2, + BF = 4, + IT = 8, + SL = 16, + EM = 32 +}; + + +string tag_name(PAR_TAG const & pt) { + switch (pt) { + case PAR_NONE: return "!-- --"; + case TT: return "tt"; + case SF: return "sf"; + case BF: return "bf"; + case IT: return "it"; + case SL: return "sl"; + case EM: return "em"; + } + return ""; +} + + +inline +void operator|=(PAR_TAG & p1, PAR_TAG const & p2) +{ + p1 = static_cast(p1 | p2); +} + + +inline +void reset(PAR_TAG & p1, PAR_TAG const & p2) +{ + p1 = static_cast(p1 & ~p2); +} + +} // anon + + +// Handle internal paragraph parsing -- layout already processed. +void Paragraph::simpleLinuxDocOnePar(Buffer const & buf, + ostream & os, + LyXFont const & outerfont, + OutputParams const & runparams, + lyx::depth_type /*depth*/) const +{ + LyXLayout_ptr const & style = layout(); + + string::size_type char_line_count = 5; // Heuristic choice ;-) + + // gets paragraph main font + LyXFont font_old; + bool desc_on; + if (style->labeltype == LABEL_MANUAL) { + font_old = style->labelfont; + desc_on = true; + } else { + font_old = style->font; + desc_on = false; + } + + LyXFont::FONT_FAMILY family_type = LyXFont::ROMAN_FAMILY; + LyXFont::FONT_SERIES series_type = LyXFont::MEDIUM_SERIES; + LyXFont::FONT_SHAPE shape_type = LyXFont::UP_SHAPE; + bool is_em = false; + + stack tag_state; + // parsing main loop + for (pos_type i = 0; i < size(); ++i) { + + PAR_TAG tag_close = PAR_NONE; + list < PAR_TAG > tag_open; + + LyXFont const font = getFont(buf.params(), i, outerfont); + + if (font_old.family() != font.family()) { + switch (family_type) { + case LyXFont::SANS_FAMILY: + tag_close |= SF; + break; + case LyXFont::TYPEWRITER_FAMILY: + tag_close |= TT; + break; + default: + break; + } + + family_type = font.family(); + + switch (family_type) { + case LyXFont::SANS_FAMILY: + tag_open.push_back(SF); + break; + case LyXFont::TYPEWRITER_FAMILY: + tag_open.push_back(TT); + break; + default: + break; + } + } + + if (font_old.series() != font.series()) { + switch (series_type) { + case LyXFont::BOLD_SERIES: + tag_close |= BF; + break; + default: + break; + } + + series_type = font.series(); + + switch (series_type) { + case LyXFont::BOLD_SERIES: + tag_open.push_back(BF); + break; + default: + break; + } + + } + + if (font_old.shape() != font.shape()) { + switch (shape_type) { + case LyXFont::ITALIC_SHAPE: + tag_close |= IT; + break; + case LyXFont::SLANTED_SHAPE: + tag_close |= SL; + break; + default: + break; + } + + shape_type = font.shape(); + + switch (shape_type) { + case LyXFont::ITALIC_SHAPE: + tag_open.push_back(IT); + break; + case LyXFont::SLANTED_SHAPE: + tag_open.push_back(SL); + break; + default: + break; + } + } + // handle tag + if (font_old.emph() != font.emph()) { + if (font.emph() == LyXFont::ON) { + tag_open.push_back(EM); + is_em = true; + } + else if (is_em) { + tag_close |= EM; + is_em = false; + } + } + + list < PAR_TAG > temp; + while (!tag_state.empty() && tag_close) { + PAR_TAG k = tag_state.top(); + tag_state.pop(); + os << "'; + if (tag_close & k) + reset(tag_close,k); + else + temp.push_back(k); + } + + for(list< PAR_TAG >::const_iterator j = temp.begin(); + j != temp.end(); ++j) { + tag_state.push(*j); + os << '<' << tag_name(*j) << '>'; + } + + for(list< PAR_TAG >::const_iterator j = tag_open.begin(); + j != tag_open.end(); ++j) { + tag_state.push(*j); + os << '<' << tag_name(*j) << '>'; + } + + char c = getChar(i); + + + if (c == Paragraph::META_INSET) { + getInset(i)->linuxdoc(buf, os, runparams); + font_old = font; + continue; + } + + if (style->latexparam() == "CDATA") { + // "TeX"-Mode on == > SGML-Mode on. + if (c != '\0') + os << c; + ++char_line_count; + } else { + bool ws; + string str; + boost::tie(ws, str) = sgml::escapeChar(c); + if (ws && !isFreeSpacing()) { + // in freespacing mode, spaces are + // non-breaking characters + if (desc_on) { // if char is ' ' then... + ++char_line_count; + sgmlLineBreak(os, char_line_count, 6); + os << ""; + desc_on = false; + } else { + sgmlLineBreak(os, char_line_count, 1); + os << c; + } + } else { + os << str; + char_line_count += str.length(); + } + } + font_old = font; + } + + while (!tag_state.empty()) { + os << "'; + tag_state.pop(); + } + + // resets description flag correctly + if (desc_on) { + // not closed... + sgmlLineBreak(os, char_line_count, 6); + os << ""; + } +} + + +string Paragraph::getDocbookId() const +{ + for (pos_type i = 0; i < size(); ++i) { + if (isInset(i)) { + InsetBase const * inset = getInset(i); + InsetBase::Code lyx_code = inset->lyxCode(); + if (lyx_code == InsetBase::LABEL_CODE) { + return static_cast(inset)->getContents(); + } + } + + } + return string(); +} + + +void Paragraph::simpleDocBookOnePar(Buffer const & buf, + ostream & os, + LyXFont const & outerfont, + OutputParams const & runparams, + lyx::depth_type depth) const +{ + bool emph_flag = false; + + LyXLayout_ptr const & style = layout(); + LyXLayout_ptr const & defaultstyle = + buf.params().getLyXTextClass().defaultLayout(); + + LyXFont font_old = + style->labeltype == LABEL_MANUAL ? style->labelfont : style->font; + + int char_line_count = depth; + bool label_closed = true; + bool para_closed = true; + + if (style->latextype == LATEX_ITEM_ENVIRONMENT) { + string ls = ""; + Counters & counters = buf.params().getLyXTextClass().counters(); + if (!style->free_spacing) + os << string(depth,' '); + if (!style->labeltag().empty()) { + os << "<" << style->labeltag() << ">\n"; + label_closed = false; + } else { + if (!defaultstyle->latexparam().empty()) { + counters.step("para"); + ls = tostr(counters.value("para")); + ls = " id=\"" + + subst(defaultstyle->latexparam(), "#", ls) + '"'; + } + os << "<" << style->itemtag() << ">\n" + << string(depth, ' ') << "<" + << defaultstyle->latexname() << ls << ">\n"; + para_closed = false; + } + } + + // parsing main loop + for (pos_type i = 0; i < size(); ++i) { + LyXFont font = getFont(buf.params(), i, outerfont); + + // handle tag + if (font_old.emph() != font.emph()) { + if (font.emph() == LyXFont::ON) { + if (style->latexparam() == "CDATA") + os << "]]>"; + os << ""; + if (style->latexparam() == "CDATA") + os << "latexparam() == "CDATA") + os << "]]>"; + os << ""; + if (style->latexparam() == "CDATA") + os << "latexparam() == "CDATA") + os << "]]>"; + inset->docbook(buf, os, runparams); + if (style->latexparam() == "CDATA") + os << "pass_thru) { + os << c; + } else if (isFreeSpacing() || c != ' ') { + os << str; + } else if (!style->labeltag().empty() && !label_closed) { + ++char_line_count; + os << "\nlabeltag() << "><" + << style->itemtag() << "><" + << defaultstyle->latexname() << ">"; + label_closed = true; + para_closed = false; + } else { + os << ' '; + } + } + font_old = font; + } + + if (emph_flag) { + if (style->latexparam() == "CDATA") + os << "]]>"; + os << ""; + if (style->latexparam() == "CDATA") + os << " not closed... + os << "labeltag() << ">\n<" + << style->itemtag() << "><" + << defaultstyle->latexname() << "> "; + } + if (!para_closed) { + os << "\n" << string(depth, ' ') << "latexname() << ">\n"; + } + if (style->free_spacing) + os << '\n'; +} + + namespace { /// return true if the char is a meta-character for an inset @@ -1071,21 +1476,15 @@ bool IsInsetChar(char c) bool Paragraph::isHfill(pos_type pos) const { - return IsInsetChar(getChar(pos)) - && getInset(pos)->lyxCode() == InsetOld::HFILL_CODE; -} - - -bool Paragraph::isInset(pos_type pos) const -{ - return IsInsetChar(getChar(pos)); + return + isInset(pos) && getInset(pos)->lyxCode() == InsetBase::HFILL_CODE; } bool Paragraph::isNewline(pos_type pos) const { - return IsInsetChar(getChar(pos)) - && getInset(pos)->lyxCode() == InsetOld::NEWLINE_CODE; + return + isInset(pos) && getInset(pos)->lyxCode() == InsetBase::NEWLINE_CODE; } @@ -1126,7 +1525,9 @@ bool Paragraph::isLetter(pos_type pos) const bool Paragraph::isWord(pos_type pos) const { - unsigned char const c = getChar(pos); + if (isInset(pos)) + return getInset(pos)->isLetter(); + value_type const c = getChar(pos); return !(IsSeparatorChar(c) || IsKommaChar(c) || IsInsetChar(c)); @@ -1138,7 +1539,9 @@ Paragraph::getParLanguage(BufferParams const & bparams) const { if (!empty()) return getFirstFontSettings().language(); +#ifdef WITH_WARNINGS #warning FIXME we should check the prev par as well (Lgb) +#endif return bparams.language; } @@ -1147,8 +1550,7 @@ bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const { return lyxrc.rtl_support && getParLanguage(bparams)->RightToLeft() - && !(inInset() && inInset()->owner() && - inInset()->owner()->lyxCode() == InsetOld::ERT_CODE); + && ownerCode() != InsetBase::ERT_CODE; } @@ -1165,7 +1567,7 @@ void Paragraph::changeLanguage(BufferParams const & bparams, } -bool Paragraph::isMultiLingual(BufferParams const & bparams) +bool Paragraph::isMultiLingual(BufferParams const & bparams) const { Language const * doc_language = bparams.language; Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin(); @@ -1183,6 +1585,15 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams) // Convert the paragraph to a string. // Used for building the table of contents string const Paragraph::asString(Buffer const & buffer, bool label) const +{ + OutputParams runparams; + return asString(buffer, runparams, label); +} + + +string const Paragraph::asString(Buffer const & buffer, + OutputParams const & runparams, + bool label) const { #if 0 string s; @@ -1194,17 +1605,17 @@ string const Paragraph::asString(Buffer const & buffer, bool label) const if (IsPrintable(c)) s += c; else if (c == META_INSET && - getInset(i)->lyxCode() == InsetOld::MATH_CODE) { - ostringstream ost; - getInset(i)->ascii(buffer, ost); - s += subst(STRCONV(ost.str()),'\n',' '); + getInset(i)->lyxCode() == InsetBase::MATH_CODE) { + ostringstream os; + getInset(i)->plaintext(buffer, os, runparams); + s += subst(STRCONV(os.str()),'\n',' '); } } return s; #else // This should really be done by the caller and not here. - string ret(asString(buffer, 0, size(), label)); + string ret = asString(buffer, runparams, 0, size(), label); return subst(ret, '\n', ' '); #endif } @@ -1213,6 +1624,16 @@ string const Paragraph::asString(Buffer const & buffer, bool label) const string const Paragraph::asString(Buffer const & buffer, pos_type beg, pos_type end, bool label) const { + + OutputParams const runparams; + return asString(buffer, runparams, beg, end, label); +} + + +string const Paragraph::asString(Buffer const & buffer, + OutputParams const & runparams, + pos_type beg, pos_type end, bool label) const +{ ostringstream os; if (beg == 0 && label && !params().labelString().empty()) @@ -1223,7 +1644,7 @@ string const Paragraph::asString(Buffer const & buffer, if (IsPrintable(c)) os << c; else if (c == META_INSET) - getInset(i)->ascii(buffer, os); + getInset(i)->plaintext(buffer, os, runparams); } return os.str(); @@ -1233,17 +1654,6 @@ string const Paragraph::asString(Buffer const & buffer, void Paragraph::setInsetOwner(UpdatableInset * inset) { pimpl_->inset_owner = inset; - InsetList::iterator it = insetlist.begin(); - InsetList::iterator end = insetlist.end(); - for (; it != end; ++it) - if (it->inset) - it->inset->setOwner(inset); -} - - -void Paragraph::deleteInsetsLyXText(BufferView * bv) -{ - insetlist.deleteInsetsLyXText(bv); } @@ -1273,14 +1683,14 @@ void Paragraph::cleanChanges() Change::Type Paragraph::lookupChange(lyx::pos_type pos) const { - BOOST_ASSERT(!size() || pos < size()); + BOOST_ASSERT(empty() || pos < size()); return pimpl_->lookupChange(pos); } Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const { - BOOST_ASSERT(!size() || pos < size()); + BOOST_ASSERT(empty() || pos < size()); return pimpl_->lookupChangeFull(pos); } @@ -1300,7 +1710,6 @@ bool Paragraph::isChangeEdited(pos_type start, pos_type end) const void Paragraph::setChange(lyx::pos_type pos, Change::Type type) { pimpl_->setChange(pos, type); - } @@ -1327,14 +1736,14 @@ Paragraph::value_type Paragraph::getChar(pos_type pos) const // This is in the critical path! pos_type const siz = text_.size(); - BOOST_ASSERT(0 <= pos && pos <= siz); + BOOST_ASSERT(0 <= pos); + BOOST_ASSERT(pos <= siz); if (pos == siz) { lyxerr << "getChar() on pos " << pos << " in par id " << id() << " of size " << siz << " is a bit silly !" << endl; BOOST_ASSERT(false); - return '\0'; } return text_[pos]; @@ -1347,19 +1756,8 @@ int Paragraph::id() const } -void Paragraph::id(int i) -{ - pimpl_->id_ = i; -} - - LyXLayout_ptr const & Paragraph::layout() const { -/* - InsetOld * inset = inInset(); - if (inset && inset->lyxCode() == InsetOld::ENVIRONMENT_CODE) - return static_cast(inset)->layout(); -*/ return layout_; } @@ -1376,6 +1774,13 @@ UpdatableInset * Paragraph::inInset() const } +InsetBase::Code Paragraph::ownerCode() const +{ + return pimpl_->inset_owner + ? pimpl_->inset_owner->lyxCode() : InsetBase::NO_CODE; +} + + void Paragraph::clearContents() { text_.clear(); @@ -1406,10 +1811,8 @@ bool Paragraph::isFreeSpacing() const return true; // for now we just need this, later should we need this in some - // other way we can always add a function to InsetOld too. - if (pimpl_->inset_owner && pimpl_->inset_owner->owner()) - return pimpl_->inset_owner->owner()->lyxCode() == InsetOld::ERT_CODE; - return false; + // other way we can always add a function to InsetBase too. + return ownerCode() == InsetBase::ERT_CODE; } @@ -1417,9 +1820,7 @@ bool Paragraph::allowEmpty() const { if (layout()->keepempty) return true; - if (pimpl_->inset_owner && pimpl_->inset_owner->owner()) - return pimpl_->inset_owner->owner()->lyxCode() == InsetOld::ERT_CODE; - return false; + return ownerCode() == InsetBase::ERT_CODE; } @@ -1435,6 +1836,30 @@ RowList::iterator Paragraph::getRow(pos_type pos) } +RowList::const_iterator Paragraph::getRow(pos_type pos) const +{ + RowList::const_iterator rit = rows.end(); + RowList::const_iterator const begin = rows.begin(); + + for (--rit; rit != begin && rit->pos() > pos; --rit) + ; + + return rit; +} + + +size_t Paragraph::row(pos_type pos) const +{ + RowList::const_iterator rit = rows.end(); + RowList::const_iterator const begin = rows.begin(); + + for (--rit; rit != begin && rit->pos() > pos; --rit) + ; + + return rit - begin; +} + + unsigned char Paragraph::transformChar(unsigned char c, pos_type pos) const { if (!Encodings::is_arabic(c))