expand user in file module paths; move framework doc index to end, but also fix Scribble latex output when index is not at the end

svn: r9453

collects/scribble/latex-render.ss

@@ -85,6 +85,8 @@
           (render-flow (part-flow d) d ri #f)
           (for-each (lambda (sec) (render-part sec ri))
                     (part-parts d))
+          (when (part-style? d 'index)
+            (printf "\\onecolumn\n\n"))
           null))
       
       (define/override (render-paragraph p part ri)

collects/scribblings/framework/framework.scrbl

@@ -4,8 +4,6 @@
 
 @title{@bold{Framework}: PLT GUI Application Framework}
 
-@index-section[]
-
 @(defmodule framework/framework)
 
 @include-section["framework-application.scrbl"]
@@ -34,3 +32,5 @@
 @include-section["framework-scheme.scrbl"]
 @include-section["framework-text.scrbl"]
 @include-section["framework-version.scrbl"]
+
+@index-section[]

collects/scribblings/reference/syntax.scrbl

@@ -1473,7 +1473,7 @@ corresponds to the default @tech{module name resolver}.
 
  @defsubform[(file string)]{Similar to the plain @scheme[rel-string]
  case, but @scheme[string] is a path---possibly absolute---using the
- current platform's path conventions.}
+ current platform's path conventions and @scheme[expand-user-path].}
 
  @defsubform*[((planet id)
                (planet string)

src/mzscheme/src/cstartup.inc

@@ -14,11 +14,11 @@
 117,101,115,61,120,73,108,101,116,114,101,99,45,118,97,108,117,101,115,66,108,
 97,109,98,100,97,1,20,112,97,114,97,109,101,116,101,114,105,122,97,116,105,
 111,110,45,107,101,121,61,118,73,100,101,102,105,110,101,45,118,97,108,117,101,
-115,98,10,35,11,8,168,211,94,159,2,16,35,35,159,2,15,35,35,16,20,
+115,98,10,35,11,8,184,211,94,159,2,16,35,35,159,2,15,35,35,16,20,
 2,3,2,2,2,6,2,2,2,4,2,2,2,5,2,2,2,9,2,2,2,
 7,2,2,2,8,2,2,2,10,2,2,2,11,2,2,2,12,2,2,97,36,
-11,8,168,211,93,159,2,15,35,36,16,2,2,13,161,2,2,36,2,13,2,
+11,8,184,211,93,159,2,15,35,36,16,2,2,13,161,2,2,36,2,13,2,
-2,2,13,97,10,11,11,8,168,211,16,0,97,10,37,11,8,168,211,16,0,
+2,2,13,97,10,11,11,8,184,211,16,0,97,10,37,11,8,184,211,16,0,
 13,16,4,35,29,11,11,2,2,11,18,98,64,104,101,114,101,8,31,8,30,
 8,29,8,28,8,27,27,248,22,189,3,23,196,1,249,22,182,3,80,158,38,
 35,251,22,73,2,17,248,22,88,23,200,2,12,249,22,63,2,1,248,22,90,
@@ -28,14 +28,14 @@
 36,35,36,28,248,22,71,248,22,65,23,195,2,248,22,64,193,249,22,182,3,
 80,158,38,35,251,22,73,2,17,248,22,64,23,200,2,249,22,63,2,4,248,
 22,65,23,202,1,11,18,100,10,8,31,8,30,8,29,8,28,8,27,16,4,
-11,11,2,18,3,1,7,101,110,118,55,56,51,51,16,4,11,11,2,19,3,
+11,11,2,18,3,1,7,101,110,118,55,56,52,50,16,4,11,11,2,19,3,
-1,7,101,110,118,55,56,51,52,27,248,22,65,248,22,189,3,23,197,1,28,
+1,7,101,110,118,55,56,52,51,27,248,22,65,248,22,189,3,23,197,1,28,
 248,22,71,23,194,2,20,15,159,36,35,36,28,248,22,71,248,22,65,23,195,
 2,248,22,64,193,249,22,182,3,80,158,38,35,250,22,73,2,20,248,22,73,
 249,22,73,248,22,73,2,21,248,22,64,23,202,2,251,22,73,2,17,2,21,
 2,21,249,22,63,2,6,248,22,65,23,205,1,18,100,11,8,31,8,30,8,
-29,8,28,8,27,16,4,11,11,2,18,3,1,7,101,110,118,55,56,51,54,
+29,8,28,8,27,16,4,11,11,2,18,3,1,7,101,110,118,55,56,52,53,
-16,4,11,11,2,19,3,1,7,101,110,118,55,56,51,55,248,22,189,3,193,
+16,4,11,11,2,19,3,1,7,101,110,118,55,56,52,54,248,22,189,3,193,
 27,248,22,189,3,194,249,22,63,248,22,73,248,22,64,196,248,22,65,195,27,
 248,22,65,248,22,189,3,23,197,1,249,22,182,3,80,158,38,35,28,248,22,
 51,248,22,183,3,248,22,64,23,198,2,27,249,22,2,32,0,89,162,8,44,
@@ -65,8 +65,8 @@
 65,202,251,22,73,2,17,28,249,22,149,8,248,22,183,3,248,22,64,23,201,
 2,64,101,108,115,101,10,248,22,64,23,198,2,250,22,74,2,20,9,248,22,
 65,23,201,1,249,22,63,2,7,248,22,65,23,203,1,99,8,31,8,30,8,
-29,8,28,8,27,16,4,11,11,2,18,3,1,7,101,110,118,55,56,53,57,
+29,8,28,8,27,16,4,11,11,2,18,3,1,7,101,110,118,55,56,54,56,
-16,4,11,11,2,19,3,1,7,101,110,118,55,56,54,48,18,158,94,10,64,
+16,4,11,11,2,19,3,1,7,101,110,118,55,56,54,57,18,158,94,10,64,
 118,111,105,100,8,47,27,248,22,65,248,22,189,3,196,249,22,182,3,80,158,
 38,35,28,248,22,51,248,22,183,3,248,22,64,197,250,22,73,2,26,248,22,
 73,248,22,64,199,248,22,88,198,27,248,22,183,3,248,22,64,197,250,22,73,
@@ -348,7 +348,7 @@
 111,116,101,29,94,2,1,67,35,37,117,116,105,108,115,11,29,94,2,1,69,
 35,37,110,101,116,119,111,114,107,11,29,94,2,1,68,35,37,112,97,114,97,
 109,122,11,29,94,2,1,68,35,37,101,120,112,111,98,115,11,29,94,2,1,
-68,35,37,107,101,114,110,101,108,11,98,10,35,11,8,170,213,97,159,2,2,
+68,35,37,107,101,114,110,101,108,11,98,10,35,11,8,186,213,97,159,2,2,
 35,35,159,2,3,35,35,159,2,4,35,35,159,2,5,35,35,159,2,6,35,
 35,16,0,159,35,20,103,159,35,16,1,20,24,65,98,101,103,105,110,16,0,
 83,158,41,20,100,137,69,35,37,98,117,105,108,116,105,110,29,11,11,10,10,
@@ -365,7 +365,7 @@
 0,200,0,223,0,3,1,8,1,13,1,18,1,23,1,54,1,58,1,66,1,
 74,1,82,1,185,1,230,1,250,1,29,2,64,2,98,2,108,2,155,2,165,
 2,172,2,71,4,84,4,103,4,222,4,234,4,138,5,152,5,16,6,22,6,
-36,6,63,6,148,6,150,6,211,6,138,12,197,12,229,12,0,0,154,15,0,
+36,6,63,6,148,6,150,6,211,6,142,12,201,12,233,12,0,0,158,15,0,
 0,29,11,11,70,100,108,108,45,115,117,102,102,105,120,1,25,100,101,102,97,
 117,108,116,45,108,111,97,100,47,117,115,101,45,99,111,109,112,105,108,101,100,
 65,113,117,111,116,101,29,94,2,4,67,35,37,117,116,105,108,115,11,29,94,
@@ -490,72 +490,72 @@
 28,248,22,71,23,197,1,87,94,23,197,1,6,7,7,109,97,105,110,46,115,
 115,28,249,22,166,13,0,8,35,114,120,34,91,46,93,34,23,199,2,23,197,
 1,249,22,167,6,23,199,1,6,3,3,46,115,115,28,249,22,149,8,248,22,
-64,23,201,2,64,102,105,108,101,249,22,139,13,248,22,88,23,201,2,248,80,
+64,23,201,2,64,102,105,108,101,249,22,139,13,248,22,143,13,248,22,88,23,
-159,42,55,36,23,202,2,12,87,94,28,28,248,22,178,12,23,194,2,10,248,
+202,2,248,80,159,42,55,36,23,202,2,12,87,94,28,28,248,22,178,12,23,
-22,166,7,23,194,2,87,94,23,200,1,12,28,23,200,2,250,22,178,8,67,
+194,2,10,248,22,166,7,23,194,2,87,94,23,200,1,12,28,23,200,2,250,
-114,101,113,117,105,114,101,249,22,128,7,6,17,17,98,97,100,32,109,111,100,
+22,178,8,67,114,101,113,117,105,114,101,249,22,128,7,6,17,17,98,97,100,
-117,108,101,32,112,97,116,104,126,97,28,23,198,2,248,22,64,23,199,2,6,
+32,109,111,100,117,108,101,32,112,97,116,104,126,97,28,23,198,2,248,22,64,
-0,0,23,203,1,87,94,23,200,1,250,22,179,8,2,20,249,22,128,7,6,
+23,199,2,6,0,0,23,203,1,87,94,23,200,1,250,22,179,8,2,20,249,
-13,13,109,111,100,117,108,101,32,112,97,116,104,126,97,28,23,198,2,248,22,
+22,128,7,6,13,13,109,111,100,117,108,101,32,112,97,116,104,126,97,28,23,
-64,23,199,2,6,0,0,23,201,2,27,28,248,22,166,7,23,195,2,249,22,
+198,2,248,22,64,23,199,2,6,0,0,23,201,2,27,28,248,22,166,7,23,
-171,7,23,196,2,35,249,22,141,13,248,22,142,13,23,197,2,11,27,28,248,
+195,2,249,22,171,7,23,196,2,35,249,22,141,13,248,22,142,13,23,197,2,
-22,166,7,23,196,2,249,22,171,7,23,197,2,36,248,80,158,42,51,23,195,
+11,27,28,248,22,166,7,23,196,2,249,22,171,7,23,197,2,36,248,80,158,
-2,91,159,38,11,90,161,38,35,11,28,248,22,166,7,23,199,2,250,22,7,
+42,51,23,195,2,91,159,38,11,90,161,38,35,11,28,248,22,166,7,23,199,
-2,22,249,22,171,7,23,203,2,37,2,22,248,22,135,13,23,198,2,87,95,
+2,250,22,7,2,22,249,22,171,7,23,203,2,37,2,22,248,22,135,13,23,
-23,195,1,23,193,1,27,28,248,22,166,7,23,200,2,249,22,171,7,23,201,
+198,2,87,95,23,195,1,23,193,1,27,28,248,22,166,7,23,200,2,249,22,
-2,38,249,80,158,47,52,23,197,2,5,0,27,28,248,22,166,7,23,201,2,
+171,7,23,201,2,38,249,80,158,47,52,23,197,2,5,0,27,28,248,22,166,
-249,22,171,7,23,202,2,39,248,22,159,4,23,200,2,27,27,250,22,133,2,
+7,23,201,2,249,22,171,7,23,202,2,39,248,22,159,4,23,200,2,27,27,
-80,158,51,42,248,22,182,13,247,22,161,11,11,28,23,193,2,192,87,94,23,
+250,22,133,2,80,158,51,42,248,22,182,13,247,22,161,11,11,28,23,193,2,
-193,1,27,247,22,121,87,94,250,22,131,2,80,158,52,42,248,22,182,13,247,
+192,87,94,23,193,1,27,247,22,121,87,94,250,22,131,2,80,158,52,42,248,
-22,161,11,195,192,87,95,28,23,209,1,27,250,22,133,2,23,197,2,197,11,
+22,182,13,247,22,161,11,195,192,87,95,28,23,209,1,27,250,22,133,2,23,
-28,23,193,1,12,87,95,27,27,28,248,22,17,80,158,51,45,80,158,50,45,
+197,2,197,11,28,23,193,1,12,87,95,27,27,28,248,22,17,80,158,51,45,
-247,22,19,250,22,25,248,22,23,23,197,2,80,158,53,44,23,196,1,27,247,
+80,158,50,45,247,22,19,250,22,25,248,22,23,23,197,2,80,158,53,44,23,
-22,161,11,249,22,3,83,158,39,20,97,94,89,162,8,44,36,54,9,226,12,
+196,1,27,247,22,161,11,249,22,3,83,158,39,20,97,94,89,162,8,44,36,
-11,2,3,33,46,23,195,1,23,196,1,248,28,248,22,17,80,158,50,45,32,
+54,9,226,12,11,2,3,33,46,23,195,1,23,196,1,248,28,248,22,17,80,
-0,89,162,43,36,41,9,222,33,47,80,159,49,57,36,89,162,43,35,50,9,
+158,50,45,32,0,89,162,43,36,41,9,222,33,47,80,159,49,57,36,89,162,
-227,14,9,8,4,3,33,48,250,22,131,2,23,197,1,197,10,12,28,28,248,
+43,35,50,9,227,14,9,8,4,3,33,48,250,22,131,2,23,197,1,197,10,
-22,166,7,23,202,1,11,27,248,22,144,6,23,208,2,28,192,192,28,248,22,
+12,28,28,248,22,166,7,23,202,1,11,27,248,22,144,6,23,208,2,28,192,
-61,23,208,2,249,22,149,8,248,22,64,23,210,2,2,21,11,250,22,131,2,
+192,28,248,22,61,23,208,2,249,22,149,8,248,22,64,23,210,2,2,21,11,
-80,158,50,43,28,248,22,144,6,23,210,2,249,22,63,23,211,1,248,80,159,
+250,22,131,2,80,158,50,43,28,248,22,144,6,23,210,2,249,22,63,23,211,
-53,55,36,23,213,1,87,94,23,210,1,249,22,63,23,211,1,247,22,155,13,
+1,248,80,159,53,55,36,23,213,1,87,94,23,210,1,249,22,63,23,211,1,
-252,22,168,7,23,208,1,23,207,1,23,205,1,23,203,1,201,12,193,91,159,
+247,22,155,13,252,22,168,7,23,208,1,23,207,1,23,205,1,23,203,1,201,
-37,10,90,161,36,35,10,11,90,161,36,36,10,83,158,38,20,96,96,2,20,
+12,193,91,159,37,10,90,161,36,35,10,11,90,161,36,36,10,83,158,38,20,
-89,162,8,44,36,50,9,224,2,0,33,42,89,162,43,38,48,9,223,1,33,
+96,96,2,20,89,162,8,44,36,50,9,224,2,0,33,42,89,162,43,38,48,
-43,89,162,43,39,8,30,9,225,2,3,0,33,49,208,87,95,248,22,141,4,
+9,223,1,33,43,89,162,43,39,8,30,9,225,2,3,0,33,49,208,87,95,
-248,80,158,37,49,247,22,161,11,248,22,131,6,80,158,36,36,248,22,152,12,
+248,22,141,4,248,80,158,37,49,247,22,161,11,248,22,131,6,80,158,36,36,
-80,159,36,41,36,159,35,20,103,159,35,16,1,20,24,65,98,101,103,105,110,
+248,22,152,12,80,159,36,41,36,159,35,20,103,159,35,16,1,20,24,65,98,
-16,0,83,158,41,20,100,137,66,35,37,98,111,111,116,2,1,11,10,10,36,
+101,103,105,110,16,0,83,158,41,20,100,137,66,35,37,98,111,111,116,2,1,
-80,158,35,35,20,103,159,39,16,19,30,2,1,2,2,193,30,2,1,2,3,
+11,10,10,36,80,158,35,35,20,103,159,39,16,19,30,2,1,2,2,193,30,
-193,30,2,5,72,112,97,116,104,45,115,116,114,105,110,103,63,10,30,2,5,
+2,1,2,3,193,30,2,5,72,112,97,116,104,45,115,116,114,105,110,103,63,
-75,112,97,116,104,45,97,100,100,45,115,117,102,102,105,120,7,30,2,6,1,
+10,30,2,5,75,112,97,116,104,45,97,100,100,45,115,117,102,102,105,120,7,
-20,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,45,107,101,121,
+30,2,6,1,20,112,97,114,97,109,101,116,101,114,105,122,97,116,105,111,110,
-4,30,2,6,1,23,101,120,116,101,110,100,45,112,97,114,97,109,101,116,101,
+45,107,101,121,4,30,2,6,1,23,101,120,116,101,110,100,45,112,97,114,97,
-114,105,122,97,116,105,111,110,3,30,2,1,2,7,193,30,2,1,2,8,193,
+109,101,116,101,114,105,122,97,116,105,111,110,3,30,2,1,2,7,193,30,2,
-30,2,1,2,9,193,30,2,1,2,10,193,30,2,1,2,11,193,30,2,1,
+1,2,8,193,30,2,1,2,9,193,30,2,1,2,10,193,30,2,1,2,11,
-2,12,193,30,2,1,2,13,193,30,2,1,2,14,193,30,2,1,2,15,193,
+193,30,2,1,2,12,193,30,2,1,2,13,193,30,2,1,2,14,193,30,2,
-30,2,5,69,45,102,105,110,100,45,99,111,108,0,30,2,5,76,110,111,114,
+1,2,15,193,30,2,5,69,45,102,105,110,100,45,99,111,108,0,30,2,5,
-109,97,108,45,99,97,115,101,45,112,97,116,104,6,30,2,5,79,112,97,116,
+76,110,111,114,109,97,108,45,99,97,115,101,45,112,97,116,104,6,30,2,5,
-104,45,114,101,112,108,97,99,101,45,115,117,102,102,105,120,9,30,2,1,2,
+79,112,97,116,104,45,114,101,112,108,97,99,101,45,115,117,102,102,105,120,9,
-16,193,16,0,11,11,16,11,2,10,2,11,2,8,2,9,2,12,2,13,2,
+30,2,1,2,16,193,16,0,11,11,16,11,2,10,2,11,2,8,2,9,2,
-3,2,7,2,2,2,15,2,14,46,11,38,35,11,11,16,1,2,16,16,1,
+12,2,13,2,3,2,7,2,2,2,15,2,14,46,11,38,35,11,11,16,1,
-11,16,1,2,16,36,36,36,11,11,16,0,16,0,16,0,35,35,11,11,11,
+2,16,16,1,11,16,1,2,16,36,36,36,11,11,16,0,16,0,16,0,35,
-16,0,16,0,16,0,35,35,16,0,16,16,83,158,35,16,2,89,162,43,36,
+35,11,11,11,16,0,16,0,16,0,35,35,16,0,16,16,83,158,35,16,2,
-44,9,223,0,33,23,80,159,35,57,36,83,158,35,16,2,89,162,43,36,44,
+89,162,43,36,44,9,223,0,33,23,80,159,35,57,36,83,158,35,16,2,89,
-9,223,0,33,24,80,159,35,56,36,83,158,35,16,2,89,162,43,36,48,67,
+162,43,36,44,9,223,0,33,24,80,159,35,56,36,83,158,35,16,2,89,162,
-103,101,116,45,100,105,114,223,0,33,25,80,159,35,55,36,83,158,35,16,2,
+43,36,48,67,103,101,116,45,100,105,114,223,0,33,25,80,159,35,55,36,83,
-89,162,43,37,48,68,119,105,116,104,45,100,105,114,223,0,33,26,80,159,35,
+158,35,16,2,89,162,43,37,48,68,119,105,116,104,45,100,105,114,223,0,33,
-54,36,83,158,35,16,2,248,22,163,7,69,115,111,45,115,117,102,102,105,120,
+26,80,159,35,54,36,83,158,35,16,2,248,22,163,7,69,115,111,45,115,117,
-80,159,35,35,36,83,158,35,16,2,89,162,43,37,59,2,3,223,0,33,35,
+102,102,105,120,80,159,35,35,36,83,158,35,16,2,89,162,43,37,59,2,3,
-80,159,35,36,36,83,158,35,16,2,32,0,89,162,8,44,36,41,2,7,222,
+223,0,33,35,80,159,35,36,36,83,158,35,16,2,32,0,89,162,8,44,36,
-192,80,159,35,41,36,83,158,35,16,2,247,22,123,80,159,35,42,36,83,158,
+41,2,7,222,192,80,159,35,41,36,83,158,35,16,2,247,22,123,80,159,35,
-35,16,2,247,22,122,80,159,35,43,36,83,158,35,16,2,247,22,59,80,159,
+42,36,83,158,35,16,2,247,22,122,80,159,35,43,36,83,158,35,16,2,247,
-35,44,36,83,158,35,16,2,248,22,18,74,109,111,100,117,108,101,45,108,111,
+22,59,80,159,35,44,36,83,158,35,16,2,248,22,18,74,109,111,100,117,108,
-97,100,105,110,103,80,159,35,45,36,83,158,35,16,2,11,80,158,35,46,83,
+101,45,108,111,97,100,105,110,103,80,159,35,45,36,83,158,35,16,2,11,80,
-158,35,16,2,11,80,158,35,47,83,158,35,16,2,32,0,89,162,43,37,44,
+158,35,46,83,158,35,16,2,11,80,158,35,47,83,158,35,16,2,32,0,89,
-2,14,222,33,41,80,159,35,48,36,83,158,35,16,2,89,162,8,44,36,44,
+162,43,37,44,2,14,222,33,41,80,159,35,48,36,83,158,35,16,2,89,162,
-2,15,223,0,33,50,80,159,35,49,36,83,158,35,16,2,89,162,43,35,43,
+8,44,36,44,2,15,223,0,33,50,80,159,35,49,36,83,158,35,16,2,89,
-2,16,223,0,33,51,80,159,35,53,36,95,29,94,2,4,68,35,37,107,101,
+162,43,35,43,2,16,223,0,33,51,80,159,35,53,36,95,29,94,2,4,68,
-114,110,101,108,11,29,94,2,4,69,35,37,109,105,110,45,115,116,120,11,2,
+35,37,107,101,114,110,101,108,11,29,94,2,4,69,35,37,109,105,110,45,115,
-5,9,9,9,35,0};
+116,120,11,2,5,9,9,9,35,0};
-    EVAL_ONE_SIZED_STR((char *)expr, 4121);
+    EVAL_ONE_SIZED_STR((char *)expr, 4125);
   }

src/mzscheme/src/startup.inc

@@ -605,7 +605,7 @@
 " file"
 " (string-append file \".ss\")))))))))"
 "((eq?(car s) 'file)"
-"(path->complete-path(cadr s)(get-dir))))))"
+"(path->complete-path(expand-user-path(cadr s))(get-dir))))))"
 "(unless(or(path? s-parsed) "
 "(vector? s-parsed))"
 "(if stx"

src/mzscheme/src/startup.ss

@@ -692,7 +692,7 @@
                                                          file
                                                          (string-append file ".ss"))))))))]
                       [(eq? (car s) 'file)
-                       (path->complete-path (cadr s) (get-dir))])])
+                       (path->complete-path (expand-user-path (cadr s)) (get-dir))])])
                 (unless (or (path? s-parsed)			  
                             (vector? s-parsed))
                   (if stx