diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2001-06-25 10:58:40 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2001-06-25 10:58:40 +0000 |
| commit | 599b6b9743c71b3822700ae1a464102a0a9fd515 (patch) | |
| tree | 0ae9ff23501f9f723603518885c24adaa8e1a3cf /tests/multiple | |
| parent | cf6a4a2322a3ba69546e4cd191373dfa85828fa0 (diff) | |
| download | libxslt-599b6b9743c71b3822700ae1a464102a0a9fd515.tar.gz libxslt-599b6b9743c71b3822700ae1a464102a0a9fd515.tar.bz2 libxslt-599b6b9743c71b3822700ae1a464102a0a9fd515.zip | |
Lots of cleanup work toward betted multiple document output handling:
* libxslt/transform.[ch] libxslt/xslt.c libxslt/xsltInternals.h:
added a new interface xsltRunStylesheet() for a more flexible
handling of the output and trying to adhere to xsl:document
filename generation semantic if one knows the URL of the output,
also add IObuf capacity and SAX for output but is currently not
implemented.
* libxslt/xsltproc.c: added a -o or --output filename argument
to test xsltRunStylesheet() or provide a base when generating
multiple outputs
* tests/docbook/Makefile.am tests/docbook/result/xtchunk/html/*:
updated tests to add DocBook xt:document based chunking
* tests/multiple/Makefile.am: cleaned up the makefile a bit
* tests/multiple/out/*.html: the new xt:document now generate
the DOCTYPE if available as is the case for HTML
Daniel
Diffstat (limited to 'tests/multiple')
26 files changed, 56 insertions, 17 deletions
diff --git a/tests/multiple/Makefile.am b/tests/multiple/Makefile.am index bd7437f0..9136499d 100644 --- a/tests/multiple/Makefile.am +++ b/tests/multiple/Makefile.am @@ -4,19 +4,29 @@ $(top_builddir)/libxslt/xsltproc: @(cd ../../libxslt ; make xsltproc) EXTRA_DIST = dict.dtd dict.xml dict.xsl result.xml \ - out/lettera.html out/lettera.orig out/letterb.html out/letterb.orig \ - out/letterc.html out/letterc.orig out/letterd.html out/letterd.orig \ - out/lettere.html out/lettere.orig out/letterf.html out/letterf.orig \ - out/letterg.html out/letterg.orig out/letterh.html out/letterh.orig \ - out/letterij.html out/letterij.orig out/letterk.html out/letterk.orig \ - out/letterl.html out/letterl.orig out/letterm.html out/letterm.orig \ - out/lettern.html out/lettern.orig out/lettero.html out/lettero.orig \ - out/letterp.html out/letterp.orig out/letterq.html out/letterq.orig \ - out/letterr.html out/letterr.orig out/letters.html out/letters.orig \ - out/lettert.html out/lettert.orig out/letteruv.html out/letteruv.orig \ - out/letterw.html out/letterw.orig out/letterx.html out/letterx.orig \ - out/lettery.html out/lettery.orig out/letterz.html out/letterz.orig \ - out/titlepage.html out/titlepage.orig + out/lettera.orig out/letterb.orig \ + out/letterc.orig out/letterd.orig \ + out/lettere.orig out/letterf.orig \ + out/letterg.orig out/letterh.orig \ + out/letterij.orig out/letterk.orig \ + out/letterl.orig out/letterm.orig \ + out/lettern.orig out/lettero.orig \ + out/letterp.orig out/letterq.orig \ + out/letterr.orig out/letters.orig \ + out/lettert.orig out/letteruv.orig \ + out/letterw.orig out/letterx.orig \ + out/lettery.orig out/letterz.orig \ + out/titlepage.orig + + +GENERATED = \ + out/lettera.html out/letterb.html out/letterc.html out/letterd.html \ + out/lettere.html out/letterf.html out/letterg.html out/letterh.html \ + out/letterij.html out/letterk.html out/letterl.html out/letterm.html \ + out/lettern.html out/lettero.html out/letterp.html out/letterq.html \ + out/letterr.html out/letters.html out/lettert.html out/letteruv.html \ + out/letterw.html out/letterx.html out/lettery.html out/letterz.html \ + out/titlepage.html all: test @@ -24,10 +34,14 @@ test tests: $(top_builddir)/libxslt/xsltproc @(echo > .memdump) @($(top_builddir)/libxslt/xsltproc $(srcdir)/dict.xsl $(srcdir)/dict.xml > dict.res ; \ diff $(srcdir)/result.xml dict.res; \ - for i in $(srcdir)/out/letter*.orig ; do \ - diff $$i $(srcdir)/out/`basename $$i .orig`.html; done ; \ - diff $(srcdir)/out/titlepage.orig $(srcdir)/out/titlepage.html; \ + for i in $(srcdir)/out/letter*.html $(srcdir)/out/titlepage.html ; do \ + orig=$(srcdir)/out/`basename $$i .html`.orig ; \ + if [ -f $$orig ] ; then \ + diff $$orig $$i ; \ + else \ + echo "new $$orig" ; cp $$i $$orig ; \ + fi ; done ; \ grep "MORY ALLO" .memdump | grep -v "MEMORY ALLOCATED : 0" || true;\ - rm -f dict.res) + rm -f dict.res $(GENERATED)) diff --git a/tests/multiple/out/lettera.orig b/tests/multiple/out/lettera.orig index efbb37d3..2e36c43a 100644 --- a/tests/multiple/out/lettera.orig +++ b/tests/multiple/out/lettera.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterb.orig b/tests/multiple/out/letterb.orig index 02577313..aa71a283 100644 --- a/tests/multiple/out/letterb.orig +++ b/tests/multiple/out/letterb.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterc.orig b/tests/multiple/out/letterc.orig index 3666c8f9..ab4c2c83 100644 --- a/tests/multiple/out/letterc.orig +++ b/tests/multiple/out/letterc.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterd.orig b/tests/multiple/out/letterd.orig index 922912c4..630d05f6 100644 --- a/tests/multiple/out/letterd.orig +++ b/tests/multiple/out/letterd.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/lettere.orig b/tests/multiple/out/lettere.orig index cdc5cc08..4c4ea1d8 100644 --- a/tests/multiple/out/lettere.orig +++ b/tests/multiple/out/lettere.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterf.orig b/tests/multiple/out/letterf.orig index f6964b0f..c36fc94b 100644 --- a/tests/multiple/out/letterf.orig +++ b/tests/multiple/out/letterf.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterg.orig b/tests/multiple/out/letterg.orig index e7035d77..057e0c72 100644 --- a/tests/multiple/out/letterg.orig +++ b/tests/multiple/out/letterg.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterh.orig b/tests/multiple/out/letterh.orig index 64fd55c4..a1aabe9c 100644 --- a/tests/multiple/out/letterh.orig +++ b/tests/multiple/out/letterh.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterij.orig b/tests/multiple/out/letterij.orig index d7f5f638..57663169 100644 --- a/tests/multiple/out/letterij.orig +++ b/tests/multiple/out/letterij.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterk.orig b/tests/multiple/out/letterk.orig index 0ae03278..85b88bcf 100644 --- a/tests/multiple/out/letterk.orig +++ b/tests/multiple/out/letterk.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterl.orig b/tests/multiple/out/letterl.orig index b7d4a1a2..3c4e9a7b 100644 --- a/tests/multiple/out/letterl.orig +++ b/tests/multiple/out/letterl.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterm.orig b/tests/multiple/out/letterm.orig index 89fb11aa..ce4ee88e 100644 --- a/tests/multiple/out/letterm.orig +++ b/tests/multiple/out/letterm.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/lettern.orig b/tests/multiple/out/lettern.orig index b771eb3f..3ad7e98d 100644 --- a/tests/multiple/out/lettern.orig +++ b/tests/multiple/out/lettern.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/lettero.orig b/tests/multiple/out/lettero.orig index caf4b9f4..a85124f7 100644 --- a/tests/multiple/out/lettero.orig +++ b/tests/multiple/out/lettero.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterp.orig b/tests/multiple/out/letterp.orig index 48292905..3809c0e8 100644 --- a/tests/multiple/out/letterp.orig +++ b/tests/multiple/out/letterp.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterq.orig b/tests/multiple/out/letterq.orig index f7525dbe..a34a5dcb 100644 --- a/tests/multiple/out/letterq.orig +++ b/tests/multiple/out/letterq.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterr.orig b/tests/multiple/out/letterr.orig index 73aa7f1d..b7bdb6bf 100644 --- a/tests/multiple/out/letterr.orig +++ b/tests/multiple/out/letterr.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letters.orig b/tests/multiple/out/letters.orig index dabf6053..819308bf 100644 --- a/tests/multiple/out/letters.orig +++ b/tests/multiple/out/letters.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/lettert.orig b/tests/multiple/out/lettert.orig index 0f3aff6c..bfe0887e 100644 --- a/tests/multiple/out/lettert.orig +++ b/tests/multiple/out/lettert.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letteruv.orig b/tests/multiple/out/letteruv.orig index 8e2af18d..fa91d9d8 100644 --- a/tests/multiple/out/letteruv.orig +++ b/tests/multiple/out/letteruv.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterw.orig b/tests/multiple/out/letterw.orig index 5b806f48..dfaf9336 100644 --- a/tests/multiple/out/letterw.orig +++ b/tests/multiple/out/letterw.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterx.orig b/tests/multiple/out/letterx.orig index bb3d5242..ecfac338 100644 --- a/tests/multiple/out/letterx.orig +++ b/tests/multiple/out/letterx.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/lettery.orig b/tests/multiple/out/lettery.orig index 3dd0e1fd..85d1bd59 100644 --- a/tests/multiple/out/lettery.orig +++ b/tests/multiple/out/lettery.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/letterz.orig b/tests/multiple/out/letterz.orig index 363d4ea2..8073d866 100644 --- a/tests/multiple/out/letterz.orig +++ b/tests/multiple/out/letterz.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> diff --git a/tests/multiple/out/titlepage.orig b/tests/multiple/out/titlepage.orig index 3e44987f..a3a347c6 100644 --- a/tests/multiple/out/titlepage.orig +++ b/tests/multiple/out/titlepage.orig @@ -1,3 +1,4 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd"> <html> <head> <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"> |