The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 8863ac62aa25ea11dc9ac78c525d01aee3defc23 Author: Georg Baum <[email protected]> Date: Sat Oct 6 00:29:16 2012 +0200 Really output file format 444 The previous output was read correctly by LyX as well, but the new version is more similar to the files written by LyX. Also update TODO with recent file format changes. diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp index 6486307..6ea980e 100644 --- a/src/tex2lyx/Preamble.cpp +++ b/src/tex2lyx/Preamble.cpp @@ -446,6 +446,7 @@ Preamble::Preamble() : one_language(true), title_layout_found(false) h_font_roman = "default"; h_font_sans = "default"; h_font_typewriter = "default"; + h_font_math = "auto"; h_font_default_family = "default"; h_use_non_tex_fonts = "false"; h_font_sc = "false"; @@ -506,7 +507,7 @@ Preamble::Preamble() : one_language(true), title_layout_found(false) h_use_indices = "false"; h_use_geometry = "false"; h_use_default_options = "false"; - h_use_hyperref = "0"; + h_use_hyperref = "false"; h_use_refstyle = "0"; h_use_packages["amsmath"] = "1"; h_use_packages["amssymb"] = "0"; @@ -522,7 +523,7 @@ void Preamble::handle_hyperref(vector<string> & options) { // FIXME swallow inputencoding changes that might surround the // hyperref setup if it was written by LyX - h_use_hyperref = "1"; + h_use_hyperref = "true"; // swallow "unicode=true", since LyX does always write that vector<string>::iterator it = find(options.begin(), options.end(), "unicode=true"); @@ -990,6 +991,7 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc) << "\\font_roman " << h_font_roman << "\n" << "\\font_sans " << h_font_sans << "\n" << "\\font_typewriter " << h_font_typewriter << "\n" + << "\\font_math " << h_font_math << "\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" @@ -1008,7 +1010,7 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc) os << "\\paperfontsize " << h_paperfontsize << "\n" << "\\spacing " << h_spacing << "\n" << "\\use_hyperref " << h_use_hyperref << '\n'; - if (h_use_hyperref == "1") { + if (h_use_hyperref == "true") { if (!h_pdf_title.empty()) os << "\\pdf_title \"" << h_pdf_title << "\"\n"; if (!h_pdf_author.empty()) diff --git a/src/tex2lyx/Preamble.h b/src/tex2lyx/Preamble.h index bd95e37..2ce75fd 100644 --- a/src/tex2lyx/Preamble.h +++ b/src/tex2lyx/Preamble.h @@ -105,6 +105,7 @@ private: std::string h_float_placement; std::string h_fontcolor; std::string h_fontencoding; + std::string h_font_math; std::string h_font_roman; std::string h_font_sans; std::string h_font_typewriter; diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt index a1efc09..2bdc1d9 100644 --- a/src/tex2lyx/TODO.txt +++ b/src/tex2lyx/TODO.txt @@ -62,6 +62,20 @@ Format LaTeX feature LyX feature 411 support for polyglossia \language_package (the cases of no package, of babel and of custom package is supported) 415 undertilde.sty fonts 427 tipa.sty \begin{IPA}, \textipa InsetTIPA +434 libertine-type1, libertine.sty, \font_osf, \font_roman + libertine-legacy.sty +435 txtt LaTeX font \font_typewriter +436 mathdesign.sty \font_roman +437 TeX Gyre LaTeX fonts \font_* +438 \tone{51}, \tone{15}, \tone{45}, InsetTIPA + \tone{12}, \tone{454}, \toptiebar, + \bottomtiebar +439 MinionPro.sty \font_roman, \font_osf +440 MinionPro.sty, eulervm.sty \font_math +442 newtxmath.sty, \font_math +443 unicode-math.sty InsetMath* +444 biolinum-type1.sty, libertine.sty, \font_osf, \font_sans + libertine-legacy.sty General diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx index 06488f5..7d29cc8 100644 --- a/src/tex2lyx/test/CJK.lyx.lyx +++ b/src/tex2lyx/test/CJK.lyx.lyx @@ -23,6 +23,7 @@ \font_roman default \font_sans default \font_typewriter default +\font_math auto \font_default_family default \use_non_tex_fonts false \font_sc false @@ -36,7 +37,7 @@ \index_command default \paperfontsize default \spacing single -\use_hyperref 0 +\use_hyperref false \papersize default \use_geometry false \use_package amsmath 1 diff --git a/src/tex2lyx/test/DummyDocument.lyx b/src/tex2lyx/test/DummyDocument.lyx index d2c533f..1c78873 100644 --- a/src/tex2lyx/test/DummyDocument.lyx +++ b/src/tex2lyx/test/DummyDocument.lyx @@ -12,6 +12,7 @@ \font_roman default \font_sans default \font_typewriter default +\font_math auto \font_default_family default \use_non_tex_fonts false \font_sc false @@ -25,7 +26,7 @@ \index_command default \paperfontsize 12 \spacing onehalf -\use_hyperref 0 +\use_hyperref false \papersize a4paper \use_geometry false \use_package amsmath 2 diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx index cf1a7ed..731ab98 100644 --- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx +++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx @@ -23,6 +23,7 @@ \font_roman Linux Libertine O \font_sans Linux Biolinum O \font_typewriter Linux Biolinum O +\font_math auto \font_default_family default \use_non_tex_fonts true \font_sc false @@ -36,7 +37,7 @@ \index_command default \paperfontsize default \spacing single -\use_hyperref 0 +\use_hyperref false \papersize default \use_geometry false \use_package amsmath 1 diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx index 4a8e09a..f1412b5 100644 --- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx +++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx @@ -47,6 +47,7 @@ \font_roman default \font_sans default \font_typewriter default +\font_math auto \font_default_family default \use_non_tex_fonts false \font_sc false @@ -60,7 +61,7 @@ \index_command default \paperfontsize 12 \spacing other 1.2 -\use_hyperref 0 +\use_hyperref false \papersize b4paper \use_geometry true \use_package amsmath 2 diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx index 075f3e8..d1acb84 100644 --- a/src/tex2lyx/test/test-insets.lyx.lyx +++ b/src/tex2lyx/test/test-insets.lyx.lyx @@ -18,6 +18,7 @@ \font_roman default \font_sans default \font_typewriter default +\font_math auto \font_default_family default \use_non_tex_fonts false \font_sc false @@ -31,7 +32,7 @@ \index_command default \paperfontsize 12 \spacing onehalf -\use_hyperref 0 +\use_hyperref false \papersize a4paper \use_geometry false \use_package amsmath 2 diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx index f9f8966..2bc1882 100644 --- a/src/tex2lyx/test/test-structure.lyx.lyx +++ b/src/tex2lyx/test/test-structure.lyx.lyx @@ -51,6 +51,7 @@ logicalmkup \font_roman default \font_sans default \font_typewriter default +\font_math auto \font_default_family default \use_non_tex_fonts false \font_sc false @@ -65,7 +66,7 @@ logicalmkup \index_command default \paperfontsize default \spacing single -\use_hyperref 0 +\use_hyperref false \papersize legalpaper \use_geometry false \use_package amsmath 1 diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx index 666a078..a0ddb99 100644 --- a/src/tex2lyx/test/test.lyx.lyx +++ b/src/tex2lyx/test/test.lyx.lyx @@ -23,6 +23,7 @@ \font_roman default \font_sans default \font_typewriter default +\font_math auto \font_default_family default \use_non_tex_fonts false \font_sc false @@ -36,7 +37,7 @@ \index_command default \paperfontsize 11 \spacing single -\use_hyperref 0 +\use_hyperref false \papersize default \use_geometry false \use_package amsmath 1 ----------------------------------------------------------------------- Summary of changes: src/tex2lyx/Preamble.cpp | 8 +++++--- src/tex2lyx/Preamble.h | 1 + src/tex2lyx/TODO.txt | 14 ++++++++++++++ src/tex2lyx/test/CJK.lyx.lyx | 3 ++- src/tex2lyx/test/DummyDocument.lyx | 3 ++- src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx | 3 ++- .../test/box-color-size-space-align.lyx.lyx | 3 ++- src/tex2lyx/test/test-insets.lyx.lyx | 3 ++- src/tex2lyx/test/test-structure.lyx.lyx | 3 ++- src/tex2lyx/test/test.lyx.lyx | 3 ++- 10 files changed, 34 insertions(+), 10 deletions(-) hooks/post-receive -- The LyX Source Repository
