#include "Layout.h"
#include "TextClass.h"
#include "Lexer.h"
-#include "debug.h"
+#include "Font.h"
+#include "support/debug.h"
-#include "support/lstrings.h"
+#include "support/lstrings.h"
-namespace lyx {
+#include <ostream>
-using support::subst;
-using support::trim;
+using namespace std;
+using namespace lyx::support;
-using std::endl;
-using std::string;
+namespace lyx {
/// Special value of toclevel for layouts that to not belong in a TOC
const int Layout::NOT_IN_TOC = -1000;
LT_PARSKIP,
//LT_PLAIN,
LT_PREAMBLE,
+ LT_REQUIRES,
LT_RIGHTMARGIN,
LT_SPACING,
LT_TOPSEP,
/////////////////////
-// Constructor for layout
-Layout::Layout ()
+Layout::Layout()
{
margintype = MARGIN_STATIC;
latextype = LATEX_PARAGRAPH;
optionalargs = 0;
needprotect = false;
keepempty = false;
- font = Font(Font::ALL_INHERIT);
- labelfont = Font(Font::ALL_INHERIT);
- resfont = Font(Font::ALL_SANE);
- reslabelfont = Font(Font::ALL_SANE);
+ font = inherit_font;
+ labelfont = inherit_font;
+ resfont = sane_font;
+ reslabelfont = sane_font;
nextnoindent = false;
parskip = 0.0;
itemsep = 0;
labelbottomsep = 0.0;
parsep = 0;
align = LYX_ALIGN_BLOCK;
- alignpossible = LYX_ALIGN_BLOCK;
+ alignpossible = LYX_ALIGN_NONE | LYX_ALIGN_LAYOUT;
labeltype = LABEL_NO_LABEL;
endlabeltype = END_LABEL_NO_LABEL;
// Should or should not. That is the question.
}
-// Reads a layout definition from file
bool Layout::read(Lexer & lexrc, TextClass const & tclass)
{
// This table is sorted alphabetically [asierra 30March96]
{ "parskip", LT_PARSKIP },
{ "passthru", LT_PASS_THRU },
{ "preamble", LT_PREAMBLE },
+ { "requires", LT_REQUIRES },
{ "rightmargin", LT_RIGHTMARGIN },
{ "spacing", LT_SPACING },
{ "textfont", LT_TEXTFONT },
case LT_COPYSTYLE: // initialize with a known style
if (lexrc.next()) {
- string const style = subst(lexrc.getString(),
+ docstring const style = subst(lexrc.getDocString(),
'_', ' ');
if (tclass.hasLayout(style)) {
- string const tmpname = name_;
+ docstring const tmpname = name_;
this->operator=(*tclass[style]);
name_ = tmpname;
} else {
lyxerr << "Cannot copy unknown style `"
- << style << "'\n"
+ << to_utf8(style) << "'\n"
<< "All layouts so far:"
<< endl;
TextClass::const_iterator it =
TextClass::const_iterator end =
tclass.end();
for (; it != end; ++it) {
- lyxerr << (*it)->name()
+ lyxerr << to_utf8((*it)->name())
<< endl;
}
case LT_OBSOLETEDBY: // replace with a known style
if (lexrc.next()) {
- string const style = lexrc.getString();
+ docstring const style =
+ subst(lexrc.getDocString(), '_', ' ');
if (tclass.hasLayout(style)) {
- string const tmpname = name_;
+ docstring const tmpname = name_;
this->operator=(*tclass[style]);
name_ = tmpname;
if (obsoleted_by().empty())
obsoleted_by_ = style;
} else {
- lyxerr << "Cannot replace with unknown style `" << style << '\'' << endl;
+ lyxerr << "Cannot replace with unknown style `"
+ << to_utf8(style) << '\'' << endl;
//lexrc.printError("Cannot replace with"
// " unknown style "
case LT_DEPENDSON:
if (lexrc.next())
- depends_on_ = lexrc.getString();
+ depends_on_ = subst(lexrc.getDocString(), '_', ' ');
break;
case LT_MARGIN: // margin style definition.
break;
case LT_FONT:
- font.lyxRead(lexrc);
- labelfont= font;
+ font = lyxRead(lexrc, font);
+ labelfont = font;
break;
case LT_TEXTFONT:
- font.lyxRead(lexrc);
+ font = lyxRead(lexrc, font);
break;
case LT_LABELFONT:
- labelfont.lyxRead(lexrc);
+ labelfont = lyxRead(lexrc, labelfont);
break;
case LT_NEXTNOINDENT: // Indent next paragraph?
case LT_LEFTMARGIN: // left margin type
if (lexrc.next())
- leftmargin = lexrc.getString();
+ leftmargin = lexrc.getDocString();
break;
case LT_RIGHTMARGIN: // right margin type
if (lexrc.next())
- rightmargin = lexrc.getString();
+ rightmargin = lexrc.getDocString();
break;
case LT_LABELINDENT: // label indenting flag
if (lexrc.next())
- labelindent = lexrc.getString();
+ labelindent = lexrc.getDocString();
break;
case LT_PARINDENT: // paragraph indent. flag
if (lexrc.next())
- parindent = lexrc.getString();
+ parindent = lexrc.getDocString();
break;
case LT_PARSKIP: // paragraph skip size
case LT_LABELSEP: // label separator
if (lexrc.next()) {
- labelsep = subst(lexrc.getString(), 'x', ' ');
+ labelsep = from_utf8(subst(lexrc.getString(), 'x', ' '));
}
break;
case LT_SPACING: // setspace.sty
readSpacing(lexrc);
break;
+
+ case LT_REQUIRES:
+ if (lexrc.eatLine())
+ requires_ = getVectorFromString(lexrc.getString());
+ break;
+
}
}
lexrc.popTable();
};
lexrc.pushTable(alignTags, AT_LAYOUT);
- alignpossible = LYX_ALIGN_NONE;
+ alignpossible = LYX_ALIGN_NONE | LYX_ALIGN_LAYOUT;
int lineno = lexrc.getLineNo();
do {
int le = lexrc.lex();
}
-namespace {
-
-keyword_item endlabelTypeTags[] = {
+static keyword_item endlabelTypeTags[] =
+{
{ "box", END_LABEL_BOX },
{ "filled_box", END_LABEL_FILLED_BOX },
{ "no_label", END_LABEL_NO_LABEL },
{ "static", END_LABEL_STATIC }
};
-} // namespace anon
-
void Layout::readEndLabelType(Lexer & lexrc)
{
case END_LABEL_BOX:
case END_LABEL_FILLED_BOX:
case END_LABEL_NO_LABEL:
- endlabeltype = static_cast<LYX_END_LABEL_TYPES>(le);
+ endlabeltype = static_cast<EndLabelType>(le);
break;
default:
lyxerr << "Unhandled value " << le
case MARGIN_DYNAMIC:
case MARGIN_FIRST_DYNAMIC:
case MARGIN_RIGHT_ADDRESS_BOX:
- margintype = static_cast<LYX_MARGIN_TYPE>(le);
+ margintype = static_cast<MarginType>(le);
break;
default:
lyxerr << "Unhandled value " << le
case LATEX_ITEM_ENVIRONMENT:
case LATEX_BIB_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
- latextype = static_cast<LYX_LATEX_TYPES>(le);
+ latextype = static_cast<LatexType>(le);
break;
default:
lyxerr << "Unhandled value " << le
}
-string const & Layout::name() const
+docstring const & Layout::name() const
{
return name_;
}
-void Layout::setName(string const & n)
+void Layout::setName(docstring const & name)
{
- name_ = n;
+ name_ = name;
}
-string const & Layout::obsoleted_by() const
+docstring const & Layout::obsoleted_by() const
{
return obsoleted_by_;
}
-string const & Layout::depends_on() const
+docstring const & Layout::depends_on() const
{
return depends_on_;
}
+
Layout * Layout::forCaption()
{
Layout * lay = new Layout();
- lay->name_ = "Caption";
+ lay->name_ = from_ascii("Caption");
lay->latexname_ = "caption";
lay->latextype = LATEX_COMMAND;
lay->optionalargs = 1;
return lay;
}
-
-
} // namespace lyx
projects / lyx.git / blobdiff