X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.cpp;h=13adf04675cdf0a43e6673bded0843fd5f566558;hb=b271e3e06d778dbe7f20973c718f06d8aac0cf6f;hp=d83f273e9cab70d25f990fbd1aa6559e527af899;hpb=88177a89cb15a528f462dc1645397f76deda44f5;p=lyx.git diff --git a/src/TextClass.cpp b/src/TextClass.cpp index d83f273e9c..13adf04675 100644 --- a/src/TextClass.cpp +++ b/src/TextClass.cpp @@ -15,60 +15,53 @@ #include #include "TextClass.h" -#include "debug.h" -#include "Lexer.h" + +#include "LayoutFile.h" +#include "Color.h" #include "Counters.h" -#include "gettext.h" #include "Floating.h" #include "FloatList.h" +#include "Layout.h" +#include "Lexer.h" +#include "Font.h" #include "frontends/alert.h" -#include "support/lstrings.h" -#include "support/lyxlib.h" +#include "support/debug.h" +#include "support/ExceptionMessage.h" +#include "support/FileName.h" #include "support/filetools.h" +#include "support/gettext.h" +#include "support/lstrings.h" #include "support/os.h" -#include -namespace fs = boost::filesystem; - +#include #include +#include "boost/assert.hpp" -namespace lyx { - -using support::FileName; -using support::libFileSearch; -using support::makeDisplayPath; -using support::quoteName; -using support::rtrim; -using support::subst; -using support::addName; - -using std::endl; -using std::find_if; -using std::remove_if; -using std::string; -using std::ostream; +using namespace std; +using namespace lyx::support; +namespace lyx { namespace { -class LayoutNamesEqual : public std::unary_function { +class LayoutNamesEqual : public unary_function { public: LayoutNamesEqual(docstring const & name) : name_(name) {} - bool operator()(Layout_ptr const & c) const + bool operator()(Layout const & c) const { - return c->name() == name_; + return c.name() == name_; } private: docstring name_; }; -int const FORMAT = 4; +int const FORMAT = 6; bool layout2layout(FileName const & filename, FileName const & tempfile) @@ -80,16 +73,16 @@ bool layout2layout(FileName const & filename, FileName const & tempfile) return false; } - std::ostringstream command; - command << support::os::python() << ' ' << quoteName(script.toFilesystemEncoding()) + ostringstream command; + command << os::python() << ' ' << quoteName(script.toFilesystemEncoding()) << ' ' << quoteName(filename.toFilesystemEncoding()) << ' ' << 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); + cmd_ret const ret = + runCommand(command_str); if (ret.first != 0) { lyxerr << "Could not run layout conversion " "script layout2layout.py." << endl; @@ -98,14 +91,31 @@ bool layout2layout(FileName const & filename, FileName const & tempfile) return true; } + +std::string translateRT(TextClass::ReadType rt) +{ + switch (rt) { + case TextClass::BASECLASS: + return "textclass"; + case TextClass::MERGE: + return "input file"; + case TextClass::MODULE: + return "module file"; + } + // shutup warning + return string(); +} + } // namespace anon -TextClass::TextClass(string const & fn, string const & cln, - string const & desc, bool texClassAvail ) - : name_(fn), latexname_(cln), description_(desc), - floatlist_(new FloatList), ctrs_(new Counters), - texClassAvail_(texClassAvail) +docstring const TextClass::emptylayout_ = from_ascii("PlainLayout"); + + +InsetLayout DocumentClass::empty_insetlayout_; + + +TextClass::TextClass() { outputType_ = LATEX; columns_ = 1; @@ -113,34 +123,31 @@ TextClass::TextClass(string const & fn, string const & cln, secnumdepth_ = 3; tocdepth_ = 3; pagestyle_ = "default"; - defaultfont_ = Font(Font::ALL_SANE); + defaultfont_ = sane_font; opt_fontsize_ = "10|11|12"; opt_pagestyle_ = "empty|plain|headings|fancy"; titletype_ = TITLE_COMMAND_AFTER; titlename_ = "maketitle"; loaded_ = false; + // a hack to make this available for translation + // i'm sure there must be a better way (rgh) + _("PlainLayout"); } -bool TextClass::isTeXClassAvailable() const -{ - return texClassAvail_; -} - - -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; - lay.resfont.realize(defaultfont()); - lay.reslabelfont = lay.labelfont; - lay.reslabelfont.realize(defaultfont()); - return false; // no errors + lyxerr << "Error parsing style `" << to_utf8(lay.name()) << '\'' << endl; + return false; } - lyxerr << "Error parsing style `" << to_utf8(lay.name()) << '\'' << endl; - return true; + // Resolve fonts + lay.resfont = lay.font; + lay.resfont.realize(defaultfont_); + lay.reslabelfont = lay.labelfont; + lay.reslabelfont.realize(defaultfont_); + return true; // no errors } @@ -149,7 +156,6 @@ enum TextClassTags { TC_INPUT, TC_STYLE, TC_DEFAULTSTYLE, - TC_CHARSTYLE, TC_INSETLAYOUT, TC_ENVIRONMENT, TC_NOSTYLE, @@ -162,6 +168,7 @@ enum TextClassTags { TC_CLASSOPTIONS, TC_PREAMBLE, TC_PROVIDES, + TC_REQUIRES, TC_LEFTMARGIN, TC_RIGHTMARGIN, TC_FLOAT, @@ -174,16 +181,15 @@ enum TextClassTags { // Reads a textclass structure from file. -bool TextClass::read(FileName const & filename, bool merge) +bool TextClass::read(FileName const & filename, ReadType rt) { - if (!support::isFileReadable(filename)) { + if (!filename.isReadableFile()) { lyxerr << "Cannot read layout file `" << filename << "'." << endl; - return true; + return false; } keyword_item textClassTags[] = { - { "charstyle", TC_CHARSTYLE }, { "classoptions", TC_CLASSOPTIONS }, { "columns", TC_COLUMNS }, { "counter", TC_COUNTER }, @@ -201,6 +207,7 @@ bool TextClass::read(FileName const & filename, bool merge) { "pagestyle", TC_PAGESTYLE }, { "preamble", TC_PREAMBLE }, { "provides", TC_PROVIDES }, + { "requires", TC_REQUIRES }, { "rightmargin", TC_RIGHTMARGIN }, { "secnumdepth", TC_SECNUMDEPTH }, { "sides", TC_SIDES }, @@ -210,14 +217,32 @@ bool TextClass::read(FileName const & filename, bool merge) { "tocdepth", TC_TOCDEPTH } }; - if (!merge) - LYXERR(Debug::TCLASS) << "Reading textclass " - << to_utf8(makeDisplayPath(filename.absFilename())) - << endl; - else - LYXERR(Debug::TCLASS) << "Reading input file " - << to_utf8(makeDisplayPath(filename.absFilename())) - << endl; + LYXERR(Debug::TCLASS, "Reading " + translateRT(rt) + ": " + + to_utf8(makeDisplayPath(filename.absFilename()))); + + // Define the `empty' layout used in table cells, ert, etc. Note that + // we do this before loading any layout file, so that classes can + // override features of this layout if they should choose to do so. + if (rt == BASECLASS) { + static char const * s = "Margin Static\n" + "LatexType Paragraph\n" + "LatexName dummy\n" + "Align Block\n" + "AlignPossible Left, Right, Center\n" + "LabelType No_Label\n" + "End"; + istringstream ss(s); + Lexer lex(textClassTags, sizeof(textClassTags) / sizeof(textClassTags[0])); + lex.setStream(ss); + Layout lay; + lay.setName(emptylayout_); + if (!readStyle(lex, lay)) { + // The only way this happens is because the hardcoded layout above + // is wrong. + BOOST_ASSERT(false); + }; + layoutlist_.push_back(lay); + } Lexer lexrc(textClassTags, sizeof(textClassTags) / sizeof(textClassTags[0])); @@ -263,10 +288,9 @@ bool TextClass::read(FileName const & filename, bool merge) "layout"); if (tmp.empty()) { - lexrc.printError("Could not find input" - "file: " + inc); + lexrc.printError("Could not find input file: " + inc); error = true; - } else if (read(tmp, true)) { + } else if (!read(tmp, MERGE)) { lexrc.printError("Error reading input" "file: " + tmp.absFilename()); error = true; @@ -292,31 +316,34 @@ bool TextClass::read(FileName const & filename, bool merge) + lexrc.getString() + " is probably not valid UTF-8!"; lexrc.printError(s.c_str()); Layout lay; - error = do_readStyle(lexrc, lay); + //FIXME If we're just dropping this layout, do we really + //care whether there's an error?? Or should we just set + //error to true, since we couldn't even read the name? + error = !readStyle(lexrc, lay); } else if (hasLayout(name)) { - Layout * lay = operator[](name).get(); - error = do_readStyle(lexrc, *lay); + Layout & lay = operator[](name); + 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(new Layout(lay)) - ); + layoutlist_.push_back(lay); if (defaultlayout_.empty()) { - // We do not have a default - // layout yet, so we choose - // the first layout we - // encounter. + // We do not have a default layout yet, so we choose + // the first layout we encounter. defaultlayout_ = name; } } } else { + //FIXME Should we also eat the style here? viz: + //Layout lay; + //readStyle(lexrc, lay); + //as above... lexrc.printError("No name given for style: `$$Token'."); error = true; } @@ -326,11 +353,9 @@ bool TextClass::read(FileName const & filename, bool merge) 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" -// " `$$Token'"); } break; @@ -360,11 +385,11 @@ bool TextClass::read(FileName const & filename, bool merge) break; case TC_DEFAULTFONT: - defaultfont_.lyxRead(lexrc); + defaultfont_ = lyxRead(lexrc); if (!defaultfont_.resolved()) { lexrc.printError("Warning: defaultfont should " "be fully instantiated!"); - defaultfont_.realize(Font(Font::ALL_SANE)); + defaultfont_.realize(sane_font); } break; @@ -378,7 +403,7 @@ bool TextClass::read(FileName const & filename, bool merge) tocdepth_ = lexrc.getInteger(); break; - // First step to support options + // First step to support options case TC_CLASSOPTIONS: readClassOptions(lexrc); break; @@ -398,98 +423,131 @@ bool TextClass::read(FileName const & filename, bool merge) break; } + case TC_REQUIRES: { + lexrc.eatLine(); + vector const req + = getVectorFromString(lexrc.getString()); + requires_.insert(req.begin(), req.end()); + break; + } + case TC_LEFTMARGIN: // left margin type if (lexrc.next()) - leftmargin_ = lexrc.getString(); + leftmargin_ = lexrc.getDocString(); break; case TC_RIGHTMARGIN: // right margin type if (lexrc.next()) - rightmargin_ = lexrc.getString(); - break; - case TC_CHARSTYLE: - if (lexrc.next()) { - string const name = subst(lexrc.getString(), '_', ' '); - readCharStyle(lexrc, name); - } + rightmargin_ = lexrc.getDocString(); break; + case TC_INSETLAYOUT: if (lexrc.next()) { - docstring const name = subst(lexrc.getDocString(), '_', ' '); - readInsetLayout(lexrc, name); + InsetLayout il; + if (il.read(lexrc)) { + insetlayoutlist_[il.name()] = il; + } + // else there was an error, so forget it } break; + case TC_FLOAT: readFloat(lexrc); break; + 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); + floatlist_.erase(nofloat); } break; } + + //Note that this is triggered the first time through the loop unless + //we hit a format tag. if (format != FORMAT) break; } if (format != FORMAT) { - LYXERR(Debug::TCLASS) << "Converting layout file from format " - << format << " to " << FORMAT << endl; - FileName const tempfile(support::tempName()); - error = !layout2layout(filename, tempfile); - if (!error) - error = read(tempfile, merge); - support::unlink(tempfile); - return error; + LYXERR(Debug::TCLASS, "Converting layout file from format " + << format << " to " << FORMAT); + FileName const tempfile = FileName::tempName(); + bool success = layout2layout(filename, tempfile); + if (success) + read(tempfile, rt); + tempfile.removeFile(); + return success; } - if (!merge) { // we are at top level here. - LYXERR(Debug::TCLASS) << "Finished reading textclass " - << to_utf8(makeDisplayPath(filename.absFilename())) - << endl; - if (defaultlayout_.empty()) { - lyxerr << "Error: Textclass '" << name_ - << "' is missing a defaultstyle." << endl; + LYXERR(Debug::TCLASS, "Finished reading " + translateRT(rt) + ": " + + to_utf8(makeDisplayPath(filename.absFilename()))); + + if (rt != BASECLASS) + return !error; + + if (defaultlayout_.empty()) { + lyxerr << "Error: Textclass '" << name_ + << "' is missing a defaultstyle." << endl; + error = true; + } + + //Try to erase "stdinsets" from the provides_ set. + //The + // Provides stdinsets 1 + //declaration simply tells us that the standard insets have been + //defined. (It's found in stdinsets.inc but could also be used in + //user-defined files.) There isn't really any such package. So we + //might as well go ahead and erase it. + //If we do not succeed, then it was not there, which means that + //the textclass did not provide the definitions of the standard + //insets. So we need to try to load them. + int erased = provides_.erase("stdinsets"); + if (!erased) { + FileName tmp = libFileSearch("layouts", "stdinsets.inc"); + + if (tmp.empty()) { + throw ExceptionMessage(WarningException, _("Missing File"), + _("Could not find stdinsets.inc! This may lead to data loss!")); + error = true; + } else if (!read(tmp, MERGE)) { + throw ExceptionMessage(WarningException, _("Corrupt File"), + _("Could not read stdinsets.inc! This may lead to data loss!")); error = true; } + } - min_toclevel_ = Layout::NOT_IN_TOC; - max_toclevel_ = Layout::NOT_IN_TOC; - const_iterator cit = begin(); - const_iterator the_end = end(); - for ( ; cit != the_end ; ++cit) { - int const toclevel = (*cit)->toclevel; - if (toclevel != Layout::NOT_IN_TOC) { - if (min_toclevel_ == Layout::NOT_IN_TOC) - min_toclevel_ = toclevel; - else - min_toclevel_ = std::min(min_toclevel_, - toclevel); - max_toclevel_ = std::max(max_toclevel_, - toclevel); - } + min_toclevel_ = Layout::NOT_IN_TOC; + max_toclevel_ = Layout::NOT_IN_TOC; + const_iterator lit = begin(); + const_iterator len = end(); + for (; lit != len; ++lit) { + int const toclevel = lit->toclevel; + if (toclevel != Layout::NOT_IN_TOC) { + if (min_toclevel_ == Layout::NOT_IN_TOC) + min_toclevel_ = toclevel; + else + min_toclevel_ = min(min_toclevel_, toclevel); + max_toclevel_ = max(max_toclevel_, toclevel); } - LYXERR(Debug::TCLASS) - << "Minimum TocLevel is " << min_toclevel_ - << ", maximum is " << max_toclevel_ <(le); + titletype_ = static_cast(le); break; default: lyxerr << "Unhandled value " << le @@ -603,192 +661,6 @@ void TextClass::readClassOptions(Lexer & lexrc) lexrc.popTable(); } -enum CharStyleTags { - CS_FONT = 1, - CS_LABELFONT, - CS_LATEXTYPE, - CS_LATEXNAME, - CS_LATEXPARAM, - CS_PREAMBLE, - CS_END -}; - - -enum InsetLayoutTags { - IL_FONT = 1, - IL_LABELFONT, - IL_LABELSTRING, - IL_LATEXTYPE, - IL_LATEXNAME, - IL_LATEXPARAM, - IL_PREAMBLE, - IL_END -}; - - - -void TextClass::readCharStyle(Lexer & lexrc, string const & name) -{ - keyword_item elementTags[] = { - { "end", CS_END }, - { "font", CS_FONT }, - { "labelfont", CS_LABELFONT }, - { "latexname", CS_LATEXNAME }, - { "latexparam", CS_LATEXPARAM }, - { "latextype", CS_LATEXTYPE }, - { "preamble", CS_PREAMBLE} - }; - - lexrc.pushTable(elementTags, CS_END); - - string latextype; - string latexname; - string latexparam; - Font font(Font::ALL_INHERIT); - Font labelfont(Font::ALL_INHERIT); - string preamble; - - bool getout = false; - while (!getout && lexrc.isOK()) { - int le = lexrc.lex(); - switch (le) { - case Lexer::LEX_UNDEF: - lexrc.printError("Unknown ClassOption tag `$$Token'"); - continue; - default: break; - } - switch (static_cast(le)) { - case CS_LATEXTYPE: - lexrc.next(); - latextype = lexrc.getString(); - break; - case CS_LATEXNAME: - lexrc.next(); - latexname = lexrc.getString(); - break; - case CS_LATEXPARAM: - lexrc.next(); - latexparam = subst(lexrc.getString(), """, "\""); - break; - case CS_LABELFONT: - labelfont.lyxRead(lexrc); - break; - case CS_FONT: - font.lyxRead(lexrc); - labelfont = font; - break; - case CS_PREAMBLE: - preamble = lexrc.getLongString("EndPreamble"); - break; - case CS_END: - getout = true; - break; - } - } - - // - // Here add element to list if getout == true - if (getout) { - CharStyle cs; - cs.name = name; - cs.latextype = latextype; - cs.latexname = latexname; - cs.latexparam = latexparam; - cs.font = font; - cs.labelfont = labelfont; - cs.preamble = from_utf8(preamble); - charstyles().push_back(cs); - } - - lexrc.popTable(); -} - - -void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name) -{ - keyword_item elementTags[] = { - { "end", IL_END }, - { "font", IL_FONT }, - { "labelfont", IL_LABELFONT }, - { "labelstring", IL_LABELSTRING }, - { "latexname", IL_LATEXNAME }, - { "latexparam", IL_LATEXPARAM }, - { "latextype", IL_LATEXTYPE }, - { "preamble", IL_PREAMBLE} - }; - - lexrc.pushTable(elementTags, IL_END); - - docstring labelstring; - string latextype; - string latexname; - string latexparam; - Font font(Font::ALL_INHERIT); - Font labelfont(Font::ALL_INHERIT); - string preamble; - - bool getout = false; - while (!getout && lexrc.isOK()) { - int le = lexrc.lex(); - switch (le) { - case Lexer::LEX_UNDEF: - lexrc.printError("Unknown ClassOption tag `$$Token'"); - continue; - default: break; - } - switch (static_cast(le)) { - case IL_LATEXTYPE: - lexrc.next(); - latextype = lexrc.getString(); - break; - case IL_LABELSTRING: - lexrc.next(); - labelstring = lexrc.getDocString(); - break; - case IL_LATEXNAME: - lexrc.next(); - latexname = lexrc.getString(); - break; - case IL_LATEXPARAM: - lexrc.next(); - latexparam = subst(lexrc.getString(), """, "\""); - break; - case IL_LABELFONT: - labelfont.lyxRead(lexrc); - labelfont.realize(defaultfont()); - break; - case IL_FONT: - font.lyxRead(lexrc); - font.realize(defaultfont()); - labelfont = font; - break; - case IL_PREAMBLE: - preamble = lexrc.getLongString("EndPreamble"); - break; - case IL_END: - getout = true; - break; - } - } - - // - // Here add element to list if getout == true - if (getout) { - InsetLayout il; - il.labelstring = labelstring; - il.latextype = latextype; - il.latexname = latexname; - il.latexparam = latexparam; - il.font = font; - il.labelfont = labelfont; - il.preamble = from_utf8(preamble); - insetlayoutlist_[name] = il; - } - - lexrc.popTable(); -} - - enum FloatTags { FT_TYPE = 1, @@ -833,7 +705,7 @@ void TextClass::readFloat(Lexer & lexrc) int le = lexrc.lex(); switch (le) { case Lexer::LEX_UNDEF: - lexrc.printError("Unknown ClassOption tag `$$Token'"); + lexrc.printError("Unknown float tag `$$Token'"); continue; default: break; } @@ -841,8 +713,8 @@ void TextClass::readFloat(Lexer & lexrc) case FT_TYPE: lexrc.next(); type = lexrc.getString(); - if (floatlist_->typeExist(type)) { - Floating const & fl = floatlist_->getType(type); + if (floatlist_.typeExist(type)) { + Floating const & fl = floatlist_.getType(type); placement = fl.placement(); ext = fl.ext(); within = fl.within(); @@ -892,10 +764,14 @@ void TextClass::readFloat(Lexer & lexrc) if (getout) { Floating fl(type, placement, ext, within, style, name, listName, builtin); - floatlist_->newFloat(fl); + floatlist_.newFloat(fl); // each float has its own counter - ctrs_->newCounter(from_ascii(type), from_ascii(within), - docstring(), docstring()); + counters_.newCounter(from_ascii(type), from_ascii(within), + docstring(), docstring()); + // also define sub-float counters + docstring const subtype = "sub-" + from_ascii(type); + counters_.newCounter(subtype, from_ascii(type), + "\\alph{" + subtype + "}", docstring()); } lexrc.popTable(); @@ -910,6 +786,7 @@ enum CounterTags { CT_END }; + void TextClass::readCounter(Lexer & lexrc) { keyword_item counterTags[] = { @@ -932,7 +809,7 @@ void TextClass::readCounter(Lexer & lexrc) int le = lexrc.lex(); switch (le) { case Lexer::LEX_UNDEF: - lexrc.printError("Unknown ClassOption tag `$$Token'"); + lexrc.printError("Unknown counter tag `$$Token'"); continue; default: break; } @@ -940,14 +817,10 @@ void TextClass::readCounter(Lexer & lexrc) case CT_NAME: lexrc.next(); name = lexrc.getDocString(); - if (ctrs_->hasCounter(name)) - LYXERR(Debug::TCLASS) - << "Reading existing counter " - << to_utf8(name) << endl; + if (counters_.hasCounter(name)) + 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(); @@ -972,31 +845,13 @@ void TextClass::readCounter(Lexer & lexrc) // Here if have a full counter if getout == true if (getout) - ctrs_->newCounter(name, within, - labelstring, labelstring_appendix); + counters_.newCounter(name, within, + labelstring, labelstring_appendix); lexrc.popTable(); } -Font const & TextClass::defaultfont() const -{ - return defaultfont_; -} - - -string const & TextClass::leftmargin() const -{ - return leftmargin_; -} - - -string const & TextClass::rightmargin() const -{ - return rightmargin_; -} - - bool TextClass::hasLayout(docstring const & n) const { docstring const name = n.empty() ? defaultLayoutName() : n; @@ -1008,35 +863,52 @@ bool TextClass::hasLayout(docstring const & n) const -Layout_ptr const & TextClass::operator[](docstring const & name) const +Layout const & TextClass::operator[](docstring const & name) const { BOOST_ASSERT(!name.empty()); - LayoutList::const_iterator cit = - find_if(layoutlist_.begin(), - layoutlist_.end(), - LayoutNamesEqual(name)); + const_iterator it = + find_if(begin(), end(), LayoutNamesEqual(name)); - if (cit == layoutlist_.end()) { + if (it == end()) { lyxerr << "We failed to find the layout '" << to_utf8(name) << "' in the layout list. You MUST investigate!" << endl; - for (LayoutList::const_iterator it = layoutlist_.begin(); - it != layoutlist_.end(); ++it) - lyxerr << " " << to_utf8(it->get()->name()) << endl; + for (const_iterator cit = begin(); cit != end(); ++cit) + lyxerr << " " << to_utf8(cit->name()) << endl; // we require the name to exist BOOST_ASSERT(false); } - return (*cit); + return *it; } +Layout & TextClass::operator[](docstring const & name) +{ + BOOST_ASSERT(!name.empty()); + + iterator it = find_if(begin(), end(), LayoutNamesEqual(name)); + + if (it == end()) { + lyxerr << "We failed to find the layout '" << to_utf8(name) + << "' in the layout list. You MUST investigate!" + << endl; + for (const_iterator cit = begin(); cit != end(); ++cit) + lyxerr << " " << to_utf8(cit->name()) << endl; + + // we require the name to exist + BOOST_ASSERT(false); + } + + return *it; +} -bool TextClass::delete_layout(docstring const & name) + +bool TextClass::deleteLayout(docstring const & name) { - if (name == defaultLayoutName()) + if (name == defaultLayoutName() || name == emptyLayoutName()) return false; LayoutList::iterator it = @@ -1060,9 +932,9 @@ bool TextClass::load(string const & path) const FileName layout_file; if (!path.empty()) layout_file = FileName(addName(path, name_ + ".layout")); - if (layout_file.empty() || !fs::exists(layout_file.toFilesystemEncoding())) + if (layout_file.empty() || !layout_file.exists()) layout_file = libFileSearch("layouts", name_, "layout"); - loaded_ = const_cast(this)->read(layout_file) == 0; + loaded_ = const_cast(this)->read(layout_file); if (!loaded_) { lyxerr << "Error reading `" @@ -1076,38 +948,20 @@ bool TextClass::load(string const & path) const } -FloatList & TextClass::floats() -{ - return *floatlist_.get(); -} - - -FloatList const & TextClass::floats() const -{ - return *floatlist_.get(); -} - - -Counters & TextClass::counters() const +InsetLayout const & DocumentClass::insetLayout(docstring const & name) const { - return *ctrs_.get(); -} - -InsetLayout const & TextClass::insetlayout(docstring const & name) const -{ - return insetlayoutlist_[name]; -} - - -CharStyles::iterator TextClass::charstyle(string const & s) const -{ - CharStyles::iterator cs = charstyles().begin(); - CharStyles::iterator csend = charstyles().end(); - for (; cs != csend; ++cs) { - if (cs->name == s) - return cs; + docstring n = name; + InsetLayouts::const_iterator cen = insetlayoutlist_.end(); + while (!n.empty()) { + InsetLayouts::const_iterator cit = insetlayoutlist_.lower_bound(n); + if (cit != cen && cit->first == n) + return cit->second; + size_t i = n.find(':'); + if (i == string::npos) + break; + n = n.substr(0,i); } - return csend; + return empty_insetlayout_; } @@ -1118,146 +972,74 @@ docstring const & TextClass::defaultLayoutName() const } -Layout_ptr const & TextClass::defaultLayout() const +Layout const & TextClass::defaultLayout() const { return operator[](defaultLayoutName()); } -string const & TextClass::name() const -{ - return name_; -} - - -string const & TextClass::latexname() const -{ - const_cast(this)->load(); - return latexname_; -} - - -string const & TextClass::description() const -{ - return description_; -} - - -string const & TextClass::opt_fontsize() const +bool TextClass::isDefaultLayout(Layout const & lay) const { - return opt_fontsize_; + return lay.name() == defaultLayoutName(); } -string const & TextClass::opt_pagestyle() const +bool TextClass::isEmptyLayout(Layout const & lay) const { - return opt_pagestyle_; + return lay.name() == emptyLayoutName(); } -string const & TextClass::options() const +DocumentClass & DocumentClassBundle::newClass(LayoutFile const & baseClass) { - return options_; + DocumentClass * dc = new DocumentClass(baseClass); + tc_list_.push_back(dc); + return *tc_list_.back(); } -string const & TextClass::class_header() const +DocumentClassBundle & DocumentClassBundle::get() { - return class_header_; + static DocumentClassBundle singleton; + return singleton; } -string const & TextClass::pagestyle() const -{ - return pagestyle_; -} - - -docstring const & TextClass::preamble() const -{ - return preamble_; -} - - -TextClass::PageSides TextClass::sides() const -{ - return sides_; -} - - -int TextClass::secnumdepth() const -{ - return secnumdepth_; -} +DocumentClass::DocumentClass(LayoutFile const & tc) + : TextClass(tc) +{} -int TextClass::tocdepth() const +bool DocumentClass::hasLaTeXLayout(std::string const & lay) const { - return tocdepth_; + LayoutList::const_iterator it = layoutlist_.begin(); + LayoutList::const_iterator end = layoutlist_.end(); + for (; it != end; ++it) + if (it->latexname() == lay) + return true; + return false; } -OutputType TextClass::outputType() const -{ - return outputType_; -} - - -bool TextClass::provides(string const & p) const +bool DocumentClass::provides(string const & p) const { return provides_.find(p) != provides_.end(); } -unsigned int TextClass::columns() const -{ - return columns_; -} - - -LYX_TITLE_LATEX_TYPES TextClass::titletype() const -{ - return titletype_; -} - - -string const & TextClass::titlename() const -{ - return titlename_; -} - - -int TextClass::size() const -{ - return layoutlist_.size(); -} - - -int TextClass::min_toclevel() const -{ - return min_toclevel_; -} - - -int TextClass::max_toclevel() const -{ - return max_toclevel_; -} - - -bool TextClass::hasTocLevels() const +bool DocumentClass::hasTocLevels() const { return min_toclevel_ != Layout::NOT_IN_TOC; } -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; }