Fix #10778 (issue with CJK and language nesting)

[lyx.git] / src / tex2lyx / tex2lyx.h

diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h
index e3da48b478bbe1ebf8e5287d9e481a9a57f6949a..8220877339bd856429c0e0d7f9ab72914df43490 100644 (file)
--- a/src/tex2lyx/tex2lyx.h
+++ b/src/tex2lyx/tex2lyx.h
@@ -26,14 +26,6 @@ namespace lyx {
 
 namespace support { class FileName; }
 
-/// Simple support for frontend::Alert::warning().
-namespace frontend { 
-namespace Alert {
-       void warning(docstring const & title, docstring const & message,
-                                bool const &);
-}
-}
-
 class Context;
 
 /// A trivial subclass, just to give us a public default constructor
@@ -45,6 +37,8 @@ public:
 
 /// Translate babel language name to LyX language name
 extern std::string babel2lyx(std::string const & language);
+/// Translate LyX language name to babel language name
+extern std::string lyx2babel(std::string const & language);
 /// Translate polyglossia language name to LyX language name
 extern std::string polyglossia2lyx(std::string const & language);
 /// Translate basic color name or RGB color in LaTeX syntax to LyX color code
@@ -118,6 +112,8 @@ extern InsetLayout const * findInsetLayoutWithoutModule(
  * list of used modules if yes.
  */
 extern bool checkModule(std::string const & name, bool command);
+/// Is this feature already provided e.g. by the document class?
+extern bool isProvided(std::string const & name);
 // Access to environment stack
 extern std::vector<std::string> active_environments;
 std::string active_environment();
@@ -189,19 +185,21 @@ extern bool overwriteFiles();
 extern bool copyFiles();
 /// Shall we skip child documents and keep them as TeX?
 extern bool skipChildren();
+/// Does tex2lyx run in roundtrip mode?
+extern bool roundtripMode();
 
 
 /*!
  *  Reads tex input from \a infilename and writes lyx output to \a outfilename.
- *  The (latex) encoding can be provided as \a encoding.
+ *  The iconv name of the encoding can be provided as \a encoding.
  *  Uses some common settings for the preamble, so this should only
  *  be used more than once for included documents.
  *  Caution: Overwrites the existing preamble settings if the new document
  *  contains a preamble.
  *  \return true if the conversion was successful, else false.
  */
-bool tex2lyx(std::string const & infilename, 
-            support::FileName const & outfilename, 
+bool tex2lyx(std::string const & infilename,
+            support::FileName const & outfilename,
             std::string const & encoding);