disser 1.1.0

git-svn-id: svn://tug.org/texlive/trunk@11501 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 23 insertions, 14 deletions

diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.fig.nmk.cmd b/Master/texmf-dist/doc/latex/disser/include/latex.fig.nmk.cmd
index 556eeb49a12..6232434028a 100644
--- a/Master/texmf-dist/doc/latex/disser/include/latex.fig.nmk.cmd
+++ b/Master/texmf-dist/doc/latex/disser/include/latex.fig.nmk.cmd
@@ -23,6 +23,8 @@ if "%suffix%"=="" set suffix=~
 
 rem end of configuration
 
+setlocal enabledelayedexpansion
+
 if "%1"=="" (
 :default
 	call :help
@@ -51,7 +53,8 @@ goto :eof
 
 if "%1"=="epstopdf" (
 :epstopdf
-	for %%f in (%e2pfiles%) do (
+	if "%2" neq "" set e2pfiles=%2 %3 %4 %5 %6 %7 %8 %9
+	for %%f in (!e2pfiles!) do (
 		if not exist "%%~nf.pdf" (
 			%epstopdf% "%%f"
 			echo epstopdf: %%f
@@ -62,7 +65,8 @@ goto :eof
 
 if "%1"=="fixbb" (
 :fixbb
-	for %%f in (%fbbfiles%) do (
+	if "%2" neq "" set fbbfiles=%2 %3 %4 %5 %6 %7 %8 %9
+	for %%f in (!fbbfiles!) do (
 		%epstool% %etflags% "%%f" "%%f%suffix%"
 		move "%%f%suffix%" "%%f" > nul
 		echo fixbb: %%f
@@ -72,7 +76,8 @@ goto :eof
 
 if "%1"=="epstoeps" (
 :epstoeps
-	for %%f in (%e2efiles%) do (
+	if "%2" neq "" set e2efiles=%2 %3 %4 %5 %6 %7 %8 %9
+	for %%f in (!e2efiles!) do (
 		%e2e% %e2eflags% "%%f" "%%f%suffix%"
 		move "%%f%suffix%" "%%f" > nul
 		echo epstoeps: %%f
diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.mk b/Master/texmf-dist/doc/latex/disser/include/latex.mk
index ffae7b209d2..de058733d32 100644
--- a/Master/texmf-dist/doc/latex/disser/include/latex.mk
+++ b/Master/texmf-dist/doc/latex/disser/include/latex.mk
@@ -4,6 +4,7 @@
 #
 
 TARGET?=thesis
+BIBFILE?=thesis.bib
 
 ARCH?=7z
 BIBTEX?=bibtex8
@@ -58,9 +59,8 @@ rtf: $(TARGET).rtf
 
 $(TARGET).dvi: $(TARGET).tex
 	$(LATEX) $(TEXFLAGS) $^
-	@if [ -f $(TARGET).bib ];\
-	then \
-		$(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\
+	@if [ -f $(BIBFILE) ]; then \
+		for f in *.aux; do $(BIBTEX) $(BIBTEXFLAGS) $$f; done ;\
 		$(LATEX) $(TEXFLAGS) $^ ;\
 	else \
 		echo Warning: Bibliography file does not exist ;\
@@ -79,9 +79,9 @@ $(TARGET)_book.ps: $(TARGET).ps
 
 $(TARGET).pdf: $(TARGET).tex
 	$(PDFLATEX) $(PDFLATEXFLAGS) $^
-	@if [ -f $(TARGET).bib ];\
+	@if [ -f $(BIBFILE) ];\
 	then \
-		$(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\
+		for f in *.aux; do $(BIBTEX) $(BIBTEXFLAGS) $$f ; done ;\
 		$(PDFLATEX) $(PDFLATEXFLAGS) $^ ;\
 	else \
 		echo Warning: Bibliography file does not exist ;\
diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd
index 6a162d08b38..80ed92bfe9d 100644
--- a/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd
+++ b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd
@@ -9,6 +9,7 @@ if "%CMDEXTVERSION%"=="" (
 )
 
 if "%target%"=="" set target=thesis
+set bibfile=thesis.bib
 
 if "%arch%"=="" set arch=7z
 if "%bibtex%"=="" set bibtex=bibtex8
@@ -27,7 +28,9 @@ if "%l2rtf%"=="" set l2rtf=latex2rtf
 if "%archext%"=="" set archext=zip
 if "%archflags%"=="" set archflags=a -t%archext%
 if "%archive%"=="" set archive=%target%.%archext%
+
 if "%bibtexflags%"=="" set bibtexflags=-H -c cp1251
+
 if "%l2hflags%"=="" (
 	set l2hflags=-dir html -iso_language RU.RU -split 3 -short_index ^
     -numbered_footnotes -no_footnode -white -antialias ^
@@ -60,9 +63,9 @@ if "%1"=="" goto :eof
 if "%1"=="dvi" (
 :dvi
 	%latex% %latexflags% %target%.tex
-	if exist %target%.bib (
-		%bibtex% %bibtexflags% %target%
-		%latex% %latexflags% %target%.tex
+	if exist %bibfile% (
+		for %%f in (*.aux) do %bibtex% %bibtexflags% %%f
+		%latex% %texflags% %target%.tex
 	) else (
 		echo Warning: Bibliography file does not exist
 	)
@@ -73,9 +76,11 @@ goto :eof
 if "%1"=="pdf" (
 :pdf
 	%pdflatex% %pdflatexflags% %target%.tex
-	if exist %target%.bib (
-		%bibtex% %bibtexflags% %target%
+	if exist %bibfile% (
+		for %%f in (*.aux) do %bibtex% %bibtexflags% %%f
 		%pdflatex% %pdflatexflags% %target%.tex
+	) else (
+		echo Warning: Bibliography file does not exist
 	)
 	%pdflatex% %pdflatexflags% %target%.tex
 goto :eof
@@ -185,4 +190,3 @@ goto :eof
 if "%1" neq "" echo Don't know how to make %1
 :end
 shift & goto :start
-