fontspec 2.1a (26sep10)

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

1 files changed, 85 insertions, 75 deletions

diff --git a/Master/texmf-dist/source/latex/fontspec/Makefile b/Master/texmf-dist/source/latex/fontspec/Makefile
index cd8158afd28..606da5ca8e2 100644
--- a/Master/texmf-dist/source/latex/fontspec/Makefile
+++ b/Master/texmf-dist/source/latex/fontspec/Makefile
@@ -4,6 +4,7 @@
 
 SHELL = /bin/sh
 .SUFFIXES:
+.SILENT:
 
 #### BEGIN ####
 
@@ -34,6 +35,9 @@ NAME = fontspec
 DOC = $(NAME).pdf
 DTX = $(NAME).dtx
 
+# Redefine this to print output if you need:
+REDIRECT = > /dev/null
+
 # Files grouped by generation mode
 COMPILED = $(DOC) fontspec-testsuite.pdf
 EXAMPLES = fontspec-example.tex
@@ -67,10 +71,10 @@ CTAN_ZIP = $(NAME).zip
 TDS_ZIP = $(NAME).tds.zip
 ZIPS = $(CTAN_ZIP) $(TDS_ZIP)
 
-DO_PDFLATEX = pdflatex --interaction=batchmode $< >/dev/null
-DO_PDFLATEX_WRITE18 = pdflatex --shell-escape --interaction=batchmode $< >/dev/null
-DO_TEX = tex --interaction=batchmode $< >/dev/null
-DO_MAKEINDEX = makeindex -s gind.ist $(subst .dtx,,$<) >/dev/null 2>&1
+DO_PDFLATEX = pdflatex --interaction=nonstopmode $<  $(REDIRECT)
+DO_PDFLATEX_WRITE18 = pdflatex --shell-escape --interaction=nonstopmode $<  $(REDIRECT)
+DO_TEX = tex --interaction=nonstopmode $<  $(REDIRECT)
+DO_MAKEINDEX = makeindex -s gind.ist $(subst .dtx,,$<)  $(REDIRECT)  2>&1
 
 all: $(GENERATED)
 doc: $(COMPILED)
@@ -119,7 +123,7 @@ README: README.markdown
 fontspec-testsuite.pdf: $(DTX)
 	@echo 'Compiling test suite.'
 	$(DO_PDFLATEX)
-	xelatex --interaction=batchmode fontspec-testsuite.tex
+	xelatex --interaction=nonstopmode fontspec-testsuite.tex  $(REDIRECT)
 
 .PHONY: install manifest clean mrproper
 
@@ -167,7 +171,7 @@ SUITESOURCE = \
   $(testdir)/testsuite.cls \
   $(testdir)/$(TESTLIST)
 
