X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_funcs.h;h=59786081cbafd90e9d872a7a090855b60d93976c;hb=ca339eb1991efcab02a5f1b7f33387b35df2a416;hp=0953a6dd1c9d07646e065594d06c6f6f13f4db47;hpb=9d6cad3fe60696d795280a886623fdc9a89f9de6;p=lyx.git

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index 0953a6dd1c..59786081cb 100644
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -12,15 +12,17 @@
 #ifndef PARAGRAPH_FUNCS_H
 #define PARAGRAPH_FUNCS_H
 
-#include "ParagraphList_fwd.h"
-
 #include "support/types.h"
 
+
+namespace lyx {
+
 class Buffer;
 class BufferParams;
-class InsetBase;
-class LyXFont;
+class Inset;
+class Font;
 class Paragraph;
+class ParagraphList;
 
 /**
  * This breaks a paragraph at the specified position.
@@ -33,40 +35,50 @@ class Paragraph;
  */
 void breakParagraph(BufferParams const & bparams,
 		    ParagraphList & paragraphs,
-		    lyx::pit_type par,
-		    lyx::pos_type pos,
+		    pit_type par,
+		    pos_type pos,
 		    int flag);
 
 ///
 void breakParagraphConservative(BufferParams const & bparams,
 				ParagraphList & paragraphs,
-				lyx::pit_type par,
-				lyx::pos_type pos);
+				pit_type par,
+				pos_type pos);
 
 /**
  * Append the next paragraph onto the tail of this one.
  * Be careful, this doesent make any check at all.
  */
 void mergeParagraph(BufferParams const & bparams,
-	ParagraphList & paragraphs, lyx::pit_type par);
+	ParagraphList & paragraphs, pit_type par);
 
 
 /// for the environments
-lyx::pit_type depthHook(lyx::pit_type par,
-	ParagraphList const & plist, lyx::depth_type depth);
+pit_type depthHook(pit_type par,
+	ParagraphList const & plist, depth_type depth);
 
-lyx::pit_type outerHook(lyx::pit_type par, ParagraphList const & plist);
+pit_type outerHook(pit_type par, ParagraphList const & plist);
 
 /// Is it the first par with same depth and layout?
-bool isFirstInSequence(lyx::pit_type par, ParagraphList const & plist);
+bool isFirstInSequence(pit_type par, ParagraphList const & plist);
 
 /** Check if the current paragraph is the last paragraph in a
     proof environment */
-int getEndLabel(lyx::pit_type par, ParagraphList const & plist);
+int getEndLabel(pit_type par, ParagraphList const & plist);
 
-LyXFont const outerFont(lyx::pit_type par_offset, ParagraphList const & pars);
+/**
+ * Get the font of the "environment" of paragraph \p par_offset in \p pars.
+ * All font changes of the paragraph are relative to this font.
+ */
+Font const outerFont(pit_type par_offset, ParagraphList const & pars);
 
 /// return the number of InsetOptArg in a paragraph
 int numberOfOptArgs(Paragraph const & par);
 
+/// accept the changes within the complete ParagraphList
+void acceptChanges(ParagraphList & pars, BufferParams const & bparams);
+
+
+} // namespace lyx
+
 #endif // PARAGRAPH_FUNCS_H