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 7101a7c7f8f584db0aef0bef83cd63c2c9c5511c..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
@@ -43,17 +35,14 @@ public:
        void setName(std::string const & name) { name_ = name; }
 };
 
-/// in preamble.cpp
-void parse_preamble(Parser & p, std::ostream & os, 
-       std::string const & forceclass, TeX2LyXDocClass & tc);
 /// Translate babel language name to LyX language name
 extern std::string babel2lyx(std::string const & language);
-
-/// used packages with options
-extern std::map<std::string, std::vector<std::string> > used_packages;
-extern const char * const modules_placeholder;
-extern std::string h_inputencoding;
-extern std::string h_paragraph_separation;
+/// 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
+extern std::string rgbcolor2code(std::string const & name);
 
 /// in text.cpp
 std::string translate_len(std::string const &);
@@ -72,14 +61,18 @@ void parse_text_in_inset(Parser & p, std::ostream & os, unsigned flags,
                          bool outer, Context const & context,
                          InsetLayout const * layout = 0);
 
+/// Guess document language from \p p if CJK is used.
+/// \p lang is used for all non-CJK contents.
+std::string guessLanguage(Parser & p, std::string const & lang);
+
 
 /// in math.cpp
 void parse_math(Parser & p, std::ostream & os, unsigned flags, mode_type mode);
 
 
 /// in table.cpp
-void handle_tabular(Parser & p, std::ostream & os, bool is_long_tabular,
-                   Context & context);
+void handle_tabular(Parser & p, std::ostream & os, std::string const & name,
+                    std::string const & width, Context & context);
 
 
 /// in tex2lyx.cpp
@@ -91,6 +84,7 @@ std::string join(std::vector<std::string> const & input,
        char const * delim);
 
 bool is_math_env(std::string const & name);
+bool is_display_math_env(std::string const & name);
 char const * const * is_known(std::string const &, char const * const *);
 
 /*!
@@ -106,6 +100,8 @@ void add_known_command(std::string const & command, std::string const & o1,
 extern void add_known_environment(std::string const & environment,
        std::string const & o1, bool o2, docstring const & beg,
        docstring const & end);
+extern void add_known_theorem(std::string const & theorem,
+       std::string const & o1, bool o2, docstring const & definition);
 extern Layout const * findLayoutWithoutModule(TextClass const & textclass,
        std::string const & name, bool command);
 extern InsetLayout const * findInsetLayoutWithoutModule(
@@ -116,15 +112,20 @@ 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();
 
 enum ArgumentType {
        required,
+       req_group,
        verbatim,
        item,
-       optional
+       optional,
+       opt_group,
+       displaymath,
 };
 
 class FullCommand {
@@ -161,30 +162,44 @@ extern CommandMap known_math_environments;
 extern FullCommandMap possible_textclass_commands;
 /// Environments that might be defined by the document class or modules
 extern FullEnvironmentMap possible_textclass_environments;
+/// Theorems that might be defined by the document class or modules
+extern FullCommandMap possible_textclass_theorems;
 ///
 extern bool noweb_mode;
 /// Did we recognize any pdflatex-only construct?
 extern bool pdflatex;
+/// Did we recognize any xetex-only construct?
+extern bool xetex;
+/// Do we have non-CJK Japanese?
+extern bool is_nonCJKJapanese;
 /// LyX format that is created by tex2lyx
-int const LYX_FORMAT = 413;
-
-/// path of the master .tex file
-extern std::string getMasterFilePath();
-/// path of the currently processed .tex file
-extern std::string getParentFilePath();
+extern int const LYX_FORMAT;
+
+/// Absolute path of the master .lyx or .tex file
+extern std::string getMasterFilePath(bool input);
+/// Absolute path of the currently processed .lyx or .tex file
+extern std::string getParentFilePath(bool input);
+/// Is it allowed to overwrite existing files?
+extern bool overwriteFiles();
+/// Do we need to copy included files to the output directory?
+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);