#include "support/gettext.h"
#include "support/lstrings.h"
+#include <algorithm>
+
+
using namespace std;
using namespace lyx::support;
static docstring const lyx_def = from_ascii(
"\\providecommand{\\LyX}{L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}");
-static docstring const lyxline_def = from_ascii(
- "\\newcommand{\\lyxline}[1][1pt]{%\n"
- " \\par\\noindent%\n"
- " \\rule[.5ex]{\\linewidth}{#1}\\par}");
-
static docstring const noun_def = from_ascii(
"\\newcommand{\\noun}[1]{\\textsc{#1}}");
static docstring const lyxgreyedout_def = from_ascii(
"%% The greyedout annotation environment\n"
- "\\newenvironment{lyxgreyedout}{\\textcolor[gray]{0.8}\\bgroup}{\\egroup}\n");
+ "\\newenvironment{lyxgreyedout}{\\textcolor{note_fontcolor}\\bgroup}{\\egroup}\n");
// We want to omit the file extension for includegraphics, but this does not
// work when the filename contains other dots.
"\\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{\\~}{\\perispomeni}%\n"
- "}}\n"
- "\\DeclareRobustCommand{\\textgreek}[1]{\\leavevmode{%\n"
- " \\IfFileExists{grtm10.tfm}{}{\\fontfamily{cmr}}\\greektext #1}}\n"
- "\\DeclareFontEncoding{LGR}{}{}\n");
+ "\\DeclareRobustCommand{\\greektext}{%\n"
+ " \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}}\n"
+ "\\DeclareRobustCommand{\\textgreek}[1]{\\leavevmode{\\greektext #1}}\n"
+ "\\DeclareFontEncoding{LGR}{}{}\n"
+ "\\DeclareTextSymbol{\\~}{LGR}{126}");
static docstring const textcyr_def = from_ascii(
"\\DeclareRobustCommand{\\cyrtext}{%\n"
" \\mathchar\"0\\hexnumber@\\symtipasymb0C}{#2}}\n"
"\\newcommand{\\ogonek}[1]{\\mathpalette\\doogonek{#1}}\n");
+static docstring const lyxref_def = from_ascii(
+ "\\makeatletter\n"
+ "\\def\\lyxref#1{\\@lyxref#1:@@@@@:}\n"
+ "\\def\\@lyxref#1:#2:{%\n"
+ "\\ifthenelse{\\equal{#2}{@@@@@}}%\n"
+ " {\\ref{#1}}%\n"
+ " {\\@@lyxref#1:#2:}%\n"
+ "}\n"
+ "\\def\\@@lyxref#1:#2:@@@@@:{%\n"
+ " \\RS@ifundefined{#1ref}%\n"
+ " {\\ref{#1:#2}}%\n"
+ " {\\RS@nameuse{#1ref}{#2}}%\n"
+ "}\n"
+ "\\RS@ifundefined{\thmref}\n"
+ " {\\def\\RSthmtxt{theorem~}\\newref{thm}{name = \\RSthmtxt}}\n"
+ " {}\n"
+ "\\makeatother\n"
+ );
+
/////////////////////////////////////////////////////////////////////
//
// LaTeXFeatures
// 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");
}
}
// subfig is handled in BufferParams.cpp
"varioref",
"prettyref",
+ "refstyle",
/*For a successful cooperation of the `wrapfig' package with the
`float' package you should load the `wrapfig' package *after*
the `float' package. See the caption package documentation
"bm",
"pdfpages",
"amscd",
- "slashed"
+ "slashed",
+ "multirow"
};
int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
if (mustProvide("pdfcolmk"))
colors << "\\usepackage{pdfcolmk}\n";
+ // the following 3 color commands must be set after color
+ // is loaded and before pdfpages, therefore add the command
+ // here define the set color
if (mustProvide("pagecolor")) {
- // the \pagecolor command must be set after color is loaded and
- // before pdfpages, therefore add the command here
- // define the set color
colors << "\\definecolor{page_backgroundcolor}{rgb}{";
colors << outputLaTeXColor(params_.backgroundcolor) << "}\n";
// set the page color
colors << "\\pagecolor{page_backgroundcolor}\n";
}
+ if (mustProvide("fontcolor")) {
+ colors << "\\definecolor{document_fontcolor}{rgb}{";
+ colors << outputLaTeXColor(params_.fontcolor) << "}\n";
+ // set the color
+ colors << "\\color{document_fontcolor}\n";
+ }
+
+ if (mustProvide("lyxgreyedout")) {
+ colors << "\\definecolor{note_fontcolor}{rgb}{";
+ colors << outputLaTeXColor(params_.notefontcolor) << "}\n";
+ // the color will be set together with the definition of
+ // the lyxgreyedout environment (see lyxgreyedout_def)
+ }
+
+ // color for shaded boxes
+ if (isRequired("framed") && mustProvide("color")) {
+ colors << "\\definecolor{shadecolor}{rgb}{";
+ colors << outputLaTeXColor(params_.boxbgcolor) << "}\n";
+ // this color is automatically used by the LaTeX-package "framed"
+ }
+
return colors.str();
}
packages << "\\usepackage{accents}\n";
// mathdots must be loaded after amsmath
- if (mustProvide("mathdots"))
+ if (mustProvide("mathdots") &&
+ params_.use_mathdots != BufferParams::package_off)
packages << "\\usepackage{mathdots}\n";
// yhmath must be loaded after amsmath
<< params_.graphicsDriver
<< "]{graphicx}\n";
}
- // shadecolor for shaded
- 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
- //to use the xcolor package instead, and then we can do
- // \define{shadcolor}{RGB}...
- //and not do any conversion. We'd then need to require xcolor
- //in InsetNote::validate().
- int const stmSize = packages.precision(2);
- packages << "\\definecolor{shadecolor}{rgb}{"
- << c.r / 255.0 << ',' << c.g / 255.0 << ',' << c.b / 255.0 << "}\n";
- packages.precision(stmSize);
- }
-
+
// lyxskak.sty --- newer chess support based on skak.sty
if (mustProvide("chess"))
packages << "\\usepackage[ps,mover]{lyxskak}\n";
if (mustProvide("xy"))
packages << "\\usepackage[all]{xy}\n";
+ if (mustProvide("feyn"))
+ packages << "\\usepackage{feyn}\n"; //Diagram
+
if (mustProvide("ulem"))
packages << "\\PassOptionsToPackage{normalem}{ulem}\n"
"\\usepackage{ulem}\n";
if (mustProvide("LyX"))
macros << lyx_def << '\n';
- if (mustProvide("lyxline"))
- macros << lyxline_def << '\n';
-
if (mustProvide("noun"))
macros << noun_def << '\n';
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';
if (mustProvide("NeedTabularnewline"))
macros << tabularnewline_def;
- // greyedout environment (note inset)
+ // greyed-out environment (note inset)
+ // the color is specified in the routine
+ // getColorOptions() to avoid LaTeX-package clashes
if (mustProvide("lyxgreyedout"))
macros << lyxgreyedout_def;
// floats
getFloatDefinitions(macros);
+
+ if (mustProvide("refstyle"))
+ macros << lyxref_def << '\n';
// change tracking
if (mustProvide("ct-dvipost"))
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());
fi != end; ++fi)
// FIXME UNICODE
sgmlpreamble << "\n<!ENTITY " << fi->first
- << (isSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
+ << (isSGMLFileName(fi->second) ? " SYSTEM \"" : " \"")
<< makeRelPath(from_utf8(fi->second), basename) << "\">";
return sgmlpreamble.str();
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";
}
}
projects / lyx.git / blobdiff