From 7308e4cc10b0e6ea8da6248c2b1963aae206ad12 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 8 Jul 2013 16:56:47 -0600 Subject: [PATCH] scribble: prefer dest-relative paths to collection-relative paths Documentation for a user-scoped package is rendered inside a collection path but moved outside of the collection path when later installed in installation-wide, so it's important to try a destination-relative path first. original commit: 301bdf9764d898fdadd6105a97462d1c87fb625e --- pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt b/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt index 258efe2c..21a9884a 100644 --- a/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt +++ b/pkgs/scribble-pkgs/scribble-lib/scribble/html-render.rkt @@ -259,9 +259,12 @@ (define (path->relative p) (let ([p (path->main-doc-relative p)]) (if (path? p) - (let ([p (path->collects-relative p)]) + (let ([p (path->root-relative p)]) (if (path? p) - (path->root-relative p) + (let ([p (path->collects-relative p)]) + (if (path? p) + p + (intern-taglet p))) (intern-taglet p))) (intern-taglet p))))