#include "support/package.h"
#include "support/path.h"
-namespace support = lyx::support;
-
using std::endl;
using std::for_each;
-
using std::string;
using std::ostream;
using std::vector;
-
namespace lyx {
namespace external {
-namespace {
typedef Translator<TransformID, string> TransformIDTranslator;
-TransformIDTranslator const & transformIDTranslator();
-} // namespace anon
+static TransformIDTranslator const initIDTranslator()
+{
+ TransformIDTranslator translator(TransformID(-1), "");
+ translator.addPair(Rotate, "Rotate");
+ translator.addPair(Resize, "Resize");
+ translator.addPair(Clip, "Clip");
+ translator.addPair(Extra, "Extra");
+ return translator;
+}
+static TransformIDTranslator const & transformIDTranslator()
+{
+ static TransformIDTranslator const translator = initIDTranslator();
+ return translator;
+}
// We have to have dummy default commands for security reasons!
Template::Template()
ost << "\tFormat " << vt.first << '\n'
<< "\t\tProduct " << ft.product << '\n'
<< "\t\tUpdateFormat " << ft.updateFormat << '\n'
- << "\t\tUpdateResult " << ft.updateResult << '\n'
- << "\t\tRequirement " << ft.requirement << '\n';
+ << "\t\tUpdateResult " << ft.updateResult << '\n';
+
+ vector<string>::const_iterator qit = ft.requirements.begin();
+ vector<string>::const_iterator qend = ft.requirements.end();
+ for (; qit != qend; ++qit) {
+ lyxerr << "req:" << *qit << std::endl;
+ ost << "\t\tRequirement " << *qit << '\n';
+ }
typedef vector<Template::Option> Options;
Options::const_iterator oit = ft.options.begin();
LyXLex lex(templatetags, TM_TEMPLATE_END);
- string filename = support::LibFileSearch("", "external_templates");
+ support::FileName const filename = support::libFileSearch("", "external_templates");
if (filename.empty() || !lex.setFile(filename)) {
lex.printError("external::TemplateManager::readTemplates: "
"No template file");
case FO_REQUIREMENT:
lex.next(true);
- requirement = lex.getString();
+ requirements.push_back(lex.getString());
break;
case FO_PREAMBLE:
}
}
-namespace {
-
-TransformIDTranslator const initIDTranslator()
-{
- TransformIDTranslator translator(TransformID(-1), "");
- translator.addPair(Rotate, "Rotate");
- translator.addPair(Resize, "Resize");
- translator.addPair(Clip, "Clip");
- translator.addPair(Extra, "Extra");
- return translator;
-}
-
-
-TransformIDTranslator const & transformIDTranslator()
-{
- static TransformIDTranslator const translator = initIDTranslator();
- return translator;
-}
-
-} // namespace anon
-
} // namespace external
} // namespace lyx