Lout 3.24 tag.3.24

git-svn-id: http://svn.savannah.nongnu.org/svn/lout/tags/3.24@18 9365b830-b601-4143-9ba8-b4a8e2c3339c

3 files changed, 14 insertions, 31 deletions

diff --git a/include/README b/include/README
index 63ad651..2eb1841 100644
--- a/include/README
+++ b/include/README
@@ -34,6 +34,7 @@ Setup files (containing mainly lists of options settable by the user)
        blue             Blue
        perl             Perl + Pod
        pod              Pod
+       python           Python
 
 Source files (containing Lout and PostScript source code for the packages)
 --------------------------------------------------------------------------
@@ -70,6 +71,7 @@ Source files (containing Lout and PostScript source code for the packages)
        bluef            Blue
        perlf            Perl
        podf             Pod
+       pythonf          Python
 
 Miscellaneous
 -------------
diff --git a/include/bookf b/include/bookf
index f555e1f..70cf313 100644
--- a/include/bookf
+++ b/include/bookf
@@ -94,7 +94,7 @@ def @BookSetup
     named @SubAppendixGap		{  2.0v  @OrIfPlain 3f		}
     named @SubSubAppendixGap		{  1.5v  @OrIfPlain 2f		}
 
-    named @PrefaceInContents		{  No 				}
+    named @PrefaceInContents		{  Yes 				}
     named @AbbreviationsInContents	{  Yes				}
     named @IntroductionInContents	{  Yes				}
     named @PartInContents		{  Yes				}
@@ -686,7 +686,8 @@ def @BookSetup
 			    @PageHeaders { @PageHeaders }
 			    @Orient { @PageOrientation }
 			    @IntroFirstPageNumber
-		    //	NonStart @Runner @Owner { @Tag }
+		    # //	NonStart @Runner @Owner { @Tag }
+		    //	None @Runner @Owner { @Tag }
 		    //	@PageList
 			    @ColumnNumber { @ColumnNumber }
 			    @PageHeaders { @PageHeaders }
diff --git a/include/dsf b/include/dsf
index 16a1967..803fcc3 100644
--- a/include/dsf
+++ b/include/dsf
@@ -723,24 +723,6 @@ def @DocumentSetup
 	}
     }
 
-    def @DoBackground right @Orient
-    {	
-#     "LoutPageSet" @Graphic	# VT: case PDF produces nothing
-      { @BackEnd @Case {
-          PostScript @Yield "LoutPageSet"
-          else @Yield "% @DoBackground/LoutPageSet UNIMPLEMENTED"
-        }
-      } @Graphic
-      {
-	{ @OrientationAngle @Orient } @Rotate
-	{ @OrientedWidth @Orient } @Wide { @OrientedHeight @Orient } @High
-	{   //@TopMargin ||@OddLeftMargin
-	        @HExpand @VExpand @PageBackground
-	    ||@OddRightMargin //@FootMargin
-	}
-      }
-    }
-
     def @PageSet right x
     {	
 #     "LoutPageSet" @Graphic	# VT: case PDF produces nothing
@@ -768,12 +750,11 @@ def @DocumentSetup
 	named @Orient {}
 	right x
     {
-	# @DoBackground @Orient ||0io
 	@PageSet
 	{ @OrientationAngle @Orient } @Rotate
 	{ @OrientedWidth @Orient } @Wide { @OrientedHeight @Orient } @High
 	{   //@TopMargin ||@OddLeftMargin
-		@PageBackground @Background
+		{ // || @PageBackground } @Background
 	        # 1 @MargSet
 		@PageEnclose @PageBox @HExpand { extra // @VExpand x }
 	    ||@OddRightMargin //@FootMargin
@@ -786,11 +767,10 @@ def @DocumentSetup
 	right x
     {
 	@PageSet
-	# @DoBackground @Orient ||0io
 	{ @OrientationAngle @Orient } @Rotate
 	{ @OrientedWidth @Orient } @Wide { @OrientedHeight @Orient } @High
 	{   //@TopMargin ||@EvenLeftMargin
-		@PageBackground @Background
+		{ // || @PageBackground } @Background
 	        # 0 @MargSet
 		@PageEnclose @PageBox @HExpand { extra // @VExpand x }
 	    ||@EvenRightMargin //@FootMargin
@@ -2087,7 +2067,7 @@ def @DocumentSetup
 		  extra { extra }
 		  @AtTop { @AtTop }
 		  @FirstPageNum
-	    { Running Titles } @Yield @RunningPageList
+	    { Running Titles NoTitles } @Yield @RunningPageList
 		  @ColumnNumber { @ColumnNumber }
 		  @PageHeaders { @PageHeaders }
 		  @Orient { @Orient }
@@ -2115,7 +2095,7 @@ def @DocumentSetup
 		  extra { extra }
 		  @AtTop { @AtTop }
 		  @FirstPageNum
-	    { Running Titles } @Yield @RunningIntroPageList
+	    { Running Titles NoTitles } @Yield @RunningIntroPageList
 		  @ColumnNumber { @ColumnNumber }
 		  @PageHeaders { @PageHeaders }
 		  @Orient { @Orient }
@@ -2197,19 +2177,19 @@ def @DocumentSetup
     def @FigureContentsPlace { @Galley }
     def @TableContentsPlace { @Galley }
 
-    def @SendContents into { @ContentsPlace&&preceding }
+    def @SendContents into { @ContentsPlace&&foll_or_prec }
 	right x
     {
 	x
     }
 
-    def @SendFigureContents into { @FigureContentsPlace&&preceding }
+    def @SendFigureContents into { @FigureContentsPlace&&foll_or_prec }
 	right x
     {
 	x
     }
 
-    def @SendTableContents into { @TableContentsPlace&&preceding }
+    def @SendTableContents into { @TableContentsPlace&&foll_or_prec }
 	right x
     {
 	x
@@ -3647,8 +3627,8 @@ def @DocumentSetup
 		    title { @InitialLanguage @Language @ContentsCaption }
 		    pagenum { @PageOf @Tag }
 		// @FigureCounterIncrement @Tag
-		// @PageMark @Tag
 		// @Body
+		// @PageMark @Tag
 	    }
 	}
 
@@ -3892,8 +3872,8 @@ def @DocumentSetup
 		    title { @InitialLanguage @Language @ContentsCaption }
 		    pagenum { @PageOf @Tag }
 		// @TableCounterIncrement @Tag
-		// @PageMark @Tag
 		// @Body
+		// @PageMark @Tag
 	    }
 	}