fix some C++ parsing bugs

[lyx.git] / src / paragraph_funcs.h

diff --git a/src/paragraph_funcs.h b/src/paragraph_funcs.h
index 56054c8f2acb5d16aa0517d0e9e7efe9f418e7fd..abae9f7d9389844a0a93829034b40192e08b37f5 100644 (file)
--- a/src/paragraph_funcs.h
+++ b/src/paragraph_funcs.h
@@ -19,15 +19,18 @@ 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,6 +39,7 @@ void breakParagraphConservative(BufferParams const & bparams,
  * Be careful, this doesent make any check at all.
  */
 void mergeParagraph(BufferParams const & bparams,
+                   ParagraphList & paragraphs,
                    ParagraphList::iterator par);
 
 
@@ -53,23 +57,16 @@ bool isFirstInSequence(Paragraph * par);
 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);
+void latexParagraphs(Buffer const * buf,
+                    ParagraphList const & paragraphs,
+                    ParagraphList::iterator par,
+                    ParagraphList::iterator endpar,
+                    std::ostream & ofs,
+                    TexRow & texrow,
+                    bool moving_arg = false);
 
-ParagraphList::iterator
-TeXOnePar(Buffer const * buf,
-         BufferParams const & bparams,
-         ParagraphList::iterator 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