Lout 3.22.

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

6 files changed, 56 insertions, 322 deletions

diff --git a/include/book b/include/book
index 0ced4dd..a41d539 100644
--- a/include/book
+++ b/include/book
@@ -263,7 +263,7 @@
   # @TitlePageFont		{ Helvetica Base} # title page font (not size)
   # @SeparateIntroNumbering	{ Yes		} # separate intro page numbers
   # @PrefaceAfterContents  	{ No		} # Yes or No
-  # @ChapterStartPages		{ Any		} # Any, Odd, or Even
+  # @ChapterStartPages		{ Any		} # Any, Odd, Even, SamePage
   # @ReferencesBeforeAppendices	{ No		} # references before appendices
   # @PrefaceWord		{ preface	} # word for "Preface"
   # @ContentsWord		{ contents	} # word for "Contents"
diff --git a/include/bookf b/include/bookf
index fe5ab72..4b10ce3 100644
--- a/include/bookf
+++ b/include/bookf
@@ -226,7 +226,8 @@ def @BookSetup
 
     #######################################################################
     #                                                                     #
-    #  @Full - this sends text to a full-width place.                     #
+    #  @Full - this sends text to a full-width place on a new page, even  #
+    #  if @ChapterStartPages is SamePage.                                 #
     #                                                                     #
     #######################################################################
 
@@ -237,7 +238,7 @@ def @BookSetup
 	def @Even force into { @EvenFullPlace&&following } right x { x }
 
 	@ChapterStartPages @Case {
-	    Any  @Yield @Any  x
+	    { Any SamePage } @Yield @Any  x
 	    Odd  @Yield @Odd  x
 	    Even @Yield @Even x
 	}
@@ -246,20 +247,23 @@ def @BookSetup
 
     #######################################################################
     #                                                                     #
-    #  @NoForceFull - this sends text to a full-width place.              #
+    #  @ChapterFull - this sends text to a full-width place on a new      #
+    #  page, unless @ChapterStartPages is SamePage, in which case it      #
+    #  doesn't send the text anywhere.                                    #
     #                                                                     #
     #######################################################################
 
-    def @NoForceFull right x
+    def @ChapterFull right x
     {
-	def @Any  into { @FullPlace&&following     } right x { x }
-	def @Odd  into { @OddFullPlace&&following  } right x { x }
-	def @Even into { @EvenFullPlace&&following } right x { x }
+	def @Any  force into { @FullPlace&&following     } right x { x }
+	def @Odd  force into { @OddFullPlace&&following  } right x { x }
+	def @Even force into { @EvenFullPlace&&following } right x { x }
 
 	@ChapterStartPages @Case {
 	    Any  @Yield @Any  x
 	    Odd  @Yield @Odd  x
 	    Even @Yield @Even x
+	    SamePage @Yield x
 	}
     }
 
@@ -277,7 +281,7 @@ def @BookSetup
 	def @Even force into { @IntroEvenFullPlace&&following } right x { x }
 
 	@ChapterStartPages @Case {
-	    Any  @Yield @Any  x
+	    { Any SamePage } @Yield @Any  x
 	    Odd  @Yield @Odd  x
 	    Even @Yield @Even x
 	}
@@ -436,7 +440,7 @@ def @BookSetup
 		incontents { @ReferencesInContents }
 		pnprefix { @ReferencesPrefix }
 		inrunners { Yes }
-		sendheader { @Full @Body }
+		sendheader { @ChapterFull @Body }
 		innergap { @SectionGap }
 		@ReferencesSection
 
@@ -1053,7 +1057,7 @@ def @BookSetup
 	    indisplays { @ChapterNumInDisplays }
 	    infigures { @ChapterNumInFigures }
 	    intables { @ChapterNumInTables }
-	    sendheader { @Full @Body }
+	    sendheader { @ChapterFull @Body }
 	    innergap { @SectionGap }
 	    inrunners { Yes }
 	    @Body
@@ -1252,7 +1256,7 @@ def @BookSetup
 	    indisplays { @AppendixNumInDisplays }
 	    infigures { @AppendixNumInFigures }
 	    intables { @AppendixNumInTables }
-	    sendheader { @Full @Body }
+	    sendheader { @ChapterFull @Body }
 	    innergap { @SubAppendixGap }
 	    inrunners { Yes }
 	    @Body
