Lout 3.33.

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

1 files changed, 66 insertions, 0 deletions

diff --git a/include/bookf b/include/bookf
index 4ae9141..fde3b80 100644
--- a/include/bookf
+++ b/include/bookf
@@ -22,6 +22,7 @@ def @BookSetup
     named @ContentsWord			{  contents			}
     named @FigureListWord		{  figurelist			}
     named @TableListWord		{  tablelist			}
+    named @FloaterListWord		{  floaterlist			}
     named @IntroductionWord		{  introduction			}
     named @AbbreviationsWord		{  abbreviations		}
     named @ChapterWord			{  chapter			}
@@ -191,6 +192,16 @@ def @BookSetup
     named @SubAppendixNumInTables	{  No				}
     named @SubSubAppendixNumInTables	{  No				}
 
+    named @SubPrefaceNumInFloaters	{  No				}
+    named @SubIntroductionNumInFloaters	{  No				}
+    named @ChapterNumInFloaters		{  Yes				}
+    named @SectionNumInFloaters		{  No				}
+    named @SubSectionNumInFloaters	{  No				}
+    named @SubSubSectionNumInFloaters	{  No				}
+    named @AppendixNumInFloaters	{  Yes				}
+    named @SubAppendixNumInFloaters	{  No				}
+    named @SubSubAppendixNumInFloaters	{  No				}
+
     named @SubPrefaceNumInRunners	{  No				}
     named @SubIntroductionNumInRunners	{  No				}
     named @SectionNumInRunners		{  Yes				}
@@ -203,6 +214,7 @@ def @BookSetup
     named @ContentsPrefix		{				}
     named @FigureContentsPrefix		{				}
     named @TableContentsPrefix		{				}
+    named @FloaterContentsPrefix	{				}
     named @AbbreviationsPrefix		{				}
     named @IntroductionPrefix		{				}
     named @ChapterPrefix		{				}
@@ -494,6 +506,27 @@ def @BookSetup
 		@TableContentsSection
 	}
 
+	def @FloaterContentsPart
+	    named @Tag {}
+	{
+	    @LargeScaleStructure
+		tag { @Tag }
+		type { ExtraMajorIntro }
+		initiallanguage { @InitialLanguage }
+		title { floaterlist @WordVal @FloaterListWord }
+		aboveheadinggap { @AboveChapterGap }
+		headingfont { @ChapterHeadingFont }
+		headingbreak { @ChapterHeadingBreak }
+		headingformat { @Num @ChapterHeadingFormat @Body }
+		incontents { No }
+		pnprefix { @FloaterContentsPrefix }
+		inrunners { Yes }
+		majortitle { floaterlist @WordVal @FloaterListWord }
+		sendheader { @ChooseFull @Body }
+		innergap { @SectionGap }
+		@FloaterContentsSection
+	}
+
 	def @ReferencesPart
 	    named @Tag {}
 	{
@@ -707,6 +740,10 @@ def @BookSetup
 			{ Yes Bypass }	@Yield @TableContentsPart
 			else		@Yield @Null
 		    }
+            //      @MakeFloaterContents @Case {
+			{ Yes Bypass }	@Yield @FloaterContentsPart
+			else		@Yield @Null
+		    }
             //1.1b  @PrefaceAfterContents @Do @PrefacePlace
         }
 
@@ -769,6 +806,10 @@ def @BookSetup
 			{ Yes Bypass }	@Yield @TableContentsPart
 			else		@Yield @Null
 		    }
+            //      @MakeFloaterContents @Case {
+			{ Yes Bypass }	@Yield @FloaterContentsPart
+			else		@Yield @Null
+		    }
             //1.1b  @PrefaceAfterContents @Do @PrefacePlace
 	    //  @AbbreviationsPlace
 	    //  @IntroductionPlace
@@ -811,6 +852,7 @@ def @BookSetup
 		        Yes @BeginDisplayCounter {}
 		        Yes @BeginFigureCounter {}
 		        Yes @BeginTableCounter {}
+		        Yes @BeginFloaterCounter {}
 		    //	@PageList
 			    @ColumnNumber { @ColumnNumber }
 			    @PageHeaders { @PageHeaders }
@@ -830,6 +872,7 @@ def @BookSetup
 		        Yes @BeginDisplayCounter {}
 		        Yes @BeginFigureCounter {}
 		        Yes @BeginTableCounter {}
+		        Yes @BeginFloaterCounter {}
 		    //  @IntroPageList
 			    @ColumnNumber { 1 }
 			    @PageHeaders { @PageHeaders }
@@ -887,6 +930,7 @@ def @BookSetup
             named @RunningTitle { dft }
 	    named @InitialLanguage { @InitialLanguage }
 	    named @BypassNumber { dft }
+	    named @NewPage { No }
             body @Body
         {
 
@@ -922,7 +966,9 @@ def @BookSetup
 		indisplays { @SubPrefaceNumInDisplays }
 		infigures { @SubPrefaceNumInFigures }
 		intables { @SubPrefaceNumInTables }
+		infloaters { @SubPrefaceNumInFloaters }
 		inrunners { @SubPrefaceNumInRunners }
+		newpage { @NewPage }
 		@Body
         }
 
