disser update (29apr08)

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

4 files changed, 248 insertions, 146 deletions

diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.fig.mk b/Master/texmf-dist/doc/latex/disser/include/latex.fig.mk
index 75089a8711c..f3e23d5ded5 100644
--- a/Master/texmf-dist/doc/latex/disser/include/latex.fig.mk
+++ b/Master/texmf-dist/doc/latex/disser/include/latex.fig.mk
@@ -3,34 +3,49 @@
 # Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
 #
 
-EPSTOOL=epstool
-EPSTOPDF=epstopdf
+E2E?=eps2eps
+EPSTOOL?=epstool
+EPSTOPDF?=epstopdf
 
-ETFLAGS=--quiet --copy --bbox
+E2EFLAGS?=-dSAFER
+ETFLAGS?=--quiet --copy --bbox
 
-FIGCLFILES=*.pdf
-SUFFIX=~
+E2EFILES?=*.eps
+E2PFILES?=*.eps
+FBBFILES?=*.eps
+FIGCLFILES?=*.pdf
+SUFFIX?=~
 
 # end of configuration
 
 help:
-	@echo Targets:
-	@echo "  clean    - clean PDF files"
-	@echo "  epstopdf - convert all figures to PDF"
-	@echo "  fixbb    - fix BoundingBox"
-	@echo "  help     - (default) show help"
+	@echo "Targets:"
+	@echo "  clean      clean PDF files"
+	@echo "  epstoeps   optimize EPS files"
+	@echo "  epstopdf   convert all figures to PDF"
+	@echo "  fixbb      fix BoundingBox of EPS files"
+	@echo "  help       (default) show help"
 
 clean:
 	rm -f $(FIGCLFILES)
 
-epstopdf:	$(patsubst %.eps, %.pdf, $(wildcard *.eps))
+epstoeps: $(E2EFILES)
+	@for f in $^ ;\
+	do \
+		echo -n "fixbb: $$f..." ;\
+		$(E2E) $(E2EFLAGS) $$f $$f$(SUFFIX) ;\
+		mv $$f$(SUFFIX) $$f ;\
+		echo "done" ;\
+	done
+
+epstopdf:	$(patsubst %.eps, %.pdf, $(wildcard $(E2PFILES)))
 
-fixbb: *.eps
-	@for f in *.eps ; \
+fixbb: $(FBBFILES)
+	@for f in $^ ;\
 	do \
 		echo -n "fixbb: $$f..." ;\
-		$(EPSTOOL) $(ETFLAGS) $$f $$f~ ;\
-		mv $$f~ $$f ;\
+		$(EPSTOOL) $(ETFLAGS) $$f $$f$(SUFFIX) ;\
+		mv $$f$(SUFFIX) $$f ;\
 		echo "done" ;\
 	done
 
@@ -38,4 +53,3 @@ fixbb: *.eps
 	@echo -n "epstopdf: $<..."
 	@$(EPSTOPDF) "$<"
 	@echo "done"
-
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 f6f164b74a1..556eeb49a12 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
@@ -8,13 +8,18 @@ if "%CMDEXTVERSION%"=="" (
 	goto :eof
 )
 
-set epstool=epstool
-set epstopdf=epstopdf
+if "%e2e%"=="" set e2e=eps2eps
+if "%epstool%"=="" set epstool=epstool
+if "%epstopdf%"=="" set epstopdf=epstopdf
 
-set etflags=--quiet --copy --bbox
+if "%e2eflags%"=="" set e2eflags=-dSAFER
+if "%etflags%"=="" set etflags=--quiet --copy --bbox
 
-set figclfiles=*.pdf
-set suffix=~
+if "%e2efiles%"=="" set e2efiles=*.eps
+if "%e2pfiles%"=="" set e2pfiles=*.eps
+if "%fbbfiles%"=="" set fbbfiles=*.eps
+if "%figclfiles%"=="" set figclfiles=*.pdf
+if "%suffix%"=="" set suffix=~
 
 rem end of configuration
 
@@ -29,11 +34,12 @@ if "%1"=="" goto :eof
 
 if "%1"=="help" (
 :help
-	echo Targets:
-	echo   clean    - clean generated PDF files
-	echo   epstopdf - convert all figures to PDF
-	echo   fixbb    - fix BoundingBox
-	echo   help     - ^(default^) show this message
+	echo List of targets:
+	echo   clean      clean PDF files
+	echo   epstoeps   optimize EPS files
+	echo   epstopdf   convert all figures to PDF
+	echo   fixbb      fix BoundingBox of EPS files
+	echo   help       ^(default^) show this message
 goto :eof
 )
 
