X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.cpp;h=f1b1df7eaab855ac78b1d13843d9f45479f23ac1;hb=c4db1d0f5a05429726d244caebd207bf29c58d71;hp=8aae1abe87667f081ba339f8327cb8a461266ccc;hpb=eca79a8a09edf79ac48f1cf0948e8f24c74564b3;p=lyx.git diff --git a/src/TextClass.cpp b/src/TextClass.cpp index 8aae1abe87..f1b1df7eaa 100644 --- a/src/TextClass.cpp +++ b/src/TextClass.cpp @@ -15,12 +15,15 @@ #include #include "TextClass.h" -#include "debug.h" -#include "Lexer.h" + +#include "Color.h" #include "Counters.h" +#include "debug.h" #include "gettext.h" #include "Floating.h" #include "FloatList.h" +#include "Layout.h" +#include "Lexer.h" #include "frontends/alert.h" @@ -29,11 +32,13 @@ #include "support/filetools.h" #include "support/os.h" -#include -namespace fs = boost::filesystem; - #include +using std::endl; +using std::find_if; +using std::remove_if; +using std::string; +using std::ostream; namespace lyx { @@ -45,12 +50,7 @@ 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; - +extern FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font); namespace { @@ -114,7 +114,7 @@ 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; @@ -129,7 +129,7 @@ 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; if (!lay.read(lexrc, *this)) { @@ -176,7 +176,7 @@ enum TextClassTags { // Reads a textclass structure from file. bool TextClass::read(FileName const & filename, ReadType rt) { - if (!support::isFileReadable(filename)) { + if (!filename.isFileReadable()) { lyxerr << "Cannot read layout file `" << filename << "'." << endl; return true; @@ -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(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" @@ -366,11 +366,11 @@ bool TextClass::read(FileName const & filename, ReadType rt) 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; @@ -514,7 +514,7 @@ void TextClass::readTitleType(Lexer & lexrc) return; case TITLE_COMMAND_AFTER: case TITLE_ENVIRONMENT: - titletype_ = static_cast(le); + titletype_ = static_cast(le); break; default: lyxerr << "Unhandled value " << le @@ -613,12 +613,18 @@ enum InsetLayoutTags { IL_FONT = 1, IL_BGCOLOR, IL_DECORATION, + IL_FREESPACING, + IL_FORCELTR, IL_LABELFONT, IL_LABELSTRING, IL_LATEXNAME, IL_LATEXPARAM, IL_LATEXTYPE, IL_LYXTYPE, + IL_KEEPEMPTY, + IL_MULTIPAR, + IL_NEEDPROTECT, + IL_PASSTHRU, IL_PREAMBLE, IL_END }; @@ -631,12 +637,18 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name) { "decoration", IL_DECORATION }, { "end", IL_END }, { "font", IL_FONT }, + { "forceltr", IL_FORCELTR }, + { "freespacing", IL_FREESPACING }, + { "keepempty", IL_KEEPEMPTY }, { "labelfont", IL_LABELFONT }, { "labelstring", IL_LABELSTRING }, { "latexname", IL_LATEXNAME }, { "latexparam", IL_LATEXPARAM }, { "latextype", IL_LATEXTYPE }, { "lyxtype", IL_LYXTYPE }, + { "multipar", IL_MULTIPAR }, + { "needprotect", IL_NEEDPROTECT }, + { "passthru", IL_PASSTHRU }, { "preamble", IL_PREAMBLE } }; @@ -648,10 +660,16 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name) string decoration; string latexname; string latexparam; - Font font(Font::ALL_INHERIT); - Font labelfont(Font::ALL_INHERIT); - Color::color bgcolor(Color::background); + FontInfo font = inherit_font; + FontInfo labelfont = inherit_font; + ColorCode bgcolor(Color_background); string preamble; + bool multipar = false; + bool passthru = false; + bool needprotect = false; + bool keepempty = false; + bool freespacing = false; + bool forceltr = false; bool getout = false; while (!getout && lexrc.isOK()) { @@ -688,12 +706,34 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name) latexparam = subst(lexrc.getString(), """, "\""); break; case IL_LABELFONT: - labelfont.lyxRead(lexrc); - labelfont.realize(defaultfont()); + labelfont = lyxRead(lexrc, inherit_font); + break; + case IL_FORCELTR: + lexrc.next(); + forceltr = lexrc.getBool(); + break; + case IL_MULTIPAR: + lexrc.next(); + multipar = lexrc.getBool(); + break; + case IL_PASSTHRU: + lexrc.next(); + passthru = lexrc.getBool(); + break; + case IL_KEEPEMPTY: + lexrc.next(); + keepempty = lexrc.getBool(); + break; + case IL_FREESPACING: + lexrc.next(); + freespacing = lexrc.getBool(); + break; + case IL_NEEDPROTECT: + lexrc.next(); + needprotect = lexrc.getBool(); break; case IL_FONT: - font.lyxRead(lexrc); - font.realize(defaultfont()); + font = lyxRead(lexrc, inherit_font); // So: define font before labelfont labelfont = font; break; @@ -712,7 +752,6 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name) } } - // // Here add element to list if getout == true if (getout) { InsetLayout il; @@ -723,7 +762,16 @@ void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name) il.latextype = latextype; il.latexname = latexname; il.latexparam = latexparam; + il.multipar = multipar; + il.passthru = passthru; + il.needprotect = needprotect; + il.freespacing = freespacing; + 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; @@ -924,7 +972,7 @@ void TextClass::readCounter(Lexer & lexrc) } -Font const & TextClass::defaultfont() const +FontInfo const & TextClass::defaultfont() const { return defaultfont_; } @@ -974,12 +1022,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; @@ -1005,7 +1052,7 @@ 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; @@ -1059,7 +1106,9 @@ InsetLayout const & TextClass::insetlayout(docstring const & name) const } static InsetLayout empty; empty.labelstring = from_utf8("UNDEFINED"); - empty.bgcolor = Color::error; + empty.labelfont = sane_font; + empty.labelfont.setColor(Color_error); + empty.bgcolor = Color_error; return empty; } @@ -1132,7 +1181,7 @@ docstring const & TextClass::preamble() const } -TextClass::PageSides TextClass::sides() const +PageSides TextClass::sides() const { return sides_; } @@ -1168,7 +1217,7 @@ unsigned int TextClass::columns() const } -LYX_TITLE_LATEX_TYPES TextClass::titletype() const +TitleLatexType TextClass::titletype() const { return titletype_; } @@ -1204,13 +1253,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; }