87 files changed, 132 insertions, 310 deletions

diff --git a/Jamfile b/Jamfile
index 851379d2..6fd4a7b9 100644
--- a/Jamfile
+++ b/Jamfile
@@ -13,10 +13,8 @@ HDRS = [ FDirName $(TOP) include ] ;
 Main hexdump : hexdump.c ;
 Main strdump : strdump.c ;
 
-SubInclude TOP base ;
-SubInclude TOP stream ;
-SubInclude TOP world ;
-SubInclude TOP raster ;
+SubInclude TOP fitz ;
+SubInclude TOP fitzdraw ;
 
 SubInclude TOP fonts ;
 SubInclude TOP cmaps ;
diff --git a/apps/Jamfile b/apps/Jamfile
index 84c02f2c..f7b5391d 100644
--- a/apps/Jamfile
+++ b/apps/Jamfile
@@ -1,6 +1,6 @@
 #
 
-FITZLIBS = libmupdf libbase libstream libworld libraster libfonts libcmaps ;
+FITZLIBS = libmupdf libfitz libfitzdraw libfonts libcmaps ;
 
 SubDir TOP apps ;
 Main mupdftool : pdftool.c ;
diff --git a/base/Jamfile b/base/Jamfile
deleted file mode 100644
index 0b9e1239..00000000
--- a/base/Jamfile
+++ /dev/null
@@ -1,23 +0,0 @@
-SubDir TOP base ;
-
-Library libbase :
-	base_cpudep.c
-	base_error.c
-	base_hash.c
-	base_matrix.c
-	base_memory.c
-	base_rect.c
-	base_rune.c
-	base_cleanname.c
-	;
-
-if $(NEED_STRLCPY) { Library libbase : util_strlcpy.c ; }
-if $(NEED_STRSEP) { Library libbase : util_strsep.c ; }
-if $(NEED_GETOPT) { Library libbase : util_getopt.c ; }
-
-# MSVC does not have gettimeofday()
-if $(OS) = NT
-{
-    Library libbase : util_gettimeofday.c ;
-}
-
diff --git a/fitz/Jamfile b/fitz/Jamfile
new file mode 100644
index 00000000..1cfbd3a5
--- /dev/null
+++ b/fitz/Jamfile
@@ -0,0 +1,102 @@
+#
+#
+#
+
+SubDir TOP fitz ;
+
+#
+# The base runtime support, and patching over
+# platform specific wonkyness.
+#
+
+Library libfitz :
+	base_cpudep.c
+	base_error.c
+	base_hash.c
+	base_matrix.c
+	base_memory.c
+	base_rect.c
+	base_rune.c
+	base_cleanname.c
+	;
+
+if $(NEED_STRLCPY) { Library libfitz : util_strlcpy.c ; }
+if $(NEED_STRSEP) { Library libfitz : util_strsep.c ; }
+if $(NEED_GETOPT) { Library libfitz : util_getopt.c ; }
+
+# MSVC does not have gettimeofday()
+if $(OS) = NT
+{
+    Library libfitz : util_gettimeofday.c ;
+}
+
+#
+# Encryption, carousel-object-system, filters, buffers and streams.
+#
+
+Library libfitz :
+
+	crypt_arc4.c
+	crypt_crc32.c
+	crypt_md5.c
+
+	obj_array.c
+	obj_dict.c
+	obj_parse.c
+	obj_print.c
+	obj_simple.c
+
+	stm_buffer.c
+	stm_filter.c
+	stm_open.c
+	stm_read.c
+	stm_write.c
+	stm_misc.c
+
+	filt_pipeline.c
+	filt_arc4.c
+	filt_null.c
+
+	filt_a85d.c
+	filt_a85e.c
+	filt_ahxd.c
+	filt_ahxe.c
+	filt_dctd.c
+	filt_dcte.c
+	filt_faxd.c
+	filt_faxdtab.c
+	filt_faxe.c
+	filt_faxetab.c
+	filt_flate.c
+	filt_lzwd.c
+	filt_lzwe.c
+	filt_predict.c
+	filt_rld.c
+	filt_rle.c
+
+	;
+
+if $(HAVE_JASPER)   { Library libstream : filt_jpxd.c ; }
+if $(HAVE_JBIG2DEC) { Library libstream : filt_jbig2d.c ; }
+
+#
+# Resources and display tree.
+#
+
+Library libfitz :
+
+	node_toxml.c
+	node_misc1.c
+	node_misc2.c
+	node_optimize.c
+	node_path.c
+	node_text.c
+	node_tree.c
+
+	res_colorspace.c
+	res_font.c
+	res_image.c
+	res_shade.c
+
+	;
+
diff --git a/base/base_cleanname.c b/fitz/base_cleanname.c
index 54764630..54764630 100644
--- a/base/base_cleanname.c
+++ b/fitz/base_cleanname.c
diff --git a/base/base_cpudep.c b/fitz/base_cpudep.c
index 51273a59..51273a59 100644
--- a/base/base_cpudep.c
+++ b/fitz/base_cpudep.c
diff --git a/base/base_error.c b/fitz/base_error.c
index 461ffc60..461ffc60 100644
--- a/base/base_error.c
+++ b/fitz/base_error.c
diff --git a/base/base_hash.c b/fitz/base_hash.c
index c7086ca9..c7086ca9 100644
--- a/base/base_hash.c
+++ b/fitz/base_hash.c
diff --git a/base/base_matrix.c b/fitz/base_matrix.c
index 364b287c..364b287c 100644
--- a/base/base_matrix.c
+++ b/fitz/base_matrix.c
diff --git a/base/base_memory.c b/fitz/base_memory.c
index 8c2c0249..8c2c0249 100644
--- a/base/base_memory.c
+++ b/fitz/base_memory.c
diff --git a/base/base_rect.c b/fitz/base_rect.c
index 3c00cb94..3c00cb94 100644
--- a/base/base_rect.c
+++ b/fitz/base_rect.c
diff --git a/base/base_rune.c b/fitz/base_rune.c
index 32168792..32168792 100644
--- a/base/base_rune.c
+++ b/fitz/base_rune.c
diff --git a/stream/crypt_arc4.c b/fitz/crypt_arc4.c
index fc4d487c..fc4d487c 100644
--- a/stream/crypt_arc4.c
+++ b/fitz/crypt_arc4.c
diff --git a/stream/crypt_crc32.c b/fitz/crypt_crc32.c
index dded733e..dded733e 100644
--- a/stream/crypt_crc32.c
+++ b/fitz/crypt_crc32.c
diff --git a/stream/crypt_md5.c b/fitz/crypt_md5.c
index 8f665329..8f665329 100644
--- a/stream/crypt_md5.c
+++ b/fitz/crypt_md5.c
diff --git a/stream/filt_a85d.c b/fitz/filt_a85d.c
index 19ba9e9a..19ba9e9a 100644
--- a/stream/filt_a85d.c
+++ b/fitz/filt_a85d.c
diff --git a/stream/filt_a85e.c b/fitz/filt_a85e.c
index 386d8bb3..386d8bb3 100644
--- a/stream/filt_a85e.c
+++ b/fitz/filt_a85e.c
diff --git a/stream/filt_ahxd.c b/fitz/filt_ahxd.c
index 0feb10c2..0feb10c2 100644
--- a/stream/filt_ahxd.c
+++ b/fitz/filt_ahxd.c
diff --git a/stream/filt_ahxe.c b/fitz/filt_ahxe.c
index 0fc727c3..0fc727c3 100644
--- a/stream/filt_ahxe.c
+++ b/fitz/filt_ahxe.c
diff --git a/stream/filt_arc4.c b/fitz/filt_arc4.c
index af038599..af038599 100644
--- a/stream/filt_arc4.c
+++ b/fitz/filt_arc4.c
diff --git a/stream/filt_dctc.h b/fitz/filt_dctc.h
index 72f61ef2..72f61ef2 100644
--- a/stream/filt_dctc.h
+++ b/fitz/filt_dctc.h
diff --git a/stream/filt_dctd.c b/fitz/filt_dctd.c
index 3425b8e5..3425b8e5 100644
--- a/stream/filt_dctd.c
+++ b/fitz/filt_dctd.c
diff --git a/stream/filt_dcte.c b/fitz/filt_dcte.c
index 5380c6b1..5380c6b1 100644
--- a/stream/filt_dcte.c
+++ b/fitz/filt_dcte.c
diff --git a/stream/filt_faxc.h b/fitz/filt_faxc.h
index f11334be..f11334be 100644
--- a/stream/filt_faxc.h
+++ b/fitz/filt_faxc.h
diff --git a/stream/filt_faxd.c b/fitz/filt_faxd.c
index 3eaf5f3b..3eaf5f3b 100644
--- a/stream/filt_faxd.c
+++ b/fitz/filt_faxd.c
diff --git a/stream/filt_faxd.h b/fitz/filt_faxd.h
index 9f3fb470..9f3fb470 100644
--- a/stream/filt_faxd.h
+++ b/fitz/filt_faxd.h
diff --git a/stream/filt_faxdtab.c b/fitz/filt_faxdtab.c
index 6efcf053..6efcf053 100644
--- a/stream/filt_faxdtab.c
+++ b/fitz/filt_faxdtab.c
diff --git a/stream/filt_faxe.c b/fitz/filt_faxe.c
index 7551fb80..7551fb80 100644
--- a/stream/filt_faxe.c
+++ b/fitz/filt_faxe.c
diff --git a/stream/filt_faxe.h b/fitz/filt_faxe.h
index dd3fc121..dd3fc121 100644
--- a/stream/filt_faxe.h
+++ b/fitz/filt_faxe.h
diff --git a/stream/filt_faxetab.c b/fitz/filt_faxetab.c
index 34914c2d..34914c2d 100644
--- a/stream/filt_faxetab.c
+++ b/fitz/filt_faxetab.c
diff --git a/stream/filt_flate.c b/fitz/filt_flate.c
index 6a86da3a..6a86da3a 100644
--- a/stream/filt_flate.c
+++ b/fitz/filt_flate.c
diff --git a/stream/filt_jbig2d.c b/fitz/filt_jbig2d.c
index 3569d3eb..3569d3eb 100644
--- a/stream/filt_jbig2d.c
+++ b/fitz/filt_jbig2d.c
diff --git a/stream/filt_jpxd.c b/fitz/filt_jpxd.c
index 28dc87de..28dc87de 100644
--- a/stream/filt_jpxd.c
+++ b/fitz/filt_jpxd.c
diff --git a/stream/filt_lzwd.c b/fitz/filt_lzwd.c
index c4aed45b..c4aed45b 100644
--- a/stream/filt_lzwd.c
+++ b/fitz/filt_lzwd.c
diff --git a/stream/filt_lzwe.c b/fitz/filt_lzwe.c
index 5a221f9f..5a221f9f 100644
--- a/stream/filt_lzwe.c
+++ b/fitz/filt_lzwe.c
diff --git a/stream/filt_null.c b/fitz/filt_null.c
index 601ed815..601ed815 100644
--- a/stream/filt_null.c
+++ b/fitz/filt_null.c
diff --git a/stream/filt_pipeline.c b/fitz/filt_pipeline.c
index ea0b9885..ea0b9885 100644
--- a/stream/filt_pipeline.c
+++ b/fitz/filt_pipeline.c
diff --git a/stream/filt_predict.c b/fitz/filt_predict.c
index 4654e792..4654e792 100644
--- a/stream/filt_predict.c
+++ b/fitz/filt_predict.c
diff --git a/stream/filt_rld.c b/fitz/filt_rld.c
index 9b0ed75f..9b0ed75f 100644
--- a/stream/filt_rld.c
+++ b/fitz/filt_rld.c
diff --git a/stream/filt_rle.c b/fitz/filt_rle.c
index 65c2a7a4..65c2a7a4 100644
--- a/stream/filt_rle.c
+++ b/fitz/filt_rle.c
diff --git a/world/node_misc1.c b/fitz/node_misc1.c
index fc8407d5..fc8407d5 100644
--- a/world/node_misc1.c
+++ b/fitz/node_misc1.c
diff --git a/world/node_misc2.c b/fitz/node_misc2.c
index b83678d1..b83678d1 100644
--- a/world/node_misc2.c
+++ b/fitz/node_misc2.c
diff --git a/world/node_optimize.c b/fitz/node_optimize.c
index cb3918e1..cb3918e1 100644
--- a/world/node_optimize.c
+++ b/fitz/node_optimize.c
diff --git a/world/node_path.c b/fitz/node_path.c
index b5aea542..b5aea542 100644
--- a/world/node_path.c
+++ b/fitz/node_path.c
diff --git a/world/node_text.c b/fitz/node_text.c
index 86a523df..86a523df 100644
--- a/world/node_text.c
+++ b/fitz/node_text.c
diff --git a/world/node_toxml.c b/fitz/node_toxml.c
index cc87c997..cc87c997 100644
--- a/world/node_toxml.c
+++ b/fitz/node_toxml.c
diff --git a/world/node_tree.c b/fitz/node_tree.c
index f5698bc1..f5698bc1 100644
--- a/world/node_tree.c
+++ b/fitz/node_tree.c
diff --git a/stream/obj_array.c b/fitz/obj_array.c
index 3953470a..3953470a 100644
--- a/stream/obj_array.c
+++ b/fitz/obj_array.c
diff --git a/stream/obj_dict.c b/fitz/obj_dict.c
index 236c8a1a..236c8a1a 100644
--- a/stream/obj_dict.c
+++ b/fitz/obj_dict.c
diff --git a/stream/obj_parse.c b/fitz/obj_parse.c
index 48d59538..48d59538 100644
--- a/stream/obj_parse.c
+++ b/fitz/obj_parse.c
diff --git a/stream/obj_print.c b/fitz/obj_print.c
index 4e321127..4e321127 100644
--- a/stream/obj_print.c
+++ b/fitz/obj_print.c
diff --git a/stream/obj_simple.c b/fitz/obj_simple.c
index d8eb77b7..d8eb77b7 100644
--- a/stream/obj_simple.c
+++ b/fitz/obj_simple.c
diff --git a/world/res_colorspace.c b/fitz/res_colorspace.c
index 04fc532e..04fc532e 100644
--- a/world/res_colorspace.c
+++ b/fitz/res_colorspace.c
diff --git a/world/res_font.c b/fitz/res_font.c
index 7238cc3c..7238cc3c 100644
--- a/world/res_font.c
+++ b/fitz/res_font.c
diff --git a/world/res_image.c b/fitz/res_image.c
index 4379cf17..4379cf17 100644
--- a/world/res_image.c
+++ b/fitz/res_image.c
diff --git a/world/res_shade.c b/fitz/res_shade.c
index d1bd991e..d1bd991e 100644
--- a/world/res_shade.c
+++ b/fitz/res_shade.c
diff --git a/stream/stm_buffer.c b/fitz/stm_buffer.c
index 8a1e0850..8a1e0850 100644
--- a/stream/stm_buffer.c
+++ b/fitz/stm_buffer.c
diff --git a/stream/stm_filter.c b/fitz/stm_filter.c
index 450433d4..450433d4 100644
--- a/stream/stm_filter.c
+++ b/fitz/stm_filter.c
diff --git a/stream/stm_misc.c b/fitz/stm_misc.c
index 70c1c315..70c1c315 100644
--- a/stream/stm_misc.c
+++ b/fitz/stm_misc.c
diff --git a/stream/stm_open.c b/fitz/stm_open.c
index 14e52642..14e52642 100644
--- a/stream/stm_open.c
+++ b/fitz/stm_open.c
diff --git a/stream/stm_read.c b/fitz/stm_read.c
index e0a6e8a1..e0a6e8a1 100644
--- a/stream/stm_read.c
+++ b/fitz/stm_read.c
diff --git a/stream/stm_write.c b/fitz/stm_write.c
index ed928b50..ed928b50 100644
--- a/stream/stm_write.c
+++ b/fitz/stm_write.c
diff --git a/base/util_getopt.c b/fitz/util_getopt.c
index 8025334e..8025334e 100644
--- a/base/util_getopt.c
+++ b/fitz/util_getopt.c
diff --git a/base/util_gettimeofday.c b/fitz/util_gettimeofday.c
index fee36673..fee36673 100644
--- a/base/util_gettimeofday.c
+++ b/fitz/util_gettimeofday.c
diff --git a/base/util_strlcpy.c b/fitz/util_strlcpy.c
index 15b378b2..15b378b2 100644
--- a/base/util_strlcpy.c
+++ b/fitz/util_strlcpy.c
diff --git a/base/util_strsep.c b/fitz/util_strsep.c
index e54903ce..e54903ce 100644
--- a/base/util_strsep.c
+++ b/fitz/util_strsep.c
diff --git a/fitzdraw/Jamfile b/fitzdraw/Jamfile
new file mode 100644
index 00000000..c76d9c6d
--- /dev/null
+++ b/fitzdraw/Jamfile
@@ -0,0 +1,21 @@
+SubDir TOP fitzdraw ;
+
+Library libfitzdraw :
+	glyphcache.c
+	pixmap.c
+	porterduff.c
+	meshdraw.c
+	imagedraw.c
+	imageunpack.c
+	imagescale.c
+	pathscan.c
+	pathfill.c
+	pathstroke.c
+	render.c
+	blendmodes.c
+	;
+
+if $(OSPLAT) = PPC     { Library libfitzdraw : archppc.c ; }
+if $(OSPLAT) = SPARC   { Library libfitzdraw : archsparc.c ; }
+if $(OSPLAT) = X86     { Library libfitzdraw : archx86.c ; }
+
diff --git a/raster/archppc.c b/fitzdraw/archppc.c
index 30dbd780..30dbd780 100644
--- a/raster/archppc.c
+++ b/fitzdraw/archppc.c
diff --git a/raster/archsparc.c b/fitzdraw/archsparc.c
index b78e5a4d..b78e5a4d 100644
--- a/raster/archsparc.c
+++ b/fitzdraw/archsparc.c
diff --git a/raster/archx86.c b/fitzdraw/archx86.c
index 261b8a16..261b8a16 100644
--- a/raster/archx86.c
+++ b/fitzdraw/archx86.c
diff --git a/raster/blendmodes.c b/fitzdraw/blendmodes.c
index f3ba8ac5..f3ba8ac5 100644
--- a/raster/blendmodes.c
+++ b/fitzdraw/blendmodes.c
diff --git a/raster/glyphcache.c b/fitzdraw/glyphcache.c
index fe03524e..fe03524e 100644
--- a/raster/glyphcache.c
+++ b/fitzdraw/glyphcache.c
diff --git a/raster/imagedraw.c b/fitzdraw/imagedraw.c
index 1ad74bf7..1ad74bf7 100644
--- a/raster/imagedraw.c
+++ b/fitzdraw/imagedraw.c
diff --git a/raster/imagescale.c b/fitzdraw/imagescale.c
index f25d4d5a..f25d4d5a 100644
--- a/raster/imagescale.c
+++ b/fitzdraw/imagescale.c
diff --git a/raster/imageunpack.c b/fitzdraw/imageunpack.c
index a07d4f16..a07d4f16 100644
--- a/raster/imageunpack.c
+++ b/fitzdraw/imageunpack.c
diff --git a/raster/meshdraw.c b/fitzdraw/meshdraw.c
index abdcaaa1..abdcaaa1 100644
--- a/raster/meshdraw.c
+++ b/fitzdraw/meshdraw.c
diff --git a/raster/pathfill.c b/fitzdraw/pathfill.c
index 3040e6a3..3040e6a3 100644
--- a/raster/pathfill.c
+++ b/fitzdraw/pathfill.c
diff --git a/raster/pathscan.c b/fitzdraw/pathscan.c
index 0ea46502..0ea46502 100644
--- a/raster/pathscan.c
+++ b/fitzdraw/pathscan.c
diff --git a/raster/pathstroke.c b/fitzdraw/pathstroke.c
index d68f38ed..d68f38ed 100644
--- a/raster/pathstroke.c
+++ b/fitzdraw/pathstroke.c
diff --git a/raster/pixmap.c b/fitzdraw/pixmap.c
index 077009f8..077009f8 100644
--- a/raster/pixmap.c
+++ b/fitzdraw/pixmap.c
diff --git a/raster/porterduff.c b/fitzdraw/porterduff.c
index 8f2b9862..8f2b9862 100644
--- a/raster/porterduff.c
+++ b/fitzdraw/porterduff.c
diff --git a/raster/render.c b/fitzdraw/render.c
index 90ead6a7..90ead6a7 100644
--- a/raster/render.c
+++ b/fitzdraw/render.c
diff --git a/fonts/Jamfile b/fonts/Jamfile
index 869b4bd7..ac3dee2a 100644
--- a/fonts/Jamfile
+++ b/fonts/Jamfile
@@ -1,8 +1,11 @@
 SubDir TOP fonts ;
 
