Move to the 2d collection, and the 2d-lib package.

2d-lib/LICENSE.txt

@@ -1,5 +1,5 @@
-unstable-2d
+2d-lib
-Copyright (c) 2010-2014 PLT Design Inc.
+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

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))

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)])))))

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))

info.rkt

@@ -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))