/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
- *
+ *
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#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 "debug.h"
-#include "LaTeXFeatures.h"
-#include "texrow.h"
#include "BufferView.h"
+#include "changes.h"
#include "encoding.h"
-#include "ParameterStruct.h"
+#include "debug.h"
#include "gettext.h"
-#include "lyxtextclasslist.h"
+#include "language.h"
+#include "latexrunparams.h"
+#include "layout.h"
+#include "lyxrc.h"
+#include "paragraph_funcs.h"
+#include "ParameterStruct.h"
+#include "texrow.h"
+
+#include "Lsstream.h"
-#include "insets/insetinclude.h"
-#include "insets/insetbib.h"
-#include "insets/insettext.h"
+#include "insets/insetbibitem.h"
+#include "insets/insetoptarg.h"
+#include "insets/insetenv.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include <algorithm>
#include <fstream>
#include <csignal>
+#include <ctime>
+
+using namespace lyx::support;
using std::ostream;
using std::endl;
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
char minibuffer_char;
LyXFont minibuffer_font;
-Inset * minibuffer_inset;
+InsetOld * minibuffer_inset;
} // namespace anon
-extern BufferView * current_view;
-
-
Paragraph::Paragraph()
: pimpl_(new Paragraph::Pimpl(this))
{
- for (int i = 0; i < 10; ++i)
- setCounter(i, 0);
- next_ = 0;
- previous_ = 0;
enumdepth = 0;
itemdepth = 0;
- bibkey = 0; // ale970302
params().clear();
}
-// This constructor inserts the new paragraph in a list.
-Paragraph::Paragraph(Paragraph * par)
- : pimpl_(new Paragraph::Pimpl(this))
+Paragraph::Paragraph(Paragraph const & lp)
+ : pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this))
{
- for (int i = 0; i < 10; ++i)
- setCounter(i, 0);
enumdepth = 0;
itemdepth = 0;
+ // this is because of the dummy layout of the paragraphs that
+ // follow footnotes
+ layout_ = lp.layout();
- // double linked list begin
- next_ = par->next_;
- if (next_)
- next_->previous_ = this;
- previous_ = par;
- previous_->next_ = this;
- // end
-
- bibkey = 0; // ale970302
- params().clear();
+ // copy everything behind the break-position to the new paragraph
+ insetlist = lp.insetlist;
+ InsetList::iterator it = insetlist.begin();
+ InsetList::iterator end = insetlist.end();
+ for (; it != end; ++it) {
+ // currently we hold Inset*, not InsetBase*
+ it->inset = static_cast<InsetOld*>(it->inset->clone().release());
+ // tell the new inset who is the boss now
+ it->inset->parOwner(this);
+ }
}
-Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
- : pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this, same_ids))
+void Paragraph::operator=(Paragraph const & lp)
{
- for (int i = 0; i < 10; ++i)
- setCounter(i, 0);
- enumdepth = 0;
- itemdepth = 0;
- next_ = 0;
- previous_ = 0;
+ // needed as we will destroy the pimpl_ before copying it
+ if (&lp != this)
+ return;
+ lyxerr << "Paragraph::operator=()\n";
+ delete pimpl_;
+ pimpl_ = new Pimpl(*lp.pimpl_, this);
+ enumdepth = lp.enumdepth;
+ itemdepth = lp.itemdepth;
// this is because of the dummy layout of the paragraphs that
// follow footnotes
layout_ = lp.layout();
- // ale970302
- if (lp.bibkey) {
- bibkey = static_cast<InsetBibKey *>
- (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->inset = static_cast<InsetOld*>(it->inset->clone().release());
// tell the new inset who is the boss now
it->inset->parOwner(this);
}
}
-
// the destructor removes the new paragraph from the list
Paragraph::~Paragraph()
{
- 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;
-
delete pimpl_;
//
//lyxerr << "Paragraph::paragraph_id = "
}
-void Paragraph::writeFile(Buffer const * buf, ostream & os,
- BufferParams const & bparams,
- depth_type dth) const
+void Paragraph::write(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()) {
}
}
}
-
+
// First write the layout
- string lay = layout();
- if (lay.empty()) {
- lay = textclasslist[bparams.textclass].defaultLayoutName();
- }
-
- os << "\n\\layout " << layout() << "\n";
-
- // Maybe some vertical spaces.
- if (params().spaceTop().kind() != VSpace::NONE)
- os << "\\added_space_top "
- << params().spaceTop().asLyXCommand() << " ";
- if (params().spaceBottom().kind() != VSpace::NONE)
- os << "\\added_space_bottom "
- << params().spaceBottom().asLyXCommand() << " ";
-
- // Maybe the paragraph has special spacing
- params().spacing().writeFile(os, true);
-
- // The labelwidth string used in lists.
- if (!params().labelWidthString().empty())
- os << "\\labelwidthstring "
- << params().labelWidthString() << '\n';
-
- // Lines above or below?
- if (params().lineTop())
- os << "\\line_top ";
- if (params().lineBottom())
- os << "\\line_bottom ";
-
- // Pagebreaks above or below?
- if (params().pagebreakTop())
- os << "\\pagebreak_top ";
- if (params().pagebreakBottom())
- os << "\\pagebreak_bottom ";
-
- // Start of appendix?
- if (params().startOfAppendix())
- os << "\\start_of_appendix ";
-
- // Noindent?
- if (params().noindent())
- os << "\\noindent ";
-
- // Alignment?
- if (params().align() != LYX_ALIGN_LAYOUT) {
- int h = 0;
- switch (params().align()) {
- case LYX_ALIGN_LEFT: h = 1; break;
- case LYX_ALIGN_RIGHT: h = 2; break;
- case LYX_ALIGN_CENTER: h = 3; break;
- default: h = 0; break;
- }
- os << "\\align " << string_align[h] << " ";
- }
-
- // bibitem ale970302
- if (bibkey)
- bibkey->write(buf, os);
-
+ os << "\n\\begin_layout " << layout()->name() << '\n';
+
+ params().write(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;
}
-
+
value_type const c = getChar(i);
switch (c) {
case META_INSET:
{
- Inset const * inset = getInset(i);
+ InsetOld const * inset = getInset(i);
if (inset)
if (inset->directWrite()) {
// international char, let it write
}
}
break;
- case META_NEWLINE:
- os << "\n\\newline \n";
- column = 0;
- break;
- case META_HFILL:
- os << "\n\\hfill \n";
- column = 0;
- break;
case '\\':
os << "\n\\backslash \n";
column = 0;
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
break;
}
}
-
- // 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));
+
+ os << "\n\\end_layout\n";
}
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());
}
minibuffer_inset = 0;
if (minibuffer_char == Paragraph::META_INSET) {
if (getInset(pos)) {
- minibuffer_inset = getInset(pos)->clone(buffer);
+ minibuffer_inset = static_cast<InsetOld *>(getInset(pos)->clone().release());
} else {
minibuffer_inset = 0;
minibuffer_char = ' ';
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;
minibuffer_char = ' ';
// This reflects what GetInset() does (ARRae)
}
-
}
-
- // Erase(pos); now the caller is responsible for that.
}
bool Paragraph::insertFromMinibuffer(pos_type pos)
{
if (minibuffer_char == Paragraph::META_INSET) {
- if (!insetAllowed(minibuffer_inset->lyxCode())) {
+ if (!insetAllowed(minibuffer_inset->lyxCode()))
return false;
- }
insertInset(pos, minibuffer_inset, minibuffer_font);
} else {
LyXFont f = minibuffer_font;
- if (!checkInsertChar(f)) {
+ if (!checkInsertChar(f))
return false;
- }
insertChar(pos, minibuffer_char, f);
}
return true;
// end of minibuffer
-void Paragraph::erase(pos_type pos)
+void Paragraph::eraseIntern(lyx::pos_type pos)
{
- pimpl_->erase(pos);
+ pimpl_->eraseIntern(pos);
+}
+
+
+bool Paragraph::erase(pos_type pos)
+{
+ return pimpl_->erase(pos);
+}
+
+
+int Paragraph::erase(pos_type start, pos_type end)
+{
+ return pimpl_->erase(start, end);
}
void Paragraph::insertChar(pos_type pos, Paragraph::value_type c)
{
- LyXFont const f(LyXFont::ALL_INHERIT);
- insertChar(pos, c, f);
+ insertChar(pos, c, LyXFont(LyXFont::ALL_INHERIT));
}
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);
}
-void Paragraph::insertInset(pos_type pos, Inset * inset)
+void Paragraph::insertInset(pos_type pos, InsetOld * inset)
{
- LyXFont const f(LyXFont::ALL_INHERIT);
- insertInset(pos, inset, f);
+ insertInset(pos, inset, LyXFont(LyXFont::ALL_INHERIT));
}
-void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font)
+void Paragraph::insertInset(pos_type pos, InsetOld * inset, LyXFont const & font, Change change)
{
- pimpl_->insertInset(pos, inset, font);
+ pimpl_->insertInset(pos, inset, font, change);
}
-bool Paragraph::insetAllowed(Inset::Code code)
+bool Paragraph::insetAllowed(InsetOld::Code code)
{
//lyxerr << "Paragraph::InsertInsetAllowed" << endl;
-
if (pimpl_->inset_owner)
return pimpl_->inset_owner->insetAllowed(code);
return true;
}
-Inset * Paragraph::getInset(pos_type pos)
+InsetOld * Paragraph::getInset(pos_type pos)
{
- lyx::Assert(pos < size());
+ Assert(pos < size());
+ return insetlist.get(pos);
+}
- // 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;
+InsetOld const * Paragraph::getInset(pos_type pos) const
+{
+ Assert(pos < size());
+ return insetlist.get(pos);
}
-Inset const * Paragraph::getInset(pos_type pos) const
+// Gets uninstantiated font setting at position.
+LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
+ pos_type pos) const
{
- lyx::Assert(pos < size());
+ 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)
+ Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
+ Pimpl::FontList::const_iterator end = pimpl_->fontlist.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;
+ if (cit != end)
+ return cit->font();
+
+ if (pos == size() && !empty())
+ return getFontSettings(bparams, pos - 1);
+
+ return LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
}
-// Gets uninstantiated font setting at position.
-LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
- pos_type pos) const
+lyx::pos_type
+Paragraph::getEndPosOfFontSpan(lyx::pos_type pos) const
{
- lyx::Assert(pos <= size());
+ Assert(pos <= size());
Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
- for (; cit != end; ++cit) {
- if (cit->pos() > pos)
- break;
- }
-
- LyXFont retfont;
- if (cit != 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
+ for (; cit != end; ++cit)
+ if (cit->pos() >= pos)
+ return cit->pos();
- return retfont;
+ // This should not happen, but if so, we take no chances.
+ lyxerr << "Pararaph::getEndPosOfFontSpan: This should not happen!\n";
+ return pos;
}
// 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);
}
// The difference is that this one is used for generating the LaTeX file,
// and thus cosmetic "improvements" are disallowed: This has to deliver
// 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 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 const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
+ LyXFont const & outerfont) const
+{
+ Assert(pos >= 0);
+
+ LyXLayout_ptr const & lout = layout();
+
+ pos_type const body_pos = beginningOfBody();
LyXFont layoutfont;
- if (pos < main_body)
- layoutfont = lout.labelfont;
+ if (pos < body_pos)
+ 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
+ tmpfont.realize(outerfont);
+ tmpfont.realize(bparams.getLyXTextClass().defaultfont());
- return pimpl_->realizeFont(tmpfont, bparams);
+ return tmpfont;
}
-LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const
+LyXFont const Paragraph::getLabelFont(BufferParams const & bparams,
+ LyXFont const & outerfont) const
{
- LyXLayout const & lout =
- textclasslist[bparams.textclass][layout()];
-
- LyXFont tmpfont = lout.labelfont;
+ LyXFont tmpfont = layout()->labelfont;
tmpfont.setLanguage(getParLanguage(bparams));
-
- return pimpl_->realizeFont(tmpfont, bparams);
+ tmpfont.realize(outerfont);
+ tmpfont.realize(bparams.getLyXTextClass().defaultfont());
+ return tmpfont;
}
-LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams) const
+LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams,
+ LyXFont const & outerfont) const
{
- LyXLayout const & lout =
- textclasslist[bparams.textclass][layout()];
-
- LyXFont tmpfont = lout.font;
+ LyXFont tmpfont = layout()->font;
tmpfont.setLanguage(getParLanguage(bparams));
-
- return pimpl_->realizeFont(tmpfont, bparams);
+ tmpfont.realize(outerfont);
+ tmpfont.realize(bparams.getLyXTextClass().defaultfont());
+ return tmpfont;
}
Pimpl::FontList::const_iterator end_it = pimpl_->fontlist.begin();
Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
for (; end_it != end; ++end_it) {
- if (end_it->pos() > endpos)
+ if (end_it->pos() >= endpos)
break;
}
Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
for (; cit != end; ++cit) {
- if (cit->pos() > startpos)
+ if (cit->pos() >= startpos)
break;
}
void Paragraph::setFont(pos_type pos, LyXFont const & font)
{
- lyx::Assert(pos <= size());
+ Assert(pos <= size());
// First, reduce font against layout/label font
// Update: The SetCharFont() routine in text2.C already
Pimpl::FontList::iterator it = beg;
Pimpl::FontList::iterator endit = pimpl_->fontlist.end();
for (; it != endit; ++it) {
- if (it->pos() > pos)
+ if (it->pos() >= pos)
break;
}
unsigned int i = std::distance(beg, it);
// 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);
pimpl_->fontlist.insert(pimpl_->fontlist.begin() + i + 1,
Pimpl::FontTable(pos, font));
} else { // The general case. The block is splitted into 3 blocks
- pimpl_->fontlist.insert(pimpl_->fontlist.begin() + i,
+ 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 Paragraph::next(Paragraph * p)
-{
- next_ = p;
-}
-
-
-// This function is able to hide closed footnotes.
-Paragraph * Paragraph::next()
-{
- return next_;
-}
-
-
-Paragraph const * Paragraph::next() const
-{
- return next_;
-}
-
-
-void Paragraph::previous(Paragraph * p)
-{
- previous_ = p;
-}
-
-
-// This function is able to hide closed footnotes.
-Paragraph * Paragraph::previous()
-{
- return previous_;
-}
-
-
-// This function is able to hide closed footnotes.
-Paragraph const * Paragraph::previous() const
+void Paragraph::makeSameLayout(Paragraph const & par)
{
- 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());
- }
-
- if (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 (!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());
- }
- }
-}
-
-
-void Paragraph::makeSameLayout(Paragraph const * par)
-{
- layout(par->layout());
+ layout(par.layout());
// move to pimpl?
- params() = par->params();
+ params() = par.params();
}
-int Paragraph::stripLeadingSpaces(lyx::textclass_type tclass)
+int Paragraph::stripLeadingSpaces()
{
- if (textclasslist[tclass][layout()].free_spacing ||
- isFreeSpacing()) {
+ if (isFreeSpacing())
return 0;
- }
-
+
int i = 0;
- while (size() && (isNewline(0) || isLineSeparator(0))) {
- erase(0);
+ while (!empty() && (isNewline(0) || isLineSeparator(0))) {
+ pimpl_->eraseIntern(0);
++i;
}
}
-bool Paragraph::hasSameLayout(Paragraph const * par) const
-{
- return
- par->layout() == layout() &&
- params().sameLayout(par->params());
-}
-
-
-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
+bool Paragraph::hasSameLayout(Paragraph const & par) 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;
- if (endlabeltype != END_LABEL_NO_LABEL) {
- if (!next_)
- return endlabeltype;
-
- depth_type const next_depth = next_->getDepth();
- if (par_depth > next_depth ||
- (par_depth == next_depth
- && layout != next_->layout()))
- return endlabeltype;
- break;
- }
- if (par_depth == 0)
- break;
- par = par->outerHook();
- if (par)
- par_depth = par->getDepth();
- }
- return END_LABEL_NO_LABEL;
+ return
+ par.layout() == layout() &&
+ params().sameLayout(par.params());
}
}
-Paragraph::depth_type Paragraph::getMaxDepthAfter(Buffer const * buffer) const
+Paragraph::depth_type Paragraph::getMaxDepthAfter() const
{
- bool const isenv = textclasslist[buffer->params.textclass][layout()].isEnvironment();
-
- if (isenv)
+ if (layout()->isEnvironment())
return params().depth() + 1;
else
return params().depth();
-
}
+
char Paragraph::getAlign() const
{
return params().align();
}
-int Paragraph::getFirstCounter(int i) const
-{
- return pimpl_->counter_[i];
-}
-
-
// the next two functions are for the manual labels
string const Paragraph::getLabelWidthString() const
{
}
-void Paragraph::applyLayout(string const & new_layout)
+void Paragraph::applyLayout(LyXLayout_ptr const & new_layout)
{
layout(new_layout);
params().labelWidthString(string());
}
-// if the layout of a paragraph contains a manual label, the beginning of the
-// main body is the beginning of the second word. This is what the par-
-// function returns. If the layout does not contain a label, the main
-// body always starts with position 0. This differentiation is necessary,
-// because there cannot be a newline or a blank <= the beginning of the
-// main body in TeX.
-
-int Paragraph::beginningOfMainBody() const
+int Paragraph::beginningOfBody() 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() && !isNewline(i)) {
++i;
char previous_char = 0;
- char temp = 0;
- if (i < size()
- && (previous_char = getChar(i)) != Paragraph::META_NEWLINE) {
- // Yes, this ^ is supposed to be "= " not "=="
- ++i;
- while (i < size()
- && previous_char != ' '
- && (temp = getChar(i)) != Paragraph::META_NEWLINE) {
+ char temp = 0;
+ if (i < size()) {
+ previous_char = getChar(i);
+ if (!isNewline(i)) {
++i;
- previous_char = temp;
+ while (i < size() && previous_char != ' ') {
+ temp = getChar(i);
+ if (isNewline(i))
+ break;
+
+ ++i;
+ previous_char = temp;
+ }
}
}
}
}
-Paragraph * Paragraph::depthHook(depth_type depth)
-{
- Paragraph * newpar = this;
-
- do {
- newpar = newpar->previous();
- } while (newpar && newpar->getDepth() > depth);
-
- if (!newpar) {
- if (previous() || getDepth())
- lyxerr << "ERROR (Paragraph::DepthHook): "
- "no hook." << endl;
- newpar = this;
- }
-
- return newpar;
-}
-
-
-Paragraph const * Paragraph::depthHook(depth_type depth) const
-{
- Paragraph const * newpar = this;
-
- do {
- newpar = newpar->previous();
- } while (newpar && newpar->getDepth() > depth);
-
- if (!newpar) {
- if (previous() || getDepth())
- lyxerr << "ERROR (Paragraph::DepthHook): "
- "no hook." << endl;
- newpar = this;
- }
-
- return newpar;
-}
-
-Paragraph * Paragraph::outerHook()
-{
- if (!getDepth())
- return 0;
- return depthHook(depth_type(getDepth() - 1));
-}
-
-Paragraph const * Paragraph::outerHook() const
-{
- if (!getDepth())
- return 0;
- return depthHook(depth_type(getDepth() - 1));
-}
-
-
-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
+int Paragraph::getPositionOfInset(InsetOld const * inset) const
{
// Find the entry.
- InsetList::const_iterator cit = insetlist.begin();
+ InsetList::const_iterator it = insetlist.begin();
InsetList::const_iterator end = insetlist.end();
- for (; cit != end; ++cit) {
- if (cit->inset == inset) {
- return cit->pos;
- }
- }
- if (inset == bibkey)
- return 0;
-
+ for (; it != end; ++it)
+ if (it->inset == inset)
+ return it->pos;
return -1;
}
-Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
- BufferParams const & bparams,
- ostream & os, TexRow & texrow,
- bool moving_arg)
+InsetBibitem * Paragraph::bibitem() const
{
- 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;
- }
+ InsetList::const_iterator it = insetlist.begin();
+ if (it != insetlist.end() && it->inset->lyxCode() == InsetOld::BIBTEX_CODE)
+ return static_cast<InsetBibitem *>(it->inset);
+ return 0;
+}
- 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();
- }
- }
-
- // 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;
-
+
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:
+ 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:
column += 14;
break;
}
-
+
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:
// This one spits out the text of the paragraph
bool Paragraph::simpleTeXOnePar(Buffer const * buf,
- BufferParams const & bparams,
- ostream & os, TexRow & texrow,
- bool moving_arg)
+ BufferParams const & bparams,
+ LyXFont const & outerfont,
+ ostream & os, TexRow & texrow,
+ LatexRunParams const & runparams)
{
lyxerr[Debug::LATEX] << "SimpleTeXOnePar... " << this << endl;
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
// any special options in the paragraph and also we don't allow
(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)
- main_body = 0;
- else
- main_body = beginningOfMainBody();
+ pos_type body_pos;
- int column = 0;
+ // FIXME: can we actually skip this check and just call
+ // beginningOfBody() ??
+ if (style->labeltype != LABEL_MANUAL) {
+ body_pos = 0;
+ } else {
+ body_pos = beginningOfBody();
+ }
- if (main_body > 0) {
+ unsigned int column = 0;
+
+ if (body_pos > 0) {
os << '[';
++column;
- basefont = getLabelFont(bparams);
+ basefont = getLabelFont(bparams, outerfont);
} else {
- basefont = getLayoutFont(bparams);
+ basefont = getLayoutFont(bparams, outerfont);
}
- moving_arg |= style.needprotect;
-
+ bool moving_arg = runparams.moving_arg;
+ moving_arg |= style->needprotect;
+
// Which font is currently active?
LyXFont running_font(basefont);
// Do we have an open font change?
bool open_font = false;
- texrow.start(this, 0);
+ Change::Type running_change = Change::UNCHANGED;
+
+ texrow.start(id(), 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);
}
for (pos_type i = 0; i < size(); ++i) {
++column;
// First char in paragraph or after label?
- if (i == main_body) {
- if (main_body > 0) {
+ if (i == body_pos) {
+ if (body_pos > 0) {
if (open_font) {
column += running_font.latexWriteEndChanges(os, basefont, basefont);
open_font = false;
}
- basefont = getLayoutFont(bparams);
+ basefont = getLayoutFont(bparams, outerfont);
running_font = basefont;
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);
// Fully instantiated font
- LyXFont font = getFont(bparams, i);
+ LyXFont font = getFont(bparams, i, outerfont);
- LyXFont const & 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) {
- LyXFont const & next_font = getFont(bparams, i + 1);
+ LyXFont const & next_font = getFont(bparams, i + 1, outerfont);
if (next_font != running_font
&& next_font != font) {
font = next_font;
}
}
-
+
// We end font definition before blanks
- if (font != running_font && open_font) {
+ if (open_font &&
+ (font != running_font ||
+ font.language() != running_font.language()))
+ {
column += running_font.latexWriteEndChanges(os,
basefont,
- (i == main_body-1) ? basefont : font);
+ (i == body_pos-1) ? basefont : font);
running_font = basefont;
open_font = false;
}
// Blanks are printed before start of fontswitch
if (c == ' ') {
// Do not print the separation of the optional argument
- if (i != main_body - 1) {
+ if (i != body_pos - 1) {
pimpl_->simpleTeXBlanks(os, texrow, i,
- column, font, style);
+ column, font, *style);
}
}
// Do we need to change font?
- if (font != running_font && i != main_body - 1) {
+ if ((font != running_font ||
+ font.language() != running_font.language()) &&
+ i != body_pos - 1)
+ {
column += font.latexWriteStartChanges(os, basefont,
last_font);
running_font = font;
open_font = true;
}
- if (c == Paragraph::META_NEWLINE) {
- // newlines are handled differently here than
- // the default in SimpleTeXSpecialChars().
- if (!style.newline_allowed) {
- os << '\n';
- } else {
- if (open_font) {
- column += running_font.latexWriteEndChanges(os, basefont, basefont);
- open_font = false;
- }
- basefont = getLayoutFont(bparams);
- running_font = basefont;
- if (font.family() ==
- LyXFont::TYPEWRITER_FAMILY) {
- os << "~";
- }
- if (moving_arg)
- os << "\\protect ";
- os << "\\\\\n";
- }
- texrow.newline();
- texrow.start(this, i + 1);
- column = 0;
- } else {
- pimpl_->simpleTeXSpecialChars(buf, bparams,
- os, texrow, moving_arg,
- font, running_font,
- basefont, open_font,
- style, i, column, c);
- }
+ Change::Type change = pimpl_->lookupChange(i);
+
+ column += Changes::latexMarkChange(os, running_change, change);
+ running_change = change;
+
+ LatexRunParams rp = runparams;
+ rp.moving_arg = moving_arg;
+ rp.free_spacing = style->free_spacing;
+ pimpl_->simpleTeXSpecialChars(buf, bparams,
+ os, texrow, runparams,
+ font, running_font,
+ basefont, outerfont, open_font,
+ 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
if (next_) {
running_font
.latexWriteEndChanges(os, basefont,
- next_->getFont(bparams,
- 0));
+ next_->getFont(bparams,
+ 0, outerfont));
} else {
running_font.latexWriteEndChanges(os, basefont,
- basefont);
+ basefont);
}
#else
#ifdef WITH_WARNINGS
}
// Needed if there is an optional argument but no contents.
- if (main_body > 0 && main_body == size()) {
+ if (body_pos > 0 && body_pos == size()) {
os << "]~";
return_value = false;
}
if (!asdefault) {
- column += endTeXParParams(bparams, os);
+ column += endTeXParParams(bparams, os, moving_arg);
}
lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
}
-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
{
- return IsHfillChar(getChar(pos));
+ return IsInsetChar(getChar(pos))
+ && getInset(pos)->lyxCode() == InsetOld::HFILL_CODE;
}
bool Paragraph::isNewline(pos_type pos) const
{
- return pos >= 0 && IsNewlineChar(getChar(pos));
+ return IsInsetChar(getChar(pos))
+ && getInset(pos)->lyxCode() == InsetOld::NEWLINE_CODE;
}
{
value_type const c = getChar(pos);
return IsLineSeparatorChar(c)
- || (IsInsetChar(c) && getInset(pos)->isLineSeparator());
+ || (IsInsetChar(c) && getInset(pos) &&
+ getInset(pos)->isLineSeparator());
}
value_type const c = getChar(pos);
if (IsLetterChar(c))
return true;
- if (isInset(pos))
+ if (isInset(pos))
return getInset(pos)->isLetter();
// We want to pass the ' and escape chars to ispell
string const extra = lyxrc.isp_esc_chars + '\'';
return contains(extra, c);
}
-
-
+
+
bool Paragraph::isWord(pos_type pos) const
{
return IsWordChar(getChar(pos)) ;
Language const *
-Paragraph::getParLanguage(BufferParams const & bparams) 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
- return bparams.language;
+#warning FIXME we should check the prev par as well (Lgb)
+ return bparams.language;
}
bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
{
return lyxrc.rtl_support
- && getParLanguage(bparams)->RightToLeft();
+ && getParLanguage(bparams)->RightToLeft()
+ && !(inInset() && inInset()->owner() &&
+ inInset()->owner()->lyxCode() == InsetOld::ERT_CODE);
}
void Paragraph::changeLanguage(BufferParams const & bparams,
- Language const * from, Language const * to)
+ Language const * from, Language const * to)
{
for (pos_type i = 0; i < size(); ++i) {
LyXFont font = getFontSettings(bparams, i);
Language const * doc_language = bparams.language;
Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
-
+
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;
// 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;
+#if 0
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);
if (IsPrintable(c))
s += c;
else if (c == META_INSET &&
- getInset(i)->lyxCode() == Inset::MATH_CODE) {
+ getInset(i)->lyxCode() == InsetOld::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;
+#else
+ // This should really be done by the caller and not here.
+ string ret(asString(buffer, 0, size(), label));
+ return subst(ret, '\n', ' ');
+#endif
}
-string const Paragraph::asString(Buffer const * buffer,
- pos_type beg, pos_type end, bool label)
+string const Paragraph::asString(Buffer const * buffer,
+ pos_type beg, pos_type end, bool label) const
{
- ostringstream ost;
+ ostringstream os;
if (beg == 0 && label && !params().labelString().empty())
- ost << params().labelString() << ' ';
+ os << params().labelString() << ' ';
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);
- }
+ os << c;
+ else if (c == META_INSET)
+ getInset(i)->ascii(buffer, os);
}
- return ost.str().c_str();
+ return STRCONV(os.str());
}
-void Paragraph::setInsetOwner(Inset * i)
+void Paragraph::setInsetOwner(UpdatableInset * inset)
{
- 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);
- }
+ pimpl_->inset_owner = inset;
+ InsetList::iterator it = insetlist.begin();
+ InsetList::iterator end = insetlist.end();
+ for (; it != end; ++it)
+ if (it->inset)
+ it->inset->setOwner(inset);
}
void Paragraph::deleteInsetsLyXText(BufferView * bv)
{
- // 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<UpdatableInset *>
- (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<UpdatableInset *>
- (cit->inset)->resizeLyXText(bv, true);
- }
- }
- }
+ insetlist.resizeInsetsLyXText(bv);
}
-void Paragraph::setContentsFromPar(Paragraph * par)
+void Paragraph::setContentsFromPar(Paragraph const & par)
{
pimpl_->setContentsFromPar(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;
+ Assert(!size() || pos < size());
+ return pimpl_->lookupChange(pos);
}
-string const & Paragraph::layout() const
+Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const
{
- return layout_;
+ 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());
-
- layout_ = new_layout;
+ return pimpl_->isChanged(start, end);
}
-bool Paragraph::isFirstInSequence() const
+bool Paragraph::isChangeEdited(pos_type start, pos_type end) const
{
- Paragraph const * dhook = depthHook(getDepth());
- return (dhook == this
- || dhook->layout() != layout()
- || dhook->getDepth() != getDepth());
+ return pimpl_->isChangeEdited(start, end);
}
-Inset * Paragraph::inInset() const
+void Paragraph::setChange(lyx::pos_type pos, Change::Type type)
{
- return pimpl_->inset_owner;
+ pimpl_->setChange(pos, type);
+
}
-void Paragraph::clearContents()
+void Paragraph::markErased()
{
- pimpl_->clear();
+ pimpl_->markErased();
+}
+
+
+void Paragraph::acceptChange(pos_type start, pos_type end)
+{
+ return pimpl_->acceptChange(start, end);
}
-void Paragraph::setCounter(int i, int v)
+void Paragraph::rejectChange(pos_type start, pos_type end)
{
- pimpl_->counter_[i] = v;
+ return pimpl_->rejectChange(start, end);
}
-int Paragraph::getCounter(int i) const
+lyx::pos_type Paragraph::size() const
{
- return pimpl_->counter_[i];
+ return pimpl_->size();
}
-void Paragraph::incCounter(int i)
+bool Paragraph::empty() const
{
- pimpl_->counter_[i]++;
+ return pimpl_->empty();
}
-void Paragraph::setChar(pos_type pos, value_type c)
+Paragraph::value_type Paragraph::getChar(pos_type pos) const
{
- pimpl_->setChar(pos, c);
+ return pimpl_->getChar(pos);
}
-Paragraph::inset_iterator::inset_iterator(Paragraph::InsetList::iterator const & iter)
- : it(iter)
-{}
+int Paragraph::id() const
+{
+ return pimpl_->id_;
+}
-Paragraph::inset_iterator Paragraph::inset_iterator_begin()
+void Paragraph::id(int i)
{
- return inset_iterator(insetlist.begin());
+ pimpl_->id_ = i;
}
-Paragraph::inset_iterator Paragraph::inset_iterator_end()
+LyXLayout_ptr const & Paragraph::layout() const
{
- return inset_iterator(insetlist.end());
+/*
+ InsetOld * inset = inInset();
+ if (inset && inset->lyxCode() == InsetOld::ENVIRONMENT_CODE)
+ return static_cast<InsetEnvironment*>(inset)->layout();
+*/
+ return layout_;
+}
+
+
+void Paragraph::layout(LyXLayout_ptr const & new_layout)
+{
+ layout_ = new_layout;
+}
+
+
+UpdatableInset * Paragraph::inInset() const
+{
+ return pimpl_->inset_owner;
+}
+
+
+void Paragraph::clearContents()
+{
+ pimpl_->clear();
+}
+
+void Paragraph::setChar(pos_type pos, value_type c)
+{
+ pimpl_->setChar(pos, c);
}
}
-Paragraph * Paragraph::getParFromID(int id) const
+bool Paragraph::isFreeSpacing() const
{
- return pimpl_->getParFromID(id);
+ if (layout()->free_spacing)
+ return true;
+
+ // for now we just need this, later should we need this in some
+ // other way we can always add a function to InsetOld::() too.
+ if (pimpl_->inset_owner && pimpl_->inset_owner->owner())
+ return (pimpl_->inset_owner->owner()->lyxCode() == InsetOld::ERT_CODE);
+ return false;
}
-bool Paragraph::isFreeSpacing() const
+bool Paragraph::allowEmpty() 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 (layout()->keepempty)
+ return true;
if (pimpl_->inset_owner && pimpl_->inset_owner->owner())
- return (pimpl_->inset_owner->owner()->lyxCode() == Inset::ERT_CODE);
+ return (pimpl_->inset_owner->owner()->lyxCode() == InsetOld::ERT_CODE);
return false;
}
+
+
+bool operator==(Paragraph const & lhs, Paragraph const & rhs)
+{
+#warning FIXME this implementatoin must be completely wrong...
+ return &lhs == &rhs;
+}
projects / lyx.git / blobdiff