-SubDir TOP fonts droid ;
-GenFile font_cjk.c : hexdump DroidSansFallback.ttf ;
-Library libfonts : font_cjk.c ;
+if ! ( NOCJK in $(DEFINES) )
+{
+    SubDir TOP fonts droid ;
+    GenFile font_cjk.c : hexdump DroidSansFallback.ttf ;
+    Library libfonts : font_cjk.c ;
+}
 
 SubDir TOP fonts ;
 
diff --git a/raster/Jamfile b/raster/Jamfile
deleted file mode 100644
index 6c8d2830..00000000
--- a/raster/Jamfile
+++ /dev/null
@@ -1,21 +0,0 @@
-SubDir TOP raster ;
-
-Library libraster :
-	glyphcache.c
-	pixmap.c
-	porterduff.c
-	meshdraw.c
-	imagedraw.c
-	imageunpack.c
-	imagescale.c
-	pathscan.c
-	pathfill.c
-	pathstroke.c
-	render.c
-	blendmodes.c
-	;
-
-if $(OSPLAT) = PPC     { Library libraster : archppc.c ; }
-if $(OSPLAT) = SPARC   { Library libraster : archsparc.c ; }
-if $(OSPLAT) = X86     { Library libraster : archx86.c ; }
-
diff --git a/stream/Jamfile b/stream/Jamfile
deleted file mode 100644
index 65c08b75..00000000
--- a/stream/Jamfile
+++ /dev/null
@@ -1,47 +0,0 @@
-SubDir TOP stream ;
-
-Library libstream :
-
-	crypt_arc4.c
-	crypt_crc32.c
-	crypt_md5.c
-
-	obj_array.c
-	obj_dict.c
-	obj_parse.c
-	obj_print.c
-	obj_simple.c
-
-	stm_buffer.c
-	stm_filter.c
-	stm_open.c
-	stm_read.c
-	stm_write.c
-	stm_misc.c
-
-	filt_pipeline.c
-	filt_arc4.c
-	filt_null.c
-
-	filt_a85d.c
-	filt_a85e.c
-	filt_ahxd.c
-	filt_ahxe.c
-	filt_dctd.c
-	filt_dcte.c
-	filt_faxd.c
-	filt_faxdtab.c
-	filt_faxe.c
-	filt_faxetab.c
-	filt_flate.c
-	filt_lzwd.c
-	filt_lzwe.c
-	filt_predict.c
-	filt_rld.c
-	filt_rle.c
-
-	;
-
-if $(HAVE_JASPER)   { Library libstream : filt_jpxd.c ; }
-if $(HAVE_JBIG2DEC) { Library libstream : filt_jbig2d.c ; }
-
diff --git a/world/Jamfile b/world/Jamfile
deleted file mode 100644
index 9f53ef0a..00000000
--- a/world/Jamfile
+++ /dev/null
@@ -1,19 +0,0 @@
-SubDir TOP world ;
-
-Library libworld :
-
-	node_toxml.c
-	node_misc1.c
-	node_misc2.c
-	node_optimize.c
-	node_path.c
-	node_text.c
-	node_tree.c
-
-	res_colorspace.c
-	res_font.c
-	res_image.c
-	res_shade.c
-
-	;
-
diff --git a/world/node_tolisp.c b/world/node_tolisp.c
deleted file mode 100644
index 364d2862..00000000
--- a/world/node_tolisp.c
+++ /dev/null
@@ -1,192 +0,0 @@
-#include "fitz-base.h"
-#include "fitz-world.h"
-
-static void indent(int level)
-{
-	while (level--)
-		putchar(' ');
-}
-
-static void lispnode(fz_node *node, int level);
-
-static void lispmeta(fz_metanode *node, int level)
-{
-	fz_node *child;
-	indent(level);
-	printf("(meta ");
-	if (node->name) { fz_debugobj(node->name); }
-	if (node->dict) { printf("\n"); fz_debugobj(node->dict); }
-	printf("\n");
-	for (child = node->super.first; child; child = child->next)
-		lispnode(child, level + 1);
-	indent(level);
-	printf(")\n");
-}
-
-static void lispover(fz_overnode *node, int level)
-{
-	fz_node *child;
-	indent(level);
-	printf("(over\n");
-	for (child = node->super.first; child; child = child->next)
-		lispnode(child, level + 1);
-	indent(level);
-	printf(")\n");
-}
-
-static void lispmask(fz_masknode *node, int level)
-{
-	fz_node *child;
-	indent(level);
-	printf("(mask\n");
-	for (child = node->super.first; child; child = child->next)
-		lispnode(child, level + 1);
-	indent(level);
-	printf(")\n");
-}
-
-static void lispblend(fz_blendnode *node, int level)
-{
-	fz_node *child;
-	indent(level);
-	printf("(blend-%d %d\n", node->mode, node->cs->refs);
-	for (child = node->super.first; child; child = child->next)
-		lispnode(child, level + 1);
-	indent(level);
-	printf(")\n");
-}
-
-static void lisptransform(fz_transformnode *node, int level)
-{
-	indent(level);
-	printf("(transform %g %g %g %g %g %g\n",
-		node->m.a, node->m.b,
-		node->m.c, node->m.d,
-		node->m.e, node->m.f);
-	lispnode(node->super.first, level + 1);
-	indent(level);
-	printf(")\n");
-}
-
-static void lispcolor(fz_colornode *node, int level)
-{
-	int i;
-	indent(level);
-	printf("(color %s ", node->cs->name);
-	for (i = 0; i < node->n; i++)
-		printf("%g ", node->samples[i]);
-	printf(" %d)\n", node->cs->refs);
-}
-
-static void lisplink(fz_linknode *node, int level)
-{
-	indent(level);
-	printf("(link %p %d)\n", node->tree, node->tree->refs);
-}
-
-static void lisppath(fz_pathnode *node, int level)
-{
-	int i;
-
-	indent(level);
-
-	if (node->paint == FZ_STROKE)
-	{
-		printf("(path 'stroke %d %d %g %g ",
-			node->linecap,
-			node->linejoin,
-			node->linewidth,
-			node->miterlimit);
-		if (node->dash)
-		{
-			printf("%g '( ", node->dash->phase);
-			for (i = 0; i < node->dash->len; i++)
-				printf("%g ", node->dash->array[i]);
-			printf(")");
-		}
-		else
-			printf("0 '()");
-	}
-	else
-	{
-		printf("(path '%s", node->paint == FZ_FILL ? "fill" : "eofill");
-	}
-
-	printf("\n");
-	fz_debugpathnode(node);
-
-	indent(level);
-	printf(")\n");
-}
-
-static void lisptext(fz_textnode *node, int level)
-{
-	int i;
-
-	indent(level);
-	printf("(text %s [%g %g %g %g]\n", node->font->name,
-		node->trm.a, node->trm.b, node->trm.c, node->trm.d);
-
-	for (i = 0; i < node->len; i++)
-	{
-		indent(level + 1);
-		if (node->els[i].cid >= 32 && node->els[i].cid < 128)
-			printf("(cid '%c' %g %g)\n", node->els[i].cid, node->els[i].x, node->els[i].y);
-		else
-			printf("(cid <%04x> %g %g)\n", node->els[i].cid, node->els[i].x, node->els[i].y);
-	}
-
-	indent(level);
-	printf(")\n");
-}
-
-static void lispimage(fz_imagenode *node, int level)
-{
-	fz_image *image = node->image;
-	indent(level);
-	printf("(image %dx%d %d+%d %d)\n", image->w, image->h, image->n, image->a, image->refs);
-}
-
-static void lispshade(fz_shadenode *node, int level)
-{
-	indent(level);
-	printf("(shade %d)\n", node->shade->refs);
-}
-
-static void lispnode(fz_node *node, int level)
-{
-	if (!node)
-	{
-		indent(level);
-		printf("(nil)\n");
-		return;
-	}
-
-	switch (node->kind)
-	{
-	case FZ_NMETA: lispmeta((fz_metanode*)node, level); break;
-	case FZ_NOVER: lispover((fz_overnode*)node, level); break;
-	case FZ_NMASK: lispmask((fz_masknode*)node, level); break;
-	case FZ_NBLEND: lispblend((fz_blendnode*)node, level); break;
-	case FZ_NTRANSFORM: lisptransform((fz_transformnode*)node, level); break;
-	case FZ_NCOLOR: lispcolor((fz_colornode*)node, level); break;
-	case FZ_NPATH: lisppath((fz_pathnode*)node, level); break;
-	case FZ_NTEXT: lisptext((fz_textnode*)node, level); break;
-	case FZ_NIMAGE: lispimage((fz_imagenode*)node, level); break;
-	case FZ_NSHADE: lispshade((fz_shadenode*)node, level); break;
-	case FZ_NLINK: lisplink((fz_linknode*)node, level); break;
-	}
-}
-
-void
-fz_debugnode(fz_node *node)
-{
-	lispnode(node, 0);
-}
-
-void
-fz_debugtree(fz_tree *tree)
-{
-	lispnode(tree->root, 0);
-}
-