namespace lyx {
-// Keep the changes documented in the Customization manual.
+// Keep the changes documented in the Customization manual.
//
// If you change this format, then you MUST also make sure that
-// your changes do not invalidate the hardcoded layout file in
+// your changes do not invalidate the hardcoded layout file in
// LayoutFile.cpp. Additions will never do so, but syntax changes
// could. See LayoutFileList::addEmptyClass() and, especially, the
-// definition of the layoutpost string.
+// definition of the layoutpost string.
// You should also run (or ask someone who has bash to run) the
-// development/updatelayouts.sh script, to update the format of
+// development/tools/updatelayouts.sh script, to update the format of
// all of our layout files.
//
-int const LAYOUT_FORMAT = 32;
-
+int const LAYOUT_FORMAT = 38; //gb : LangPreamble and BabelPreamble for InsetLayout
+
namespace {
class LayoutNamesEqual : public unary_function<Layout, bool> {
}
-string translateReadType(TextClass::ReadType rt)
+string translateReadType(TextClass::ReadType rt)
{
switch (rt) {
case TextClass::BASECLASS:
} // namespace anon
-// This string should not be translated here,
+// This string should not be translated here,
// because it is a layout identifier.
docstring const TextClass::plain_layout_ = from_ascii("Plain Layout");
tocdepth_ = 3;
pagestyle_ = "default";
defaultfont_ = sane_font;
+ opt_enginetype_ = "authoryear|numerical";
opt_fontsize_ = "10|11|12";
opt_pagestyle_ = "empty|plain|headings|fancy";
+ cite_full_author_list_ = true;
titletype_ = TITLE_COMMAND_AFTER;
titlename_ = "maketitle";
loaded_ = false;
TC_CLASSOPTIONS,
TC_PREAMBLE,
TC_HTMLPREAMBLE,
+ TC_HTMLSTYLES,
TC_PROVIDES,
TC_REQUIRES,
TC_LEFTMARGIN,
TC_FORMAT,
TC_ADDTOPREAMBLE,
TC_ADDTOHTMLPREAMBLE,
+ TC_ADDTOHTMLSTYLES,
TC_DEFAULTMODULE,
TC_PROVIDESMODULE,
TC_EXCLUDESMODULE,
TC_HTMLTOCSECTION,
- TC_CITEFORMAT
+ TC_CITEENGINE,
+ TC_CITEENGINETYPE,
+ TC_CITEFORMAT,
+ TC_DEFAULTBIBLIO,
+ TC_FULLAUTHORLIST,
};
LexerKeyword textClassTags[] = {
{ "addtohtmlpreamble", TC_ADDTOHTMLPREAMBLE },
+ { "addtohtmlstyles", TC_ADDTOHTMLSTYLES },
{ "addtopreamble", TC_ADDTOPREAMBLE },
+ { "citeengine", TC_CITEENGINE },
+ { "citeenginetype", TC_CITEENGINETYPE },
{ "citeformat", TC_CITEFORMAT },
{ "classoptions", TC_CLASSOPTIONS },
{ "columns", TC_COLUMNS },
{ "counter", TC_COUNTER },
+ { "defaultbiblio", TC_DEFAULTBIBLIO },
{ "defaultfont", TC_DEFAULTFONT },
{ "defaultmodule", TC_DEFAULTMODULE },
{ "defaultstyle", TC_DEFAULTSTYLE },
{ "excludesmodule", TC_EXCLUDESMODULE },
{ "float", TC_FLOAT },
{ "format", TC_FORMAT },
+ { "fullauthorlist", TC_FULLAUTHORLIST },
{ "htmlpreamble", TC_HTMLPREAMBLE },
+ { "htmlstyles", TC_HTMLSTYLES },
{ "htmltocsection", TC_HTMLTOCSECTION },
{ "ifcounter", TC_IFCOUNTER },
{ "ifstyle", TC_IFSTYLE },
{ "titlelatextype", TC_TITLELATEXTYPE },
{ "tocdepth", TC_TOCDEPTH }
};
-
+
} //namespace anon
}
+std::string TextClass::convert(std::string const & str)
+{
+ FileName const fn = FileName::tempName("locallayout");
+ ofstream os(fn.toFilesystemEncoding().c_str());
+ os << str;
+ os.close();
+ FileName const tempfile = FileName::tempName("convert_locallayout");
+ bool success = layout2layout(fn, tempfile);
+ if (!success)
+ return "";
+ ifstream is(tempfile.toFilesystemEncoding().c_str());
+ string ret;
+ string tmp;
+ while (!is.eof()) {
+ getline(is, tmp);
+ ret += tmp + '\n';
+ }
+ is.close();
+ tempfile.removeFile();
+ return ret;
+}
+
+
TextClass::ReturnValues TextClass::readWithoutConv(FileName const & filename, ReadType rt)
{
if (!filename.isReadableFile()) {
LYXERR(Debug::TCLASS, "Reading " + translateReadType(rt) + ": " +
to_utf8(makeDisplayPath(filename.absFileName())));
- // Define the plain layout used in table cells, ert, etc. Note that
- // we do this before loading any layout file, so that classes can
+ // Define the plain 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(plain_layout_))
layoutlist_.push_back(createBasicLayout(plain_layout_));
Lexer lexrc(textClassTags);
lexrc.setFile(filename);
ReturnValues retval = read(lexrc, rt);
-
+
LYXERR(Debug::TCLASS, "Finished reading " + translateReadType(rt) + ": " +
to_utf8(makeDisplayPath(filename.absFileName())));
return retval == OK;
bool const worx = convertLayoutFormat(filename, rt);
- if (!worx) {
- LYXERR0 ("Unable to convert " << filename <<
+ if (!worx)
+ LYXERR0 ("Unable to convert " << filename <<
" to format " << LAYOUT_FORMAT);
- return false;
- }
- return true;
+ return worx;
}
-bool TextClass::validate(std::string const & str)
+TextClass::ReturnValues TextClass::validate(std::string const & str)
{
TextClass tc;
return tc.read(str, VALIDATION);
}
-bool TextClass::read(std::string const & str, ReadType rt)
+TextClass::ReturnValues TextClass::read(std::string const & str, ReadType rt)
{
Lexer lexrc(textClassTags);
istringstream is(str);
lexrc.setStream(is);
ReturnValues retval = read(lexrc, rt);
- if (retval != FORMAT_MISMATCH)
- return retval == OK;
+ if (retval != FORMAT_MISMATCH)
+ return retval;
// write the layout string to a temporary file
FileName const tempfile = FileName::tempName("TextClass_read");
ofstream os(tempfile.toFilesystemEncoding().c_str());
if (!os) {
LYXERR0("Unable to create temporary file");
- return false;
+ return ERROR;
}
os << str;
os.close();
// now try to convert it
bool const worx = convertLayoutFormat(tempfile, rt);
if (!worx) {
- LYXERR0("Unable to convert internal layout information to format "
+ LYXERR0("Unable to convert internal layout information to format "
<< LAYOUT_FORMAT);
+ return ERROR;
}
tempfile.removeFile();
- return worx;
+ return OK_OLDFORMAT;
}
// Reads a textclass structure from file.
-TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
+TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt)
{
if (!lexrc.isOK())
return ERROR;
case TC_HTMLPREAMBLE:
htmlpreamble_ = from_utf8(lexrc.getLongString("EndPreamble"));
break;
-
+
+ case TC_HTMLSTYLES:
+ htmlstyles_ = from_utf8(lexrc.getLongString("EndStyles"));
+ break;
+
case TC_HTMLTOCSECTION:
html_toc_section_ = from_utf8(trim(lexrc.getString()));
break;
htmlpreamble_ += from_utf8(lexrc.getLongString("EndPreamble"));
break;
+ case TC_ADDTOHTMLSTYLES:
+ htmlstyles_ += from_utf8(lexrc.getLongString("EndStyles"));
+ break;
+
case TC_PROVIDES: {
lexrc.next();
string const feature = lexrc.getString();
case TC_REQUIRES: {
lexrc.eatLine();
- vector<string> const req
+ vector<string> const req
= getVectorFromString(lexrc.getString());
requires_.insert(req.begin(), req.end());
break;
case TC_FLOAT:
error = !readFloat(lexrc);
break;
-
+
+ case TC_CITEENGINE:
+ error = !readCiteEngine(lexrc);
+ break;
+
+ case TC_CITEENGINETYPE:
+ if (lexrc.next())
+ opt_enginetype_ = rtrim(lexrc.getString());
+ break;
+
case TC_CITEFORMAT:
- readCiteFormat(lexrc);
+ error = !readCiteFormat(lexrc);
+ break;
+
+ case TC_DEFAULTBIBLIO:
+ if (lexrc.next())
+ cite_default_biblio_style_ = rtrim(lexrc.getString());
+ break;
+
+ case TC_FULLAUTHORLIST:
+ if (lexrc.next())
+ cite_full_author_list_ &= lexrc.getBool();
break;
case TC_NOCOUNTER:
<< "' is missing a defaultstyle.");
return ERROR;
}
-
- // Try to erase "stdinsets" from the provides_ set.
+
+ // Try to erase "stdinsets" from the provides_ set.
// The
// Provides stdinsets 1
// declaration simply tells us that the standard insets have been
}
-void TextClass::readCiteFormat(Lexer & lexrc)
+bool TextClass::readCiteEngine(Lexer & lexrc)
+{
+ int const type = readCiteEngineType(lexrc);
+ if (type & ENGINE_TYPE_AUTHORYEAR)
+ cite_styles_[ENGINE_TYPE_AUTHORYEAR].clear();
+ if (type & ENGINE_TYPE_NUMERICAL)
+ cite_styles_[ENGINE_TYPE_NUMERICAL].clear();
+ string def;
+ bool getout = false;
+ while (!getout && lexrc.isOK()) {
+ lexrc.eatLine();
+ def = lexrc.getString();
+ def = subst(def, " ", "");
+ def = subst(def, "\t", "");
+ if (compare_ascii_no_case(def, "end") == 0) {
+ getout = true;
+ continue;
+ }
+ string cmd;
+ CitationStyle cs;
+ char ichar = def[0];
+ if (ichar == '#')
+ continue;
+ if (ichar == 'C') {
+ cs.forceUpperCase = true;
+ def[0] = 'c';
+ }
+
+ size_t const n = def.size();
+ for (size_t i = 0; i != n; ++i) {
+ ichar = def[i];
+ if (ichar == '*')
+ cs.fullAuthorList = true;
+ else if (ichar == '[' && cs.textAfter)
+ cs.textBefore = true;
+ else if (ichar == '[')
+ cs.textAfter = true;
+ else if (ichar != ']')
+ cmd += ichar;
+ }
+
+ cs.cmd = cmd;
+ if (type & ENGINE_TYPE_AUTHORYEAR)
+ cite_styles_[ENGINE_TYPE_AUTHORYEAR].push_back(cs);
+ if (type & ENGINE_TYPE_NUMERICAL)
+ cite_styles_[ENGINE_TYPE_NUMERICAL].push_back(cs);
+ }
+ return getout;
+}
+
+
+int TextClass::readCiteEngineType(Lexer & lexrc) const
+{
+ int const ENGINE_TYPE_DEFAULT =
+ ENGINE_TYPE_AUTHORYEAR | ENGINE_TYPE_NUMERICAL;
+ if (!lexrc.next()) {
+ lexrc.printError("No cite engine type given for token: `$$Token'.");
+ return ENGINE_TYPE_DEFAULT;
+ }
+ string const type = rtrim(lexrc.getString());
+ if (compare_ascii_no_case(type, "authoryear") == 0)
+ return ENGINE_TYPE_AUTHORYEAR;
+ else if (compare_ascii_no_case(type, "numerical") == 0)
+ return ENGINE_TYPE_NUMERICAL;
+ else if (compare_ascii_no_case(type, "default") != 0) {
+ string const s = "Unknown cite engine type `" + type
+ + "' given for token: `$$Token',";
+ lexrc.printError(s);
+ }
+ return ENGINE_TYPE_DEFAULT;
+}
+
+
+bool TextClass::readCiteFormat(Lexer & lexrc)
{
+ int const type = readCiteEngineType(lexrc);
string etype;
string definition;
while (lexrc.isOK()) {
lexrc.next();
etype = lexrc.getString();
- if (!lexrc.isOK() || compare_ascii_no_case(etype, "end") == 0)
+ if (compare_ascii_no_case(etype, "end") == 0)
break;
+ if (!lexrc.isOK())
+ return false;
lexrc.eatLine();
definition = lexrc.getString();
char initchar = etype[0];
if (initchar == '#')
continue;
- if (initchar == '!' || initchar == '_')
- cite_macros_[etype] = definition;
- else
- cite_formats_[etype] = definition;
+ if (initchar == '!' || initchar == '_') {
+ if (type & ENGINE_TYPE_AUTHORYEAR)
+ cite_macros_[ENGINE_TYPE_AUTHORYEAR][etype] = definition;
+ if (type & ENGINE_TYPE_NUMERICAL)
+ cite_macros_[ENGINE_TYPE_NUMERICAL][etype] = definition;
+ } else {
+ if (type & ENGINE_TYPE_AUTHORYEAR)
+ cite_formats_[ENGINE_TYPE_AUTHORYEAR][etype] = definition;
+ if (type & ENGINE_TYPE_NUMERICAL)
+ cite_formats_[ENGINE_TYPE_NUMERICAL][etype] = definition;
+ }
}
+ return true;
}
FT_WITHIN,
FT_STYLE,
FT_LISTNAME,
- FT_NEEDSFLOAT,
+ FT_USESFLOAT,
+ FT_PREDEFINED,
FT_HTMLSTYLE,
FT_HTMLATTR,
FT_HTMLTAG,
{ "htmlattr", FT_HTMLATTR },
{ "htmlstyle", FT_HTMLSTYLE },
{ "htmltag", FT_HTMLTAG },
+ { "ispredefined", FT_PREDEFINED },
{ "listcommand", FT_LISTCOMMAND },
{ "listname", FT_LISTNAME },
- { "needsfloatpkg", FT_NEEDSFLOAT },
{ "numberwithin", FT_WITHIN },
{ "placement", FT_PLACEMENT },
{ "refprefix", FT_REFPREFIX },
{ "style", FT_STYLE },
- { "type", FT_TYPE }
+ { "type", FT_TYPE },
+ { "usesfloatpkg", FT_USESFLOAT }
};
lexrc.pushTable(floatTags);
string style;
string type;
string within;
- bool needsfloat = true;
+ bool usesfloat = true;
+ bool ispredefined = false;
bool getout = false;
while (!getout && lexrc.isOK()) {
style = fl.style();
name = fl.name();
listname = fl.listName();
- needsfloat = fl.needsFloatPkg();
+ usesfloat = fl.usesFloatPkg();
+ ispredefined = fl.isPredefined();
listcommand = fl.listCommand();
refprefix = fl.refPrefix();
- }
+ }
break;
case FT_NAME:
lexrc.next();
lexrc.next();
listname = lexrc.getString();
break;
- case FT_NEEDSFLOAT:
+ case FT_USESFLOAT:
lexrc.next();
- needsfloat = lexrc.getBool();
+ usesfloat = lexrc.getBool();
+ break;
+ case FT_PREDEFINED:
+ lexrc.next();
+ ispredefined = lexrc.getBool();
break;
case FT_HTMLATTR:
lexrc.next();
// Here we have a full float if getout == true
if (getout) {
- if (!needsfloat && listcommand.empty()) {
+ if (!usesfloat && listcommand.empty()) {
// if this float uses the same auxfile as an existing one,
// there is no need for it to provide a list command.
FloatList::const_iterator it = floatlist_.begin();
}
if (!found_ext)
LYXERR0("The layout does not provide a list command " <<
- "for the builtin float `" << type << "'. LyX will " <<
+ "for the float `" << type << "'. LyX will " <<
"not be able to produce a float list.");
}
- Floating fl(type, placement, ext, within, style, name,
- listname, listcommand, refprefix,
- htmltag, htmlattr, htmlstyle, needsfloat);
+ Floating fl(type, placement, ext, within, style, name,
+ listname, listcommand, refprefix,
+ htmltag, htmlattr, htmlstyle, usesfloat, ispredefined);
floatlist_.newFloat(fl);
// each float has its own counter
counters_.newCounter(from_ascii(type), from_ascii(within),
string const & TextClass::prerequisites() const
-{
+{
if (contains(prerequisites_, ',')) {
vector<string> const pres = getVectorFromString(prerequisites_);
prerequisites_ = getStringFromVector(pres, "\n\t");
}
- return prerequisites_;
+ return prerequisites_;
}
bool TextClass::hasLayout(docstring const & n) const
bool TextClass::hasInsetLayout(docstring const & n) const
{
- if (n.empty())
+ if (n.empty())
return false;
InsetLayouts::const_iterator it = insetlayoutlist_.begin();
InsetLayouts::const_iterator en = insetlayoutlist_.end();
{
LASSERT(!name.empty(), /**/);
- const_iterator it =
+ const_iterator it =
find_if(begin(), end(), LayoutNamesEqual(name));
if (it == end()) {
<< to_utf8(makeDisplayPath(layout_file.absFileName()))
<< "'\n(Check `" << name_
<< "')\nCheck your installation and "
- "try Options/Reconfigure..."
+ "try Options/Reconfigure..."
<< endl;
}
}
-void DocumentClass::addLayoutIfNeeded(docstring const & n) const
+bool DocumentClass::addLayoutIfNeeded(docstring const & n) const
{
- if (!hasLayout(n))
- layoutlist_.push_back(createBasicLayout(n, true));
+ if (hasLayout(n))
+ return false;
+
+ layoutlist_.push_back(createBasicLayout(n, true));
+ return true;
}
-InsetLayout const & DocumentClass::insetLayout(docstring const & name) const
+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 const & TextClass::defaultLayoutName() const
{
- // This really should come from the actual layout... (Lgb)
return defaultlayout_;
}
}
-bool TextClass::isDefaultLayout(Layout const & layout) const
+bool TextClass::isDefaultLayout(Layout const & layout) const
{
return layout.name() == defaultLayoutName();
}
-bool TextClass::isPlainLayout(Layout const & layout) const
+bool TextClass::isPlainLayout(Layout const & layout) const
{
return layout.name() == plainLayoutName();
}
DocumentClassBundle & DocumentClassBundle::get()
{
- static DocumentClassBundle singleton;
- return singleton;
+ static DocumentClassBundle singleton;
+ return singleton;
}
}
-string const & DocumentClass::getCiteFormat(string const & entry_type) const
+string const & DocumentClass::getCiteFormat(CiteEngineType const & type,
+ string const & entry, string const & fallback) const
{
static string default_format = "{%author%[[%author%, ]][[{%editor%[[%editor%, ed., ]]}]]}\"%title%\"{%journal%[[, {!<i>!}%journal%{!</i>!}]][[{%publisher%[[, %publisher%]][[{%institution%[[, %institution%]]}]]}]]}{%year%[[ (%year%)]]}{%pages%[[, %pages%]]}.";
-
- map<string, string>::const_iterator it = cite_formats_.find(entry_type);
- if (it != cite_formats_.end())
- return it->second;
- return default_format;
+
+ map<CiteEngineType, map<string, string> >::const_iterator itype = cite_formats_.find(type);
+ if (itype == cite_formats_.end())
+ return default_format;
+ map<string, string>::const_iterator it = itype->second.find(entry);
+ if (it == itype->second.end() && !fallback.empty())
+ it = itype->second.find(fallback);
+ if (it == itype->second.end())
+ return default_format;
+ return it->second;
}
-string const & DocumentClass::getCiteMacro(string const & macro) const
+string const & DocumentClass::getCiteMacro(CiteEngineType const & type,
+ string const & macro) const
{
static string empty;
- map<string, string>::const_iterator it = cite_macros_.find(macro);
- if (it != cite_macros_.end())
- return it->second;
- return empty;
+ map<CiteEngineType, map<string, string> >::const_iterator itype = cite_macros_.find(type);
+ if (itype == cite_macros_.end())
+ return empty;
+ map<string, string>::const_iterator it = itype->second.find(macro);
+ if (it == itype->second.end())
+ return empty;
+ return it->second;
+}
+
+
+vector<string> const DocumentClass::citeCommands(
+ CiteEngineType const & type) const
+{
+ vector<CitationStyle> const styles = citeStyles(type);
+ vector<CitationStyle>::const_iterator it = styles.begin();
+ vector<CitationStyle>::const_iterator end = styles.end();
+ vector<string> cmds;
+ for (; it != end; ++it) {
+ CitationStyle const cite = *it;
+ cmds.push_back(cite.cmd);
+ }
+ return cmds;
+}
+
+
+vector<CitationStyle> const & DocumentClass::citeStyles(
+ CiteEngineType const & type) const
+{
+ static vector<CitationStyle> empty;
+ map<CiteEngineType, vector<CitationStyle> >::const_iterator it = cite_styles_.find(type);
+ if (it == cite_styles_.end())
+ return empty;
+ return it->second;
}