X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.h;h=664033209c890f452c0f17923e13ea1fc4db8b87;hb=49a17aaa5dc37139eb3deddaf3cbd2606608a0b7;hp=a67d1b5a591a5e1ce1b659a5ee12c0378951ce0c;hpb=e4dba53232bc71d5a577466e7fb4a3251944d9d8;p=features.git

diff --git a/src/CutAndPaste.h b/src/CutAndPaste.h
index a67d1b5a59..664033209c 100644
--- a/src/CutAndPaste.h
+++ b/src/CutAndPaste.h
@@ -14,9 +14,11 @@
 #ifndef CUTANDPASTE_H
 #define CUTANDPASTE_H
 
+#include "Author.h"
 #include "DocumentClassPtr.h"
 
-#include "support/docstring.h"
+#include "support/strfwd.h"
+#include "support/types.h"
 
 #include "frontends/Clipboard.h"
 
@@ -25,10 +27,13 @@
 
 namespace lyx {
 
-class DocumentClass;
+class Buffer;
 class ErrorList;
+class Inset;
 class InsetText;
 class Cursor;
+class CursorData;
+class CursorSlice;
 class ParagraphList;
 
 namespace cap {
@@ -37,8 +42,13 @@ namespace cap {
 std::vector<docstring> availableSelections(Buffer const *);
 /// Get the number of available elements in the cut buffer.
 size_type numberOfSelections();
-/// Get the sel_index-th element of the cut buffer in plain text format.
-docstring selection(size_t sel_index, DocumentClassConstPtr docclass);
+///
+typedef std::pair<DocumentClassConstPtr, AuthorList > DocInfoPair;
+/**
+ * Get the sel_index-th element of the cut buffer in plain text format
+ * or, if \param for_math is true, in a format suitable for mathed.
+ */
+docstring selection(size_t sel_index, DocInfoPair docinfo, bool for_math = false);
 
 /**
  * Replace using the font of the first selected character and select
@@ -66,7 +76,7 @@ void cutSelectionToTemp(Cursor & cur, bool realcut = true);
 /// Push the current selection to the cut buffer and the system clipboard.
 void copySelection(Cursor const & cur);
 /// Like copySelection, but only put to temporary cut buffer
-void copySelectionToTemp(Cursor & cur);
+void copySelectionToTemp(Cursor const & cur);
 ///
 void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext);
 /**
@@ -116,16 +126,21 @@ enum BranchAction {
 /// Paste the paragraph list \p parlist at the position given by \p cur.
 /// Does not handle undo. Does only work in text, not mathed.
 void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
-                        DocumentClassConstPtr textclass, ErrorList & errorList,
-                        BranchAction branchAction = BRANCH_ASK);
+			DocumentClassConstPtr textclass, AuthorList const & authors,
+			ErrorList & errorList,
+			BranchAction branchAction = BRANCH_ASK);
 
 
 /** Needed to switch between different classes. This works
  *  for a list of paragraphs beginning with the specified par.
- *  It changes layouts and character styles.
+ *  It changes layouts and character styles. Errors are reported
+ *  in the passed ErrorList.
  */
-void switchBetweenClasses(DocumentClassConstPtr c1,
-			DocumentClassConstPtr c2, InsetText & in, ErrorList &);
+void switchBetweenClasses(DocumentClassConstPtr oldone,
+            DocumentClassConstPtr newone, InsetText & in, ErrorList & el);
+/// Same but without error reporting.
+void switchBetweenClasses(DocumentClassConstPtr oldone,
+            DocumentClassConstPtr newone, InsetText & in);
 
 /// Get the current selection as a string. Does not change the selection.
 /// Does only work if the whole selection is in mathed.
@@ -153,8 +168,8 @@ void selDel(Cursor & cur);
 void selClearOrDel(Cursor & cur);
 /// Calculate rectangular region of cell between \c i1 and \c i2.
 void region(CursorSlice const & i1, CursorSlice const & i2,
-    Inset::row_type & r1, Inset::row_type & r2,
-    Inset::col_type & c1, Inset::col_type & c2);
+			row_type & r1, row_type & r2,
+			col_type & c1, col_type & c2);
 /** Tabular has its own paste stack for multiple cells
  *  but it needs to know whether there is a more recent
  *  ordinary paste. Therefore which one is newer.