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

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index a67354d5a9..bf7a6429fe 100644
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -12,78 +12,68 @@
 #ifndef PARAGRAPH_FUNCS_H
 #define PARAGRAPH_FUNCS_H
 
-#include "ParagraphList_fwd.h"
 #include "support/types.h"
 
-#include <string>
 
+namespace lyx {
 
 class Buffer;
 class BufferParams;
-class TexRow;
-class LatexRunParams;
-class LyXFont;
-class LyXLex;
-class InsetOld;
+class Inset;
+class Font;
+class Paragraph;
+class ParagraphList;
 
-///
+/**
+ * This breaks a paragraph at the specified position.
+ * The new paragraph will:
+ * - Decrease depth by one (or change layout to default layout) when
+ *    keep_layout == false  
+ * - keep current depth and layout when keep_layout == true
+ */
 void breakParagraph(BufferParams const & bparams,
 		    ParagraphList & paragraphs,
-		    ParagraphList::iterator par,
-		    lyx::pos_type pos,
-		    int flag);
+		    pit_type par,
+		    pos_type pos,
+		    bool keep_layout);
 
 ///
 void breakParagraphConservative(BufferParams const & bparams,
 				ParagraphList & paragraphs,
-				ParagraphList::iterator 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,
-		    ParagraphList::iterator par);
+	ParagraphList & paragraphs, pit_type par);
 
 
 /// for the environments
-ParagraphList::iterator depthHook(ParagraphList::iterator pit,
-				  ParagraphList const & plist,
-				  lyx::depth_type depth);
+pit_type depthHook(pit_type par,
+	ParagraphList const & plist, depth_type depth);
 
-ParagraphList::iterator outerHook(ParagraphList::iterator pit,
-				  ParagraphList const & plist);
+pit_type outerHook(pit_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(pit_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);
-
+int getEndLabel(pit_type par, 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);
-
-LyXFont const outerFont(ParagraphList::iterator pit,
-			ParagraphList const & plist);
+/**
+ * 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);
 
-/// find outermost paragraph containing an inset
-ParagraphList::iterator outerPar(Buffer const & buf, InsetOld const * inset);
+/// accept the changes within the complete ParagraphList
+void acceptChanges(ParagraphList & pars, BufferParams const & bparams);
 
-/// find owning paragraph containing an inset
-Paragraph const & ownerPar(Buffer const & buf, InsetOld const * inset);
 
+} // namespace lyx
 
 #endif // PARAGRAPH_FUNCS_H