float2string #4 (Spacing)

[lyx.git] / src / paragraph_funcs.h

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index dc282599e1411f6229a264113273c5a0ac32da9d..7bf37146d913007c9fc760ab40998ed44b573d50 100644 (file)
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -12,29 +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 InsetBase;
 class LyXFont;
-class LyXLex;
-class InsetOld;
+class Paragraph;
+class ParagraphList;
+
 
 ///
 void breakParagraph(BufferParams const & bparams,
                    ParagraphList & paragraphs,
-                   ParagraphList::iterator par,
+                   lyx::pit_type par,
                    lyx::pos_type pos,
                    int flag);
 
 ///
 void breakParagraphConservative(BufferParams const & bparams,
                                ParagraphList & paragraphs,
-                               ParagraphList::iterator par,
+                               lyx::pit_type par,
                                lyx::pos_type pos);
 
 /**
@@ -42,38 +40,25 @@ 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::pit_type par);
 
 
 /// for the environments
-ParagraphList::iterator depthHook(ParagraphList::iterator pit,
-                                 ParagraphList const & plist,
-                                 lyx::depth_type depth);
+lyx::pit_type depthHook(lyx::pit_type par,
+       ParagraphList const & plist, lyx::depth_type depth);
 
-ParagraphList::iterator outerHook(ParagraphList::iterator pit,
-                                 ParagraphList const & plist);
+lyx::pit_type outerHook(lyx::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(lyx::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);
-
-/// 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);
-
-/// find outermost paragraph containing an inset
-ParagraphList::iterator outerPar(Buffer const & buf, InsetOld const * inset);
+int getEndLabel(lyx::pit_type par, ParagraphList const & plist);
 
-/// find owning paragraph containing an inset
-Paragraph const & ownerPar(Buffer const & buf, InsetOld const * inset);
+LyXFont const outerFont(lyx::pit_type par_offset, ParagraphList const & pars);
 
+/// return the number of InsetOptArg in a paragraph
+int numberOfOptArgs(Paragraph const & par);
 
 #endif // PARAGRAPH_FUNCS_H