#include "frontends/alert.h"
-#include "support/assert.h"
+#include "support/lassert.h"
#include "support/debug.h"
#include "support/ExceptionMessage.h"
#include "support/FileName.h"
}
-bool TextClass::readStyle(Lexer & lexrc, Layout & lay)
+bool TextClass::readStyle(Lexer & lexrc, Layout & lay) const
{
LYXERR(Debug::TCLASS, "Reading style " << to_utf8(lay.name()));
if (!lay.read(lexrc, *this)) {
TC_STYLE,
TC_DEFAULTSTYLE,
TC_INSETLAYOUT,
- TC_ENVIRONMENT,
TC_NOSTYLE,
TC_COLUMNS,
TC_SIDES,
{ "counter", TC_COUNTER },
{ "defaultfont", TC_DEFAULTFONT },
{ "defaultstyle", TC_DEFAULTSTYLE },
- { "environment", TC_ENVIRONMENT },
{ "float", TC_FLOAT },
{ "format", TC_FORMAT },
{ "input", TC_INPUT },
bool TextClass::convertLayoutFormat(support::FileName const & filename, ReadType rt)
{
LYXERR(Debug::TCLASS, "Converting layout file to " << FORMAT);
- FileName const tempfile = FileName::tempName();
+ FileName const tempfile = FileName::tempName("convert_layout");
bool success = layout2layout(filename, tempfile);
if (success)
success = read(tempfile, rt);
// 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 && !hasLayout(emptylayout_)) {
- 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);
- 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.
- LASSERT(false, /**/);
- };
- layoutlist_.push_back(lay);
- }
+ if (rt == BASECLASS && !hasLayout(emptylayout_))
+ layoutlist_.push_back(createEmptyLayout(emptylayout_));
Lexer lexrc(textClassTags);
lexrc.setFile(filename);
return retval == OK;
// write the layout string to a temporary file
- FileName const tempfile = FileName::tempName();
+ FileName const tempfile = FileName::tempName("TextClass_read");
ofstream os(tempfile.toFilesystemEncoding().c_str());
if (!os) {
- LYXERR0("Unable to create tempoary file");
+ LYXERR0("Unable to create temporary file");
return false;
}
os << str;
}
break;
- case TC_ENVIRONMENT:
case TC_STYLE:
if (lexrc.next()) {
docstring const name = from_utf8(subst(lexrc.getString(),
} else {
Layout layout;
layout.setName(name);
- if (le == TC_ENVIRONMENT)
- layout.is_environment = true;
error = !readStyle(lexrc, layout);
if (!error)
layoutlist_.push_back(layout);
}
-
Layout const & TextClass::operator[](docstring const & name) const
{
LASSERT(!name.empty(), /**/);
return true;
// Read style-file, provided path is searched before the system ones
- FileName layout_file;
- if (!path.empty())
+ // If path is a file, it is loaded directly.
+ FileName layout_file(path);
+ if (!path.empty() && !layout_file.isReadableFile())
layout_file = FileName(addName(path, name_ + ".layout"));
if (layout_file.empty() || !layout_file.exists())
layout_file = libFileSearch("layouts", name_, "layout");
}
+void DocumentClass::addLayoutIfNeeded(docstring const & n) const
+{
+ if (!hasLayout(n))
+ layoutlist_.push_back(createEmptyLayout(n, true));
+}
+
+
InsetLayout const & DocumentClass::insetLayout(docstring const & name) const
{
+ // FIXME The fix for the InsetLayout part of 4812 would be here:
+ // Add the InsetLayout to the document class if it is not found.
docstring n = name;
InsetLayouts::const_iterator cen = insetlayoutlist_.end();
while (!n.empty()) {
}
-bool TextClass::isEmptyLayout(Layout const & layout) const
+bool TextClass::isPlainLayout(Layout const & layout) const
{
return layout.name() == emptyLayoutName();
}
+Layout TextClass::createEmptyLayout(docstring const & name, bool unknown) const
+{
+ static Layout * defaultLayout = NULL;
+
+ if (defaultLayout) {
+ defaultLayout->setUnknown(unknown);
+ defaultLayout->setName(name);
+ return *defaultLayout;
+ }
+
+ 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);
+ lex.setStream(ss);
+ defaultLayout = new Layout;
+ defaultLayout->setUnknown(unknown);
+ defaultLayout->setName(name);
+ if (!readStyle(lex, *defaultLayout)) {
+ // The only way this happens is because the hardcoded layout above
+ // is wrong.
+ LASSERT(false, /**/);
+ };
+ return *defaultLayout;
+}
+
/////////////////////////////////////////////////////////////////////////
//
// DocumentClassBundle