prepare Qt 5.6 builds

[lyx.git] / src / output_latex.h

diff --git a/src/output_latex.h b/src/output_latex.h
index 84bd800a8aadac963572407a46f13e38ba389d8a..8bfeb6aafc587cb294bca176160d8c032ac66590 100644 (file)
--- a/src/output_latex.h
+++ b/src/output_latex.h
@@ -15,8 +15,7 @@
 #include <utility>
 
 #include "support/docstream.h"
-#include "Paragraph.h"
-#include "ParIterator.h"
+#include "Layout.h"
 #include "ParagraphList.h"
 
 
@@ -25,16 +24,23 @@ namespace lyx {
 class Buffer;
 class BufferParams;
 class Encoding;
+class Layout;
 class Paragraph;
 class OutputParams;
-class TexRow;
 class Text;
 
-/// Export up to \p number optarg insets
-int latexOptArgInsets(Paragraph const & par,
-                     odocstream & os, OutputParams const & runparams,
-                     int number);
-
+/** Export optional and required arguments of the paragraph \p par.
+    Non-existing required arguments are output empty: {}.
+ */
+void latexArgInsets(Paragraph const & par,
+               otexstream & os, OutputParams const & runparams,
+               Layout::LaTeXArgMap const & latexargs,
+               std::string const & prefix = std::string());
+/// Same for multi-par sequences (e.g. merged environments or InsetLayouts)
+void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pit,
+               otexstream & os, OutputParams const & runparams,
+               Layout::LaTeXArgMap const & latexargs,
+               std::string const & prefix = std::string());
 /** Export \p paragraphs of buffer \p buf to LaTeX.
     Don't use a temporary stringstream for \p os if the final output is
     supposed to go to a file.
@@ -42,8 +48,7 @@ int latexOptArgInsets(Paragraph const & par,
  */
 void latexParagraphs(Buffer const & buf,
                     Text const & text,
-                    odocstream & ofs,
-                    TexRow & texrow,
+                    otexstream & ofs,
                     OutputParams const &,
                     std::string const & everypar = std::string());
 
@@ -57,13 +62,13 @@ std::pair<bool, int> switchEncoding(odocstream & os,
                     bool force = false);
 
 /// FIXME: this should not be visible.
-ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
-                     Text const & text,
-                     ParagraphList::const_iterator pit,
-                     odocstream & os, TexRow & texrow,
-                     OutputParams const & runparams,
-                     std::string const & everypar = std::string(),
-                     int start_pos = -1, int end_pos = -1);
+void TeXOnePar(Buffer const & buf,
+                  Text const & text,
+                  pit_type pit,
+                  otexstream & os,
+                  OutputParams const & runparams,
+                  std::string const & everypar = std::string(),
+                  int start_pos = -1, int end_pos = -1);
 
 } // namespace lyx