up links in all documents, and they go to the user docs using cookies

svn: r9992

collects/scribble/html-render.ss

@@ -219,6 +219,9 @@
              quiet-table-of-contents)
 
     (init-field [css-path #f]
+                ;; up-path is either a link "up", or #t which uses
+                ;; goes to start page (using cookies to get to the
+                ;; user start page)
                 [up-path #f]
                 [style-file #f]
                 [script-path #f]
@@ -620,14 +623,26 @@
                   prev-content)
                  sep-element
                  (make-element
-                  (if (or parent up-path)
+                  (cond
+                    ;; up-path = #t => go up to the start page, using
+                    ;; cookies to get to the user's version of it (see
+                    ;; scribblings/main/private/utils for the code
+                    ;; that creates these cookies.)
+                    [(and (eq? #t up-path) (not parent))
+                     (make-target-url
+                      "../index.html"
+                      (make-with-attributes
+                       #f `([onclick
+                             . ,(format "return GotoPLTRoot(\"~a\");"
+                                        (version))])))]
+                    [(or parent up-path)
                      (make-target-url
                       (cond [(not parent) up-path]
                             [(and (toc-part? parent) (part-parent parent ri))
                              (derive-filename parent)]
                             [else "index.html"])
-                     #f)
+                      #f)]
-                    "nonavigation")
+                    [else "nonavigation"])
                   up-content)
                  sep-element
                  (make-element
@@ -815,8 +830,8 @@
                              (if (path? addr)
                                (from-root addr (get-dest-directory))
                                addr))]
-                      ;; The target-url chains to another style. Allow
+                    ;; The target-url chains to another style,
-                      ;;  `with-attributes' inside as well as outside:
+                    ;; flatten-style above takes care of it though.
                     ,@(let ([style (target-url-style style)])
                         (if (string? style)
                           `([class ,style])

collects/scribble/scribble-common.js

@@ -19,19 +19,21 @@ function SetCookie(key, val) {
     key + "=" + escape(val) + "; expires="+ d.toGMTString() + "; path=/";
 }
 
-function GotoPLTRoot(ver) {
+// note that this always stores a directory name, ending with a "/"
-  var u = GetCookie("PLT_Root."+ver);
-  if (u == null) return true; // no cookie: use plain up link
-  location = u;
-  return false;
-}
-
 function SetPLTRoot(ver, relative) {
   var root = location.protocol + "//" + location.host
            + NormalizePath(location.pathname.replace(/[^\/]*$/, relative));
   SetCookie("PLT_Root."+ver, root);
 }
 
+// adding index.html works because of the above
+function GotoPLTRoot(ver) {
+  var u = GetCookie("PLT_Root."+ver);
+  if (u == null) return true; // no cookie: use plain up link
+  location = u + "index.html";
+  return false;
+}
+
 normalize_rxs = [/\/\/+/g, /\/\.(\/|$)/, /\/[^\/]*\/\.\.(\/|$)/];
 function NormalizePath(path) {
   var tmp, i;

collects/scribble/struct.ss

@@ -172,7 +172,7 @@
                   [parent (or/c false/c part?)]
                   [info any/c])]
 
- [target-url ([addr (or/c string? path?)][style any/c])]
+ [target-url ([addr (or/c string? path?)] [style any/c])]
  [url-anchor ([name string?])]
  [image-file ([path (or/c path-string?
                           (cons/c (one-of/c 'collects)

collects/setup/scribble.ss

@@ -224,9 +224,12 @@
   (if latex-dest
     (new (latex:render-mixin render%)
          [dest-dir latex-dest])
-    (let ([multi? (memq 'multi-page (doc-flags doc))]
+    (let* ([flags (doc-flags doc)]
+           [multi? (memq 'multi-page flags)]
            [main?  (doc-under-main? doc)]
-          [ddir (doc-dest-dir doc)])
+           [ddir   (doc-dest-dir doc)]
+           [root?  (or (memq 'main-doc-root flags)
+                       (memq 'user-doc-root flags))])
       (new ((if multi? html:render-multi-mixin values)
             (html:render-mixin render%))
         [dest-dir (if multi?
@@ -234,7 +237,10 @@
                     ddir)]
         [css-path    (and main? "../scribble.css")]
         [script-path (and main? "../scribble-common.js")]
-        [up-path     (and main? "../index.html")]))))
+        ;; up-path is #t, which makes it go to the (user's) start page
+        ;; (using cookies) -- except when it is the start page itself
+        ;; (one of the two)
+        [up-path     (not root?)]))))
 
 (define (pick-dest latex-dest doc)
   (cond [latex-dest