anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 21:45:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only add \makeatletter and \makeatother to the preamble when actually needed

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_5_X@24417 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2008-04-21 21:55:49 +00:00
parent 9af53d6fa7
commit 6bc6ca6c4d
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/BufferParams.cpp
View File

@ -1093,13 +1093,17 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
// The optional packages;
docstring lyxpreamble(from_ascii(features.getPackages()));
// this might be useful...
lyxpreamble += "\n\\makeatletter\n";
// only add \makeatletter and \makeatother when actually needed
bool makeatletter = false;
// Some macros LyX will need
docstring tmppreamble(from_ascii(features.getMacros()));
if (!tmppreamble.empty()) {
if (!makeatletter) {
lyxpreamble += "\n\\makeatletter\n";
makeatletter = true;
}
lyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"LyX specific LaTeX commands.\n"
+ tmppreamble + '\n';
@ -1108,6 +1112,10 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
// the text class specific preamble
tmppreamble = features.getTClassPreamble();
if (!tmppreamble.empty()) {
if (!makeatletter) {
lyxpreamble += "\n\\makeatletter\n";
makeatletter = true;
}
lyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"Textclass specific LaTeX commands.\n"
+ tmppreamble + '\n';
@ -1115,6 +1123,10 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
/* the user-defined preamble */
if (!preamble.empty()) {
if (!makeatletter) {
lyxpreamble += "\n\\makeatletter\n";
makeatletter = true;
}
// FIXME UNICODE
lyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"User specified LaTeX commands.\n"
@ -1153,8 +1165,16 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
}
}
if (!bullets_def.empty())
if (!bullets_def.empty()) {
if (!makeatletter) {
lyxpreamble += "\n\\makeatletter\n";
makeatletter = true;
}
lyxpreamble += bullets_def + "}\n\n";
}
if (makeatletter)
lyxpreamble += "\\makeatother\n\n";
// We try to load babel late, in case it interferes
// with other packages.
@ -1162,11 +1182,9 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
if (use_babel && !features.isRequired("jurabib")) {
// FIXME UNICODE
lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n';
lyxpreamble += from_utf8(features.getBabelOptions());
lyxpreamble += from_utf8(features.getBabelOptions()) + '\n';
}
lyxpreamble += "\\makeatother\n\n";
int const nlines =
int(lyx::count(lyxpreamble.begin(), lyxpreamble.end(), '\n'));
for (int j = 0; j != nlines; ++j) {

3
status.15x
View File

@ -50,6 +50,9 @@ What's new
- Add support for the HTML-to-LaTeX converters gnuhtml2latex and
htmltolatex (bug 4615).
- The \makeatletter and \makeatother commands are now added to the LaTeX
preamble only when actually needed.
* BUILD/INSTALLATION: