X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_pimpl.h;h=5af4d69556b899ceaf8bd22e9075ef273ca515e8;hb=09e01879979643949f1f2c7216023f1f35d5ada2;hp=9f03d866369e6c2e8b95b010868595485cd3b00f;hpb=ae87b945156585b080ed155919f64b80e48d7a04;p=lyx.git

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index 9f03d86636..5af4d69556 100644
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -1,24 +1,20 @@
 // -*- C++ -*-
 /**
  * \file paragraph_pimpl.h
- * Copyright 1995-2002 the LyX Team
+ * Copyright 1995-2003 the LyX Team
  * Read the file COPYING
  */
 
 #ifndef PARAGRAPH_PIMPL_H
 #define PARAGRAPH_PIMPL_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
 #include "paragraph.h"
 #include "ParagraphParameters.h"
 #include "changes.h"
 #include "counters.h"
 
 #include <boost/scoped_ptr.hpp>
- 
+
 class LyXLayout;
 
 struct Paragraph::Pimpl {
@@ -28,7 +24,7 @@ struct Paragraph::Pimpl {
 	///
 	Pimpl(Paragraph * owner);
 	/// Copy constructor
-	Pimpl(Pimpl const &, Paragraph * owner, bool same_ids = false);
+	Pimpl(Pimpl const &, Paragraph * owner);
 	///
 	lyx::pos_type size() const {
 		return text.size();
@@ -40,7 +36,7 @@ struct Paragraph::Pimpl {
 	///
 	void clear();
 	///
-	void setContentsFromPar(Paragraph const * par);
+	void setContentsFromPar(Paragraph const & par);
 	/// set tracking mode
 	void trackChanges(Change::Type type = Change::UNCHANGED);
 	/// stop tracking
@@ -55,24 +51,24 @@ struct Paragraph::Pimpl {
 	bool isChanged(lyx::pos_type start, lyx::pos_type end) const;
 	/// is there a non-addition in this range ?
 	bool isChangeEdited(lyx::pos_type start, lyx::pos_type end) const;
- 
+
 	/// set change at pos
 	void setChange(lyx::pos_type pos, Change::Type type);
- 
+
 	/// mark as erased
 	void markErased();
- 
+
 	/// accept change
 	void acceptChange(lyx::pos_type start, lyx::pos_type end);
 
 	/// reject change
 	void rejectChange(lyx::pos_type start, lyx::pos_type end);
- 
+
 	/// are we tracking changes ?
 	bool tracking() const {
 		return changes_.get();
 	}
- 
+
 	///
 	value_type getChar(lyx::pos_type pos) const;
 	///
@@ -80,18 +76,15 @@ struct Paragraph::Pimpl {
 	///
 	void insertChar(lyx::pos_type pos, value_type c, LyXFont const & font, Change change = Change(Change::INSERTED));
 	///
-	void insertInset(lyx::pos_type pos, Inset * inset, LyXFont const & font, Change change = Change(Change::INSERTED));
+	void insertInset(lyx::pos_type pos, InsetOld * inset, LyXFont const & font, Change change = Change(Change::INSERTED));
 	/// definite erase
 	void eraseIntern(lyx::pos_type pos);
-	/// erase the given position
-	void erase(lyx::pos_type pos);
+	/// erase the given position. Returns true if it was actually erased
+	bool erase(lyx::pos_type pos);
 	/// erase the given range
-	bool erase(lyx::pos_type start, lyx::pos_type end);
-	///
-	LyXFont const realizeFont(LyXFont const & font,
-				  BufferParams const & bparams) const;
+	int erase(lyx::pos_type start, lyx::pos_type end);
 	///
-	Inset * inset_owner;
+	UpdatableInset * inset_owner;
 
 	/** A font entry covers a range of positions. Notice that the
 	    entries in the list are inserted in random order.
@@ -151,9 +144,6 @@ struct Paragraph::Pimpl {
 	///
 	FontList fontlist;
 
-	///
-	Paragraph * TeXDeeper(Buffer const *, BufferParams const &,
-				 std::ostream &, TexRow & texrow);
 	///
 	void simpleTeXBlanks(std::ostream &, TexRow & texrow,
 			     lyx::pos_type const i,
@@ -163,9 +153,11 @@ struct Paragraph::Pimpl {
 	///
 	void simpleTeXSpecialChars(Buffer const *, BufferParams const &,
 				   std::ostream &, TexRow & texrow,
-				   bool moving_arg,
+				   LatexRunParams const &,
 				   LyXFont & font, LyXFont & running_font,
-				   LyXFont & basefont, bool & open_font,
+				   LyXFont & basefont,
+				   LyXFont const & outerfont,
+				   bool & open_font,
 				   Change::Type & running_change,
 				   LyXLayout const & style,
 				   lyx::pos_type & i,
@@ -175,8 +167,6 @@ struct Paragraph::Pimpl {
 	void validate(LaTeXFeatures & features,
 		      LyXLayout const & layout) const;
 
-	///
-	Paragraph * getParFromID(int id) const;
 	///
 	unsigned int id_;
 	///
@@ -185,15 +175,12 @@ struct Paragraph::Pimpl {
 	ParagraphParameters params;
 
 private:
-	/// erase at the given position. Returns true if it was actually erased
-	bool erasePos(lyx::pos_type pos);
-
 	/// match a string against a particular point in the paragraph
 	bool isTextAt(string const & str, lyx::pos_type pos) const;
 
 	/// for recording and looking up changes in revision tracking mode
 	boost::scoped_ptr<Changes> changes_;
- 
+
 	/// Who owns us?
 	Paragraph * owner_;
 	///