@@ -45,26 +51,35 @@ goto :eof
 
 if "%1"=="epstopdf" (
 :epstopdf
-	for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :conv %%n
-goto :end
-:conv
-	%epstopdf% "%1"
-	echo epstopdf: %~nx1...done
+	for %%f in (%e2pfiles%) do (
+		if not exist "%%~nf.pdf" (
+			%epstopdf% "%%f"
+			echo epstopdf: %%f
+		)
+	)
 goto :eof	
 )
 
 if "%1"=="fixbb" (
 :fixbb
-	for /f "usebackq" %%n in (`dir *.eps /s /b`) do call :fix %%n
-goto :end
-:fix
-	%epstool% %etflags% %1 %1.%suffix%
-	move %1.%suffix% %1 > nul
-	echo fixbb: %~nx1...done
+	for %%f in (%fbbfiles%) do (
+		%epstool% %etflags% "%%f" "%%f%suffix%"
+		move "%%f%suffix%" "%%f" > nul
+		echo fixbb: %%f
+	)
+goto :eof
+)
+
+if "%1"=="epstoeps" (
+:epstoeps
+	for %%f in (%e2efiles%) do (
+		%e2e% %e2eflags% "%%f" "%%f%suffix%"
+		move "%%f%suffix%" "%%f" > nul
+		echo epstoeps: %%f
+	)
 goto :eof
 )
 
 if "%1" neq "" echo Don't know how to make %1
 :end
 shift & goto :start
-
diff --git a/Master/texmf-dist/doc/latex/disser/include/latex.mk b/Master/texmf-dist/doc/latex/disser/include/latex.mk
index 1546c18f332..ffae7b209d2 100644
--- a/Master/texmf-dist/doc/latex/disser/include/latex.mk
+++ b/Master/texmf-dist/doc/latex/disser/include/latex.mk
@@ -3,35 +3,37 @@
 # Author: Stanislav Kruchinin <stanislav.kruchinin@gmail.com>
 #
 
-TARGET=thesis
-
-ARCH=7z
-BIBTEX=bibtex8
-DVIPS=dvips
-FIND=/bin/find
-L2H=latex2html
-PDFTEX=pdflatex
-PS2PDF=gs
-PSNUP=psnup
-TEX=latex
-
-ARCHEXT=zip
-ARCHFLAGS=a -t$(ARCHEXT)
-ARCHIVE=$(TARGET).$(ARCHEXT)
-BIBTEXFLAGS=-H -c cp1251
-
-L2HFLAGS=-dir html -iso_language RU.RU -split 3 -short_index \
+TARGET?=thesis
+
+ARCH?=7z
+BIBTEX?=bibtex8
+DVIPS?=dvips
+FIND?=/bin/find
+L2H?=latex2html
+LATEX?=latex
+PDFLATEX?=pdflatex
+PS2PDF?=gs
+PSBOOK?=psbook
+PSNUP?=psnup
+
+ARCHEXT?=zip
+ARCHFLAGS?=a -t$(ARCHEXT)
+ARCHIVE?=$(TARGET).$(ARCHEXT)
+BIBTEXFLAGS?=-H -c cp1251
+
+L2HFLAGS?=-dir html -iso_language RU.RU -split 3 -short_index \
   -numbered_footnotes -no_footnode -white -antialias -html_version 4.0
-PS2PDFFLAGS=-dBATCH -dNOPAUSE -sDEVICE=pdfwrite -g4960x7016 -r600 \
-  -dCompatibilityLevel=1.2 -sOutputFile=$(TARGET)_2on1.pdf -c save pop \
-  -f $(TARGET)_2on1.ps
-PSNUPFLAGS=-2 -pA4
-TEXFLAGS=-src-specials
-
-CLEXT=*.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof *.lot *.lol \
-  *.bbl *.blg *.bak *.dvi *.ps *.pdf 
-CLFILES=$(CLEXT) $(ARCHIVE)
-SRCFILES=*
+L2RTFFLAGS?=-F -M12 -i russian
+PS2PDFFLAGS?=-dBATCH -dNOPAUSE -sDEVICE=pdfwrite -g4960x7016 -r600 \
+  -dCompatibilityLevel=1.2
+PSNUPFLAGS?=-2 -pA4
+PDFLATEXFLAGS?=--shell-escape
+LATEXFLAGS?=-src-specials
+
+CLEXT?=*.aux *.toc *.idx *.ind *.ilg *.log *.out *.lof *.lot *.lol \
+  *.bbl *.blg *.bak *.dvi *.ps *.pdf
+CLFILES?=$(CLEXT) $(ARCHIVE)
+SRCFILES?=*
 
 # end of configuration
 
