#include "TextClass.h"
#include "support/docstream.h"
+#include "support/FileName.h"
#include "support/filetools.h"
-using std::endl;
-using std::find;
-using std::string;
-using std::list;
-using std::ostream;
-using std::ostringstream;
-using std::set;
-
+using namespace std;
+using namespace lyx::support;
namespace lyx {
-using support::isSGMLFilename;
-using support::libFileSearch;
-using support::makeRelPath;
-using support::onlyPath;
-
/////////////////////////////////////////////////////////////////////
//
// Strings
static string const tabularnewline_def =
"%% Because html converters don't know tabularnewline\n"
"\\providecommand{\\tabularnewline}{\\\\}\n";
-
+
static string const lyxgreyedout_def =
"%% The greyedout annotation environment\n"
"\\newenvironment{lyxgreyedout}{\\textcolor[gray]{0.8}\\bgroup}{\\egroup}\n";
"\\DeclareRobustCommand{\\textcyr}[1]{\\leavevmode{\\cyrtext #1}}\n"
"\\DeclareFontEncoding{T2A}{}{}\n";
-
+static string const newlyxcommand_def =
+ "%% Math macros with multiple optional parameters\n"
+ "% #1<-\\foo\n"
+ "\\def\\newlyxcommand#1{\n"
+ " \\@ifnextchar[%]\n"
+ " {\\newlyxcommand@arity{#1}}\n"
+ " {\\newlyxcommand@arity{#1}[0]}\n"
+ "}\n"
+ "\n"
+ "% #1<-\\foo #2<-arity\n"
+ "\\def\\newlyxcommand@arity#1[#2]{\n"
+ " \\@ifnextchar[%]\n"
+ " {\\newlyxcommand@firstopt{#1}{}{#2}}\n"
+ " {\\newlyxcommand@def#1{#2}}\n"
+ "}\n"
+ "\n"
+ "% #1<-\\foo #2<-iii #3<-arity #4<-default value for (#2+1)th argument\n"
+ "\\def\\newlyxcommand@firstopt#1#2#3[#4]{\n"
+ " % ##1<-\\foo@\n"
+ " \\def\\@defclause##1{\n"
+ " \\def#1{\n"
+ " \\@ifnextchar[%]\n"
+ " {##1{}{#4}}\n"
+ " {##1{}{#4}[#4]}}\n"
+ " }\n"
+ " \\expandafter\\@defclause\\csname\\expandafter\\@gobble\\string#1@\\endcsname\n"
+ " \\@ifnextchar[%]\n"
+ " {\\newlyxcommand@opt{#1}{#2}{#3}}\n"
+ " {\\newlyxcommand@last{#1}{#2}{#3}[#4]}\n"
+ "}\n"
+ "\n"
+ "\\begingroup\n"
+ "\\catcode`\\Q=3\n"
+ "\\gdef\\@myempty{Q}\n"
+ "\\endgroup\n"
+ "\n"
+ "% #1<-\\foo #2<-iii #3<-arity #4<-default value for (#2+1)th argument\n"
+ "\\def\\newlyxcommand@opt#1#2#3[#4]{\n"
+ " % ##1<-\\foo@iii ##2<-\\foo@iiii \n"
+ " % ####1<-{a}{b}{c} ####2<-default value ####3<- default arg\n"
+ " \\def\\@defclause##1##2{\n"
+ " \\def##1####1####2[####3]{\n"
+ " \\ifx\\@myempty####3\\@myempty%\n"
+ " \\def\\@callnext{\n"
+ " \\@ifnextchar[%]\n"
+ " {##2{####1{####2}}{#4}}\n"
+ " {##2{####1{####2}}{#4}[#4]}\n"
+ " }\n"
+ " \\else\n"
+ " \\def\\@callnext{\n"
+ " \\@ifnextchar[%]\n"
+ " {##2{####1{####3}}{#4}}\n"
+ " {##2{####1{####3}}{#4}[#4]}\n"
+ " }\n"
+ " \\fi\n"
+ " \\@callnext\n"
+ " }\n"
+ " }\n"
+ " \\expandafter\\def\\expandafter\\@clausename\\expandafter{\\csname\\expandafter\\@gobble\\string#1@#2\\endcsname}\n"
+ " \\expandafter\\def\\expandafter\\@nextclausename\\expandafter{\\csname\\expandafter\\@gobble\\string#1@#2i\\endcsname}\n"
+ " \\expandafter\\expandafter\\expandafter \n"
+ " \\@defclause\\expandafter\\@clausename\\@nextclausename\n"
+ " \\@ifnextchar[%]\n"
+ " {\\newlyxcommand@opt{#1}{#2i}{#3}}\n"
+ " {\\newlyxcommand@last{#1}{#2i}{#3}[#4]}\n"
+ "}\n"
+ "\n"
+ "% #1<-\\foo #2<-iii #3<-arity #4<-default value for (#2+1)th argument\n"
+ "\\def\\newlyxcommand@last#1#2#3[#4]{\n"
+ " \\def\\@defclause##1##2{\n"
+ " \\def##1####1####2[####3]{\n"
+ " \\ifx\\@myempty####3\\@myempty%\n"
+ " \\def\\@callnext{##2####1{####2}}\n"
+ " \\else\n"
+ " \\def\\@callnext{##2####1{####3}}\n"
+ " \\fi\n"
+ " \\@callnext\n"
+ " }\n"
+ " }\n"
+ " \\expandafter\\def\\expandafter\\@clausename\\expandafter{\\csname\\expandafter\\@gobble\\string#1@#2\\endcsname}\n"
+ " \\expandafter\\def\\expandafter\\@nextclausename\\expandafter{\\csname\\expandafter\\@gobble\\string#1@#2i\\endcsname}\n"
+ " \\expandafter\\expandafter\\expandafter\n"
+ " \\@defclause\\expandafter\\@clausename\\@nextclausename\n"
+ " \\expandafter\\newlyxcommand@def\\csname\\expandafter\\@gobble\\string#1@#2i\\endcsname{#3}\n"
+ "}\n"
+ "\n"
+ "% #1<-\\foo #2<-arity #3<-definition\n"
+ "\\def\\newlyxcommand@def#1#2#3{\n"
+ " \\ifx#20\n"
+ " \\def#1{#3}\n"
+ " \\else\n"
+ " \\def\\@splitargs##1#2##2.{\\def#1##1#2}\\@splitargs##1##2##3##4##5##6##7##8##9.{#3}\n"
+ " \\fi\n"
+ "}\n";
+
/////////////////////////////////////////////////////////////////////
//
// LaTeXFeatures
bool LaTeXFeatures::isAvailable(string const & name)
{
+ string n = name;
if (packages_.empty())
getAvailable();
- return find(packages_.begin(), packages_.end(), name) != packages_.end();
+ size_t loc = n.rfind(".sty");
+ if (loc == n.length() - 4)
+ n = n.erase(name.length() - 4);
+ return find(packages_.begin(), packages_.end(), n) != packages_.end();
}
"mathrsfs",
"ascii",
"url",
+ "covington",
+ "csquotes",
+ "enumitem",
+ "endnotes",
+ "ifthen",
+ "amsthm"
};
int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
ostringstream packages;
TextClass const & tclass = params_.getTextClass();
+ // FIXME: currently, we can only load packages and macros known
+ // to LyX.
+ // However, with the Require tag of layouts/custom insets,
+ // also inknown packages can be requested. They are silently
+ // swallowed now. We should change this eventually.
+
//
// These are all the 'simple' includes. i.e
// packages which we just \usepackage{package}
params_.use_esint == BufferParams::package_off)) {
packages << "\\usepackage{amsmath}\n";
}
-
+
// wasysym is a simple feature, but it must be after amsmath if both
// are used
// wasysym redefines some integrals (e.g. iint) from amsmath. That
<< "]{graphicx}\n";
}
// shadecolor for shaded
- if (mustProvide("framed") && mustProvide("color")) {
+ if (isRequired("framed") && mustProvide("color")) {
RGBColor c = rgbFromHexName(lcolor.getX11Name(Color_shadedbg));
//255.0 to force conversion to double
//NOTE As Jürgen Spitzmüller pointed out, an alternative would be
macros << binom_def << '\n';
if (mustProvide("mathcircumflex"))
macros << mathcircumflex_def << '\n';
+ if (mustProvide("newlyxcommand"))
+ macros << newlyxcommand_def << '\n';
// other
if (mustProvide("ParagraphLeftIndent"))
tcpreamble << tclass[*cit]->preamble();
}
- InsetLayouts const & insetlayouts = tclass.insetlayouts();
- InsetLayouts::const_iterator cit2 = insetlayouts.begin();
- InsetLayouts::const_iterator end2 = insetlayouts.end();
- for (; cit2 != end2; ++cit2) {
- if (isRequired(to_utf8(cit2->first))) {
- tcpreamble << from_utf8(cit2->second.preamble);
- }
- }
-
return tcpreamble.str();
}
projects / lyx.git / blobdiff