merged
authorStian Soiland-Reyes <soiland-reyes@cs.manchester.ac.uk>
Tue, 21 Feb 2012 10:30:56 +0000
changeset 1626 9b7c09f8b2ba
parent 1625 5ed1401c6b75 (current diff)
parent 1624 d711911bfb6a (diff)
child 1628 80492e77812c
child 1629 1357fcf3efbf
merged
--- a/model/working-copy/Makefile	Tue Feb 21 10:30:37 2012 +0000
+++ b/model/working-copy/Makefile	Tue Feb 21 10:30:56 2012 +0000
@@ -6,12 +6,12 @@
 
 make.glossary.js: glossary.html Makefile
 	@$(MAKE) OUT.JS=$(OUT.JS) documentation
-	@$(MAKE) OUT.JS=$(OUT.JS) hgid
+	@$(MAKE) OUT.JS=$(OUT.JS) hgGlossaryId
 	@echo "glossary_string= " >> $(OUT.JS)
 	cat $(IN.HTML) | awk '{ print "'\''"  $$0 " '\'' + " }' >> $(OUT.JS)
 	echo "' ' ;" >> $(OUT.JS)
 
-hgid:
+hgGlossaryId:
 	@echo "glossary_hg='http://dvcs.w3.org/hg/prov/file/$(HGID)/model/working-copy/glossary.html';"  >> $(OUT.JS)
 
 documentation:
@@ -34,9 +34,23 @@
 	echo "<html>" > all-divs.html
 	xpath out01 .//div[@class] >> all-divs.html
 	echo "</html>" >> all-divs.html
+	cat all-divs.html | sed -e "s/\'/\\\'/g" > all-divs2.html
+	$(MAKE) make.all-divs.js
 
-make.all-divs.js: all-divs.html Makefile
-	$(MAKE) OUT.JS=all-divs.js IN.HTML=all-divs.html make.glossary.js
+make.all-divs.js: all-divs2.html Makefile
+	$(MAKE) OUT.JS=all-divs.js IN.HTML=all-divs2.html make.divs.js
+
+hgDivsId:
+	@echo "divs_hg='http://dvcs.w3.org/hg/prov/file/$(HGID)/model/working-copy/towards-wd4.html';"  >> $(OUT.JS)
+
+make.divs.js: 
+	@$(MAKE) OUT.JS=$(OUT.JS) documentation
+	@$(MAKE) OUT.JS=$(OUT.JS) hgDivsId
+	@echo "divs_string= " >> $(OUT.JS)
+	cat $(IN.HTML) | awk '{ print "'\''"  $$0 " '\'' + " }' >> $(OUT.JS)
+	echo "' ' ;" >> $(OUT.JS)
+
+
 
 
 
--- a/model/working-copy/glossary.js	Tue Feb 21 10:30:37 2012 +0000
+++ b/model/working-copy/glossary.js	Tue Feb 21 10:30:56 2012 +0000
@@ -3,7 +3,7 @@
 //  with <script src="glossary.js" class="remove"></script>
 //Insert glossary definitions with the following 
 // <div class="glossary-ref" ref="glossary-generation"></div>
-glossary_hg='http://dvcs.w3.org/hg/prov/file/12ca0ec89610/model/working-copy/glossary.html';
+glossary_hg='http://dvcs.w3.org/hg/prov/file/0523d130a6d7/model/working-copy/glossary.html';
 glossary_string= 
 ' ' + 
 '<html> ' +