From 73d840b9f14b65166b92e6b43f930fd0ef7b8267 Mon Sep 17 00:00:00 2001 From: "Jeffrey H. Kingston" Date: Tue, 14 Sep 2010 19:38:17 +0000 Subject: Lout 3.19. git-svn-id: http://svn.savannah.nongnu.org/svn/lout/trunk@7 9365b830-b601-4143-9ba8-b4a8e2c3339c --- include/README | 2 +- include/bluef | 1 - include/book | 9 ++ include/cprintf | 5 +- include/doc | 9 ++ include/dsf | 256 ++++++++++++++++++++++++-------------------------------- include/eqf | 6 +- include/picture | 9 ++ include/progf | 34 ++++++-- include/report | 9 ++ include/slides | 9 ++ include/tblf | 26 +++++- 12 files changed, 217 insertions(+), 158 deletions(-) (limited to 'include') diff --git a/include/README b/include/README index dc2cd91..008aac8 100644 --- a/include/README +++ b/include/README @@ -78,4 +78,4 @@ Miscellaneous Jeffrey H. Kingston -26 February 2000 +9 March 2000 diff --git a/include/bluef b/include/bluef index 5d4a06d..2966814 100644 --- a/include/bluef +++ b/include/bluef @@ -213,7 +213,6 @@ def @BlueSetup } def @O # for formatting operators - named symb {} right x { operators @Test diff --git a/include/book b/include/book index 4a8a5a8..22a3ab9 100644 --- a/include/book +++ b/include/book @@ -142,16 +142,25 @@ # @IndexBreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexColumnNumber { 2 } # index columns (1 to 10) # @IndexColumnGap { 1.00c @OrIfPlain 6s } # index column gap + # @IndexCtd { Yes } # include (ctd.) lines + # @IndexCtdWord { continued } # "ctd." in current lang. + # @IndexCtdFormat { @Body @I (@CtdWord) } # format of ctd. # @MakeIndexA { No } # make index A? Yes or No # @IndexAFont { } # index A entries font # @IndexABreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexAColumnNumber { 2 } # index A columns (1 to 10) # @IndexAColumnGap { 1.00c @OrIfPlain 6s } # index A column gap + # @IndexACtd { Yes } # include (ctd.) lines + # @IndexACtdWord { continued } # "ctd." in current lang. + # @IndexACtdFormat { @Body @I (@CtdWord) } # format of ctd. # @MakeIndexB { No } # make index B? Yes or No # @IndexBFont { } # index B entries font # @IndexBBreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexBColumnNumber { 2 } # index B columns (1 to 10) # @IndexBColumnGap { 1.00c @OrIfPlain 6s } # index B column gap + # @IndexBCtd { Yes } # include (ctd.) lines + # @IndexBCtdWord { continued } # "ctd." in current lang. + # @IndexBCtdFormat { @Body @I (@CtdWord) } # format of ctd. # @TopGap { 0.75c @OrIfPlain 2f } # gap between figures # @MidGap { 0.75c @OrIfPlain 2f } # gap above/below body text # @FootNoteNumbers { Arabic } # footnote numbers diff --git a/include/cprintf b/include/cprintf index 311369c..313b110 100644 --- a/include/cprintf +++ b/include/cprintf @@ -15,8 +15,8 @@ export @CP def @CPSetup named style - named @OrIfPlain left x right y - { @BackEnd @Case { PlainText @Yield y else @Yield x } } + named @OrIfPlain left x right y + { @BackEnd @Case { PlainText @Yield y else @Yield x } } { fixed } # print style named pipe { } # pipe through this first @@ -214,7 +214,6 @@ def @CPSetup } def @O # for formatting operators - named symb {} right x { operators @Test diff --git a/include/doc b/include/doc index cf483ef..85fd92c 100644 --- a/include/doc +++ b/include/doc @@ -142,16 +142,25 @@ # @IndexBreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexColumnNumber { 2 } # index columns (1 to 10) # @IndexColumnGap { 1.00c @OrIfPlain 6s } # index column gap + # @IndexCtd { Yes } # include (ctd.) lines + # @IndexCtdWord { continued } # "ctd." in current lang. + # @IndexCtdFormat { @Body @I (@CtdWord) } # format of ctd. # @MakeIndexA { No } # make index A? Yes or No # @IndexAFont { } # index A entries font # @IndexABreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexAColumnNumber { 2 } # index A columns (1 to 10) # @IndexAColumnGap { 1.00c @OrIfPlain 6s } # index A column gap + # @IndexACtd { Yes } # include (ctd.) lines + # @IndexACtdWord { continued } # "ctd." in current lang. + # @IndexACtdFormat { @Body @I (@CtdWord) } # format of ctd. # @MakeIndexB { No } # make index B? Yes or No # @IndexBFont { } # index B entries font # @IndexBBreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexBColumnNumber { 2 } # index B columns (1 to 10) # @IndexBColumnGap { 1.00c @OrIfPlain 6s } # index B column gap + # @IndexBCtd { Yes } # include (ctd.) lines + # @IndexBCtdWord { continued } # "ctd." in current lang. + # @IndexBCtdFormat { @Body @I (@CtdWord) } # format of ctd. # @TopGap { 0.75c @OrIfPlain 2f } # gap between figures # @MidGap { 0.75c @OrIfPlain 2f } # gap above/below body text # @FootNoteNumbers { Arabic } # footnote numbers diff --git a/include/dsf b/include/dsf index fda93f9..56b2a51 100644 --- a/include/dsf +++ b/include/dsf @@ -234,16 +234,34 @@ def @DocumentSetup named @IndexBreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # index entries break named @IndexColumnNumber { 2 } # index columns (1 to 10) named @IndexColumnGap { 1.00c @OrIfPlain 6s } # index column gap + named @IndexCtd { Yes } # include (ctd.) lines + named @IndexCtdWord { continued } # "ctd." in current lang + named @IndexCtdFormat + left @Body + right @CtdWord + { @Body @I (@CtdWord) } # (ctd.) format named @MakeIndexA { No } # make index A? Yes or No named @IndexAFont { } # index A entries font named @IndexABreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # index A entries break named @IndexAColumnNumber { 2 } # index A columns (1 to 10) named @IndexAColumnGap { 1.00c @OrIfPlain 6s } # index A column gap + named @IndexACtd { Yes } # include (ctd.) lines + named @IndexACtdWord { continued } # "ctd." in current lang + named @IndexACtdFormat + left @Body + right @CtdWord + { @Body @I (@CtdWord) } # (ctd.) format named @MakeIndexB { No } # make index B? Yes or No named @IndexBFont { } # index B entries font named @IndexBBreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # index B entries break named @IndexBColumnNumber { 2 } # index B columns (1 to 10) named @IndexBColumnGap { 1.00c @OrIfPlain 6s } # index B column gap + named @IndexBCtd { Yes } # include (ctd.) lines + named @IndexBCtdWord { continued } # "ctd." in current lang + named @IndexBCtdFormat + left @Body + right @CtdWord + { @Body @I (@CtdWord) } # (ctd.) format named @TopGap { 0.75c @OrIfPlain 2f } # gap between figures named @MidGap { 0.75c @OrIfPlain 2f } # gap above/below body text @@ -3961,14 +3979,51 @@ def @DocumentSetup right etc { // @IndexBreak @Break @IndexList - // @IndexBreak @Break @BypassIndexList // etc + // @IndexBreak @Break @BypassIndexList + # //1vx --- "@Clear" + // @ClearHeaderComponent + // etc } def @DoIndex into { @IndexList&&following } left @Key named indent { 0f } + named stem {} right @Body { + def @Enclose right x + { + @IndexCtd.indent @Case { + + Yes.0f @Yield { + @ClearHeaderComponent + //1vx + x + //1vx + 1vx @SetHeaderComponent { + indent @Wide & + stem @IndexCtdFormat {continued @WordVal @IndexCtdWord} + } + //1vx + 1vx @BeginHeaderComponent (unused) + } + + Yes.1f @Yield { + @EndHeaderComponent + //1vx + x + //1vx + 1vx @BeginHeaderComponent { + indent @Wide & + stem @IndexCtdFormat {continued @WordVal @IndexCtdWord} + } + } + + else @Yield x + + } + } + def @Merge left x right y { {x @Rump y} @Case @@ -3977,19 +4032,6 @@ def @DocumentSetup else @Yield { { x &"0.03fu" , } @Meld y } } -################################ obsolete ################################### -# {x @Rump y} @Case -# { -# "" @Yield x -# else @Yield { -# { {x @Rump y} @Common "," } @Case -# { -# "," @Yield { x &"0.03fu" x @Rump y } -# else @Yield { x &"0.03fu" , x @Rump y } -# } -# } -# } -############################################################################# } @IndexFont @Font @IndexBreak @Break { indent @Wide & @Body } @@ -4002,7 +4044,7 @@ def @DocumentSetup right y { @MakeIndex @Case { - Yes @Yield { {@PageMark @Tag} x @DoIndex indent { indent } y } + Yes @Yield { {@PageMark @Tag} x @DoIndex stem { y } indent { indent } y } else @Yield @Null } } @@ -4017,39 +4059,8 @@ def @DocumentSetup named to {} right y { - def numval + def pagerange { -# to @Case -# { -# "" @Yield @PageOf @Tag -# else @Yield { -# { @PageOf @Tag } @Case -# { -# { @PageOf to } @Yield { @PageOf @Tag } -# else @Yield { {@PageOf @Tag}--{@PageOf to} } -# } -# } -# } - @BackEnd @Case { - { PlainText PostScript } @Yield { - to @Case - { - "" @Yield @PageOf @Tag - else @Yield { - { @PageOf @Tag } @Case - { - { @PageOf to } @Yield { @PageOf @Tag } - else @Yield { {@PageOf @Tag}--{@PageOf to} } - } - } - } - } -# -# PDF: Index entries produce a blue underlined hyperlink for the page number -# - PDF @Yield { - { "__link_source=<<"@Tag">>" } - @Graphic { blue @Colour @Underline { to @Case { "" @Yield @PageOf @Tag @@ -4061,29 +4072,26 @@ def @DocumentSetup } } } - } - } - } - } } + @MakeIndex @Case { - Yes @Yield { - @BackEnd @Case { - { PostScript PlainText } @Yield { - @PageMark @Tag - x @DoIndex indent { indent } { y &"0.03fu" , numval } - } - PDF @Yield { - {"__link_target=<<"@Tag">>"} @Graphic {""} - @PageMark @Tag - x @DoIndex indent { indent } { y &"0.03fu" , numval } - } - } - } -# Yes @Yield { @PageMark @Tag -# x @DoIndex indent { indent } { y &"0.03fu" , numval } -# } + Yes @Yield { @BackEnd @Case { + + { PostScript PlainText } @Yield { + @PageMark @Tag + x @DoIndex stem { y } indent { indent } { y &"0.03fu" , pagerange } + } + + PDF @Yield { + {"__link_target=<<"@Tag">>"} @Graphic {""} + @PageMark @Tag + x @DoIndex stem { y } indent { indent } { + y &"0.03fu" , { "__link_source=<<"@Tag">>" } + @Graphic { blue @Colour @Underline pagerange } + } + } + } } else @Yield @Null } } @@ -4171,39 +4179,8 @@ def @DocumentSetup named to {} right y { - def numval + def pagerange { -# to @Case -# { -# "" @Yield @PageOf @Tag -# else @Yield { -# { @PageOf @Tag } @Case -# { -# { @PageOf to } @Yield { @PageOf @Tag } -# else @Yield { {@PageOf @Tag}--{@PageOf to} } -# } -# } -# } - @BackEnd @Case { - { PostScript PlainText } @Yield { - to @Case - { - "" @Yield @PageOf @Tag - else @Yield { - { @PageOf @Tag } @Case - { - { @PageOf to } @Yield { @PageOf @Tag } - else @Yield { {@PageOf @Tag}--{@PageOf to} } - } - } - } - } -# -# PDF: Index entries produce a blue underlined hyperlink for the page number -# - PDF @Yield { - { "__link_source=<<"@Tag">>" } - @Graphic { blue @Colour @Underline { to @Case { "" @Yield @PageOf @Tag @@ -4215,16 +4192,26 @@ def @DocumentSetup } } } - } - } - } - } } + @MakeIndexA @Case { - Yes @Yield { @PageMark @Tag - x @DoIndexA indent { indent } { y &"0.03fu" , numval } - } + Yes @Yield { @BackEnd @Case { + + { PostScript PlainText } @Yield { + @PageMark @Tag + x @DoIndexA indent { indent } { y &"0.03fu" , pagerange } + } + + PDF @Yield { + {"__link_target=<<"@Tag">>"} @Graphic {""} + @PageMark @Tag + x @DoIndexA indent { indent } { + y &"0.03fu" , { "__link_source=<<"@Tag">>" } + @Graphic { blue @Colour @Underline pagerange } + } + } + } } else @Yield @Null } } @@ -4312,39 +4299,8 @@ def @DocumentSetup named to {} right y { - def numval + def pagerange { -# to @Case -# { -# "" @Yield @PageOf @Tag -# else @Yield { -# { @PageOf @Tag } @Case -# { -# { @PageOf to } @Yield { @PageOf @Tag } -# else @Yield { {@PageOf @Tag}--{@PageOf to} } -# } -# } -# } - @BackEnd @Case { - { PostScript PlainText } @Yield { - to @Case - { - "" @Yield @PageOf @Tag - else @Yield { - { @PageOf @Tag } @Case - { - { @PageOf to } @Yield { @PageOf @Tag } - else @Yield { {@PageOf @Tag}--{@PageOf to} } - } - } - } - } -# -# PDF: Index entries produce a blue underlined hyperlink for the page number -# - PDF @Yield { - { "__link_source=<<"@Tag">>" } - @Graphic { blue @Colour @Underline { to @Case { "" @Yield @PageOf @Tag @@ -4356,16 +4312,26 @@ def @DocumentSetup } } } - } - } - } - } } + @MakeIndexB @Case { - Yes @Yield { @PageMark @Tag - x @DoIndexB indent { indent } { y &"0.03fu" , numval } - } + Yes @Yield { @BackEnd @Case { + + { PostScript PlainText } @Yield { + @PageMark @Tag + x @DoIndexB indent { indent } { y &"0.03fu" , pagerange } + } + + PDF @Yield { + {"__link_target=<<"@Tag">>"} @Graphic {""} + @PageMark @Tag + x @DoIndexB indent { indent } { + y &"0.03fu" , { "__link_source=<<"@Tag">>" } + @Graphic { blue @Colour @Underline pagerange } + } + } + } } else @Yield @Null } } diff --git a/include/eqf b/include/eqf index e03bb3e..68a902b 100644 --- a/include/eqf +++ b/include/eqf @@ -88,6 +88,8 @@ export "`" "``" "```" bin rel punct non vctr big small gcd hom inf ker lg lim liminf limsup ln log max min Pr sec sin sinh supr tan tanh mod ldots cdots vdots ddots del grad "..." ",...," "'" "''" "'''" "''''" empty + + triangleup triangledown leftarrow longleftarrow dblleftarrow dbllongleftarrow rightarrow longrightarrow dblrightarrow dbllongrightarrow @@ -584,7 +586,6 @@ def @Eq } } - def triangledown { 180d @Rotate triangle } ################################################################### # # @@ -1207,6 +1208,9 @@ def @Eq # # ################################################################### + def triangleup { 0.8f @Font triangle } + def triangledown { 180d @Rotate 0.8f @Font triangle } + ################################################################### # # # Symbols with parameters. # diff --git a/include/picture b/include/picture index 42c5c3f..abe6d43 100644 --- a/include/picture +++ b/include/picture @@ -141,16 +141,25 @@ # @IndexBreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexColumnNumber { 2 } # index columns (1 to 10) # @IndexColumnGap { 1.00c @OrIfPlain 6s } # index column gap + # @IndexCtd { Yes } # include (ctd.) lines + # @IndexCtdWord { continued } # "ctd." in current lang. + # @IndexCtdFormat { @Body @I (@CtdWord) } # format of ctd. # @MakeIndexA { No } # make index A? Yes or No # @IndexAFont { } # index A entries font # @IndexABreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexAColumnNumber { 2 } # index A columns (1 to 10) # @IndexAColumnGap { 1.00c @OrIfPlain 6s } # index A column gap + # @IndexACtd { Yes } # include (ctd.) lines + # @IndexACtdWord { continued } # "ctd." in current lang. + # @IndexACtdFormat { @Body @I (@CtdWord) } # format of ctd. # @MakeIndexB { No } # make index B? Yes or No # @IndexBFont { } # index B entries font # @IndexBBreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexBColumnNumber { 2 } # index B columns (1 to 10) # @IndexBColumnGap { 1.00c @OrIfPlain 6s } # index B column gap + # @IndexBCtd { Yes } # include (ctd.) lines + # @IndexBCtdWord { continued } # "ctd." in current lang. + # @IndexBCtdFormat { @Body @I (@CtdWord) } # format of ctd. # @TopGap { 0.75c @OrIfPlain 2f } # gap between figures # @MidGap { 0.75c @OrIfPlain 2f } # gap above/below body text # @FootNoteNumbers { Arabic } # footnote numbers diff --git a/include/progf b/include/progf index 5ca3f81..ec864df 100644 --- a/include/progf +++ b/include/progf @@ -7,11 +7,11 @@ # Adapted from the original @CPrint package. # # # # This package uses a filtered body parameter to convert program source # -# code into Lout source. The filter program is prog2lout, which is # +# code into Lout source. The filter program is prg2lout, which is # # distributed with Lout and should be compiled and installed wherever # # Lout itself is. # # # -# This package is intended for use by prog2lout's stand-alone mode. # +# This package is intended for use by prg2lout's stand-alone mode. # # If you are adding a new language, a better place to start would be # # files eiffelf and eiffel rather than progf. # # # @@ -66,7 +66,7 @@ def @ProgSetup export - "$>" @S @D @C @K @N @O @A @M + "$>" @S @D @C @K @N @O @A @ST @ED @M def @Prog named language { language } # language @@ -124,12 +124,12 @@ def @ProgSetup { pipe @Case { "" @Yield { - "prog2lout -r -l" language -i{@FilterIn} -o{@FilterOut} -e{@FilterErr} + "prg2lout -r -l" language -i{@FilterIn} -o{@FilterOut} -e{@FilterErr} -t{@InitTab} -T{@InitTabWidth} } else @Yield { "cat" @FilterIn "|" pipe "|" - "prog2lout -r -l" language -o{@FilterOut} + "prg2lout -r -l" language -o{@FilterOut} -e{@FilterErr} -t{@InitTab} -T{@InitTabWidth} } } @@ -220,7 +220,6 @@ def @ProgSetup } def @O # for formatting operators - named symb {} right x { operators @Test @@ -240,6 +239,29 @@ def @ProgSetup } } + def @ST # for formatting asterisks + right x + { + operators @Test + iffixed { fixedoperators } + ifvarying { varyingoperators } + ifsymbol { symboloperators } + @Font "0.5w" @VShift x + } + + def @ED # for formatting larger dots + right x + { + operators @Test + iffixed { fixedoperators } + ifvarying { varyingoperators } + ifsymbol { symboloperators } + @Font @BackEnd @Case { + PlainText @Yield x + else @Yield { "1.2f" @Font "+0.05f" @VShift @O x &"0.05f" } + } + } + macro "$>" { {} & } def @M right x diff --git a/include/report b/include/report index 4905980..8c80944 100644 --- a/include/report +++ b/include/report @@ -146,16 +146,25 @@ # @IndexBreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexColumnNumber { 2 } # index columns (1 to 10) # @IndexColumnGap { 1.00c @OrIfPlain 6s } # index column gap + # @IndexCtd { Yes } # include (ctd.) lines + # @IndexCtdWord { continued } # "ctd." in current lang. + # @IndexCtdFormat { @Body @I (@CtdWord) } # format of ctd. # @MakeIndexA { No } # make index A? Yes or No # @IndexAFont { } # index A entries font # @IndexABreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexAColumnNumber { 2 } # index A columns (1 to 10) # @IndexAColumnGap { 1.00c @OrIfPlain 6s } # index A column gap + # @IndexACtd { Yes } # include (ctd.) lines + # @IndexACtdWord { continued } # "ctd." in current lang. + # @IndexACtdFormat { @Body @I (@CtdWord) } # format of ctd. # @MakeIndexB { No } # make index B? Yes or No # @IndexBFont { } # index B entries font # @IndexBBreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexBColumnNumber { 2 } # index B columns (1 to 10) # @IndexBColumnGap { 1.00c @OrIfPlain 6s } # index B column gap + # @IndexBCtd { Yes } # include (ctd.) lines + # @IndexBCtdWord { continued } # "ctd." in current lang. + # @IndexBCtdFormat { @Body @I (@CtdWord) } # format of ctd. # @TopGap { 0.75c @OrIfPlain 2f } # gap between figures # @MidGap { 0.75c @OrIfPlain 2f } # gap above/below body text # @FootNoteNumbers { Arabic } # footnote numbers diff --git a/include/slides b/include/slides index f740c84..60088dd 100644 --- a/include/slides +++ b/include/slides @@ -144,16 +144,25 @@ # @IndexBreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexColumnNumber { 2 } # index columns (1 to 10) # @IndexColumnGap { 1.00c @OrIfPlain 6s } # index column gap + # @IndexCtd { Yes } # include (ctd.) lines + # @IndexCtdWord { continued } # "ctd." in current lang. + # @IndexCtdFormat { @Body @I (@CtdWord) } # format of ctd. # @MakeIndexA { No } # make index A? Yes or No # @IndexAFont { } # index A entries font # @IndexABreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexAColumnNumber { 2 } # index A columns (1 to 10) # @IndexAColumnGap { 1.00c @OrIfPlain 6s } # index A column gap + # @IndexACtd { Yes } # include (ctd.) lines + # @IndexACtdWord { continued } # "ctd." in current lang. + # @IndexACtdFormat { @Body @I (@CtdWord) } # format of ctd. # @MakeIndexB { No } # make index B? Yes or No # @IndexBFont { } # index B entries font # @IndexBBreak { {oragged 1.2fx} @OrIfPlain {oragged 1fx} } # and break # @IndexBColumnNumber { 2 } # index B columns (1 to 10) # @IndexBColumnGap { 1.00c @OrIfPlain 6s } # index B column gap + # @IndexBCtd { Yes } # include (ctd.) lines + # @IndexBCtdWord { continued } # "ctd." in current lang. + # @IndexBCtdFormat { @Body @I (@CtdWord) } # format of ctd. # @TopGap { 0.75c @OrIfPlain 2f } # gap between figures # @MidGap { 0.75c @OrIfPlain 2f } # gap above/below body text # @FootNoteNumbers { Arabic } # footnote numbers diff --git a/include/tblf b/include/tblf index 9a2da6e..d3929cf 100644 --- a/include/tblf +++ b/include/tblf @@ -177,6 +177,18 @@ def @TblSetup @NoBreakRowg @NoBreakRowh + @HeaderRow + @HeaderRowa + @HeaderRowb + @HeaderRowc + @HeaderRowd + @HeaderRowe + @HeaderRowf + @HeaderRowg + @HeaderRowh + + @EndHeaderRow + @NP def @Tbl @@ -1253,7 +1265,7 @@ def @TblSetup named gap {} right thick { - @OneRow { col @VRule thick /gap col @VRule thick } + @OneRow { col @VRule thick |gap col @VRule thick } } def @MakeHRule @@ -3123,6 +3135,18 @@ def @TblSetup macro @NoBreakRowg { /0iu @DoRowg } macro @NoBreakRowh { /0iu @DoRowh } + macro @HeaderRow { / @BeginHeaderComponent @DoRow } + macro @HeaderRowa { / @BeginHeaderComponent @DoRowa } + macro @HeaderRowb { / @BeginHeaderComponent @DoRowb } + macro @HeaderRowc { / @BeginHeaderComponent @DoRowc } + macro @HeaderRowd { / @BeginHeaderComponent @DoRowd } + macro @HeaderRowe { / @BeginHeaderComponent @DoRowe } + macro @HeaderRowf { / @BeginHeaderComponent @DoRowf } + macro @HeaderRowg { / @BeginHeaderComponent @DoRowg } + macro @HeaderRowh { / @BeginHeaderComponent @DoRowh } + + macro @EndHeaderRow { / @EndHeaderComponent } + macro @NP { /"1.1b" } @Body -- cgit