Create rhombus picts instead of racket picts when rhombus is installed

Author: rfindler

redex-doc/redex/scribblings/ref/typesetting.scrbl

@@ -71,6 +71,15 @@ picts inline in the paper. For producing
 papers with LaTeX, create @filepath{.ps} files from the picts with Redex,
 which can be included into a LaTeX document.
 
+Redex picts can also be used with the
+@seclink["top" #:doc '(lib "rhombus/pict/scribblings/rhombus-pict.scrbl") #:indirect? #t]{
+ Rhombus's pict library}. When the Rhombus library is installed, Redex
+creates Rhombus picts and when it is not installed, Redex
+creates Racket picts. Rhombus picts are
+@tech[#:doc '(lib "pict/scribblings/pict.scrbl")]{pict
+ convertible}, however, so Rhombus picts can be used whenever the Racket library
+picts are expected.
+
 @section{Generating Picts}
 
 This section documents two sets of operations, one for

redex-lib/redex/private/loc-wrapper-rt.rkt

@@ -10,8 +10,8 @@
 
 (define (init-loc-wrapper e line column quoted?)
   (if quoted?
-      (make-lw e line #f column #f #f #f)
-      (make-lw e line #f column #f #t #f)))
+      (make-lw e line #f column #f #f #f #f)
+      (make-lw e line #f column #f #t #f #f)))
 
 (define (init-loc-wrapper/unquoted e line column)
   (init-loc-wrapper e line column #f))
@@ -22,13 +22,16 @@
 
 ;; e : (union string symbol #f (listof lw))
 ;; line, line-span, column, column-span : number
-(define-struct lw (e line line-span column column-span unq? metafunction?) 
+;; pict-tag is used when making a rhombus pict; it ends up 
+;;      in the metadata of the pict generated from the elements
+;;      of the list inside `e` (it shouldn't be there if there isn't a list)
+(define-struct lw (e line line-span column column-span unq? metafunction? pict-tag)
   #:mutable
   #:inspector (make-inspector))
 
 ;; build-lw is designed for external consumption
 (define (build-lw e line line-span column column-span)
-  (make-lw e line line-span column column-span #f #f))
+  (make-lw e line line-span column column-span #f #f #f))
 
 (define curly-quotes-for-strings (make-parameter #t))
 
@@ -49,7 +52,7 @@
         (init-loc-wrapper/unquoted (loop e) (loop line) (loop column))]
        [(vector 'make-lw e line line-span column column-span unq? metafunction?)
         (make-lw (loop e) (loop line) (loop line-span) (loop column) 
-                 (loop column-span) (loop unq?) (loop metafunction?))]
+                 (loop column-span) (loop unq?) (loop metafunction?) #f)]
        [(vector 'rewrite-quotes arg)
         (rewrite-quotes (loop arg))]
        [(vector 'list x ...)

redex-lib/redex/private/loc-wrapper.rkt

@@ -1,6 +1,8 @@
 #lang racket/base
 
 (require racket/contract
+         racket/math
+         racket/treelist
          (for-syntax racket/base)
          (for-syntax "loc-wrapper-ct.rkt")
          "loc-wrapper-rt.rkt")
@@ -23,7 +25,8 @@
              (column pnum)
              (column-span pnum)
              (unq? boolean?)
-             (metafunction? boolean?))))
+             (metafunction? boolean?)
+             (pict-tag (or/c string? treelist? #f)))))
 
 (provide to-lw
          to-lw/uq

redex-pict-lib/redex/pict.rkt

@@ -4,11 +4,10 @@
          "private/pict.rkt"
          "private/core-layout.rkt"
          "private/derivation-pict.rkt"
+         "private/pict-interface.rkt"
          redex/private/struct
          redex/private/loc-wrapper
-         redex/reduction-semantics
-         texpict/mrpict
-         (only-in pict/convert pict-convertible?))
+         redex/reduction-semantics)
 
 (define reduction-rule-style/c
   (or/c 'vertical 

redex-pict-lib/redex/private/arrow.rkt

@@ -1,8 +1,8 @@
 #lang racket/base
-(require texpict/mrpict
-         racket/draw
+(require racket/draw
          racket/class
-         racket/contract)
+         racket/contract
+         "pict-interface.rkt")
 
 (provide/contract
  [make-arrow-pict