X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.C;h=bcc3eb9864240f454ecbe1ed5da11cf3df279b7f;hb=b9288969ec06caa3d7b1e9d4eb7937c1e029b44f;hp=3af82b6910fb2d9198e1263e054b680ccd13961b;hpb=389fa29ba55badfafd7b4b5765182f5963d47f35;p=lyx.git diff --git a/src/paragraph.C b/src/paragraph.C index 3af82b6910..bcc3eb9864 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -11,36 +11,40 @@ #include #ifdef __GNUG__ -#pragma implementation "lyxparagraph.h" +#pragma implementation #endif -#include -#include -#include - -#include "lyxparagraph.h" -#include "support/textutils.h" +#include "paragraph.h" +#include "paragraph_pimpl.h" #include "lyxrc.h" #include "layout.h" #include "language.h" #include "tex-strings.h" #include "buffer.h" #include "bufferparams.h" -#include "support/FileInfo.h" -#include "support/LAssert.h" #include "debug.h" #include "LaTeXFeatures.h" -#include "insets/insetinclude.h" -#include "insets/insetbib.h" -#include "insets/insettext.h" -#include "support/filetools.h" -#include "lyx_gui_misc.h" #include "texrow.h" -#include "support/lyxmanip.h" #include "BufferView.h" #include "encoding.h" #include "ParameterStruct.h" #include "gettext.h" +#include "lyxtextclasslist.h" + +#include "insets/insetinclude.h" +#include "insets/insetbib.h" +#include "insets/insettext.h" + +#include "support/filetools.h" +#include "support/lstrings.h" +#include "support/lyxmanip.h" +#include "support/FileInfo.h" +#include "support/LAssert.h" +#include "support/textutils.h" + +#include +#include +#include using std::ostream; using std::endl; @@ -50,8 +54,10 @@ 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 LyXParagraph find its buffer to get +// this is a bad idea, but how can Paragraph find its buffer to get // parameters? (JMarc) extern string bibitemWidest(Buffer const *); @@ -69,36 +75,27 @@ Inset * minibuffer_inset; extern BufferView * current_view; -// Initialization of the counter for the paragraph id's, -// declared in lyxparagraph.h -unsigned int LyXParagraph::paragraph_id = 0; - -// Initialize static member. -ShareContainer LyXParagraph::FontTable::container; - -LyXParagraph::LyXParagraph() +Paragraph::Paragraph() + : pimpl_(new Paragraph::Pimpl(this)) { - text.reserve(500); // is this number too big? - for (int i = 0; i < 10; ++i) setCounter(i , 0); - enumdepth = 0; - itemdepth = 0; + for (int i = 0; i < 10; ++i) + setCounter(i, 0); next_ = 0; previous_ = 0; - inset_owner = 0; - id_ = paragraph_id++; - bibkey = 0; // ale970302 - Clear(); + enumdepth = 0; + itemdepth = 0; + bibkey = 0; // ale970302 + clear(); } -// This konstruktor inserts the new paragraph in a list. -LyXParagraph::LyXParagraph(LyXParagraph * par) +// This constructor inserts the new paragraph in a list. +Paragraph::Paragraph(Paragraph * par) + : pimpl_(new Paragraph::Pimpl(this)) { - text.reserve(500); - par->fitToSize(); - - for (int i = 0; i < 10; ++i) setCounter(i, 0); + for (int i = 0; i < 10; ++i) + setCounter(i, 0); enumdepth = 0; itemdepth = 0; @@ -109,54 +106,49 @@ LyXParagraph::LyXParagraph(LyXParagraph * par) previous_ = par; previous_->next_ = this; // end - - inset_owner = 0; - id_ = paragraph_id++; - bibkey = 0; // ale970302 - - Clear(); + bibkey = 0; // ale970302 + + clear(); } -LyXParagraph::LyXParagraph(LyXParagraph const & lp) +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); + for (int i = 0; i < 10; ++i) + setCounter(i, 0); enumdepth = 0; itemdepth = 0; - next_ = 0; + next_ = 0; previous_ = 0; - id_ = paragraph_id++; - Clear(); - - MakeSameLayout(&lp); // this is because of the dummy layout of the paragraphs that // follow footnotes - layout = lp.layout; + layout_ = lp.layout(); - inset_owner = lp.inset_owner; - - // ale970302 - if (lp.bibkey) + // ale970302 + if (lp.bibkey) { bibkey = static_cast - (lp.bibkey->Clone(*current_view->buffer())); - else + (lp.bibkey->clone(*current_view->buffer())); + } else { bibkey = 0; + } // copy everything behind the break-position to the new paragraph - - text = lp.text; - fontlist = lp.fontlist; insetlist = lp.insetlist; for (InsetList::iterator it = insetlist.begin(); it != insetlist.end(); ++it) - it->inset = it->inset->Clone(*current_view->buffer()); + { + it->inset = it->inset->clone(*current_view->buffer(), same_ids); + // tell the new inset who is the boss now + it->inset->parOwner(this); + } } // the destructor removes the new paragraph from the list -LyXParagraph::~LyXParagraph() +Paragraph::~Paragraph() { if (previous_) previous_->next_ = next_; @@ -165,30 +157,32 @@ LyXParagraph::~LyXParagraph() for (InsetList::iterator it = insetlist.begin(); it != insetlist.end(); ++it) { - delete (*it).inset; + delete it->inset; } - // ale970302 + // ale970302 delete bibkey; + + delete pimpl_; // - //lyxerr << "LyXParagraph::paragraph_id = " - // << LyXParagraph::paragraph_id << endl; + //lyxerr << "Paragraph::paragraph_id = " + // << Paragraph::paragraph_id << endl; } -void LyXParagraph::writeFile(Buffer const * buf, ostream & os, - BufferParams const & bparams, - char dth) const +void Paragraph::writeFile(Buffer const * buf, ostream & os, + BufferParams const & bparams, + depth_type dth) const { // The beginning or end of a deeper (i.e. nested) area? - if (dth != params.depth()) { - if (params.depth() > dth) { - while (params.depth() > dth) { + if (dth != params().depth()) { + if (params().depth() > dth) { + while (params().depth() > dth) { os << "\n\\begin_deeper "; ++dth; } } else { - while (params.depth() < dth) { + while (params().depth() < dth) { os << "\n\\end_deeper "; --dth; } @@ -196,50 +190,48 @@ void LyXParagraph::writeFile(Buffer const * buf, ostream & os, } // First write the layout - os << "\n\\layout " - << textclasslist.NameOfLayout(bparams.textclass, layout) - << "\n"; + os << "\n\\layout " << layout() << "\n"; // Maybe some vertical spaces. - if (params.spaceTop().kind() != VSpace::NONE) + if (params().spaceTop().kind() != VSpace::NONE) os << "\\added_space_top " - << params.spaceTop().asLyXCommand() << " "; - if (params.spaceBottom().kind() != VSpace::NONE) + << 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); + params().spacing().writeFile(os, true); // The labelwidth string used in lists. - if (!params.labelWidthString().empty()) + if (!params().labelWidthString().empty()) os << "\\labelwidthstring " - << params.labelWidthString() << '\n'; + << params().labelWidthString() << '\n'; // Lines above or below? - if (params.lineTop()) + if (params().lineTop()) os << "\\line_top "; - if (params.lineBottom()) + if (params().lineBottom()) os << "\\line_bottom "; // Pagebreaks above or below? - if (params.pagebreakTop()) + if (params().pagebreakTop()) os << "\\pagebreak_top "; - if (params.pagebreakBottom()) + if (params().pagebreakBottom()) os << "\\pagebreak_bottom "; // Start of appendix? - if (params.startOfAppendix()) + if (params().startOfAppendix()) os << "\\start_of_appendix "; // Noindent? - if (params.noindent()) + if (params().noindent()) os << "\\noindent "; // Alignment? - if (params.align() != LYX_ALIGN_LAYOUT) { + if (params().align() != LYX_ALIGN_LAYOUT) { int h = 0; - switch (params.align()) { + switch (params().align()) { case LYX_ALIGN_LEFT: h = 1; break; case LYX_ALIGN_RIGHT: h = 2; break; case LYX_ALIGN_CENTER: h = 3; break; @@ -250,39 +242,43 @@ void LyXParagraph::writeFile(Buffer const * buf, ostream & os, // bibitem ale970302 if (bibkey) - bibkey->Write(buf, os); + bibkey->write(buf, os); LyXFont font1(LyXFont::ALL_INHERIT, bparams.language); int column = 0; - for (size_type i = 0; i < size(); ++i) { + for (pos_type i = 0; i < size(); ++i) { if (!i) { os << "\n"; column = 0; } // Write font changes - LyXFont font2 = GetFontSettings(bparams, i); + 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; } - value_type const c = GetChar(i); + value_type const c = getChar(i); switch (c) { case META_INSET: { - Inset const * inset = GetInset(i); + Inset const * inset = getInset(i); if (inset) - if (inset->DirectWrite()) { + if (inset->directWrite()) { // international char, let it write // code directly so it's shorter in // the file - inset->Write(buf, os); + inset->write(buf, os); } else { os << "\n\\begin_inset "; - inset->Write(buf, os); + inset->write(buf, os); os << "\n\\end_inset \n\n"; column = 0; } @@ -301,7 +297,7 @@ void LyXParagraph::writeFile(Buffer const * buf, ostream & os, column = 0; break; case '.': - if (i + 1 < size() && GetChar(i + 1) == ' ') { + if (i + 1 < size() && getChar(i + 1) == ' ') { os << ".\n"; column = 0; } else @@ -318,7 +314,7 @@ void LyXParagraph::writeFile(Buffer const * buf, ostream & os, if (c != '\0') os << c; else - lyxerr << "ERROR (LyXParagraph::writeFile):" + lyxerr << "ERROR (Paragraph::writeFile):" " NULL char in structure." << endl; ++column; break; @@ -331,74 +327,89 @@ void LyXParagraph::writeFile(Buffer const * buf, ostream & os, } -void LyXParagraph::validate(LaTeXFeatures & features) const +void Paragraph::validate(LaTeXFeatures & features) const { BufferParams const & bparams = features.bufferParams(); // check the params. - if (params.lineTop() || params.lineBottom()) - features.lyxline = true; - if (!params.spacing().isDefault()) - features.setspace = true; + if (params().lineTop() || params().lineBottom()) + features.require("lyxline"); + if (!params().spacing().isDefault()) + features.require("setspace"); // then the layouts - features.layout[GetLayout()] = true; + features.useLayout(layout()); // then the fonts Language const * doc_language = bparams.language; - for (FontList::const_iterator cit = fontlist.begin(); - cit != fontlist.end(); ++cit) { - if ((*cit).font().noun() == LyXFont::ON) { + for (Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin(); + cit != pimpl_->fontlist.end(); ++cit) { + if (cit->font().noun() == LyXFont::ON) { lyxerr[Debug::LATEX] << "font.noun: " - << (*cit).font().noun() + << cit->font().noun() << endl; - features.noun = true; + features.require("noun"); lyxerr[Debug::LATEX] << "Noun enabled. Font: " - << (*cit).font().stateText(0) + << cit->font().stateText(0) << endl; } - switch ((*cit).font().color()) { + switch (cit->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.color = true; + features.require("color"); lyxerr[Debug::LATEX] << "Color enabled. Font: " - << (*cit).font().stateText(0) + << cit->font().stateText(0) << endl; } - Language const * language = (*cit).font().language(); - if (language->babel() != doc_language->babel()) { - features.UsedLanguages.insert(language); + Language const * language = cit->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()]; + for (InsetList::const_iterator cit = insetlist.begin(); cit != insetlist.end(); ++cit) { - if ((*cit).inset) - (*cit).inset->Validate(features); + if (cit->inset) { + cit->inset->validate(features); + if (lout.needprotect && + cit->inset->lyxCode() == Inset::FOOT_CODE) + features.require("NeedLyXFootnoteCode"); + } } } // First few functions needed for cut and paste and paragraph breaking. -void LyXParagraph::CopyIntoMinibuffer(Buffer const & buffer, - LyXParagraph::size_type pos) const +void Paragraph::copyIntoMinibuffer(Buffer const & buffer, pos_type pos) const { BufferParams bparams = buffer.params; - minibuffer_char = GetChar(pos); - minibuffer_font = GetFontSettings(bparams, pos); + minibuffer_char = getChar(pos); + minibuffer_font = getFontSettings(bparams, pos); minibuffer_inset = 0; - if (minibuffer_char == LyXParagraph::META_INSET) { - if (GetInset(pos)) { - minibuffer_inset = GetInset(pos)->Clone(buffer); + if (minibuffer_char == Paragraph::META_INSET) { + if (getInset(pos)) { + minibuffer_inset = getInset(pos)->clone(buffer); } else { minibuffer_inset = 0; minibuffer_char = ' '; @@ -408,15 +419,14 @@ void LyXParagraph::CopyIntoMinibuffer(Buffer const & buffer, } -void LyXParagraph::CutIntoMinibuffer(BufferParams const & bparams, - LyXParagraph::size_type pos) +void Paragraph::cutIntoMinibuffer(BufferParams const & bparams, pos_type pos) { - minibuffer_char = GetChar(pos); - minibuffer_font = GetFontSettings(bparams, pos); + minibuffer_char = getChar(pos); + minibuffer_font = getFontSettings(bparams, pos); minibuffer_inset = 0; - if (minibuffer_char == LyXParagraph::META_INSET) { - if (GetInset(pos)) { - minibuffer_inset = GetInset(pos); + 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) @@ -425,9 +435,11 @@ void LyXParagraph::CutIntoMinibuffer(BufferParams const & bparams, InsetList::iterator it = lower_bound(insetlist.begin(), insetlist.end(), - search_elem, matchIT()); - if (it != insetlist.end() && (*it).pos == pos) - (*it).inset = 0; + search_elem, Pimpl::matchIT()); + if (it != insetlist.end() && it->pos == pos) + it->inset = 0; + // the inset is not in a paragraph anymore + minibuffer_inset->parOwner(0); } else { minibuffer_inset = 0; minibuffer_char = ' '; @@ -440,15 +452,20 @@ void LyXParagraph::CutIntoMinibuffer(BufferParams const & bparams, } -bool LyXParagraph::InsertFromMinibuffer(LyXParagraph::size_type pos) +bool Paragraph::insertFromMinibuffer(pos_type pos) { - if ((minibuffer_char == LyXParagraph::META_INSET) && - !InsertInsetAllowed(minibuffer_inset)) - return false; - if (minibuffer_char == LyXParagraph::META_INSET) - InsertInset(pos, minibuffer_inset, minibuffer_font); - else - InsertChar(pos, minibuffer_char, minibuffer_font); + if (minibuffer_char == Paragraph::META_INSET) { + if (!insetAllowed(minibuffer_inset->lyxCode())) { + return false; + } + insertInset(pos, minibuffer_inset, minibuffer_font); + } else { + LyXFont f = minibuffer_font; + if (!checkInsertChar(f)) { + return false; + } + insertChar(pos, minibuffer_char, f); + } return true; } @@ -456,154 +473,68 @@ bool LyXParagraph::InsertFromMinibuffer(LyXParagraph::size_type pos) -void LyXParagraph::Clear() +void Paragraph::clear() { - params.clear(); - - layout = 0; + params().clear(); + + layout_.erase(); + bibkey = 0; } -void LyXParagraph::Erase(LyXParagraph::size_type pos) +void Paragraph::erase(pos_type pos) { - lyx::Assert(pos < size()); - // if it is an inset, delete the inset entry - if (text[pos] == LyXParagraph::META_INSET) { - // find the entry - InsetTable search_inset(pos, 0); - InsetList::iterator it = - lower_bound(insetlist.begin(), - insetlist.end(), - search_inset, matchIT()); - if (it != insetlist.end() && (*it).pos == pos) { - delete (*it).inset; - insetlist.erase(it); - } - } - - text.erase(text.begin() + pos); - - // Erase entries in the tables. - FontTable search_font(pos, LyXFont()); - - FontList::iterator it = - lower_bound(fontlist.begin(), - fontlist.end(), - search_font, matchFT()); - if (it != fontlist.end() && (*it).pos() == pos && - (pos == 0 || - (it != fontlist.begin() && (*(it - 1)).pos() == pos - 1))) { - // If it is a multi-character font - // entry, we just make it smaller - // (see update below), otherwise we - // should delete it. - unsigned int const i = it - fontlist.begin(); - fontlist.erase(fontlist.begin() + i); - it = fontlist.begin() + i; - if (i > 0 && i < fontlist.size() && - fontlist[i - 1].font() == fontlist[i].font()) { - fontlist.erase(fontlist.begin() + i - 1); - it = fontlist.begin() + i - 1; - } - } - - // Update all other entries. - FontList::iterator fend = fontlist.end(); - for (; it != fend; ++it) - (*it).pos((*it).pos() - 1); - - // Update the inset table. - InsetTable search_inset(pos, 0); - InsetList::iterator lend = insetlist.end(); - for (InsetList::iterator it = - upper_bound(insetlist.begin(), - lend, - search_inset, matchIT()); - it != lend; ++it) - --(*it).pos; + pimpl_->erase(pos); } -void LyXParagraph::InsertChar(LyXParagraph::size_type pos, - LyXParagraph::value_type c) +bool Paragraph::checkInsertChar(LyXFont & font) { - LyXFont const f(LyXFont::ALL_INHERIT); - InsertChar(pos, c, f); + if (pimpl_->inset_owner) + return pimpl_->inset_owner->checkInsertChar(font); + return true; } -void LyXParagraph::InsertChar(LyXParagraph::size_type pos, - LyXParagraph::value_type c, - LyXFont const & font) +void Paragraph::insertChar(pos_type pos, Paragraph::value_type c) { - lyx::Assert(pos <= size()); + LyXFont const f(LyXFont::ALL_INHERIT); + insertChar(pos, c, f); +} - text.insert(text.begin() + pos, c); - - // Update the font table. - FontTable search_font(pos, LyXFont()); - for (FontList::iterator it = lower_bound(fontlist.begin(), - fontlist.end(), - search_font, matchFT()); - it != fontlist.end(); ++it) - (*it).pos((*it).pos() + 1); - - // Update the inset table. - InsetTable search_inset(pos, 0); - for (InsetList::iterator it = lower_bound(insetlist.begin(), - insetlist.end(), - search_inset, matchIT()); - it != insetlist.end(); ++it) - ++(*it).pos; - SetFont(pos, font); +void Paragraph::insertChar(pos_type pos, Paragraph::value_type c, + LyXFont const & font) +{ + pimpl_->insertChar(pos, c, font); } -void LyXParagraph::InsertInset(LyXParagraph::size_type pos, - Inset * inset) +void Paragraph::insertInset(pos_type pos, Inset * inset) { LyXFont const f(LyXFont::ALL_INHERIT); - InsertInset(pos, inset, f); + insertInset(pos, inset, f); } -void LyXParagraph::InsertInset(LyXParagraph::size_type pos, - Inset * inset, LyXFont const & font) +void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font) { - lyx::Assert(inset); - lyx::Assert(pos <= size()); - - InsertChar(pos, META_INSET, font); - lyx::Assert(text[pos] == META_INSET); - - // Add a new entry in the inset table. - InsetTable search_inset(pos, 0); - InsetList::iterator it = lower_bound(insetlist.begin(), - insetlist.end(), - search_inset, matchIT()); - if (it != insetlist.end() && (*it).pos == pos) - lyxerr << "ERROR (LyXParagraph::InsertInset): " - "there is an inset in position: " << pos << endl; - else - insetlist.insert(it, InsetTable(pos, inset)); - if (inset_owner) - inset->setOwner(inset_owner); + pimpl_->insertInset(pos, inset, font); } -bool LyXParagraph::InsertInsetAllowed(Inset * inset) +bool Paragraph::insetAllowed(Inset::Code code) { - //lyxerr << "LyXParagraph::InsertInsetAllowed" << endl; + //lyxerr << "Paragraph::InsertInsetAllowed" << endl; - if (inset_owner) - return inset_owner->InsertInsetAllowed(inset); + if (pimpl_->inset_owner) + return pimpl_->inset_owner->insetAllowed(code); return true; } -Inset * LyXParagraph::GetInset(LyXParagraph::size_type pos) +Inset * Paragraph::getInset(pos_type pos) { lyx::Assert(pos < size()); @@ -611,11 +542,11 @@ Inset * LyXParagraph::GetInset(LyXParagraph::size_type pos) InsetTable search_inset(pos, 0); InsetList::iterator it = lower_bound(insetlist.begin(), insetlist.end(), - search_inset, matchIT()); - if (it != insetlist.end() && (*it).pos == pos) - return (*it).inset; + search_inset, Pimpl::matchIT()); + if (it != insetlist.end() && it->pos == pos) + return it->inset; - lyxerr << "ERROR (LyXParagraph::GetInset): " + lyxerr << "ERROR (Paragraph::getInset): " "Inset does not exist: " << pos << endl; //::raise(SIGSTOP); @@ -628,7 +559,7 @@ Inset * LyXParagraph::GetInset(LyXParagraph::size_type pos) } -Inset const * LyXParagraph::GetInset(LyXParagraph::size_type pos) const +Inset const * Paragraph::getInset(pos_type pos) const { lyx::Assert(pos < size()); @@ -636,11 +567,11 @@ Inset const * LyXParagraph::GetInset(LyXParagraph::size_type pos) const InsetTable search_inset(pos, 0); InsetList::const_iterator cit = lower_bound(insetlist.begin(), insetlist.end(), - search_inset, matchIT()); - if (cit != insetlist.end() && (*cit).pos == pos) - return (*cit).inset; + search_inset, Pimpl::matchIT()); + if (cit != insetlist.end() && cit->pos == pos) + return cit->inset; - lyxerr << "ERROR (LyXParagraph::GetInset): " + lyxerr << "ERROR (Paragraph::GetInset): " "Inset does not exist: " << pos << endl; //::raise(SIGSTOP); //text[pos] = ' '; // WHY!!! does this set the pos to ' '???? @@ -653,32 +584,36 @@ Inset const * LyXParagraph::GetInset(LyXParagraph::size_type pos) const // Gets uninstantiated font setting at position. -LyXFont const LyXParagraph::GetFontSettings(BufferParams const & bparams, - LyXParagraph::size_type pos) const +LyXFont const Paragraph::getFontSettings(BufferParams const & bparams, + pos_type pos) const { lyx::Assert(pos <= size()); - FontTable search_font(pos, LyXFont()); - FontList::const_iterator cit = lower_bound(fontlist.begin(), - fontlist.end(), - search_font, matchFT()); - if (cit != fontlist.end()) - return (*cit).font(); - - if (pos == size() && size()) - return GetFontSettings(bparams, pos - 1); - - return LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams)); + Pimpl::FontTable search_font(pos, LyXFont()); + Pimpl::FontList::const_iterator cit = lower_bound(pimpl_->fontlist.begin(), + pimpl_->fontlist.end(), + search_font, Pimpl::matchFT()); + LyXFont retfont; + if (cit != pimpl_->fontlist.end()) { + retfont = cit->font(); + } else if (pos == size() && size()) { + 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; } // Gets uninstantiated font setting at position 0 -LyXFont const LyXParagraph::GetFirstFontSettings() const +LyXFont const Paragraph::getFirstFontSettings() const { - if (size() > 0) { - if (!fontlist.empty()) - return fontlist[0].font(); - } + if (size() > 0 && !pimpl_->fontlist.empty()) + return pimpl_->fontlist[0].font(); return LyXFont(LyXFont::ALL_INHERIT); } @@ -691,77 +626,85 @@ LyXFont const LyXParagraph::GetFirstFontSettings() const // the true picture of the buffer. (Asger) // If position is -1, we get the layout font of the paragraph. // If position is -2, we get the font of the manual label of the paragraph. -LyXFont const LyXParagraph::getFont(BufferParams const & bparams, - LyXParagraph::size_type pos) const -{ - LyXFont tmpfont; - LyXLayout const & layout = - textclasslist.Style(bparams.textclass, - GetLayout()); - LyXParagraph::size_type main_body = 0; - if (layout.labeltype == LABEL_MANUAL) - main_body = BeginningOfMainBody(); - - if (pos >= 0) { - LyXFont layoutfont; - if (pos < main_body) - layoutfont = layout.labelfont; - else - layoutfont = layout.font; - tmpfont = GetFontSettings(bparams, pos); - tmpfont.realize(layoutfont); - } else { - // process layoutfont for pos == -1 and labelfont for pos < -1 - if (pos == -1) - tmpfont = layout.font; - else - tmpfont = layout.labelfont; - tmpfont.setLanguage(getParLanguage(bparams)); - } +LyXFont const Paragraph::getFont(BufferParams const & bparams, + pos_type pos) const +{ + lyx::Assert(pos >= 0); + + LyXLayout const & lout = + textclasslist[bparams.textclass][layout()]; + pos_type main_body = 0; + if (lout.labeltype == LABEL_MANUAL) + main_body = beginningOfMainBody(); + + LyXFont layoutfont; + if (pos < main_body) + layoutfont = lout.labelfont; + else + 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); +} - // check for environment font information - char par_depth = GetDepth(); - LyXParagraph const * par = this; - while (par && par_depth && !tmpfont.resolved()) { - par = par->DepthHook(par_depth - 1); - if (par) { - tmpfont.realize(textclasslist. - Style(bparams.textclass, - par->GetLayout()).font); - par_depth = par->GetDepth(); - } - } - tmpfont.realize(textclasslist - .TextClass(bparams.textclass) - .defaultfont()); - return tmpfont; +LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const +{ + LyXLayout const & lout = + textclasslist[bparams.textclass][layout()]; + + LyXFont tmpfont = lout.labelfont; + tmpfont.setLanguage(getParLanguage(bparams)); + + return pimpl_->realizeFont(tmpfont, bparams); +} + + +LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams) const +{ + LyXLayout const & lout = + textclasslist[bparams.textclass][layout()]; + + LyXFont tmpfont = lout.font; + tmpfont.setLanguage(getParLanguage(bparams)); + + return pimpl_->realizeFont(tmpfont, bparams); } /// Returns the height of the highest font in range LyXFont::FONT_SIZE -LyXParagraph::HighestFontInRange(LyXParagraph::size_type startpos, - LyXParagraph::size_type endpos) const +Paragraph::highestFontInRange(pos_type startpos, pos_type endpos, + LyXFont::FONT_SIZE const def_size) const { + if (pimpl_->fontlist.empty()) + return def_size; + LyXFont::FONT_SIZE maxsize = LyXFont::SIZE_TINY; - if (fontlist.empty()) - return maxsize; - - FontTable end_search(endpos, LyXFont()); - FontList::const_iterator end_it = lower_bound(fontlist.begin(), - fontlist.end(), - end_search, matchFT()); - if (end_it != fontlist.end()) + Pimpl::FontTable end_search(endpos, LyXFont()); + Pimpl::FontList::const_iterator end_it = + lower_bound(pimpl_->fontlist.begin(), + pimpl_->fontlist.end(), + end_search, Pimpl::matchFT()); + if (end_it != pimpl_->fontlist.end()) ++end_it; - FontTable start_search(startpos, LyXFont()); - for (FontList::const_iterator cit = - lower_bound(fontlist.begin(), - fontlist.end(), - start_search, matchFT()); - cit != end_it; ++cit) { - LyXFont::FONT_SIZE size = (*cit).font().size(); + Pimpl::FontTable start_search(startpos, LyXFont()); + Pimpl::FontList::const_iterator cit = + lower_bound(pimpl_->fontlist.begin(), + pimpl_->fontlist.end(), + start_search, Pimpl::matchFT()); + + for (; cit != end_it; ++cit) { + LyXFont::FONT_SIZE size = cit->font().size(); + if (size == LyXFont::INHERIT_SIZE) + size = def_size; if (size > maxsize && size <= LyXFont::SIZE_HUGER) maxsize = size; } @@ -769,11 +712,10 @@ LyXParagraph::HighestFontInRange(LyXParagraph::size_type startpos, } -LyXParagraph::value_type -LyXParagraph::GetUChar(BufferParams const & bparams, - LyXParagraph::size_type pos) const +Paragraph::value_type +Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const { - value_type c = GetChar(pos); + value_type c = getChar(pos); if (!lyxrc.rtl_support) return c; @@ -804,61 +746,14 @@ LyXParagraph::GetUChar(BufferParams const & bparams, uc = '<'; break; } - if (uc != c && GetFontSettings(bparams, pos).isRightToLeft()) + if (uc != c && getFontSettings(bparams, pos).isRightToLeft()) return uc; else return c; } -// return an string of the current word, and the end of the word in lastpos. -string const LyXParagraph::GetWord(LyXParagraph::size_type & lastpos) const -{ - lyx::Assert(lastpos >= 0); - - // the current word is defined as starting at the first character - // from the immediate left of lastpospos which meets the definition - // of IsLetter(), continuing to the last character to the right - // of this meeting IsLetter. - - string theword; - - // grab a word - - // move back until we have a letter - - //there's no real reason to have firstpos & lastpos as - //separate variables as this is written, but maybe someon - // will want to return firstpos in the future. - - //since someone might have typed a punctuation first - int firstpos = lastpos; - - while ((firstpos >= 0) && !IsLetter(firstpos)) - --firstpos; - - // now find the beginning by looking for a nonletter - - while ((firstpos>= 0) && IsLetter(firstpos)) - --firstpos; - - // the above is now pointing to the preceeding non-letter - ++firstpos; - lastpos = firstpos; - - // so copy characters into theword until we get a nonletter - // note that this can easily exceed lastpos, wich means - // that if used in the middle of a word, the whole word - // is included - - while (IsLetter(lastpos)) theword += GetChar(lastpos++); - - return theword; -} - - -void LyXParagraph::SetFont(LyXParagraph::size_type pos, - LyXFont const & font) +void Paragraph::setFont(pos_type pos, LyXFont const & font) { lyx::Assert(pos <= size()); @@ -869,181 +764,180 @@ void LyXParagraph::SetFont(LyXParagraph::size_type pos, // in a new kernel. (Asger) // Next search font table - FontTable search_font(pos, LyXFont()); - FontList::iterator it = lower_bound(fontlist.begin(), - fontlist.end(), - search_font, matchFT()); - unsigned int i = it - fontlist.begin(); - bool notfound = it == fontlist.end(); + Pimpl::FontTable search_font(pos, LyXFont()); + Pimpl::FontList::iterator it = lower_bound(pimpl_->fontlist.begin(), + pimpl_->fontlist.end(), + search_font, Pimpl::matchFT()); + unsigned int i = it - pimpl_->fontlist.begin(); + bool notfound = it == pimpl_->fontlist.end(); - if (!notfound && fontlist[i].font() == font) + if (!notfound && pimpl_->fontlist[i].font() == font) return; bool begin = pos == 0 || notfound || - (i > 0 && fontlist[i-1].pos() == pos - 1); + (i > 0 && pimpl_->fontlist[i-1].pos() == pos - 1); // Is position pos is a beginning of a font block? - bool end = !notfound && fontlist[i].pos() == pos; + bool end = !notfound && pimpl_->fontlist[i].pos() == pos; // Is position pos is the end of a font block? if (begin && end) { // A single char block - if (i + 1 < fontlist.size() && - fontlist[i + 1].font() == font) { + if (i + 1 < pimpl_->fontlist.size() && + pimpl_->fontlist[i + 1].font() == font) { // Merge the singleton block with the next block - fontlist.erase(fontlist.begin() + i); - if (i > 0 && fontlist[i - 1].font() == font) - fontlist.erase(fontlist.begin() + i-1); - } else if (i > 0 && fontlist[i - 1].font() == font) { + pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i); + if (i > 0 && pimpl_->fontlist[i - 1].font() == font) + 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 - fontlist[i - 1].pos(pos); - fontlist.erase(fontlist.begin() + i); + pimpl_->fontlist[i - 1].pos(pos); + pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i); } else - fontlist[i].font(font); + pimpl_->fontlist[i].font(font); } else if (begin) { - if (i > 0 && fontlist[i - 1].font() == font) - fontlist[i - 1].pos(pos); + if (i > 0 && pimpl_->fontlist[i - 1].font() == font) + pimpl_->fontlist[i - 1].pos(pos); else - fontlist.insert(fontlist.begin() + i, - FontTable(pos, font)); + pimpl_->fontlist.insert(pimpl_->fontlist.begin() + i, + Pimpl::FontTable(pos, font)); } else if (end) { - fontlist[i].pos(pos - 1); - if (!(i + 1 < fontlist.size() && - fontlist[i + 1].font() == font)) - fontlist.insert(fontlist.begin() + i + 1, - FontTable(pos, font)); + pimpl_->fontlist[i].pos(pos - 1); + if (!(i + 1 < pimpl_->fontlist.size() && + pimpl_->fontlist[i + 1].font() == font)) + pimpl_->fontlist.insert(pimpl_->fontlist.begin() + i + 1, + Pimpl::FontTable(pos, font)); } else { // The general case. The block is splitted into 3 blocks - fontlist.insert(fontlist.begin() + i, - FontTable(pos - 1, fontlist[i].font())); - fontlist.insert(fontlist.begin() + i + 1, - FontTable(pos, font)); + pimpl_->fontlist.insert(pimpl_->fontlist.begin() + i, + Pimpl::FontTable(pos - 1, pimpl_->fontlist[i].font())); + pimpl_->fontlist.insert(pimpl_->fontlist.begin() + i + 1, + Pimpl::FontTable(pos, font)); } } -void LyXParagraph::next(LyXParagraph * p) +void Paragraph::next(Paragraph * p) { next_ = p; } // This function is able to hide closed footnotes. -LyXParagraph * LyXParagraph::next() +Paragraph * Paragraph::next() { return next_; } -LyXParagraph const * LyXParagraph::next() const +Paragraph const * Paragraph::next() const { return next_; } -void LyXParagraph::previous(LyXParagraph * p) +void Paragraph::previous(Paragraph * p) { previous_ = p; } // This function is able to hide closed footnotes. -LyXParagraph * LyXParagraph::previous() +Paragraph * Paragraph::previous() { return previous_; } // This function is able to hide closed footnotes. -LyXParagraph const * LyXParagraph::previous() const +Paragraph const * Paragraph::previous() const { return previous_; } -void LyXParagraph::BreakParagraph(BufferParams const & bparams, - LyXParagraph::size_type pos, +void Paragraph::breakParagraph(BufferParams const & bparams, + pos_type pos, int flag) { // create a new paragraph - LyXParagraph * tmp = new LyXParagraph(this); + Paragraph * tmp = new Paragraph(this); + tmp->layout(layout()); + // remember to set the inset_owner - tmp->SetInsetOwner(InInset()); + 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->SetOnlyLayout(layout); - tmp->SetLabelWidthString(params.labelWidthString()); + tmp->layout(layout()); + tmp->setLabelWidthString(params().labelWidthString()); } if (size() > pos || !size() || flag == 2) { - tmp->SetOnlyLayout(layout); - tmp->params.align(params.align()); - tmp->SetLabelWidthString(params.labelWidthString()); + 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().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()); + tmp->params().depth(params().depth()); + tmp->params().noindent(params().noindent()); // copy everything behind the break-position // to the new paragraph - size_type pos_end = text.size() - 1; - size_type i = pos; - size_type j = pos; + 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)) + cutIntoMinibuffer(bparams, i); + if (tmp->insertFromMinibuffer(j - pos)) ++j; } - tmp->fitToSize(); - for (i = pos_end; i >= pos; --i) - Erase(i); - - fitToSize(); + for (i = pos_end; i >= pos; --i) { + erase(i); + } } // just an idea of me if (!pos) { - tmp->params.lineTop(params.lineTop()); - tmp->params.pagebreakTop(params.pagebreakTop()); - tmp->params.spaceTop(params.spaceTop()); + tmp->params().lineTop(params().lineTop()); + tmp->params().pagebreakTop(params().pagebreakTop()); + tmp->params().spaceTop(params().spaceTop()); tmp->bibkey = bibkey; - Clear(); + clear(); // layout stays the same with latex-environments if (flag) { - SetOnlyLayout(tmp->layout); - SetLabelWidthString(tmp->params.labelWidthString()); - params.depth(tmp->params.depth()); + layout(tmp->layout()); + setLabelWidthString(tmp->params().labelWidthString()); + params().depth(tmp->params().depth()); } } } -void LyXParagraph::MakeSameLayout(LyXParagraph const * par) +void Paragraph::makeSameLayout(Paragraph const * par) { - layout = par->layout; - params.makeSame(par->params); - - // This can be changed after NEW_INSETS is in effect. (Lgb) - SetLabelWidthString(par->params.labelWidthString()); + layout(par->layout()); + // move to pimpl? + params() = par->params(); } -int LyXParagraph::StripLeadingSpaces(LyXTextClassList::size_type tclass) +int Paragraph::stripLeadingSpaces(lyx::textclass_type tclass) { - if (textclasslist.Style(tclass, GetLayout()).free_spacing) + if (textclasslist[tclass][layout()].free_spacing || + isFreeSpacing()) { return 0; + } int i = 0; - while (size() - && (IsNewline(0) || IsLineSeparator(0))){ - Erase(0); + while (size() && (isNewline(0) || isLineSeparator(0))) { + erase(0); ++i; } @@ -1051,161 +945,162 @@ int LyXParagraph::StripLeadingSpaces(LyXTextClassList::size_type tclass) } -bool LyXParagraph::HasSameLayout(LyXParagraph const * par) const +bool Paragraph::hasSameLayout(Paragraph const * par) const { return - par->layout == layout && - params.sameLayout(par->params); + par->layout() == layout() && + params().sameLayout(par->params()); } -void LyXParagraph::BreakParagraphConservative(BufferParams const & bparams, - LyXParagraph::size_type pos) +void Paragraph::breakParagraphConservative(BufferParams const & bparams, + pos_type pos) { // create a new paragraph - LyXParagraph * tmp = new LyXParagraph(this); - tmp->MakeSameLayout(this); + 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 - size_type pos_end = text.size() - 1; + pos_type pos_end = size() - 1; - size_type i, j; - for (i = j = pos; i <= pos_end; ++i) { - CutIntoMinibuffer(bparams, i); - if (tmp->InsertFromMinibuffer(j - pos)) + //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; } - - tmp->fitToSize(); - for (size_type i = pos_end; i >= pos; --i) - Erase(i); - - fitToSize(); + 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 LyXParagraph::PasteParagraph(BufferParams const & bparams) +void Paragraph::pasteParagraph(BufferParams const & bparams) { // copy the next paragraph to this one - LyXParagraph * the_next = next(); - + 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()); + params().lineBottom(the_next->params().lineBottom()); + params().spaceBottom(the_next->params().spaceBottom()); + params().pagebreakBottom(the_next->params().pagebreakBottom()); - size_type pos_end = the_next->text.size() - 1; - size_type pos_insert = size(); + pos_type pos_end = the_next->pimpl_->size() - 1; + pos_type pos_insert = size(); // ok, now copy the paragraph - size_type i, j; - for (i = j = 0; i <= pos_end; ++i) { - the_next->CutIntoMinibuffer(bparams, i); - if (InsertFromMinibuffer(pos_insert + j)) + 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 - LyXParagraph * ppar = the_next->previous_; - LyXParagraph * npar = the_next->next_; + Paragraph * ppar = the_next->previous_; + Paragraph * npar = the_next->next_; delete the_next; ppar->next(npar); } -int LyXParagraph::GetEndLabel(BufferParams const & bparams) const +int Paragraph::getEndLabel(BufferParams const & bparams) const { - LyXParagraph const * par = this; - int par_depth = GetDepth(); + Paragraph const * par = this; + depth_type par_depth = getDepth(); while (par) { - LyXTextClass::LayoutList::size_type layout = par->GetLayout(); + string const & layout = par->layout(); int const endlabeltype = - textclasslist.Style(bparams.textclass, - layout).endlabeltype; + textclasslist[bparams.textclass][layout].endlabeltype; if (endlabeltype != END_LABEL_NO_LABEL) { if (!next_) return endlabeltype; - int const next_depth = next_->GetDepth(); + depth_type const next_depth = next_->getDepth(); if (par_depth > next_depth || (par_depth == next_depth - && layout != next_->GetLayout())) + && layout != next_->layout())) return endlabeltype; break; } if (par_depth == 0) break; - par = par->DepthHook(par_depth - 1); + par = par->outerHook(); if (par) - par_depth = par->GetDepth(); + par_depth = par->getDepth(); } return END_LABEL_NO_LABEL; } -char LyXParagraph::GetDepth() const +Paragraph::depth_type Paragraph::getDepth() const { - return params.depth(); + return params().depth(); } -char LyXParagraph::GetAlign() const +Paragraph::depth_type Paragraph::getMaxDepthAfter(Buffer const * buffer) const { - return params.align(); -} + bool const isenv = textclasslist[buffer->params.textclass][layout()].isEnvironment(); + if (isenv) + return params().depth() + 1; + else + return params().depth(); -string const & LyXParagraph::GetLabelstring() const +} + +char Paragraph::getAlign() const { - return params.labelString(); + return params().align(); } -int LyXParagraph::GetFirstCounter(int i) const +string const & Paragraph::getLabelstring() const { - return counter_[i]; + return params().labelString(); } -// the next two functions are for the manual labels -string const LyXParagraph::GetLabelWidthString() const +int Paragraph::getFirstCounter(int i) const { - if (!params.labelWidthString().empty()) - return params.labelWidthString(); - else - return _("Senseless with this layout!"); + return pimpl_->counter_[i]; } -void LyXParagraph::SetLabelWidthString(string const & s) +// the next two functions are for the manual labels +string const Paragraph::getLabelWidthString() const { - params.labelWidthString(s); + if (!params().labelWidthString().empty()) + return params().labelWidthString(); + else + return _("Senseless with this layout!"); } -void LyXParagraph::SetOnlyLayout(LyXTextClass::size_type new_layout) +void Paragraph::setLabelWidthString(string const & s) { - layout = new_layout; + params().labelWidthString(s); } -void LyXParagraph::SetLayout(LyXTextClass::size_type new_layout) +void Paragraph::applyLayout(string 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)); + 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)); } @@ -1216,24 +1111,24 @@ void LyXParagraph::SetLayout(LyXTextClass::size_type new_layout) // because there cannot be a newline or a blank <= the beginning of the // main body in TeX. -int LyXParagraph::BeginningOfMainBody() const +int Paragraph::beginningOfMainBody() const { // Unroll the first two cycles of the loop // and remember the previous character to // remove unnecessary GetChar() calls - size_type i = 0; + pos_type i = 0; if (i < size() - && GetChar(i) != LyXParagraph::META_NEWLINE) { + && getChar(i) != Paragraph::META_NEWLINE) { ++i; char previous_char = 0; char temp = 0; if (i < size() - && (previous_char = GetChar(i)) != LyXParagraph::META_NEWLINE) { + && (previous_char = getChar(i)) != Paragraph::META_NEWLINE) { // Yes, this ^ is supposed to be "= " not "==" ++i; while (i < size() && previous_char != ' ' - && (temp = GetChar(i)) != LyXParagraph::META_NEWLINE) { + && (temp = getChar(i)) != Paragraph::META_NEWLINE) { ++i; previous_char = temp; } @@ -1244,19 +1139,17 @@ int LyXParagraph::BeginningOfMainBody() const } -LyXParagraph * LyXParagraph::DepthHook(int deth) +Paragraph * Paragraph::depthHook(depth_type depth) { - LyXParagraph * newpar = this; - if (deth < 0) - return 0; - + Paragraph * newpar = this; + do { newpar = newpar->previous(); - } while (newpar && newpar->GetDepth() > deth); - + } while (newpar && newpar->getDepth() > depth); + if (!newpar) { - if (previous() || GetDepth()) - lyxerr << "ERROR (LyXParagraph::DepthHook): " + if (previous() || getDepth()) + lyxerr << "ERROR (Paragraph::DepthHook): " "no hook." << endl; newpar = this; } @@ -1265,19 +1158,17 @@ LyXParagraph * LyXParagraph::DepthHook(int deth) } -LyXParagraph const * LyXParagraph::DepthHook(int deth) const +Paragraph const * Paragraph::depthHook(depth_type depth) const { - LyXParagraph const * newpar = this; - if (deth < 0) - return 0; - + Paragraph const * newpar = this; + do { newpar = newpar->previous(); - } while (newpar && newpar->GetDepth() > deth); - + } while (newpar && newpar->getDepth() > depth); + if (!newpar) { - if (previous() || GetDepth()) - lyxerr << "ERROR (LyXParagraph::DepthHook): " + if (previous() || getDepth()) + lyxerr << "ERROR (Paragraph::DepthHook): " "no hook." << endl; newpar = this; } @@ -1285,43 +1176,40 @@ LyXParagraph const * LyXParagraph::DepthHook(int deth) const return newpar; } +Paragraph * Paragraph::outerHook() +{ + if (!getDepth()) + return 0; + return depthHook(depth_type(getDepth() - 1)); +} -int LyXParagraph::AutoDeleteInsets() +Paragraph const * Paragraph::outerHook() const { - int count = 0; - InsetList::size_type index = 0; - while (index < insetlist.size()) { - if (insetlist[index].inset && insetlist[index].inset->AutoDelete()) { - Erase(insetlist[index].pos); - // Erase() calls to insetlist.erase(&insetlist[index]) - // so index shouldn't be increased. - ++count; - } else - ++index; - } - return count; + if (!getDepth()) + return 0; + return depthHook(depth_type(getDepth() - 1)); } -LyXParagraph::inset_iterator -LyXParagraph::InsetIterator(LyXParagraph::size_type pos) +Paragraph::inset_iterator +Paragraph::InsetIterator(pos_type pos) { InsetTable search_inset(pos, 0); InsetList::iterator it = lower_bound(insetlist.begin(), insetlist.end(), - search_inset, matchIT()); + search_inset, Pimpl::matchIT()); return inset_iterator(it); } // returns -1 if inset not found -int LyXParagraph::GetPositionOfInset(Inset * inset) const +int Paragraph::getPositionOfInset(Inset const * inset) const { // Find the entry. for (InsetList::const_iterator cit = insetlist.begin(); cit != insetlist.end(); ++cit) { - if ((*cit).inset == inset) { - return (*cit).pos; + if (cit->inset == inset) { + return cit->pos; } } if (inset == bibkey) @@ -1331,64 +1219,90 @@ int LyXParagraph::GetPositionOfInset(Inset * inset) const } -LyXParagraph * LyXParagraph::TeXOnePar(Buffer const * buf, - BufferParams const & bparams, - ostream & os, TexRow & texrow, - bool moving_arg) +Paragraph * Paragraph::TeXOnePar(Buffer const * buf, + BufferParams const & bparams, + ostream & os, TexRow & texrow, + bool moving_arg) { lyxerr[Debug::LATEX] << "TeXOnePar... " << this << endl; - LyXLayout const & style = - textclasslist.Style(bparams.textclass, - layout); - + 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.startOfAppendix()) { - os << "\\appendix\n"; - texrow.newline(); - } - - if (!params.spacing().isDefault() - && (!previous() || !previous()->HasSameLayout(this))) { - os << params.spacing().writeEnvirBegin() << "\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 (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 (params().pagebreakTop()) { + os << "\\newpage"; + further_blank_line = true; + } + if (params().spaceTop().kind() != VSpace::NONE) { + os << params().spaceTop().asLatexCommand(bparams); + further_blank_line = true; + } - if (further_blank_line){ - os << '\n'; - texrow.newline(); + 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() != doc_language->babel() && - language->babel() != previous_language->babel()) { - os << subst(lyxrc.language_command_begin, "$$lang", - language->babel()) - << endl; - texrow.newline(); + 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" && @@ -1398,7 +1312,7 @@ LyXParagraph * LyXParagraph::TeXOnePar(Buffer const * buf, << "}" << endl; texrow.newline(); } - + switch (style.latextype) { case LATEX_COMMAND: os << '\\' @@ -1407,7 +1321,7 @@ LyXParagraph * LyXParagraph::TeXOnePar(Buffer const * buf, break; case LATEX_ITEM_ENVIRONMENT: if (bibkey) { - bibkey->Latex(buf, os, false, false); + bibkey->latex(buf, os, false, false); } else os << "\\item "; break; @@ -1418,7 +1332,7 @@ LyXParagraph * LyXParagraph::TeXOnePar(Buffer const * buf, break; } - bool need_par = SimpleTeXOnePar(buf, bparams, os, texrow, moving_arg); + 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. @@ -1429,10 +1343,12 @@ LyXParagraph * LyXParagraph::TeXOnePar(Buffer const * buf, // Is this really needed ? (Dekel) // We do not need to use to change the font for the last paragraph // or for a command. - LyXFont font = getFont(bparams, size() - 1); + LyXFont const font = + (size() == 0 + ? getLayoutFont(bparams) : getFont(bparams, size() - 1)); - bool is_command = textclasslist.Style(bparams.textclass, - GetLayout()).isCommand(); + bool is_command = style.isCommand(); + if (style.resfont.size() != font.size() && next_ && !is_command) { if (!need_par) os << "{"; @@ -1442,120 +1358,212 @@ LyXParagraph * LyXParagraph::TeXOnePar(Buffer const * buf, } else if (is_command) os << "}"; - if (language->babel() != doc_language->babel() && - (!next_ - || next_->getParLanguage(bparams)->babel() != language->babel())) { - os << endl - << subst(lyxrc.language_command_end, "$$lang", - doc_language->babel()); - } - switch (style.latextype) { case LATEX_ITEM_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT: - if (next_ && (params.depth() < next_->params.depth())) { - os << '\n'; - texrow.newline(); - } + 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())) + && (next_->layout() != layout() + || next_->params().depth() != params().depth())) break; + // fall through possible default: // we don't need it for the last paragraph!!! - // or for tables in floats - // -- effectively creates a \par where there isn't one which - // breaks a \subfigure or \subtable. if (next_) { os << '\n'; texrow.newline(); } } - further_blank_line = false; - if (params.lineBottom()) { - os << "\\lyxline{\\" << getFont(bparams, - size() - 1).latexSize() << '}'; - further_blank_line = true; - } + 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 (params().spaceBottom().kind() != VSpace::NONE) { + os << params().spaceBottom().asLatexCommand(bparams); + further_blank_line = true; + } - if (further_blank_line){ - os << '\n'; - texrow.newline(); - } + if (params().pagebreakBottom()) { + os << "\\newpage"; + further_blank_line = true; + } - if (!params.spacing().isDefault() - && (!next_ || !next_->HasSameLayout(this))) { - os << params.spacing().writeEnvirEnd() << "\n"; - texrow.newline(); + if (further_blank_line) { + os << '\n'; + texrow.newline(); + } + + if (!params().spacing().isDefault() + && (!next_ || !next_->hasSameLayout(this))) { + os << params().spacing().writeEnvirEnd() << "\n"; + texrow.newline(); + } } // 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 +{ + int column = 0; + + if (params().noindent()) { + os << "\\noindent "; + 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: + if (getParLanguage(bparams)->babel() != "hebrew") { + os << "\\begin{flushleft}"; + column += 17; + } else { + os << "\\begin{flushright}"; + column += 18; + } + break; + case LYX_ALIGN_RIGHT: + if (getParLanguage(bparams)->babel() != "hebrew") { + os << "\\begin{flushright}"; + column += 18; + } else { + os << "\\begin{flushleft}"; + column += 17; + } + break; + case LYX_ALIGN_CENTER: + os << "\\begin{center}"; + column += 14; + break; + } + + return column; +} + +// This could go to ParagraphParameters if we want to +int Paragraph::endTeXParParams(BufferParams const & bparams, + ostream & os) 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: + if (getParLanguage(bparams)->babel() != "hebrew") { + os << "\\end{flushleft}"; + column = 15; + } else { + os << "\\end{flushright}"; + column = 16; + } + break; + case LYX_ALIGN_RIGHT: + if (getParLanguage(bparams)->babel() != "hebrew") { + os << "\\end{flushright}"; + column+= 16; + } else { + os << "\\end{flushleft}"; + column = 15; + } + break; + case LYX_ALIGN_CENTER: + os << "\\end{center}"; + column = 12; + break; + } + return column; +} + // This one spits out the text of the paragraph -bool LyXParagraph::SimpleTeXOnePar(Buffer const * buf, - BufferParams const & bparams, - ostream & os, TexRow & texrow, - bool moving_arg) +bool Paragraph::simpleTeXOnePar(Buffer const * buf, + BufferParams const & bparams, + ostream & os, TexRow & texrow, + bool moving_arg) { lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl; bool return_value = false; - LyXLayout const & style = - textclasslist.Style(bparams.textclass, - GetLayout()); + 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! + bool asdefault = + (inInset() && inInset()->forceDefaultParagraphs(inInset())); + + if (asdefault) { + style = textclasslist[bparams.textclass].defaultLayout(); + } else { + style = textclasslist[bparams.textclass][layout()]; + } + LyXFont basefont; // Maybe we have to create a optional argument. - size_type main_body; + pos_type main_body; if (style.labeltype != LABEL_MANUAL) main_body = 0; else - main_body = BeginningOfMainBody(); + main_body = beginningOfMainBody(); + + int column = 0; if (main_body > 0) { os << '['; - basefont = getFont(bparams, -2); // Get label font + ++column; + basefont = getLabelFont(bparams); } else { - basefont = getFont(bparams, -1); // Get layout font - } - - int column = 0; - - if (main_body >= 0 - && !text.size()) { - if (style.isCommand()) { - os << '{'; - ++column; - } else if (params.align() != LYX_ALIGN_LAYOUT) { - os << '{'; - ++column; - return_value = true; - } + basefont = getLayoutFont(bparams); } moving_arg |= style.needprotect; @@ -1567,7 +1575,18 @@ bool LyXParagraph::SimpleTeXOnePar(Buffer const * buf, texrow.start(this, 0); - for (size_type i = 0; i < size(); ++i) { + // if the paragraph is empty, the loop will not be entered at all + if (!size()) { + if (style.isCommand()) { + os << '{'; + ++column; + } + if (!asdefault) + column += startTeXParParams(bparams, os); + + } + + for (pos_type i = 0; i < size(); ++i) { ++column; // First char in paragraph or after label? if (i == main_body) { @@ -1576,7 +1595,7 @@ bool LyXParagraph::SimpleTeXOnePar(Buffer const * buf, column += running_font.latexWriteEndChanges(os, basefont, basefont); open_font = false; } - basefont = getFont(bparams, -1); // Now use the layout font + basefont = getLayoutFont(bparams); running_font = basefont; os << ']'; ++column; @@ -1584,72 +1603,32 @@ bool LyXParagraph::SimpleTeXOnePar(Buffer const * buf, if (style.isCommand()) { os << '{'; ++column; - } else if (params.align() != LYX_ALIGN_LAYOUT && next_) { - // We do not need \par here (Dekel) - // os << "{\\par"; - os << "{"; - ++column; - return_value = true; } - - if (params.noindent()) { - os << "\\noindent "; - 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: - if (moving_arg) - os << "\\protect"; - if (getParLanguage(bparams)->babel() != "hebrew") { - os << "\\raggedright "; - column+= 13; - } else { - os << "\\raggedleft "; - column+= 12; - } - break; - case LYX_ALIGN_RIGHT: - if (moving_arg) - os << "\\protect"; - if (getParLanguage(bparams)->babel() != "hebrew") { - os << "\\raggedleft "; - column+= 12; - } else { - os << "\\raggedright "; - column+= 13; - } - break; - case LYX_ALIGN_CENTER: - if (moving_arg) - os << "\\protect"; - os << "\\centering "; - column+= 11; - break; - } + + if (!asdefault) + column += startTeXParParams(bparams, os); } - - value_type c = GetChar(i); + + value_type c = getChar(i); // Fully instantiated font LyXFont font = getFont(bparams, i); - LyXFont last_font = running_font; + LyXFont const & last_font = running_font; // Spaces at end of font change are simulated to be // outside font change, i.e. we write "\textXX{text} " // rather than "\textXX{text }". (Asger) - if (open_font && c == ' ' && i <= size() - 2 - && !getFont(bparams, i + 1).equalExceptLatex(running_font) - && !getFont(bparams, i + 1).equalExceptLatex(font)) { - font = getFont(bparams, i + 1); + if (open_font && c == ' ' && i <= size() - 2) { + LyXFont const & next_font = getFont(bparams, i + 1); + if (next_font != running_font + && next_font != font) { + font = next_font; + } } + // We end font definition before blanks - if (!font.equalExceptLatex(running_font) && open_font) { + if (font != running_font && open_font) { column += running_font.latexWriteEndChanges(os, basefont, (i == main_body-1) ? basefont : font); @@ -1661,32 +1640,30 @@ bool LyXParagraph::SimpleTeXOnePar(Buffer const * buf, if (c == ' ') { // Do not print the separation of the optional argument if (i != main_body - 1) { - SimpleTeXBlanks(os, texrow, i, - column, font, style); + pimpl_->simpleTeXBlanks(os, texrow, i, + column, font, style); } } // Do we need to change font? - if (!font.equalExceptLatex(running_font) - && i != main_body-1) { + if (font != running_font && i != main_body - 1) { column += font.latexWriteStartChanges(os, basefont, last_font); running_font = font; open_font = true; } - if (c == LyXParagraph::META_NEWLINE) { + if (c == Paragraph::META_NEWLINE) { // newlines are handled differently here than // the default in SimpleTeXSpecialChars(). - if (!style.newline_allowed - || font.latex() == LyXFont::ON) { + if (!style.newline_allowed) { os << '\n'; } else { if (open_font) { column += running_font.latexWriteEndChanges(os, basefont, basefont); open_font = false; } - basefont = getFont(bparams, -1); + basefont = getLayoutFont(bparams); running_font = basefont; if (font.family() == LyXFont::TYPEWRITER_FAMILY) { @@ -1700,24 +1677,34 @@ bool LyXParagraph::SimpleTeXOnePar(Buffer const * buf, texrow.start(this, i + 1); column = 0; } else { - SimpleTeXSpecialChars(buf, bparams, - os, texrow, moving_arg, - font, running_font, basefont, - open_font, style, i, column, c); + pimpl_->simpleTeXSpecialChars(buf, bparams, + os, texrow, moving_arg, + font, running_font, + basefont, open_font, + style, i, column, c); } } // If we have an open font definition, we have to close it if (open_font) { +#ifdef FIXED_LANGUAGE_END_DETECTION if (next_) { running_font .latexWriteEndChanges(os, basefont, - next_->getFont(bparams, - 0)); + next_->getFont(bparams, + 0)); } else { running_font.latexWriteEndChanges(os, basefont, - basefont); + basefont); } +#else +#ifdef WITH_WARNINGS +//#warning For now we ALWAYS have to close the foreign font settings if they are +//#warning there as we start another \selectlanguage with the next paragraph if +//#warning we are in need of this. This should be fixed sometime (Jug) +#endif + running_font.latexWriteEndChanges(os, basefont, basefont); +#endif } // Needed if there is an optional argument but no contents. @@ -1726,19 +1713,23 @@ bool LyXParagraph::SimpleTeXOnePar(Buffer const * buf, return_value = false; } + if (!asdefault) { + column += endTeXParParams(bparams, os); + } + lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl; return return_value; } -bool LyXParagraph::linuxDocConvertChar(char c, string & sgml_string) +bool Paragraph::sgmlConvertChar(char c, string & sgml_string) { bool retval = false; switch (c) { - case LyXParagraph::META_HFILL: + case Paragraph::META_HFILL: sgml_string.erase(); break; - case LyXParagraph::META_NEWLINE: + case Paragraph::META_NEWLINE: sgml_string = '\n'; break; case '&': @@ -1795,348 +1786,42 @@ bool LyXParagraph::linuxDocConvertChar(char c, string & sgml_string) } -void LyXParagraph::SimpleTeXBlanks(ostream & os, TexRow & texrow, - LyXParagraph::size_type const i, - int & column, LyXFont const & font, - LyXLayout const & style) -{ - if (column > tex_code_break_column - && i - && GetChar(i - 1) != ' ' - && (i < size() - 1) - // In LaTeX mode, we don't want to - // break lines since some commands - // do not like this - && ! (font.latex() == LyXFont::ON) - // same in FreeSpacing mode - && !style.free_spacing - // In typewriter mode, we want to avoid - // ! . ? : at the end of a line - && !(font.family() == LyXFont::TYPEWRITER_FAMILY - && (GetChar(i-1) == '.' - || GetChar(i-1) == '?' - || GetChar(i-1) == ':' - || GetChar(i-1) == '!'))) { - if (tex_code_break_column == 0) { - // in batchmode we need LaTeX to still - // see it as a space not as an extra '\n' - os << " %\n"; - } else { - os << '\n'; - } - texrow.newline(); - texrow.start(this, i + 1); - column = 0; - } else if (font.latex() == LyXFont::OFF) { - if (style.free_spacing) { - os << '~'; - } else { - os << ' '; - } - } -} - - -void LyXParagraph::SimpleTeXSpecialChars(Buffer const * buf, - BufferParams const & bparams, - ostream & os, TexRow & texrow, - bool moving_arg, - LyXFont & font, - LyXFont & running_font, - LyXFont & basefont, - bool & open_font, - LyXLayout const & style, - LyXParagraph::size_type & i, - int & column, - LyXParagraph::value_type const c) +Paragraph * Paragraph::TeXEnvironment(Buffer const * buf, + BufferParams const & bparams, + ostream & os, TexRow & texrow) { - // 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 LyXParagraph::META_INSET: { - Inset * inset = GetInset(i); - if (inset) { - bool close = false; - int const len = os.tellp(); - //ostream::pos_type const len = os.tellp(); - if ((inset->LyxCode() == Inset::GRAPHICS_CODE - || inset->LyxCode() == Inset::MATH_CODE - || inset->LyxCode() == Inset::URL_CODE) - && running_font.isRightToLeft()) { - os << "\\L{"; - close = true; - } - - int tmp = inset->Latex(buf, os, moving_arg, - style.free_spacing); - - if (close) - os << "}"; - - if (tmp) { - column = 0; - } else { - column += int(os.tellp()) - len; - } - for (; tmp--;) { - texrow.newline(); - } - } - } - break; - - case LyXParagraph::META_NEWLINE: - if (open_font) { - column += running_font.latexWriteEndChanges(os, - basefont, - basefont); - open_font = false; - } - basefont = getFont(bparams, -1); - running_font = basefont; - break; - - case LyXParagraph::META_HFILL: - os << "\\hfill{}"; - column += 7; - break; + lyxerr[Debug::LATEX] << "TeXEnvironment... " << this << endl; - default: - // And now for the special cases within each mode - // Are we in LaTeX mode? - if (font.latex() == LyXFont::ON) { - // at present we only have one option - // but I'll leave it as a switch statement - // so its simpler to extend. (ARRae) - switch (c) { - default: - // make sure that we will not print - // error generating chars to the tex - // file. This test would not be needed - // if it were done in the buffer - // itself. - if (c != '\0') { - os << c; - } - break; - } - } else { - // Plain mode (i.e. not LaTeX) - switch (c) { - case '\\': - os << "\\textbackslash{}"; - column += 15; - break; - - case '°': case '±': case '²': case '³': - case '×': case '÷': case '¹': case 'ª': - case 'º': case '¬': case 'µ': - if (bparams.inputenc == "latin1" || - (bparams.inputenc == "auto" && - font.language()->encoding()->LatexName() - == "latin1")) { - os << "\\ensuremath{" - << c - << '}'; - column += 13; - } else { - os << c; - } - break; - - case '|': case '<': case '>': - // In T1 encoding, these characters exist - if (lyxrc.fontenc == "T1") { - os << c; - //... but we should avoid ligatures - if ((c == '>' || c == '<') - && i <= size() - 2 - && GetChar(i + 1) == c) { - //os << "\\textcompwordmark{}"; - // Jean-Marc, have a look at - // this. I think this works - // equally well: - os << "\\,{}"; - // Lgb - column += 19; - } - break; - } - // Typewriter font also has them - if (font.family() == LyXFont::TYPEWRITER_FAMILY) { - os << 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; - - case '-': // "--" in Typewriter mode -> "-{}-" - if (i <= size() - 2 - && GetChar(i + 1) == '-' - && font.family() == LyXFont::TYPEWRITER_FAMILY) { - os << "-{}"; - column += 2; - } else { - os << '-'; - } - break; + LyXLayout const & style = + textclasslist[bparams.textclass][layout()]; - case '\"': - os << "\\char`\\\"{}"; - column += 9; - break; + 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()) { - case '£': - if (bparams.inputenc == "default") { - os << "\\pounds{}"; - column += 8; - } else { - os << c; - } - break; - - case '$': case '&': - case '%': case '#': case '{': - case '}': case '_': - os << '\\' << c; - column += 1; - break; - - case '~': - os << "\\textasciitilde{}"; - column += 16; - break; - - case '^': - os << "\\textasciicircum{}"; - column += 17; - break; - - case '*': case '[': case ']': - // avoid being mistaken for optional arguments - os << '{' << c << '}'; - 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; - - default: - /* idea for labels --- begin*/ - // Check for "LyX" - if (c == 'L' - && i <= size() - 3 - && font.family() != LyXFont::TYPEWRITER_FAMILY - && GetChar(i + 1) == 'y' - && GetChar(i + 2) == 'X') { - os << "\\LyX{}"; - i += 2; - column += 5; - } - // Check for "TeX" - else if (c == 'T' - && i <= size() - 3 - && font.family() != LyXFont::TYPEWRITER_FAMILY - && GetChar(i + 1) == 'e' - && GetChar(i + 2) == 'X') { - os << "\\TeX{}"; - i += 2; - column += 5; - } - // Check for "LaTeX2e" - else if (c == 'L' - && i <= size() - 7 - && font.family() != LyXFont::TYPEWRITER_FAMILY - && GetChar(i + 1) == 'a' - && GetChar(i + 2) == 'T' - && GetChar(i + 3) == 'e' - && GetChar(i + 4) == 'X' - && GetChar(i + 5) == '2' - && GetChar(i + 6) == 'e') { - os << "\\LaTeXe{}"; - i += 6; - column += 8; - } - // Check for "LaTeX" - else if (c == 'L' - && i <= size() - 5 - && font.family() != LyXFont::TYPEWRITER_FAMILY - && GetChar(i + 1) == 'a' - && GetChar(i + 2) == 'T' - && GetChar(i + 3) == 'e' - && GetChar(i + 4) == 'X') { - os << "\\LaTeX{}"; - i += 4; - column += 7; - /* idea for labels --- end*/ - } else if (c != '\0') { - os << c; - } - break; - } + 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(); } - } -} - -LyXParagraph * LyXParagraph::TeXDeeper(Buffer const * buf, - BufferParams const & bparams, - ostream & os, TexRow & texrow) -{ - lyxerr[Debug::LATEX] << "TeXDeeper... " << this << endl; - LyXParagraph * par = this; - - while (par && par->params.depth() == params.depth()) { - if (textclasslist.Style(bparams.textclass, - par->layout).isEnvironment()) { - par = par->TeXEnvironment(buf, bparams, - os, texrow); - } else { - par = par->TeXOnePar(buf, bparams, - os, texrow, false); + if (lyxrc.language_command_end.empty() || + language->babel() != doc_language->babel()) { + os << subst(lyxrc.language_command_begin, "$$lang", + language->babel()) + << endl; + texrow.newline(); } } - lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl; - - return par; -} - - -LyXParagraph * LyXParagraph::TeXEnvironment(Buffer const * buf, - BufferParams const & bparams, - ostream & os, TexRow & texrow) -{ - lyxerr[Debug::LATEX] << "TeXEnvironment... " << this << endl; - - LyXLayout const & style = - textclasslist.Style(bparams.textclass, - layout); - if (style.isEnvironment()){ + if (style.isEnvironment()) { if (style.latextype == LATEX_LIST_ENVIRONMENT) { os << "\\begin{" << style.latexname() << "}{" - << params.labelWidthString() << "}\n"; + << params().labelWidthString() << "}\n"; } else if (style.labeltype == LABEL_BIBLIO) { // ale970405 os << "\\begin{" << style.latexname() << "}{" @@ -2150,14 +1835,12 @@ LyXParagraph * LyXParagraph::TeXEnvironment(Buffer const * buf, << style.latexparam() << '\n'; texrow.newline(); } - LyXParagraph * par = this; + Paragraph * par = this; do { - par = par->TeXOnePar(buf, bparams, - os, texrow, false); + par = par->TeXOnePar(buf, bparams, os, texrow, false); - if (par && par->params.depth() > params.depth()) { - if (textclasslist.Style(bparams.textclass, - par->layout).isParagraph() + if (par && par->params().depth() > params().depth()) { + if (textclasslist[bparams.textclass][par->layout()].isParagraph() // Thinko! // How to handle this? (Lgb) //&& !suffixIs(os, "\n\n") @@ -2175,14 +1858,15 @@ LyXParagraph * LyXParagraph::TeXEnvironment(Buffer const * buf, os << '\n'; texrow.newline(); } - par = par->TeXDeeper(buf, bparams, os, texrow); + par = par->pimpl_->TeXDeeper(buf, bparams, os, texrow); } } while (par - && par->layout == layout - && par->params.depth() == params.depth()); + && 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; @@ -2190,102 +1874,117 @@ LyXParagraph * LyXParagraph::TeXEnvironment(Buffer const * buf, } -bool LyXParagraph::IsHfill(size_type pos) const +bool Paragraph::isHfill(pos_type pos) const { - return IsHfillChar(GetChar(pos)); + return IsHfillChar(getChar(pos)); } -bool LyXParagraph::IsInset(size_type pos) const +bool Paragraph::isInset(pos_type pos) const { - return IsInsetChar(GetChar(pos)); + return IsInsetChar(getChar(pos)); } -bool LyXParagraph::IsNewline(size_type pos) const +bool Paragraph::isNewline(pos_type pos) const { - return pos >= 0 && IsNewlineChar(GetChar(pos)); + return pos >= 0 && IsNewlineChar(getChar(pos)); } -bool LyXParagraph::IsSeparator(size_type pos) const +bool Paragraph::isSeparator(pos_type pos) const { - return IsSeparatorChar(GetChar(pos)); + return IsSeparatorChar(getChar(pos)); } -bool LyXParagraph::IsLineSeparator(size_type pos) const +bool Paragraph::isLineSeparator(pos_type pos) const { - return IsLineSeparatorChar(GetChar(pos)); + value_type const c = getChar(pos); + return IsLineSeparatorChar(c) + || (IsInsetChar(c) && getInset(pos)->isLineSeparator()); } -bool LyXParagraph::IsKomma(size_type pos) const +bool Paragraph::isKomma(pos_type pos) const { - return IsKommaChar(GetChar(pos)); + return IsKommaChar(getChar(pos)); } /// Used by the spellchecker -bool LyXParagraph::IsLetter(LyXParagraph::size_type pos) const +bool Paragraph::isLetter(pos_type pos) const { - value_type const c = GetChar(pos); + value_type const c = getChar(pos); if (IsLetterChar(c)) return true; - // '\0' is not a letter, allthough every string contains "" (below) - if (c == '\0') - return false; + if (isInset(pos)) + return getInset(pos)->isLetter(); // We want to pass the ' and escape chars to ispell string const extra = lyxrc.isp_esc_chars + '\''; - char ch[2] = { c, 0 }; - return contains(extra, ch); + return contains(extra, c); } -bool LyXParagraph::IsWord(size_type pos ) const +bool Paragraph::isWord(pos_type pos) const { - return IsWordChar(GetChar(pos)) ; + return IsWordChar(getChar(pos)) ; } Language const * -LyXParagraph::getParLanguage(BufferParams const & bparams) const +Paragraph::getParLanguage(BufferParams const & bparams) const { - if (size() > 0) - return GetFirstFontSettings().language(); - else if (previous_) + if (size() > 0) { +#ifndef INHERIT_LANGUAGE + 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 return bparams.language; } -bool LyXParagraph::isRightToLeftPar(BufferParams const & bparams) const +bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const { return lyxrc.rtl_support && getParLanguage(bparams)->RightToLeft(); } -void LyXParagraph::ChangeLanguage(BufferParams const & bparams, +void Paragraph::changeLanguage(BufferParams const & bparams, Language const * from, Language const * to) { - for (size_type i = 0; i < size(); ++i) { - LyXFont font = GetFontSettings(bparams, i); + for (pos_type i = 0; i < size(); ++i) { + LyXFont font = getFontSettings(bparams, i); if (font.language() == from) { font.setLanguage(to); - SetFont(i, font); + setFont(i, font); } } } -bool LyXParagraph::isMultiLingual(BufferParams const & bparams) +bool Paragraph::isMultiLingual(BufferParams const & bparams) { Language const * doc_language = bparams.language; - for (FontList::const_iterator cit = fontlist.begin(); - cit != fontlist.end(); ++cit) - if ((*cit).font().language() != doc_language) + for (Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin(); + cit != pimpl_->fontlist.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; } @@ -2293,22 +1992,22 @@ bool LyXParagraph::isMultiLingual(BufferParams const & bparams) // Convert the paragraph to a string. // Used for building the table of contents -string const LyXParagraph::String(Buffer const * buffer, bool label) +string const Paragraph::asString(Buffer const * buffer, bool label) { BufferParams const & bparams = buffer->params; string s; - if (label && !params.labelString().empty()) - s += params.labelString() + ' '; + if (label && !params().labelString().empty()) + s += params().labelString() + ' '; string::size_type const len = s.size(); - for (LyXParagraph::size_type i = 0; i < size(); ++i) { - value_type c = GetChar(i); + for (pos_type i = 0; i < size(); ++i) { + value_type c = getChar(i); if (IsPrintable(c)) s += c; else if (c == META_INSET && - GetInset(i)->LyxCode() == Inset::MATH_CODE) { - std::ostringstream ost; - GetInset(i)->Ascii(buffer, ost); + getInset(i)->lyxCode() == Inset::MATH_CODE) { + ostringstream ost; + getInset(i)->ascii(buffer, ost); s += subst(ost.str().c_str(),'\n',' '); } } @@ -2320,21 +2019,24 @@ string const LyXParagraph::String(Buffer const * buffer, bool label) } -string const LyXParagraph::String(Buffer const * buffer, - LyXParagraph::size_type beg, - LyXParagraph::size_type end) +string const Paragraph::asString(Buffer const * buffer, + pos_type beg, pos_type end, bool label) { - std::ostringstream ost; + ostringstream ost; - if (beg == 0 && !params.labelString().empty()) - ost << params.labelString() << ' '; + if (beg == 0 && label && !params().labelString().empty()) + ost << params().labelString() << ' '; - for (LyXParagraph::size_type i = beg; i < end; ++i) { - value_type const c = GetUChar(buffer->params, i); + for (pos_type i = beg; i < end; ++i) { + value_type const c = getUChar(buffer->params, i); if (IsPrintable(c)) ost << c; + else if (c == META_NEWLINE) + ost << '\n'; + else if (c == META_HFILL) + ost << '\t'; else if (c == META_INSET) { - GetInset(i)->Ascii(buffer, ost); + getInset(i)->ascii(buffer, ost); } } @@ -2342,55 +2044,175 @@ string const LyXParagraph::String(Buffer const * buffer, } -void LyXParagraph::SetInsetOwner(Inset * i) +void Paragraph::setInsetOwner(Inset * i) { - inset_owner = i; + pimpl_->inset_owner = i; for (InsetList::const_iterator cit = insetlist.begin(); cit != insetlist.end(); ++cit) { - if ((*cit).inset) - (*cit).inset->setOwner(i); + if (cit->inset) + cit->inset->setOwner(i); } } -void LyXParagraph::deleteInsetsLyXText(BufferView * bv) +void Paragraph::deleteInsetsLyXText(BufferView * bv) { // then the insets for (InsetList::const_iterator cit = insetlist.begin(); cit != insetlist.end(); ++cit) { - if ((*cit).inset) { - if ((*cit).inset->IsTextInset()) { + if (cit->inset) { + if (cit->inset->isTextInset()) { static_cast - ((*cit).inset)->deleteLyXText(bv, true); + (cit->inset)->deleteLyXText(bv, true); } } } } -void LyXParagraph::resizeInsetsLyXText(BufferView * bv) +void Paragraph::resizeInsetsLyXText(BufferView * bv) { // then the insets for (InsetList::const_iterator cit = insetlist.begin(); - cit != insetlist.end(); ++cit) { - if ((*cit).inset) { - if ((*cit).inset->IsTextInset()) { + cit != insetlist.end(); ++cit) + { + if (cit->inset) { + if (cit->inset->isTextInset()) { static_cast - ((*cit).inset)->resizeLyXText(bv, true); + (cit->inset)->resizeLyXText(bv, true); } } } } -void LyXParagraph::fitToSize() +void Paragraph::setContentsFromPar(Paragraph * par) +{ + pimpl_->setContentsFromPar(par); +} + + +lyx::pos_type Paragraph::size() const { - TextContainer tmp(text.begin(), text.end()); - text.swap(tmp); + return pimpl_->size(); } -void LyXParagraph::setContentsFromPar(LyXParagraph * par) +Paragraph::value_type Paragraph::getChar(pos_type pos) const { - text = par->text; + return pimpl_->getChar(pos); +} + + +int Paragraph::id() const +{ + return pimpl_->id_; +} + + +void Paragraph::id(int id_arg) +{ + pimpl_->id_ = id_arg; +} + + +string const & Paragraph::layout() const +{ + return layout_; +} + + +void Paragraph::layout(string const & new_layout) +{ + layout_ = new_layout; +} + + +bool Paragraph::isFirstInSequence() const +{ + Paragraph const * dhook = depthHook(getDepth()); + return (dhook == this + || dhook->layout() != layout() + || dhook->getDepth() != getDepth()); +} + + +Inset * Paragraph::inInset() const +{ + return pimpl_->inset_owner; +} + + +void Paragraph::clearContents() +{ + pimpl_->clear(); +} + + +void Paragraph::setCounter(int i, int v) +{ + pimpl_->counter_[i] = v; +} + + +int Paragraph::getCounter(int i) const +{ + return pimpl_->counter_[i]; +} + + +void Paragraph::incCounter(int i) +{ + pimpl_->counter_[i]++; +} + + +void Paragraph::setChar(pos_type pos, value_type c) +{ + pimpl_->setChar(pos, c); +} + + +Paragraph::inset_iterator::inset_iterator(Paragraph::InsetList::iterator const & iter) + : it(iter) +{} + + +Paragraph::inset_iterator Paragraph::inset_iterator_begin() +{ + return inset_iterator(insetlist.begin()); +} + + +Paragraph::inset_iterator Paragraph::inset_iterator_end() +{ + return inset_iterator(insetlist.end()); +} + + +ParagraphParameters & Paragraph::params() +{ + return pimpl_->params; +} + + +ParagraphParameters const & Paragraph::params() const +{ + return pimpl_->params; +} + + +Paragraph * Paragraph::getParFromID(int id) const +{ + return pimpl_->getParFromID(id); +} + + +bool Paragraph::isFreeSpacing() const +{ + // for now we just need this, later should we need this in some + // other way we can always add a function to Inset::() too. + if (pimpl_->inset_owner && pimpl_->inset_owner->owner()) + return (pimpl_->inset_owner->owner()->lyxCode() == Inset::ERT_CODE); + return false; }