fix some C++ parsing bugs

[lyx.git] / src / paragraph_funcs.h

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index d136d619e409a9b67a8a81a6d7a5a0b07e6914b3..abae9f7d9389844a0a93829034b40192e08b37f5 100644 (file)
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -12,29 +12,35 @@
 #ifndef PARAGRAPH_FUNCS_H
 #define PARAGRAPH_FUNCS_H
 
+#include "ParagraphList.h"
 #include "support/types.h"
 
 class Buffer;
 class BufferParams;
 class Paragraph;
 class TexRow;
+class LyXLex;
 
 ///
 void breakParagraph(BufferParams const & bparams,
-                   Paragraph *,
+                   ParagraphList & paragraphs,
+                   ParagraphList::iterator par,
                    lyx::pos_type pos,
                    int flag);
 
 ///
 void breakParagraphConservative(BufferParams const & bparams,
-                               Paragraph *,
+                               ParagraphList & paragraphs,
+                               ParagraphList::iterator par,
                                lyx::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, Paragraph *);
+void mergeParagraph(BufferParams const & bparams,
+                   ParagraphList & paragraphs,
+                   ParagraphList::iterator par);
 
 
 #if 0
@@ -51,20 +57,16 @@ bool isFirstInSequence(Paragraph * par);
 int getEndLabel(Paragraph * para, BufferParams const & bparams);
 #endif
 
-Paragraph * TeXDeeper(Buffer const * buf,
-                     BufferParams const & bparams,
-                     Paragraph * pit,
-                     std::ostream & os, TexRow & texrow);
 
-Paragraph * TeXEnvironment(Buffer const * buf,
-                          BufferParams const & bparams,
-                          Paragraph * pit,
-                          std::ostream & os, TexRow & texrow);
+void latexParagraphs(Buffer const * buf,
+                    ParagraphList const & paragraphs,
+                    ParagraphList::iterator par,
+                    ParagraphList::iterator endpar,
+                    std::ostream & ofs,
+                    TexRow & texrow,
+                    bool moving_arg = false);
 
-Paragraph * TeXOnePar(Buffer const * buf,
-                     BufferParams const & bparams,
-                     Paragraph * pit,
-                     std::ostream & os, TexRow & texrow,
-                     bool moving_arg);
+/// read a paragraph from a .lyx file. Returns number of unrecognised tokens
+int readParagraph(Buffer & buf, Paragraph & par, LyXLex & lex);
 
 #endif // PARAGRAPH_FUNCS_H