From b21a0182c1808c7b5ae6d103c43d16911e19cff3 Mon Sep 17 00:00:00 2001
From: Eli Barzilay <eli@racket-lang.org>
Date: Wed, 28 May 2008 01:52:01 +0000
Subject: [PATCH] removed index-page search hacks, added search-page stub

svn: r9994
---
 collects/scribble/basic.ss                  | 4 ++--
 collects/scribble/html-render.ss            | 5 ++++-
 collects/scribblings/main/config.ss         | 4 ++--
 collects/scribblings/main/info.ss           | 8 ++++----
 collects/scribblings/main/search.scrbl      | 8 ++++++++
 collects/scribblings/main/user/search.scrbl | 8 ++++++++
 6 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 collects/scribblings/main/search.scrbl
 create mode 100644 collects/scribblings/main/user/search.scrbl

diff --git a/collects/scribble/basic.ss b/collects/scribble/basic.ss
index 2da5029359..105efef015 100644
--- a/collects/scribble/basic.ss
+++ b/collects/scribble/basic.ss
@@ -237,8 +237,8 @@
     (lambda (renderer sec ri)
       (define l null)
       (define line-break (if (send renderer index-manual-newlines?)
-                             (make-element 'newline '("\n"))
-                             ""))
+                           (make-element 'newline '("\n"))
+                           ""))
       (define alpha-starts (make-hasheq))
       (hash-for-each
        (let ([parent (collected-info-parent (part-collected-info sec ri))])
diff --git a/collects/scribble/html-render.ss b/collects/scribble/html-render.ss
index ecc242f2d0..c1345c335f 100644
--- a/collects/scribble/html-render.ss
+++ b/collects/scribble/html-render.ss
@@ -105,6 +105,7 @@
 
 (define-serializable-struct literal-anchor (string))
 
+#; ; no need for these index-local searches
 #reader scribble/reader (begin ; easier to format
 
 (define search-script
@@ -607,6 +608,7 @@
                                 (make-element "nonavigation" index-content)
                                 (make-link-element
                                  #f index-content (car (part-tags index)))))
+                    #; ; no need for these index-local searches
                     ,@(if (eq? d index)
                         null
                         `((small nbsp
@@ -909,7 +911,8 @@
                                null))
                           ,@(render-flow d part ri #f))
                      (loop (cdr ds) (cdr as) (cdr vas))))]))))
-      `(,@(if index? `(,search-script ,search-field) '())
+      `(#; ; no need for these index-local searches
+        ,@(if index? `(,search-script ,search-field) '())
         (table ([cellspacing "0"]
                 ,@(if need-inline?
                     '([style "display: inline; vertical-align: top;"])
diff --git a/collects/scribblings/main/config.ss b/collects/scribblings/main/config.ss
index a296b9091c..d715f70454 100644
--- a/collects/scribblings/main/config.ss
+++ b/collects/scribblings/main/config.ss
@@ -16,12 +16,12 @@
   `((start   "PLT Manuals"      user "index.html")
     (search  "Search Manuals"   user "search/index.html")
     ---
-    (index   "Master Index"     user "master-index/index.html")
-    ---
     (license "License"          plt  "license/index.html")
     (acks    "Acknowledgements" plt  "acks/index.html")
     (release "Release Notes"    plt  "release/index.html")
     ---
+    (index   "Master Index"     user "master-index/index.html")
+    ---
     (bugreport "Report a Bug"   #f ,(format "~a?v=~a" bug-url (version)))))
 
 ;; Section definitions for manuals that appear on the start page.
diff --git a/collects/scribblings/main/info.ss b/collects/scribblings/main/info.ss
index 280d52159e..bb178dfcb0 100644
--- a/collects/scribblings/main/info.ss
+++ b/collects/scribblings/main/info.ss
@@ -5,10 +5,10 @@
      (main-doc-root always-run depends-all-main no-depend-on) (omit))
     ("user/start.scrbl"
      (user-doc-root always-run depends-all no-depend-on) (omit))
-    ("master-index.scrbl"
-     (depends-all-main no-depend-on) (omit))
-    ("user/master-index.scrbl"
-     (user-doc depends-all no-depend-on) (omit))
+    ("search.scrbl"       (depends-all-main no-depend-on) (omit))
+    ("master-index.scrbl" (depends-all-main no-depend-on) (omit))
+    ("user/search.scrbl"       (user-doc depends-all no-depend-on) (omit))
+    ("user/master-index.scrbl" (user-doc depends-all no-depend-on) (omit))
     ("license.scrbl" () (omit))
     ("acks.scrbl"    () (omit))
     ("release.scrbl" () (omit))))
diff --git a/collects/scribblings/main/search.scrbl b/collects/scribblings/main/search.scrbl
new file mode 100644
index 0000000000..d8db0c1d22
--- /dev/null
+++ b/collects/scribblings/main/search.scrbl
@@ -0,0 +1,8 @@
+#lang scribble/doc
+@(require scribble/basic
+          scribble/decode
+          "private/utils.ss")
+
+@main-page['search #t]
+
+Search page not implemented yet.
diff --git a/collects/scribblings/main/user/search.scrbl b/collects/scribblings/main/user/search.scrbl
new file mode 100644
index 0000000000..ed604316df
--- /dev/null
+++ b/collects/scribblings/main/user/search.scrbl
@@ -0,0 +1,8 @@
+#lang scribble/doc
+@(require scribble/basic
+          scribble/decode
+          "../private/utils.ss")
+
+@main-page['search #f]
+
+Search page not implemented yet.