X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftex2lyx%2Ftex2lyx.h;h=66a60fd12e497fd77ecb4d802cc047eafe00e482;hb=f0335cef1e21810e2d020801f06364ac462e7899;hp=f2bde2e8cb5fe1cd55608556d3aa723c2d6f9265;hpb=12f8e7a6f91f4e1c631888f303af5c76c7b0cd6f;p=lyx.git diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h index f2bde2e8cb..66a60fd12e 100644 --- a/src/tex2lyx/tex2lyx.h +++ b/src/tex2lyx/tex2lyx.h @@ -43,16 +43,12 @@ 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 > used_packages; -extern const char * const modules_placeholder; -extern std::string h_inputencoding; +/// 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 &); @@ -77,12 +73,12 @@ 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 -std::string const trim(std::string const & a, char const * p = " \t\n\r"); +std::string const trimSpaceAndEol(std::string const & a); void split(std::string const & s, std::vector & result, char delim = ','); @@ -90,6 +86,7 @@ std::string join(std::vector 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 *); /*! @@ -121,9 +118,12 @@ std::string active_environment(); enum ArgumentType { required, + req_group, verbatim, item, - optional + optional, + opt_group, + displaymath, }; class FullCommand { @@ -164,8 +164,14 @@ extern FullEnvironmentMap possible_textclass_environments; 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 CJK? +extern bool have_CJK; +/// Do we have non-CJK Japanese? +extern bool is_nonCJKJapanese; /// LyX format that is created by tex2lyx -int const LYX_FORMAT = 345; +extern int const LYX_FORMAT; /// path of the master .tex file extern std::string getMasterFilePath();