#include "paragraph_funcs.h"
-#include "buffer.h"
#include "bufferparams.h"
-
-#include "debug.h"
-#include "encoding.h"
-#include "gettext.h"
-#include "language.h"
-#include "lyxrow.h"
#include "lyxtext.h"
-#include "outputparams.h"
#include "paragraph_pimpl.h"
-#include "pariterator.h"
-#include "sgml.h"
-#include "texrow.h"
-#include "vspace.h"
-
-#include "support/filetools.h"
-#include "support/lstrings.h"
-#include "support/lyxlib.h"
-
-#include <sstream>
-#include <vector>
-
-using lyx::pos_type;
-using lyx::pit_type;
-
-using lyx::support::ascii_lowercase;
-using lyx::support::bformat;
-using lyx::support::compare_ascii_no_case;
-using lyx::support::compare_no_case;
-using lyx::support::contains;
-using lyx::support::split;
-using lyx::support::subst;
-
-using std::auto_ptr;
-using std::endl;
-using std::string;
-using std::vector;
-using std::istringstream;
-using std::ostream;
-using std::pair;
-namespace {
+namespace lyx {
-bool moveItem(Paragraph & from, Paragraph & to,
- BufferParams const & params, pos_type i, pos_type j,
- Change change = Change(Change::INSERTED));
+using std::string;
-bool moveItem(Paragraph & from, Paragraph & to,
+
+static bool moveItem(Paragraph & from, Paragraph & to,
BufferParams const & params, pos_type i, pos_type j,
- Change change)
+ Change change = Change(Change::INSERTED))
{
Paragraph::value_type const tmpchar = from.getChar(i);
LyXFont tmpfont = from.getFontSettings(params, i);
return true;
}
-}
-
void breakParagraph(BufferParams const & bparams,
ParagraphList & pars, pit_type par_offset, pos_type pos, int flag)
{
// create a new paragraph, and insert into the list
ParagraphList::iterator tmp =
- pars.insert(pars.begin() + par_offset + 1, Paragraph());
+ pars.insert(boost::next(pars.begin(), par_offset + 1),
+ Paragraph());
Paragraph & par = pars[par_offset];
// remember to set the inset_owner
tmp->setInsetOwner(par.inInset());
- if (bparams.tracking_changes)
- tmp->trackChanges();
-
// this is an idea for a more userfriendly layout handling, I will
// see what the users say
if (flag) {
tmp->layout(par.layout());
tmp->setLabelWidthString(par.params().labelWidthString());
+ tmp->params().depth(par.params().depth());
+ } else if (par.params().depth() > 0) {
+ Paragraph const & hook = pars[outerHook(par_offset, pars)];
+ tmp->layout(hook.layout());
+ // not sure the line below is useful
+ tmp->setLabelWidthString(par.params().labelWidthString());
+ tmp->params().depth(hook.params().depth());
}
bool const isempty = (par.allowEmpty() && par.empty());
pos_type pos_end = par.size() - 1;
for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
- Change::Type change = par.lookupChange(i);
+ Change::Type change = par.lookupChange(i).type;
if (moveItem(par, *tmp, bparams, i, j - pos)) {
- tmp->setChange(j - pos, change);
+ // FIXME: change tracking (MG)
+ tmp->setChange(j - pos, Change(change));
++j;
}
}
for (pos_type i = pos_end; i >= pos; --i)
- par.eraseIntern(i);
+ // FIXME: change tracking (MG)
+ par.eraseChar(i, false); // erase without change tracking
}
if (pos) {
return;
}
- if (!isempty) {
- par.params().clear();
- par.layout(bparams.getLyXTextClass().defaultLayout());
- }
-
+ if (!isempty) {
+ par.params().clear();
+ par.layout(bparams.getLyXTextClass().defaultLayout());
+ }
+
// layout stays the same with latex-environments
if (flag) {
par.layout(tmp->layout());
}
// subtle, but needed to get empty pars working right
- if (bparams.tracking_changes) {
- if (!par.size()) {
- par.cleanChanges();
- } else if (!tmp->size()) {
- tmp->cleanChanges();
- }
+ if (bparams.trackChanges) {
+ // FIXME: Change tracking (MG)
+ // if (!par.size())
+ // set 'par' text to INSERTED in CT mode; clear CT info otherwise
+ // else if (!tmp->size())
+ // set 'tmp' text to INSERTED in CT mode; clear CT info otherwise
}
}
ParagraphList & pars, pit_type par_offset, pos_type pos)
{
// create a new paragraph
- Paragraph & tmp = *pars.insert(pars.begin() + par_offset + 1, Paragraph());
+ Paragraph & tmp = *pars.insert(boost::next(pars.begin(), par_offset + 1),
+ Paragraph());
Paragraph & par = pars[par_offset];
- if (bparams.tracking_changes)
- tmp.trackChanges();
-
tmp.makeSameLayout(par);
// When can pos > size()?
pos_type pos_end = par.size() - 1;
for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
- Change::Type change = par.lookupChange(i);
- if (moveItem(par, tmp, bparams, i, j - pos, change))
+ Change::Type change = par.lookupChange(i).type;
+ // FIXME: change tracking (MG)
+ if (moveItem(par, tmp, bparams, i, j - pos, Change(change)))
++j;
}
// Move over end-of-par change attr
- tmp.setChange(tmp.size(), par.lookupChange(par.size()));
+ // FIXME: change tracking (MG)
+ tmp.setChange(tmp.size(), Change(par.lookupChange(par.size()).type));
// If tracking changes, set all the text that is to be
// erased to Type::INSERTED.
for (pos_type k = pos_end; k >= pos; --k) {
- if (bparams.tracking_changes)
- par.setChange(k, Change::INSERTED);
- par.erase(k);
+ if (bparams.trackChanges)
+ // FIXME: Change tracking (MG)
+ par.setChange(k, Change(Change::INSERTED));
+ // FIXME: change tracking (MG)
+ par.eraseChar(k, false);
}
}
}
pos_type pos_end = next.size() - 1;
pos_type pos_insert = par.size();
- Change::Type cr = next.lookupChange(next.size());
+ // What happens is the following. Later on, moveItem() will copy
+ // over characters from the next paragraph to be inserted into this
+ // position. Now, if the first char to be so copied is "red" (i.e.,
+ // marked deleted) and the paragraph break is marked "blue",
+ // insertChar will trigger (eventually, through record(), and see
+ // del() and erase() in changes.C) a "hard" character deletion.
+ // Which doesn't make sense of course at this pos, but the effect is
+ // to shorten the change range to which this para break belongs, by
+ // one. It will (should) remain "orphaned", having no CT info to it,
+ // and check() in changes.C will assert. Setting the para break
+ // forcibly to "black" prevents this scenario. -- MV 13.3.2006
+ // FIXME: change tracking (MG)
+ par.setChange(par.size(), Change(Change::UNCHANGED));
+
+ Change::Type cr = next.lookupChange(next.size()).type;
// ok, now copy the paragraph
for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
- Change::Type change = next.lookupChange(i);
- if (moveItem(next, par, bparams, i, pos_insert + j, change))
+ Change::Type change = next.lookupChange(i).type;
+ // FIXME: change tracking (MG)
+ if (moveItem(next, par, bparams, i, pos_insert + j, Change(change)))
++j;
}
// Move the change status of "carriage return" over
- par.setChange(par.size(), cr);
+ // FIXME: change tracking (MG)
+ par.setChange(par.size(), Change(cr));
- pars.erase(pars.begin() + par_offset + 1);
+ pars.erase(boost::next(pars.begin(), par_offset + 1));
}
-pit_type depthHook(pit_type pit,
- ParagraphList const & pars, Paragraph::depth_type depth)
+pit_type depthHook(pit_type pit, ParagraphList const & pars, depth_type depth)
{
pit_type newpit = pit;
if (par.getDepth() == 0)
return pars.size();
- return depthHook(par_offset, pars, Paragraph::depth_type(par.getDepth() - 1));
+ return depthHook(par_offset, pars, depth_type(par.getDepth() - 1));
}
int getEndLabel(pit_type p, ParagraphList const & pars)
{
pit_type pit = p;
- Paragraph::depth_type par_depth = pars[p].getDepth();
+ depth_type par_depth = pars[p].getDepth();
while (pit != pit_type(pars.size())) {
LyXLayout_ptr const & layout = pars[pit].layout();
int const endlabeltype = layout->endlabeltype;
if (p + 1 == pit_type(pars.size()))
return endlabeltype;
- Paragraph::depth_type const next_depth =
+ depth_type const next_depth =
pars[p + 1].getDepth();
if (par_depth > next_depth ||
(par_depth == next_depth && layout != pars[p + 1].layout()))
LyXFont const outerFont(pit_type par_offset, ParagraphList const & pars)
{
- Paragraph::depth_type par_depth = pars[par_offset].getDepth();
+ depth_type par_depth = pars[par_offset].getDepth();
LyXFont tmpfont(LyXFont::ALL_INHERIT);
// Resolve against environment font information
}
return num;
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff