and word

Author: mfelleisen

scribble-doc/scriblib/scribblings/figure.scrbl

@@ -86,10 +86,13 @@ provided for backward compatibility.}
 
 
 @defproc[(figure-ref [tag string?] ...+
-                     [#:link-render-style link-style (or/c link-render-style? #f)])
+                     [#:and-word and-word string? "and"]
+                     [#:link-render-style link-style (or/c link-render-style? #f) #f])
          element?]{
 
 Generates a reference to one or more figures, using a lowercase word ``figure''.
+When two tags are given, the @racket[connecting-word] is used to
+connect the two. 
 
 If @racket[link-style] or @racket[(current-link-render-style)] at the
 time of rendering indicates the @racket['number] style mode, then the

scribble-lib/scriblib/figure.rkt

@@ -18,11 +18,11 @@
                               (#:continue? any/c)
                               element?)]
           [Figure-ref (->* (string?)
-                           (#:link-render-style link-render-style?)
+                           (#:link-render-style link-render-style? #:and-word string?)
                            #:rest (listof string?)
                            element?)]
           [figure-ref (->* (string?)
-                           (#:link-render-style link-render-style?)
+                           (#:link-render-style link-render-style? #:and-word string?)
                            #:rest (listof string?)
                            element?)])
          left-figure-style
@@ -141,6 +141,7 @@
 
 (define (ref-proc initial)
   (lambda (tag #:link-render-style [link-style #f]
+               #:and-word (and-word "and")
                . tags)
     (cond
       [(null? tags)
@@ -153,7 +154,7 @@
        (define tag2 (car tags))
        (make-element #f (list (counter-ref figures tag1 (string-append initial "igures")
                                            #:link-render-style link-style)
-                              " and "
+                              (string-append " " and-word " ")
                               (counter-ref figures tag2 #f
                                            #:link-render-style link-style)))]
       [else