Revert UI fix for two digit numbers. It actually does not work.

[lyx.git] / src / output_latex.h

diff --git a/src/output_latex.h b/src/output_latex.h
index 71af3221c97e130598826039b8b6dbd2f5c955d0..311b2e61b09a0aa18812b88fe93fb22478f4d23a 100644 (file)
--- a/src/output_latex.h
+++ b/src/output_latex.h
@@ -14,7 +14,6 @@
 
 #include <utility>
 
-#include "support/docstream.h"
 #include "Layout.h"
 #include "ParagraphList.h"
 
@@ -24,31 +23,48 @@ namespace lyx {
 class Buffer;
 class BufferParams;
 class Encoding;
-class Layout;
 class Paragraph;
 class OutputParams;
 class Text;
 
-/** Register a language switch when using polyglossia.
+/** Register a language switch when using polyglossia or begin/end commands.
+    Set \p localswitch to true if a local command switch is used.
  */
-void pushPolyglossiaLang(std::string const & lang);
+void pushLanguageName(std::string const & lang, bool localswitch = false);
 
-/** Unregister the last language switch when using polyglossia.
+/** Unregister the last language switch when using polyglossia
+    or begin/end commands.
  */
-void popPolyglossiaLang();
+void popLanguageName();
+
+// Check if we have an empty language stack
+bool languageStackEmpty();
+
+/** Return a reference to the last active language opened with
+    polyglossia or when using begin/end commands. If none or when
+    using babel with only a begin command, return a reference to
+    an empty string.
+ */
+std::string const & openLanguageName();
 
 /** 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());
+                    otexstream & os, OutputParams const & runparams,
+                    Layout::LaTeXArgMap const & latexargs,
+                    std::string const & prefix = std::string());
+/// Same for merged environments
+void latexArgInsets(ParagraphList const & pars,
+                    ParagraphList::const_iterator pit,
+                    otexstream & os, OutputParams const & runparams,
+                    Layout::LaTeXArgMap const & latexargs,
+                    std::string const & prefix = std::string());
+/// Same for InsetLayouts
+void latexArgInsetsForParent(ParagraphList const & pars, 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.
@@ -67,7 +83,7 @@ void latexParagraphs(Buffer const & buf,
 std::pair<bool, int> switchEncoding(odocstream & os,
                     BufferParams const & bparams,
                     OutputParams const &, Encoding const & newEnc,
-                    bool force = false);
+                    bool force = false, bool noswitchmacro = false);
 
 /// FIXME: this should not be visible.
 void TeXOnePar(Buffer const & buf,
@@ -76,7 +92,8 @@ void TeXOnePar(Buffer const & buf,
                   otexstream & os,
                   OutputParams const & runparams,
                   std::string const & everypar = std::string(),
-                  int start_pos = -1, int end_pos = -1);
+                  int start_pos = -1, int end_pos = -1,
+                  bool const force = false);
 
 } // namespace lyx