X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.C;h=75824ab36bd62913c49e5a3cdd1275b9be698210;hb=60322bc9d78704180ddfd2e4bf83ffa65143761c;hp=09d5a7131e0c08007b12dff53005b13679244a5d;hpb=93828a784db35d75041868ca0b87507ea80a1a7c;p=lyx.git diff --git a/src/paragraph.C b/src/paragraph.C index 09d5a7131e..75824ab36b 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -10,10 +10,6 @@ #include -#ifdef __GNUG__ -#pragma implementation -#endif - #include "paragraph.h" #include "paragraph_pimpl.h" #include "lyxrc.h" @@ -23,17 +19,15 @@ #include "buffer.h" #include "bufferparams.h" #include "debug.h" -#include "LaTeXFeatures.h" #include "texrow.h" #include "BufferView.h" #include "encoding.h" #include "ParameterStruct.h" #include "gettext.h" -#include "lyxtextclasslist.h" +#include "changes.h" -#include "insets/insetinclude.h" -#include "insets/insetbib.h" -#include "insets/insettext.h" +#include "insets/insetbibitem.h" +#include "insets/insetoptarg.h" #include "support/filetools.h" #include "support/lstrings.h" @@ -45,6 +39,7 @@ #include #include #include +#include using std::ostream; using std::endl; @@ -52,15 +47,9 @@ using std::fstream; using std::ios; using std::lower_bound; using std::upper_bound; -using std::reverse; using lyx::pos_type; -int tex_code_break_column = 72; // needs non-zero initialization. set later. -// this is a bad idea, but how can Paragraph find its buffer to get -// parameters? (JMarc) - -extern string bibitemWidest(Buffer const *); // this is a minibuffer @@ -79,23 +68,21 @@ extern BufferView * current_view; Paragraph::Paragraph() : pimpl_(new Paragraph::Pimpl(this)) { - for (int i = 0; i < 10; ++i) - setCounter(i, 0); +#ifndef NO_NEXT next_ = 0; previous_ = 0; +#endif enumdepth = 0; itemdepth = 0; - bibkey = 0; // ale970302 params().clear(); } +#ifndef NO_NEXT // This constructor inserts the new paragraph in a list. Paragraph::Paragraph(Paragraph * par) : pimpl_(new Paragraph::Pimpl(this)) { - for (int i = 0; i < 10; ++i) - setCounter(i, 0); enumdepth = 0; itemdepth = 0; @@ -107,41 +94,33 @@ Paragraph::Paragraph(Paragraph * par) previous_->next_ = this; // end - bibkey = 0; // ale970302 params().clear(); } +#endif Paragraph::Paragraph(Paragraph const & lp, bool same_ids) : pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this, same_ids)) { - for (int i = 0; i < 10; ++i) - setCounter(i, 0); enumdepth = 0; itemdepth = 0; +#ifndef NO_NEXT next_ = 0; previous_ = 0; - +#endif // this is because of the dummy layout of the paragraphs that // follow footnotes layout_ = lp.layout(); - // ale970302 - if (lp.bibkey) { - bibkey = static_cast - (lp.bibkey->clone(*current_view->buffer())); - } else { - bibkey = 0; - } - // copy everything behind the break-position to the new paragraph insetlist = lp.insetlist; - for (InsetList::iterator it = insetlist.begin(); - it != insetlist.end(); ++it) - { - it->inset = it->inset->clone(*current_view->buffer(), same_ids); + InsetList::iterator it = insetlist.begin(); + InsetList::iterator end = insetlist.end(); + for (; it != end; ++it) { + it.setInset(it.getInset()->clone(*current_view->buffer(), + same_ids)); // tell the new inset who is the boss now - it->inset->parOwner(this); + it.getInset()->parOwner(this); } } @@ -149,18 +128,12 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids) // the destructor removes the new paragraph from the list Paragraph::~Paragraph() { +#ifndef NO_NEXT if (previous_) previous_->next_ = next_; if (next_) next_->previous_ = previous_; - - for (InsetList::iterator it = insetlist.begin(); - it != insetlist.end(); ++it) { - delete it->inset; - } - - // ale970302 - delete bibkey; +#endif delete pimpl_; // @@ -169,9 +142,9 @@ Paragraph::~Paragraph() } -void Paragraph::writeFile(Buffer const * buf, ostream & os, +void Paragraph::write(Buffer const * buf, ostream & os, BufferParams const & bparams, - depth_type dth) const + depth_type & dth) const { // The beginning or end of a deeper (i.e. nested) area? if (dth != params().depth()) { @@ -189,20 +162,15 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os, } // First write the layout - string lay = layout(); - if (lay.empty()) { - lay = textclasslist[bparams.textclass].defaultLayoutName(); - } - - os << "\n\\layout " << layout() << "\n"; + os << "\n\\layout " << layout()->name() << '\n'; // Maybe some vertical spaces. if (params().spaceTop().kind() != VSpace::NONE) os << "\\added_space_top " - << params().spaceTop().asLyXCommand() << " "; + << params().spaceTop().asLyXCommand() << ' '; if (params().spaceBottom().kind() != VSpace::NONE) os << "\\added_space_bottom " - << params().spaceBottom().asLyXCommand() << " "; + << params().spaceBottom().asLyXCommand() << ' '; // Maybe the paragraph has special spacing params().spacing().writeFile(os, true); @@ -232,6 +200,11 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os, if (params().noindent()) os << "\\noindent "; + // Do we have a manual left indent? + if (!params().leftIndent().zero()) + os << "\\leftindent " << params().leftIndent().asString() + << ' '; + // Alignment? if (params().align() != LYX_ALIGN_LAYOUT) { int h = 0; @@ -241,30 +214,29 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os, case LYX_ALIGN_CENTER: h = 3; break; default: h = 0; break; } - os << "\\align " << string_align[h] << " "; + os << "\\align " << string_align[h] << ' '; } - // bibitem ale970302 - if (bibkey) - bibkey->write(buf, os); - LyXFont font1(LyXFont::ALL_INHERIT, bparams.language); + Change running_change = Change(Change::UNCHANGED); + lyx::time_type const curtime(lyx::current_time()); + int column = 0; for (pos_type i = 0; i < size(); ++i) { if (!i) { - os << "\n"; + os << '\n'; column = 0; } + Change change = pimpl_->lookupChangeFull(i); + Changes::lyxMarkChange(os, column, curtime, running_change, change); + running_change = change; + // Write font changes LyXFont font2 = getFontSettings(bparams, i); if (font2 != font1) { -#ifndef INHERIT_LANGUAGE font2.lyxWriteChanges(font1, os); -#else - font2.lyxWriteChanges(font1, bparams.language, os); -#endif column = 0; font1 = font2; } @@ -305,12 +277,12 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os, os << ".\n"; column = 0; } else - os << "."; + os << '.'; break; default: if ((column > 70 && c == ' ') || column > 79) { - os << "\n"; + os << '\n'; column = 0; } // this check is to amend a bug. LyX sometimes @@ -325,83 +297,20 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os, } } - // now write the next paragraph - if (next_) - next_->writeFile(buf, os, bparams, dth); + // to make reading work properly + if (!size()) { + running_change = pimpl_->lookupChange(0); + Changes::lyxMarkChange(os, column, curtime, + Change(Change::UNCHANGED), running_change); + } + Changes::lyxMarkChange(os, column, curtime, + running_change, Change(Change::UNCHANGED)); } void Paragraph::validate(LaTeXFeatures & features) const { - BufferParams const & bparams = features.bufferParams(); - - // check the params. - if (params().lineTop() || params().lineBottom()) - features.require("lyxline"); - if (!params().spacing().isDefault()) - features.require("setspace"); - - // then the layouts - features.useLayout(layout()); - - // then the fonts - Language const * doc_language = bparams.language; - - Pimpl::FontList::const_iterator fcit = pimpl_->fontlist.begin(); - Pimpl::FontList::const_iterator fend = pimpl_->fontlist.end(); - for (; fcit != fend; ++fcit) { - if (fcit->font().noun() == LyXFont::ON) { - lyxerr[Debug::LATEX] << "font.noun: " - << fcit->font().noun() - << endl; - features.require("noun"); - lyxerr[Debug::LATEX] << "Noun enabled. Font: " - << fcit->font().stateText(0) - << endl; - } - switch (fcit->font().color()) { - case LColor::none: - case LColor::inherit: - case LColor::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 LColor::latex: - case LColor::note: - break; - default: - features.require("color"); - lyxerr[Debug::LATEX] << "Color enabled. Font: " - << fcit->font().stateText(0) - << endl; - } - - Language const * language = fcit->font().language(); - if (language->babel() != doc_language->babel() && - language != ignore_language && -#ifdef INHERIT_LANGUAGE - language != inherit_language && -#endif - language != latex_language) - { - features.useLanguage(language); - lyxerr[Debug::LATEX] << "Found language " - << language->babel() << endl; - } - } - - // then the insets - LyXLayout const & lout = textclasslist[bparams.textclass][layout()]; - - InsetList::const_iterator icit = insetlist.begin(); - InsetList::const_iterator iend = insetlist.end(); - for (; icit != iend; ++icit) { - if (icit->inset) { - icit->inset->validate(features); - if (lout.needprotect && - icit->inset->lyxCode() == Inset::FOOT_CODE) - features.require("NeedLyXFootnoteCode"); - } - } + pimpl_->validate(features, *layout()); } @@ -432,21 +341,8 @@ void Paragraph::cutIntoMinibuffer(BufferParams const & bparams, pos_type pos) minibuffer_inset = 0; if (minibuffer_char == Paragraph::META_INSET) { if (getInset(pos)) { - minibuffer_inset = getInset(pos); - // This is a little hack since I want exactly - // the inset, not just a clone. Otherwise - // the inset would be deleted when calling Erase(pos) - // find the entry - InsetList::iterator it = insetlist.begin(); - InsetList::iterator end = insetlist.end(); - for (; it != end; ++it) { - if (it->pos == pos) - break; - } - - if (it != end && it->pos == pos) - it->inset = 0; // the inset is not in a paragraph anymore + minibuffer_inset = insetlist.release(pos); minibuffer_inset->parOwner(0); } else { minibuffer_inset = 0; @@ -486,6 +382,12 @@ void Paragraph::erase(pos_type pos) } +bool Paragraph::erase(pos_type start, pos_type end) +{ + return pimpl_->erase(start, end); +} + + bool Paragraph::checkInsertChar(LyXFont & font) { if (pimpl_->inset_owner) @@ -502,9 +404,9 @@ void Paragraph::insertChar(pos_type pos, Paragraph::value_type c) void Paragraph::insertChar(pos_type pos, Paragraph::value_type c, - LyXFont const & font) + LyXFont const & font, Change change) { - pimpl_->insertChar(pos, c, font); + pimpl_->insertChar(pos, c, font, change); } @@ -515,9 +417,9 @@ void Paragraph::insertInset(pos_type pos, Inset * inset) } -void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font) +void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font, Change change) { - pimpl_->insertInset(pos, inset, font); + pimpl_->insertInset(pos, inset, font, change); } @@ -535,27 +437,7 @@ Inset * Paragraph::getInset(pos_type pos) { lyx::Assert(pos < size()); - // Find the inset. - InsetList::iterator it = insetlist.begin(); - InsetList::iterator end = insetlist.end(); - for (; it != end; ++it) { - if (it->pos == pos) - break; - } - - if (it != end && it->pos == pos) - return it->inset; - - lyxerr << "ERROR (Paragraph::getInset): " - << "Inset does not exist: " << pos << endl; - //::raise(SIGSTOP); - - // text[pos] = ' '; // WHY!!! does this set the pos to ' '???? - // Did this commenting out introduce a bug? So far I have not - // see any, please enlighten me. (Lgb) - // My guess is that since the inset does not exist, we might - // as well replace it with a space to prevent craches. (Asger) - return 0; + return insetlist.get(pos); } @@ -563,26 +445,7 @@ Inset const * Paragraph::getInset(pos_type pos) const { lyx::Assert(pos < size()); - // Find the inset. - InsetList::const_iterator cit = insetlist.begin(); - InsetList::const_iterator end = insetlist.end(); - for (; cit != end; ++cit) { - if (cit->pos == pos) - break; - } - - if (cit != end && cit->pos == pos) - return cit->inset; - - lyxerr << "ERROR (Paragraph::getInset): " - << "Inset does not exist: " << pos << endl; - //::raise(SIGSTOP); - //text[pos] = ' '; // WHY!!! does this set the pos to ' '???? - // Did this commenting out introduce a bug? So far I have not - // see any, please enlighten me. (Lgb) - // My guess is that since the inset does not exist, we might - // as well replace it with a space to prevent craches. (Asger) - return 0; + return insetlist.get(pos); } @@ -602,14 +465,10 @@ LyXFont const Paragraph::getFontSettings(BufferParams const & bparams, LyXFont retfont; if (cit != end) { retfont = cit->font(); - } else if (pos == size() && size()) { + } else if (pos == size() && !empty()) { retfont = getFontSettings(bparams, pos - 1); } else retfont = LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams)); -#ifdef INHERIT_LANGUAGE - if (retfont.language() == inherit_language) - retfont.setLanguage(bparams.language); -#endif return retfont; } @@ -618,7 +477,7 @@ LyXFont const Paragraph::getFontSettings(BufferParams const & bparams, // Gets uninstantiated font setting at position 0 LyXFont const Paragraph::getFirstFontSettings() const { - if (size() > 0 && !pimpl_->fontlist.empty()) + if (!empty() && !pimpl_->fontlist.empty()) return pimpl_->fontlist[0].font(); return LyXFont(LyXFont::ALL_INHERIT); @@ -637,24 +496,18 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams, { lyx::Assert(pos >= 0); - LyXLayout const & lout = - textclasslist[bparams.textclass][layout()]; - pos_type main_body = 0; - if (lout.labeltype == LABEL_MANUAL) - main_body = beginningOfMainBody(); + LyXLayout_ptr const & lout = layout(); + + pos_type const main_body = beginningOfMainBody(); LyXFont layoutfont; if (pos < main_body) - layoutfont = lout.labelfont; + layoutfont = lout->labelfont; else - layoutfont = lout.font; + layoutfont = lout->font; LyXFont tmpfont = getFontSettings(bparams, pos); -#ifndef INHERIT_LANGUAGE tmpfont.realize(layoutfont); -#else - tmpfont.realize(layoutfont, bparams.language); -#endif return pimpl_->realizeFont(tmpfont, bparams); } @@ -662,10 +515,9 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams, LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const { - LyXLayout const & lout = - textclasslist[bparams.textclass][layout()]; + LyXLayout_ptr const & lout = layout(); - LyXFont tmpfont = lout.labelfont; + LyXFont tmpfont = lout->labelfont; tmpfont.setLanguage(getParLanguage(bparams)); return pimpl_->realizeFont(tmpfont, bparams); @@ -674,10 +526,9 @@ LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams) const { - LyXLayout const & lout = - textclasslist[bparams.textclass][layout()]; + LyXLayout_ptr const & lout = layout(); - LyXFont tmpfont = lout.font; + LyXFont tmpfont = lout->font; tmpfont.setLanguage(getParLanguage(bparams)); return pimpl_->realizeFont(tmpfont, bparams); @@ -796,7 +647,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font) // Merge the singleton block with the next block pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i); if (i > 0 && pimpl_->fontlist[i - 1].font() == font) - pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i-1); + pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i - 1); } else if (i > 0 && pimpl_->fontlist[i - 1].font() == font) { // Merge the singleton block with the previous block pimpl_->fontlist[i - 1].pos(pos); @@ -824,7 +675,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font) } - +#ifndef NO_NEXT void Paragraph::next(Paragraph * p) { next_ = p; @@ -862,78 +713,7 @@ Paragraph const * Paragraph::previous() const { return previous_; } - - -void Paragraph::breakParagraph(BufferParams const & bparams, - pos_type pos, - int flag) -{ - // create a new paragraph - Paragraph * tmp = new Paragraph(this); - tmp->layout(textclasslist[bparams.textclass].defaultLayoutName()); - - // remember to set the inset_owner - tmp->setInsetOwner(inInset()); - - // this is an idea for a more userfriendly layout handling, I will - // see what the users say - - // layout stays the same with latex-environments - if (flag) { - tmp->layout(layout()); - tmp->setLabelWidthString(params().labelWidthString()); - } - - bool isempty = textclasslist[bparams.textclass][layout()].keepempty; - if (!isempty && (size() > pos || !size() || flag == 2)) { - tmp->layout(layout()); - tmp->params().align(params().align()); - tmp->setLabelWidthString(params().labelWidthString()); - - tmp->params().lineBottom(params().lineBottom()); - params().lineBottom(false); - tmp->params().pagebreakBottom(params().pagebreakBottom()); - params().pagebreakBottom(false); - tmp->params().spaceBottom(params().spaceBottom()); - params().spaceBottom(VSpace(VSpace::NONE)); - - tmp->params().depth(params().depth()); - tmp->params().noindent(params().noindent()); - - // copy everything behind the break-position - // to the new paragraph - pos_type pos_end = size() - 1; - pos_type i = pos; - pos_type j = pos; - for (; i <= pos_end; ++i) { - cutIntoMinibuffer(bparams, i); - if (tmp->insertFromMinibuffer(j - pos)) - ++j; - } - for (i = pos_end; i >= pos; --i) { - erase(i); - } - } - - // just an idea of me - if (!isempty && !pos) { - tmp->params().lineTop(params().lineTop()); - tmp->params().pagebreakTop(params().pagebreakTop()); - tmp->params().spaceTop(params().spaceTop()); - tmp->bibkey = bibkey; - - bibkey = 0; - params().clear(); - layout(textclasslist[bparams.textclass].defaultLayoutName()); - - // layout stays the same with latex-environments - if (flag) { - layout(tmp->layout()); - setLabelWidthString(tmp->params().labelWidthString()); - params().depth(tmp->params().depth()); - } - } -} +#endif void Paragraph::makeSameLayout(Paragraph const * par) @@ -944,16 +724,16 @@ void Paragraph::makeSameLayout(Paragraph const * par) } -int Paragraph::stripLeadingSpaces(lyx::textclass_type tclass) +int Paragraph::stripLeadingSpaces() { - if (textclasslist[tclass][layout()].free_spacing || + if (layout()->free_spacing || isFreeSpacing()) { return 0; } int i = 0; - while (size() && (isNewline(0) || isLineSeparator(0))) { - erase(0); + while (!empty() && (isNewline(0) || isLineSeparator(0))) { + pimpl_->eraseIntern(0); ++i; } @@ -969,74 +749,14 @@ bool Paragraph::hasSameLayout(Paragraph const * par) const } -void Paragraph::breakParagraphConservative(BufferParams const & bparams, - pos_type pos) -{ - // create a new paragraph - Paragraph * tmp = new Paragraph(this); - tmp->makeSameLayout(this); - - // When can pos > Last()? - // I guess pos == Last() is possible. - if (size() > pos) { - // copy everything behind the break-position to the new - // paragraph - pos_type pos_end = size() - 1; - - //pos_type i = pos; - //pos_type j = pos; - for (pos_type i = pos, j = pos; i <= pos_end; ++i) { - cutIntoMinibuffer(bparams, i); - if (tmp->insertFromMinibuffer(j - pos)) - ++j; - } - - for (pos_type k = pos_end; k >= pos; --k) { - erase(k); - } - } -} - - -// Be carefull, this does not make any check at all. -// This method has wrong name, it combined this par with the next par. -// In that sense it is the reverse of break paragraph. (Lgb) -void Paragraph::pasteParagraph(BufferParams const & bparams) -{ - // copy the next paragraph to this one - Paragraph * the_next = next(); - - // first the DTP-stuff - params().lineBottom(the_next->params().lineBottom()); - params().spaceBottom(the_next->params().spaceBottom()); - params().pagebreakBottom(the_next->params().pagebreakBottom()); - - pos_type pos_end = the_next->pimpl_->size() - 1; - pos_type pos_insert = size(); - - // ok, now copy the paragraph - for (pos_type i = 0, j = 0; i <= pos_end; ++i) { - the_next->cutIntoMinibuffer(bparams, i); - if (insertFromMinibuffer(pos_insert + j)) - ++j; - } - - // delete the next paragraph - Paragraph * ppar = the_next->previous_; - Paragraph * npar = the_next->next_; - delete the_next; - ppar->next(npar); -} - - -int Paragraph::getEndLabel(BufferParams const & bparams) const +int Paragraph::getEndLabel() const { Paragraph const * par = this; depth_type par_depth = getDepth(); while (par) { - string const & layout = par->layout(); - int const endlabeltype = - textclasslist[bparams.textclass][layout].endlabeltype; + LyXLayout_ptr const & layout = par->layout(); + int const endlabeltype = layout->endlabeltype; + if (endlabeltype != END_LABEL_NO_LABEL) { if (!next_) return endlabeltype; @@ -1064,9 +784,9 @@ Paragraph::depth_type Paragraph::getDepth() const } -Paragraph::depth_type Paragraph::getMaxDepthAfter(Buffer const * buffer) const +Paragraph::depth_type Paragraph::getMaxDepthAfter() const { - bool const isenv = textclasslist[buffer->params.textclass][layout()].isEnvironment(); + bool const isenv = layout()->isEnvironment(); if (isenv) return params().depth() + 1; @@ -1087,12 +807,6 @@ string const & Paragraph::getLabelstring() const } -int Paragraph::getFirstCounter(int i) const -{ - return pimpl_->counter_[i]; -} - - // the next two functions are for the manual labels string const Paragraph::getLabelWidthString() const { @@ -1109,7 +823,7 @@ void Paragraph::setLabelWidthString(string const & s) } -void Paragraph::applyLayout(string const & new_layout) +void Paragraph::applyLayout(LyXLayout_ptr const & new_layout) { layout(new_layout); params().labelWidthString(string()); @@ -1129,12 +843,14 @@ void Paragraph::applyLayout(string const & new_layout) int Paragraph::beginningOfMainBody() const { + if (layout()->labeltype != LABEL_MANUAL) + return 0; + // 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() - && getChar(i) != Paragraph::META_NEWLINE) { + if (i < size() && getChar(i) != Paragraph::META_NEWLINE) { ++i; char previous_char = 0; char temp = 0; @@ -1192,6 +908,7 @@ Paragraph const * Paragraph::depthHook(depth_type depth) const return newpar; } + Paragraph * Paragraph::outerHook() { if (!getDepth()) @@ -1199,6 +916,7 @@ Paragraph * Paragraph::outerHook() return depthHook(depth_type(getDepth() - 1)); } + Paragraph const * Paragraph::outerHook() const { if (!getDepth()) @@ -1207,261 +925,32 @@ Paragraph const * Paragraph::outerHook() const } -Paragraph::inset_iterator -Paragraph::InsetIterator(pos_type pos) -{ - InsetList::iterator it = insetlist.begin(); - InsetList::iterator end = insetlist.end(); - for (; it != end; ++it) { - if (it->pos == pos) - break; - } - - return inset_iterator(it); -} - - // returns -1 if inset not found int Paragraph::getPositionOfInset(Inset const * inset) const { // Find the entry. - InsetList::const_iterator cit = insetlist.begin(); - InsetList::const_iterator end = insetlist.end(); - for (; cit != end; ++cit) { - if (cit->inset == inset) { - return cit->pos; - } - } - if (inset == bibkey) - return 0; - + InsetList::iterator it = insetlist.begin(); + InsetList::iterator end = insetlist.end(); + for (; it != end; ++it) + if (it.getInset() == inset) + return it.getPos(); return -1; } -Paragraph * Paragraph::TeXOnePar(Buffer const * buf, - BufferParams const & bparams, - ostream & os, TexRow & texrow, - bool moving_arg) +InsetBibitem * Paragraph::bibitem() { - lyxerr[Debug::LATEX] << "TeXOnePar... " << this << endl; - Inset const * in = inInset(); - bool further_blank_line = false; - LyXLayout style; - - // well we have to check if we are in an inset with unlimited - // lenght (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! - if ((in == 0) || !in->forceDefaultParagraphs(in)) { - style = textclasslist[bparams.textclass][layout()]; - - if (params().startOfAppendix()) { - os << "\\appendix\n"; - texrow.newline(); - } - - if (!params().spacing().isDefault() - && (!previous() || !previous()->hasSameLayout(this))) { - os << params().spacing().writeEnvirBegin() << "\n"; - texrow.newline(); - } - - if (tex_code_break_column && style.isCommand()) { - os << '\n'; - texrow.newline(); - } - - if (params().pagebreakTop()) { - os << "\\newpage"; - further_blank_line = true; - } - if (params().spaceTop().kind() != VSpace::NONE) { - os << params().spaceTop().asLatexCommand(bparams); - further_blank_line = true; - } - - if (params().lineTop()) { - os << "\\lyxline{\\" << getFont(bparams, 0).latexSize() << '}' - << "\\vspace{-1\\parskip}"; - further_blank_line = true; - } - - if (further_blank_line) { - os << '\n'; - texrow.newline(); - } - } else { - style = textclasslist[bparams.textclass].defaultLayout(); - } - - Language const * language = getParLanguage(bparams); - Language const * doc_language = bparams.language; - Language const * previous_language = previous() - ? previous()->getParLanguage(bparams) : doc_language; - - if (language->babel() != previous_language->babel() - // check if we already put language command in TeXEnvironment() - && !(style.isEnvironment() - && (!previous() || previous()->layout() != layout() || - previous()->params().depth() != params().depth()))) - { - if (!lyxrc.language_command_end.empty() && - previous_language->babel() != doc_language->babel()) - { - os << subst(lyxrc.language_command_end, "$$lang", - previous_language->babel()) - << endl; - texrow.newline(); - } - - if (lyxrc.language_command_end.empty() || - language->babel() != doc_language->babel()) - { - os << subst(lyxrc.language_command_begin, "$$lang", - language->babel()) - << endl; - texrow.newline(); - } - } - - if (bparams.inputenc == "auto" && - language->encoding() != previous_language->encoding()) { - os << "\\inputencoding{" - << language->encoding()->LatexName() - << "}" << endl; - texrow.newline(); - } - - switch (style.latextype) { - case LATEX_COMMAND: - os << '\\' - << style.latexname() - << style.latexparam(); - break; - case LATEX_ITEM_ENVIRONMENT: - if (bibkey) { - bibkey->latex(buf, os, false, false); - } else - os << "\\item "; - break; - case LATEX_LIST_ENVIRONMENT: - os << "\\item "; - break; - default: - break; - } - - bool need_par = simpleTeXOnePar(buf, bparams, os, texrow, moving_arg); - - // Make sure that \\par is done with the font of the last - // character if this has another size as the default. - // This is necessary because LaTeX (and LyX on the screen) - // calculates the space between the baselines according - // to this font. (Matthias) - // - // Is this really needed ? (Dekel) - // We do not need to use to change the font for the last paragraph - // or for a command. - LyXFont const font = - (size() == 0 - ? getLayoutFont(bparams) : getFont(bparams, size() - 1)); - - bool is_command = style.isCommand(); - - if (style.resfont.size() != font.size() && next_ && !is_command) { - if (!need_par) - os << "{"; - os << "\\" << font.latexSize() << " \\par}"; - } else if (need_par) { - os << "\\par}"; - } else if (is_command) - os << "}"; - - switch (style.latextype) { - case LATEX_ITEM_ENVIRONMENT: - case LATEX_LIST_ENVIRONMENT: - if (next_ && (params().depth() < next_->params().depth())) { - os << '\n'; - texrow.newline(); - } - break; - case LATEX_ENVIRONMENT: - // if its the last paragraph of the current environment - // skip it otherwise fall through - if (next_ - && (next_->layout() != layout() - || next_->params().depth() != params().depth())) - break; - // fall through possible - default: - // we don't need it for the last paragraph!!! - if (next_) { - os << '\n'; - texrow.newline(); - } - } - - if ((in == 0) || !in->forceDefaultParagraphs(in)) { - further_blank_line = false; - if (params().lineBottom()) { - os << "\\lyxline{\\" << font.latexSize() << '}'; - further_blank_line = true; - } - - if (params().spaceBottom().kind() != VSpace::NONE) { - os << params().spaceBottom().asLatexCommand(bparams); - further_blank_line = true; - } - - if (params().pagebreakBottom()) { - os << "\\newpage"; - further_blank_line = true; - } - - if (further_blank_line) { - os << '\n'; - texrow.newline(); - } - - if (!params().spacing().isDefault() - && (!next_ || !next_->hasSameLayout(this))) { - os << params().spacing().writeEnvirEnd() << "\n"; - texrow.newline(); - } - } + InsetList::iterator it = insetlist.begin(); + if (it != insetlist.end() && it.getInset()->lyxCode() == Inset::BIBTEX_CODE) + return static_cast(it.getInset()); + return 0; +} - // we don't need it for the last paragraph!!! - if (next_) { - os << '\n'; - texrow.newline(); - } else { - // Since \selectlanguage write the language to the aux file, - // we need to reset the language at the end of footnote or - // float. - - if (language->babel() != doc_language->babel()) { - if (lyxrc.language_command_end.empty()) - os << subst(lyxrc.language_command_begin, - "$$lang", - doc_language->babel()) - << endl; - else - os << subst(lyxrc.language_command_end, - "$$lang", - language->babel()) - << endl; - texrow.newline(); - } - } - lyxerr[Debug::LATEX] << "TeXOnePar...done " << next_ << endl; - return next_; -} // This could go to ParagraphParameters if we want to int Paragraph::startTeXParParams(BufferParams const & bparams, - ostream & os) const + ostream & os, bool moving_arg) const { int column = 0; @@ -1470,6 +959,22 @@ int Paragraph::startTeXParParams(BufferParams const & bparams, column += 10; } + switch (params().align()) { + case LYX_ALIGN_NONE: + case LYX_ALIGN_BLOCK: + case LYX_ALIGN_LAYOUT: + case LYX_ALIGN_SPECIAL: + break; + case LYX_ALIGN_LEFT: + case LYX_ALIGN_RIGHT: + case LYX_ALIGN_CENTER: + if (moving_arg) { + os << "\\protect"; + column = 8; + } + break; + } + switch (params().align()) { case LYX_ALIGN_NONE: case LYX_ALIGN_BLOCK: @@ -1503,12 +1008,29 @@ int Paragraph::startTeXParParams(BufferParams const & bparams, return column; } + // This could go to ParagraphParameters if we want to int Paragraph::endTeXParParams(BufferParams const & bparams, - ostream & os) const + ostream & os, bool moving_arg) const { int column = 0; + switch (params().align()) { + case LYX_ALIGN_NONE: + case LYX_ALIGN_BLOCK: + case LYX_ALIGN_LAYOUT: + case LYX_ALIGN_SPECIAL: + break; + case LYX_ALIGN_LEFT: + case LYX_ALIGN_RIGHT: + case LYX_ALIGN_CENTER: + if (moving_arg) { + os << "\\protect"; + column = 8; + } + break; + } + switch (params().align()) { case LYX_ALIGN_NONE: case LYX_ALIGN_BLOCK: @@ -1552,7 +1074,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, bool return_value = false; - LyXLayout style; + LyXLayout_ptr style; // well we have to check if we are in an inset with unlimited // lenght (all in one row) if that is true then we don't allow @@ -1562,21 +1084,25 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, (inInset() && inInset()->forceDefaultParagraphs(inInset())); if (asdefault) { - style = textclasslist[bparams.textclass].defaultLayout(); + style = bparams.getLyXTextClass().defaultLayout(); } else { - style = textclasslist[bparams.textclass][layout()]; + style = layout(); } LyXFont basefont; // Maybe we have to create a optional argument. pos_type main_body; - if (style.labeltype != LABEL_MANUAL) + + // FIXME: can we actually skip this check and just call + // beginningOfMainBody() ?? + if (style->labeltype != LABEL_MANUAL) { main_body = 0; - else + } else { main_body = beginningOfMainBody(); + } - int column = 0; + unsigned int column = 0; if (main_body > 0) { os << '['; @@ -1586,23 +1112,25 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, basefont = getLayoutFont(bparams); } - moving_arg |= style.needprotect; + moving_arg |= style->needprotect; // Which font is currently active? LyXFont running_font(basefont); // Do we have an open font change? bool open_font = false; + Change::Type running_change = Change::UNCHANGED; + texrow.start(this, 0); // if the paragraph is empty, the loop will not be entered at all - if (!size()) { - if (style.isCommand()) { + if (empty()) { + if (style->isCommand()) { os << '{'; ++column; } if (!asdefault) - column += startTeXParParams(bparams, os); + column += startTeXParParams(bparams, os, moving_arg); } @@ -1620,13 +1148,14 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, os << ']'; ++column; } - if (style.isCommand()) { + if (style->isCommand()) { os << '{'; ++column; } if (!asdefault) - column += startTeXParParams(bparams, os); + column += startTeXParParams(bparams, os, + moving_arg); } value_type c = getChar(i); @@ -1664,7 +1193,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, // Do not print the separation of the optional argument if (i != main_body - 1) { pimpl_->simpleTeXBlanks(os, texrow, i, - column, font, style); + column, font, *style); } } @@ -1679,10 +1208,15 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, open_font = true; } + Change::Type change = pimpl_->lookupChange(i); + + column += Changes::latexMarkChange(os, running_change, change); + running_change = change; + if (c == Paragraph::META_NEWLINE) { // newlines are handled differently here than // the default in SimpleTeXSpecialChars(). - if (!style.newline_allowed) { + if (!style->newline_allowed) { os << '\n'; } else { if (open_font) { @@ -1693,10 +1227,11 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, running_font = basefont; if (font.family() == LyXFont::TYPEWRITER_FAMILY) { - os << "~"; + os << '~'; } if (moving_arg) os << "\\protect "; + os << "\\\\\n"; } texrow.newline(); @@ -1707,10 +1242,14 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, os, texrow, moving_arg, font, running_font, basefont, open_font, - style, i, column, c); + running_change, + *style, i, column, c); } } + column += Changes::latexMarkChange(os, + running_change, Change::UNCHANGED); + // If we have an open font definition, we have to close it if (open_font) { #ifdef FIXED_LANGUAGE_END_DETECTION @@ -1740,7 +1279,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, } if (!asdefault) { - column += endTeXParParams(bparams, os); + column += endTeXParParams(bparams, os, moving_arg); } lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl; @@ -1748,156 +1287,6 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf, } -bool Paragraph::sgmlConvertChar(char c, string & sgml_string) -{ - bool retval = false; - switch (c) { - case Paragraph::META_HFILL: - sgml_string.erase(); - break; - case Paragraph::META_NEWLINE: - sgml_string = '\n'; - break; - case '&': - sgml_string = "&"; - break; - case '<': - sgml_string = "<"; - break; - case '>': - sgml_string = ">"; - break; - case '$': - sgml_string = "$"; - break; - case '#': - sgml_string = "#"; - break; - case '%': - sgml_string = "%"; - break; - case '[': - sgml_string = "["; - break; - case ']': - sgml_string = "]"; - break; - case '{': - sgml_string = "{"; - break; - case '}': - sgml_string = "}"; - break; - case '~': - sgml_string = "˜"; - break; - case '"': - sgml_string = """; - break; - case '\\': - sgml_string = "\"; - break; - case ' ': - retval = true; - sgml_string = ' '; - break; - case '\0': // Ignore :-) - sgml_string.erase(); - break; - default: - sgml_string = c; - break; - } - return retval; -} - - -Paragraph * Paragraph::TeXEnvironment(Buffer const * buf, - BufferParams const & bparams, - ostream & os, TexRow & texrow) -{ - lyxerr[Debug::LATEX] << "TeXEnvironment... " << this << endl; - - LyXLayout const & style = - textclasslist[bparams.textclass][layout()]; - - Language const * language = getParLanguage(bparams); - Language const * doc_language = bparams.language; - Language const * previous_language = previous_ - ? previous_->getParLanguage(bparams) : doc_language; - if (language->babel() != previous_language->babel()) { - - if (!lyxrc.language_command_end.empty() && - previous_language->babel() != doc_language->babel()) { - os << subst(lyxrc.language_command_end, "$$lang", - previous_language->babel()) - << endl; - texrow.newline(); - } - - if (lyxrc.language_command_end.empty() || - language->babel() != doc_language->babel()) { - os << subst(lyxrc.language_command_begin, "$$lang", - language->babel()) - << endl; - texrow.newline(); - } - } - - if (style.isEnvironment()) { - if (style.latextype == LATEX_LIST_ENVIRONMENT) { - os << "\\begin{" << style.latexname() << "}{" - << params().labelWidthString() << "}\n"; - } else if (style.labeltype == LABEL_BIBLIO) { - // ale970405 - os << "\\begin{" << style.latexname() << "}{" - << bibitemWidest(buf) - << "}\n"; - } else if (style.latextype == LATEX_ITEM_ENVIRONMENT) { - os << "\\begin{" << style.latexname() << '}' - << style.latexparam() << '\n'; - } else - os << "\\begin{" << style.latexname() << '}' - << style.latexparam() << '\n'; - texrow.newline(); - } - Paragraph * par = this; - do { - par = par->TeXOnePar(buf, bparams, os, texrow, false); - - if (par && par->params().depth() > params().depth()) { - if (textclasslist[bparams.textclass][par->layout()].isParagraph() - // Thinko! - // How to handle this? (Lgb) - //&& !suffixIs(os, "\n\n") - ) { - // There should be at least one '\n' already - // but we need there to be two for Standard - // paragraphs that are depth-increment'ed to be - // output correctly. However, tables can - // also be paragraphs so don't adjust them. - // ARRae - // Thinkee: - // Will it ever harm to have one '\n' too - // many? i.e. that we sometimes will have - // three in a row. (Lgb) - os << '\n'; - texrow.newline(); - } - par = par->pimpl_->TeXDeeper(buf, bparams, os, texrow); - } - } while (par - && par->layout() == layout() - && par->params().depth() == params().depth()); - - if (style.isEnvironment()) { - os << "\\end{" << style.latexname() << "}\n"; - texrow.newline(); - } - - lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl; - return par; // ale970302 -} bool Paragraph::isHfill(pos_type pos) const @@ -1962,18 +1351,8 @@ bool Paragraph::isWord(pos_type pos) const Language const * Paragraph::getParLanguage(BufferParams const & bparams) const { - if (size() > 0) { -#ifndef INHERIT_LANGUAGE + if (!empty()) { return getFirstFontSettings().language(); -#else - Language const * lang = getFirstFontSettings().language(); -#ifdef WITH_WARNINGS -#warning We should make this somewhat better, any ideas? (Jug) -#endif - if (lang == inherit_language || lang == ignore_language) - lang = bparams.language; - return lang; -#endif } else if (previous_) return previous_->getParLanguage(bparams); else @@ -2012,9 +1391,6 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams) for (; cit != end; ++cit) if (cit->font().language() != ignore_language && cit->font().language() != latex_language && -#ifdef INHERIT_LANGUAGE - cit->font().language() != inherit_language && -#endif cit->font().language() != doc_language) return true; return false; @@ -2023,13 +1399,11 @@ 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) +string const Paragraph::asString(Buffer const * buffer, bool label) const { - BufferParams const & bparams = buffer->params; string s; if (label && !params().labelString().empty()) s += params().labelString() + ' '; - string::size_type const len = s.size(); for (pos_type i = 0; i < size(); ++i) { value_type c = getChar(i); @@ -2039,19 +1413,16 @@ string const Paragraph::asString(Buffer const * buffer, bool label) getInset(i)->lyxCode() == Inset::MATH_CODE) { ostringstream ost; getInset(i)->ascii(buffer, ost); - s += subst(ost.str().c_str(),'\n',' '); + s += subst(STRCONV(ost.str()),'\n',' '); } } - if (isRightToLeftPar(bparams)) - reverse(s.begin() + len,s.end()); - return s; } string const Paragraph::asString(Buffer const * buffer, - pos_type beg, pos_type end, bool label) + pos_type beg, pos_type end, bool label) const { ostringstream ost; @@ -2071,18 +1442,18 @@ string const Paragraph::asString(Buffer const * buffer, } } - return ost.str().c_str(); + return STRCONV(ost.str()); } void Paragraph::setInsetOwner(Inset * i) { pimpl_->inset_owner = i; - InsetList::const_iterator cit = insetlist.begin(); - InsetList::const_iterator end = insetlist.end(); - for (; cit != end; ++cit) { - if (cit->inset) - cit->inset->setOwner(i); + InsetList::iterator it = insetlist.begin(); + InsetList::iterator end = insetlist.end(); + for (; it != end; ++it) { + if (it.getInset()) + it.getInset()->setOwner(i); } } @@ -2090,30 +1461,14 @@ void Paragraph::setInsetOwner(Inset * i) void Paragraph::deleteInsetsLyXText(BufferView * bv) { // then the insets - InsetList::const_iterator cit = insetlist.begin(); - InsetList::const_iterator end = insetlist.end(); - for (; cit != end; ++cit) { - if (cit->inset && cit->inset->isTextInset()) { - static_cast - (cit->inset)->deleteLyXText(bv, true); - } - } + insetlist.deleteInsetsLyXText(bv); } void Paragraph::resizeInsetsLyXText(BufferView * bv) { // then the insets - InsetList::const_iterator cit = insetlist.begin(); - InsetList::const_iterator end = insetlist.end(); - for (; cit != end; ++cit) { - if (cit->inset) { - if (cit->inset->isTextInset()) { - static_cast - (cit->inset)->resizeLyXText(bv, true); - } - } - } + insetlist.resizeInsetsLyXText(bv); } @@ -2123,121 +1478,139 @@ void Paragraph::setContentsFromPar(Paragraph * par) } -lyx::pos_type Paragraph::size() const +void Paragraph::trackChanges(Change::Type type) { - return pimpl_->size(); + pimpl_->trackChanges(type); } -Paragraph::value_type Paragraph::getChar(pos_type pos) const +void Paragraph::untrackChanges() { - return pimpl_->getChar(pos); + pimpl_->untrackChanges(); } -int Paragraph::id() const +void Paragraph::cleanChanges() { - return pimpl_->id_; + pimpl_->cleanChanges(); } -void Paragraph::id(int id_arg) +Change::Type Paragraph::lookupChange(lyx::pos_type pos) const { - pimpl_->id_ = id_arg; + lyx::Assert(!size() || pos < size()); + return pimpl_->lookupChange(pos); } -string const & Paragraph::layout() const +Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const { - return layout_; + lyx::Assert(!size() || pos < size()); + return pimpl_->lookupChangeFull(pos); } -void Paragraph::layout(string const & new_layout) +bool Paragraph::isChanged(pos_type start, pos_type end) const { - lyx::Assert(!new_layout.empty()); + return pimpl_->isChanged(start, end); +} - layout_ = new_layout; + +bool Paragraph::isChangeEdited(pos_type start, pos_type end) const +{ + return pimpl_->isChangeEdited(start, end); } -bool Paragraph::isFirstInSequence() const +void Paragraph::markErased() { - Paragraph const * dhook = depthHook(getDepth()); - return (dhook == this - || dhook->layout() != layout() - || dhook->getDepth() != getDepth()); + pimpl_->markErased(); } -Inset * Paragraph::inInset() const +void Paragraph::acceptChange(pos_type start, pos_type end) { - return pimpl_->inset_owner; + return pimpl_->acceptChange(start, end); } -void Paragraph::clearContents() +void Paragraph::rejectChange(pos_type start, pos_type end) { - pimpl_->clear(); + return pimpl_->rejectChange(start, end); } -void Paragraph::setCounter(int i, int v) +lyx::pos_type Paragraph::size() const { - pimpl_->counter_[i] = v; + return pimpl_->size(); } -int Paragraph::getCounter(int i) const +bool Paragraph::empty() const { - return pimpl_->counter_[i]; + return pimpl_->empty(); } -void Paragraph::incCounter(int i) +Paragraph::value_type Paragraph::getChar(pos_type pos) const { - pimpl_->counter_[i]++; + return pimpl_->getChar(pos); } -void Paragraph::setChar(pos_type pos, value_type c) +int Paragraph::id() const { - pimpl_->setChar(pos, c); + return pimpl_->id_; +} + + +LyXLayout_ptr const & Paragraph::layout() const +{ + return layout_; } -Paragraph::inset_iterator::inset_iterator(Paragraph::InsetList::iterator const & iter) - : it(iter) -{} +void Paragraph::layout(LyXLayout_ptr const & new_layout) +{ + layout_ = new_layout; +} -Paragraph::inset_iterator Paragraph::inset_iterator_begin() +bool Paragraph::isFirstInSequence() const { - return inset_iterator(insetlist.begin()); + Paragraph const * dhook = depthHook(getDepth()); + return (dhook == this + || dhook->layout() != layout() + || dhook->getDepth() != getDepth()); } -Paragraph::inset_iterator Paragraph::inset_iterator_end() +Inset * Paragraph::inInset() const { - return inset_iterator(insetlist.end()); + return pimpl_->inset_owner; } -ParagraphParameters & Paragraph::params() +void Paragraph::clearContents() { - return pimpl_->params; + pimpl_->clear(); } +void Paragraph::setChar(pos_type pos, value_type c) +{ + pimpl_->setChar(pos, c); +} -ParagraphParameters const & Paragraph::params() const + +ParagraphParameters & Paragraph::params() { return pimpl_->params; } -Paragraph * Paragraph::getParFromID(int id) const +ParagraphParameters const & Paragraph::params() const { - return pimpl_->getParFromID(id); + return pimpl_->params; }