anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set use_non_tex_fonts buffer parameter and default encoding correctly when we detect that xetex or luatex is used.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40765 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2012-02-16 10:40:02 +00:00
parent 220cbe0fd8
commit 586e0e6b8a
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tex2lyx/Preamble.cpp
View File

@ -410,6 +410,7 @@ Preamble::Preamble() : one_language(true)
h_font_sans = "default"; h_font_sans = "default";
h_font_typewriter = "default"; h_font_typewriter = "default";
h_font_default_family = "default"; h_font_default_family = "default";
h_use_non_tex_fonts = "false";
h_font_sc = "false"; h_font_sc = "false";
h_font_osf = "false"; h_font_osf = "false";
h_font_sf_scale = "100"; h_font_sf_scale = "100";
@ -593,8 +594,12 @@ void Preamble::handle_package(Parser &p, string const & name,
add_package(name, options); add_package(name, options);
string scale; string scale;
if (is_known(name, known_xetex_packages)) if (is_known(name, known_xetex_packages)) {
xetex = true; xetex = true;
h_use_non_tex_fonts = "true";
if (h_inputencoding == "auto")
p.setEncoding("utf8");
}
// roman fonts // roman fonts
if (is_known(name, known_roman_fonts)) { if (is_known(name, known_roman_fonts)) {
@ -887,6 +892,7 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc)
<< "\\font_sans " << h_font_sans << "\n" << "\\font_sans " << h_font_sans << "\n"
<< "\\font_typewriter " << h_font_typewriter << "\n" << "\\font_typewriter " << h_font_typewriter << "\n"
<< "\\font_default_family " << h_font_default_family << "\n" << "\\font_default_family " << h_font_default_family << "\n"
<< "\\use_non_tex_fonts " << h_use_non_tex_fonts << "\n"
<< "\\font_sc " << h_font_sc << "\n" << "\\font_sc " << h_font_sc << "\n"
<< "\\font_osf " << h_font_osf << "\n" << "\\font_osf " << h_font_osf << "\n"
<< "\\font_sf_scale " << h_font_sf_scale << "\n" << "\\font_sf_scale " << h_font_sf_scale << "\n"

1
src/tex2lyx/Preamble.h
View File

@ -92,6 +92,7 @@ private:
std::string h_font_sans; std::string h_font_sans;
std::string h_font_typewriter; std::string h_font_typewriter;
std::string h_font_default_family; std::string h_font_default_family;
std::string h_use_non_tex_fonts;
std::string h_font_sc; std::string h_font_sc;
std::string h_font_osf; std::string h_font_osf;
std::string h_font_sf_scale; std::string h_font_sf_scale;