"\\newcommand{\\lyxdeleted}[3]{}\n");
static docstring const textgreek_def = from_ascii(
+ "\\providecommand*{\\perispomeni}{\\char126}\n"
"\\AtBeginDocument{\\DeclareRobustCommand{\\greektext}{%\n"
" \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}%\n"
- " \\renewcommand{\\~}{\\char126}%\n"
+ " \\renewcommand{\\~}{\\perispomeni}%\n"
"}}\n"
"\\DeclareRobustCommand{\\textgreek}[1]{\\leavevmode{\\greektext #1}}\n"
"\\DeclareFontEncoding{LGR}{}{}\n");
// use the "H" modifier. This includes modified table and
// figure floats. (Lgb)
Floating const & fl = params_.documentClass().floats().getType(name);
- if (!fl.type().empty() && !fl.builtin()) {
+ if (!fl.floattype().empty() && fl.needsFloatPkg()) {
require("float");
}
}
"bm",
"pdfpages",
"amscd",
- "slashed"
+ "slashed",
+ "multirow"
};
int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
if (mustProvide("lyxarrow"))
macros << lyxarrow_def << '\n';
- if (mustProvide("textgreek"))
- macros << textgreek_def << '\n';
+ if (mustProvide("textgreek")) {
+ // Avoid a LaTeX error if times fonts are used and the grtimes
+ // package is installed but actual fonts are not (bug 6469).
+ if (params_.fontsRoman == "times")
+ macros << subst(textgreek_def,
+ from_ascii("\\greektext #1"),
+ from_ascii("%\n \\IfFileExists"
+ "{grtm10.tfm}{}{\\fontfamily"
+ "{cmr}}\\greektext #1"))
+ << '\n';
+ else
+ macros << textgreek_def << '\n';
+ }
if (mustProvide("textcyr"))
macros << textcyr_def << '\n';
UsedFloats::const_iterator fend = usedFloats_.end();
for (; fit != fend; ++fit) {
Floating const & fl = floats.getType(fit->first);
- docstring const type = from_ascii(fl.type());
+ docstring const type = from_ascii(fl.floattype());
docstring const flname = from_utf8(fl.name());
docstring name = translateIfPossible(flname,
buffer().language()->code());
Floating const & fl = floats.getType(cit->first);
// For builtin floats we do nothing.
- if (fl.builtin()) continue;
+ if (!fl.needsFloatPkg())
+ continue;
// We have to special case "table" and "figure"
- if (fl.type() == "tabular" || fl.type() == "figure") {
+ if (fl.floattype() == "tabular" || fl.floattype() == "figure") {
// Output code to modify "table" or "figure"
// but only if builtin == false
// and that have to be true at this point in the
// function.
- docstring const type = from_ascii(fl.type());
+ docstring const type = from_ascii(fl.floattype());
docstring const placement = from_ascii(fl.placement());
docstring const style = from_ascii(fl.style());
if (!style.empty()) {
} else {
// The other non builtin floats.
- docstring const type = from_ascii(fl.type());
+ docstring const type = from_ascii(fl.floattype());
docstring const placement = from_ascii(fl.placement());
docstring const ext = from_ascii(fl.ext());
docstring const within = from_ascii(fl.within());
// effect. (Lgb)
}
if (cit->second)
- os << "\n\\newsubfloat{" << from_ascii(fl.type()) << "}\n";
+ os << "\n\\newsubfloat{" << from_ascii(fl.floattype()) << "}\n";
}
}