isAvailable is static

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 280db235fd9eaf057f17b96adab1991365d013ac..53de012b389535734b9cdaf340d36cd3971a9606 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -566,7 +566,7 @@ string BufferParams::readToken(Lexer & lex, string const & token,
        } else if (token == "\\output_changes") {
                lex >> outputChanges;
        } else if (token == "\\branch") {
-               lex.next();
+               lex.eatLine();
                docstring branch = lex.getDocString();
                branchlist().add(branch);
                while (true) {
@@ -1900,7 +1900,7 @@ void BufferParams::writeEncodingPreamble(odocstream & os,
                }
                if (package == Encoding::CJK || features.mustProvide("CJK")) {
                        if (language->encoding()->name() == "utf8-cjk"
-                           && features.isAvailable("CJKutf8"))
+                           && LaTeXFeatures::isAvailable("CJKutf8"))
                                os << "\\usepackage{CJKutf8}\n";
                        else
                                os << "\\usepackage{CJK}\n";
@@ -1921,7 +1921,7 @@ void BufferParams::writeEncodingPreamble(odocstream & os,
                        break;
                case Encoding::CJK:
                        if (encoding().name() == "utf8-cjk"
-                           && features.isAvailable("CJKutf8"))
+                           && LaTeXFeatures::isAvailable("CJKutf8"))
                                os << "\\usepackage{CJKutf8}\n";
                        else
                                os << "\\usepackage{CJK}\n";