diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/blue | 3 | ||||
| -rw-r--r-- | include/bluef | 17 | ||||
| -rw-r--r-- | include/book | 20 | ||||
| -rw-r--r-- | include/bookf | 48 | ||||
| -rw-r--r-- | include/bsf | 41 | ||||
| -rw-r--r-- | include/cprint | 3 | ||||
| -rw-r--r-- | include/cprintf | 17 | ||||
| -rw-r--r-- | include/doc | 10 | ||||
| -rw-r--r-- | include/docf | 26 | ||||
| -rw-r--r-- | include/dsf | 17 | ||||
| -rw-r--r-- | include/eiffel | 3 | ||||
| -rw-r--r-- | include/eiffelf | 17 | ||||
| -rw-r--r-- | include/eqf | 9 | ||||
| -rw-r--r-- | include/haskell | 3 | ||||
| -rw-r--r-- | include/haskellf | 17 | ||||
| -rw-r--r-- | include/java | 3 | ||||
| -rw-r--r-- | include/javaf | 17 | ||||
| -rw-r--r-- | include/langdefs | 1 | ||||
| -rw-r--r-- | include/np | 3 | ||||
| -rw-r--r-- | include/npf | 17 | ||||
| -rw-r--r-- | include/perl | 3 | ||||
| -rw-r--r-- | include/perlf | 17 | ||||
| -rw-r--r-- | include/podf | 2 | ||||
| -rw-r--r-- | include/python | 3 | ||||
| -rw-r--r-- | include/pythonf | 17 | ||||
| -rw-r--r-- | include/report | 11 | ||||
| -rw-r--r-- | include/reportf | 29 | ||||
| -rw-r--r-- | include/rsl | 3 | ||||
| -rw-r--r-- | include/rslf | 17 | ||||
| -rw-r--r-- | include/ruby | 3 | ||||
| -rw-r--r-- | include/rubyf | 17 | ||||
| -rw-r--r-- | include/slides | 4 | ||||
| -rw-r--r-- | include/slidesf | 11 |
33 files changed, 370 insertions, 59 deletions
diff --git a/include/blue b/include/blue index cfe1c3c..6395b96 100644 --- a/include/blue +++ b/include/blue @@ -40,6 +40,7 @@ # fixedfont { Courier } # font family # fixedsize { -1.0p } # font size # fixedline { 1.0vx } # line-space + # fixedspace { lout } # spacing mode # fixedtabin { 8 } # tab interval # fixedtabout { 8s } # tab width @@ -64,6 +65,7 @@ # varyingfont { } # font family # varyingsize { 1.0f } # font size # varyingline { 1.0vx } # line-space + # varyingspace { lout } # spacing mode # varyingtabin { 8 } # tab interval # varyingtabout { 3f } # tab width @@ -88,6 +90,7 @@ # symbolfont { } # font family # symbolsize { 1.0f } # font size # symbolline { 1.0vx } # line-space + # symbolspace { lout } # spacing mode # symboltabin { 8 } # tab interval # symboltabout { 3f } # tab width diff --git a/include/bluef b/include/bluef index 8a8ff13..c4fdb48 100644 --- a/include/bluef +++ b/include/bluef @@ -27,6 +27,7 @@ def @BlueSetup named fixedfont { Courier }# font family named fixedsize { -1.0p } # font size named fixedline { 1.0vx } # line-space + named fixedspace { lout } # spacing mode named fixedtabin { 8 } # tab interval named fixedtabout { 8s } # tab width @@ -50,6 +51,7 @@ def @BlueSetup named varyingfont { } # font family named varyingsize { 1.0f } # font size named varyingline { 1.0vx } # line-space + named varyingspace { lout } # spacing mode named varyingtabin { 8 } # tab interval named varyingtabout { 3f } # tab width @@ -73,6 +75,7 @@ def @BlueSetup named symbolfont { } # font family named symbolsize { 1.0f } # font size named symbolline { 1.0vx } # line-space + named symbolspace { lout } # spacing mode named symboltabin { 8 } # tab interval named symboltabout { 3f } # tab width @@ -106,6 +109,7 @@ def @BlueSetup named font { dft } # font family named size { dft } # font size named line { dft } # line-space + named space { dft } # spacing mode named tabin { dft } # tab interval named tabout { dft } # tab width named identifiers { dft } # ident. font @@ -219,6 +223,15 @@ def @BlueSetup } + def @InitSpace + { + space @Test + iffixed { fixedspace } + ifvarying { varyingspace } + ifsymbol { symbolspace } + } + + def @PI # for formatting identifiers right x { @@ -369,7 +382,7 @@ def @BlueSetup def @A # get characters from the Adobe Symbol font - left sym + named sym {} right x { style @Case { @@ -382,7 +395,7 @@ def @BlueSetup macro "$>" { {} & } - { @InitFontFamily Base @InitSize } @Font + { @InitFontFamily Base @InitSize } @Font @InitSpace @Space { @InitLine lines nohyphen } @Break @Body @End @Blue diff --git a/include/book b/include/book index ea0b494..74e0a3a 100644 --- a/include/book +++ b/include/book @@ -411,7 +411,25 @@ # @IndexAInContents { Yes } # add index A to contents # @IndexBInContents { Yes } # add index B to contents # @ColophonInContents { Yes } # add colophon to contents - # @PartContentsIndent { 0.5rt } # indent of part contents entry + # @PrefaceContentsIndent { 0f } # indent in contents of preface + # @SubPrefaceContentsIndent { 3f } # indent in contents of sub-preface + # @AbbreviationsContentsIndent{ 0f } # indent in contents of abbreviations + # @IntroductionContentsIndent { 0f } # indent in contents of introduction + # @SubIntroductionContentsIndent { 3f } # indent in contents of sub-intro + # @PartContentsIndent { 0.5rt } # indent in contents of part (dft is ctr) + # @ChapterContentsIndent { 0f } # indent in contents of chapter + # @SectionContentsIndent { 3f } # indent in contents of section + # @SubSectionContentsIndent { 6f } # indent in contents of subsection + # @SubSubSectionContentsIndent{ 9f } # indent in contents of sub-subsection + # @AppendixContentsIndent { 0f } # indent in contents of appendix + # @SubAppendixContentsIndent { 3f } # indent in contents of sub-appendix + # @SubSubAppendixContentsIndent { 6f } # indent in contents of sub-subappendix + # @ReferencesContentsIndent { 0f } # indent in contents of references + # @GlossaryContentsIndent { 0f } # indent in contents of gloassary + # @IndexContentsIndent { 0f } # indent in contents of index + # @IndexAContentsIndent { 0f } # indent in contents of index A + # @IndexBContentsIndent { 0f } # indent in contents of index B + # @ColophonContentsIndent { 0f } # indent in contents of colophon # @SubPrefaceNumInTheorems { No } # theorem num has sub-preface num # @SubIntroductionNumInTheorems { No } # theorem num has sub-intro num # @ChapterNumInTheorems { Yes } # theorem num has chapter num diff --git a/include/bookf b/include/bookf index 9dd1a96..b62619c 100644 --- a/include/bookf +++ b/include/bookf @@ -131,7 +131,26 @@ def @BookSetup named @IndexAInContents { Yes } named @IndexBInContents { Yes } named @ColophonInContents { Yes } + + named @PrefaceContentsIndent { 0f } + named @SubPrefaceContentsIndent { 3f } + named @AbbreviationsContentsIndent { 0f } + named @IntroductionContentsIndent { 0f } + named @SubIntroductionContentsIndent{ 3f } named @PartContentsIndent { 0.5rt } + named @ChapterContentsIndent { 0f } + named @SectionContentsIndent { 3f } + named @SubSectionContentsIndent { 6f } + named @SubSubSectionContentsIndent { 9f } + named @AppendixContentsIndent { 0f } + named @SubAppendixContentsIndent { 3f } + named @SubSubAppendixContentsIndent { 6f } + named @ReferencesContentsIndent { 0f } + named @GlossaryContentsIndent { 0f } + named @IndexContentsIndent { 0f } + named @IndexAContentsIndent { 0f } + named @IndexBContentsIndent { 0f } + named @ColophonContentsIndent { 0f } named @SubPrefaceNumInTheorems { No } named @SubIntroductionNumInTheorems { No } @@ -490,6 +509,7 @@ def @BookSetup headingbreak { @ChapterHeadingBreak } headingformat { @Num @ChapterHeadingFormat @Body } incontents { @ReferencesInContents } + contentsindent { @ReferencesContentsIndent } pnprefix { @ReferencesPrefix } inrunners { Yes } sendheader { @ChapterFull @Body } @@ -523,6 +543,7 @@ def @BookSetup headingformat { @Num @ChapterHeadingFormat @Body } headingtext { @GlossaryText } incontents { @GlossaryInContents } + contentsindent { @GlossaryContentsIndent } pnprefix { @GlossaryPrefix } inrunners { Yes } sendheader { @Full @Body } @@ -556,6 +577,7 @@ def @BookSetup headingformat { @Num @ChapterHeadingFormat @Body } headingtext { @IndexText } incontents { @IndexInContents } + contentsindent { @IndexContentsIndent } pnprefix { @IndexPrefix } inrunners { Yes } sendheader { @Full @Body } @@ -589,6 +611,7 @@ def @BookSetup headingformat { @Num @ChapterHeadingFormat @Body } headingtext { @IndexAText } incontents { @IndexAInContents } + contentsindent { @IndexAContentsIndent } pnprefix { @IndexAPrefix } inrunners { Yes } sendheader { @Full @Body } @@ -622,6 +645,7 @@ def @BookSetup headingformat { @Num @ChapterHeadingFormat @Body } headingtext { @IndexAText } incontents { @IndexBInContents } + contentsindent { @IndexBContentsIndent } pnprefix { @IndexBPrefix } inrunners { Yes } sendheader { @Full @Body } @@ -654,6 +678,7 @@ def @BookSetup headingbreak { @ChapterHeadingBreak } headingformat { @Num @ChapterHeadingFormat @Body } incontents { @ColophonInContents } + contentsindent { @ColophonContentsIndent } pnprefix { @ColophonPrefix } inrunners { Yes } sendheader { @Full @Body } @@ -886,7 +911,7 @@ def @BookSetup headingbreak { @SubPrefaceHeadingBreak } headingformat { @Num @SubPrefaceHeadingFormat @Body } incontents { @SubPrefaceInContents } - contentsindent { 3f } + contentsindent { @SubPrefaceContentsIndent } numbers { @SubPrefaceNumbers } attachnum { @SubPrefaceList&&preceding @Tagged @Tag } retrievenum { @SubPrefaceList&&@Tag @Open { num } } @@ -913,6 +938,7 @@ def @BookSetup headingbreak { @ChapterHeadingBreak } headingformat { @Num @ChapterHeadingFormat @Body } incontents { @PrefaceInContents } + contentsindent { @PrefaceContentsIndent } pnprefix { @PrefacePrefix } sendheader { @ChooseFull @Body } innergap { @SectionGap } @@ -947,6 +973,7 @@ def @BookSetup headingbreak { @ChapterHeadingBreak } headingformat { @Num @ChapterHeadingFormat @Body } incontents { @AbbreviationsInContents } + contentsindent { @AbbreviationsContentsIndent } pnprefix { @AbbreviationsPrefix } sendheader { @Full @Body } innergap { @SectionGap } @@ -1010,7 +1037,7 @@ def @BookSetup headingbreak { @SubIntroductionHeadingBreak } headingformat { @Num @SubIntroductionHeadingFormat @Body } incontents { @SubIntroductionInContents } - contentsindent { 3f } + contentsindent { @SubIntroductionContentsIndent } numbers { @SubIntroductionNumbers } attachnum { @SubIntroductionList&&preceding @Tagged @Tag } retrievenum { @SubIntroductionList&&@Tag @Open { num } } @@ -1037,6 +1064,7 @@ def @BookSetup headingbreak { @ChapterHeadingBreak } headingformat { @Num @ChapterHeadingFormat @Body } incontents { @IntroductionInContents } + contentsindent { @IntroductionContentsIndent } pnprefix { @IntroductionPrefix } sendheader { @Full @Body } innergap { @SectionGap } @@ -1177,7 +1205,7 @@ def @BookSetup headingbreak { @SubSubSectionHeadingBreak } headingformat { @Num @SubSubSectionHeadingFormat @Body } incontents { @SubSubSectionInContents } - contentsindent { 9f } + contentsindent { @SubSubSectionContentsIndent } numbers { @SubSubSectionNumbers } attachnum { @SubSubSectionList&&preceding @Tagged @Tag } retrievenum { @SubSubSectionList&&@Tag @Open { num } } @@ -1203,7 +1231,7 @@ def @BookSetup headingbreak { @SubSectionHeadingBreak } headingformat { @Num @SubSectionHeadingFormat @Body } incontents { @SubSectionInContents } - contentsindent { 6f } + contentsindent { @SubSectionContentsIndent } numbers { @SubSectionNumbers } attachnum { @SubSectionList&&preceding @Tagged @Tag } retrievenum { @SubSectionList&&@Tag @Open { num } } @@ -1230,7 +1258,7 @@ def @BookSetup headingbreak { @SectionHeadingBreak } headingformat { @Num @SectionHeadingFormat @Body } incontents { @SectionInContents } - contentsindent { 3f } + contentsindent { @SectionContentsIndent } numbers { @SectionNumbers } attachnum { @SectionList&&preceding @Tagged @Tag } retrievenum { @SectionList&&@Tag @Open { num } } @@ -1260,6 +1288,7 @@ def @BookSetup headingformat { @Num @PartHeadingFormat @Body } bypassnumber { @PartNumber } incontents { @PartInContents } + contentsindent { @PartContentsIndent } sendheader { @Full @Body } inrunners { Yes } tag { @Tag } @@ -1287,7 +1316,7 @@ def @BookSetup headingbreak { @ChapterHeadingBreak } headingformat { @Num @ChapterHeadingFormat @Body } incontents { @ChapterInContents } - contentsindent { 0f } + contentsindent { @ChapterContentsIndent } word { chapter @WordVal @ChapterWord } numbers { @ChapterNumbers } attachnum { @ChapterList&&preceding @Tagged @Tag } @@ -1407,7 +1436,7 @@ def @BookSetup headingbreak { @SubSubAppendixHeadingBreak } headingformat { @Num @SubSubAppendixHeadingFormat @Body } incontents { @SubSubAppendixInContents } - contentsindent { 6f } + contentsindent { @SubSubAppendixContentsIndent } numbers { @SubSubAppendixNumbers } attachnum { @SubSubAppendixList&&preceding @Tagged @Tag } retrievenum { @SubSubAppendixList&&@Tag @Open { num } } @@ -1434,7 +1463,7 @@ def @BookSetup headingbreak { @SubAppendixHeadingBreak } headingformat { @Num @SubAppendixHeadingFormat @Body } incontents { @SubAppendixInContents } - contentsindent { 3f } + contentsindent { @SubAppendixContentsIndent } numbers { @SubAppendixNumbers } attachnum { @SubAppendixList&&preceding @Tagged @Tag } retrievenum { @SubAppendixList&&@Tag @Open { num } } @@ -1464,6 +1493,7 @@ def @BookSetup headingformat { @Num @PartHeadingFormat @Body } bypassnumber { @PartNumber } incontents { @PartInContents } + contentsindent { @PartContentsIndent } sendheader { @Full @Body } inrunners { Yes } tag { @Tag } @@ -1491,7 +1521,7 @@ def @BookSetup headingbreak { @AppendixHeadingBreak } headingformat { @Num @AppendixHeadingFormat @Body } incontents { @AppendixInContents } - contentsindent { 0f } + contentsindent { @AppendixContentsIndent } word { appendix @WordVal @AppendixWord } numbers { @AppendixNumbers } attachnum { @AppendixList&&preceding @Tagged @Tag } diff --git a/include/bsf b/include/bsf index 76b0f1a..be86f21 100644 --- a/include/bsf +++ b/include/bsf @@ -107,8 +107,9 @@ export @ListGap @ListIndent @ListRightIndent @ListLabelWidth @NumberSeparator - @Word @Roman @UCRoman @Alpha @UCAlpha @Months @ShortMonths @WeekDays - @ShortWeekDays @TwelveHours @ShortHours @MeriDiems @ShortMeriDiems + @Word @Roman @UCRoman @Alpha @UCAlpha @FnBullets @FnSymbols + @Months @ShortMonths @WeekDays @ShortWeekDays + @TwelveHours @ShortHours @MeriDiems @ShortMeriDiems @Sym @Ding @R @I @B @BI @S @F @II "~" "~~" "``" "''" ",," "--" "---" "..." @@ -119,8 +120,8 @@ export @Date @Time @DateTimeFormat @DropCapTwo @DropCapThree @Centre @Right @NoDotSep @NoDotJoin @Join @Sep @DotSep @ColonSep @DotJoin @DashJoin - @NumSep @OverStrike @Sup @Sub @FullWidthRule @LocalWidthRule - @Box @CurveBox @ShadowBox @BoundaryMarks + @NumSep @VStrut @ZeroWidth @ZeroHeight @OverStrike @Sup @Sub + @FullWidthRule @LocalWidthRule @Box @CurveBox @ShadowBox @BoundaryMarks @NumberMarker @NumberOf @TitleMarker @TitleOf @PageMarker @PageMark @NoLinkPageMark @PageOf @CrossLink @ExternalLink @@ -360,6 +361,8 @@ def @BasicSetup # @UCRoman upper case Roman numerals I, II, ... , CC # # @Alpha lower case Roman alphabet a, b, ... , z # # @UCAlpha upper case Roman alphabet A, B, ... , Z # + # @FnBullets bullets as footnote markers # + # @FnSymbols traditional footnote symbols asterisk, dagger, etc. # # @Months months of the year: January, ... , December # # @ShortMonths months of the year, abbreviated: Jan, ..., Dec # # @WeekDays days of the week: Sunday, ... , Saturday # @@ -375,6 +378,8 @@ def @BasicSetup def @UCRoman left @Tag right @Val { @Val } def @Alpha left @Tag right @Val { @Val } def @UCAlpha left @Tag right @Val { @Val } + def @FnBullets left @Tag right @Val { @Val } + def @FnSymbols left @Tag right @Val { @Val } def @Months left @Tag right @Val { @Val } def @ShortMonths left @Tag right @Val { @Val } def @WeekDays left @Tag right @Val { @Val } @@ -405,8 +410,8 @@ def @BasicSetup {} {} - @SysDatabase @Word @Roman @UCRoman @Alpha @UCAlpha @Months - @ShortMonths @WeekDays @ShortWeekDays @TwelveHours + @SysDatabase @Word @Roman @UCRoman @Alpha @UCAlpha @FnBullets @FnSymbols + @Months @ShortMonths @WeekDays @ShortWeekDays @TwelveHours @ShortHours @MeriDiems @ShortMeriDiems @DateTimeFormat { standard } @@ -686,6 +691,27 @@ def @BasicSetup ########################################################################### # # + # @VStrut, @ZeroWidth, @ZeroHeight # + # # + ########################################################################### + + + def @VStrut + named above { 0.5f } + named below { 0.5f } + right x + { + x &0iu @VContract { above @High ^/ below @High } + } + + + def @ZeroWidth right x { @HContract { |0io x |0io } } + + def @ZeroHeight right x { @VContract { /0io x /0io } } + + + ########################################################################### + # # # @OverStrike, @Sup and @Sub # # # ########################################################################### @@ -1451,7 +1477,8 @@ def @BasicSetup |indent labelwidth @Wide { # @NumberMarker @Value {style num} {style num} &0io - @NumberMarker @Value {num} {style type num} &0io + # @NumberMarker @Value {num} {style type num} &0io + @NumberMarker @Value {type num} {style type num} &0io } |itemindent @ItemPlace |rightindent //gap @MakeList @NotRevealed @Next num diff --git a/include/cprint b/include/cprint index 4c15d72..4974888 100644 --- a/include/cprint +++ b/include/cprint @@ -40,6 +40,7 @@ # fixedfont { Courier } # font family # fixedsize { -1.0p } # font size # fixedline { 1.0vx } # line-space + # fixedspace { lout } # spacing mode # fixedtabin { 8 } # tab interval # fixedtabout { 8s } # tab width @@ -64,6 +65,7 @@ # varyingfont { } # font family # varyingsize { 1.0f } # font size # varyingline { 1.0vx } # line-space + # varyingspace { lout } # varying mode # varyingtabin { 8 } # tab interval # varyingtabout { 3f } # tab width @@ -88,6 +90,7 @@ # symbolfont { } # font family # symbolsize { 1.0f } # font size # symbolline { 1.0vx } # line-space + # symbolspace { lout } # spacing mode # symboltabin { 8 } # tab interval # symboltabout { 3f } # tab width diff --git a/include/cprintf b/include/cprintf index 0307c29..2d2e680 100644 --- a/include/cprintf +++ b/include/cprintf @@ -27,6 +27,7 @@ def @CPSetup named fixedfont { Courier }# font family named fixedsize { -1.0p } # font size named fixedline { 1.0vx } # line-space + named fixedspace { lout } # spacing mode named fixedtabin { 8 } # tab interval named fixedtabout { 8s } # tab width @@ -50,6 +51,7 @@ def @CPSetup named varyingfont { } # font family named varyingsize { 1.0f } # font size named varyingline { 1.0vx } # line-space + named varyingspace { lout } # spacing mode named varyingtabin { 8 } # tab interval named varyingtabout { 3f } # tab width @@ -73,6 +75,7 @@ def @CPSetup named symbolfont { } # font family named symbolsize { 1.0f } # font size named symbolline { 1.0vx } # line-space + named symbolspace { lout } # spacing mode named symboltabin { 8 } # tab interval named symboltabout { 3f } # tab width @@ -106,6 +109,7 @@ def @CPSetup named font { dft } # font family named size { dft } # font size named line { dft } # line-space + named space { dft } # spacing mode named tabin { dft } # tab interval named tabout { dft } # tab width named identifiers { dft } # ident. font @@ -219,6 +223,15 @@ def @CPSetup } + def @InitSpace + { + space @Test + iffixed { fixedspace } + ifvarying { varyingspace } + ifsymbol { symbolspace } + } + + def @PI # for formatting identifiers right x { @@ -369,7 +382,7 @@ def @CPSetup def @A # get characters from the Adobe Symbol font - left sym + named sym {} right x { style @Case { @@ -382,7 +395,7 @@ def @CPSetup macro "$>" { {} & } - { @InitFontFamily Base @InitSize } @Font + { @InitFontFamily Base @InitSize } @Font @InitSpace @Space { @InitLine lines nohyphen } @Break @Body @End @CP diff --git a/include/doc b/include/doc index d5df7e3..49ae1d6 100644 --- a/include/doc +++ b/include/doc @@ -373,6 +373,16 @@ # @IndexInContents { Yes } # add index to contents # @IndexAInContents { Yes } # add index A to contents # @IndexBInContents { Yes } # add index B to contents + # @SectionContentsIndent { 0f } # contents indent of sections + # @SubSectionContentsIndent { 3f } # contents indent of subsections + # @SubSubSectionContentsIndent{ 6f } # contents indent of sub-subsections + # @AppendixContentsIndent { 0f } # contents indent of appendices + # @SubAppendixContentsIndent { 3f } # contents indent of sub-appendices + # @SubSubAppendixContentsIndent { 6f } # contents indent of sub-subappendices + # @ReferencesContentsIndent { 0f } # contents indent of references + # @IndexContentsIndent { 0f } # contents indent of index + # @IndexAContentsIndent { 0f } # contents indent of index A + # @IndexBContentsIndent { 0f } # contents indent of index B # @SectionNumInTheorems { No } # theorem num has section num # @SubSectionNumInTheorems { No } # theorem num has subsect num # @SubSubSectionNumInTheorems { No } # theorem num has sub-ss. num diff --git a/include/docf b/include/docf index cfc9d19..38b562f 100644 --- a/include/docf +++ b/include/docf @@ -101,6 +101,17 @@ def @OrdinarySetup named @IndexAInContents { Yes } named @IndexBInContents { Yes } + named @SectionContentsIndent { 0f } + named @SubSectionContentsIndent { 3f } + named @SubSubSectionContentsIndent { 6f } + named @AppendixContentsIndent { 0f } + named @SubAppendixContentsIndent { 3f } + named @SubSubAppendixContentsIndent { 6f } + named @ReferencesContentsIndent { 0f } + named @IndexContentsIndent { 0f } + named @IndexAContentsIndent { 0f } + named @IndexBContentsIndent { 0f } + named @SectionNumInTheorems { No } named @SubSectionNumInTheorems { No } named @SubSubSectionNumInTheorems { No } @@ -242,6 +253,7 @@ def @OrdinarySetup headingbreak { @ReferencesHeadingBreak } headingformat { @ReferencesHeadingFormat @Body } incontents { @ReferencesInContents } + contentsindent { @ReferencesContentsIndent } pnprefix { @ReferencesPrefix } majornum {} majortitle {} @@ -279,6 +291,7 @@ def @OrdinarySetup headingformat { @IndexHeadingFormat @Body } headingtext { @IndexText } incontents { @IndexInContents } + contentsindent { @IndexContentsIndent } pnprefix { @IndexPrefix } inrunners { Yes } majornum {} @@ -316,6 +329,7 @@ def @OrdinarySetup headingformat { @IndexAHeadingFormat @Body } headingtext { @IndexAText } incontents { @IndexAInContents } + contentsindent { @IndexAContentsIndent } pnprefix { @IndexAPrefix } inrunners { Yes } majornum {} @@ -353,6 +367,7 @@ def @OrdinarySetup headingformat { @IndexBHeadingFormat @Body } headingtext { @IndexBText } incontents { @IndexBInContents } + contentsindent { @IndexBContentsIndent } pnprefix { @IndexBPrefix } inrunners { Yes } majornum {} @@ -546,7 +561,7 @@ def @OrdinarySetup headingbreak { @SubSubSectionHeadingBreak } headingformat { @Num @SubSubSectionHeadingFormat @Body } incontents { @SubSubSectionInContents } - contentsindent { 6f } + contentsindent { @SubSubSectionContentsIndent } numbers { @SubSubSectionNumbers } attachnum { @SubSubSectionList&&preceding @Tagged @Tag } retrievenum { @SubSubSectionList&&@Tag @Open { num } } @@ -573,7 +588,7 @@ def @OrdinarySetup headingbreak { @SubSectionHeadingBreak } headingformat { @Num @SubSectionHeadingFormat @Body } incontents { @SubSectionInContents } - contentsindent { 3f } + contentsindent { @SubSectionContentsIndent } numbers { @SubSectionNumbers } attachnum { @SubSectionList&&preceding @Tagged @Tag } retrievenum { @SubSectionList&&@Tag @Open { num } } @@ -600,6 +615,7 @@ def @OrdinarySetup headingbreak { @SectionHeadingBreak } headingformat { @Num @SectionHeadingFormat @Body } incontents { @SectionInContents } + contentsindent { @SectionContentsIndent } numbers { @SectionNumbers } attachnum { @SectionList&&preceding @Tagged @Tag } retrievenum { @SectionList&&@Tag @Open { num } } @@ -707,7 +723,7 @@ def @OrdinarySetup headingbreak { @SubSubAppendixHeadingBreak } headingformat { @Num @SubSubAppendixHeadingFormat @Body } incontents { @SubSubAppendixInContents } - contentsindent { 6f } + contentsindent { @SubSubAppendixContentsIndent } numbers { @SubSubAppendixNumbers } attachnum { @SubSubAppendixList&&preceding @Tagged @Tag } retrievenum { @SubSubAppendixList&&@Tag @Open { num } } @@ -734,7 +750,7 @@ def @OrdinarySetup headingbreak { @SubAppendixHeadingBreak } headingformat { @Num @SubAppendixHeadingFormat @Body } incontents { @SubAppendixInContents } - contentsindent { 3f } + contentsindent { @SubAppendixContentsIndent } numbers { @SubAppendixNumbers } attachnum { @SubAppendixList&&preceding @Tagged @Tag } retrievenum { @SubAppendixList&&@Tag @Open { num } } @@ -760,7 +776,7 @@ def @OrdinarySetup headingbreak { @AppendixHeadingBreak } headingformat { @Num @AppendixHeadingFormat @Body } incontents { @AppendixInContents } - contentsindent { 0f } + contentsindent { @AppendixContentsIndent } word { appendix @WordVal @AppendixWord } numbers { @AppendixNumbers } attachnum { @AppendixList&&preceding @Tagged @Tag } diff --git a/include/dsf b/include/dsf index e992795..394fd1e 100644 --- a/include/dsf +++ b/include/dsf @@ -531,12 +531,17 @@ def @DocumentSetup # @Protect x # # # # Like @CNP, this reserves space on the current page or else makes sure # - # x appears on the following page. Lookahead is proportional to font # - # size. # + # x appears on the following page. # + # # + # Prior to Version 3.31 the amount of lookahead was just 3.0f. But # + # in Version 3.31, following a suggestion of Ludovic Courtes, this # + # was changed to @OneRow { 1.0f @High @LP 2.0v @High }, which # + # approximates the height of a title line, a paragraph separator, and # + # the first two lines of the section, and so works somewhat better. # # # ########################################################################### - def @Protect right x { 3.0f @High //0io // x } + def @Protect right x { @OneRow { 1.0f @High @LP 2.0v @High } //0io // x } ########################################################################### @@ -688,6 +693,8 @@ def @DocumentSetup UCRoman @Yield @UCRoman&&num Alpha @Yield @Alpha&&num UCAlpha @Yield @UCAlpha&&num + Bullets @Yield @FnBullets&&num + Symbols @Yield @FnSymbols&&num } } @@ -4822,7 +4829,7 @@ def @DocumentSetup left @Num right @Body {} named headingtext { @Null } # heading text named incontents { No } # entry in table of contents required - named contentsindent { 0f } # only if type is Major + named contentsindent { 0f } # only used if type is Minor named word {} named numbers { None } named attachnum {} # only if numbers is not None @@ -4947,6 +4954,7 @@ def @DocumentSetup { Yes.Major Yes.MajorIntro Yes.ExtraMajor Yes.ExtraMajorIntro } @Yield { incontents @MajorContentsEntry + indent { contentsindent } crosstag { tag } number { @LongNum } title { initiallanguage @Language title } @@ -4955,6 +4963,7 @@ def @DocumentSetup { Yes.VeryMajor } @Yield { incontents @VeryMajorContentsEntry + indent { contentsindent } title { initiallanguage @Language { bypassnumber @ColonSep title } } } diff --git a/include/eiffel b/include/eiffel index 3708d86..8ce7973 100644 --- a/include/eiffel +++ b/include/eiffel @@ -40,6 +40,7 @@ # fixedfont { Courier } # font family # fixedsize { -1.0p } # font size # fixedline { 1.0vx } # line-space + # fixedspace { lout } # spacing mode # fixedtabin { 8 } # tab interval # fixedtabout { 8s } # tab width @@ -64,6 +65,7 @@ # varyingfont { } # font family # varyingsize { 1.0f } # font size # varyingline { 1.0vx } # line-space + # varyingspace { lout } # spacing mode # varyingtabin { 8 } # tab interval # varyingtabout { 3f } # tab width @@ -88,6 +90,7 @@ # symbolfont { } # font family # symbolsize { 1.0f } # font size # symbolline { 1.0vx } # line-space + # symbolspace { lout } # spacing mode # symboltabin { 8 } # tab interval # symboltabout { 3f } # tab width diff --git a/include/eiffelf b/include/eiffelf index 573e8a9..f456392 100644 --- a/include/eiffelf +++ b/include/eiffelf @@ -27,6 +27,7 @@ def @EiffelSetup named fixedfont { Courier }# font family named fixedsize { -1.0p } # font size named fixedline { 1.0vx } # line-space + named fixedspace { lout } # spacing mode named fixedtabin { 8 } # tab interval named fixedtabout { 8s } # tab width @@ -50,6 +51,7 @@ def @EiffelSetup named varyingfont { } # font family named varyingsize { 1.0f } # font size named varyingline { 1.0vx } # line-space + named varyingspace { lout } # spacing mode named varyingtabin { 8 } # tab interval named varyingtabout { 3f } # tab width @@ -73,6 +75,7 @@ def @EiffelSetup named symbolfont { } # font family named symbolsize { 1.0f } # font size named symbolline { 1.0vx } # line-space + named symbolspace { lout } # spacing mode named symboltabin { 8 } # tab interval named symboltabout { 3f } # tab width @@ -106,6 +109,7 @@ def @EiffelSetup named font { dft } # font family named size { dft } # font size named line { dft } # line-space + named space { dft } # spacing mode named tabin { dft } # tab interval named tabout { dft } # tab width named identifiers { dft } # ident. font @@ -219,6 +223,15 @@ def @EiffelSetup } + def @InitSpace + { + space @Test + iffixed { fixedspace } + ifvarying { varyingspace } + ifsymbol { symbolspace } + } + + def @PI # for formatting identifiers right x { @@ -369,7 +382,7 @@ def @EiffelSetup def @A # get characters from the Adobe Symbol font - left sym + named sym {} right x { style @Case { @@ -382,7 +395,7 @@ def @EiffelSetup macro "$>" { {} & } - { @InitFontFamily Base @InitSize } @Font + { @InitFontFamily Base @InitSize } @Font @InitSpace @Space { @InitLine lines nohyphen } @Break @Body @End @Eiffel diff --git a/include/eqf b/include/eqf index 6f9113c..6898b5d 100644 --- a/include/eqf +++ b/include/eqf @@ -106,6 +106,7 @@ export "`" "``" "```" bin rel punct non vctr big small matrix pmatrix bmatrix brmatrix fmatrix cmatrix amatrix def @Eq + named initzunit { 1f } body @Body @Begin @@ -138,7 +139,9 @@ def @Eq # Lout but is used by the @SupGap symbol. # # # # Knuth also recommends some changes that depend on whether the # - # equation is displayed or inline; these are not implemented. # + # equation is displayed or inline; these are not implemented, # + # except that the @E symbol for inline equations (defined as # + # a macro at the bottom of this file) includes a @VSqueeze. # # # ################################################################### @@ -1690,8 +1693,8 @@ def @Eq macro amatrix { matrix atleft { blangle } atright { brangle } } { Slope xheight2mark } @Font { separate @SpaceGap } @Space - 1f @ZUnit 1f @YUnit @Body + initzunit @ZUnit 1f @YUnit @Body @End @Eq -macro @E { @OneCol @Eq } +macro @E { @OneCol @Eq initzunit { 0.7f } } diff --git a/include/haskell b/include/haskell index 7fa9b41..52d5448 100644 --- a/include/haskell +++ b/include/haskell @@ -40,6 +40,7 @@ # fixedfont { Courier } # font family # fixedsize { -1.0p } # font size # fixedline { 1.0vx } # line-space + # fixedspace { lout } # spacing mode # fixedtabin { 8 } # tab interval # fixedtabout { 8s } # tab width @@ -64,6 +65,7 @@ # varyingfont { } # font family # varyingsize { 1.0f } # font size # varyingline { 1.0vx } # line-space + # varyingspace { lout } # spacing mode # varyingtabin { 8 } # tab interval # varyingtabout { 3f } # tab width @@ -88,6 +90,7 @@ # symbolfont { } # font family # symbolsize { 1.0f } # font size # symbolline { 1.0vx } # line-space + # symbolspace { lout } # spacing mode # symboltabin { 8 } # tab interval # symboltabout { 3f } # tab width diff --git a/include/haskellf b/include/haskellf index e7a2d14..8a019f2 100644 --- a/include/haskellf +++ b/include/haskellf @@ -27,6 +27,7 @@ def @HaskellSetup named fixedfont { Courier }# font family named fixedsize { -1.0p } # font size named fixedline { 1.0vx } # line-space + named fixedspace { lout } # spacing mode named fixedtabin { 4 } # tab interval named fixedtabout { 4s } # tab width @@ -53,6 +54,7 @@ def @HaskellSetup named varyingfont { } # font family named varyingsize { 1.0f } # font size named varyingline { 1.0vx } # line-space + named varyingspace { lout } # spacing mode named varyingtabin { 4 } # tab interval named varyingtabout { 1.5f } # tab width @@ -79,6 +81,7 @@ def @HaskellSetup named symbolfont { } # font family named symbolsize { 1f } # font size named symbolline { 1.0vx } # line-space + named symbolspace { lout } # spacing mode named symboltabin { 4 } # tab interval named symboltabout { 1.7f } # tab width @@ -115,6 +118,7 @@ def @HaskellSetup named font { dft } # font family named size { dft } # font size named line { dft } # line-space + named space { dft } # spacing mode named tabin { dft } # tab interval named tabout { dft } # tab width named braces { dft } # braces font @@ -229,6 +233,15 @@ def @HaskellSetup } + def @InitSpace + { + space @Test + iffixed { fixedspace } + ifvarying { varyingspace } + ifsymbol { symbolspace } + } + + def @PO # for formatting operators right x { @@ -247,7 +260,7 @@ def @HaskellSetup def @A # get characters from the Adobe Symbol font - left sym + named sym {} right x { style @Case { @@ -459,7 +472,7 @@ def @HaskellSetup macro "$>" { {} & } - { @InitFontFamily Base @InitSize } @Font + { @InitFontFamily Base @InitSize } @Font @InitSpace @Space { @InitLine lines nohyphen } @Break @Body @End @Haskell diff --git a/include/java b/include/java index f406d39..41fd1f7 100644 --- a/include/java +++ b/include/java @@ -40,6 +40,7 @@ # fixedfont { Courier } # font family # fixedsize { -1.0p } # font size # fixedline { 1.0vx } # line-space + # fixedspace { lout } # spacing mode # fixedtabin { 8 } # tab interval # fixedtabout { 8s } # tab width @@ -64,6 +65,7 @@ # varyingfont { } # font family # varyingsize { 1.0f } # font size # varyingline { 1.0vx } # line-space + # varyingspace { lout } # spacing mode # varyingtabin { 8 } # tab interval # varyingtabout { 3f } # tab width @@ -88,6 +90,7 @@ # symbolfont { } # font family # symbolsize { 1.0f } # font size # symbolline { 1.0vx } # line-space + # symbolspace { lout } # spacing mode # symboltabin { 8 } # tab interval # symboltabout { 3f } # tab width diff --git a/include/javaf b/include/javaf index 466a099..fb84541 100644 --- a/include/javaf +++ b/include/javaf @@ -27,6 +27,7 @@ def @JavaSetup named fixedfont { Courier }# font family named fixedsize { -1.0p } # font size named fixedline { 1.0vx } # line-space + named fixedspace { lout } # spacing mode named fixedtabin { 8 } # tab interval named fixedtabout { 8s } # tab width @@ -50,6 +51,7 @@ def @JavaSetup named varyingfont { } # font family named varyingsize { 1.0f } # font size named varyingline { 1.0vx } # line-space + named varyingspace { lout } # spacing mode named varyingtabin { 8 } # tab interval named varyingtabout { 3f } # tab width @@ -73,6 +75,7 @@ def @JavaSetup named symbolfont { } # font family named symbolsize { 1.0f } # font size named symbolline { 1.0vx } # line-space + named symbolspace { lout } # spacing mode named symboltabin { 8 } # tab interval named symboltabout { 3f } # tab width @@ -106,6 +109,7 @@ def @JavaSetup named font { dft } # font family named size { dft } # font size named line { dft } # line-space + named space { dft } # spacing mode named tabin { dft } # tab interval named tabout { dft } # tab width named identifiers { dft } # ident. font @@ -219,6 +223,15 @@ def @JavaSetup } + def @InitSpace + { + space @Test + iffixed { fixedspace } + ifvarying { varyingspace } + ifsymbol { symbolspace } + } + + def @PI # for formatting identifiers right x { @@ -369,7 +382,7 @@ def @JavaSetup def @A # get characters from the Adobe Symbol font - left sym + named sym {} right x { style @Case { @@ -382,7 +395,7 @@ def @JavaSetup macro "$>" { {} & } - { @InitFontFamily Base @InitSize } @Font + { @InitFontFamily Base @InitSize } @Font @InitSpace @Space { @InitLine lines nohyphen } @Break @Body @End @Java diff --git a/include/langdefs b/include/langdefs index 95af454..3df4bae 100644 --- a/include/langdefs +++ b/include/langdefs @@ -4,6 +4,7 @@ langdef Danish Dansk da { danish . : ! ? .) ?) !) .' !' ?' } langdef Dutch Nederlands nl { dutch . : ! ? .) ?) !) .' !' ?' } langdef English en { english . : ! ? .) ?) !) .' !' ?' } langdef EnglishUK "en-GB" { engluk . : ! ? .) ?) !) .' !' ?' } +langdef Esperanto eo { esperanto . : ! ? .) ?) !) .' !' ?' } langdef Finnish Suomi fi { finnish } langdef French Francais "Fran\347ais" fr { french } langdef German Deutsch de { german } @@ -39,6 +39,7 @@ # fixedfont { Courier } # font family # fixedsize { -1.0p } # font size # fixedline { 1.0vx } # line-space + # fixedspace { lout } # spacing mode # fixedtabin { 8 } # tab interval # fixedtabout { 8s } # tab width @@ -63,6 +64,7 @@ # varyingfont { } # font family # varyingsize { 1.0f } # font size # varyingline { 1.0vx } # line-space + # varyingspace { lout } # varying mode # varyingtabin { 8 } # tab interval # varyingtabout { 3f } # tab width @@ -87,6 +89,7 @@ # symbolfont { } # font family # symbolsize { 1.0f } # font size # symbolline { 1.0vx } # line-space + # symbolspace { lout } # spacing mode # symboltabin { 8 } # tab interval # symboltabout { 3f } # tab width diff --git a/include/npf b/include/npf index a45a94c..258529d 100644 --- a/include/npf +++ b/include/npf @@ -26,6 +26,7 @@ def @NonpareilSetup named fixedfont { Courier }# font family named fixedsize { -1.0p } # font size named fixedline { 1.0vx } # line-space + named fixedspace { lout } # spacing mode named fixedtabin { 8 } # tab interval named fixedtabout { 8s } # tab width @@ -49,6 +50,7 @@ def @NonpareilSetup named varyingfont { } # font family named varyingsize { 1.0f } # font size named varyingline { 1.0vx } # line-space + named varyingspace { lout } # spacing mode named varyingtabin { 8 } # tab interval named varyingtabout { 3f } # tab width @@ -72,6 +74,7 @@ def @NonpareilSetup named symbolfont { } # font family named symbolsize { 1.0f } # font size named symbolline { 1.0vx } # line-space + named symbolspace { lout } # spacing mode named symboltabin { 8 } # tab interval named symboltabout { 3f } # tab width @@ -105,6 +108,7 @@ def @NonpareilSetup named font { dft } # font family named size { dft } # font size named line { dft } # line-space + named space { dft } # spacing mode named tabin { dft } # tab interval named tabout { dft } # tab width named identifiers { dft } # ident. font @@ -218,6 +222,15 @@ def @NonpareilSetup } + def @InitSpace + { + space @Test + iffixed { fixedspace } + ifvarying { varyingspace } + ifsymbol { symbolspace } + } + + def @PI # for formatting identifiers right x { @@ -368,7 +381,7 @@ def @NonpareilSetup def @A # get characters from the Adobe Symbol font - left sym + named sym {} right x { style @Case { @@ -381,7 +394,7 @@ def @NonpareilSetup macro "$>" { {} & } - { @InitFontFamily Base @InitSize } @Font + { @InitFontFamily Base @InitSize } @Font @InitSpace @Space { @InitLine lines nohyphen } @Break @Body @End @Nonpareil diff --git a/include/perl b/include/perl index 7b723b9..4a886f3 100644 --- a/include/perl +++ b/include/perl @@ -58,6 +58,7 @@ # fixedfont { Courier } # font family # fixedsize { -1.0p } # font size # fixedline { 1.0vx } # line-space + # fixedspace { lout } # spacing mode # fixedtabin { 8 } # tab interval # fixedtabout { 8s } # tab width @@ -83,6 +84,7 @@ # varyingsize { 1.0f } # font size # varyingline { 1.0vx } # line-space # varyingtabin { 8 } # tab interval + # varyingspace { lout } # spacing mode # varyingtabout { 3f } # tab width # varyingidentifiers { Slope } # identifier face @@ -106,6 +108,7 @@ # symbolfont { } # font family # symbolsize { 1.0f } # font size # symbolline { 1.0vx } # line-space + # symbolspace { lout } # spacing mode # symboltabin { 8 } # tab interval # symboltabout { 3f } # tab width diff --git a/include/perlf b/include/perlf index b82f3a8..8a12ceb 100644 --- a/include/perlf +++ b/include/perlf @@ -27,6 +27,7 @@ def @PerlSetup named fixedfont { Courier }# font family named fixedsize { -1.0p } # font size named fixedline { 1.0vx } # line-space + named fixedspace { lout } # spacing mode named fixedtabin { 8 } # tab interval named fixedtabout { 8s } # tab width @@ -50,6 +51,7 @@ def @PerlSetup named varyingfont { } # font family named varyingsize { 1.0f } # font size named varyingline { 1.0vx } # line-space + named varyingspace { lout } # spacing mode named varyingtabin { 8 } # tab interval named varyingtabout { 3f } # tab width @@ -73,6 +75,7 @@ def @PerlSetup named symbolfont { } # font family named symbolsize { 1.0f } # font size named symbolline { 1.0vx } # line-space + named symbolspace { lout } # spacing mode named symboltabin { 8 } # tab interval named symboltabout { 3f } # tab width @@ -106,6 +109,7 @@ def @PerlSetup named font { dft } # font family named size { dft } # font size named line { dft } # line-space + named space { dft } # spacing mode named tabin { dft } # tab interval named tabout { dft } # tab width named identifiers { dft } # ident. font @@ -219,6 +223,15 @@ def @PerlSetup } + def @InitSpace + { + space @Test + iffixed { fixedspace } + ifvarying { varyingspace } + ifsymbol { symbolspace } + } + + def @PI # for formatting identifiers right x { @@ -369,7 +382,7 @@ def @PerlSetup def @A # get characters from the Adobe Symbol font - left sym + named sym {} right x { style @Case { @@ -382,7 +395,7 @@ def @PerlSetup macro "$>" { {} & } - { @InitFontFamily Base @InitSize } @Font + { @InitFontFamily Base @InitSize } @Font @InitSpace @Space { @InitLine lines nohyphen } @Break @Body @End @Perl diff --git a/include/podf b/include/podf index 1a64654..709cb06 100644 --- a/include/podf +++ b/include/podf @@ -508,7 +508,7 @@ def @PodSetup def @A # get characters from the Adobe Symbol font - left sym + named sym {} right x { style @Case { diff --git a/include/python b/include/python index 0db2ea5..9216ca5 100644 --- a/include/python +++ b/include/python @@ -40,6 +40,7 @@ # fixedfont { Courier } # font family # fixedsize { -1.0p } # font size # fixedline { 1.0vx } # line-space + # fixedspace { lout } # spacing mode # fixedtabin { 8 } # tab interval # fixedtabout { 8s } # tab width @@ -64,6 +65,7 @@ # varyingfont { } # font family # varyingsize { 1.0f } # font size # varyingline { 1.0vx } # line-space + # varyingspace { lout } # spacing mode # varyingtabin { 8 } # tab interval # varyingtabout { 3f } # tab width @@ -88,6 +90,7 @@ # symbolfont { } # font family # symbolsize { 1.0f } # font size # symbolline { 1.0vx } # line-space + # symbolspace { lout } # spacing mode # symboltabin { 8 } # tab interval # symboltabout { 3f } # tab width diff --git a/include/pythonf b/include/pythonf index f70111f..712c399 100644 --- a/include/pythonf +++ b/include/pythonf @@ -27,6 +27,7 @@ def @PythonSetup named fixedfont { Courier }# font family named fixedsize { -1.0p } # font size named fixedline { 1.0vx } # line-space + named fixedspace { lout } # spacing mode named fixedtabin { 8 } # tab interval named fixedtabout { 8s } # tab width @@ -50,6 +51,7 @@ def @PythonSetup named varyingfont { } # font family named varyingsize { 1.0f } # font size named varyingline { 1.0vx } # line-space + named varyingspace { lout } # spacing mode named varyingtabin { 8 } # tab interval named varyingtabout { 3f } # tab width @@ -73,6 +75,7 @@ def @PythonSetup named symbolfont { } # font family named symbolsize { 1.0f } # font size named symbolline { 1.0vx } # line-space + named symbolspace { lout } # spacing mode named symboltabin { 8 } # tab interval named symboltabout { 3f } # tab width @@ -106,6 +109,7 @@ def @PythonSetup named font { dft } # font family named size { dft } # font size named line { dft } # line-space + named space { dft } # spacing mode named tabin { dft } # tab interval named tabout { dft } # tab width named identifiers { dft } # ident. font @@ -219,6 +223,15 @@ def @PythonSetup } + def @InitSpace + { + space @Test + iffixed { fixedspace } + ifvarying { varyingspace } + ifsymbol { symbolspace } + } + + def @PI # for formatting identifiers right x { @@ -372,7 +385,7 @@ def @PythonSetup def @A # get characters from the Adobe Symbol font - left sym + named sym {} right x { style @Case { @@ -386,7 +399,7 @@ def @PythonSetup def "''" { "''" } - { @InitFontFamily Base @InitSize } @Font + { @InitFontFamily Base @InitSize } @Font @InitSpace @Space { @InitLine lines nohyphen } @Break @Body @End @Python diff --git a/include/report b/include/report index 4cf0a5a..7f2523d 100644 --- a/include/report +++ b/include/report @@ -409,6 +409,17 @@ # @IndexInContents { Yes } # add index to contents # @IndexAInContents { Yes } # add index A to contents # @IndexBInContents { Yes } # add index B to contents + # @SectionContentsIndent { 0f } # contents indent of sections + # @SubSectionContentsIndent { 3f } # contents indent of subsections + # @SubSubSectionContentsIndent{ 6f } # contents indent of sub-subsections + # @AppendixContentsIndent { 0f } # contents indent of appendices + # @SubAppendixContentsIndent { 3f } # contents indent of sub-appendices + # @SubSubAppendixContentsIndent { 6f } # contents indent of sub-sub-appendices + # @ReferencesContentsIndent { 0f } # contents indent of references + # @GlossaryContentsIndent { 0f } # contents indent of glossary + # @IndexContentsIndent { 0f } # contents indent of index + # @IndexAContentsIndent { 0f } # contents indent of index A + # @IndexBContentsIndent { 0f } # contents indent of index B # @SectionNumInTheorems { No } # theorem num has section num # @SubSectionNumInTheorems { No } # theorem num has subsect num # @SubSubSectionNumInTheorems { No } # theorem num has sub-ss. num diff --git a/include/reportf b/include/reportf index f0b3779..ebef8b5 100644 --- a/include/reportf +++ b/include/reportf @@ -139,6 +139,18 @@ def @ReportSetup named @IndexAInContents { Yes } named @IndexBInContents { Yes } + named @SectionContentsIndent { 0f } + named @SubSectionContentsIndent { 3f } + named @SubSubSectionContentsIndent { 6f } + named @AppendixContentsIndent { 0f } + named @SubAppendixContentsIndent { 3f } + named @SubSubAppendixContentsIndent { 6f } + named @ReferencesContentsIndent { 0f } + named @GlossaryContentsIndent { 0f } + named @IndexContentsIndent { 0f } + named @IndexAContentsIndent { 0f } + named @IndexBContentsIndent { 0f } + named @SectionNumInTheorems { No } named @SubSectionNumInTheorems { No } named @SubSubSectionNumInTheorems { No } @@ -360,6 +372,7 @@ def @ReportSetup headingbreak { @ReferencesHeadingBreak } headingformat { @ReferencesHeadingFormat @Body } incontents { @ReferencesInContents } + contentsindent { @ReferencesContentsIndent } majornum {} majortitle {} minornum {} @@ -394,6 +407,7 @@ def @ReportSetup headingformat { @GlossaryHeadingFormat @Body } headingtext { @GlossaryText } incontents { @GlossaryInContents } + contentsindent { @GlossaryContentsIndent } prefix { @GlossaryPrefix } inrunners { Yes } majornum {} @@ -432,6 +446,7 @@ def @ReportSetup headingformat { @IndexHeadingFormat @Body } headingtext { @IndexText } incontents { @IndexInContents } + contentsindent { @IndexContentsIndent } prefix { @IndexPrefix } inrunners { Yes } majornum {} @@ -469,6 +484,7 @@ def @ReportSetup headingformat { @IndexAHeadingFormat @Body } headingtext { @IndexAText } incontents { @IndexAInContents } + contentsindent { @IndexAContentsIndent } prefix { @IndexAPrefix } inrunners { Yes } majornum {} @@ -506,6 +522,7 @@ def @ReportSetup headingformat { @IndexBHeadingFormat @Body } headingtext { @IndexBText } incontents { @IndexBInContents } + contentsindent { @IndexBContentsIndent } prefix { @IndexBPrefix } inrunners { Yes } majornum {} @@ -728,7 +745,7 @@ def @ReportSetup headingbreak { @SubSubSectionHeadingBreak } headingformat { @Num @SubSubSectionHeadingFormat @Body } incontents { @SubSubSectionInContents } - contentsindent { 6f } + contentsindent { @SubSubSectionContentsIndent } numbers { @SubSubSectionNumbers } attachnum { @SubSubSectionList&&preceding @Tagged @Tag } retrievenum { @SubSubSectionList&&@Tag @Open { num } } @@ -755,7 +772,7 @@ def @ReportSetup headingbreak { @SubSectionHeadingBreak } headingformat { @Num @SubSectionHeadingFormat @Body } incontents { @SubSectionInContents } - contentsindent { 3f } + contentsindent { @SubSectionContentsIndent } numbers { @SubSectionNumbers } attachnum { @SubSectionList&&preceding @Tagged @Tag } retrievenum { @SubSectionList&&@Tag @Open { num } } @@ -781,7 +798,7 @@ def @ReportSetup headingbreak { @SectionHeadingBreak } headingformat { @Num @SectionHeadingFormat @Body } incontents { @SectionInContents } - contentsindent { 0f } + contentsindent { @SectionContentsIndent } numbers { @SectionNumbers } attachnum { @SectionList&&preceding @Tagged @Tag } retrievenum { @SectionList&&@Tag @Open { num } } @@ -895,7 +912,7 @@ def @ReportSetup headingbreak { @SubSubAppendixHeadingBreak } headingformat { @Num @SubSubAppendixHeadingFormat @Body } incontents { @SubSubAppendixInContents } - contentsindent { 6f } + contentsindent { @SubSubAppendixContentsIndent } numbers { @SubSubAppendixNumbers } attachnum { @SubSubAppendixList&&preceding @Tagged @Tag } retrievenum { @SubSubAppendixList&&@Tag @Open { num } } @@ -922,7 +939,7 @@ def @ReportSetup headingbreak { @SubAppendixHeadingBreak } headingformat { @Num @SubAppendixHeadingFormat @Body } incontents { @SubAppendixInContents } - contentsindent { 3f } + contentsindent { @SubAppendixContentsIndent } numbers { @SubAppendixNumbers } attachnum { @SubAppendixList&&preceding @Tagged @Tag } retrievenum { @SubAppendixList&&@Tag @Open { num } } @@ -949,7 +966,7 @@ def @ReportSetup headingbreak { @AppendixHeadingBreak } headingformat { @Num @AppendixHeadingFormat @Body } incontents { @AppendixInContents } - contentsindent { 0f } + contentsindent { @AppendixContentsIndent } word { appendix @WordVal @AppendixWord } numbers { @AppendixNumbers } attachnum { @AppendixList&&preceding @Tagged @Tag } diff --git a/include/rsl b/include/rsl index 09427b6..3411034 100644 --- a/include/rsl +++ b/include/rsl @@ -41,6 +41,7 @@ # fixedfont { Courier } # font family # fixedsize { -1.0p } # font size # fixedline { 1.0vx } # line-space + # fixedspace { lout } # spacing mode # fixedtabin { 8 } # tab interval # fixedtabout { 8s } # tab width @@ -65,6 +66,7 @@ # varyingfont { } # font family # varyingsize { 1.0f } # font size # varyingline { 1.0vx } # line-space + # varyingspace { lout } # spacing mode # varyingtabin { 8 } # tab interval # varyingtabout { 3f } # tab width @@ -89,6 +91,7 @@ # symbolfont { } # font family # symbolsize { 1.0f } # font size # symbolline { 1.0vx } # line-space + # symbolspace { lout } # spacing mode # symboltabin { 8 } # tab interval # symboltabout { 3f } # tab width diff --git a/include/rslf b/include/rslf index f6c0bdf..0680138 100644 --- a/include/rslf +++ b/include/rslf @@ -27,6 +27,7 @@ def @RSLSetup named fixedfont { Courier }# font family named fixedsize { -1.0p } # font size named fixedline { 1.0vx } # line-space + named fixedspace { lout } # spacing mode named fixedtabin { 8 } # tab interval named fixedtabout { 8s } # tab width @@ -50,6 +51,7 @@ def @RSLSetup named varyingfont { } # font family named varyingsize { 1.0f } # font size named varyingline { 1.0vx } # line-space + named varyingspace { lout } # spacing mode named varyingtabin { 8 } # tab interval named varyingtabout { 3f } # tab width @@ -73,6 +75,7 @@ def @RSLSetup named symbolfont { } # font family named symbolsize { 1.0f } # font size named symbolline { 1.0vx } # line-space + named symbolspace { lout } # spacing mode named symboltabin { 8 } # tab interval named symboltabout { 3f } # tab width @@ -106,6 +109,7 @@ def @RSLSetup named font { dft } # font family named size { dft } # font size named line { dft } # line-space + named space { dft } # spacing mode named tabin { dft } # tab interval named tabout { dft } # tab width named identifiers { dft } # ident. font @@ -219,6 +223,15 @@ def @RSLSetup } + def @InitSpace + { + space @Test + iffixed { fixedspace } + ifvarying { varyingspace } + ifsymbol { symbolspace } + } + + def @PI # for formatting identifiers right x { @@ -385,7 +398,7 @@ def @RSLSetup def @A # get characters from the Adobe Symbol font - left sym + named sym {} right x { { { Symbol Base } @Font @Char sym } @FA x @@ -440,7 +453,7 @@ def @RSLSetup macro "$>" { {} & } - { @InitFontFamily Base @InitSize } @Font + { @InitFontFamily Base @InitSize } @Font @InitSpace @Space { @InitLine lines nohyphen } @Break @Body @End @RSL diff --git a/include/ruby b/include/ruby index 8ee57d5..6a82b55 100644 --- a/include/ruby +++ b/include/ruby @@ -40,6 +40,7 @@ # fixedfont { LetterGothic } # font family # fixedsize { -1.0p } # font size # fixedline { 1.0vx } # line-space + # fixedspace { lout } # spacing mode # fixedtabin { 8 } # tab interval # fixedtabout { 8s } # tab width @@ -64,6 +65,7 @@ # varyingfont { } # font family # varyingsize { 1.0f } # font size # varyingline { 1.0vx } # line-space + # varyingspace { lout } # spacing mode # varyingtabin { 8 } # tab interval # varyingtabout { 3f } # tab width @@ -88,6 +90,7 @@ # symbolfont { } # font family # symbolsize { 1.0f } # font size # symbolline { 1.0vx } # line-space + # symbolspace { lout } # spacing mode # symboltabin { 8 } # tab interval # symboltabout { 3f } # tab width diff --git a/include/rubyf b/include/rubyf index 89f38e0..e7f607a 100644 --- a/include/rubyf +++ b/include/rubyf @@ -27,6 +27,7 @@ def @RubySetup named fixedfont { Courier }# font family named fixedsize { -1.0p } # font size named fixedline { 1.0vx } # line-space + named fixedspace { lout } # spacing mode named fixedtabin { 8 } # tab interval named fixedtabout { 8s } # tab width @@ -50,6 +51,7 @@ def @RubySetup named varyingfont { } # font family named varyingsize { 1.0f } # font size named varyingline { 1.0vx } # line-space + named varyingspace { lout } # spacing mode named varyingtabin { 8 } # tab interval named varyingtabout { 3f } # tab width @@ -73,6 +75,7 @@ def @RubySetup named symbolfont { } # font family named symbolsize { 1.0f } # font size named symbolline { 1.0vx } # line-space + named symbolspace { lout } # spacing mode named symboltabin { 8 } # tab interval named symboltabout { 3f } # tab width @@ -106,6 +109,7 @@ def @RubySetup named font { dft } # font family named size { dft } # font size named line { dft } # line-space + named space { dft } # spacing mode named tabin { dft } # tab interval named tabout { dft } # tab width named identifiers { dft } # ident. font @@ -219,6 +223,15 @@ def @RubySetup } + def @InitSpace + { + space @Test + iffixed { fixedspace } + ifvarying { varyingspace } + ifsymbol { symbolspace } + } + + def @PI # for formatting identifiers right x { @@ -372,7 +385,7 @@ def @RubySetup def @A # get characters from the Adobe Symbol font - left sym + named sym {} right x { style @Case { @@ -385,7 +398,7 @@ def @RubySetup macro "$>" { {} & } - { @InitFontFamily Base @InitSize } @Font + { @InitFontFamily Base @InitSize } @Font @InitSpace @Space { @InitLine lines nohyphen } @Break @Body @End @Ruby diff --git a/include/slides b/include/slides index 86218ca..b3fb95c 100644 --- a/include/slides +++ b/include/slides @@ -344,6 +344,10 @@ # @LectureInContents { Yes } # add lectures to contents # @OverheadInContents { No } # add overheads to contents # @ReferencesInContents { Yes } # add references to contents + # @LectureContentsIndent { 0f } # contents indent of lectures + # @OverheadInLectureContentsIndent { 2f } # .. of overhead within lec + # @OverheadContentsIndent { 0f } # .. of stand-alone overhead + # @ReferencesContentsIndent { 0f } # .. of references # @LectureNumInTheorems { Yes } # theorem num has lecture num # @OverheadNumInTheorems { No } # theorem num has overhead num # @LectureNumInDisplays { Yes } # display num has lecture num diff --git a/include/slidesf b/include/slidesf index 3823ccd..5194ff6 100644 --- a/include/slidesf +++ b/include/slidesf @@ -42,6 +42,10 @@ def @OverheadSetup named @LectureInContents { Yes } named @OverheadInContents { No } named @ReferencesInContents { Yes } + named @LectureContentsIndent { 0f } + named @OverheadContentsIndent { 0f } + named @OverheadInLectureContentsIndent { 2f } + named @ReferencesContentsIndent { 0f } named @LectureNumInTheorems { Yes } named @OverheadNumInTheorems { No } named @LectureNumInDisplays { Yes } @@ -167,6 +171,7 @@ def @OverheadSetup @LectureHeadingFormat { @RefHeading @RefListTitle } | // @PageMark @Tag // @ReferencesInContents @ContentsEntry + indent { @ReferencesContentsIndent } title { @RefHeading @RefListTitle } pagenum { @PageOf @Tag } // Start @Runner @MajorTitle { @GetTitle } @@ -248,7 +253,7 @@ def @OverheadSetup headingbreak { @OverheadHeadingBreak } headingformat { @Num @OverheadHeadingFormat @Body } incontents { @OverheadInContents } - contentsindent { 0f } + contentsindent { @OverheadContentsIndent } numbers { @OverheadNumbers } attachnum { @OverheadsList&&preceding @Tagged @Tag } retrievenum { @OverheadsList&&@Tag @Open { num } } @@ -326,7 +331,7 @@ def @OverheadSetup headingbreak { @OverheadHeadingBreak } headingformat { @Num @OverheadHeadingFormat @Body } incontents { @OverheadInContents } - contentsindent { 2f } + contentsindent { @OverheadInLectureContentsIndent } numbers { @OverheadNumbers } attachnum { @LecOverheadsList&&preceding @Tagged @Tag } retrievenum { @LecOverheadsList&&@Tag @Open { num } } @@ -354,7 +359,7 @@ def @OverheadSetup headingbreak { @LectureHeadingBreak } headingformat { @Num @LectureHeadingFormat @Body } incontents { @LectureInContents } - contentsindent { 0f } + contentsindent { @LectureContentsIndent } word { lecture @WordVal @LectureWord } numbers { @LectureNumbers } attachnum { @LectureList&&preceding @Tagged @Tag } |