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 64863076530c62c6a225d3485c968b6bf45033a2..6ea980eb1db69c5ab1ed0b0d8a1cc735e1638523 100644 (file)
--- 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 bd95e370b06872afb1f9d59c6ebdefa580ab5027..2ce75fd0653c0fa4f0a6111cc3940d40a2cc133e 100644 (file)
--- 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 a1efc09c97964d037fe6cfa957a510bd033e3b3f..2bdc1d94aaf754fb4523d01c13a97fc16048e4b2 100644 (file)
--- 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 06488f5565c971d2d0d6a0d7664d2573e1352f16..7d29cc858ce09ba7555ce394914f1ad2b3515bc7 100644 (file)
--- 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 d2c533f8abf91f7c5c13ef23427bd689197340e7..1c788731787d3eb09b6b779cdc0a32ba205321e8 100644 (file)
--- 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 cf1a7ed58ec9d1b128375343923667e319ec1fa9..731ab9897b5b0565c1c88db883aa7c13d184fea0 100644 (file)
--- 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 4a8e09a28f750fa9637fe01211dfb8ae85eaabda..f1412b5ca381b47c8eb7117b789d8c837d276a2e 100644 (file)
--- 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 075f3e8839fe7278eb2a196f1ffdfeb7aa4f9049..d1acb84042eed8ad7f4c478fab30e1319647fce6 100644 (file)
--- 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 f9f89661bed943667235b30e005e2b612893b974..2bc1882474f97a9403ddd8c9a4c190f844631a48 100644 (file)
--- 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 666a0788e6b077ff7d7be1ca42e819d575ee245a..a0ddb99cb487c052ec1132fb3b7be918e8f6c6bc 100644 (file)
--- 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