Alfredo's second patch

[lyx.git] / src / paragraph_funcs.h

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index 56054c8f2acb5d16aa0517d0e9e7efe9f418e7fd..3270494e658c20e832b3209872b28d550967a7d5 100644 (file)
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -13,21 +13,24 @@
 #define PARAGRAPH_FUNCS_H
 
 #include "ParagraphList.h"
+#include "paragraph.h"
 #include "support/types.h"
 
 class Buffer;
 class BufferParams;
-class Paragraph;
 class TexRow;
+class LyXLex;
 
 ///
 void breakParagraph(BufferParams const & bparams,
+                   ParagraphList & paragraphs,
                    ParagraphList::iterator par,
                    lyx::pos_type pos,
                    int flag);
 
 ///
 void breakParagraphConservative(BufferParams const & bparams,
+                               ParagraphList & paragraphs,
                                ParagraphList::iterator par,
                                lyx::pos_type pos);
 
@@ -36,40 +39,43 @@ void breakParagraphConservative(BufferParams const & bparams,
  * Be careful, this doesent make any check at all.
  */
 void mergeParagraph(BufferParams const & bparams,
+                   ParagraphList & paragraphs,
                    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
-
-ParagraphList::iterator
-TeXDeeper(Buffer const * buf,
-         BufferParams const & bparams,
-         ParagraphList::iterator pit,
-         std::ostream & os, TexRow & texrow);
-
-ParagraphList::iterator
-TeXEnvironment(Buffer const * buf,
-              BufferParams const & bparams,
-              ParagraphList::iterator pit,
-              std::ostream & os, TexRow & texrow);
-
-ParagraphList::iterator
-TeXOnePar(Buffer const * buf,
-         BufferParams const & bparams,
-         ParagraphList::iterator pit,
-         std::ostream & os, TexRow & texrow,
-         bool moving_arg);
+int getEndLabel(ParagraphList::iterator pit,
+               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);
+
+/// 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