#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "paragraph.h"
#include "paragraph_pimpl.h"
#include "lyxrc.h"
#include "encoding.h"
#include "ParameterStruct.h"
#include "gettext.h"
+#include "changes.h"
-#include "insets/insetinclude.h"
-#include "insets/insetbib.h"
-#include "insets/insettext.h"
+#include "insets/insetbibitem.h"
#include "insets/insetoptarg.h"
#include "support/filetools.h"
#include <algorithm>
#include <fstream>
#include <csignal>
+#include <ctime>
using std::ostream;
using std::endl;
using std::ios;
using std::lower_bound;
using std::upper_bound;
-using std::reverse;
using lyx::pos_type;
-// 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
#endif
enumdepth = 0;
itemdepth = 0;
- bibkey = 0; // ale970302
params().clear();
}
previous_->next_ = this;
// end
- bibkey = 0; // ale970302
params().clear();
}
#endif
// 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;
InsetList::iterator it = insetlist.begin();
next_->previous_ = previous_;
#endif
- // ale970302
- delete bibkey;
-
delete pimpl_;
//
//lyxerr << "Paragraph::paragraph_id = "
void Paragraph::write(Buffer const * buf, ostream & os,
BufferParams const & bparams,
- depth_type dth) const
+ depth_type & dth) const
{
// The beginning or end of a deeper (i.e. nested) area?
if (dth != params().depth()) {
}
// First write the layout
- os << "\n\\layout " << layout()->name() << "\n";
+ os << "\n\\layout " << layout()->name() << '\n';
// Maybe some vertical spaces.
if (params().spaceTop().kind() != VSpace::NONE)
os << "\\added_space_top "
- << params().spaceTop().asLyXCommand() << " ";
+ << params().spaceTop().asLyXCommand() << ' ';
if (params().spaceBottom().kind() != VSpace::NONE)
os << "\\added_space_bottom "
- << params().spaceBottom().asLyXCommand() << " ";
+ << params().spaceBottom().asLyXCommand() << ' ';
// Maybe the paragraph has special spacing
params().spacing().writeFile(os, true);
// Do we have a manual left indent?
if (!params().leftIndent().zero())
- os << "\\leftindent " << params().leftIndent().asString() << " ";
+ os << "\\leftindent " << params().leftIndent().asString()
+ << ' ';
// Alignment?
if (params().align() != LYX_ALIGN_LAYOUT) {
case LYX_ALIGN_CENTER: h = 3; break;
default: h = 0; break;
}
- os << "\\align " << string_align[h] << " ";
+ os << "\\align " << string_align[h] << ' ';
}
- // bibitem ale970302
- if (bibkey)
- bibkey->write(buf, os);
-
LyXFont font1(LyXFont::ALL_INHERIT, bparams.language);
+ Change running_change = Change(Change::UNCHANGED);
+ lyx::time_type const curtime(lyx::current_time());
+
int column = 0;
for (pos_type i = 0; i < size(); ++i) {
if (!i) {
- os << "\n";
+ os << '\n';
column = 0;
}
+ Change change = pimpl_->lookupChangeFull(i);
+ Changes::lyxMarkChange(os, column, curtime, running_change, change);
+ running_change = change;
+
// Write font changes
LyXFont font2 = getFontSettings(bparams, i);
if (font2 != font1) {
-#ifndef INHERIT_LANGUAGE
font2.lyxWriteChanges(font1, os);
-#else
- font2.lyxWriteChanges(font1, bparams.language, os);
-#endif
column = 0;
font1 = font2;
}
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;
}
}
+
+ // 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));
}
}
+bool Paragraph::erase(pos_type start, pos_type end)
+{
+ return pimpl_->erase(start, end);
+}
+
+
bool Paragraph::checkInsertChar(LyXFont & font)
{
if (pimpl_->inset_owner)
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, LyXFont const & font)
+void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font, Change change)
{
- pimpl_->insertInset(pos, inset, font);
+ pimpl_->insertInset(pos, inset, font, change);
}
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;
}
LyXLayout_ptr const & lout = layout();
- pos_type main_body = 0;
- if (lout->labeltype == LABEL_MANUAL)
- main_body = beginningOfMainBody();
+ pos_type const main_body = beginningOfMainBody();
LyXFont layoutfont;
if (pos < main_body)
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);
}
int i = 0;
while (!empty() && (isNewline(0) || isLineSeparator(0))) {
- erase(0);
+ pimpl_->eraseIntern(0);
++i;
}
int Paragraph::beginningOfMainBody() const
{
+ if (layout()->labeltype != LABEL_MANUAL)
+ return 0;
+
// Unroll the first two cycles of the loop
// and remember the previous character to
// remove unnecessary GetChar() calls
// Find the entry.
InsetList::iterator it = insetlist.begin();
InsetList::iterator end = insetlist.end();
- for (; it != end; ++it) {
- if (it.getInset() == inset) {
+ for (; it != end; ++it)
+ if (it.getInset() == inset)
return it.getPos();
- }
- }
- if (inset == bibkey)
- return 0;
-
return -1;
}
-namespace {
-InsetOptArg * optArgInset(Paragraph const & par)
+InsetBibitem * Paragraph::bibitem()
{
- // Find the entry.
- InsetList::iterator it = par.insetlist.begin();
- InsetList::iterator end = par.insetlist.end();
- for (; it != end; ++it) {
- Inset * ins = it.getInset();
- if (ins->lyxCode() == Inset::OPTARG_CODE) {
- return static_cast<InsetOptArg *>(ins);
- }
- }
+ InsetList::iterator it = insetlist.begin();
+ if (it != insetlist.end() && it.getInset()->lyxCode() == Inset::BIBTEX_CODE)
+ return static_cast<InsetBibitem *>(it.getInset());
return 0;
}
-} // end namespace
-
-Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
- BufferParams const & bparams,
- ostream & os, TexRow & texrow,
- bool moving_arg)
-{
- lyxerr[Debug::LATEX] << "TeXOnePar... " << this << endl;
- Inset const * in = inInset();
- bool further_blank_line = false;
- 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
- // any environment other then "Standard" to be valid!
- if ((in == 0) || !in->forceDefaultParagraphs(in)) {
- style = 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 (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 = bparams.getLyXTextClass().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();
-
- // Separate handling of optional argument inset.
- if (style->optionalargs == 1) {
- InsetOptArg * it = optArgInset(*this);
- if (it != 0)
- it->latexOptional(buf, os, false, false);
- }
- else
- os << 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 =
- (empty()
- ? getLayoutFont(bparams) : getFont(bparams, size() - 1));
-
- bool is_command = style->isCommand();
-
- if (style->resfont.size() != font.size() && next_ && !is_command) {
- if (!need_par)
- os << "{";
- os << "\\" << font.latexSize() << " \\par}";
- } else if (need_par) {
- os << "\\par}";
- } else if (is_command)
- os << "}";
-
- switch (style->latextype) {
- case LATEX_ITEM_ENVIRONMENT:
- case LATEX_LIST_ENVIRONMENT:
- if (next_ && (params().depth() < next_->params().depth())) {
- os << '\n';
- texrow.newline();
- }
- break;
- case LATEX_ENVIRONMENT:
- // if its the last paragraph of the current environment
- // skip it otherwise fall through
- if (next_
- && (next_->layout() != layout()
- || next_->params().depth() != params().depth()))
- break;
- // fall through possible
- default:
- // we don't need it for the last paragraph!!!
- if (next_) {
- os << '\n';
- texrow.newline();
- }
- }
-
- if ((in == 0) || !in->forceDefaultParagraphs(in)) {
- further_blank_line = false;
- if (params().lineBottom()) {
- os << "\\lyxline{\\" << font.latexSize() << '}';
- further_blank_line = true;
- }
-
- if (params().spaceBottom().kind() != VSpace::NONE) {
- os << params().spaceBottom().asLatexCommand(bparams);
- further_blank_line = true;
- }
-
- if (params().pagebreakBottom()) {
- os << "\\newpage";
- further_blank_line = true;
- }
-
- if (further_blank_line) {
- os << '\n';
- texrow.newline();
- }
-
- if (!params().spacing().isDefault()
- && (!next_ || !next_->hasSameLayout(this))) {
- os << params().spacing().writeEnvirEnd() << "\n";
- texrow.newline();
- }
- }
-
- // 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
// Maybe we have to create a optional argument.
pos_type main_body;
- if (style->labeltype != LABEL_MANUAL)
+
+ // FIXME: can we actually skip this check and just call
+ // beginningOfMainBody() ??
+ if (style->labeltype != LABEL_MANUAL) {
main_body = 0;
- else
+ } else {
main_body = beginningOfMainBody();
+ }
- int column = 0;
+ unsigned int column = 0;
if (main_body > 0) {
os << '[';
// Do we have an open font change?
bool open_font = false;
+ Change::Type running_change = Change::UNCHANGED;
+
texrow.start(this, 0);
// if the paragraph is empty, the loop will not be entered at all
open_font = true;
}
+ Change::Type change = pimpl_->lookupChange(i);
+
+ column += Changes::latexMarkChange(os, running_change, change);
+ running_change = change;
+
if (c == Paragraph::META_NEWLINE) {
// newlines are handled differently here than
// the default in SimpleTeXSpecialChars().
running_font = basefont;
if (font.family() ==
LyXFont::TYPEWRITER_FAMILY) {
- os << "~";
+ os << '~';
}
if (moving_arg)
os << "\\protect ";
os, texrow, moving_arg,
font, running_font,
basefont, 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
}
-Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
- BufferParams const & bparams,
- ostream & os, TexRow & texrow)
-{
- lyxerr[Debug::LATEX] << "TeXEnvironment... " << this << endl;
-
- LyXLayout_ptr const & style = 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();
- }
- }
-
- bool leftindent_open = false;
- if (!params().leftIndent().zero()) {
- os << "\\begin{LyXParagraphLeftIndent}{" <<
- params().leftIndent().asLatexString() << "}\n";
- texrow.newline();
- leftindent_open = true;
- }
-
- 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 (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()
- && par->params().leftIndent() == params().leftIndent());
-
- if (style->isEnvironment()) {
- os << "\\end{" << style->latexname() << "}\n";
- texrow.newline();
- }
-
- if (leftindent_open) {
- os << "\\end{LyXParagraphLeftIndent}\n";
- texrow.newline();
- }
-
- lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
- return par; // ale970302
-}
bool Paragraph::isHfill(pos_type pos) const
Paragraph::getParLanguage(BufferParams const & bparams) const
{
if (!empty()) {
-#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
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;
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);
getInset(i)->lyxCode() == Inset::MATH_CODE) {
ostringstream ost;
getInset(i)->ascii(buffer, ost);
- s += subst(ost.str().c_str(),'\n',' ');
+ s += subst(STRCONV(ost.str()),'\n',' ');
}
}
- if (isRightToLeftPar(bparams))
- reverse(s.begin() + len,s.end());
-
return s;
}
string const Paragraph::asString(Buffer const * buffer,
- pos_type beg, pos_type end, bool label)
+ pos_type beg, pos_type end, bool label) const
{
ostringstream ost;
}
}
- return ost.str().c_str();
+ return STRCONV(ost.str());
}
}
+void Paragraph::trackChanges(Change::Type type)
+{
+ pimpl_->trackChanges(type);
+}
+
+
+void Paragraph::untrackChanges()
+{
+ pimpl_->untrackChanges();
+}
+
+
+void Paragraph::cleanChanges()
+{
+ pimpl_->cleanChanges();
+}
+
+
+Change::Type Paragraph::lookupChange(lyx::pos_type pos) const
+{
+ lyx::Assert(!size() || pos < size());
+ return pimpl_->lookupChange(pos);
+}
+
+
+Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const
+{
+ lyx::Assert(!size() || pos < size());
+ return pimpl_->lookupChangeFull(pos);
+}
+
+
+bool Paragraph::isChanged(pos_type start, pos_type end) const
+{
+ return pimpl_->isChanged(start, end);
+}
+
+
+bool Paragraph::isChangeEdited(pos_type start, pos_type end) const
+{
+ return pimpl_->isChangeEdited(start, end);
+}
+
+
+void Paragraph::markErased()
+{
+ pimpl_->markErased();
+}
+
+
+void Paragraph::acceptChange(pos_type start, pos_type end)
+{
+ return pimpl_->acceptChange(start, end);
+}
+
+
+void Paragraph::rejectChange(pos_type start, pos_type end)
+{
+ return pimpl_->rejectChange(start, end);
+}
+
+
lyx::pos_type Paragraph::size() const
{
return pimpl_->size();
}
-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