From 5bbd6e27121929c9d50d2630ac3a4b1301385d21 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 14 Nov 2013 11:10:45 -0700 Subject: [PATCH] scribble: fix a rendering and cross-reference problem The problem is related to the recently introduced style split between definitions and references to definitions. original commit: 44f810aa72468961f73aad3161ea345cd1e3ed30 --- .../scribble-lib/scribble/private/manual-bind.rkt | 2 +- .../scribble-lib/scribble/private/manual-class.rkt | 3 +-- .../scribble-lib/scribble/private/manual-proc.rkt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt index 0d19da6d..7686510c 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-bind.rkt @@ -93,7 +93,7 @@ (define (gen defn?) (if sig (*sig-elem #:defn? defn? (sig-id sig) name) - (annote-exporting-library + ((if defn? annote-exporting-library values) (to-element #:defn? defn? (make-just-context name stx-id))))) (values (gen #t) (gen #f)))) diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt index 9586f350..d26f986c 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-class.rkt @@ -197,8 +197,7 @@ (list (let ([target-maker (id-to-target-maker stx-id #t)] [content (annote-exporting-library (to-element #:defn? #t stx-id))] - [ref-content (annote-exporting-library - (to-element stx-id))]) + [ref-content (to-element stx-id)]) (if target-maker (target-maker content diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt index 95b05068..e28c2f63 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/private/manual-proc.rkt @@ -708,7 +708,7 @@ (if link? (let () (define (gen defn?) - (annote-exporting-library + ((if defn? annote-exporting-library values) (to-element #:defn? defn? name-id))) (define content (gen #t)) (define ref-content (gen #f))