#include "Changes.h"
#include "Cursor.h"
#include "ErrorList.h"
+#include "FuncCode.h"
#include "FuncRequest.h"
#include "InsetIterator.h"
#include "InsetList.h"
#include "Language.h"
-#include "lfuns.h"
#include "LyXFunc.h"
#include "LyXRC.h"
#include "Text.h"
bool dirty_tabular_stack_ = false;
-void region(CursorSlice const & i1, CursorSlice const & i2,
- Inset::row_type & r1, Inset::row_type & r2,
- Inset::col_type & c1, Inset::col_type & c2)
-{
- Inset & p = i1.inset();
- c1 = p.col(i1.idx());
- c2 = p.col(i2.idx());
- if (c1 > c2)
- swap(c1, c2);
- r1 = p.row(i1.idx());
- r2 = p.row(i2.idx());
- if (r1 > r2)
- swap(r1, r2);
-}
-
-
bool checkPastePossible(int index)
{
return size_t(index) < theCuts.size() && !theCuts[index].first.empty();
pair<PitPosPair, pit_type>
pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
- DocumentClass const * const docclass, ErrorList & errorlist)
+ DocumentClass const * const oldDocClass, ErrorList & errorlist)
{
Buffer const & buffer = cur.buffer();
pit_type pit = cur.pit();
// Make a copy of the CaP paragraphs.
ParagraphList insertion = parlist;
- DocumentClass const * const tc = buffer.params().documentClassPtr();
+ DocumentClass const * const newDocClass =
+ buffer.params().documentClassPtr();
// Now remove all out of the pars which is NOT allowed in the
// new environment and set also another font if that is required.
}
// set the paragraphs to empty layout if necessary
- // note that we are doing this if the empty layout is
- // supposed to be the default, not just if it is forced
if (cur.inset().useEmptyLayout()) {
- LayoutPtr const layout =
- buffer.params().documentClass().emptyLayout();
+ bool forceEmptyLayout = cur.inset().forceEmptyLayout();
+ Layout const & emptyLayout = newDocClass->emptyLayout();
+ Layout const & defaultLayout = newDocClass->defaultLayout();
+ ParagraphList::iterator const end = insertion.end();
+ ParagraphList::iterator par = insertion.begin();
+ for (; par != end; ++par) {
+ Layout const & parLayout = par->layout();
+ if (forceEmptyLayout || parLayout == defaultLayout)
+ par->setLayout(emptyLayout);
+ }
+ } else { // check if we need to reset from empty layout
+ Layout const & defaultLayout = newDocClass->defaultLayout();
+ Layout const & emptyLayout = newDocClass->emptyLayout();
ParagraphList::iterator const end = insertion.end();
- for (ParagraphList::iterator par = insertion.begin();
- par != end; ++par)
- par->setLayout(layout);
+ ParagraphList::iterator par = insertion.begin();
+ for (; par != end; ++par) {
+ Layout const & parLayout = par->layout();
+ if (parLayout == emptyLayout)
+ par->setLayout(defaultLayout);
+ }
}
// Make sure there is no class difference.
// since we store pointers to insets at some places and we don't
// want to invalidate them.
insertion.swap(in.paragraphs());
- cap::switchBetweenClasses(docclass, tc, in, errorlist);
+ cap::switchBetweenClasses(oldDocClass, newDocClass, in, errorlist);
insertion.swap(in.paragraphs());
ParagraphList::iterator tmpbuf = insertion.begin();
// check for duplicates
InsetCommand & lab = static_cast<InsetCommand &>(*it);
docstring const oldname = lab.getParam("name");
- lab.update(oldname, false);
+ lab.updateCommand(oldname, false);
docstring const newname = lab.getParam("name");
if (oldname != newname) {
// adapt the references
break;
}
+ case BIBITEM_CODE: {
+ // check for duplicates
+ InsetCommand & bib = static_cast<InsetCommand &>(*it);
+ docstring const oldkey = bib.getParam("key");
+ bib.updateCommand(oldkey, false);
+ docstring const newkey = bib.getParam("key");
+ if (oldkey != newkey) {
+ // adapt the references
+ for (InsetIterator itt = inset_iterator_begin(in); itt != i_end; ++itt) {
+ if (itt->lyxCode() == CITE_CODE) {
+ InsetCommand & ref = dynamic_cast<InsetCommand &>(*itt);
+ if (ref.getParam("key") == oldkey)
+ ref.setParam("key", newkey);
+ }
+ }
+ }
+ break;
+ }
+
default:
break; // nothing
}
pit_type startpit, pit_type endpit,
int start, int end, DocumentClass const * const dc, CutStack & cutstack)
{
- BOOST_ASSERT(0 <= start && start <= pars[startpit].size());
- BOOST_ASSERT(0 <= end && end <= pars[endpit].size());
- BOOST_ASSERT(startpit != endpit || start <= end);
+ LASSERT(0 <= start && start <= pars[startpit].size(), /**/);
+ LASSERT(0 <= end && end <= pars[endpit].size(), /**/);
+ LASSERT(startpit != endpit || start <= end, /**/);
// Clone the paragraphs within the selection.
ParagraphList copy_pars(boost::next(pars.begin(), startpit),
namespace cap {
+void region(CursorSlice const & i1, CursorSlice const & i2,
+ Inset::row_type & r1, Inset::row_type & r2,
+ Inset::col_type & c1, Inset::col_type & c2)
+{
+ Inset & p = i1.inset();
+ c1 = p.col(i1.idx());
+ c2 = p.col(i2.idx());
+ if (c1 > c2)
+ swap(c1, c2);
+ r1 = p.row(i1.idx());
+ r2 = p.row(i2.idx());
+ if (r1 > r2)
+ swap(r1, r2);
+}
+
+
docstring grabAndEraseSelection(Cursor & cur)
{
if (!cur.selection())
}
+bool reduceSelectionToOneCell(Cursor & cur)
+{
+ if (!cur.selection() || !cur.inMathed())
+ return false;
+
+ CursorSlice i1 = cur.selBegin();
+ CursorSlice i2 = cur.selEnd();
+ if (!i1.inset().asInsetMath())
+ return false;
+
+ // the easy case: do nothing if only one cell is selected
+ if (i1.idx() == i2.idx())
+ return true;
+
+ cur.top().pos() = 0;
+ cur.resetAnchor();
+ cur.top().pos() = cur.top().lastpos();
+
+ return true;
+}
+
+
+bool multipleCellsSelected(Cursor const & cur)
+{
+ if (!cur.selection() || !cur.inMathed())
+ return false;
+
+ CursorSlice i1 = cur.selBegin();
+ CursorSlice i2 = cur.selEnd();
+ if (!i1.inset().asInsetMath())
+ return false;
+
+ if (i1.idx() == i2.idx())
+ return false;
+
+ return true;
+}
+
+
void switchBetweenClasses(DocumentClass const * const oldone,
DocumentClass const * const newone, InsetText & in, ErrorList & errorlist)
{
errorlist.clear();
- BOOST_ASSERT(!in.paragraphs().empty());
+ LASSERT(!in.paragraphs().empty(), /**/);
if (oldone == newone)
return;
// layouts
ParIterator end = par_iterator_end(in);
for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
- docstring const name = it->layout()->name();
+ docstring const name = it->layout().name();
bool hasLayout = newtc.hasLayout(name);
if (in.useEmptyLayout())
docstring const s = bformat(
_("Layout had to be changed from\n%1$s to %2$s\n"
"because of class conversion from\n%3$s to %4$s"),
- name, it->layout()->name(),
+ name, it->layout().name(),
from_utf8(oldtc.name()), from_utf8(newtc.name()));
// To warn the user that something had to be done.
errorlist.push_back(ErrorItem(_("Changed Layout"), s,
ParagraphList::const_iterator pit = pars.begin();
ParagraphList::const_iterator pend = pars.end();
for (; pit != pend; ++pit) {
- asciiSel += pit->asString(false);
+ asciiSel += pit->asString(AS_STR_INSETS);
if (asciiSel.size() > 25) {
asciiSel.replace(22, docstring::npos,
from_ascii("..."));
if (cur.inTexted()) {
Text * text = cur.text();
- BOOST_ASSERT(text);
+ LASSERT(text, /**/);
saveSelection(cur);
cur.selectionAsString(true));
}
+ if (begpit != endpit)
+ cur.updateFlags(Update::Force | Update::FitCursor);
+
boost::tie(endpit, endpos) =
eraseSelectionHelper(bp,
text->paragraphs(),
if (cur.inTexted()) {
Text * text = cur.text();
- BOOST_ASSERT(text);
+ LASSERT(text, /**/);
// ok we have a selection. This is always between cur.selBegin()
// and sel_end cursor
docstring selection(size_t sel_index)
{
return sel_index < theCuts.size()
- ? theCuts[sel_index].first.back().asString(false)
+ ? theCuts[sel_index].first.back().asString(AS_STR_INSETS)
: docstring();
}
{
if (cur.inTexted()) {
Text * text = cur.text();
- BOOST_ASSERT(text);
+ LASSERT(text, /**/);
pit_type endpit;
PitPosPair ppp;
}
// mathed is handled in InsetMathNest/InsetMathGrid
- BOOST_ASSERT(!cur.inMathed());
+ LASSERT(!cur.inMathed(), /**/);
}
void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */,
Clipboard::GraphicsType preferedType)
{
- BOOST_ASSERT(theClipboard().hasGraphicsContents(preferedType));
+ LASSERT(theClipboard().hasGraphicsContents(preferedType), /**/);
// get picture from clipboard
FileName filename = theClipboard().getAsGraphics(cur, preferedType);
return;
// create inset for graphic
- InsetGraphics * inset = new InsetGraphics;
+ InsetGraphics * inset = new InsetGraphics(cur.buffer());
InsetGraphicsParams params;
- params.filename = EmbeddedFile(filename.absFilename(), cur.buffer().filePath());
+ params.filename = support::DocFileName(filename.absFilename());
inset->setParams(params);
cur.recordUndo();
cur.insert(inset);
if (!cur.selection())
return docstring();
- // FIXME: What is wrong with the following?
#if 0
+ // grab selection by glueing multiple cells together. This is not what
+ // we want because selections spanning multiple cells will get "&" and "\\"
+ // seperators.
ostringstream os;
for (DocIterator dit = cur.selectionBegin();
dit != cur.selectionEnd(); dit.forwardPos())
projects / lyx.git / blobdiff