disser update (23jul07)

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

2 files changed, 15 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
index 8ed500ecaa6..902f2a22ab2 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/nomake.cmd
@@ -32,6 +32,7 @@ set arc=rar
 set arcflags=a -r -x%target%.pdf -x%target%.prj
 
 set tex=%texmf%\miktex\bin\latex
+set pdftex=%texmf%\miktex\bin\pdflatex
 set texflags=-src-specials
 
 set bibtex=%texmf%\miktex\bin\bibtex8
@@ -54,6 +55,7 @@ set suffix=$$
 
 if %1/==/ (
 :make
+	chcp 1251
 	%tex% %target%.tex
 	%bibtex% %bibtexflags% %target%
 	%tex% %target%.tex
@@ -65,13 +67,17 @@ if %1/==/ goto :eof
 
 if %1/==pdf/ (
 :pdf
-	set tex=pdflatex
-	call :make
+	chcp 1251
+	%pdftex% %target%.tex
+	%bibtex% %bibtexflags% %target%
+	%pdftex% %target%.tex
+	%pdftex% %texflags% %target%.tex
+goto :eof
 )
 
+rem Make source distribution
 if %1/==srcdist/ (
 :srcdist
-	echo Making source distribution...
 	if not exist %clsdir% mkdir %clsdir%
 	xcopy %clssrc% %clsdir% /S
 	xcopy %bstsrc%\%bstfile% . /S
@@ -96,9 +102,9 @@ if %1/==cleansvn/ (
 goto :end
 )
 
+rem Fix bounding boxes of EPS files
 if %1/==fixbb/ (
 :fixbb
-	echo Fixing bounding boxes of EPS files...
 	for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n
 goto :end
 :fix
@@ -108,9 +114,9 @@ goto :end
 goto :eof	
 )
 
+rem Convert EPS to PDF
 if %1/==epstopdf/ (
 :epstopdf
-	echo Converting EPS to PDF...
 	for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n
 	goto :end
 :conv
@@ -143,13 +149,6 @@ if %1/==djvu/ (
 	%pdftodjvu% %pdftodjvuflags% %target%.pdf
 goto :end
 )
-rem Create OCRed DjVu file
-if %1/==ocr/ (
-:ocr
-	if not exist %target%.djvu call :djvu
-	%djvuocr% %djvuocrflags% %target%.djvu %target%-ocr.djvu
-goto :end	
-)
 rem Create backup
 if %1/==backup/ (
 :backup
@@ -158,6 +157,7 @@ if %1/==backup/ (
 goto :end
 )
 
+echo Don't know how to make %1
 :end
 shift & goto :start
 
diff --git a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
index a85ee17ba6f..0b1c94af0dc 100644
--- a/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
+++ b/Master/texmf-dist/doc/latex/disser/templates/doctor/thesis.bib
@@ -1,4 +1,4 @@
-@ARTICLE{Yoffe-AP42-93-173,
+@ARTICLE{Yoffe-1993-AP-42-173,
     Author  = {A. D. Yoffe},
     Journal = {Adv. Phys.},
     Pages   = {173},
@@ -6,7 +6,7 @@
     Year    = {1993}
 }
 
-@ARTICLE{Kayanuma-PRB38-88-9797,
+@ARTICLE{Kayanuma-1988-PRB-38-9797,
     Author  = {Y. Kayanuma},
     Journal = {Phys. Rev. B},
     Pages   = {9797},
@@ -14,7 +14,7 @@
     Year    = {1988}
 }
 
-@ARTICLE{Efros-FTP16-82-1209,
+@ARTICLE{Efros-1982-FTP16-82-1209,
     Author   = {Ал. Л. Эфрос and А. Л. Эфрос},
     Journal  = {Физика и техника полупроводников},
     Pages    = {1209},