From c669b6f4d2ecd01d009e195fc37033f6cf75e113 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@lyx.org>
Date: Tue, 19 Mar 2013 01:18:38 +0100
Subject: [PATCH] tex2lyx: support for Iwona fonts

- also correct the support for the Kurier fonts. Thanks to our cleaner implementation, some code can now go.
---
 src/tex2lyx/Preamble.cpp | 26 ++------------------------
 src/tex2lyx/TODO.txt     |  2 ++
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 6c84f06634..e757bc7c83 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -129,8 +129,8 @@ const char * const known_roman_fonts[] = { "ae", "beraserif", "bookman",
 "tgbonum", "tgchorus", "tgpagella", "tgschola", "tgtermes", "utopia", 0};
 
 const char * const known_sans_fonts[] = { "avant", "berasans", "biolinum-type1",
-"cmbr", "cmss", "helvet", "iwona", "iwonal", "kurier", "kurierl", "lmss",
-"tgadventor", "tgheros", 0};
+"cmbr", "cmss", "helvet", "iwona", "iwonac", "iwonal", "iwonalc", "kurier",
+"kurierc", "kurierl", "kurierlc", "lmss", "tgadventor", "tgheros", 0};
 
 const char * const known_kurier_fonts[] = { "kurier", "kurierl",
 "kurier-condensed", "kurier-light-condensed", 0};
@@ -1498,12 +1498,6 @@ void Preamble::parse(Parser & p, string const & forceclass,
 				p.skip_spaces();
 				in_lyx_preamble = true;
 			}
-			if (name == "\\bfdefault")
-				// LyX re-adds this if a kurier font is used
-				if (is_known(h_font_sans, known_kurier_fonts) && body == "b") {
-					p.skip_spaces();
-					in_lyx_preamble = true;
-				}
 
 			// remove the lyxdot definition that is re-added by LyX
 			// if necessary
@@ -1534,22 +1528,6 @@ void Preamble::parse(Parser & p, string const & forceclass,
 			in_lyx_preamble = was_in_lyx_preamble;
 		}
 
-		else if (t.cs() == "edef"){
-			// we only support this for kurier fonts
-			string const command = p.next_token().asInput();
-			p.get_token();
-			if (command == "\\sfdefault") {
-				p.getArg('{', '}');
-				if (h_font_sans == "kurier")
-					h_font_sans = "kurier-condensed";
-				if (h_font_sans == "kurierl")
-					h_font_sans = "kurier-light-condensed";
-				p.skip_spaces();
-			}
-			else
-				h_preamble << "\\edef" << command << "{" << p.getArg('{', '}') << "}\n";
-		}
-
 		else if (t.cs() == "documentclass") {
 			vector<string>::iterator it;
 			vector<string> opts = split_options(p.getArg('[', ']'));
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 1aa13fe726..97b4ae7747 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -80,6 +80,7 @@ Format LaTeX feature                        LyX feature
 459    beamer: \begin{frame},               \begin_layout Frame
        \begin{frame}[plain],                \begin_layout PlainFrame
        \begin{frame}[fragile]               \begin_layout FragileFrame
+461   support for kurier math font (the other kurier fonts are already supported)
 462    New libertine LaTeX fonts:
        \usepackage[scale|scaled|ttscale=$val]{libertineMono-type1}
                                             \font_typewriter
@@ -97,6 +98,7 @@ Format LaTeX feature                        LyX feature
       \twocolumn[]{}{}                      Layout Twocolumn, InsetArgument
       \item[]<>                             InsetArgument
       \begin{enumerate|itemize|...}[]       InsetArgument
+467   support for iwona math font (the other iwona fonts are already supported)
 
 General
 
-- 
2.39.2