[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz metacode/pegboard.py metacode/uml.py metaco...
|
From: |
Asko Soukka |
|
Subject: |
[Gzz-commits] gzz metacode/pegboard.py metacode/uml.py metaco... |
|
Date: |
Wed, 18 Dec 2002 06:37:07 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Asko Soukka <address@hidden> 02/12/18 06:37:00
Modified files:
metacode : pegboard.py uml.py umldoc.py umlrst.py
umltool.py
doc : Gzz_architecture.html
doc/pegboard : .cvsignore
doc/pegboard/1001: .cvsignore
doc/pegboard/1004: .cvsignore
doc/pegboard/1005: .cvsignore
doc/pegboard/1006: .cvsignore
doc/pegboard/1007: .cvsignore
doc/pegboard/1008: .cvsignore
doc/pegboard/1009: .cvsignore
doc/pegboard/1010: .cvsignore
doc/pegboard/1011: .cvsignore
doc/pegboard/1012: .cvsignore
doc/pegboard/1013: .cvsignore
doc/pegboard/1014: .cvsignore
doc/pegboard/1015: .cvsignore
doc/pegboard/1016: .cvsignore
doc/pegboard/1018: .cvsignore
doc/pegboard/1019: .cvsignore
doc/pegboard/1020: .cvsignore
doc/pegboard/1021: .cvsignore
doc/pegboard/1022: .cvsignore
doc/pegboard/201: .cvsignore
doc/pegboard/async_storm--benja: .cvsignore
doc/pegboard/box_cs--tjl: .cvsignore
doc/pegboard/bug_test--tjl: .cvsignore
doc/pegboard/bug_test_rst--benja: .cvsignore
doc/pegboard/cellview_naming--benja: .cvsignore
doc/pegboard/chug_shear_twirl--benja: .cvsignore
doc/pegboard/containment--benja: .cvsignore
doc/pegboard/diceable--tjl: .cvsignore
doc/pegboard/email_storage--marc: .cvsignore
doc/pegboard/gfxdemos_framework--tjl: .cvsignore
doc/pegboard/grizzly_bear--benja: .cvsignore
doc/pegboard/miniblocks--benja: .cvsignore
doc/pegboard/null_cs_api--tjl: .cvsignore
doc/pegboard/obsless_get_enfilade--benja: .cvsignore
doc/pegboard/prefix_argument--benja: .cvsignore
doc/pegboard/pts_content_types--marc: .cvsignore
doc/pegboard/search_bindings--benja: .cvsignore
doc/pegboard/styled_text--benja: .cvsignore
doc/pegboard/textstyle_getwidth--humppake: .cvsignore
doc/pegboard/view_split--tjl: .cvsignore
doc/pegboard/vob_considerations--benja: .cvsignore
doc/pegboard/vobcoorder_culling--humppake: .cvsignore
doc/pegboard/vobcoorder_fontscale--tjl: .cvsignore
doc/pegboard/vobcoorder_generator--mudyc: .cvsignore
doc/pegboard/vobcoorder_isActive--tjl: .cvsignore
doc/pegboard/vobcoorder_parents--tjl: .cvsignore
doc/pegboard/vobscene_hierarchies_clicks--tjl: .cvsignore
doc/pegboard/vobscene_interp--tjl: .cvsignore
doc/pegboard/vobscene_put--tjl: .cvsignore
doc/pegboard/vobscene_twids--tjl: .cvsignore
doc/pegboard/w2sx--tjl: .cvsignore
doc/pegboard/xu_link_space--benja: .cvsignore
doc/uml : .cvsignore Makefile
doc/uml/gl : .cvsignore Makefile
Documentation/misc/uml: Makefile
Removed files:
metacode : umlpeg.py
Log message:
Fixing umldoc, *.gen.foo postfix for generated files.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/pegboard.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/uml.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umldoc.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umlrst.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/umltool.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/Gzz_architecture.html.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/.cvsignore.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1001/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1004/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1005/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1006/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1007/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1008/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1009/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1010/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1011/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1012/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1013/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1014/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1015/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1016/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1018/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1019/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1020/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1021/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1022/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/201/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/async_storm--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/box_cs--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/bug_test--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/bug_test_rst--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/cellview_naming--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/chug_shear_twirl--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/containment--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/diceable--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/email_storage--marc/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/gfxdemos_framework--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/grizzly_bear--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/miniblocks--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/null_cs_api--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/obsless_get_enfilade--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/prefix_argument--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/pts_content_types--marc/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/search_bindings--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/styled_text--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/textstyle_getwidth--humppake/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/view_split--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vob_considerations--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vobcoorder_culling--humppake/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vobcoorder_fontscale--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vobcoorder_generator--mudyc/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vobcoorder_isActive--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vobcoorder_parents--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vobscene_hierarchies_clicks--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vobscene_interp--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vobscene_put--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/vobscene_twids--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/w2sx--tjl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/xu_link_space--benja/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/uml/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/uml/Makefile.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/uml/gl/.cvsignore.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/uml/gl/Makefile.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/Documentation/misc/uml/Makefile.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
Patches:
Index: gzz/Documentation/misc/uml/Makefile
diff -u gzz/Documentation/misc/uml/Makefile:1.4
gzz/Documentation/misc/uml/Makefile:1.5
--- gzz/Documentation/misc/uml/Makefile:1.4 Tue Dec 17 09:23:35 2002
+++ gzz/Documentation/misc/uml/Makefile Wed Dec 18 06:37:00 2002
@@ -6,9 +6,9 @@
echo $(RST_TARGETS)
clean:
- rm -f *.html
+ rm -f *.gen.html
%.html: %.rst
- make -C ../../../ rst2html RST="Documentation/misc/uml/$*.rst"
+ make -C ../../../ umldoc INPUT="Documentation/misc/uml/$*.rst"
Index: gzz/doc/Gzz_architecture.html
diff -u gzz/doc/Gzz_architecture.html:1.18 gzz/doc/Gzz_architecture.html:1.19
--- gzz/doc/Gzz_architecture.html:1.18 Mon Oct 14 10:03:06 2002
+++ gzz/doc/Gzz_architecture.html Wed Dec 18 06:36:54 2002
@@ -13,7 +13,7 @@
<p>This document is hyperlinked to the generated Javadocs through the UML
diagrams. Pending changes are documented on the <a
- href="pegboard/pegboard.html">PEGboard</a>.<br>
+ href="pegboard/pegboard.gen.html">PEGboard</a>.<br>
</p>
<p>The overall division of Gzz is shown in the package diagram below. <span
Index: gzz/doc/pegboard/.cvsignore
diff -u gzz/doc/pegboard/.cvsignore:1.7 gzz/doc/pegboard/.cvsignore:1.8
--- gzz/doc/pegboard/.cvsignore:1.7 Tue Nov 12 11:53:04 2002
+++ gzz/doc/pegboard/.cvsignore Wed Dec 18 06:36:54 2002
@@ -1 +1 @@
-pegboard.html
+pegboard.gen.html
Index: gzz/doc/pegboard/1001/.cvsignore
diff -u gzz/doc/pegboard/1001/.cvsignore:1.1
gzz/doc/pegboard/1001/.cvsignore:1.2
--- gzz/doc/pegboard/1001/.cvsignore:1.1 Tue Nov 12 11:56:16 2002
+++ gzz/doc/pegboard/1001/.cvsignore Wed Dec 18 06:36:54 2002
@@ -1 +1 @@
-PEG_1001.html
+PEG_1001.gen.html
Index: gzz/doc/pegboard/1004/.cvsignore
diff -u gzz/doc/pegboard/1004/.cvsignore:1.1
gzz/doc/pegboard/1004/.cvsignore:1.2
--- gzz/doc/pegboard/1004/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1004/.cvsignore Wed Dec 18 06:36:55 2002
@@ -1 +1 @@
-PEG_1004.html
+PEG_1004.gen.html
Index: gzz/doc/pegboard/1005/.cvsignore
diff -u gzz/doc/pegboard/1005/.cvsignore:1.1
gzz/doc/pegboard/1005/.cvsignore:1.2
--- gzz/doc/pegboard/1005/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1005/.cvsignore Wed Dec 18 06:36:55 2002
@@ -1 +1 @@
-PEG_1005.html
+PEG_1005.gen.html
Index: gzz/doc/pegboard/1006/.cvsignore
diff -u gzz/doc/pegboard/1006/.cvsignore:1.1
gzz/doc/pegboard/1006/.cvsignore:1.2
--- gzz/doc/pegboard/1006/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1006/.cvsignore Wed Dec 18 06:36:55 2002
@@ -1 +1 @@
-PEG_1006.html
+PEG_1006.gen.html
Index: gzz/doc/pegboard/1007/.cvsignore
diff -u gzz/doc/pegboard/1007/.cvsignore:1.1
gzz/doc/pegboard/1007/.cvsignore:1.2
--- gzz/doc/pegboard/1007/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1007/.cvsignore Wed Dec 18 06:36:55 2002
@@ -1 +1 @@
-PEG_1007.html
+PEG_1007.gen.html
Index: gzz/doc/pegboard/1008/.cvsignore
diff -u gzz/doc/pegboard/1008/.cvsignore:1.1
gzz/doc/pegboard/1008/.cvsignore:1.2
--- gzz/doc/pegboard/1008/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1008/.cvsignore Wed Dec 18 06:36:55 2002
@@ -1 +1 @@
-PEG_1008.html
+PEG_1008.gen.html
Index: gzz/doc/pegboard/1009/.cvsignore
diff -u gzz/doc/pegboard/1009/.cvsignore:1.1
gzz/doc/pegboard/1009/.cvsignore:1.2
--- gzz/doc/pegboard/1009/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1009/.cvsignore Wed Dec 18 06:36:55 2002
@@ -1 +1 @@
-PEG_1009.html
+PEG_1009.gen.html
Index: gzz/doc/pegboard/1010/.cvsignore
diff -u gzz/doc/pegboard/1010/.cvsignore:1.1
gzz/doc/pegboard/1010/.cvsignore:1.2
--- gzz/doc/pegboard/1010/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1010/.cvsignore Wed Dec 18 06:36:55 2002
@@ -1 +1 @@
-PEG_1010.html
+PEG_1010.gen.html
Index: gzz/doc/pegboard/1011/.cvsignore
diff -u gzz/doc/pegboard/1011/.cvsignore:1.1
gzz/doc/pegboard/1011/.cvsignore:1.2
--- gzz/doc/pegboard/1011/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1011/.cvsignore Wed Dec 18 06:36:55 2002
@@ -1 +1 @@
-PEG_1011.html
+PEG_1011.gen.html
Index: gzz/doc/pegboard/1012/.cvsignore
diff -u gzz/doc/pegboard/1012/.cvsignore:1.1
gzz/doc/pegboard/1012/.cvsignore:1.2
--- gzz/doc/pegboard/1012/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1012/.cvsignore Wed Dec 18 06:36:55 2002
@@ -1 +1 @@
-PEG_1012.html
+PEG_1012.gen.html
Index: gzz/doc/pegboard/1013/.cvsignore
diff -u gzz/doc/pegboard/1013/.cvsignore:1.1
gzz/doc/pegboard/1013/.cvsignore:1.2
--- gzz/doc/pegboard/1013/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1013/.cvsignore Wed Dec 18 06:36:56 2002
@@ -1 +1 @@
-PEG_1013.html
+PEG_1013.gen.html
Index: gzz/doc/pegboard/1014/.cvsignore
diff -u gzz/doc/pegboard/1014/.cvsignore:1.1
gzz/doc/pegboard/1014/.cvsignore:1.2
--- gzz/doc/pegboard/1014/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1014/.cvsignore Wed Dec 18 06:36:56 2002
@@ -1 +1 @@
-PEG_1014.html
+PEG_1014.gen.html
Index: gzz/doc/pegboard/1015/.cvsignore
diff -u gzz/doc/pegboard/1015/.cvsignore:1.1
gzz/doc/pegboard/1015/.cvsignore:1.2
--- gzz/doc/pegboard/1015/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1015/.cvsignore Wed Dec 18 06:36:56 2002
@@ -1 +1 @@
-PEG_1015.html
+PEG_1015.gen.html
Index: gzz/doc/pegboard/1016/.cvsignore
diff -u gzz/doc/pegboard/1016/.cvsignore:1.1
gzz/doc/pegboard/1016/.cvsignore:1.2
--- gzz/doc/pegboard/1016/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1016/.cvsignore Wed Dec 18 06:36:56 2002
@@ -1 +1 @@
-PEG_1016.html
+PEG_1016.gen.html
Index: gzz/doc/pegboard/1018/.cvsignore
diff -u gzz/doc/pegboard/1018/.cvsignore:1.1
gzz/doc/pegboard/1018/.cvsignore:1.2
--- gzz/doc/pegboard/1018/.cvsignore:1.1 Tue Nov 12 11:56:17 2002
+++ gzz/doc/pegboard/1018/.cvsignore Wed Dec 18 06:36:56 2002
@@ -1 +1 @@
-PEG_1018.html
+PEG_1018.gen.html
Index: gzz/doc/pegboard/1019/.cvsignore
diff -u gzz/doc/pegboard/1019/.cvsignore:1.1
gzz/doc/pegboard/1019/.cvsignore:1.2
--- gzz/doc/pegboard/1019/.cvsignore:1.1 Tue Nov 12 11:56:18 2002
+++ gzz/doc/pegboard/1019/.cvsignore Wed Dec 18 06:36:56 2002
@@ -1 +1 @@
-PEG_1019.html
+PEG_1019.gen.html
Index: gzz/doc/pegboard/1020/.cvsignore
diff -u gzz/doc/pegboard/1020/.cvsignore:1.1
gzz/doc/pegboard/1020/.cvsignore:1.2
--- gzz/doc/pegboard/1020/.cvsignore:1.1 Tue Nov 12 11:56:18 2002
+++ gzz/doc/pegboard/1020/.cvsignore Wed Dec 18 06:36:56 2002
@@ -1 +1 @@
-PEG_1020.html
+PEG_1020.gen.html
Index: gzz/doc/pegboard/1021/.cvsignore
diff -u gzz/doc/pegboard/1021/.cvsignore:1.1
gzz/doc/pegboard/1021/.cvsignore:1.2
--- gzz/doc/pegboard/1021/.cvsignore:1.1 Tue Nov 12 11:56:18 2002
+++ gzz/doc/pegboard/1021/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-click.html
+click.gen.html
Index: gzz/doc/pegboard/1022/.cvsignore
diff -u gzz/doc/pegboard/1022/.cvsignore:1.1
gzz/doc/pegboard/1022/.cvsignore:1.2
--- gzz/doc/pegboard/1022/.cvsignore:1.1 Tue Nov 12 11:56:18 2002
+++ gzz/doc/pegboard/1022/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-keys.html
+keys.gen.html
Index: gzz/doc/pegboard/201/.cvsignore
diff -u gzz/doc/pegboard/201/.cvsignore:1.1 gzz/doc/pegboard/201/.cvsignore:1.2
--- gzz/doc/pegboard/201/.cvsignore:1.1 Tue Nov 12 11:56:18 2002
+++ gzz/doc/pegboard/201/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-PEG_201.html
+PEG_201.gen.html
Index: gzz/doc/pegboard/async_storm--benja/.cvsignore
diff -u gzz/doc/pegboard/async_storm--benja/.cvsignore:1.1
gzz/doc/pegboard/async_storm--benja/.cvsignore:1.2
--- gzz/doc/pegboard/async_storm--benja/.cvsignore:1.1 Sun Nov 24 09:45:18 2002
+++ gzz/doc/pegboard/async_storm--benja/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/box_cs--tjl/.cvsignore
diff -u gzz/doc/pegboard/box_cs--tjl/.cvsignore:1.1
gzz/doc/pegboard/box_cs--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/box_cs--tjl/.cvsignore:1.1 Tue Nov 12 11:56:18 2002
+++ gzz/doc/pegboard/box_cs--tjl/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/bug_test--tjl/.cvsignore
diff -u gzz/doc/pegboard/bug_test--tjl/.cvsignore:1.1
gzz/doc/pegboard/bug_test--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/bug_test--tjl/.cvsignore:1.1 Mon Nov 18 04:20:04 2002
+++ gzz/doc/pegboard/bug_test--tjl/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/bug_test_rst--benja/.cvsignore
diff -u gzz/doc/pegboard/bug_test_rst--benja/.cvsignore:1.1
gzz/doc/pegboard/bug_test_rst--benja/.cvsignore:1.2
--- gzz/doc/pegboard/bug_test_rst--benja/.cvsignore:1.1 Fri Nov 22 19:35:57 2002
+++ gzz/doc/pegboard/bug_test_rst--benja/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/cellview_naming--benja/.cvsignore
diff -u gzz/doc/pegboard/cellview_naming--benja/.cvsignore:1.1
gzz/doc/pegboard/cellview_naming--benja/.cvsignore:1.2
--- gzz/doc/pegboard/cellview_naming--benja/.cvsignore:1.1 Fri Nov 15
10:02:28 2002
+++ gzz/doc/pegboard/cellview_naming--benja/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/chug_shear_twirl--benja/.cvsignore
diff -u gzz/doc/pegboard/chug_shear_twirl--benja/.cvsignore:1.1
gzz/doc/pegboard/chug_shear_twirl--benja/.cvsignore:1.2
--- gzz/doc/pegboard/chug_shear_twirl--benja/.cvsignore:1.1 Tue Nov 12
11:56:19 2002
+++ gzz/doc/pegboard/chug_shear_twirl--benja/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/containment--benja/.cvsignore
diff -u gzz/doc/pegboard/containment--benja/.cvsignore:1.1
gzz/doc/pegboard/containment--benja/.cvsignore:1.2
--- gzz/doc/pegboard/containment--benja/.cvsignore:1.1 Tue Nov 12 11:56:19 2002
+++ gzz/doc/pegboard/containment--benja/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/diceable--tjl/.cvsignore
diff -u gzz/doc/pegboard/diceable--tjl/.cvsignore:1.1
gzz/doc/pegboard/diceable--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/diceable--tjl/.cvsignore:1.1 Mon Dec 9 04:14:58 2002
+++ gzz/doc/pegboard/diceable--tjl/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/email_storage--marc/.cvsignore
diff -u gzz/doc/pegboard/email_storage--marc/.cvsignore:1.1
gzz/doc/pegboard/email_storage--marc/.cvsignore:1.2
--- gzz/doc/pegboard/email_storage--marc/.cvsignore:1.1 Tue Nov 12 11:56:19 2002
+++ gzz/doc/pegboard/email_storage--marc/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/gfxdemos_framework--tjl/.cvsignore
diff -u gzz/doc/pegboard/gfxdemos_framework--tjl/.cvsignore:1.1
gzz/doc/pegboard/gfxdemos_framework--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/gfxdemos_framework--tjl/.cvsignore:1.1 Thu Dec 5
15:16:42 2002
+++ gzz/doc/pegboard/gfxdemos_framework--tjl/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/grizzly_bear--benja/.cvsignore
diff -u gzz/doc/pegboard/grizzly_bear--benja/.cvsignore:1.1
gzz/doc/pegboard/grizzly_bear--benja/.cvsignore:1.2
--- gzz/doc/pegboard/grizzly_bear--benja/.cvsignore:1.1 Tue Nov 12 11:56:19 2002
+++ gzz/doc/pegboard/grizzly_bear--benja/.cvsignore Wed Dec 18 06:36:57 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/miniblocks--benja/.cvsignore
diff -u gzz/doc/pegboard/miniblocks--benja/.cvsignore:1.1
gzz/doc/pegboard/miniblocks--benja/.cvsignore:1.2
--- gzz/doc/pegboard/miniblocks--benja/.cvsignore:1.1 Tue Nov 12 11:56:19 2002
+++ gzz/doc/pegboard/miniblocks--benja/.cvsignore Wed Dec 18 06:36:58 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/null_cs_api--tjl/.cvsignore
diff -u gzz/doc/pegboard/null_cs_api--tjl/.cvsignore:1.1
gzz/doc/pegboard/null_cs_api--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/null_cs_api--tjl/.cvsignore:1.1 Tue Nov 12 11:56:19 2002
+++ gzz/doc/pegboard/null_cs_api--tjl/.cvsignore Wed Dec 18 06:36:58 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/obsless_get_enfilade--benja/.cvsignore
diff -u gzz/doc/pegboard/obsless_get_enfilade--benja/.cvsignore:1.1
gzz/doc/pegboard/obsless_get_enfilade--benja/.cvsignore:1.2
--- gzz/doc/pegboard/obsless_get_enfilade--benja/.cvsignore:1.1 Tue Nov 26
01:30:33 2002
+++ gzz/doc/pegboard/obsless_get_enfilade--benja/.cvsignore Wed Dec 18
06:36:58 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/prefix_argument--benja/.cvsignore
diff -u gzz/doc/pegboard/prefix_argument--benja/.cvsignore:1.1
gzz/doc/pegboard/prefix_argument--benja/.cvsignore:1.2
--- gzz/doc/pegboard/prefix_argument--benja/.cvsignore:1.1 Tue Nov 12
11:56:19 2002
+++ gzz/doc/pegboard/prefix_argument--benja/.cvsignore Wed Dec 18 06:36:58 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/pts_content_types--marc/.cvsignore
diff -u gzz/doc/pegboard/pts_content_types--marc/.cvsignore:1.1
gzz/doc/pegboard/pts_content_types--marc/.cvsignore:1.2
--- gzz/doc/pegboard/pts_content_types--marc/.cvsignore:1.1 Tue Nov 12
11:56:20 2002
+++ gzz/doc/pegboard/pts_content_types--marc/.cvsignore Wed Dec 18 06:36:58 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/search_bindings--benja/.cvsignore
diff -u gzz/doc/pegboard/search_bindings--benja/.cvsignore:1.1
gzz/doc/pegboard/search_bindings--benja/.cvsignore:1.2
--- gzz/doc/pegboard/search_bindings--benja/.cvsignore:1.1 Tue Nov 12
11:56:20 2002
+++ gzz/doc/pegboard/search_bindings--benja/.cvsignore Wed Dec 18 06:36:58 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/styled_text--benja/.cvsignore
diff -u gzz/doc/pegboard/styled_text--benja/.cvsignore:1.1
gzz/doc/pegboard/styled_text--benja/.cvsignore:1.2
--- gzz/doc/pegboard/styled_text--benja/.cvsignore:1.1 Tue Nov 12 11:56:20 2002
+++ gzz/doc/pegboard/styled_text--benja/.cvsignore Wed Dec 18 06:36:58 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/textstyle_getwidth--humppake/.cvsignore
diff -u gzz/doc/pegboard/textstyle_getwidth--humppake/.cvsignore:1.1
gzz/doc/pegboard/textstyle_getwidth--humppake/.cvsignore:1.2
--- gzz/doc/pegboard/textstyle_getwidth--humppake/.cvsignore:1.1 Mon Nov
25 23:45:03 2002
+++ gzz/doc/pegboard/textstyle_getwidth--humppake/.cvsignore Wed Dec 18
06:36:58 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/view_split--tjl/.cvsignore
diff -u gzz/doc/pegboard/view_split--tjl/.cvsignore:1.1
gzz/doc/pegboard/view_split--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/view_split--tjl/.cvsignore:1.1 Tue Nov 12 11:56:20 2002
+++ gzz/doc/pegboard/view_split--tjl/.cvsignore Wed Dec 18 06:36:58 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/vob_considerations--benja/.cvsignore
diff -u gzz/doc/pegboard/vob_considerations--benja/.cvsignore:1.1
gzz/doc/pegboard/vob_considerations--benja/.cvsignore:1.2
--- gzz/doc/pegboard/vob_considerations--benja/.cvsignore:1.1 Mon Dec 9
04:14:58 2002
+++ gzz/doc/pegboard/vob_considerations--benja/.cvsignore Wed Dec 18
06:36:59 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/vobcoorder_culling--humppake/.cvsignore
diff -u gzz/doc/pegboard/vobcoorder_culling--humppake/.cvsignore:1.1
gzz/doc/pegboard/vobcoorder_culling--humppake/.cvsignore:1.2
--- gzz/doc/pegboard/vobcoorder_culling--humppake/.cvsignore:1.1 Tue Nov
12 11:56:20 2002
+++ gzz/doc/pegboard/vobcoorder_culling--humppake/.cvsignore Wed Dec 18
06:36:59 2002
@@ -1,2 +1,2 @@
-impl.html
-peg.html
+impl.gen.html
+peg.gen.html
Index: gzz/doc/pegboard/vobcoorder_fontscale--tjl/.cvsignore
diff -u gzz/doc/pegboard/vobcoorder_fontscale--tjl/.cvsignore:1.1
gzz/doc/pegboard/vobcoorder_fontscale--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/vobcoorder_fontscale--tjl/.cvsignore:1.1 Tue Nov 12
11:56:20 2002
+++ gzz/doc/pegboard/vobcoorder_fontscale--tjl/.cvsignore Wed Dec 18
06:36:59 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/vobcoorder_generator--mudyc/.cvsignore
diff -u gzz/doc/pegboard/vobcoorder_generator--mudyc/.cvsignore:1.1
gzz/doc/pegboard/vobcoorder_generator--mudyc/.cvsignore:1.2
--- gzz/doc/pegboard/vobcoorder_generator--mudyc/.cvsignore:1.1 Wed Nov 27
05:39:05 2002
+++ gzz/doc/pegboard/vobcoorder_generator--mudyc/.cvsignore Wed Dec 18
06:36:59 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/vobcoorder_isActive--tjl/.cvsignore
diff -u gzz/doc/pegboard/vobcoorder_isActive--tjl/.cvsignore:1.1
gzz/doc/pegboard/vobcoorder_isActive--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/vobcoorder_isActive--tjl/.cvsignore:1.1 Tue Nov 12
11:56:20 2002
+++ gzz/doc/pegboard/vobcoorder_isActive--tjl/.cvsignore Wed Dec 18
06:36:59 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/vobcoorder_parents--tjl/.cvsignore
diff -u gzz/doc/pegboard/vobcoorder_parents--tjl/.cvsignore:1.1
gzz/doc/pegboard/vobcoorder_parents--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/vobcoorder_parents--tjl/.cvsignore:1.1 Tue Nov 12
11:56:20 2002
+++ gzz/doc/pegboard/vobcoorder_parents--tjl/.cvsignore Wed Dec 18 06:36:59 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/vobscene_hierarchies_clicks--tjl/.cvsignore
diff -u gzz/doc/pegboard/vobscene_hierarchies_clicks--tjl/.cvsignore:1.1
gzz/doc/pegboard/vobscene_hierarchies_clicks--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/vobscene_hierarchies_clicks--tjl/.cvsignore:1.1 Fri Nov
15 10:03:37 2002
+++ gzz/doc/pegboard/vobscene_hierarchies_clicks--tjl/.cvsignore Wed Dec
18 06:36:59 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/vobscene_interp--tjl/.cvsignore
diff -u gzz/doc/pegboard/vobscene_interp--tjl/.cvsignore:1.1
gzz/doc/pegboard/vobscene_interp--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/vobscene_interp--tjl/.cvsignore:1.1 Tue Dec 17
02:01:45 2002
+++ gzz/doc/pegboard/vobscene_interp--tjl/.cvsignore Wed Dec 18 06:36:59 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/vobscene_put--tjl/.cvsignore
diff -u gzz/doc/pegboard/vobscene_put--tjl/.cvsignore:1.1
gzz/doc/pegboard/vobscene_put--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/vobscene_put--tjl/.cvsignore:1.1 Wed Dec 11 03:49:20 2002
+++ gzz/doc/pegboard/vobscene_put--tjl/.cvsignore Wed Dec 18 06:36:59 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/vobscene_twids--tjl/.cvsignore
diff -u gzz/doc/pegboard/vobscene_twids--tjl/.cvsignore:1.1
gzz/doc/pegboard/vobscene_twids--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/vobscene_twids--tjl/.cvsignore:1.1 Fri Nov 15 10:03:37 2002
+++ gzz/doc/pegboard/vobscene_twids--tjl/.cvsignore Wed Dec 18 06:37:00 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/w2sx--tjl/.cvsignore
diff -u gzz/doc/pegboard/w2sx--tjl/.cvsignore:1.1
gzz/doc/pegboard/w2sx--tjl/.cvsignore:1.2
--- gzz/doc/pegboard/w2sx--tjl/.cvsignore:1.1 Tue Nov 12 11:56:20 2002
+++ gzz/doc/pegboard/w2sx--tjl/.cvsignore Wed Dec 18 06:37:00 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/pegboard/xu_link_space--benja/.cvsignore
diff -u gzz/doc/pegboard/xu_link_space--benja/.cvsignore:1.1
gzz/doc/pegboard/xu_link_space--benja/.cvsignore:1.2
--- gzz/doc/pegboard/xu_link_space--benja/.cvsignore:1.1 Fri Nov 15
03:52:34 2002
+++ gzz/doc/pegboard/xu_link_space--benja/.cvsignore Wed Dec 18 06:37:00 2002
@@ -1 +1 @@
-peg.html
+peg.gen.html
Index: gzz/doc/uml/.cvsignore
diff -u gzz/doc/uml/.cvsignore:1.1 gzz/doc/uml/.cvsignore:1.2
--- gzz/doc/uml/.cvsignore:1.1 Mon Aug 19 08:32:07 2002
+++ gzz/doc/uml/.cvsignore Wed Dec 18 06:37:00 2002
@@ -1,5 +1,9 @@
-*.1
-*.gen*
-*.html
-*.log
-*.png
+*.gen.1
+*.gen.2
+*.gen.3
+*.log
+*.gen.html
+*.gen.uml
+*.gen.mp
+*.gen.png
+*.gen.log
Index: gzz/doc/uml/Makefile
diff -u gzz/doc/uml/Makefile:1.8 gzz/doc/uml/Makefile:1.9
--- gzz/doc/uml/Makefile:1.8 Fri Aug 30 12:48:38 2002
+++ gzz/doc/uml/Makefile Wed Dec 18 06:37:00 2002
@@ -6,7 +6,7 @@
echo $(TARGETS)
clean:
- rm -f *.gen1 *.gen2 *.html *.log *.1 *.png
+ rm -f *.gen.1 *.gen.2 *.gen.3 *.log *.gen.html *.gen.uml *.gen.mp
*.gen.png *.gen.log
%.html: %.uml %.mp
MPINPUTS=../../metacode python ../../metacode/uml.py $*
Index: gzz/doc/uml/gl/.cvsignore
diff -u gzz/doc/uml/gl/.cvsignore:1.1 gzz/doc/uml/gl/.cvsignore:1.2
--- gzz/doc/uml/gl/.cvsignore:1.1 Thu Aug 29 05:19:44 2002
+++ gzz/doc/uml/gl/.cvsignore Wed Dec 18 06:37:00 2002
@@ -1,6 +1,9 @@
-*.gen1
-*.gen2
-*.gen3
-*.1
-*.png
-*.html
+*.gen.1
+*.gen.2
+*.gen.3
+*.log
+*.gen.html
+*.gen.uml
+*.gen.mp
+*.gen.png
+*.gen.log
Index: gzz/doc/uml/gl/Makefile
diff -u gzz/doc/uml/gl/Makefile:1.1 gzz/doc/uml/gl/Makefile:1.2
--- gzz/doc/uml/gl/Makefile:1.1 Thu Aug 29 05:41:55 2002
+++ gzz/doc/uml/gl/Makefile Wed Dec 18 06:37:00 2002
@@ -2,9 +2,11 @@
all: $(TARGETS)
+showtargets:
+ echo $(TARGETS)
+
clean:
- rm -f *.gen1 *.gen2 *.html *.log *.1 *.png
+ rm -f *.gen.1 *.gen.2 *.gen.3 *.log *.gen.html *.gen.uml *.gen.mp
*.gen.png *.gen.log
%.html: %.uml %.mp
MPINPUTS=../../../metacode python ../../../metacode/uml.py $*
-
Index: gzz/metacode/pegboard.py
diff -u gzz/metacode/pegboard.py:1.24 gzz/metacode/pegboard.py:1.25
--- gzz/metacode/pegboard.py:1.24 Tue Dec 17 09:11:38 2002
+++ gzz/metacode/pegboard.py Wed Dec 18 06:36:53 2002
@@ -165,7 +165,7 @@
pub.set_reader('standalone', None, 'restructuredtext')
pub.set_writer('html')
file = pegroot+'/'+pegdir+'/'+rstfile[0:len(rstfile)-4]
- args = '-stg --stylesheet ../'+css+' %s.rst %s.html' % (file,file)
+ args = '-stg --stylesheet ../'+css+' %s.rst %s.gen.html' % (file,file)
pub.process_command_line(argv=args.split())
#conversion may fail because of bad restructuredtext
@@ -174,12 +174,12 @@
document = pub.reader.read(pub.source, pub.parser, pub.settings)
pub.apply_transforms(document)
output = pub.writer.write(document, pub.destination)
- peg['cvsignore'].append(rstfile[0:len(rstfile)-4]+'.html')
+ peg['cvsignore'].append(rstfile[0:len(rstfile)-4]+'.gen.html')
#conversion have succeeded so far, parsing peg's metadata
#from its document tree
if rstfile == peg['rst']:
- peg['html'] = rstfile[0:len(rstfile)-4]+'.html'
+ peg['html'] = rstfile[0:len(rstfile)-4]+'.gen.html'
peg['topic'] = getTagValue(document, 'title', always_raw=1)
peg['topic'] = peg['topic']
peg['last-modified'] = getFieldTagValue(document,
'last-modified')
@@ -201,6 +201,13 @@
fails += 'PEG %s: Docutil raised an exception while converting %s.
' % (pegdir, rstfile)
fails += 'Conversion failed and HTML not created.\n'
+ #########################
+ #UMLDOC: the second pass#
+ #########################
+ for rstfile in rstfiles:
+ file = pegroot+'/'+pegdir+'/'+rstfile
+ umlrst.embed_diagram(file)
+
if not peg['html']:
for file in peg['files']:
if file[len(file)-5:len(file)] == '.html':
@@ -384,24 +391,24 @@
#converts pegboard.rst, reads results into buffer and opens pegboard.html for
writing
-print 'Generating '+pegroot+'/pegboard.html'
-args = '-stg --stylesheet '+css+' '+pegroot+'/pegboard.rst
'+pegroot+'/pegboard.html'
+print 'Generating '+pegroot+'/pegboard.gen.html'
+args = '-stg --stylesheet '+css+' '+pegroot+'/pegboard.rst
'+pegroot+'/pegboard.gen.html'
publish_cmdline(writer_name='html', argv=args.split())
#generate .cvsignores for generated html-files
if os.path.isfile(pegroot+'/.cvsignore'):
cvsignorefile = open(pegroot+'/.cvsignore', 'r')
- if cvsignorefile.read().find('pegboard.html') == -1:
+ if cvsignorefile.read().find('pegboard.gen.html') == -1:
print 'Updating '+pegroot+'/.cvsignore'
cvsignorefile.close()
cvsignorefile = open(pegroot+'/.cvsignore', 'a')
- cvsignorefile.write('pegboard.html\n')
+ cvsignorefile.write('pegboard.gen.html\n')
cvsignorefile.close()
else:
print 'Creating '+pegroot+'/.cvsignore'
cvsignorefile = open(pegroot+'/.cvsignore', 'w')
- cvsignorefile.write('pegboard.html\n')
+ cvsignorefile.write('pegboard.gen.html\n')
cvsignorefile.close()
for peg in pegtable:
Index: gzz/metacode/uml.py
diff -u gzz/metacode/uml.py:1.21 gzz/metacode/uml.py:1.22
--- gzz/metacode/uml.py:1.21 Tue Dec 17 09:11:38 2002
+++ gzz/metacode/uml.py Wed Dec 18 06:36:53 2002
@@ -17,7 +17,6 @@
import sys, umltool
-umltool.settings['to_root']= '../../'
+for path in sys.argv[1:]:
+ umltool.run(path)
-for prefix in sys.argv[1:]:
- umltool.run(prefix)
Index: gzz/metacode/umldoc.py
diff -u gzz/metacode/umldoc.py:1.5 gzz/metacode/umldoc.py:1.6
--- gzz/metacode/umldoc.py:1.5 Tue Dec 17 09:38:35 2002
+++ gzz/metacode/umldoc.py Wed Dec 18 06:36:53 2002
@@ -15,73 +15,33 @@
# file for more details.
#
-import sys, os
-import umltool
+import sys, os.path
+import umltool, umlrst
+import docutils.core
# must be run in the main directory of gzz module
umltool.settings['css'] = 'doc/gzz.css'
-umltool.settings['tmpdir'] = 'doc/uml'
-
-#Environmental variable MPINPUTS should be relative to tmpdir, or absolute
path.
-os.putenv("MPINPUTS", "../../metacode")
-
-#TEXFMOUTPUT should change the output directory of metapost, but it didn't
-#seem to do that. Instead of this, metapost is currently run in tmpdir.
-#os.putenv("TEXMFOUTPUT", umltool.settings['tmpdir'])
def run(path):
- set_to_root(path)
+ umltool.set_to_root(path)
if os.path.isdir(path):
if not path.endswith("/"): umltool.settings['to_root'] += "../"
elif os.path.isfile(path) or os.path.isfile(path+'.rst'):
rst2html(path)
- embed_diagram(path)
+ umlrst.embed_diagram(path)
-def set_to_root(path):
- depth = path.count("/")
- umltool.settings['to_root'] = "".join(["../" for i in range(depth)])
+ else:
+ umltool.run(path)
def rst2html(path):
- import umlrst, docutils.core
#the first pass - converts rst into html
if path.endswith(".rst"): path = path[0:len(path)-4]
args = '-stg --stylesheet '+umltool.settings['to_root']\
- +umltool.settings['css']+' '+path+'.rst '+path+'.html'
+ +umltool.settings['css']+' '+path+'.rst '+path+'.gen.html'
docutils.core.publish_cmdline(writer_name='html', argv=args.split())
-
-def create_diagram(diagram):
- umltool.run(diagram)
-
-def embed_diagram(path):
- if not umltool.settings.has_key('to_root'):
- set_to_root(path)
-
- #the second pass - adds uml into html
- if path.endswith(".rst"): path = path[0:len(path)-4]
- print path
- if os.path.isfile(path+".html"):
- html = open(path+".html").read()
- out = open(path+".html", "w")
- insert = html.find("<!-- UML:")
- while insert > -1:
- out.write(html[0:insert]);
- name = html[insert+9:html.find(" ", insert+9)]
- create_diagram(name)
- imgmap = open(umltool.settings['tmpdir']+"/"+name+".html").read()
- out.write("<map name=\""+name+"\">\n")
- out.write(imgmap[imgmap.find('>',imgmap.find('<map'))+1:\
- imgmap.find('</map>')])
- out.write("</map>\n")
- out.write("<img src=\""+umltool.settings['to_root']\
- +umltool.settings['tmpdir']+"/"+name+".png"\
- +"\" usemap=\""+name+"\"/>")
- html = html[html.find("-->", insert)+3:len(html)]
- insert = html.find("<!-- UML:")
- out.write(html)
- out.close()
for path in sys.argv[1:]:
run(path)
Index: gzz/metacode/umlrst.py
diff -u gzz/metacode/umlrst.py:1.4 gzz/metacode/umlrst.py:1.5
--- gzz/metacode/umlrst.py:1.4 Tue Dec 17 19:24:23 2002
+++ gzz/metacode/umlrst.py Wed Dec 18 06:36:53 2002
@@ -15,9 +15,18 @@
# file for more details.
#
-import sys, os
+import os.path
import docutils.parsers.rst.directives, docutils.nodes, docutils.core
-import umltool, umldoc
+import umltool
+
+umltool.settings['tmpdir'] = 'doc/uml'
+
+#Environmental variable MPINPUTS should be relative to tmpdir, or absolute
path.
+os.putenv("MPINPUTS", "../../metacode")
+
+#TEXFMOUTPUT should change the output directory of metapost, but it didn't
+#seem to do that. Instead of this, metapost is currently run in tmpdir.
+#os.putenv("TEXMFOUTPUT", umltool.settings['tmpdir'])
def uml_directive(name, arguments, options, content, lineno,
content_offset, block_text, state, state_machine):
@@ -42,13 +51,20 @@
temp += line + "\n"
files[current] = temp
- # XXX fatal error if
- if
os.path.isfile(umltool.settings['tmpdir']+"/"+attributes['name']+".uml"):
- pass
+ # XXX fatal error if diagram with the same name already exists
+ # Anyway, this needs more thinkin. This check should be global,
+ # but following asserts would need to make clean tmpdir before
+ # every remake...
+
+# assert not os.path.isfile(umltool.settings['tmpdir']+"/"\
+# +attributes['name']+".gen.uml"), "file "\
+# +attributes['name']+".gen.uml already exists"
+# assert not os.path.isfile(umltool.settings['tmpdir']+"/"\
+# +attributes['name']+".uml")
#writes uml and mp sourcefiles and converts them into png and html
- uml = open(umltool.settings['tmpdir']+"/"+attributes['name']+".uml",
"w")
- mp = open(umltool.settings['tmpdir']+"/"+attributes['name']+".mp", "w")
+ uml =
open(umltool.settings['tmpdir']+"/"+attributes['name']+".gen.uml", "w")
+ mp = open(umltool.settings['tmpdir']+"/"+attributes['name']+".gen.mp",
"w")
uml.write(files[0])
mp.write(files[1])
uml.close()
@@ -61,4 +77,63 @@
uml_directive.content = 1
docutils.parsers.rst.directives._directives['uml'] = uml_directive
+
+def uml_refer_directive(name, arguments, options, content, lineno,
+ content_offset, block_text, state, state_machine):
+ """
+ Pass content to UML-tool, which creates a png file.
+ Returns a comment node with name of the diagram.
+ """
+ attributes = {'name': arguments[0]}
+ if content:
+ uml_node = docutils.nodes.comment('', 'UML:'+attributes['name'])
+
+ return [uml_node]
+
+uml_refer_directive.arguments = (1, 0, 0)
+uml_refer_directive.options = {}
+uml_refer_directive.content = 0
+
+docutils.parsers.rst.directives._directives['uml-refer'] = uml_refer_directive
+
+def create_diagram(diagram):
+ umltool.run(diagram)
+
+def embed_diagram(path):
+ if not umltool.settings.has_key('to_root'):
+ umltool.set_to_root(path)
+
+ #the second pass - adds uml into html
+ if path.endswith(".rst"): path = path[0:len(path)-4]
+ if os.path.isfile(path+".gen.html"):
+ html = open(path+".gen.html").read()
+ out = open(path+".gen.html", "w")
+ insert = html.find("<!-- UML:")
+ while insert > -1:
+ out.write(html[0:insert]);
+ name = html[insert+9:html.find(" ", insert+9)]
+
+ #This should work also with non-generated UML-diagrams. Checks
first
+ #for generated and then if non-generated diagram exists.
+ if
(os.path.isfile(umltool.settings['tmpdir']+"/"+name+".gen.uml")):
+ prefix = name + ".gen"
+ else: prefix = name
+ assert
os.path.isfile(umltool.settings['tmpdir']+"/"+prefix+".uml")\
+ and
os.path.isfile(umltool.settings['tmpdir']+"/"+prefix+".mp")
+ create_diagram(prefix)
+ assert
os.path.isfile(umltool.settings['tmpdir']+"/"+prefix+".html")\
+ and
os.path.isfile(umltool.settings['tmpdir']+"/"+prefix+".png")
+
+ #Cut&Pastes imagemap into html
+ imgmap = open(umltool.settings['tmpdir']+"/"+prefix+".html").read()
+ out.write("<map name=\""+name+"\">\n")
+ out.write(imgmap[imgmap.find('>',imgmap.find('<map'))+1:\
+ imgmap.find('</map>')])
+ out.write("</map>\n")
+ out.write("<img
src=\""+umltool.settings['to_tmpdir']+"/"+prefix+".png"\
+ +"\" usemap=\""+name+"\"/>")
+ html = html[html.find("-->", insert)+3:len(html)]
+ insert = html.find("<!-- UML:")
+ out.write(html)
+ out.close()
Index: gzz/metacode/umltool.py
diff -u gzz/metacode/umltool.py:1.3 gzz/metacode/umltool.py:1.4
--- gzz/metacode/umltool.py:1.3 Tue Dec 17 09:11:38 2002
+++ gzz/metacode/umltool.py Wed Dec 18 06:36:53 2002
@@ -28,6 +28,26 @@
jlinkpackage = None
+def set_to_root(path):
+ depth = path.count("/")
+ settings['to_root'] = "".join(["../" for i in range(depth)])
+ settings['to_javadoc'] = merge_paths(path, settings['javadoc'])
+ if settings.has_key('tmpdir'):
+ settings['to_tmpdir'] = merge_paths(path, settings['tmpdir'])
+
+def merge_paths(fromd, to):
+ depth = fromd.count("/")
+ from_parts = fromd.split("/")
+ to_parts = to.split("/")
+ parts = len(from_parts)<len(to_parts) and len(from_parts) or len(to_parts)
+ for i in range(parts):
+ if from_parts[i] != to_parts[i]:
+ parts = i
+ break
+ result = "".join(["../" for i in range(depth-parts)]) \
+ +"".join([to_parts[i+parts]+"/" for i in
range(len(to_parts)-parts)])
+ return (result[0:len(result)-1])
+
def matchRemove(p, s):
"Match pattern p in s and remove the match, return (match, ns)"
m = re.match(p,s)
@@ -645,11 +665,11 @@
if re.search("html", ts[-1]):
target = self.name
elif re.match("^[a-z]", ts[-1]):
- target = (settings['to_root']+settings['javadoc']+"/"\
+ target = (settings['to_javadoc']+"/"\
+"/".join(ts)
+ "/package-summary.html#package_description")
else:
- target = (settings['to_root']+settings['javadoc']+"/"\
+ target = (settings['to_javadoc']+"/"\
+"/".join(ts)
+ ".html")
return """<area href="%s" shape="rect" coords="%s" target="_top"
title="%s" alt="%s" />\n""" % (
@@ -679,35 +699,45 @@
"-xborder", 0, "-yborder", 0]]
def run(prefix):
- #Runs metapost in the tmpdir (to store all output data there)
- current_path = os.path.abspath("")
+ if prefix.endswith(".gen"):
+ genprefix = prefix
+ else: genprefix = prefix + ".gen"
if settings.has_key('tmpdir'):
- os.chdir(os.path.abspath(settings['tmpdir']))
-
- s = open(prefix+".uml").read()
+ path = settings['tmpdir'] + "/"
+ else: path = '';
+
+ s = open(path+prefix+".uml").read()
l = parseIndented(s)
m = mplist(l)
-
- open(prefix+".gen1", "w").write(m.setupCode())
- open(prefix+".gen2", "w").write(m.drawCode())
- open(prefix+".gen3", "w").write("""
+
+ gen1 = open(path+genprefix+".1", "w")
+ gen1.write(m.setupCode())
+ gen1.close()
+ gen2 = open(path+genprefix+".2", "w")
+ gen2.write(m.drawCode())
+ gen2.close()
+ gen3 = open(path+genprefix+".3", "w")
+ gen3.write("""
prologues := 1;
input umlhelper.mp
beginfig(1)
- input %(prefix)s.gen1
+ input %(genprefix)s.1
input %(prefix)s.mp
- input %(prefix)s.gen2
+ input %(genprefix)s.2
endfig
end
""" % locals())
+ gen3.close()
+
+ syscmd = "/usr/bin/mpost %s" % genprefix+".3";
+ if settings.has_key('tmpdir'):
+ os.system("cd "+path+";"+syscmd)
+ else: os.system(syscmd)
- assert not os.spawnlp(os.P_WAIT,
- "/usr/bin/mpost", "/usr/bin/mpost", prefix+".gen3")
-
- log = open(prefix+".log").read()
+ log = open(path+genprefix+".log").read()
print "LINKS"
links = []
@@ -726,10 +756,11 @@
list = bbox.pstopnm(4)
print "PSTOPNM: ", list
- cmd = ("pstopnm -verbose "+" ".join(list)+" <"+prefix+""".1 | pnmscale
-reduce 4 |
- pnmtopng >"""+prefix+".png")
- print "Command:",cmd
- os.system(cmd)
+ syscmd = ("pstopnm -verbose "+" ".join(list)+" <"+path+genprefix\
+ +""".1 | pnmscale -reduce 4 |
+ pnmtopng >"""+path+genprefix+".png")
+ print "Command:",syscmd
+ os.system(syscmd)
htmlcode = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd";>
@@ -748,9 +779,8 @@
</BODY>
</HTML>
""" % { "prefix": prefix,
- "filename": prefix+".png",
+ "filename": genprefix+".png",
"links": " ".join([l.imgmapanchor() for l in links]) }
- open(prefix+".html", "w").write(htmlcode)
-
- #Returning back to the current directory
- os.chdir(current_path)
+ html = open(path+genprefix+".html", "w")
+ html.write(htmlcode)
+ html.close()