X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.h;h=8bfeb6aafc587cb294bca176160d8c032ac66590;hb=02847641a8b97a57d1866120bb446427e0bda7a4;hp=ebb299a83543f005cb2b9e0511a51c83da1de970;hpb=1ef605f6254ef3f3b8cec5440a2e67e6f23a707b;p=lyx.git

diff --git a/src/output_latex.h b/src/output_latex.h
index ebb299a835..8bfeb6aafc 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"
 
 
@@ -28,17 +27,20 @@ class Encoding;
 class Layout;
 class Paragraph;
 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,
+/** 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,
-		unsigned int reqargs, unsigned int optargs);
-
+		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.
@@ -47,7 +49,6 @@ int latexArgInsets(Paragraph const & par,
 void latexParagraphs(Buffer const & buf,
 		     Text const & text,
 		     otexstream & ofs,
-		     TexRow & texrow,
 		     OutputParams const &,
 		     std::string const & everypar = std::string());
 
@@ -64,7 +65,7 @@ std::pair<bool, int> switchEncoding(odocstream & os,
 void TeXOnePar(Buffer const & buf,
 	           Text const & text,
 	           pit_type pit,
-	           otexstream & os, TexRow & texrow,
+	           otexstream & os,
 	           OutputParams const & runparams,
 	           std::string const & everypar = std::string(),
 	           int start_pos = -1, int end_pos = -1);