fix translation of \nobreakdash in tex2lyx

[lyx.git] / src / tex2lyx / preamble.cpp

diff --git a/src/tex2lyx/preamble.cpp b/src/tex2lyx/preamble.cpp
index 3c4d5805a474cad87ac8f8ce9d9a44b5e3a5cf7a..42f9d33cb21024e20c9c9013f4dc95f573b9e372 100644 (file)
--- a/src/tex2lyx/preamble.cpp
+++ b/src/tex2lyx/preamble.cpp
@@ -56,6 +56,9 @@ namespace {
 //"chinese-simplified", "chinese-traditional", "japanese", "korean"
 // Both changes require first that support for non-babel languages (CJK,
 // armtex) is added.
+// add polutonikogreek for lyxformat 338
+// add mongolian for lyxformat 342
+// add turkmen for lyxformat 383
 const char * const known_languages[] = { "afrikaans", "albanian", "american",
 "arabic", "arabtex", "austrian", "bahasa", "bahasai", "bahasam", "basque",
 "belarusian", "brazil", "brazilian", "breton", "british", "bulgarian",
@@ -63,11 +66,12 @@ const char * const known_languages[] = { "afrikaans", "albanian", "american",
 "english", "esperanto", "estonian", "finnish", "francais", "french",
 "frenchb", "frenchle", "frenchpro", "galician", "german", "germanb", "greek",
 "hebrew", "icelandic", "indon", "indonesian", "interlingua", "irish",
-"italian", "kazakh", "latvian", "lithuanian", "lsorbian", "magyar", "malay",
-"meyalu", "naustrian", "ngerman", "ngermanb", "norsk", "nynorsk", "polish",
-"portuges", "portuguese", "romanian", "russian", "russianb", "scottish",
-"serbian", "serbian-latin", "slovak", "slovene", "spanish", "swedish",
-"thai", "turkish", "ukraineb", "ukrainian", "usorbian", "welsh", 0};
+"italian", "kazakh", "latin", "latvian", "lithuanian", "lsorbian", "magyar",
+"malay", "meyalu", "naustrian", "ngerman", "ngermanb", "norsk", "nynorsk",
+"polish", "portuges", "portuguese", "romanian", "russian", "russianb",
+"samin", "scottish", "serbian", "serbian-latin", "slovak", "slovene",
+"spanish", "swedish", "thai", "turkish", "ukraineb", "ukrainian",
+"usorbian", "vietnam", "welsh", 0};
 
 const char * const known_bahasa_languages[] = {"bahasa", "bahasai",
                                                "indon", "indonesian", 0};
@@ -88,11 +92,13 @@ const char * const known_ukrainian_languages[] = {"ukrainian", "ukraineb", 0};
 const char * const known_english_quotes_languages[] = {"american", "canadian",
 "english", "esperanto", "hebrew", "irish", "scottish", "thai", 0};
 
-//add this to known_french_quotes_languages when updating to lyxformat 327:
-//"spanish-mexico"
+//add this to known_french_quotes_languages when updating to
+// - lyxformat 327: "spanish-mexico"
+// - lyxformat 338: "polutonikogreek"
+// - lyxformat 383: "turkmen"
 const char * const known_french_quotes_languages[] = {"albanian", "arabic",
 "basque", "canadien", "catalan", "galician", "greek", "italian", "norsk",
-"nynorsk", "spanish", "turkish", 0};
+"nynorsk", "spanish", "turkish", "vietnam", 0};
 
 const char * const known_german_quotes_languages[] = {"austrian", "bulgarian",
 "czech", "icelandic", "lithuanian", "lsorbian", "naustrian", "serbian",
@@ -133,6 +139,7 @@ const char * const known_coded_paper_margins[] = { "leftmargin", "topmargin",
 // default settings
 ostringstream h_preamble;
 string h_textclass               = "article";
+string h_use_default_options     = "false";
 string h_options                 = string();
 string h_language                = "english";
 string h_inputencoding           = "auto";
@@ -160,8 +167,7 @@ string h_pdf_bookmarksopenlevel  = "1";
 string h_pdf_breaklinks          = "0";
 string h_pdf_pdfborder           = "0";
 string h_pdf_colorlinks          = "0";
-string h_pdf_backref             = "0";
-string h_pdf_pagebackref         = "0";
+string h_pdf_backref             = "section";
 string h_pdf_pdfusetitle         = "1";
 string h_pdf_pagemode;
 string h_pdf_quoted_options;
@@ -551,7 +557,8 @@ void end_preamble(ostream & os, TextClass const & /*textclass*/)
                os << "\\begin_preamble\n" << h_preamble.str() << "\n\\end_preamble\n";
        if (!h_options.empty())
                os << "\\options " << h_options << "\n";
-       os << "\\language " << h_language << "\n"
+       os << "\\use_default_options " << h_use_default_options << "\n"
+          << "\\language " << h_language << "\n"
           << "\\inputencoding " << h_inputencoding << "\n"
           << "\\font_roman " << h_font_roman << "\n"
           << "\\font_sans " << h_font_sans << "\n"
@@ -584,7 +591,6 @@ void end_preamble(ostream & os, TextClass const & /*textclass*/)
                      "\\pdf_pdfborder " << h_pdf_pdfborder << "\n"
                      "\\pdf_colorlinks " << h_pdf_colorlinks << "\n"
                      "\\pdf_backref " << h_pdf_backref << "\n"
-                     "\\pdf_pagebackref " << h_pdf_pagebackref << "\n"
                      "\\pdf_pdfusetitle " << h_pdf_pdfusetitle << '\n';
                if (!h_pdf_pagemode.empty())
                        os << "\\pdf_pagemode " << h_pdf_pagemode << '\n';