fix merged build

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 918fc0b3c695203b97f0a43cd345f2801d2ca26a..757b3af8dc1745e1ed4b48a428fff26b09718bde 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -197,7 +197,7 @@ static docstring const changetracking_none_def = from_ascii(
 static docstring const textgreek_def = from_ascii(
        "\\providecommand*{\\perispomeni}{\\char126}\n"
        "\\AtBeginDocument{\\DeclareRobustCommand{\\greektext}{%\n"
-       "  \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}\n"
+       "  \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}%\n"
        "  \\renewcommand{\\~}{\\perispomeni}\n"
        "}}\n"
        "\\DeclareRobustCommand{\\textgreek}[1]{\\leavevmode{\\greektext #1}}\n"
@@ -368,12 +368,10 @@ void LaTeXFeatures::useInsetLayout(InsetLayout const & lay)
 {
        docstring const & lname = lay.name();
        DocumentClass const & tclass = params_.documentClass();
-       if (!tclass.hasInsetLayout(lname)) {
-               lyxerr << "LaTeXFeatures::useInsetLayout: layout `"
-                      << to_utf8(lname) << "' does not exist in this class"
-                      << endl;
+
+       // this is a default inset layout, nothing useful here
+       if (!tclass.hasInsetLayout(lname))
                return;
-       }
        // Is this layout already in usedInsetLayouts?
        if (find(usedInsetLayouts_.begin(), usedInsetLayouts_.end(), lname) 
                        != usedInsetLayouts_.end())