X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fparagraph_funcs.h;h=6a573f458fc35dbe4dcd22db83586828951fa533;hb=32d281cba0a2e4d0e8425a34a1a8d1f5e7251412;hp=c02a33006cb96adc9cf2e39df9f5891842ed9de4;hpb=fd1a4f75e897c8d0894d7c3247fafa964eb44b6d;p=lyx.git

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index c02a33006c..6a573f458f 100644
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -1,54 +1,73 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file paragraph_funcs.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #ifndef PARAGRAPH_FUNCS_H
 #define PARAGRAPH_FUNCS_H
 
-#include "ParagraphList.h"
-#include "paragraph.h"
-
 #include "support/types.h"
 
+class Buffer;
 class BufferParams;
+class InsetBase;
+class LyXFont;
+class Paragraph;
+class ParagraphList;
+
 
 ///
 void breakParagraph(BufferParams const & bparams,
-		    Paragraph *,
+		    ParagraphList & paragraphs,
+		    lyx::par_type par,
 		    lyx::pos_type pos,
 		    int flag);
 
 ///
 void breakParagraphConservative(BufferParams const & bparams,
-				Paragraph *,
+				ParagraphList & paragraphs,
+				lyx::par_type par,
 				lyx::pos_type pos);
 
-/** Paste this paragraph with the next one.
-    Be carefull, this doesent make any check at all.
-*/
-void pasteParagraph(BufferParams const & bparams,
-		    Paragraph *);
+/**
+ * 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::par_type par);
 
 
-#if 0
 /// for the environments
-Paragraph * depthHook(Paragraph * par, Paragraph::depth_type depth);
+lyx::par_type depthHook(lyx::par_type par,
+	ParagraphList const & plist, lyx::depth_type depth);
 
-Paragraph * outerHook(Paragraph * par);
+lyx::par_type outerHook(lyx::par_type par, ParagraphList const & plist);
 
 /// Is it the first par with same depth and layout?
-bool isFirstInSequence(Paragraph * par);
+bool isFirstInSequence(lyx::par_type par, ParagraphList const & plist);
 
 /** Check if the current paragraph is the last paragraph in a
     proof environment */
-int getEndLabel(Paragraph * para, BufferParams const & bparams);
-#endif
+int getEndLabel(lyx::par_type par, ParagraphList const & plist);
+
+LyXFont const outerFont(lyx::par_type par, ParagraphList const & plist);
+
+/// find outermost paragraph containing an inset
+lyx::par_type outerPar(Buffer const & buf, InsetBase const * inset);
+
+/// find owning paragraph containing an inset
+Paragraph const & ownerPar(Buffer const & buf, InsetBase const * inset);
+
+/// return the range of pars [beg, end[ owning the range of y [ystart, yend]
+void getParsInRange(ParagraphList & plist,
+				int ystart, int yend,
+				lyx::par_type & beg,
+				lyx::par_type & end);
 
-#endif
+#endif // PARAGRAPH_FUNCS_H