#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"
#include "Lexer.h"
+#include "Font.h"
#include "frontends/alert.h"
#include "support/lstrings.h"
-#include "support/lyxlib.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "support/os.h"
#include <sstream>
-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 {
-using support::FileName;
-using support::libFileSearch;
-using support::makeDisplayPath;
-using support::quoteName;
-using support::rtrim;
-using support::subst;
-using support::addName;
-
-extern FontInfo lyxRead(Lexer &, FontInfo const & fi = sane_font);
-
namespace {
-class LayoutNamesEqual : public std::unary_function<LayoutPtr, bool> {
+class LayoutNamesEqual : public unary_function<LayoutPtr, bool> {
public:
LayoutNamesEqual(docstring const & name)
: name_(name)
};
-int const FORMAT = 5;
+int const FORMAT = 6;
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;
}
-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;
TC_CLASSOPTIONS,
TC_PREAMBLE,
TC_PROVIDES,
+ TC_REQUIRES,
TC_LEFTMARGIN,
TC_RIGHTMARGIN,
TC_FLOAT,
// 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;
{ "pagestyle", TC_PAGESTYLE },
{ "preamble", TC_PREAMBLE },
{ "provides", TC_PROVIDES },
+ { "requires", TC_REQUIRES },
{ "rightmargin", TC_RIGHTMARGIN },
{ "secnumdepth", TC_SECNUMDEPTH },
{ "sides", TC_SIDES },
switch (rt) {
case BASECLASS:
- LYXERR(Debug::TCLASS) << "Reading textclass ";
+ LYXERR(Debug::TCLASS, "Reading textclass ");
break;
case MERGE:
- LYXERR(Debug::TCLASS) << "Reading input file ";
- break;
+ 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]));
+ 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))
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"
break;
case TC_DEFAULTFONT:
- defaultfont_ = lyxRead(lexrc, sane_font);
+ defaultfont_ = lyxRead(lexrc);
if (!defaultfont_.resolved()) {
lexrc.printError("Warning: defaultfont should "
"be fully instantiated!");
break;
}
+ case TC_REQUIRES: {
+ lexrc.eatLine();
+ string const packages = lexrc.getString();
+ vector<string> req = getVectorFromString(packages);
+ for (vector<string>::const_iterator it = req.begin();
+ it != req.end(); ++it) {
+ if (find(requires_.begin(), requires_.end(), *it) == requires_.end())
+ requires_.push_back(*it);
+ }
+ break;
+ }
+
case TC_LEFTMARGIN: // left margin type
if (lexrc.next())
leftmargin_ = lexrc.getDocString();
}
if (format != FORMAT) {
- LYXERR(Debug::TCLASS) << "Converting layout file from format "
- << format << " to " << FORMAT << endl;
- FileName const tempfile(support::tempName());
+ LYXERR(Debug::TCLASS, "Converting layout file from format "
+ << format << " to " << FORMAT);
+ FileName const tempfile = FileName::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;
if (min_toclevel_ == Layout::NOT_IN_TOC)
min_toclevel_ = toclevel;
else
- min_toclevel_ = std::min(min_toclevel_,
+ min_toclevel_ = min(min_toclevel_,
toclevel);
- max_toclevel_ = std::max(max_toclevel_,
+ max_toclevel_ = max(max_toclevel_,
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_);
}
IL_NEEDPROTECT,
IL_PASSTHRU,
IL_PREAMBLE,
+ IL_REQUIRES,
IL_END
};
{ "multipar", IL_MULTIPAR },
{ "needprotect", IL_NEEDPROTECT },
{ "passthru", IL_PASSTHRU },
- { "preamble", IL_PREAMBLE }
+ { "preamble", IL_PREAMBLE },
+ { "requires", IL_REQUIRES }
};
lexrc.pushTable(elementTags, IL_END);
FontInfo labelfont = inherit_font;
ColorCode bgcolor(Color_background);
string preamble;
+ vector<string> requires;
bool multipar = false;
bool passthru = false;
bool needprotect = false;
int le = lexrc.lex();
switch (le) {
case Lexer::LEX_UNDEF:
- lexrc.printError("Unknown ClassOption tag `$$Token'");
+ lexrc.printError("Unknown InsetLayout tag `$$Token'");
continue;
default: break;
}
case IL_PREAMBLE:
preamble = lexrc.getLongString("EndPreamble");
break;
+ case IL_REQUIRES: {
+ lexrc.eatLine();
+ string const packages = lexrc.getString();
+ requires = getVectorFromString(packages);
+ break;
+ }
case IL_END:
getout = true;
break;
}
}
- //
// Here add element to list if getout == true
if (getout) {
InsetLayout il;
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.bgcolor = bgcolor;
il.preamble = preamble;
+ il.requires = requires;
insetlayoutlist_[name] = il;
}
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;
}
CT_END
};
+
void TextClass::readCounter(Lexer & lexrc)
{
keyword_item counterTags[] = {
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;
}
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();
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;
}
static InsetLayout empty;
empty.labelstring = from_utf8("UNDEFINED");
+ empty.labelfont = sane_font;
+ empty.labelfont.setColor(Color_error);
empty.bgcolor = Color_error;
return empty;
}
}
-TextClass::PageSides TextClass::sides() const
+PageSides TextClass::sides() const
{
return sides_;
}
}
-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;
}