@@ -1013,6 +1059,7 @@ def @BookSetup
             named @RunningTitle { dft }
 	    named @InitialLanguage { @InitialLanguage }
 	    named @BypassNumber { dft }
+	    named @NewPage { No }
             body @Body
         {
 
@@ -1048,7 +1095,9 @@ def @BookSetup
 		indisplays { @SubIntroductionNumInDisplays }
 		infigures { @SubIntroductionNumInFigures }
 		intables { @SubIntroductionNumInTables }
+		infloaters { @SubIntroductionNumInFloaters }
 		inrunners { @SubIntroductionNumInRunners }
+		newpage { @NewPage }
 		@Body
         }
 
@@ -1131,6 +1180,7 @@ def @BookSetup
             named @RunningTitle { dft }
 	    named @InitialLanguage { @InitialLanguage }
 	    named @BypassNumber { dft }
+	    named @NewPage { No }
             body @Body
         {
 
@@ -1161,6 +1211,7 @@ def @BookSetup
 		named @RunningTitle { dft }
 		named @InitialLanguage { @InitialLanguage }
 		named @BypassNumber { dft }
+		named @NewPage { No }
 		body @Body
             {
 
@@ -1191,6 +1242,7 @@ def @BookSetup
 		    named @RunningTitle { dft }
 		    named @InitialLanguage { @InitialLanguage }
 		    named @BypassNumber { dft }
+		    named @NewPage { No }
 		    body @Body
 		{
                 
@@ -1216,7 +1268,9 @@ def @BookSetup
 			indisplays { @SubSubSectionNumInDisplays }
 			infigures { @SubSubSectionNumInFigures }
 			intables { @SubSubSectionNumInTables }
+			infloaters { @SubSubSectionNumInFloaters }
 			inrunners { @SubSubSectionNumInRunners }
+			newpage { @NewPage }
 			@Body
 	        }
 
@@ -1242,7 +1296,9 @@ def @BookSetup
 		    indisplays { @SubSectionNumInDisplays }
 		    infigures { @SubSectionNumInFigures }
 		    intables { @SubSectionNumInTables }
+		    infloaters { @SubSectionNumInFloaters }
 		    inrunners { @SubSectionNumInRunners }
+		    newpage { @NewPage }
 		    @Body
 
             }
@@ -1269,7 +1325,9 @@ def @BookSetup
 		indisplays { @SectionNumInDisplays }
 		infigures { @SectionNumInFigures }
 		intables { @SectionNumInTables }
+		infloaters { @SectionNumInFloaters }
 		inrunners { @SectionNumInRunners }
+		newpage { @NewPage }
 		@Body
 
         }
@@ -1326,6 +1384,7 @@ def @BookSetup
 	    indisplays { @ChapterNumInDisplays }
 	    infigures { @ChapterNumInFigures }
 	    intables { @ChapterNumInTables }
+	    infloaters { @ChapterNumInFloaters }
 	    sendheader { @ChapterFull @Body }
 	    innergap { @SectionGap }
 	    inrunners { Yes }
@@ -1393,6 +1452,7 @@ def @BookSetup
             named @RunningTitle { dft }
 	    named @InitialLanguage { @InitialLanguage }
 	    named @BypassNumber { dft }
+	    named @NewPage { No }
             body @Body
         {
 
@@ -1422,6 +1482,7 @@ def @BookSetup
 		named @RunningTitle { dft }
 		named @InitialLanguage { @InitialLanguage }
 		named @BypassNumber { dft }
+		named @NewPage { No }
 		body @Body
             {
 
@@ -1447,7 +1508,9 @@ def @BookSetup
 		    indisplays { @SubSubAppendixNumInDisplays }
 		    infigures { @SubSubAppendixNumInFigures }
 		    intables { @SubSubAppendixNumInTables }
+		    infloaters { @SubSubAppendixNumInFloaters }
 		    inrunners { @SubSubAppendixNumInRunners }
+		    newpage { @NewPage }
 		    @Body
 
             }
@@ -1474,7 +1537,9 @@ def @BookSetup
 		indisplays { @SubAppendixNumInDisplays }
 		infigures { @SubAppendixNumInFigures }
 		intables { @SubAppendixNumInTables }
+		infloaters { @SubAppendixNumInFloaters }
 		inrunners { @SubAppendixNumInRunners }
+		newpage { @NewPage }
 		@Body
 
         }
@@ -1531,6 +1596,7 @@ def @BookSetup
 	    indisplays { @AppendixNumInDisplays }
 	    infigures { @AppendixNumInFigures }
 	    intables { @AppendixNumInTables }
+	    infloaters { @AppendixNumInFloaters }
 	    sendheader { @ChapterFull @Body }
 	    innergap { @SubAppendixGap }
 	    inrunners { Yes }