X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput_latex.h;h=1f3afff17f17aecf952ef8fe2e07dbb448efde64;hb=68ee68103a77300c3aa01db9e63bd01b8243a0eb;hp=9a7de7ed69d12714ac07b5c5f162b0c97408fca7;hpb=b0097bcddbc2c99755db192c0720f693825ef319;p=lyx.git

diff --git a/src/output_latex.h b/src/output_latex.h
index 9a7de7ed69..1f3afff17f 100644
--- 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"
 
 
@@ -31,14 +30,18 @@ class OutputParams;
 class TexRow;
 class Text;
 
-/// Export up to \p reqargs required arguments and
-/// \p optargs optional ones. If not enough required
-/// ones are given, we'll output: {}. The optional ones
-/// must all come first.
-int latexArgInsets(Paragraph const & par,
-		odocstream & os, OutputParams const & runparams,
-		unsigned int reqargs, unsigned int optargs);
-
+/** 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.
@@ -46,8 +49,7 @@ int latexArgInsets(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());
 
@@ -61,13 +63,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