preamble.cpp: handle the (n)german options correctly

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21998 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index 94853651b0b69d62bd024d516d33d0b980f128a9..414ab15f7988be283ef1b23897c43f8e43ccb693 100644 (file)
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -68,8 +68,8 @@ const char * const known_languages[] = { "afrikaans", "american", "arabic",
 
 const char * const known_french_languages[] = {"french", "frenchb", "francais",
                                                "frenchle", "frenchpro", 0};
-const char * const known_german_languages[] = {"german", "germanb",    "ngerman",
-                                               "ngermanb", 0};
+const char * const known_german_languages[] = {"german", "germanb", 0};
+const char * const known_ngerman_languages[] = {"ngerman", "ngermanb", 0};
 const char * const known_russian_languages[] = {"russian", "russianb", 0};
 const char * const known_ukrainian_languages[] = {"ukrainian", "ukraineb", 0};
 
@@ -282,6 +282,8 @@ void handle_package(string const & name, string const & opts)
                if (is_known(name, known_french_languages))
                        h_language = "french";
                else if (is_known(name, known_german_languages))
+                       h_language = "german";
+               else if (is_known(name, known_ngerman_languages))
                        h_language = "ngerman";
                else if (is_known(name, known_russian_languages))
                        h_language = "russian";
@@ -494,6 +496,8 @@ TextClass const parse_preamble(Parser & p, ostream & os, string const & forcecla
                        if (is_known(h_language, known_french_languages))
                                h_language = "french";
                        else if (is_known(h_language, known_german_languages))
+                               h_language = "german";
+                       else if (is_known(h_language, known_ngerman_languages))
                                h_language = "ngerman";
                        else if (is_known(h_language, known_russian_languages))
                                h_language = "russian";