multicol; small stuff

[lyx.git] / src / lyxtextclass.C

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 376f20975a3a8c714c03ce6974be2adcafc6994f..d44748b0e5cec4e526fcc78bc15a8bef6348f259 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -11,10 +11,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyxtextclass.h"
 #include "debug.h"
 #include "lyxlex.h"
@@ -64,6 +60,8 @@ LyXTextClass::LyXTextClass(string const & fn, string const & cln,
        opt_fontsize_ = "10|11|12";
        opt_pagestyle_ = "empty|plain|headings|fancy";
        provides_ = nothing;
+       titletype_ = TITLE_COMMAND_AFTER;
+       titlename_ = "maketitle";
        loaded = false;
 }
 
@@ -79,7 +77,7 @@ bool LyXTextClass::do_readStyle(LyXLex & lexrc, LyXLayout & lay)
                lay.reslabelfont.realize(defaultfont());
                return false; // no errors
        }
-       lyxerr << "Error parsing style `" << lay.name() << "'" << endl;
+       lyxerr << "Error parsing style `" << lay.name() << '\'' << endl;
        return true;
 }
 
@@ -107,10 +105,11 @@ enum TextClassTags {
        TC_RIGHTMARGIN,
        TC_FLOAT,
        TC_COUNTER,
-       TC_NOFLOAT
+       TC_NOFLOAT,
+       TC_TITLELATEXNAME,
+       TC_TITLELATEXTYPE
 };
 
-
 // Reads a textclass structure from file.
 bool LyXTextClass::Read(string const & filename, bool merge)
 {
@@ -137,6 +136,8 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                { "secnumdepth",     TC_SECNUMDEPTH },
                { "sides",           TC_SIDES },
                { "style",           TC_STYLE },
+               { "titlelatexname",  TC_TITLELATEXNAME },
+               { "titlelatextype",  TC_TITLELATEXTYPE },
                { "tocdepth",        TC_TOCDEPTH }
        };
 
@@ -149,7 +150,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                                     << MakeDisplayPath(filename)
                                     << endl;
 
-       LyXLex lexrc(textClassTags, TC_NOFLOAT);
+       LyXLex lexrc(textClassTags, TC_TITLELATEXTYPE);
        bool error = false;
 
        lexrc.setFile(filename);
@@ -228,7 +229,8 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                                string const style = subst(lexrc.getString(),
                                                     '_', ' ');
                                if (!delete_layout(style))
-                                       lyxerr << "Cannot delete style `" << style << "'" << endl;
+                                       lyxerr << "Cannot delete style `"
+                                              << style << '\'' << endl;
 //                                     lexrc.printError("Cannot delete style"
 //                                                      " `$$Token'");
                        }
@@ -326,13 +328,19 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                case TC_COUNTER:
                        readCounter(lexrc);
                        break;
+               case TC_TITLELATEXTYPE:
+                       readTitleType(lexrc);
+                       break;
+               case TC_TITLELATEXNAME:
+                       if (lexrc.next())
+                               titlename_ = lexrc.getString();
+                       break;
                case TC_NOFLOAT:
                        if (lexrc.next()) {
                                string const nofloat = lexrc.getString();
                                floatlist_->erase(nofloat);
                        }
                        break;
-
                }
        }
 
@@ -354,6 +362,33 @@ bool LyXTextClass::Read(string const & filename, bool merge)
 }
 
 
+void LyXTextClass::readTitleType(LyXLex & lexrc)
+{
+       keyword_item titleTypeTags[] = {
+               { "commandafter", TITLE_COMMAND_AFTER },
+               { "environment", TITLE_ENVIRONMENT }
+       };
+
+       pushpophelper pph(lexrc, titleTypeTags, TITLE_ENVIRONMENT);
+
+       int le = lexrc.lex();
+       switch (le) {
+       case LyXLex::LEX_UNDEF:
+               lexrc.printError("Unknown output type `$$Token'");
+               return;
+       case TITLE_COMMAND_AFTER:
+       case TITLE_ENVIRONMENT:
+               titletype_ = static_cast<LYX_TITLE_LATEX_TYPES>(le);
+               break;
+       default:
+               lyxerr << "Unhandled value " << le
+                      << " in LyXTextClass::readTitleType." << endl;
+
+               break;
+       }
+}
+
+
 void LyXTextClass::readOutputType(LyXLex & lexrc)
 {
        keyword_item outputTypeTags[] = {
@@ -888,6 +923,21 @@ int LyXTextClass::maxcounter() const
 }
 
 
+LYX_TITLE_LATEX_TYPES LyXTextClass::titletype() const
+{
+       return titletype_;
+}
+
+
+string const & LyXTextClass::titlename() const
+{
+       return titlename_;
+}
+
+
+
+
+
 int LyXTextClass::size() const
 {
        return layoutlist_.size();
@@ -898,10 +948,10 @@ ostream & operator<<(ostream & os, LyXTextClass::PageSides p)
 {
        switch (p) {
        case LyXTextClass::OneSide:
-               os << "1";
+               os << '1';
                break;
        case LyXTextClass::TwoSides:
-               os << "2";
+               os << '2';
                break;
        }
        return os;