bkyk8rc3zvpnsf5inmcqq4n3k98cv6hj-my-site-hyper-literate-git.test.suzanne.soy-0.0.1

commit 6b54708a3935622d122db9db2fb679872ce5ea46
parent 58fab5c3a660607c74aeeb8b3044d9c31e7ef5a7
Author: Matthew Flatt <mflatt@racket-lang.org>
Date:   Thu, 28 Mar 2013 18:58:23 -0600

scriblib/footnote: fix for non-Latex output

Also, fix warnings generated even for Latex mode.

original commit: 45f74eafe59df40ac7682e37aecce3b46ac05f06

Diffstat:
M
collects/scriblib/private/counter.rkt
 | 
22
++++++++++++++--------
A
collects/tests/scribble/docs/footnote.scrbl
 | 
12
++++++++++++
A
collects/tests/scribble/docs/footnote.txt
 | 
9
+++++++++

3 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/collects/scriblib/private/counter.rkt b/collects/scriblib/private/counter.rkt
@@ -1,4 +1,4 @@
-#lang scheme
+#lang racket/base
 (require scribble/core
          scribble/decode)
 
@@ -14,6 +14,11 @@
                      #:ref-wrap [ref-wrap (lambda (c s) c)])
   (make-counter 0 name target-wrap ref-wrap))
 
+(define (tag->counter-tag counter tag . kind)
+  (if (generated-tag? tag)
+      `(,(string->symbol (format "counter-~a" kind)) ,tag)
+      `(counter (,(counter-name counter) ,tag ,@kind))))
+
 (define (counter-target counter tag label 
                         #:continue? [continue? #f]
                         . content)
@@ -27,7 +32,7 @@
          (list
           (make-delayed-element
            (lambda (renderer part ri)
-             (let ([n (resolve-get part ri `(counter (,(counter-name counter) ,tag "value")))])
+             (let ([n (resolve-get part ri (tag->counter-tag counter tag "value"))])
                (let ([l (cons (format "~a" n) content)])
                  (if label
                      (list* label 'nbsp l)
@@ -43,16 +48,17 @@
                         (counter-n counter)
                         (add1 (counter-n counter)))])
              (set-counter-n! counter n)
-             (collect-put! ci `(counter (,(counter-name counter) ,tag "value")) n)))))
-       `(counter (,(counter-name counter) ,tag))))
+             (collect-put! ci (generate-tag (tag->counter-tag counter tag "value") ci) n)))))
+       (tag->counter-tag counter tag)))
     (if (counter-target-wrap counter)
         ((counter-target-wrap counter)
          c
-         (format "t:~a" (t-encode (list 'counter (list (counter-name counter) tag)))))
+         (format "t:~a" (t-encode (tag->counter-tag counter tag))))
         c)))
 
 (define (t-encode s)
-  (string-append*
+  (apply
+   string-append
    (map (lambda (c)
           (cond
             [(and (or (char-alphabetic? c) (char-numeric? c))
@@ -65,7 +71,7 @@
 (define (counter-ref counter tag label)
   (let ([n (make-delayed-element
             (lambda (renderer part ri)
-              (let ([n (resolve-get part ri `(counter (,(counter-name counter) ,tag "value")))])
+              (let ([n (resolve-get part ri (tag->counter-tag counter tag "value"))])
                 (if (counter-ref-wrap counter)
                     (let ([id (format "t:~a" (t-encode (list 'counter (list (counter-name counter) tag))))])
                       ((counter-ref-wrap counter)
@@ -86,7 +92,7 @@
           'nbsp
           n)
          n)
-     `(counter (,(counter-name counter) ,tag)))))
+     (tag->counter-tag counter tag))))
 
 (define (counter-collect-value counter)
   (counter-n counter))
diff --git a/collects/tests/scribble/docs/footnote.scrbl b/collects/tests/scribble/docs/footnote.scrbl
@@ -0,0 +1,12 @@
+#lang scribble/base
+@(require scriblib/footnote)
+
+@(define-footnote footnote generate-footnotes)
+
+@title{Document}
+
+Left.@footnote{A}
+
+Right.@footnote{A♯}
+
+@generate-footnotes[]
diff --git a/collects/tests/scribble/docs/footnote.txt b/collects/tests/scribble/docs/footnote.txt
@@ -0,0 +1,9 @@
+Document
+
+Left.1A
+
+Right.2A♯
+
+1A
+
+2A♯