@@ -41,34 +43,62 @@ pdf: $(TARGET).pdf
 
 pdf_2on1: $(TARGET)_2on1.pdf
 
+pdf_book: $(TARGET)_book.pdf
+
 ps: $(TARGET).ps
 
 ps_2on1: $(TARGET)_2on1.ps
 
+ps_book: $(TARGET)_book.ps
+
 html: $(TARGET).dvi
-	@$(L2H) $(L2HFLAGS) $(TARGET).tex
+	$(L2H) $(L2HFLAGS) $(TARGET).tex
+
+rtf: $(TARGET).rtf
 
 $(TARGET).dvi: $(TARGET).tex
-	@$(TEX) $(TEXFLAGS) $^
-	@$(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\
-	@$(TEX) $(TEXFLAGS) $^
-	@$(TEX) $(TEXFLAGS) $^
+	$(LATEX) $(TEXFLAGS) $^
+	@if [ -f $(TARGET).bib ];\
+	then \
+		$(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\
+		$(LATEX) $(TEXFLAGS) $^ ;\
+	else \
+		echo Warning: Bibliography file does not exist ;\
+	fi
+	$(LATEX) $(TEXFLAGS) $^
 
 $(TARGET).ps: $(TARGET).dvi
-	@$(DVIPS) -o $@ $^
+	$(DVIPS) -o $@ $^
 
 $(TARGET)_2on1.ps: $(TARGET).ps
-	@$(PSNUP) $(PSNUPFLAGS) $^ > $@
+	$(PSNUP) $(PSNUPFLAGS) $^ > $@
+
+$(TARGET)_book.ps: $(TARGET).ps
+	$(PSNUP) $(PSNUPFLAGS) $^ > $@
+	$(PSBOOK) $^ | $(PSNUP) -2 > $@
 
 $(TARGET).pdf: $(TARGET).tex
-	@$(MAKE) -C fig epstopdf
-	@$(PDFTEX) $^
-	@$(BIBTEX) $(BIBTEXFLAGS) $(TARGET)
-	@$(PDFTEX) $^
-	@$(PDFTEX) $^
+	$(PDFLATEX) $(PDFLATEXFLAGS) $^
+	@if [ -f $(TARGET).bib ];\
+	then \
+		$(BIBTEX) $(BIBTEXFLAGS) $(TARGET) ;\
+		$(PDFLATEX) $(PDFLATEXFLAGS) $^ ;\
+	else \
+		echo Warning: Bibliography file does not exist ;\
+	fi
+	$(PDFLATEX) $(PDFLATEXFLAGS) $^
 
 $(TARGET)_2on1.pdf: $(TARGET)_2on1.ps
-	@$(PS2PDF) $^ $@
+	$(PS2PDF) $(PS2PDFFLAGS) -sOutputFile=$@ -c save pop -f $^
+
+$(TARGET)_book.pdf: $(TARGET)_book.ps
+	$(PS2PDF) $(PS2PDFFLAGS) -sOutputFile=$@ -c save pop -f $^
+
+$(TARGET).rtf: $(TARGET).dvi
+	$(L2RTF) $(L2RTFFLAGS) -a $(TARGET).aux -b $(TARGET).bbl $(TARGET).tex
+
+epstoeps:
+	@$(MAKE) -C fig $@
 
 epstopdf:
 	@$(MAKE) -C fig $@
@@ -78,7 +108,7 @@ fixbb:
 
 srcdist:
 	@$(MAKE) clean
-	@$(ARCH) $(ARCHFLAGS) $(ARCHIVE) $(SRCFILES)
+	$(ARCH) $(ARCHFLAGS) $(ARCHIVE) $(SRCFILES)
 
 clean:
 	rm -f $(CLFILES)
@@ -86,16 +116,20 @@ clean:
 	@$(MAKE) -C fig $@
 
 help:
-	@echo "Targets:"
-	@echo "  dvi      - (default) build DVI"
-	@echo "  clean    - remove ouptut files"
-	@echo "  epstopdf - convert all figures to PDF"
-	@echo "  fixbb    - fix BoundingBox"
-	@echo "  help     - show help"
-	@echo "  html     - build HTML"
-	@echo "  pdf      - build PDF"
-	@echo "  pdf_2on1 - build PDF with 2 pages on one landscape-oriented A4"
-	@echo "  ps       - build PS"
-	@echo "  ps_2on1  - build PS with 2 pages on one landscape-oriented A4"
-	@echo "  srcdist  - build source distribution $(ARCHIVE)"
+	@echo "List of targets:"
+	@echo "  dvi        (default) build DVI"
+	@echo "  clean      remove output files"
+	@echo "  epstoeps   optimize EPS files"
+	@echo "  epstopdf   convert figures to PDF"
+	@echo "  fixbb      fix BoundingBox of EPS files"
+	@echo "  help       show list of targets"
+	@echo "  html       convert to HTML"
+	@echo "  pdf        build PDF"
+	@echo "  pdf_2on1   build PDF with two A5 pages on one A4 ordered by number"
+	@echo "  pdf_book   build PDF booklet (two A5 on A4)"
+	@echo "  ps         build PS"
+	@echo "  ps_2on1    build PS with two A5 pages on one A4 ordered by number"
+	@echo "  ps_book    build PS booklet (two A5 on A4)"
+	@echo "  rtf        convert to RTF"
+	@echo "  srcdist    build source distribution $(ARCHIVE)"
 
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 2cdc9f56b82..6a162d08b38 100644
--- a/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd
+++ b/Master/texmf-dist/doc/latex/disser/include/latex.nmk.cmd
@@ -8,39 +8,43 @@ if "%CMDEXTVERSION%"=="" (
 	goto :eof
 )
 
-if "%texmf%"=="" set texmf=%programfiles%\miktex-2.6
-
-set target=thesis
-
-set arch=7z
-set bibtex=bibtex8
-set epstool=epstool
-set epstopdf=epstopdf
-set ps2pdf=gswin32c
-set dvips=dvips
-set l2h=latex2html
-set mktexlsr=mktexlsr
-set pdftex=pdflatex
-set psnup=psnup
-set tex=latex
-
-set archext=zip
-set archflags=a -t%archext%
-set archive=%target%.%archext%
-set bibtexflags=-H -c cp1251
-set l2hflags=-dir html -iso_language RU.RU -split 3 -short_index ^
-             -numbered_footnotes -no_footnode -white -antialias ^
-             -html_version 4.0
-set ps2pdfflags=-dBATCH -dNOPAUSE -sDEVICE=pdfwrite -g4960x7016 -r600 ^
-	  -dCompatibilityLevel#1.2 -sOutputFile=%target%_2on1.pdf -c save pop ^
-	  -f %target%_2on1.ps
-set psnupflags=-2 -pA4
-set texflags=-src-specials -terminal=oem
+if "%target%"=="" set target=thesis
+
+if "%arch%"=="" set arch=7z
+if "%bibtex%"=="" set bibtex=bibtex8
+if "%epstool%"=="" set epstool=epstool
+if "%epstopdf%"=="" set epstopdf=epstopdf
+if "%ps2pdf%"=="" set ps2pdf=gswin32c
+if "%dvips%"=="" set dvips=dvips
+if "%l2h%"=="" set l2h=latex2html
+if "%mktexlsr%"=="" set mktexlsr=mktexlsr
+if "%pdflatex%"=="" set pdflatex=pdflatex
+if "%psbook%"=="" set psbook=psbook
+if "%psnup%"=="" set psnup=psnup
+if "%latex%"=="" set latex=latex
+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 ^
+    -html_version 4.0
+)
+if "%ps2pdfflags%"=="" (
+	set ps2pdfflags=-dBATCH -dNOPAUSE -sDEVICE=pdfwrite -g4960x7016 -r600 ^
+	  -dCompatibilityLevel#1.2
+)
+if "%psnupflags%"=="" set psnupflags=-2 -pA4
+if "%pdflatexflags%"=="" set pdflatexflags=--shell-escape
+if "%latexflags%"=="" set latexflags=-src-specials
 
 set clext=*.bbl *.bak *.aux *.blg *.out *.toc *.log *.dvi *.tmp *.pdf *.ps
-set clfiles= %clext% %target%.%arc%
-set srcfiles=*
-set suffix=~
+if "%clfiles%"=="" set clfiles= %clext% %target%.%arc%
+if "%srcfiles%"=="" set srcfiles=*
+if "%suffix%"=="" set suffix=~
 
 rem end of configuration
 
@@ -55,27 +59,41 @@ if "%1"=="" goto :eof
 
 if "%1"=="dvi" (
 :dvi
-	%tex% %texflags% %target%.tex
-	%bibtex% %bibtexflags% %target%
-	%tex% %texflags% %target%.tex
-	%tex% %texflags% %target%.tex
+	%latex% %latexflags% %target%.tex
+	if exist %target%.bib (
+		%bibtex% %bibtexflags% %target%
+		%latex% %latexflags% %target%.tex
+	) else (
+		echo Warning: Bibliography file does not exist
+	)
+	%latex% %latexflags% %target%.tex
 goto :eof
 )
 
 if "%1"=="pdf" (
 :pdf
-	call :epstopdf
-	%pdftex% %texflags% %target%.tex
-	%bibtex% %bibtexflags% %target%
-	%pdftex% %texflags% %target%.tex
-	%pdftex% %texflags% %target%.tex
+	%pdflatex% %pdflatexflags% %target%.tex
+	if exist %target%.bib (
+		%bibtex% %bibtexflags% %target%
+		%pdflatex% %pdflatexflags% %target%.tex
+	)
+	%pdflatex% %pdflatexflags% %target%.tex
 goto :eof
 )
 
 if "%1"=="pdf_2on1" (
 :pdf2on1
-	if not exist %target%.ps call :ps2on1
-	%ps2pdf% %ps2pdfflags% 2 > nul 2>&1
+	if not exist %target%_2on1.ps call :ps2on1
+	%ps2pdf% %ps2pdfflags% -sOutputFile=%target%_2on1.pdf ^
+	-c save pop -f %target%_2on1.ps
+goto :eof
+)
+
+if "%1"=="pdf_booklet" (
+:pdfbooklet
+	if not exist %target%_booklet.ps call :psbooklet
+	%ps2pdf% %ps2pdfflags% -sOutputFile=%target%_booklet.pdf ^
+	-c save pop -f %target%_booklet.ps
 goto :eof
 )
 
@@ -93,6 +111,13 @@ if "%1"=="ps_2on1" (
 goto :eof
 )
 
+if "%1"=="ps_booklet" (
+:psbooklet
+	if not exist %target%.ps call :ps
+	%psbook% %target%.ps | %psnup% -2 > %target%_booklet.ps
+goto :eof
+)
+
 if "%1"=="html" (
 :html
 	if not exist %target%.dvi call :dvi
@@ -100,6 +125,11 @@ if "%1"=="html" (
 goto :eof
 )
 
+if "%1"=="rtf" (
+	call :dvi
+	%l2rtf% -F -M12 -i russian -a %target%.aux -b %target%.bbl %target%.tex
+)
+
 if "%1"=="clean" (
 :clean
 	del /s %clfiles% 2> nul
@@ -114,6 +144,12 @@ if "%1"=="srcdist" (
 goto :eof
 )
 
+if "%1"=="epstoeps" (
+:epstoeps
+	cd fig & call nomake.cmd epstoeps & cd ..
+goto :eof	
+)
+
 if "%1"=="epstopdf" (
 :epstopdf
 	cd fig & call nomake.cmd epstopdf & cd ..
@@ -128,18 +164,21 @@ goto :eof
 
 if "%1"=="help" (
 :help
-	echo Targets:
-	echo   dvi      - ^(default^) build DVI
-	echo   clean    - remove ouptut files
-	echo   epstopdf - convert all figures to PDF
-	echo   fixbb    - fix BoundingBox
-	echo   help     - show help
-	echo   html     - build HTML
-	echo   pdf      - build PDF
-	echo   pdf_2on1 - build PDF with 2 pages on one landscape-oriented A4
-	echo   ps       - build PS
-	echo   ps_2on1  - build PS with 2 pages on one landscape-oriented A4
-	echo   srcdist  - build source distribution %archive%
+	echo List of targets:
+	echo   dvi        ^(default^) build DVI
+	echo   clean      remove output files
+	echo   epstoeps   optimize EPS files
+	echo   epstopdf   convert figures to PDF
+	echo   fixbb      fix BoundingBox of EPS files
+	echo   help       show list of targets
+	echo   html       convert to HTML
+	echo   pdf_2on1   build PDF with two A5 pages on one A4 ordered by number
+	echo   pdf_book   build PDF booklet ^(two A5 on A4^)
+	echo   ps         build PS
+	echo   ps_2on1    build PS with two A5 pages on A4 ordered by number
+	echo   ps_book    build PS booklet ^(two A5 on A4^)
+	echo   rtf        convert to RTF
+	echo   srcdist    build source distribution %archive%
 goto :eof
 )