diff -u -r1.27 -r1.28
--- Makefile	3 May 2010 21:21:49 -0000	1.27
+++ Makefile	27 Jan 2011 00:23:02 -0000	1.28
@@ -1,4 +1,4 @@

-# $Id: Makefile,v 1.27 2010/05/03 21:21:49 jeremy Exp $

+# $Id: Makefile,v 1.28 2011/01/27 00:23:02 jeremy Exp $

 
 #
 # Makefile using GeomConverter and shell tools to

@@ -71,30 +71,32 @@

 	echo ; \
 	echo "build          - rebuild single detector"; \
 	echo "cleanup        - make fresh copy of detector"; \

-	echo "cvs_commit     - commit changes to single detector"; \
-	echo "dawn           - generate prim file for DAWN for single detector"; \

+	echo "cvs_commit     - commit changes"; \
+	echo "dawn           - generate prim file for DAWN"; \

 	echo "dawncut        - generate all dawncut"; \
 	echo "dawncut_xy     - dawncut in xy plane"; \
 	echo "dawncut_zy     - dawncut in zy plane"; \
 	echo "dawncut_zx     - dawncut in zx plane"; \
 	echo "g4heprep       - make Geant4 heprep"; \

-	echo "gdml           - make GDML file for single detector"; \
-	echo "godl           - make GODL file for single detector"; \
-	echo "heprep         - make HepRep file for single detector"; \
-	echo "lcdd           - make LCDD file for single detector"; \

+	echo "gdml           - make GDML file"; \
+	echo "godl           - make GODL file"; \
+	echo "heprep         - make HepRep file"; \
+	echo "lcdd           - make LCDD file"; \
+	echo "html           - make an HTML information page"; \
+        echo "svg            - make an SVG quartile view"; \

 	echo "pandora        - make slicPandora geometry file for single detector"; \
 	echo "new            - create a new detector"; \
 	echo "ogl            - load the LCDD into SLIC and start OpenGL viewer"; \

-	echo "olap           - check a single detector for overlaps"; \

+	echo "olap           - check for overlaps"; \

 	echo "mkdir          - make directory for new detector"; \
 	echo "oiv            - load LCDD file into Geant4 OpenInventor viewer"; \
 	echo "properties     - create detector.properties file for single detector"; \
 	echo "slic           - load the LCDD file into SLIC"; \
 	echo "template       - copy template files to new detector dir"; \
 	echo "tree           - output drawTree command to file"; \

-	echo "update         - update single detector to WWW"; \
-	echo "vrml           - make VRML2 file for single detector"; \
-	echo "zip            - create zip file for single detector"; \

+	echo "update         - update single detector lcsim.org/detectors"; \
+	echo "vrml           - make VRML2 file"; \
+	echo "zip            - create zip file"; \

 	echo ; \
 	echo "COMMANDS ON ALL DETECTORS"; \
 	echo ; \

@@ -200,6 +202,16 @@

 	@for detector in $(DETECTORS); do \
 	$(MAKE) zip DETECTOR=$$detector; done
 

+# Create the html page for each detector.
+html_all:
+	@for detector in $(DETECTORS); do \
+	$(MAKE) html DETECTOR=$$detector; done
+
+# Create the SVG for each detector.
+svg_all:
+	@for detector in $(DETECTORS); do \
+	$(MAKE) svg DETECTOR=$$detector; done
+

 # Cleanup all detectors.
 cleanup_all:
 	@for detector in $(DETECTORS); do \

@@ -295,7 +307,7 @@

 # Generate a VRML file.
 vrml:
 	@$(SLICBIN) -g ./detectors/$(DETECTOR)/$(DETECTOR).lcdd -m ./g4macros/vrml.mac &>/dev/null; \

-	mv g4_00.wrl ./detectors/$(DETECTOR)/$(DETECTOR).wrl; \

+	mv detector.wrl ./detectors/$(DETECTOR)/$(DETECTOR).wrl; \

 	echo "Created ./detectors/$(DETECTOR)/$(DETECTOR).wrl"
 
 # Check a detector for overlaps.

@@ -324,6 +336,16 @@

 	@java -jar $(GEOMCONVERTER) -o godl ./detectors/$(DETECTOR)/compact.xml ./detectors/$(DETECTOR)/$(DETECTOR).godl; \
 	echo "Created ./detectors/$(DETECTOR)/$(DETECTOR).godl"
 

+# Create HTML page using GeomConverter.
+html:
+	@$(JAVA) -jar $(GEOMCONVERTER) -o html ./detectors/$(DETECTOR)/compact.xml ./detectors/$(DETECTOR)/$(DETECTOR).html; \
+	echo "Created ./detectors/$(DETECTOR)/$(DETECTOR).html"
+
+# Create SVG file using GeomConverter.
+svg:
+	@$(JAVA) -jar $(GEOMCONVERTER) -o svg ./detectors/$(DETECTOR)/compact.xml ./detectors/$(DETECTOR)/$(DETECTOR).svg; \
+	echo "Created ./detectors/$(DETECTOR)/$(DETECTOR).svg"
+

 # Commit changes to LCDetectors cvs for a single detector.
 cvs_commit:
 	@if [ -d detectors/$(DETECTOR) ]; then cd detectors/$(DETECTOR) && cvs commit -m "Updates to $(DETECTOR) detector."; fi