X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.h;h=ebb299a83543f005cb2b9e0511a51c83da1de970;hb=13739f37d5208e87e97c44ef2eeba35807ddb9c5;hp=70045d304f77ce3df0128d2f436b7da5958cfc16;hpb=345d7c00cd85576102a025daad82e6537fcb12d2;p=lyx.git

diff --git a/src/output_latex.h b/src/output_latex.h
index 70045d304f..ebb299a835 100644
--- a/src/output_latex.h
+++ b/src/output_latex.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,7 +12,12 @@
 #ifndef OUTPUT_LATEX_H
 #define OUTPUT_LATEX_H
 
+#include <utility>
+
 #include "support/docstream.h"
+#include "Paragraph.h"
+#include "ParIterator.h"
+#include "ParagraphList.h"
 
 
 namespace lyx {
@@ -20,15 +25,19 @@ namespace lyx {
 class Buffer;
 class BufferParams;
 class Encoding;
+class Layout;
 class Paragraph;
-class ParagraphList;
 class OutputParams;
 class TexRow;
+class Text;
 
-/// Export up to \p number optarg insets
-int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
-                      odocstream & os, OutputParams const & runparams,
-                      int number);
+/// 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,
+		otexstream & os, OutputParams const & runparams,
+		unsigned int reqargs, unsigned int optargs);
 
 /** Export \p paragraphs of buffer \p buf to LaTeX.
     Don't use a temporary stringstream for \p os if the final output is
@@ -36,17 +45,29 @@ int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
     \sa Buffer::writeLaTeXSource for the reason.
  */
 void latexParagraphs(Buffer const & buf,
-		     ParagraphList const & paragraphs,
-		     odocstream & ofs,
+		     Text const & text,
+		     otexstream & ofs,
 		     TexRow & texrow,
 		     OutputParams const &,
 		     std::string const & everypar = std::string());
 
-/// Switch the encoding of \p os from \p oldEnc to \p newEnc if needed.
-/// \return the number of characters written to \p os.
-int switchEncoding(odocstream & os, BufferParams const & bparams,
-                   bool moving_arg, Encoding const & oldEnc,
-                   Encoding const & newEnc);
+/** Switch the encoding of \p os from runparams.encoding to \p newEnc if needed.
+    \p force forces this also within non-default or -auto encodings.
+    \return (did the encoding change?, number of characters written to \p os)
+ */
+std::pair<bool, int> switchEncoding(odocstream & os,
+		     BufferParams const & bparams,
+		     OutputParams const &, Encoding const & newEnc,
+		     bool force = false);
+
+/// FIXME: this should not be visible.
+void TeXOnePar(Buffer const & buf,
+	           Text const & text,
+	           pit_type pit,
+	           otexstream & os, TexRow & texrow,
+	           OutputParams const & runparams,
+	           std::string const & everypar = std::string(),
+	           int start_pos = -1, int end_pos = -1);
 
 } // namespace lyx