-TESTOUT = $(shell ls $(testdir)/*.safe.pdf)
+TESTOUT = $(shell ls $(testdir)/*.*safe.pdf)
 BUILDTESTSRC = $(subst $(testdir)/,$(builddir)/,$(subst .safe.pdf,.ltx,$(TESTOUT)))
 BUILDTESTTARGET = $(subst $(testdir)/,$(builddir)/,$(subst .safe.pdf,.diff.pdf,$(TESTOUT)))
 
@@ -194,112 +198,118 @@ $(builddir)/%: %
 
 #### Generating new tests ####
 
-lonelystub = $(shell cd $(testdir); ls | egrep '($(xprefix)|$(lprefix))(.*\.ltx)|(.*\.safe.pdf)' | cut -d . -f 1 | uniq -u)
+lonelystub = $(shell cd $(testdir); ls | egrep '(X|L)(.*\.ltx)|(X|L)(.*\.safe.pdf)' | cut -d . -f 1 | uniq -u)
 lonelyfile = $(addsuffix .safe.pdf,$(lonelystub))
 lonelypath = $(addprefix $(testdir)/,$(lonelyfile))
 lonelytest = $(addprefix $(builddir)/,$(addsuffix .pdf,$(lonelystub)))
 
-bothlonelystub = $(shell cd $(testdir); ls | egrep '($(both).*\.ltx)|($(both).*\.safe.pdf)' | cut -d . -f 1 | uniq -u)
-bothlonelyfile = $(addsuffix .safe.pdf,$(bothlonelystub))
-bothlonelypath = $(addprefix $(testdir)/,$(bothlonelyfile))
-bothlonelytest = $(addprefix $(builddir)/,$(addsuffix .pdf,$(bothlonelystub)))
+Xlonelystub = $(shell cd $(testdir); ls | egrep '(F.*\.ltx)|(F.*.Xsafe.pdf)' | cut -d . -f 1 | uniq -u)
+Xlonelyfile = $(addsuffix .Xsafe.pdf,$(Xlonelystub))
+Xlonelypath = $(addprefix $(testdir)/,$(Xlonelyfile))
+Xlonelytest = $(addprefix $(builddir)/,$(addsuffix -X.pdf,$(Xlonelystub)))
 
-initest: $(lonelypath) $(bothlonelypath)
+Llonelystub = $(shell cd $(testdir); ls | egrep '(F.*\.ltx)|(F.*.Lsafe.pdf)' | cut -d . -f 1 | uniq -u)
+Llonelyfile = $(addsuffix .Lsafe.pdf,$(Llonelystub))
+Llonelypath = $(addprefix $(testdir)/,$(Llonelyfile))
+Llonelytest = $(addprefix $(builddir)/,$(addsuffix -L.pdf,$(Llonelystub)))
 
-$(lonelypath): $(lonelytest)
-	@$(COPY)  `echo $@ | sed -e s/$(testdir)/$(builddir)/ -e s/.safe.pdf/.pdf/`  $@
+initest: $(lonelypath) $(Xlonelypath) $(Llonelypath)
 
-$(bothlonelypath): $(bothlonelytest)
-	@$(COPY)  `echo $@ | sed -e s/$(testdir)/$(builddir)/ -e s/.safe.pdf/.pdf/`  $@
+$(lonelypath): $(lonelytest)
+	$(COPY)  `echo $@ | sed -e s/$(testdir)/$(builddir)/ -e s/.safe.pdf/.pdf/`  $@
 
-#### REFERENCE OUTPUT GENERATION ####
+$(Xlonelypath): $(Xlonelytest)
+	$(COPY)  `echo $@ | sed -e s/$(testdir)/$(builddir)/ -e s/.Xsafe.pdf/-X.pdf/`  $@
 
-$(builddir)/$(both)%.gendiff.pdf: $(builddir)/$(both)%-$(lprefix).pdf $(builddir)/$(both)%-$(xprefix).pdf
-	@echo '$(both)$*: Comparing PDF from LuaLaTeX with PDF from XeLaTeX.'
-	@if test $(shell compare \
-	                $(COMPARE_OPTS) \
-	                $(builddir)/$(both)$*-$(lprefix).pdf \
-	                $(builddir)/$(both)$*-$(xprefix).pdf \
-	                $(builddir)/$(both)$*.gendiff.pdf 2>&1) -lt 1 ; then \
-	  echo '$(both)$*: Test generation successed.' ; \
-	else \
-	  echo '$(both)$*: Test generation failed; XeLaTeX and LuaLaTeX gave different output.' ; \
-	  false ; \
-	fi
+$(Llonelypath): $(Llonelytest)
+	$(COPY)  `echo $@ | sed -e s/$(testdir)/$(builddir)/ -e s/.Lsafe.pdf/-L.pdf/`  $@
 
-$(builddir)/$(both)%.pdf: $(builddir)/$(both)%.gendiff.pdf
-	  $(MOVE) $(builddir)/$(both)$*-$(xprefix).pdf $(builddir)/$(both)$*.pdf
 
 #### TESTS FOR BOTH ENGINES ####
 
-$(builddir)/$(both)%.diff.pdf: $(builddir)/$(both)%-$(lprefix).pdf $(builddir)/$(both)%-$(xprefix).pdf
-	@echo '$(both)$*: Comparing PDF from LuaLaTeX against reference output.'
-	@if test $(shell compare \
+$(builddir)/F%-L.diff.pdf: $(builddir)/F%-L.pdf
+	@echo 'F$*: Comparing PDF from LuaLaTeX against reference output.'
+	if test $(shell compare \
 	                $(COMPARE_OPTS) \
-	                $(builddir)/$(both)$*-$(lprefix).pdf \
-	                $(testdir)/$(both)$*.safe.pdf \
-	                $(builddir)/$(both)$*.diff.pdf 2>&1) -le 1 ; then \
-	  echo '$(both)$*: Test passed.' ; \
+	                $(builddir)/F$*-L.pdf \
+	                $(testdir)/F$*.Lsafe.pdf \
+	                $(builddir)/F$*-L.diff.pdf 2>&1) -le 1 ; then \
+	  echo 'F$*: Test passed.' ; \
 	else \
-	  echo '$(both)$*: Test failed.' ; \
+	  echo 'F$*: Test failed.' ; \
 	  false ; \
 	fi
-	@echo '$(both)$*: Comparing PDF from XeLaTeX against reference output.'
-	@if test $(shell compare \
+
+$(builddir)/F%-X.diff.pdf: $(builddir)/F%-X.pdf
+	@echo 'F$*: Comparing PDF from LuaLaTeX against reference output.'
+	if test $(shell compare \
 	                $(COMPARE_OPTS) \
-	                $(builddir)/$(both)$*-$(xprefix).pdf \
-	                $(testdir)/$(both)$*.safe.pdf \
-	                $(builddir)/$(both)$*.diff.pdf 2>&1) -le 1 ; then \
-	  echo '$(both)$*: Test passed.' ; \
+	                $(builddir)/F$*-X.pdf \
+	                $(testdir)/F$*.Xsafe.pdf \
+	                $(builddir)/F$*-X.diff.pdf 2>&1) -le 1 ; then \
+	  echo 'F$*: Test passed.' ; \
 	else \
-	  echo '$(both)$*: Test failed.' ; \
+	  echo 'F$*: Test failed.' ; \
 	  false ; \
 	fi
 
-$(builddir)/$(both)%-$(lprefix).pdf: $(BUILDSOURCE) $(BUILDSUITE) $(builddir)/$(both)%.ltx
-	@echo '$(both)$*: Generating PDF output with LuaLaTeX.'
-	@cd $(builddir); lualatex -jobname=$(both)$*-$(lprefix) -interaction=batchmode $(both)$*.ltx > /dev/null
+$(builddir)/F%-L.pdf: $(BUILDSOURCE) $(BUILDSUITE) $(builddir)/F%-L.ltx
+	@echo 'F$*: Generating PDF output with LuaLaTeX.'
+	@cd $(builddir); lualatex -interaction=nonstopmode F$*-L.ltx  $(REDIRECT)
+
+$(builddir)/F%-X.pdf: $(BUILDSOURCE) $(BUILDSUITE) $(builddir)/F%-X.ltx
+	@echo 'F$*: Generating PDF output with XeLaTeX.'
+	@cd $(builddir); xelatex -interaction=nonstopmode F$*-X.ltx   $(REDIRECT)
 
-$(builddir)/$(both)%-$(xprefix).pdf: $(BUILDSOURCE) $(BUILDSUITE) $(builddir)/$(both)%.ltx
-	@echo '$(both)$*: Generating PDF output with XeLaTeX.'
-	@cd $(builddir); xelatex -jobname=$(both)$*-$(xprefix) -interaction=batchmode $(both)$*.ltx > /dev/null
+$(builddir)/F%-L.ltx: $(builddir)/F%.ltx
+	$(COPY) $< $@
+
+$(builddir)/F%-X.ltx: $(builddir)/F%.ltx
+	$(COPY) $< $@
 
 
 #### TEST FOR EACH ENGINE INDIVIDUALLY ####
 
-$(builddir)/$(lprefix)%.diff.pdf: $(builddir)/$(lprefix)%.pdf
-	@echo '$(lprefix)$*: Comparing PDF against reference output.'
-	@if test $(shell compare $(COMPARE_OPTS) \
-	          $(builddir)/$(lprefix)$*.pdf $(testdir)/$(lprefix)$*.safe.pdf \
-	          $(builddir)/$(lprefix)$*.diff.pdf 2>&1) -le 1 ; then \
-	  echo '$(lprefix)$*: Test passed.' ; \
+$(builddir)/L%.diff.pdf: $(builddir)/L%.pdf
+	@echo 'L$*: Comparing PDF against reference output.'
+	if test $(shell compare $(COMPARE_OPTS) \
+	          $(builddir)/L$*.pdf $(testdir)/L$*.safe.pdf \
+	          $(builddir)/L$*.diff.pdf 2>&1) -le 1 ; then \
+	  echo 'L$*: Test passed.' ; \
 	else \
-	  echo '$(lprefix)$*: Test failed.' ; \
+	  echo 'L$*: Test failed.' ; \
 	  false ; \
 	fi
 
-$(builddir)/$(xprefix)%.diff.pdf: $(builddir)/$(xprefix)%.pdf
-	@echo '$(xprefix)$*: Comparing PDF against reference output.'
-	@if test $(shell compare \
+$(builddir)/X%.diff.pdf: $(builddir)/X%.pdf
+	@echo 'X$*: Comparing PDF against reference output.'
+	if test $(shell compare \
 	                $(COMPARE_OPTS) \
-	                $(builddir)/$(xprefix)$*.pdf \
-	                $(testdir)/$(xprefix)$*.safe.pdf \
-	                $(builddir)/$(xprefix)$*.diff.pdf 2>&1) -le 1 ; then \
-	  echo '$(xprefix)$*: Test passed.' ; \
+	                $(builddir)/X$*.pdf \
+	                $(testdir)/X$*.safe.pdf \
+	                $(builddir)/X$*.diff.pdf 2>&1) -le 1 ; then \
+	  echo 'X$*: Test passed.' ; \
 	else \
-	  echo '$(xprefix)$*: Test failed.' ; \
+	  echo 'X$*: Test failed.' ; \
 	  false ; \
 	fi
 
-$(builddir)/$(xprefix)%.pdf: $(BUILDSOURCE) $(BUILDSUITE) $(builddir)/$(xprefix)%.ltx
-	@echo '$(xprefix)$*: Generating PDF output with XeLaTeX.'
-	@cd $(builddir); xelatex -interaction=batchmode $(xprefix)$*.ltx > /dev/null
+$(builddir)/X%.pdf: $(BUILDSOURCE) $(BUILDSUITE) $(builddir)/X%.ltx
+	@echo 'X$*: Generating PDF output with XeLaTeX.'
+	@cd $(builddir); xelatex -interaction=nonstopmode X$*.ltx $(REDIRECT)
 
-$(builddir)/$(lprefix)%.pdf: $(BUILDSOURCE) $(BUILDSUITE) $(builddir)/$(lprefix)%.ltx
-	@echo '$(lprefix)$*: Generating PDF output with LuaLaTeX.'
-	@cd $(builddir); lualatex -interaction=batchmode $(lprefix)$*.ltx > /dev/null
+$(builddir)/L%.pdf: $(BUILDSOURCE) $(BUILDSUITE) $(builddir)/L%.ltx
+	@echo 'L$*: Generating PDF output with LuaLaTeX.'
+	@cd $(builddir); lualatex -interaction=nonstopmode L$*.ltx $(REDIRECT)
 
 #### HACK: allow `make <foobar>` run that test.
 
-%: build/%.ltx
-	make build/$*.diff.pdf
\ No newline at end of file
+L%: build/L%.ltx
+	make build/L$*.diff.pdf
+
+X%: build/X%.ltx
+	make build/X$*.diff.pdf
+
+F%: build/F%.ltx
+	make build/F$*-L.diff.pdf
+	make build/F$*-X.diff.pdf
\ No newline at end of file