diff --git a/include/latin2.fd b/include/latin2.fd
deleted file mode 100644
index 5bc648b..0000000
--- a/include/latin2.fd
+++ /dev/null
@@ -1,143 +0,0 @@
-##################################################################################################################
-#                                                                                                                #
-#  Latin2 Font definitions.  Use a very wide window to see them clearly.                                         #
-#                                                                                                                #
-#       Lout font       Lout font         PostScript         PostScript font metrics    Lout character Recode/   #
-#       family name     face name         font name          (formerly .AFM) file name  mapping file   NoRecode  #
-#                                                                                                                #
-##################################################################################################################
-
-
-fontdef	AvantGardeCE	Base		{ AvantGarde-Medium		AG-Md		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	Slope		{ AvantGarde-MediumObl		AG-MdO		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	Bold		{ AvantGarde-Bold		AG-Bd		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	BoldSlope	{ AvantGarde-BoldObl		AG-BdO		LtLatin2.LCM	Recode	 }
-
-fontdef	AvantGardeCE	Bold		{ AvantGarde-Bold		AG-Bd		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	BoldObl		{ AvantGarde-BoldObl		AG-BdO		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	Book		{ AvantGarde-Book		AG-Bk		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	BookOblique	{ AvantGarde-BookOblique	AG-BkO		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	CondBold	{ AvantGarde-CondBold		AG-CnBd		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	CondBook	{ AvantGarde-CondBook		AG-CnBk		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	CondDemi	{ AvantGarde-CondDemi		AG-CnDm		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	CondMedium	{ AvantGarde-CondMedium		AG-CnMd		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	Demi		{ AvantGarde-Demi		AG-Dm		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	DemiOblique	{ AvantGarde-DemiOblique	AG-DmO		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	ExtraLight	{ AvantGarde-ExtraLight		AG-ExLt		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	ExtraLightObl	{ AvantGarde-ExtraLightObl	AG-ExLtO	LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	Medium		{ AvantGarde-Medium		AG-Md		LtLatin2.LCM	Recode	 }
-fontdef	AvantGardeCE	MediumObl	{ AvantGarde-MediumObl		AG-MdO		LtLatin2.LCM	Recode	 }
-
-
-fontdef	BookmanCE	Base		{ Bookman-Medium		Bk-Md		LtLatin2.LCM	Recode	 }
-fontdef	BookmanCE	Slope		{ Bookman-MediumItalic		Bk-MdIt		LtLatin2.LCM	Recode	 }
-fontdef	BookmanCE	Bold		{ Bookman-Bold			Bk-Bd		LtLatin2.LCM	Recode	 }
-fontdef	BookmanCE	BoldSlope	{ Bookman-BoldItalic		Bk-BdIt		LtLatin2.LCM	Recode	 }
-
-fontdef	BookmanCE	Bold		{ Bookman-Bold			Bk-Bd		LtLatin2.LCM	Recode	 }
-fontdef	BookmanCE	BoldItalic	{ Bookman-BoldItalic		Bk-BdIt		LtLatin2.LCM	Recode	 }
-fontdef	BookmanCE	Demi		{ Bookman-Demi			Bk-Dm		LtLatin2.LCM	Recode	 }
-fontdef	BookmanCE	DemiItalic	{ Bookman-DemiItalic		Bk-DmIt		LtLatin2.LCM	Recode	 }
-fontdef	BookmanCE	Light		{ Bookman-Light			Bk-Lt		LtLatin2.LCM	Recode	 }
-fontdef	BookmanCE	LightItalic	{ Bookman-LightItalic		Bk-LtIt		LtLatin2.LCM	Recode	 }
-fontdef	BookmanCE	Medium		{ Bookman-Medium		Bk-Md		LtLatin2.LCM	Recode	 }
-fontdef	BookmanCE	MediumItalic	{ Bookman-MediumItalic		Bk-MdIt		LtLatin2.LCM	Recode	 }
-
-
-fontdef	CourierCE	Base		{ Courier			Cr		LtLatin2.LCM	Recode	 }
-fontdef	CourierCE	Slope		{ Courier-Oblique		Cr-O		LtLatin2.LCM	Recode	 }
-fontdef	CourierCE	Bold		{ Courier-Bold			Cr-Bd		LtLatin2.LCM	Recode	 }
-fontdef	CourierCE	BoldSlope	{ Courier-BoldOblique		Cr-BdO		LtLatin2.LCM	Recode	 }
-
-fontdef	CourierCE	Base		{ Courier			Cr		LtLatin2.LCM	Recode	 }
-fontdef	CourierCE	Bold		{ Courier-Bold			Cr-Bd		LtLatin2.LCM	Recode	 }
-fontdef	CourierCE	BoldOblique	{ Courier-BoldOblique		Cr-BdO		LtLatin2.LCM	Recode	 }
-fontdef	CourierCE	Oblique		{ Courier-Oblique		Cr-O		LtLatin2.LCM	Recode	 }
-
-
-fontdef	HelveticaCE	Base		{ Helvetica			He		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	Slope		{ Helvetica-Oblique		He-O		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	Bold		{ Helvetica-Bold		He-Bd		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	BoldSlope	{ Helvetica-BoldOblique		He-BdO		LtLatin2.LCM	Recode	 }
-
-fontdef	HelveticaCE	Base		{ Helvetica			He		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	Black		{ Helvetica-Black		He-Bl		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	BlackOblique	{ Helvetica-BlackOblique	He-BlO		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	Bold		{ Helvetica-Bold		He-Bd		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	BoldOblique	{ Helvetica-BoldOblique		He-BdO		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	Compressed	{ Helvetica-Compressed		He-Cm		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	Cond		{ Helvetica-Condensed		He-Cn		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	CondBlack	{ Helvetica-Condensed-Black	He-CnBl		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	CondBlackObl	{ Helvetica-Condensed-BlackObl	He-CnBlO	LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	CondBold	{ Helvetica-Condensed-Bold	He-CnBd		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	CondBoldObl	{ Helvetica-Condensed-BoldObl	He-CnBdO	LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	CondLight	{ Helvetica-Condensed-Light	He-CnLi		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	CondLightObl	{ Helvetica-Condensed-LightObl	He-CnLiO	LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	CondOblique	{ Helvetica-Condensed-Oblique	He-CnO		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	ExtraCompressed	{ Helvetica-ExtraCompressed	He-ExtC		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	Light		{ Helvetica-Light		He-Lt		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	LightOblique	{ Helvetica-LightOblique	He-LtO		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	Narrow		{ Helvetica-Narrow		He-Nr		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	NarrowBold	{ Helvetica-Narrow-Bold		He-NrBd		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	NarrowBoldObl	{ Helvetica-Narrow-BoldOblique	He-NrBdO	LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	NarrowObl	{ Helvetica-Narrow-Oblique	He-NrO		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	Oblique		{ Helvetica-Oblique		He-O		LtLatin2.LCM	Recode	 }
-fontdef	HelveticaCE	UltraCompressed	{ Helvetica-UltraCompressed	He-UlCm		LtLatin2.LCM	Recode	 }
-
-
-fontdef	SchoolbookCE	Base		{ NewCenturySchlbk-Roman	NCS-Rm		LtLatin2.LCM	Recode	 }
-fontdef	SchoolbookCE	Slope		{ NewCenturySchlbk-Italic	NCS-It		LtLatin2.LCM	Recode	 }
-fontdef	SchoolbookCE	Bold		{ NewCenturySchlbk-Bold		NCS-Bd		LtLatin2.LCM	Recode	 }
-fontdef	SchoolbookCE	BoldSlope	{ NewCenturySchlbk-BoldItalic	NCS-BdIt	LtLatin2.LCM	Recode	 }
-
-fontdef	SchoolbookCE	Bold		{ NewCenturySchlbk-Bold		NCS-Bd		LtLatin2.LCM	Recode	 }
-fontdef	SchoolbookCE	BoldItalic	{ NewCenturySchlbk-BoldItalic	NCS-BdIt	LtLatin2.LCM	Recode	 }
-fontdef	SchoolbookCE	Italic		{ NewCenturySchlbk-Italic	NCS-It		LtLatin2.LCM	Recode	 }
-fontdef	SchoolbookCE	Roman		{ NewCenturySchlbk-Roman	NCS-Rm		LtLatin2.LCM	Recode	 }
-
-
-fontdef	PalatinoCE	Base		{ Palatino-Roman		Pa-Rm		LtLatin2.LCM	Recode	 }
-fontdef	PalatinoCE	Slope		{ Palatino-Italic		Pa-It		LtLatin2.LCM	Recode	 }
-fontdef	PalatinoCE	Bold		{ Palatino-Bold			Pa-Bd		LtLatin2.LCM	Recode	 }
-fontdef	PalatinoCE	BoldSlope	{ Palatino-BoldItalic		Pa-BdIt		LtLatin2.LCM	Recode	 }
-
-fontdef	PalatinoCE	Bold		{ Palatino-Bold			Pa-Bd		LtLatin2.LCM	Recode	 }
-fontdef	PalatinoCE	BoldItalic	{ Palatino-BoldItalic		Pa-BdIt		LtLatin2.LCM	Recode	 }
-fontdef	PalatinoCE	BoldItalicOsF	{ Palatino-BoldItalicOsF	Pa-BdItF	LtLatin2.LCM	Recode	 }
-fontdef	PalatinoCE	BoldOsF		{ Palatino-BoldOsF		Pa-BdF		LtLatin2.LCM	Recode	 }
-fontdef	PalatinoCE	Italic		{ Palatino-Italic		Pa-It		LtLatin2.LCM	Recode	 }
-fontdef	PalatinoCE	ItalicOsF	{ Palatino-ItalicOsF		Pa-ItF		LtLatin2.LCM	Recode	 }
-fontdef	PalatinoCE	Roman		{ Palatino-Roman		Pa-Rm		LtLatin2.LCM	Recode	 }
-fontdef	PalatinoCE	SC		{ Palatino-SC			Pa-SC		LtLatin2.LCM	Recode	 }
-
-
-fontdef	TimesCE		Base		{ Times-Roman			Ti-Rm		LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		Slope		{ Times-Italic			Ti-It		LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		Bold		{ Times-Bold			Ti-Bd		LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		BoldSlope	{ Times-BoldItalic		Ti-BdIt		LtLatin2.LCM	Recode	 }
-
-fontdef	TimesCE		Bold		{ Times-Bold			Ti-Bd		LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		BoldItalic	{ Times-BoldItalic		Ti-BdIt		LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		BoldItalicOsF	{ Times-BoldItalicOsF		Ti-BdItF	LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		BoldSC		{ Times-BoldSC			Ti-BdSC		LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		ExtraBold	{ Times-ExtraBold		Ti-ExBd		LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		Italic		{ Times-Italic			Ti-It		LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		ItalicOsF	{ Times-ItalicOsF		Ti-ItF		LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		Roman		{ Times-Roman			Ti-Rm		LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		RomanSC		{ Times-RomanSC			Ti-RmSC		LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		Semibold	{ Times-Semibold		Ti-Sm		LtLatin2.LCM	Recode	 }
-fontdef	TimesCE		SemiboldItalic	{ Times-SemiboldItalic		Ti-SmIt		LtLatin2.LCM	Recode	 }
-
-
-fontdef	ChanceryCE	Base		{ ZapfChancery-Roman		ZC-Rm		LtLatin2.LCM	Recode	 }
-fontdef	ChanceryCE	Slope		{ ZapfChancery-Italic		ZC-It		LtLatin2.LCM	Recode	 }
-fontdef	ChanceryCE	Bold		{ ZapfChancery-Bold		ZC-Bd		LtLatin2.LCM	Recode	 }
-fontdef	ChanceryCE	BoldSlope	{ ZapfChancery-MediumItalic	ZC-MdIt		LtLatin2.LCM	Recode	 }
-
-fontdef	ChanceryCE	Roman		{ ZapfChancery-Roman		ZC-Rm		LtLatin2.LCM	Recode	 }
-fontdef	ChanceryCE	Bold		{ ZapfChancery-Bold		ZC-Bd		LtLatin2.LCM	Recode	 }
-fontdef	ChanceryCE	Italic		{ ZapfChancery-Italic		ZC-It		LtLatin2.LCM	Recode	 }
-fontdef	ChanceryCE	Light		{ ZapfChancery-Light		ZC-Lt		LtLatin2.LCM	Recode	 }
-fontdef	ChanceryCE	Demi		{ ZapfChancery-Demi		ZC-Dm		LtLatin2.LCM	Recode	 }
-fontdef	ChanceryCE	LightItalic	{ ZapfChancery-LightItalic	ZC-LtIt		LtLatin2.LCM	Recode	 }
-fontdef	ChanceryCE	MediumItalic	{ ZapfChancery-MediumItalic	ZC-MdIt		LtLatin2.LCM	Recode	 }
diff --git a/include/old.fd b/include/old.fd
deleted file mode 100644
index 0001b97..0000000
--- a/include/old.fd
+++ /dev/null
@@ -1,156 +0,0 @@
-##################################################################################################################
-#                                                                                                                #
-#  Font definitions.  Use a very wide window to see them clearly.                                                #
-#                                                                                                                #
-#       Lout font       Lout font         PostScript         PostScript font metrics    Lout character Recode/   #
-#       family name     face name         font name          (formerly .AFM) file name  mapping file   NoRecode  #
-#                                                                                                                #
-##################################################################################################################
-
-
-fontdef	AvantGarde	Base		{ AvantGarde-Medium		AG-Md		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	Slope		{ AvantGarde-MediumObl		AG-MdO		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	Bold		{ AvantGarde-Bold		AG-Bd		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	BoldSlope	{ AvantGarde-BoldObl		AG-BdO		LtLatin1.LCM	Recode	 }
-
-fontdef	AvantGarde	Bold		{ AvantGarde-Bold		AG-Bd		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	BoldObl		{ AvantGarde-BoldObl		AG-BdO		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	Book		{ AvantGarde-Book		AG-Bk		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	BookOblique	{ AvantGarde-BookOblique	AG-BkO		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	CondBold	{ AvantGarde-CondBold		AG-CnBd		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	CondBook	{ AvantGarde-CondBook		AG-CnBk		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	CondDemi	{ AvantGarde-CondDemi		AG-CnDm		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	CondMedium	{ AvantGarde-CondMedium		AG-CnMd		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	Demi		{ AvantGarde-Demi		AG-Dm		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	DemiOblique	{ AvantGarde-DemiOblique	AG-DmO		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	ExtraLight	{ AvantGarde-ExtraLight		AG-ExLt		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	ExtraLightObl	{ AvantGarde-ExtraLightObl	AG-ExLtO	LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	Medium		{ AvantGarde-Medium		AG-Md		LtLatin1.LCM	Recode	 }
-fontdef	AvantGarde	MediumObl	{ AvantGarde-MediumObl		AG-MdO		LtLatin1.LCM	Recode	 }
-
-
-fontdef	Bookman		Base		{ Bookman-Medium		Bk-Md		LtLatin1.LCM	Recode	 }
-fontdef	Bookman		Slope		{ Bookman-MediumItalic		Bk-MdIt		LtLatin1.LCM	Recode	 }
-fontdef	Bookman		Bold		{ Bookman-Bold			Bk-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Bookman		BoldSlope	{ Bookman-BoldItalic		Bk-BdIt		LtLatin1.LCM	Recode	 }
-
-fontdef	Bookman		Bold		{ Bookman-Bold			Bk-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Bookman		BoldItalic	{ Bookman-BoldItalic		Bk-BdIt		LtLatin1.LCM	Recode	 }
-fontdef	Bookman		Demi		{ Bookman-Demi			Bk-Dm		LtLatin1.LCM	Recode	 }
-fontdef	Bookman		DemiItalic	{ Bookman-DemiItalic		Bk-DmIt		LtLatin1.LCM	Recode	 }
-fontdef	Bookman		Light		{ Bookman-Light			Bk-Lt		LtLatin1.LCM	Recode	 }
-fontdef	Bookman		LightItalic	{ Bookman-LightItalic		Bk-LtIt		LtLatin1.LCM	Recode	 }
-fontdef	Bookman		Medium		{ Bookman-Medium		Bk-Md		LtLatin1.LCM	Recode	 }
-fontdef	Bookman		MediumItalic	{ Bookman-MediumItalic		Bk-MdIt		LtLatin1.LCM	Recode	 }
-
-
-fontdef	Courier		Base		{ Courier			Cr		LtLatin1.LCM	Recode	 }
-fontdef	Courier		Slope		{ Courier-Oblique		Cr-O		LtLatin1.LCM	Recode	 }
-fontdef	Courier		Bold		{ Courier-Bold			Cr-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Courier		BoldSlope	{ Courier-BoldOblique		Cr-BdO		LtLatin1.LCM	Recode	 }
-
-fontdef	Courier		Base		{ Courier			Cr		LtLatin1.LCM	Recode	 }
-fontdef	Courier		Bold		{ Courier-Bold			Cr-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Courier		BoldOblique	{ Courier-BoldOblique		Cr-BdO		LtLatin1.LCM	Recode	 }
-fontdef	Courier		Oblique		{ Courier-Oblique		Cr-O		LtLatin1.LCM	Recode	 }
-
-
-fontdef	Helvetica	Base		{ Helvetica			He		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	Slope		{ Helvetica-Oblique		He-O		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	Bold		{ Helvetica-Bold		He-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	BoldSlope	{ Helvetica-BoldOblique		He-BdO		LtLatin1.LCM	Recode	 }
-
-fontdef	Helvetica	Base		{ Helvetica			He		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	Black		{ Helvetica-Black		He-Bl		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	BlackOblique	{ Helvetica-BlackOblique	He-BlO		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	Bold		{ Helvetica-Bold		He-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	BoldOblique	{ Helvetica-BoldOblique		He-BdO		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	Compressed	{ Helvetica-Compressed		He-Cm		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	Cond		{ Helvetica-Condensed		He-Cn		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	CondBlack	{ Helvetica-Condensed-Black	He-CnBl		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	CondBlackObl	{ Helvetica-Condensed-BlackObl	He-CnBlO	LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	CondBold	{ Helvetica-Condensed-Bold	He-CnBd		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	CondBoldObl	{ Helvetica-Condensed-BoldObl	He-CnBdO	LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	CondLight	{ Helvetica-Condensed-Light	He-CnLi		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	CondLightObl	{ Helvetica-Condensed-LightObl	He-CnLiO	LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	CondOblique	{ Helvetica-Condensed-Oblique	He-CnO		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	ExtraCompressed	{ Helvetica-ExtraCompressed	He-ExtC		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	Light		{ Helvetica-Light		He-Lt		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	LightOblique	{ Helvetica-LightOblique	He-LtO		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	Narrow		{ Helvetica-Narrow		He-Nr		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	NarrowBold	{ Helvetica-Narrow-Bold		He-NrBd		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	NarrowBoldObl	{ Helvetica-Narrow-BoldOblique	He-NrBdO	LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	NarrowObl	{ Helvetica-Narrow-Oblique	He-NrO		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	Oblique		{ Helvetica-Oblique		He-O		LtLatin1.LCM	Recode	 }
-fontdef	Helvetica	UltraCompressed	{ Helvetica-UltraCompressed	He-UlCm		LtLatin1.LCM	Recode	 }
-
-
-fontdef	Schoolbook	Base		{ NewCenturySchlbk-Roman	NCS-Rm		LtLatin1.LCM	Recode	 }
-fontdef	Schoolbook	Slope		{ NewCenturySchlbk-Italic	NCS-It		LtLatin1.LCM	Recode	 }
-fontdef	Schoolbook	Bold		{ NewCenturySchlbk-Bold		NCS-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Schoolbook	BoldSlope	{ NewCenturySchlbk-BoldItalic	NCS-BdIt	LtLatin1.LCM	Recode	 }
-
-fontdef	Schoolbook	Bold		{ NewCenturySchlbk-Bold		NCS-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Schoolbook	BoldItalic	{ NewCenturySchlbk-BoldItalic	NCS-BdIt	LtLatin1.LCM	Recode	 }
-fontdef	Schoolbook	Italic		{ NewCenturySchlbk-Italic	NCS-It		LtLatin1.LCM	Recode	 }
-fontdef	Schoolbook	Roman		{ NewCenturySchlbk-Roman	NCS-Rm		LtLatin1.LCM	Recode	 }
-
-
-fontdef	Palatino	Base		{ Palatino-Roman		Pa-Rm		LtLatin1.LCM	Recode	 }
-fontdef	Palatino	Slope		{ Palatino-Italic		Pa-It		LtLatin1.LCM	Recode	 }
-fontdef	Palatino	Bold		{ Palatino-Bold			Pa-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Palatino	BoldSlope	{ Palatino-BoldItalic		Pa-BdIt		LtLatin1.LCM	Recode	 }
-
-fontdef	Palatino	Bold		{ Palatino-Bold			Pa-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Palatino	BoldItalic	{ Palatino-BoldItalic		Pa-BdIt		LtLatin1.LCM	Recode	 }
-fontdef	Palatino	BoldItalicOsF	{ Palatino-BoldItalicOsF	Pa-BdItF	LtLatin1.LCM	Recode	 }
-fontdef	Palatino	BoldOsF		{ Palatino-BoldOsF		Pa-BdF		LtLatin1.LCM	Recode	 }
-fontdef	Palatino	Italic		{ Palatino-Italic		Pa-It		LtLatin1.LCM	Recode	 }
-fontdef	Palatino	ItalicOsF	{ Palatino-ItalicOsF		Pa-ItF		LtLatin1.LCM	Recode	 }
-fontdef	Palatino	Roman		{ Palatino-Roman		Pa-Rm		LtLatin1.LCM	Recode	 }
-fontdef	Palatino	SC		{ Palatino-SC			Pa-SC		LtLatin1.LCM	Recode	 }
-
-
-fontdef	Symbol		Base		{ Symbol			Symbol		Symb.LCM	NoRecode }
-fontdef	Symbol		Slope		{ Symbol			Symbol		Symb.LCM	NoRecode }
-fontdef	Symbol		Bold		{ Symbol			Symbol		Symb.LCM	NoRecode }
-fontdef	Symbol		BoldSlope	{ Symbol			Symbol		Symb.LCM	NoRecode }
-
-
-fontdef	Times		Base		{ Times-Roman			Ti-Rm		LtLatin1.LCM	Recode	 }
-fontdef	Times		Slope		{ Times-Italic			Ti-It		LtLatin1.LCM	Recode	 }
-fontdef	Times		Bold		{ Times-Bold			Ti-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Times		BoldSlope	{ Times-BoldItalic		Ti-BdIt		LtLatin1.LCM	Recode	 }
-
-fontdef	Times		Bold		{ Times-Bold			Ti-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Times		BoldItalic	{ Times-BoldItalic		Ti-BdIt		LtLatin1.LCM	Recode	 }
-fontdef	Times		BoldItalicOsF	{ Times-BoldItalicOsF		Ti-BdItF	LtLatin1.LCM	Recode	 }
-fontdef	Times		BoldSC		{ Times-BoldSC			Ti-BdSC		LtLatin1.LCM	Recode	 }
-fontdef	Times		ExtraBold	{ Times-ExtraBold		Ti-ExBd		LtLatin1.LCM	Recode	 }
-fontdef	Times		Italic		{ Times-Italic			Ti-It		LtLatin1.LCM	Recode	 }
-fontdef	Times		ItalicOsF	{ Times-ItalicOsF		Ti-ItF		LtLatin1.LCM	Recode	 }
-fontdef	Times		Roman		{ Times-Roman			Ti-Rm		LtLatin1.LCM	Recode	 }
-fontdef	Times		RomanSC		{ Times-RomanSC			Ti-RmSC		LtLatin1.LCM	Recode	 }
-fontdef	Times		Semibold	{ Times-Semibold		Ti-Sm		LtLatin1.LCM	Recode	 }
-fontdef	Times		SemiboldItalic	{ Times-SemiboldItalic		Ti-SmIt		LtLatin1.LCM	Recode	 }
-
-
-fontdef	Chancery	Base		{ ZapfChancery-Roman		ZC-Rm		LtLatin1.LCM	Recode	 }
-fontdef	Chancery	Slope		{ ZapfChancery-Italic		ZC-It		LtLatin1.LCM	Recode	 }
-fontdef	Chancery	Bold		{ ZapfChancery-Bold		ZC-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Chancery	BoldSlope	{ ZapfChancery-MediumItalic	ZC-MdIt		LtLatin1.LCM	Recode	 }
-
-fontdef	Chancery	Roman		{ ZapfChancery-Roman		ZC-Rm		LtLatin1.LCM	Recode	 }
-fontdef	Chancery	Bold		{ ZapfChancery-Bold		ZC-Bd		LtLatin1.LCM	Recode	 }
-fontdef	Chancery	Italic		{ ZapfChancery-Italic		ZC-It		LtLatin1.LCM	Recode	 }
-fontdef	Chancery	Light		{ ZapfChancery-Light		ZC-Lt		LtLatin1.LCM	Recode	 }
-fontdef	Chancery	Demi		{ ZapfChancery-Demi		ZC-Dm		LtLatin1.LCM	Recode	 }
-fontdef	Chancery	LightItalic	{ ZapfChancery-LightItalic	ZC-LtIt		LtLatin1.LCM	Recode	 }
-fontdef	Chancery	MediumItalic	{ ZapfChancery-MediumItalic	ZC-MdIt		LtLatin1.LCM	Recode	 }
-
-
-fontdef	Dingbats	Base		{ ZapfDingbats			ZD		Ding.LCM	NoRecode }
-fontdef	Dingbats	Slope		{ ZapfDingbats			ZD		Ding.LCM	NoRecode }
-fontdef	Dingbats	Bold		{ ZapfDingbats			ZD		Ding.LCM	NoRecode }
-fontdef	Dingbats	BoldSlope	{ ZapfDingbats			ZD		Ding.LCM	NoRecode }
-
diff --git a/include/report b/include/report
index 50f73c5..cebd65a 100644
--- a/include/report
+++ b/include/report
@@ -266,7 +266,19 @@
   # @CoverSheet			{ Yes		} # make cover sheet
   # @ContentsSeparate		{ No		} # contents on separate pages
   # @DateLine			{ No		} # Yes, No, or a date
+  # @AboveTitleGap		{ 1i		} # space above title
+  # @TitleFont			{ Bold		} # title font
+  # @TitleBreak			{ clines 1.4vx	} # title break
+  # @AuthorFont			{ Italic	} # author font
+  # @AuthorBreak		{ clines	} # author break
+  # @InstitutionFont		{		} # institution font
+  # @InstitutionBreak		{ clines	} # institution break
+  # @DateLineFont		{		} # dateline font
+  # @DateLineBreak		{		} # dateline break
   # @AbstractDisplay		{ No		} # abstract full width display
+  # @AbstractFont		{ 		} # font of abstract
+  # @AbstractBreak		{ 		} # break style of abstract
+  # @AbstractFormat		{ @Centre @Title @DP @Body } # abstract format
   # @AbstractTitle		{ dft		} # abstract title (dft is @AbstractWord)
   # @ReferencesBeforeAppendices	{ No		} # references before appendices
   # @AbstractWord		{ abstract	} # word for "Abstract"
diff --git a/include/reportf b/include/reportf
index 379b997..ce37b01 100644
--- a/include/reportf
+++ b/include/reportf
@@ -16,7 +16,21 @@ def @ReportSetup
     named @CoverSheet			{ Yes			}
     named @ContentsSeparate		{ No			}
     named @DateLine			{ No			}
+    named @AboveTitleGap		{ 1i			}
+    named @TitleFont			{ Bold			}
+    named @TitleBreak			{ clines 1.4vx		}
+    named @AuthorFont			{ Italic		}
+    named @AuthorBreak			{ clines 		}
+    named @InstitutionFont		{ 			}
+    named @InstitutionBreak		{ clines 		}
+    named @DateLineFont			{ 			}
+    named @DateLineBreak		{ 			}
     named @AbstractDisplay		{ No			}
+    named @AbstractFont			{			}
+    named @AbstractBreak		{			}
+    named @AbstractFormat
+		left @Title
+		right @Body		{ @Centre @Title @DP @Body }
     named @AbstractTitle		{ dft			}
     named @ReferencesBeforeAppendices	{ No			}
 
@@ -268,7 +282,7 @@ def @ReportSetup
 	def @DateValue right indent
 	{
 	    @DateLine @Case {
-		No	@Yield {}
+		No	@Yield @Null
 		Yes	@Yield @Date
 		else	@Yield @DateLine
 	    }
@@ -276,10 +290,11 @@ def @ReportSetup
 
 	def @TitleMaterial
 	{
-	    //1i    @B {clines 1.4vx} @Break @Cntr @Title
-	    //1.00v @I clines @Break { |0.5rt @Author | }
-	    //1.00v clines @Break @Cntr @Institution
-	    //1.00v clines @Break @Cntr @DateValue
+	    //@AboveTitleGap
+		    @TitleFont @Font @TitleBreak @Break @Cntr @Title
+	    //1.00v @AuthorFont @Font @AuthorBreak @Break @Cntr @Author
+	    //1.00v @InstitutionFont @Font @InstitutionBreak @Break @Cntr @Institution
+	    //1.00v @DateLineFont @Font @DateLineBreak @Break @Cntr @DateValue
 	}
 
 	def @AbstractPart
@@ -296,14 +311,16 @@ def @ReportSetup
 
 		"" @Yield @Null
 
-		else @Yield @AbstractDisplay @Case {
+		else @Yield
+		{
+		    @AbstractFont @Font @AbstractBreak @Break
+		    @AbstractDisplay @Case {
 		    
-		    No @Yield { @Title @DP @Abstract }
+			No @Yield { @Title @AbstractFormat @Abstract }
 
-		    Yes @Yield { |0.5rt @Title |
-				 @DP
-				 |@DisplayIndent @Abstract |@DisplayIndent
-				}
+			Yes @Yield { |@DisplayIndent
+			    @Title @AbstractFormat @Abstract |@DisplayIndent }
+		    }
 		}
 	    }
 	}