From cf245c04d3c9ba07bda82341c8fd7ada14f577f4 Mon Sep 17 00:00:00 2001
From: Vincent St-Amour <stamourv@racket-lang.org>
Date: Mon, 7 Sep 2015 17:28:55 -0500
Subject: [PATCH] Move to the 2d collection, and the 2d-lib package.

---
 LICENSE.txt => 2d-lib/LICENSE.txt             | 4 ++--
 {unstable/2d => 2d-lib}/cond.rkt              | 0
 {unstable/2d => 2d-lib}/dir-chars.rkt         | 0
 2d-lib/info.rkt                               | 7 +++++++
 {unstable/2d => 2d-lib}/lang/reader.rkt       | 2 +-
 {unstable/2d => 2d-lib}/lexer.rkt             | 0
 {unstable/2d => 2d-lib}/match.rkt             | 0
 {unstable/2d => 2d-lib}/private/lexer.rkt     | 4 ++--
 {unstable/2d => 2d-lib}/private/read-util.rkt | 0
 {unstable/2d => 2d-lib}/private/readtable.rkt | 0
 {unstable/2d => 2d-lib}/tabular.rkt           | 0
 info.rkt                                      | 8 --------
 12 files changed, 12 insertions(+), 13 deletions(-)
 rename LICENSE.txt => 2d-lib/LICENSE.txt (90%)
 rename {unstable/2d => 2d-lib}/cond.rkt (100%)
 rename {unstable/2d => 2d-lib}/dir-chars.rkt (100%)
 create mode 100644 2d-lib/info.rkt
 rename {unstable/2d => 2d-lib}/lang/reader.rkt (94%)
 rename {unstable/2d => 2d-lib}/lexer.rkt (100%)
 rename {unstable/2d => 2d-lib}/match.rkt (100%)
 rename {unstable/2d => 2d-lib}/private/lexer.rkt (99%)
 rename {unstable/2d => 2d-lib}/private/read-util.rkt (100%)
 rename {unstable/2d => 2d-lib}/private/readtable.rkt (100%)
 rename {unstable/2d => 2d-lib}/tabular.rkt (100%)
 delete mode 100644 info.rkt

diff --git a/LICENSE.txt b/2d-lib/LICENSE.txt
similarity index 90%
rename from LICENSE.txt
rename to 2d-lib/LICENSE.txt
index d156008..70153f6 100644
--- a/LICENSE.txt
+++ b/2d-lib/LICENSE.txt
@@ -1,5 +1,5 @@
-unstable-2d
-Copyright (c) 2010-2014 PLT Design Inc.
+2d-lib
+Copyright (c) 2010-2015 PLT Design Inc.
 
 This package is distributed under the GNU Lesser General Public
 License (LGPL).  This means that you can link this package into proprietary
diff --git a/unstable/2d/cond.rkt b/2d-lib/cond.rkt
similarity index 100%
rename from unstable/2d/cond.rkt
rename to 2d-lib/cond.rkt
diff --git a/unstable/2d/dir-chars.rkt b/2d-lib/dir-chars.rkt
similarity index 100%
rename from unstable/2d/dir-chars.rkt
rename to 2d-lib/dir-chars.rkt
diff --git a/2d-lib/info.rkt b/2d-lib/info.rkt
new file mode 100644
index 0000000..7de5637
--- /dev/null
+++ b/2d-lib/info.rkt
@@ -0,0 +1,7 @@
+#lang info
+
+(define collection "2d")
+(define version "1.0")
+(define deps '("base"))
+(define pkg-desc "Implementation (no documentation) part of \"2d\"")
+(define pkg-authors '(robby))
diff --git a/unstable/2d/lang/reader.rkt b/2d-lib/lang/reader.rkt
similarity index 94%
rename from unstable/2d/lang/reader.rkt
rename to 2d-lib/lang/reader.rkt
index b9b9a69..0304ad0 100644
--- a/unstable/2d/lang/reader.rkt
+++ b/2d-lib/lang/reader.rkt
@@ -33,5 +33,5 @@
           (define theirs 
             (or (and proc (proc key #f))
                 (dynamic-require 'syntax-color/racket-lexer 'racket-lexer)))
-          ((dynamic-require 'unstable/2d/lexer '2d-lexer) theirs)]
+          ((dynamic-require '2d/lexer '2d-lexer) theirs)]
          [else (if proc (proc key defval) defval)])))))
diff --git a/unstable/2d/lexer.rkt b/2d-lib/lexer.rkt
similarity index 100%
rename from unstable/2d/lexer.rkt
rename to 2d-lib/lexer.rkt
diff --git a/unstable/2d/match.rkt b/2d-lib/match.rkt
similarity index 100%
rename from unstable/2d/match.rkt
rename to 2d-lib/match.rkt
diff --git a/unstable/2d/private/lexer.rkt b/2d-lib/private/lexer.rkt
similarity index 99%
rename from unstable/2d/private/lexer.rkt
rename to 2d-lib/private/lexer.rkt
index 01abcc2..07532d9 100644
--- a/unstable/2d/private/lexer.rkt
+++ b/2d-lib/private/lexer.rkt
@@ -167,7 +167,7 @@ todo:
            [c1 (in-string eol-string)])
        (define c2 (read-char-or-special peek-port))
        (unless (equal? c1 c2)
-         (error 'unstable/2d/lexer.rkt "got an unexpected char.1 ~s vs ~s" c1 c2)))
+         (error '2d/lexer.rkt "got an unexpected char.1 ~s vs ~s" c1 c2)))
      
      (define the-state (make-state line pos (string-length first-tok-string)))
      (setup-state the-state)
@@ -215,7 +215,7 @@ todo:
              (define error-pos (- (srcloc-position (car (exn:fail:read-srclocs failed)))
                                   base-position)) ;; account for the newline
              (when (< error-pos 0)
-               (error 'unstable/2d/lexer.rkt "got error-pos < 0: ~s ~s" 
+               (error '2d/lexer.rkt "got error-pos < 0: ~s ~s" 
                       (srcloc-position (car (exn:fail:read-srclocs failed)))
                       base-position))
              (define peek-port2 (peeking-input-port port))
diff --git a/unstable/2d/private/read-util.rkt b/2d-lib/private/read-util.rkt
similarity index 100%
rename from unstable/2d/private/read-util.rkt
rename to 2d-lib/private/read-util.rkt
diff --git a/unstable/2d/private/readtable.rkt b/2d-lib/private/readtable.rkt
similarity index 100%
rename from unstable/2d/private/readtable.rkt
rename to 2d-lib/private/readtable.rkt
diff --git a/unstable/2d/tabular.rkt b/2d-lib/tabular.rkt
similarity index 100%
rename from unstable/2d/tabular.rkt
rename to 2d-lib/tabular.rkt
diff --git a/info.rkt b/info.rkt
deleted file mode 100644
index 034419b..0000000
--- a/info.rkt
+++ /dev/null
@@ -1,8 +0,0 @@
-#lang info
-
-(define collection 'multi)
-(define deps '("base" "scribble-lib" "syntax-color-lib"))
-
-(define pkg-desc "Experimental 2d syntax")
-
-(define pkg-authors '(robby))