Alfredo's second patch

[lyx.git] / src / paragraph_funcs.h

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index abae9f7d9389844a0a93829034b40192e08b37f5..3270494e658c20e832b3209872b28d550967a7d5 100644 (file)
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -13,11 +13,11 @@
 #define PARAGRAPH_FUNCS_H
 
 #include "ParagraphList.h"
+#include "paragraph.h"
 #include "support/types.h"
 
 class Buffer;
 class BufferParams;
-class Paragraph;
 class TexRow;
 class LyXLex;
 
@@ -43,19 +43,22 @@ void mergeParagraph(BufferParams const & bparams,
                    ParagraphList::iterator par);
 
 
-#if 0
 /// for the environments
-Paragraph * depthHook(Paragraph * par, Paragraph::depth_type depth);
+ParagraphList::iterator depthHook(ParagraphList::iterator pit,
+                                 ParagraphList const & plist,
+                                 Paragraph::depth_type depth);
 
-Paragraph * outerHook(Paragraph * par);
+ParagraphList::iterator outerHook(ParagraphList::iterator pit,
+                                 ParagraphList const & plist);
 
 /// Is it the first par with same depth and layout?
-bool isFirstInSequence(Paragraph * par);
+bool isFirstInSequence(ParagraphList::iterator 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(ParagraphList::iterator pit,
+               ParagraphList const & plist);
 
 
 void latexParagraphs(Buffer const * buf,
@@ -69,4 +72,10 @@ void latexParagraphs(Buffer const * buf,
 /// read a paragraph from a .lyx file. Returns number of unrecognised tokens
 int readParagraph(Buffer & buf, Paragraph & par, LyXLex & lex);
 
+LyXFont const realizeFont(LyXFont const & font,
+                         BufferParams const & params);
+
+LyXFont const outerFont(ParagraphList::iterator pit,
+                       ParagraphList const & plist);
+
 #endif // PARAGRAPH_FUNCS_H