mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-23 02:14:50 +00:00
Update tex2lyx to format 418. Nothing really to do other than write
what we expect to see. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40430 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
5d2d5e8ad5
commit
cad2ffea44
@ -410,6 +410,7 @@ Preamble::Preamble() : one_language(true)
|
|||||||
h_html_css_as_file = "0";
|
h_html_css_as_file = "0";
|
||||||
h_html_math_output = "0";
|
h_html_math_output = "0";
|
||||||
h_inputencoding = "auto";
|
h_inputencoding = "auto";
|
||||||
|
h_justification = "true";
|
||||||
h_language = "english";
|
h_language = "english";
|
||||||
h_language_package = "none";
|
h_language_package = "none";
|
||||||
//h_listings_params;
|
//h_listings_params;
|
||||||
@ -950,6 +951,7 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc)
|
|||||||
<< "\\use_indices " << h_use_indices << "\n"
|
<< "\\use_indices " << h_use_indices << "\n"
|
||||||
<< "\\paperorientation " << h_paperorientation << '\n'
|
<< "\\paperorientation " << h_paperorientation << '\n'
|
||||||
<< "\\suppress_date " << h_suppress_date << '\n'
|
<< "\\suppress_date " << h_suppress_date << '\n'
|
||||||
|
<< "\\justification " << h_justification << '\n'
|
||||||
<< "\\use_refstyle " << h_use_refstyle << '\n';
|
<< "\\use_refstyle " << h_use_refstyle << '\n';
|
||||||
if (!h_fontcolor.empty())
|
if (!h_fontcolor.empty())
|
||||||
os << "\\fontcolor " << h_fontcolor << '\n';
|
os << "\\fontcolor " << h_fontcolor << '\n';
|
||||||
|
@ -99,6 +99,7 @@ private:
|
|||||||
std::string h_html_css_as_file;
|
std::string h_html_css_as_file;
|
||||||
std::string h_html_math_output;
|
std::string h_html_math_output;
|
||||||
std::string h_inputencoding;
|
std::string h_inputencoding;
|
||||||
|
std::string h_justification;
|
||||||
std::string h_language;
|
std::string h_language;
|
||||||
std::string h_language_package;
|
std::string h_language_package;
|
||||||
std::string h_listings_params;
|
std::string h_listings_params;
|
||||||
|
@ -31,7 +31,7 @@ extern char const * const lyx_version_info;
|
|||||||
// Do not remove the comment below, so we get merge conflict in
|
// Do not remove the comment below, so we get merge conflict in
|
||||||
// independent branches. Instead add your own.
|
// independent branches. Instead add your own.
|
||||||
#define LYX_FORMAT_LYX 418 // rgh: justification option
|
#define LYX_FORMAT_LYX 418 // rgh: justification option
|
||||||
#define LYX_FORMAT_TEX2LYX 417
|
#define LYX_FORMAT_TEX2LYX 418
|
||||||
|
|
||||||
#if LYX_FORMAT_FOR_TEX2LYX != LYX_FORMAT_FOR_LYX
|
#if LYX_FORMAT_FOR_TEX2LYX != LYX_FORMAT_FOR_LYX
|
||||||
#warning "tex2lyx produces an out of date file format."
|
#warning "tex2lyx produces an out of date file format."
|
||||||
|
Loading…
Reference in New Issue
Block a user