X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_funcs.h;h=6a573f458fc35dbe4dcd22db83586828951fa533;hb=1fa0fb5c67656cacbe3cfe6e8b08dd98cada1f73;hp=fc92fac3cee37fa3dc3e5bcded827d2efa380158;hpb=b94ed208a59158b594710ccba428d9a6c822b7ad;p=lyx.git

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index fc92fac3ce..6a573f458f 100644
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -6,32 +6,33 @@
  *
  * \author Lars Gullik Bjønnes
  *
- * Full author contact details are available in file CREDITS
+ * 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 TexRow;
-class LyXLex;
+class InsetBase;
+class LyXFont;
+class Paragraph;
+class ParagraphList;
+
 
 ///
 void breakParagraph(BufferParams const & bparams,
 		    ParagraphList & paragraphs,
-		    ParagraphList::iterator par,
+		    lyx::par_type par,
 		    lyx::pos_type pos,
 		    int flag);
 
 ///
 void breakParagraphConservative(BufferParams const & bparams,
 				ParagraphList & paragraphs,
-				ParagraphList::iterator par,
+				lyx::par_type par,
 				lyx::pos_type pos);
 
 /**
@@ -39,36 +40,34 @@ void breakParagraphConservative(BufferParams const & bparams,
  * Be careful, this doesent make any check at all.
  */
 void mergeParagraph(BufferParams const & bparams,
-		    ParagraphList & paragraphs,
-		    ParagraphList::iterator par);
+	ParagraphList & paragraphs, lyx::par_type par);
+
 
 /// 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);
+int getEndLabel(lyx::par_type par, ParagraphList const & plist);
 
+LyXFont const outerFont(lyx::par_type par, ParagraphList const & plist);
 
-void latexParagraphs(Buffer const * buf,
-		     ParagraphList const & paragraphs,
-		     ParagraphList::iterator par,
-		     ParagraphList::iterator endpar,
-		     std::ostream & ofs,
-		     TexRow & texrow,
-		     bool moving_arg = false);
+/// find outermost paragraph containing an inset
+lyx::par_type outerPar(Buffer const & buf, InsetBase const * inset);
 
-/// read a paragraph from a .lyx file. Returns number of unrecognised tokens
-int readParagraph(Buffer & buf, Paragraph & par, LyXLex & lex);
+/// find owning paragraph containing an inset
+Paragraph const & ownerPar(Buffer const & buf, InsetBase const * inset);
 
-LyXFont const realizeFont(LyXFont const & font,
-			  Buffer const * buf,
-			  ParagraphList & /*plist*/,
-			  ParagraphList::iterator pit);
+/// 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 // PARAGRAPH_FUNCS_H