From d02fe185e254ddc7d8942cfffe4bd97c877b0846 Mon Sep 17 00:00:00 2001
From: Gerd Heber <gheber@hdfgroup.org>
Date: Sat, 8 Aug 2015 09:32:25 -0500
Subject: [PATCH] Use DEF instead of DEFVAR.

---
 examples/Overview.ipynb | 282 ++++------------------------------------
 1 file changed, 26 insertions(+), 256 deletions(-)

diff --git a/examples/Overview.ipynb b/examples/Overview.ipynb
index 345699d..a1feae8 100644
--- a/examples/Overview.ipynb
+++ b/examples/Overview.ipynb
@@ -2,7 +2,7 @@
  "metadata": {
   "language": "common-lisp",
   "name": "",
-  "signature": "sha256:369b292c1ecc74297adacb6883a5c1faf08191eaf887911e6915d0cc592d4b0d"
+  "signature": "sha256:8c6a25cd46fe82c8c18af5548c04dc2cf9e8196f38ccfff102a5d727ad0610ab"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -81,7 +81,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar m23 (cat:moore 2 3))"
+      "(cat:def m23 (cat:moore 2 3))"
      ],
      "language": "python",
      "metadata": {},
@@ -132,17 +132,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar m23xm23 (cat:crts-prdc m23 m23))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "m23xm23"
+      "(cat:def m23xm23 (cat:crts-prdc m23 m23))"
      ],
      "language": "python",
      "metadata": {},
@@ -188,17 +178,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar t2m23 (cat:tnsr-prdc m23 m23))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "t2m23"
+      "(cat:def t2m23 (cat:tnsr-prdc m23 m23))"
      ],
      "language": "python",
      "metadata": {},
@@ -245,17 +225,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar kz1 (cat:k-z 1))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "kz1"
+      "(cat:def kz1 (cat:k-z 1))"
      ],
      "language": "python",
      "metadata": {},
@@ -302,17 +272,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar k-z2-2 (cat:k-z2 2))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "k-z2-2"
+      "(cat:def k-z2-2 (cat:k-z2 2))"
      ],
      "language": "python",
      "metadata": {},
@@ -340,7 +300,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar s3 (cat:sphere 3))"
+      "(cat:def s3 (cat:sphere 3))"
      ],
      "language": "python",
      "metadata": {},
@@ -350,27 +310,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "s3"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "(defvar o2s3 (cat:loop-space s3 2))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "o2s3"
+      "(cat:def o2s3 (cat:loop-space s3 2))"
      ],
      "language": "python",
      "metadata": {},
@@ -397,17 +337,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar os3 (cat:loop-space s3))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "os3"
+      "(cat:def os3 (cat:loop-space s3))"
      ],
      "language": "python",
      "metadata": {},
@@ -424,17 +354,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar L1 (cat:loop3 0 's3 1))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "L1"
+      "(cat:def L1 (cat:loop3 0 's3 1))"
      ],
      "language": "python",
      "metadata": {},
@@ -451,17 +371,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar null-simp (cat:absm 3 cat:+null-loop+))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "null-simp"
+      "(cat:def null-simp (cat:absm 3 cat:+null-loop+))"
      ],
      "language": "python",
      "metadata": {},
@@ -478,18 +388,8 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar dos3 (cat:disk-pasting os3 3 '<D3> \n",
-      "                               (list L1 null-simp L1 null-simp)))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "dos3"
+      "(cat:def dos3 (cat:disk-pasting os3 3 '<D3> \n",
+      "                                (list L1 null-simp L1 null-simp)))"
      ],
      "language": "python",
      "metadata": {},
@@ -523,17 +423,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar odos3 (cat:loop-space dos3))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "odos3"
+      "(cat:def odos3 (cat:loop-space dos3))"
      ],
      "language": "python",
      "metadata": {},
@@ -607,7 +497,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar L2 (cat:loop3 0 's3 2))"
+      "(cat:def L2 (cat:loop3 0 's3 2))"
      ],
      "language": "python",
      "metadata": {},
@@ -617,27 +507,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "L2"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "(defvar square (cat:aprd os3 4 (cat:tnpr 2 L2 2 L2)))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "square"
+      "(cat:def square (cat:aprd os3 4 (cat:tnpr 2 L2 2 L2)))"
      ],
      "language": "python",
      "metadata": {},
@@ -655,17 +525,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar L4 (cat:gnrt (second (cat:cmbn-list square))))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "L4"
+      "(cat:def L4 (cat:gnrt (second (cat:cmbn-list square))))"
      ],
      "language": "python",
      "metadata": {},
@@ -682,17 +542,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar hat (mapcar #'(lambda (i) (cat:face os3 i 4 l4)) '(1 2 3 4)))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "hat"
+      "(cat:def hat (mapcar #'(lambda (i) (cat:face os3 i 4 l4)) '(1 2 3 4)))"
      ],
      "language": "python",
      "metadata": {},
@@ -709,17 +559,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar kan-simplex (cat:kfll os3 0 4 hat))  "
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "kan-simplex"
+      "(cat:def kan-simplex (cat:kfll os3 0 4 hat))  "
      ],
      "language": "python",
      "metadata": {},
@@ -756,17 +596,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar cls-os3 (cat:classifying-space os3))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "cls-os3"
+      "(cat:def cls-os3 (cat:classifying-space os3))"
      ],
      "language": "python",
      "metadata": {},
@@ -805,17 +635,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar ch3 (cat:chml-clss m23 3))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "ch3"
+      "(cat:def ch3 (cat:chml-clss m23 3))"
      ],
      "language": "python",
      "metadata": {},
@@ -832,17 +652,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar f3 (cat:z2-whitehead m23 ch3))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "f3"
+      "(cat:def f3 (cat:z2-whitehead m23 ch3))"
      ],
      "language": "python",
      "metadata": {},
@@ -859,17 +669,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar x4 (cat:fibration-total f3))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "x4"
+      "(cat:def x4 (cat:fibration-total f3))"
      ],
      "language": "python",
      "metadata": {},
@@ -903,7 +703,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar ch4 (cat:chml-clss x4 4))"
+      "(cat:def ch4 (cat:chml-clss x4 4))"
      ],
      "language": "python",
      "metadata": {},
@@ -913,7 +713,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "ch4"
+      "(cat:def f4 (cat:z2-whitehead x4 ch4))"
      ],
      "language": "python",
      "metadata": {},
@@ -923,37 +723,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "(defvar f4 (cat:z2-whitehead x4 ch4))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "f4"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "(defvar x5 (cat:fibration-total f4))"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "x5"
+      "(cat:def x5 (cat:fibration-total f4))"
      ],
      "language": "python",
      "metadata": {},