From f7cfdc48a5c4ec4d9e52a39d37b76880583ec8ad Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sat, 22 Oct 2011 19:27:46 +0000 Subject: [PATCH] Increase tex2lyx output format to 413 (LyX 2.0.x). 411: Added \language_package preamble parameter 412: Nothing to do (empty lyx2lyx conversion) 413: Added \html_css_as_file preamble parameter git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39924 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/tex2lyx/TODO.txt | 2 ++ src/tex2lyx/preamble.cpp | 4 ++++ src/tex2lyx/tex2lyx.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt index 35fcfeedbe..8caa520598 100644 --- a/src/tex2lyx/TODO.txt +++ b/src/tex2lyx/TODO.txt @@ -99,4 +99,6 @@ Format LaTeX feature LyX feature 405 author hash \author 407 vertical offset for multirows InsetTabular 409 XeTeX \use_non_tex_fonts +411 babel etc. \language_package +412 tabular* InsetTabular diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp index 6de0d019ba..e35408b796 100644 --- a/src/tex2lyx/preamble.cpp +++ b/src/tex2lyx/preamble.cpp @@ -168,6 +168,7 @@ string h_textclass = "article"; string h_use_default_options = "false"; string h_options; string h_language = "english"; +string h_language_package = "default"; string h_font_roman = "default"; string h_font_sans = "default"; string h_font_typewriter = "default"; @@ -220,6 +221,7 @@ string h_listings_params; string h_tracking_changes = "false"; string h_output_changes = "false"; string h_html_math_output = "0"; +string h_html_css_as_file = "0"; string h_html_be_strict = "false"; string h_margins; @@ -690,6 +692,7 @@ void end_preamble(ostream & os, TextClass const & /*textclass*/) os << "\\use_default_options " << h_use_default_options << "\n" << modules_placeholder << "\\language " << h_language << "\n" + << "\\language_package " << h_language_package << "\n" << "\\inputencoding " << h_inputencoding << "\n" << "\\font_roman " << h_font_roman << "\n" << "\\font_sans " << h_font_sans << "\n" @@ -758,6 +761,7 @@ void end_preamble(ostream & os, TextClass const & /*textclass*/) os << "\\tracking_changes " << h_tracking_changes << "\n" << "\\output_changes " << h_output_changes << "\n" << "\\html_math_output " << h_html_math_output << "\n" + << "\\html_css_as_file " << h_html_css_as_file << "\n" << "\\html_be_strict " << h_html_be_strict << "\n" << "\\end_header\n\n" << "\\begin_body\n"; diff --git a/src/tex2lyx/tex2lyx.h b/src/tex2lyx/tex2lyx.h index 04d366f01c..7101a7c7f8 100644 --- a/src/tex2lyx/tex2lyx.h +++ b/src/tex2lyx/tex2lyx.h @@ -166,7 +166,7 @@ extern bool noweb_mode; /// Did we recognize any pdflatex-only construct? extern bool pdflatex; /// LyX format that is created by tex2lyx -int const LYX_FORMAT = 410; +int const LYX_FORMAT = 413; /// path of the master .tex file extern std::string getMasterFilePath(); -- 2.39.2