"{\\leavevmode\\,$\\triangleleft$\\,\\allowbreak}\n"
"{\\leavevmode\\,$\\triangleright$\\,\\allowbreak}}");
+// ZERO WIDTH SPACE (ZWSP) is actually not a space character
+// but marks a line break opportunity. Several commands provide a
+// line break opportunity. They differ in side-effects:
+// \allowbreak prevents hyphenation after hyphen or dash + ZWSP
+// \linebreak[<n>] takes an optional argument denoting "urgency".
+// The \LyXZeroWidthSpace wrapper allows customization in the preamble.
+static docstring const lyxZWSP_def = from_ascii(
+ "\\newcommand*\\LyXZeroWidthSpace{\\hspace{0pt}}");
+
// for quotes without babel. This does not give perfect results, but
// anybody serious about non-english quotes should use babel (JMarc).
" {\\usefont{U}{lasy}{m}{n}\\char'51}%\n"
"}");
+static docstring const textquotedbl_def = from_ascii(
+ "\\DeclareTextSymbolDefault{\\textquotedbl}{T1}");
+
+static docstring const textquotedblp_xetex_def = from_ascii(
+ "\\providecommand\\textquotedblplain{%\n"
+ " \\bgroup\\addfontfeatures{Mapping=}\\char34\\egroup}");
+
+static docstring const textquotedblp_luatex_def = from_ascii(
+ "\\providecommand\\textquotedblplain{%\n"
+ " \\bgroup\\addfontfeatures{RawFeature=-tlig}\\char34\\egroup}");
+
+static docstring const textquotesinglep_xetex_def = from_ascii(
+ "\\providecommand\\textquotesingleplain{%\n"
+ " \\bgroup\\addfontfeatures{Mapping=}\\char39\\egroup}");
+
+static docstring const textquotesinglep_luatex_def = from_ascii(
+ "\\providecommand\\textquotesingleplain{%\n"
+ " \\bgroup\\addfontfeatures{RawFeature=-tlig}\\char39\\egroup}");
+
static docstring const paragraphleftindent_def = from_ascii(
"\\newenvironment{LyXParagraphLeftIndent}[1]%\n"
"{\n"
"}\n"
"\\@mparswitchtrue\n");
+static docstring const lyxmintcaption_def = from_ascii(
+ "\\long\\def\\lyxmintcaption[#1]#2{%\n"
+ " \\ifx#1t\\vskip\\baselineskip\\fi%\n"
+ " \\refstepcounter{listing}\\noindent%\n"
+ " \\addcontentsline{lol}{listing}%\n"
+ " {\\protect\\numberline{\\thelisting}{\\ignorespaces #2}}%\n"
+ " \\setbox\\@tempboxa\\hbox{\\listingscaption~\\thelisting: #2}%\n"
+ " \\ifdim \\wd\\@tempboxa >\\linewidth%\n"
+ " \\parbox[t]{\\linewidth}{\\unhbox\\@tempboxa}\\else%\n"
+ " \\hbox to\\linewidth{\\hfil\\box\\@tempboxa\\hfil}\\fi%\n"
+ " \\ifx#1b\\vskip\\baselineskip\\fi\n"
+ "}\n");
+
/////////////////////////////////////////////////////////////////////
//
if (params_.useNonTeXFonts)
return params_.documentClass().provides(name);
- bool const ot1 = (params_.font_encoding() == "default"
- || params_.font_encoding() == "OT1");
+ bool const ot1 = (params_.main_font_encoding() == "default"
+ || params_.main_font_encoding() == "OT1");
bool const complete = (params_.fontsSans() == "default"
&& params_.fontsTypewriter() == "default");
bool const nomath = (params_.fontsMath() == "default");
return snip.release();
}
-} //anon namespace
+} // namespace
void LaTeXFeatures::addPreambleSnippet(TexString ts, bool allow_dupes)
{
// these must be loaded if glyphs of this script are used
// unless a language providing them is used in the document
- // FIXME: currently the option is written twice in this case
- if (mustProvide("textgreek"))
+ if (mustProvide("textgreek")
+ && find(encodings.begin(), encodings.end(), "LGR") == encodings.end())
encodings.insert(encodings.begin(), "LGR");
- if (mustProvide("textcyr"))
+ if (mustProvide("textcyr")
+ && find(encodings.begin(), encodings.end(), "T2A") == encodings.end())
encodings.insert(encodings.begin(), "T2A");
LanguageList::const_iterator it = UsedLanguages_.begin();
"todonotes",
"forest",
"varwidth",
+ "footnote",
+ "tablefootnote",
};
char const * bibliofeatures[] = {
"authordate1-4",
"babelbib",
"bibgerm",
+ "chapterbib",
"chicago",
"chscite",
"harvard",
int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
-}
+} // namespace
string const LaTeXFeatures::getColorOptions() const
// if fontspec or newtxmath is used, AMS packages have to be loaded
// before fontspec (in BufferParams)
string const amsPackages = loadAMSPackages();
- bool const ot1 = (params_.font_encoding() == "default" || params_.font_encoding() == "OT1");
+ bool const ot1 = (params_.main_font_encoding() == "default"
+ || params_.main_font_encoding() == "OT1");
bool const use_newtxmath =
theLaTeXFonts().getLaTeXFont(from_ascii(params_.fontsMath())).getUsedPackage(
ot1, false, false) == "newtxmath";
packages << "numbers";
else
packages << "authoryear";
+ if (!params_.biblio_opts.empty())
+ packages << ',' << params_.biblio_opts;
packages << "]{natbib}\n";
}
}
// jurabib -- we need version 0.6 at least.
- if (mustProvide("jurabib"))
- packages << "\\usepackage{jurabib}[2004/01/25]\n";
+ if (mustProvide("jurabib")) {
+ packages << "\\usepackage";
+ if (!params_.biblio_opts.empty())
+ packages << '[' << params_.biblio_opts << ']';
+ packages << "{jurabib}[2004/01/25]\n";
+ }
// opcit -- we pass custombst as we output \bibliographystyle ourselves
if (mustProvide("opcit")) {
if (mustProvide("lyxarrow"))
macros << lyxarrow_def << '\n';
+ if (mustProvide("lyxzerowidthspace"))
+ macros << lyxZWSP_def << '\n';
+
if (!usePolyglossia() && mustProvide("textgreek")) {
// ensure LGR font encoding is defined also if fontenc is not loaded by LyX
- if (params_.font_encoding() == "default")
+ if (params_.main_font_encoding() == "default")
macros << textgreek_LGR_def;
macros << textgreek_def << '\n';
}
if (!usePolyglossia() && mustProvide("textcyr")) {
// ensure T2A font encoding is set up also if fontenc is not loaded by LyX
- if (params_.font_encoding() == "default")
+ if (params_.main_font_encoding() == "default")
macros << textcyr_T2A_def;
macros << textcyr_def << '\n';
}
macros << guillemotleft_def << '\n';
if (mustProvide("guillemotright"))
macros << guillemotright_def << '\n';
+ if (mustProvide("textquotedbl"))
+ macros << textquotedbl_def << '\n';
+ if (mustProvide("textquotesinglep")) {
+ if (runparams_.flavor == OutputParams::XETEX)
+ macros << textquotesinglep_xetex_def << '\n';
+ else
+ macros << textquotesinglep_luatex_def << '\n';
+ }
+ if (mustProvide("textquotedblp")) {
+ if (runparams_.flavor == OutputParams::XETEX)
+ macros << textquotedblp_xetex_def << '\n';
+ else
+ macros << textquotedblp_luatex_def << '\n';
+ }
// Math mode
if (mustProvide("binom") && !isRequired("amsmath"))
if (mustProvide("rtloutputdblcol"))
macros << rtloutputdblcol_def;
+ if (mustProvide("lyxmintcaption"))
+ macros << lyxmintcaption_def;
+
return macros.release();
}
list<docstring>::const_iterator cit = usedLayouts_.begin();
list<docstring>::const_iterator end = usedLayouts_.end();
for (; cit != end; ++cit)
- tcpreamble << tclass[*cit].preamble();
+ // For InPreamble layouts, we output the preamble stuff earlier
+ // (before the layouts). See Paragraph::Private::validate.
+ if (!tclass[*cit].inpreamble)
+ tcpreamble << tclass[*cit].preamble();
cit = usedInsetLayouts_.begin();
end = usedInsetLayouts_.end();
return from_utf8(preamble);
}
-}
+} // namespace
-docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel, bool use_polyglossia) const
+docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel,
+ bool use_polyglossia, bool use_minted) const
{
DocumentClass const & tclass = params_.documentClass();
// collect preamble snippets in a set to prevent multiple identical
// need to force a fixed width encoding for
// \lstlistlistingname and \lstlistingname (bug 9382).
// This needs to be consistent with InsetListings::latex().
- bool const need_fixedwidth = !runparams_.isFullUnicode() &&
- it->second.fixedwidthpreambleencoding();
+ bool const need_fixedwidth = !use_minted &&
+ !runparams_.isFullUnicode() &&
+ it->second.fixedwidthpreambleencoding();
// language dependent commands (once per document)
snippets.insert(i18npreamble(it->second.langpreamble(),
buffer().language(),
projects / lyx.git / blobdiff