anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 17:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix bug 2623:

Browse Source 
* lib/layouts/memoir.layout:
	add ProvidesMakeindex

* src/LaTeX.C (run):
	rerun latex if idx file is empty (needed by memoir)
	fix typo in comment
* src/LaTeXFeatures.C (getPackages):
	whitespace

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@13963 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2006-05-29 17:28:02 +00:00
parent 48f0a4b681
commit b75165353e
6 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ChangeLog
View File

@ -1,3 +1,7 @@
2006-05-29 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* layouts/memoir.layout: add providesMakeindex (bug 2623).
2006-05-29 Jürgen Spitzmüller <j.spitzmueller@gmx.de> 2006-05-29 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* configure.py: use $$o where appropriate (still some * configure.py: use $$o where appropriate (still some

1
lib/layouts/memoir.layout
View File

@ -13,6 +13,7 @@ SecNumDepth 2
TocDepth 2 TocDepth 2
DefaultStyle Standard DefaultStyle Standard
PageStyle Headings PageStyle Headings
ProvidesMakeidx 1
ClassOptions ClassOptions

7
src/ChangeLog
View File

@ -1,3 +1,10 @@
2006-05-29 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* LaTeX.C (run): rerun latex im idx file is empty (needed by memoir)
        fix typo in comment (bug 2623).
* LaTeXFeatures.C (getPackages): whitespace.
2006-05-22 Jürgen Spitzmüller <j.spitzmueller@gmx.de> 2006-05-22 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* BufferView_pimpl.C (getStatus): Disable saving of bookmarks in * BufferView_pimpl.C (getStatus): Disable saving of bookmarks in

9
src/LaTeX.C
View File

@ -269,12 +269,17 @@ int LaTeX::run(TeXErrors & terr)
// the .aux file is checked for signs of bibtex. Bibtex is then run // the .aux file is checked for signs of bibtex. Bibtex is then run
// if needed. // if needed.
// memoir (at least) writes an empty *idx file in the first place.
// A second latex run is needed.
rerun = fs::exists(ChangeExtension(file, ".idx"))
&& fs::is_empty(ChangeExtension(file, ".idx"));
// run makeindex // run makeindex
if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) { if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) {
// no checks for now // no checks for now
lyxerr[Debug::LATEX] << "Running MakeIndex." << endl; lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
message(_("Running MakeIndex.")); message(_("Running MakeIndex."));
rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")), runparams); rerun |= runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")), runparams);
} }
// run bibtex // run bibtex
@ -331,7 +336,7 @@ int LaTeX::run(TeXErrors & terr)
// 1.5 // 1.5
// The inclusion of files generated by external programs like // The inclusion of files generated by external programs like
// makeindex or bibtex might have done changes to pagenumbereing, // makeindex or bibtex might have done changes to pagenumbering,
// etc. And because of this we must run the external programs // etc. And because of this we must run the external programs
// again to make sure everything is redone correctly. // again to make sure everything is redone correctly.
// Also there should be no need to run the external programs any // Also there should be no need to run the external programs any

2
status.14x
View File

@ -72,6 +72,8 @@ What's new
- Make jpeg graphics with suffix in capital letters (.JPG) work with - Make jpeg graphics with suffix in capital letters (.JPG) work with
pdflatex (bug 2235). pdflatex (bug 2235).
- Fix LaTeX errors with memoir and makeindex (bug 2623).
* Math editor: * Math editor:
- Fix metrics of AMS array environments like bmatrix, vmatrix etc. (bug 2036). - Fix metrics of AMS array environments like bmatrix, vmatrix etc. (bug 2036).