moving to git; cleanup; wip

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..f52e17b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+# really this is private to my build process
+make/
+common-lisp.net
+.vcs
+GNUmakefile
+init-lisp.lisp
+project-init.lisp
+
+log5.tar.gz
+website/output/
+test-results/
+lift-local.config
+*.dribble
+*.fasl

diff --git a/cl-graph.asd b/cl-graph.asd
index ebffcf2..93c2cc0 100644 (file)
--- a/cl-graph.asd
+++ b/cl-graph.asd
@@ -4,12 +4,14 @@
 (defpackage #:cl-graph-system (:use #:cl #:asdf))
 (in-package #:cl-graph-system)
 
-(unless (find-system 'asdf-system-connections nil)
+(unless (or (member :asdf-system-connections *features*)
+           (find-system 'asdf-system-connections nil))
   (warn "The CL-Graph system would enjoy having asdf-system-connections 
 around. See 
 http://www.cliki.net/asdf-system-connections for details and download
 instructions."))
-(when (find-system 'asdf-system-connections nil)
+(when (and (not (member :asdf-system-connections *features*))
+          (find-system 'asdf-system-connections nil))
   (operate 'load-op 'asdf-system-connections))
 
 (defsystem cl-graph
@@ -35,6 +37,7 @@ instructions."))
                        :depends-on ("graph"))
                 (:file "graph-algorithms"
                        :depends-on ("graph"))
+                #+(or)
                 (:file "dynamic-classes"
                        :depends-on ("graph"))
                 (:static-file "notes.text")
@@ -53,6 +56,7 @@ instructions."))
                      :config :generic))
   :depends-on ((:version :metatilities-base "0.6.0")
               (:version :cl-containers "0.12.0")
+              :metabang-bind
               ))
 
 (defmethod operation-done-p 
@@ -70,6 +74,14 @@ instructions."))
                        :depends-on ("graph-and-variates"))))))
 
 #+asdf-system-connections
+(asdf:defsystem-connection cl-graph-and-dynamic-classes
+  :requires (cl-graph dynamic-classes)
+  :components ((:module 
+               "dev"
+               :components
+               ((:file "dynamic-classes")))))
+
+#+asdf-system-connections
 (asdf:defsystem-connection cl-graph-and-cl-graphviz
   :requires (cl-graph cl-graphviz)
   :components ((:module 

diff --git a/dev/package.lisp b/dev/package.lisp
index b5b03b8..45d89b9 100644 (file)
--- a/dev/package.lisp
+++ b/dev/package.lisp
@@ -10,7 +10,7 @@ DISCUSSION
 (in-package #:common-lisp-user)
 
 (defpackage #:cl-graph
-  (:use #:common-lisp #:metatilities #:cl-containers)
+  (:use #:common-lisp #:metatilities #:cl-containers #:metabang-bind)
   (:nicknames #:metabang.graph)
   (:documentation "CL-Graph is a Common Lisp library for manipulating graphs and running graph algorithms.")
   
@@ -184,4 +184,4 @@ DISCUSSION
    #:dot-attribute-value
    #:dot-attributes-mixin
    #:*dot-graph-attributes*
-   ))
\ No newline at end of file
+   ))

diff --git a/website/source/index.md b/website/source/index.md
deleted file mode 100644 (file)
index 40ae057..0000000
--- a/website/source/index.md
+++ /dev/null
@@ -1,81 +0,0 @@
-{include resources/header.md}
-{set-property title "CL-Graph"}
-
-   [1]: http://common-lisp.net/project/cl-containers/shared/metabang-2.png (metabang.com)
-   [2]: http://www.metabang.com/ (metabang.com)
-
-<div class="contents">
-<div class="system-links">
-
-  * [Mailing Lists][3]
-  * [Getting it][4]
-  * [Documentation][5]
-  * [News][6]
-  * [Test results][tr]
-  * [Changelog][7]
-
-   [3]: #mailing-lists
-   [4]: #downloads
-   [5]: documentation/ (documentation link)
-   [6]: #news
-   [7]: changelog.html
-   [tr]: test-report.html
-
-</div>
-<div class="system-description">
-
-### What it is
-
-CL-Graph is a Common Lisp library for manipulating graphs and
-running graph algorithms. [TINAA][8] documentation for
-CL-Graph is [available][9].
-
-   [8]: http://common-lisp.net/project/tinaa/
-   [9]: http://common-lisp.net/project/cl-graph/documentation/
-
-{anchor mailing-lists}
-
-### Mailing Lists
-
-  * [cl-graph-devel][devel-list]: A list for questions,
-    patches, bug reports, and so on; It's for everything.
-
-{anchor downloads}
-
-### Where is it
-
-A [darcs][] repository is available (note that you'll also
-need to get several other bits and pieces to get CL-Graph to
-work). The commands are listed below:
-
-    darcs get http://common-lisp.net/project/cl-graph/
-    darcs get http://common-lisp.net/project/metabang-bind/
-    darcs get http://common-lisp.net/project/metatilities-base/
-    darcs get http://common-lisp.net/project/moptilities/
-
-CL-Graph (and friends) should also be [ASDF
-installable][asdf-install]. Its CLiki home is right
-[where][cliki-home] you'd expect.
-
-There's also a handy [gzipped tar file][tarball].
-
-### What is happening
-
-2 Feb 2006
-Lots of new [CL-Graph][16] documentation.
-
-   [16]: http://common-lisp.net/project/cl-graph/documentation/
-
-25 Nov 2005
-Wrote a mini tutorial and published it on [unCLog][17].
-
-   [17]: http://www.metabang.com/unclog/publisha/atinybit.html
-
-10 Nov 2005
-Initial setup.
-
-</div>
-</div>
-
-{include resources/footer.md}
-

diff --git a/website/source/index.mmd b/website/source/index.mmd
new file mode 100644 (file)
index 0000000..df15bd1
--- /dev/null
+++ b/website/source/index.mmd
@@ -0,0 +1,95 @@
+{include resources/header.md}
+{set-property title "CL-Graph"}
+
+   [1]: http://common-lisp.net/project/cl-containers/shared/metabang-2.png (metabang.com)
+   [2]: http://www.metabang.com/ (metabang.com)
+
+<div class="contents">
+<div class="system-links">
+
+  * [Mailing Lists][3]
+  * [Getting it][4]
+{remark  * [Documentation][5] }
+  * [News][6]
+{remark  * [Test results][tr]}
+  * [Changelog][7]
+
+   [3]: #mailing-lists
+   [4]: #downloads
+   [5]: documentation/ (documentation link)
+   [6]: #news
+   [7]: changelog.html
+   [tr]: test-report.html
+
+</div>
+<div class="system-description">
+
+### What it is
+
+CL-Graph is a Common Lisp library for manipulating graphs and
+running graph algorithms. {remark [TINAA][] documentation for
+CL-Graph is [available][9].} Check out the [user's guide](user-guide.html)
+for some very old and yet still preliminary documentation. 
+
+The style-sheet is currently completely bogus. Apologies in advance.
+
+   [9]: http://common-lisp.net/project/cl-graph/documentation/
+
+{anchor mailing-lists}
+
+### Mailing Lists
+
+  * [cl-graph-devel][devel-list]: A list for questions,
+    patches, bug reports, and so on; It's for everything.
+
+{anchor downloads}
+
+### Where is it
+
+metabang.com is switching from [darcs][] to [git][]
+for source control; the current cl-graph repository is on
+[github][github-cl-graph] and you can clone it using:
+
+    git clone git://github.com/gwkkwg/cl-graph
+
+(note that you'll also
+need to get several other bits and pieces to get CL-Graph to
+work. The commands are listed below:
+
+    git clone git://github.com/gwkkwg/metabang-bind
+    git clone git://github.com/gwkkwg/metatilities-base
+    git clone git://github.com/gwkkwg/moptilities
+
+You might also want [dynamic-classes][]:
+
+    git clone git://github.com/gwkkwg/dynamic-classes
+
+CL-Graph (and friends) should also be [ASDF
+installable][asdf-install]. Its CLiki home is right
+[where][cliki-home] you'd expect.
+
+There's also a handy [gzipped tar file][tarball].
+
+### What is happening
+
+8 January 2011
+Moved to github; minor cleanup.
+
+2 Feb 2006
+Lots of new [CL-Graph][16] documentation.
+
+   [16]: http://common-lisp.net/project/cl-graph/documentation/
+
+25 Nov 2005
+Wrote a mini tutorial and published it on [unCLog][17].
+
+   [17]: http://www.metabang.com/unclog/publisha/atinybit.html
+
+10 Nov 2005
+Initial setup.
+
+</div>
+</div>
+
+{include resources/footer.md}
+

diff --git a/website/source/user-guide.md b/website/source/user-guide.md
deleted file mode 100644 (file)
index a6b53f2..0000000
--- a/website/source/user-guide.md
+++ /dev/null
@@ -1,85 +0,0 @@
-{include resources/ug-header.md}
-{set-property title "CL-Graph User's Guide"}
-{set-property style-sheet user-guide}
-{set-property docs-package cl-graph}
-
-# CL-Graph User's Guide
-
-# Table of Contents 
-
-{table-of-contents :start 2 :depth 3}
-
-## Introduction
-
-In Mathematics and Computer Science, a _graph_ is a
-collection of _vertexes_ connected by _edges_. Edges may be
-_directed_ or _undirected_ (i.e., sometimes you really can't
-get there from here). Both edges and vertexes may have
-additional data associated with them. Graphs are useful
-because you can use them to represent most anything: food
-webs, hypertext, the world wide web, protein/protein
-interactions, language, who publishes with whom, etc.
-
-CL-Graph is a general graph library built on
-[cl-containers][]. It provides an open-ended API for
-building, examining and manipulating graphs as well as
-implementations of many of the usual suspects of graph
-algorithms and measures. 
-
-## Using a graph
-
-### Creation and manipulation
-
-{include "user-guide-details/manipulation.mmd"}
-
-### Tell me about yourself - introspection
-
-{include "user-guide-details/introspection.mmd"}
-
-### Search
-
-{include "user-guide-details/search.mmd"}
-
-### Algorithms
-
-{include "user-guide-details/algorithms.mmd"}
-
-### Iteration
-
-{include "user-guide-details/iteration.mmd"}
-
-### CL-Graph and dotty
-
-{include "user-guide-details/dotty.mmd"}
-
-### Random Graphs
-
-{include user-guide-details/random-graphs.mmd}
-
-### Miscellaneous
-
-{include user-guide-details/miscellaneous.mmd}
-
-### Deprecated - to be removed soon 
-
-{include user-guide-details/deprecated.mmd}
-
-## Index of Functions
-
-{docs-index (function macro) function}
-
-<hr>
-
-{comment
-  
-#### Glossary
-
-{glossary}
-
-
-#### Footnotes
-
-{footnotes}
-}
-
-{include resources/ug-footer.md}

diff --git a/website/source/user-guide.mmd b/website/source/user-guide.mmd
new file mode 100644 (file)
index 0000000..a6b53f2
--- /dev/null
+++ b/website/source/user-guide.mmd
@@ -0,0 +1,85 @@
+{include resources/ug-header.md}
+{set-property title "CL-Graph User's Guide"}
+{set-property style-sheet user-guide}
+{set-property docs-package cl-graph}
+
+# CL-Graph User's Guide
+
+# Table of Contents 
+
+{table-of-contents :start 2 :depth 3}
+
+## Introduction
+
+In Mathematics and Computer Science, a _graph_ is a
+collection of _vertexes_ connected by _edges_. Edges may be
+_directed_ or _undirected_ (i.e., sometimes you really can't
+get there from here). Both edges and vertexes may have
+additional data associated with them. Graphs are useful
+because you can use them to represent most anything: food
+webs, hypertext, the world wide web, protein/protein
+interactions, language, who publishes with whom, etc.
+
+CL-Graph is a general graph library built on
+[cl-containers][]. It provides an open-ended API for
+building, examining and manipulating graphs as well as
+implementations of many of the usual suspects of graph
+algorithms and measures. 
+
+## Using a graph
+
+### Creation and manipulation
+
+{include "user-guide-details/manipulation.mmd"}
+
+### Tell me about yourself - introspection
+
+{include "user-guide-details/introspection.mmd"}
+
+### Search
+
+{include "user-guide-details/search.mmd"}
+
+### Algorithms
+
+{include "user-guide-details/algorithms.mmd"}
+
+### Iteration
+
+{include "user-guide-details/iteration.mmd"}
+
+### CL-Graph and dotty
+
+{include "user-guide-details/dotty.mmd"}
+
+### Random Graphs
+
+{include user-guide-details/random-graphs.mmd}
+
+### Miscellaneous
+
+{include user-guide-details/miscellaneous.mmd}
+
+### Deprecated - to be removed soon 
+
+{include user-guide-details/deprecated.mmd}
+
+## Index of Functions
+
+{docs-index (function macro) function}
+
+<hr>
+
+{comment
+  
+#### Glossary
+
+{glossary}
+
+
+#### Footnotes
+
+{footnotes}
+}
+
+{include resources/ug-footer.md}

diff --git a/website/website.tmproj b/website/website.tmproj
index 6ead674..5c2aee7 100644 (file)
--- a/website/website.tmproj
+++ b/website/website.tmproj
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
        <key>currentDocument</key>
-       <string>source/user-guide-details/iteration.mmd</string>
+       <string>../../shared/shared-links.md</string>
        <key>documents</key>
        <array>
                <dict>
@@ -20,7 +20,9 @@
                        <key>filename</key>
                        <string>../../shared/shared-links.md</string>
                        <key>lastUsed</key>
-                       <date>2008-10-01T13:35:22Z</date>
+                       <date>2011-01-04T02:51:17Z</date>
+                       <key>selected</key>
+                       <true/>
                </dict>
        </array>
        <key>fileHierarchyDrawerWidth</key>
@@ -32,23 +34,23 @@
                        <key>caret</key>
                        <dict>
                                <key>column</key>
-                               <integer>41</integer>
+                               <integer>59</integer>
                                <key>line</key>
-                               <integer>23</integer>
+                               <integer>70</integer>
                        </dict>
                        <key>firstVisibleColumn</key>
                        <integer>0</integer>
                        <key>firstVisibleLine</key>
-                       <integer>17</integer>
+                       <integer>34</integer>
                </dict>
-               <key>source/index.md</key>
+               <key>source/index.mmd</key>
                <dict>
                        <key>caret</key>
                        <dict>
                                <key>column</key>
-                               <integer>0</integer>
+                               <integer>58</integer>
                                <key>line</key>
-                               <integer>1</integer>
+                               <integer>30</integer>
                        </dict>
                        <key>firstVisibleColumn</key>
                        <integer>0</integer>
@@ -130,9 +132,9 @@
                        <key>caret</key>
                        <dict>
                                <key>column</key>
-                               <integer>0</integer>
+                               <integer>32</integer>
                                <key>line</key>
-                               <integer>0</integer>
+                               <integer>26</integer>
                        </dict>
                        <key>firstVisibleColumn</key>
                        <integer>0</integer>
@@ -279,26 +281,24 @@
                        <key>firstVisibleLine</key>
                        <integer>0</integer>
                </dict>
-               <key>source/user-guide.md</key>
+               <key>source/user-guide.mmd</key>
                <dict>
                        <key>caret</key>
                        <dict>
                                <key>column</key>
                                <integer>0</integer>
                                <key>line</key>
-                               <integer>74</integer>
+                               <integer>0</integer>
                        </dict>
                        <key>firstVisibleColumn</key>
                        <integer>0</integer>
                        <key>firstVisibleLine</key>
-                       <integer>42</integer>
+                       <integer>0</integer>
                </dict>
        </dict>
        <key>openDocuments</key>
        <array>
                <string>source/resources/header.md</string>
-               <string>source/index.md</string>
-               <string>source/user-guide.md</string>
                <string>source/user-guide.css</string>
                <string>source/user-guide-details/motivation.mmd</string>
                <string>source/user-guide-details/miscellaneous.mmd</string>
@@ -311,6 +311,8 @@
                <string>source/user-guide-details/random-graphs.mmd</string>
                <string>source/user-guide-details/algorithms.mmd</string>
                <string>../../shared/shared-links.md</string>
+               <string>source/index.mmd</string>
+               <string>source/user-guide.mmd</string>
                <string>source/resources/ug-header.md</string>
                <string>source/resources/shared-header.md</string>
                <string>source/resources/footer.md</string>
@@ -319,6 +321,6 @@
        <key>showFileHierarchyDrawer</key>
        <true/>
        <key>windowFrame</key>
-       <string>{{611, 97}, {578, 778}}</string>
+       <string>{{611, 0}, {578, 778}}</string>
 </dict>
 </plist>