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

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index a67354d5a9..6a573f458f 100644
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -12,31 +12,27 @@
 #ifndef PARAGRAPH_FUNCS_H
 #define PARAGRAPH_FUNCS_H
 
-#include "ParagraphList_fwd.h"
 #include "support/types.h"
 
-#include <string>
-
-
 class Buffer;
 class BufferParams;
-class TexRow;
-class LatexRunParams;
+class InsetBase;
 class LyXFont;
-class LyXLex;
-class InsetOld;
+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);
 
 /**
@@ -44,46 +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
-ParagraphList::iterator depthHook(ParagraphList::iterator pit,
-				  ParagraphList const & plist,
-				  lyx::depth_type depth);
+lyx::par_type depthHook(lyx::par_type par,
+	ParagraphList const & plist, lyx::depth_type depth);
 
-ParagraphList::iterator outerHook(ParagraphList::iterator pit,
-				  ParagraphList const & plist);
+lyx::par_type outerHook(lyx::par_type par, ParagraphList const & plist);
 
 /// Is it the first par with same depth and layout?
-bool isFirstInSequence(ParagraphList::iterator par,
-		       ParagraphList const & plist);
+bool isFirstInSequence(lyx::par_type par, ParagraphList const & plist);
 
 /** Check if the current paragraph is the last paragraph in a
     proof environment */
-int getEndLabel(ParagraphList::iterator pit,
-		ParagraphList const & plist);
-
-
-void latexParagraphs(Buffer const & buf,
-		     ParagraphList const & paragraphs,
-		     std::ostream & ofs,
-		     TexRow & texrow,
-		     LatexRunParams const &,
-		     std::string const & everypar = std::string());
-
-/// read a paragraph from a .lyx file. Returns number of unrecognised tokens
-int readParagraph(Buffer & buf, Paragraph & par, LyXLex & lex);
+int getEndLabel(lyx::par_type par, ParagraphList const & plist);
 
-LyXFont const outerFont(ParagraphList::iterator pit,
-			ParagraphList const & plist);
+LyXFont const outerFont(lyx::par_type par, ParagraphList const & plist);
 
 /// find outermost paragraph containing an inset
-ParagraphList::iterator outerPar(Buffer const & buf, InsetOld const * inset);
+lyx::par_type outerPar(Buffer const & buf, InsetBase const * inset);
 
 /// find owning paragraph containing an inset
-Paragraph const & ownerPar(Buffer const & buf, InsetOld const * 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 // PARAGRAPH_FUNCS_H