Add oval shape as a synonym for ellipse

diff --git a/doc/info/oval.gif b/doc/info/oval.gif
new file mode 100644 (file)
index 0000000..873a79a
Binary files /dev/null and b/doc/info/oval.gif differ

diff --git a/doc/info/shapes.html b/doc/info/shapes.html
index e93fa3e9b1a2de73fd4c4dc99f0ab1fb91083958..211fd7864782750f1c34655a8aad40d3068084d5 100644 (file)
--- a/doc/info/shapes.html
+++ b/doc/info/shapes.html
@@ -36,103 +36,105 @@ The possible polygon-based shapes are displayed below.
     <TD><IMG SRC=box.gif>
     <TD><IMG SRC=polygon.gif>
     <TD><IMG SRC=ellipse.gif>
-    <TD><IMG SRC=circle.gif>
+    <TD><IMG SRC=oval.gif>
   </TR>
   <TR ALIGN=CENTER>
     <TD><A NAME=d:box>box</A>
     <TD><A NAME=d:polygon>polygon</A>
     <TD><A NAME=d:ellipse>ellipse</A>
-    <TD><A NAME=d:circle>circle</A>
+    <TD><A NAME=d:oval>oval</A>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><IMG SRC=circle.gif>
     <TD><IMG SRC=point.gif>
     <TD><IMG SRC=egg.gif>
     <TD><IMG SRC=triangle.gif>
-    <TD><IMG SRC=plaintext.gif>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><A NAME=d:circle>circle</A>
     <TD><A NAME=d:point>point</A>
     <TD><A NAME=d:egg>egg</A>
     <TD><A NAME=d:triangle>triangle</A>
-    <TD><A NAME=d:plaintext>plaintext</A>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><IMG SRC=plaintext.gif>
     <TD><IMG SRC=diamond.gif>
     <TD><IMG SRC=trapezium.gif>
     <TD><IMG SRC=parallelogram.gif>
-    <TD><IMG SRC=house.gif>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><A NAME=d:plaintext>plaintext</A>
     <TD><A NAME=d:diamond>diamond</A>
     <TD><A NAME=d:trapezium>trapezium</A>
     <TD><A NAME=d:parallelogram>parallelogram</A>
-    <TD><A NAME=d:house>house</A>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><IMG SRC=house.gif>
     <TD><IMG SRC=pentagon.gif>
     <TD><IMG SRC=hexagon.gif>
     <TD><IMG SRC=septagon.gif>
-    <TD><IMG SRC=octagon.gif>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><A NAME=d:house>house</A>
     <TD><A NAME=d:pentagon>pentagon</A>
     <TD><A NAME=d:hexagon>hexagon</A>
     <TD><A NAME=d:septagon>septagon</A>
-    <TD><A NAME=d:octagon>octagon</A>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><IMG SRC=octagon.gif>
     <TD><IMG SRC=doublecircle.gif>
     <TD><IMG SRC=doubleoctagon.gif>
     <TD><IMG SRC=tripleoctagon.gif>
-    <TD><IMG SRC=invtriangle.gif>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><A NAME=d:octagon>octagon</A>
     <TD><A NAME=d:doublecircle>doublecircle</A>
     <TD><A NAME=d:doubleoctagon>doubleoctagon</A>
     <TD><A NAME=d:tripleoctagon>tripleoctagon</A>
-    <TD><A NAME=d:invtriangle>invtriangle</A>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><IMG SRC=invtriangle.gif>
     <TD><IMG SRC=invtrapezium.gif>
     <TD><IMG SRC=invhouse.gif>
     <TD><IMG SRC=Mdiamond.gif>
-    <TD><IMG SRC=Msquare.gif>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><A NAME=d:invtriangle>invtriangle</A>
     <TD><A NAME=d:invtrapezium>invtrapezium</A>
     <TD><A NAME=d:invhouse>invhouse</A>
     <TD><A NAME=d:Mdiamond>Mdiamond</A>
-    <TD><A NAME=d:Msquare>Msquare</A>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><IMG SRC=Msquare.gif>
     <TD><IMG SRC=Mcircle.gif>
     <TD><IMG SRC=rect.gif>
     <TD><IMG SRC=rectangle.gif>
-    <TD><IMG SRC=square.gif>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><A NAME=d:Msquare>Msquare</A>
     <TD><A NAME=d:Mcircle>Mcircle</A>
     <TD><A NAME=d:rect>rect</A>
     <TD><A NAME=d:rectangle>rectangle</A>
-    <TD><A NAME=d:square>square</A>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><IMG SRC=square.gif>
     <TD><IMG SRC=none.gif>
     <TD><IMG SRC=note.gif>
     <TD><IMG SRC=tab.gif>
-    <TD><IMG SRC=folder.gif>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><A NAME=d:square>square</A>
     <TD><A NAME=d:none>none</A>
     <TD><A NAME=d:note>note</A>
     <TD><A NAME=d:tab>tab</A>
-    <TD><A NAME=d:folder>folder</A>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><IMG SRC=folder.gif>
     <TD><IMG SRC=box3d.gif>
     <TD><IMG SRC=component.gif>
   </TR>
   <TR ALIGN=CENTER>
+    <TD><A NAME=d:folder>folder</A>
     <TD><A NAME=d:box3d>box3d</A>
     <TD><A NAME=d:component>component</A>
   </TR>

diff --git a/doc/infosrc/Makefile.old b/doc/infosrc/Makefile.old
index bf86c7f72439c0b77f6a43584f0e86cf99357680..8430666713d07d93f407cf4d54f3fa80fff3cd68 100644 (file)
--- a/doc/infosrc/Makefile.old
+++ b/doc/infosrc/Makefile.old
@@ -35,7 +35,7 @@ SGIF = Mcircle.gif Mdiamond.gif Msquare.gif box.gif \
       circle.gif diamond.gif doublecircle.gif \
       doubleoctagon.gif egg.gif ellipse.gif hexagon.gif house.gif \
       invhouse.gif invtrapezium.gif invtriangle.gif none.gif \
-      octagon.gif parallelogram.gif plaintext.gif \
+      octagon.gif oval.gif parallelogram.gif plaintext.gif \
       point.gif polygon.gif trapezium.gif triangle.gif \
       tripleoctagon.gif pentagon.gif septagon.gif rect.gif \
       rectangle.gif square.gif

diff --git a/doc/infosrc/shapelist b/doc/infosrc/shapelist
index d7fc353b1b6b9bced2b2adf682fa3ecfb6849f17..e04b8e1d28487fea485e26d8a86c2acd96b5035d 100644 (file)
--- a/doc/infosrc/shapelist
+++ b/doc/infosrc/shapelist
@@ -1,6 +1,7 @@
 box
 polygon
 ellipse
+oval
 circle
 point
 egg

diff --git a/doc/infosrc/square.gif b/doc/infosrc/square.gif
deleted file mode 100644 (file)
index 92a9d21..0000000
Binary files a/doc/infosrc/square.gif and /dev/null differ