Fixed some lines that were too long. It compiled afterwards.

[lyx.git] / src / Encoding.cpp

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 6f009046a3ede0bcf08f0d6e1089cd165d01cf09..ae03c09b4869006f41363bf09f4bdca4e2112c66 100644 (file)
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -519,26 +519,32 @@ void Encodings::read(FileName const & encfile, FileName const & symbolsfile)
                        string const iconvname = lex.getString();
                        lex.next();
                        string const width = lex.getString();
-                       bool fixedwidth;
+                       bool fixedwidth;;
                        if (width == "fixed")
                                fixedwidth = true;
                        else if (width == "variable")
                                fixedwidth = false;
-                       else
+                       else {
+                                fixedwidth = false;
                                lex.printError("Encodings::read: "
                                               "Unknown width: `$$Token'");
+                        }
+                        
                        lex.next();
                        string const p = lex.getString();
                        Encoding::Package package;
                        if (p == "none")
-                               package = Encoding::none;
+                                package = Encoding::none;
                        else if (p == "inputenc")
                                package = Encoding::inputenc;
                        else if (p == "CJK")
                                package = Encoding::CJK;
-                       else
+                       else {
+                                package = Encoding::none;
                                lex.printError("Encodings::read: "
                                               "Unknown package: `$$Token'");
+                        }
+                        
                        LYXERR(Debug::INFO) << "Reading encoding " << name << endl;
                        encodinglist[name] = Encoding(name, latexname,
                                                      iconvname, fixedwidth,