Revert part of 21965 which was debugging code.

[lyx.git] / src / TextClass.cpp

diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 16928031332bb1282a10d17074c7e69a618234c5..00cbf0941439fc5bbc89cea97c055c12ab2c8f36 100644 (file)
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -18,8 +18,8 @@
 
 #include "Color.h"
 #include "Counters.h"
-#include "debug.h"
-#include "gettext.h"
+#include "support/debug.h"
+#include "support/gettext.h"
 #include "Floating.h"
 #include "FloatList.h"
 #include "Layout.h"
@@ -52,6 +52,7 @@ using support::addName;
 
 extern FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
 
+
 namespace {
 
 class LayoutNamesEqual : public std::unary_function<LayoutPtr, bool> {
@@ -86,7 +87,7 @@ bool layout2layout(FileName const & filename, FileName const & tempfile)
                << ' ' << quoteName(tempfile.toFilesystemEncoding());
        string const command_str = command.str();
 
-       LYXERR(Debug::TCLASS) << "Running `" << command_str << '\'' << endl;
+       LYXERR(Debug::TCLASS, "Running `" << command_str << '\'');
 
        support::cmd_ret const ret =
                support::runCommand(command_str);
@@ -129,9 +130,9 @@ bool TextClass::isTeXClassAvailable() const
 }
 
 
-bool TextClass::do_readStyle(Lexer & lexrc, Layout & lay)
+bool TextClass::readStyle(Lexer & lexrc, Layout & lay)
 {
-       LYXERR(Debug::TCLASS) << "Reading style " << to_utf8(lay.name()) << endl;
+       LYXERR(Debug::TCLASS, "Reading style " << to_utf8(lay.name()));
        if (!lay.read(lexrc, *this)) {
                // Resolve fonts
                lay.resfont = lay.font;
@@ -176,7 +177,7 @@ enum TextClassTags {
 // Reads a textclass structure from file.
 bool TextClass::read(FileName const & filename, ReadType rt)
 {
-       if (!filename.isFileReadable()) {
+       if (!filename.isReadableFile()) {
                lyxerr << "Cannot read layout file `" << filename << "'."
                       << endl;
                return true;
@@ -211,19 +212,18 @@ bool TextClass::read(FileName const & filename, ReadType rt)
 
        switch (rt) {
        case BASECLASS:
-               LYXERR(Debug::TCLASS) << "Reading textclass ";
+               LYXERR(Debug::TCLASS, "Reading textclass ");
                break;
        case MERGE:
-               LYXERR(Debug::TCLASS) << "Reading input file ";
+               LYXERR(Debug::TCLASS, "Reading input file ");
          break;
        case MODULE:
-               LYXERR(Debug::TCLASS) << "Reading module file ";
+               LYXERR(Debug::TCLASS, "Reading module file ");
                break;
        default:
                BOOST_ASSERT(false);
        }
-       LYXERR(Debug::TCLASS) << to_utf8(makeDisplayPath(filename.absFilename()))
-               << endl;
+       LYXERR(Debug::TCLASS, to_utf8(makeDisplayPath(filename.absFilename())));
 
        Lexer lexrc(textClassTags,
                sizeof(textClassTags) / sizeof(textClassTags[0]));
@@ -298,16 +298,16 @@ bool TextClass::read(FileName const & filename, ReadType rt)
                                                + lexrc.getString() + " is probably not valid UTF-8!";
                                        lexrc.printError(s.c_str());
                                        Layout lay;
-                                       error = do_readStyle(lexrc, lay);
+                                       error = readStyle(lexrc, lay);
                                } else if (hasLayout(name)) {
                                        Layout * lay = operator[](name).get();
-                                       error = do_readStyle(lexrc, *lay);
+                                       error = readStyle(lexrc, *lay);
                                } else {
                                        Layout lay;
                                        lay.setName(name);
                                        if (le == TC_ENVIRONMENT)
                                                lay.is_environment = true;
-                                       error = do_readStyle(lexrc, lay);
+                                       error = readStyle(lexrc, lay);
                                        if (!error)
                                                layoutlist_.push_back(
                                                        boost::shared_ptr<Layout>(new Layout(lay))
@@ -332,7 +332,7 @@ bool TextClass::read(FileName const & filename, ReadType rt)
                        if (lexrc.next()) {
                                docstring const style = from_utf8(subst(lexrc.getString(),
                                                     '_', ' '));
-                               if (!delete_layout(style))
+                               if (!deleteLayout(style))
                                        lyxerr << "Cannot delete style `"
                                               << to_utf8(style) << '\'' << endl;
 //                                     lexrc.printError("Cannot delete style"
@@ -444,28 +444,25 @@ bool TextClass::read(FileName const & filename, ReadType rt)
        }
 
        if (format != FORMAT) {
-               LYXERR(Debug::TCLASS) << "Converting layout file from format "
-                                     << format << " to " << FORMAT << endl;
+               LYXERR(Debug::TCLASS, "Converting layout file from format "
+                                     << format << " to " << FORMAT);
                FileName const tempfile(support::tempName());
                error = !layout2layout(filename, tempfile);
                if (!error)
                        error = read(tempfile, rt);
-               support::unlink(tempfile);
+               tempfile.removeFile();
                return error;
        }
 
        if (rt == MODULE) 
-               LYXERR(Debug::TCLASS) << "Finished reading module file "
-                               << to_utf8(makeDisplayPath(filename.absFilename()))
-                               << endl;
+               LYXERR(Debug::TCLASS, "Finished reading module file "
+                               << to_utf8(makeDisplayPath(filename.absFilename())));
        else if (rt == MERGE)
-               LYXERR(Debug::TCLASS) << "Finished reading input file "
-                               << to_utf8(makeDisplayPath(filename.absFilename()))
-                               << endl;
+               LYXERR(Debug::TCLASS, "Finished reading input file "
+                               << to_utf8(makeDisplayPath(filename.absFilename())));
        else { // we are at top level here.
-               LYXERR(Debug::TCLASS) << "Finished reading textclass "
-                                     << to_utf8(makeDisplayPath(filename.absFilename()))
-                                     << endl;
+               LYXERR(Debug::TCLASS, "Finished reading textclass "
+                                     << to_utf8(makeDisplayPath(filename.absFilename())));
                if (defaultlayout_.empty()) {
                        lyxerr << "Error: Textclass '" << name_
                               << "' is missing a defaultstyle." << endl;
@@ -488,9 +485,8 @@ bool TextClass::read(FileName const & filename, ReadType rt)
                                                         toclevel);
                        }
                }
-               LYXERR(Debug::TCLASS)
-                       << "Minimum TocLevel is " << min_toclevel_
-                       << ", maximum is " << max_toclevel_ <<endl;
+               LYXERR(Debug::TCLASS, "Minimum TocLevel is " << min_toclevel_
+                       << ", maximum is " << max_toclevel_);
 
        }
 
@@ -752,7 +748,6 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name)
                }
        }
 
-       //
        // Here add element to list if getout == true
        if (getout) {
                InsetLayout il;
@@ -770,6 +765,9 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name)
                il.forceltr = forceltr;
                il.keepempty = keepempty;
                il.font = font;
+               // The label font is generally used as-is without
+               // any realization against a given context.
+               labelfont.realize(sane_font);
                il.labelfont = labelfont;
                il.bgcolor = bgcolor;           
                il.preamble = preamble;
@@ -901,6 +899,7 @@ enum CounterTags {
        CT_END
 };
 
+
 void TextClass::readCounter(Lexer & lexrc)
 {
        keyword_item counterTags[] = {
@@ -932,13 +931,9 @@ void TextClass::readCounter(Lexer & lexrc)
                        lexrc.next();
                        name = lexrc.getDocString();
                        if (counters_->hasCounter(name))
-                               LYXERR(Debug::TCLASS) 
-                                       << "Reading existing counter " 
-                                       << to_utf8(name) << endl;
+                               LYXERR(Debug::TCLASS, "Reading existing counter " << to_utf8(name));
                        else
-                               LYXERR(Debug::TCLASS) 
-                                       << "Reading new counter " 
-                                       << to_utf8(name) << endl;
+                               LYXERR(Debug::TCLASS, "Reading new counter " << to_utf8(name));
                        break;
                case CT_WITHIN:
                        lexrc.next();
@@ -1020,12 +1015,11 @@ LayoutPtr const & TextClass::operator[](docstring const & name) const
                BOOST_ASSERT(false);
        }
 
-       return (*cit);
+       return *cit;
 }
 
 
-
-bool TextClass::delete_layout(docstring const & name)
+bool TextClass::deleteLayout(docstring const & name)
 {
        if (name == defaultLayoutName())
                return false;
@@ -1105,6 +1099,8 @@ InsetLayout const & TextClass::insetlayout(docstring const & name) const
        }
        static InsetLayout empty;
        empty.labelstring = from_utf8("UNDEFINED");
+       empty.labelfont = sane_font;
+       empty.labelfont.setColor(Color_error);
        empty.bgcolor = Color_error;
        return empty;
 }
@@ -1178,7 +1174,7 @@ docstring const & TextClass::preamble() const
 }
 
 
-TextClass::PageSides TextClass::sides() const
+PageSides TextClass::sides() const
 {
        return sides_;
 }
@@ -1250,13 +1246,13 @@ bool TextClass::hasTocLevels() const
 }
 
 
-ostream & operator<<(ostream & os, TextClass::PageSides p)
+ostream & operator<<(ostream & os, PageSides p)
 {
        switch (p) {
-       case TextClass::OneSide:
+       case OneSide:
                os << '1';
                break;
-       case TextClass::TwoSides:
+       case TwoSides:
                os << '2';
                break;
        }