#include "support/filetools.h"
#include "support/lstrings.h"
#include "support/Package.h"
-#include "support/Path.h"
+#include "support/PathChanger.h"
#include "support/Translator.h"
+#include <algorithm>
#include <ostream>
using namespace std;
static TransformIDTranslator const initIDTranslator()
{
- TransformIDTranslator translator(TransformID(-1), "");
+ TransformIDTranslator translator(None, "");
translator.addPair(Rotate, "Rotate");
translator.addPair(Resize, "Resize");
translator.addPair(Clip, "Clip");
}
-class DumpPreambleDef {
-public:
- typedef TemplateManager::PreambleDefs::value_type value_type;
-
- DumpPreambleDef(ostream & os) : os_(os) {}
-
- void operator()(value_type const & vt) {
- os_ << "PreambleDef " << vt.first << '\n'
- << vt.second
- << "PreambleDefEnd" << endl;
- }
-
-private:
- ostream & os_;
-};
-
-
-class DumpTemplate {
-public:
- typedef TemplateManager::Templates::value_type value_type;
+std::function<void (TemplateManager::PreambleDefs::value_type const &)>
+ DumpPreambleDef(ostream & os)
+{
+ return [&os](TemplateManager::PreambleDefs::value_type const & vt)
+ {
+ os << "PreambleDef " << vt.first << '\n'
+ << to_utf8(vt.second)
+ << "PreambleDefEnd" << endl;
+ };
+}
- DumpTemplate(ostream & os) : os_(os) {}
- void operator()(value_type const & vt) {
+std::function<void (TemplateManager::Templates::value_type const &) >
+ DumpTemplate(ostream & os)
+{
+ return [&os](TemplateManager::Templates::value_type const & vt) {
Template const & et = vt.second;
- os_ << "Template " << et.lyxName << '\n'
+ os << "Template " << et.lyxName << '\n'
<< "\tGuiName " << et.guiName << '\n'
<< "\tHelpText\n"
- << et.helpText
+ << to_utf8(et.helpText)
<< "\tHelpTextEnd\n"
<< "\tInputFormat " << et.inputFormat << '\n'
<< "\tFileFilter " << et.fileRegExp << '\n'
<< "\tPreview ";
switch (et.preview_mode) {
case PREVIEW_OFF:
- os_ << "Off\n";
+ os << "Off\n";
break;
case PREVIEW_GRAPHICS:
- os_ << "Graphics\n";
+ os << "Graphics\n";
break;
case PREVIEW_INSTANT:
- os_ << "InstantPreview\n";
+ os << "InstantPreview\n";
break;
}
typedef vector<TransformID> IDs;
IDs::const_iterator it = et.transformIds.begin();
IDs::const_iterator end = et.transformIds.end();
for (; it != end; ++it) {
- os_ << "\tTransform "
+ os << "\tTransform "
<< transformIDTranslator().find(*it) << '\n';
}
- et.dumpFormats(os_);
- os_ << "TemplateEnd" << endl;
-
- }
-
-private:
- ostream & os_;
-};
+ et.dumpFormats(os);
+ os << "TemplateEnd" << endl;
-class DumpFormat {
-public:
- typedef Template::Formats::value_type value_type;
+ };
+}
- DumpFormat(ostream & o) : os_(o) {}
- void operator()(value_type const & vt) const {
+std::function<void (Template::Formats::value_type const &) >
+ DumpFormat (ostream & os)
+{
+ return [&os](Template::Formats::value_type const & vt)
+ {
Template::Format const & ft = vt.second;
- os_ << "\tFormat " << vt.first << '\n'
+ os << "\tFormat " << vt.first << '\n'
<< "\t\tProduct " << ft.product << '\n'
<< "\t\tUpdateFormat " << ft.updateFormat << '\n'
<< "\t\tUpdateResult " << ft.updateResult << '\n';
vector<string>::const_iterator qend = ft.requirements.end();
for (; qit != qend; ++qit) {
lyxerr << "req:" << *qit << endl;
- os_ << "\t\tRequirement " << *qit << '\n';
+ os << "\t\tRequirement " << *qit << '\n';
}
typedef vector<Template::Option> Options;
Options::const_iterator oit = ft.options.begin();
Options::const_iterator oend = ft.options.end();
for (; oit != oend; ++oit) {
- os_ << "\t\tOption "
+ os << "\t\tOption "
<< oit->name
<< ": "
<< oit->option
vector<string>::const_iterator pit = ft.preambleNames.begin();
vector<string>::const_iterator pend = ft.preambleNames.end();
for (; pit != pend; ++pit) {
- os_ << "\t\tPreamble " << *pit << '\n';
+ os << "\t\tPreamble " << *pit << '\n';
}
typedef Template::Format::FileMap FileMap;
vector<string>::const_iterator fit = rit->second.begin();
vector<string>::const_iterator fend = rit->second.end();
for (; fit != fend; ++fit) {
- os_ << "\t\tReferencedFile " << rit->first
+ os << "\t\tReferencedFile " << rit->first
<< " \"" << *fit << "\"\n";
}
}
- os_ << "\tFormatEnd\n";
- }
-private:
- ostream & os_;
-};
+ os << "\tFormatEnd\n";
+ };
+}
void Template::dumpFormats(ostream & os) const
}
-string const
-TemplateManager::getPreambleDefByName(string const & name) const
+docstring TemplateManager::getPreambleDefByName(string const & name) const
{
string const trimmed_name = trim(name);
if (trimmed_name.empty())
- return string();
+ return docstring();
PreambleDefs::const_iterator it = preambledefs.find(trimmed_name);
if (it == preambledefs.end())
- return string();
+ return docstring();
return it->second;
}
{ "templateend", TM_TEMPLATE_END }
};
- Lexer lex(templatetags);
+ // Read the templates list
+ vector<string> templateslist;
+ FileName const real_file = libFileSearch("", "xtemplates.lst");
+ LYXERR(Debug::EXTERNAL, "Reading external templates from `" << real_file << '\'');
- FileName const filename = libFileSearch("", "external_templates");
- if (filename.empty() || !lex.setFile(filename)) {
- lex.printError("external::TemplateManager::readTemplates: "
- "No template file");
+ if (real_file.empty()) {
+ LYXERR0("unable to find external templates file `xtemplates.lst'.\n"
+ << "No external templates will be available.");
return;
}
- char const * const preamble_end_tag =
- templatetags[TM_PREAMBLEDEF_END-1].tag;
+ Lexer tlex;
+ if (!tlex.setFile(real_file)) {
+ LYXERR0("lyxlex was not able to set file: "
+ << real_file << ".\nNo external templates will be available.");
+ return;
+ }
- while (lex.isOK()) {
- switch (lex.lex()) {
- case TM_PREAMBLEDEF: {
- lex.next();
- string const name = lex.getString();
- preambledefs[name] = lex.getLongString(preamble_end_tag);
+ if (!tlex.isOK()) {
+ LYXERR0("unable to open external templates file `"
+ << to_utf8(makeDisplayPath(real_file.absFileName(), 1000))
+ << "'\nNo external templates will be available.");
+ return;
+ }
+
+ bool finished = false;
+ // Parse external templates files
+ LYXERR(Debug::EXTERNAL, "Starting parsing of xtemplates.lst");
+ while (tlex.isOK() && !finished) {
+ LYXERR(Debug::EXTERNAL, "\tline by line");
+ switch (tlex.lex()) {
+ case Lexer::LEX_FEOF:
+ finished = true;
+ break;
+ default:
+ string const name = tlex.getString();
+ LYXERR(Debug::EXTERNAL, "Template name: " << name);
+ templateslist.push_back(name);
+ break;
}
- break;
+ }
- case TM_TEMPLATE: {
- lex.next();
- string const name = lex.getString();
- Template & tmp = templates[name];
- tmp.lyxName = name;
- tmp.readTemplate(lex);
+ LYXERR(Debug::EXTERNAL, "End of parsing of xtemplates.lst");
+
+ for (vector<string>::const_iterator it = templateslist.begin(); it != templateslist.end(); ++it) {
+ FileName const filename = libFileSearch("xtemplates", *it);
+ LYXERR(Debug::EXTERNAL, "Reading template file " << filename.absFileName());
+ Lexer lex(templatetags);
+ if (filename.empty() || !lex.setFile(filename)) {
+ lex.printError("external::TemplateManager::readTemplates: "
+ "No template file");
+ return;
}
- break;
- case TM_TEMPLATE_END:
- lex.printError("Warning: End outside Template.");
- break;
+ char const * const preamble_end_tag =
+ templatetags[TM_PREAMBLEDEF_END-1].tag;
- case TM_PREAMBLEDEF_END:
- lex.printError("Warning: End outside PreambleDef.");
- break;
+ while (lex.isOK()) {
+ switch (lex.lex()) {
+ case TM_PREAMBLEDEF: {
+ lex.next();
+ string const name = lex.getString();
+ preambledefs[name] = lex.getLongString(from_ascii(preamble_end_tag));
+ break;
+ }
+
+ case TM_TEMPLATE: {
+ lex.next();
+ string const name = lex.getString();
+ Template & tmp = templates[name];
+ tmp.lyxName = name;
+ tmp.readTemplate(lex);
+ break;
+ }
+
+ case TM_TEMPLATE_END:
+ lex.printError("Warning: End outside Template.");
+ break;
+
+ case TM_PREAMBLEDEF_END:
+ lex.printError("Warning: End outside PreambleDef.");
+ break;
+ default:
+ break;
+ }
}
}
}
break;
case TO_HELPTEXT:
- helpText = lex.getLongString("HelpTextEnd");
+ helpText = lex.getLongString(from_ascii("HelpTextEnd"));
break;
case TO_INPUTFORMAT:
case TO_END:
return;
-
- default:
- lex.printError("external::Template::readTemplate: "
- "Wrong tag: $$Token");
- LASSERT(false, /**/);
- break;
}
}
}
transform_class_not_found(lyxerr, transformer_class);
}
-} // namespace anon
+} // namespace
void Template::Format::readFormat(Lexer & lex)
projects / lyx.git / blobdiff