2019-02-22 19:43:00

1 files changed, 135 insertions, 69 deletions

diff --git a/doc/context/sources/general/manuals/luatex/luatex-style.tex b/doc/context/sources/general/manuals/luatex/luatex-style.tex
index a277a1178..708f83ed6 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-style.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-style.tex
@@ -2,7 +2,9 @@
 
 % todo: use \useMPlibrary[lua]
 
-\usemodule[abr-02]
+\enabletrackers[fonts.usage]
+
+\usemodule[fonts-statistics]
 
 \setuplayout
   [height=middle,
@@ -31,9 +33,31 @@
   [each]
   [packed]
 
+\definesymbol[1][\Uchar"2023]
+\definesymbol[2][\endash]
+\definesymbol[3][\wait]      % we want to catch it
+
+\setupitemize
+  [each]
+  [headcolor=maincolor,
+   symbolcolor=maincolor,
+   color=maincolor]
+
 \setupwhitespace
   [medium]
 
+\setuptabulate
+  [blank={small,samepage},
+   headstyle=bold,
+   rulecolor=maincolor,
+   rulethickness=1pt,
+   foregroundcolor=white,
+   foregroundstyle=\ss\bfx\WORD,
+   backgroundcolor=maincolor]
+
+\setupcaptions
+  [headcolor=darkblue]
+
 \startluacode
     local skipped = table.tohash { 'id', 'subtype', 'next', 'prev' }
 
@@ -89,51 +113,13 @@
 \definecolor[keptcolor] [b=.5]
 \definecolor[othercolor][r=.5,g=.5]
 
-\usebodyfont[lucidaot]
-\usebodyfont[pagella]
-\usebodyfont[cambria]
-%usebodyfont[dejavu]
-\usebodyfont[modern] % we need this in examples so we predefine
-
-% \doifmodeelse {atpragma} {
-%
-%   %  \setupbodyfont
-%   %    [lucidaot,10pt]
-%
-%     \setupbodyfont
-%       [dejavu,10pt]
-%
-%     \setuphead [chapter]      [style=\bfd]
-%     \setuphead [section]      [style=\bfb]
-%     \setuphead [subsection]   [style=\bfa]
-%     \setuphead [subsubsection][style=\bf]
-%
-% } {
-%
-%     \definetypeface[mainfacenormal]  [ss][sans] [iwona]       [default]
-%     \definetypeface[mainfacenormal]  [rm][serif][palatino]    [default]
-%     \definetypeface[mainfacenormal]  [tt][mono] [modern]      [default][rscale=1.1]
-%     \definetypeface[mainfacenormal]  [mm][math] [iwona]       [default]
-%
-%     \definetypeface[mainfacemedium]  [ss][sans] [iwona-medium][default]
-%     \definetypeface[mainfacemedium]  [rm][serif][palatino]    [default]
-%     \definetypeface[mainfacemedium]  [tt][mono] [modern]      [default][rscale=1.1]
-%     \definetypeface[mainfacemedium]  [mm][math] [iwona-medium][default]
-%
-%     \setupbodyfont
-%       [mainfacenormal,10pt]
-%
-%     \setuphead [chapter]      [style=\mainfacemedium\bfd]
-%     \setuphead [section]      [style=\mainfacemedium\bfb]
-%     \setuphead [subsection]   [style=\mainfacemedium\bfa]
-%     \setuphead [subsubsection][style=\mainfacemedium\bf]
-%
-% }
-
-\writestatus{luatex manual}{we assume that dejavu math is available}
-
-\setupbodyfont % assumes dejavu-math
-  [dejavu,10pt]
+\writestatus{luatex manual}{}
+\writestatus{luatex manual}{defining lucodaot} \usebodyfont  [lucidaot]
+\writestatus{luatex manual}{defining pagella}  \usebodyfont  [pagella]
+\writestatus{luatex manual}{defining cambria}  \usebodyfont  [cambria]
+\writestatus{luatex manual}{defining modern}   \usebodyfont  [modern]
+\writestatus{luatex manual}{defining dejavu}   \setupbodyfont[dejavu,10pt]
+\writestatus{luatex manual}{}
 
 \setuphead [chapter]      [align={flushleft,broad},style=\bfd]
 \setuphead [section]      [align={flushleft,broad},style=\bfb]
@@ -145,6 +131,9 @@
 \setuphead [subsection]   [color=maincolor]
 \setuphead [subsubsection][color=maincolor]
 
+\setupfloats
+  [ntop=4]
+
 \definehead
   [remark]
   [subsubsubject]
@@ -152,6 +141,10 @@
 \setupheadertexts
   []
 
+% \setuplayout
+%   [style=bold,
+%    color=maincolor]
+
 \definemixedcolumns
   [twocolumns]
   [n=2,
@@ -207,7 +200,7 @@
         fill fullcircle scaled r shifted (d-1/8,d-1/8)
             withcolor luaholecolor   ;
         luaorbitfactor := .25 ;
-    )  enddef ;
+    ) enddef ;
 
 \stopMPdefinitions
 
@@ -217,8 +210,15 @@
         fill Page withcolor \MPcolor{othercolor} ;
 
         luaorbitfactor := 1 ;
-        picture p ; p := lualogo xsized (3PaperWidth/5) ;
-        draw p shifted center Page shifted (0,-.85ypart center ulcorner p) ;
+
+        picture p ; p := lualogo ysized (5*\measure{paperheight}/10) ;
+        draw p
+            shifted - center p
+            shifted (
+                \measure{spreadwidth} - .5*\measure{paperwidth} + \measure{spinewidth},
+                .375*\measure{paperheight}
+            )
+        ;
 
     StopPage ;
 \stopuseMPgraphic
@@ -232,7 +232,7 @@
 
 \startuseMPgraphic{luanumber}
   % luaextraangle  := \luaextraangle;
-    luaextraangle  := if (LastPageNumber == 0) : 0 else : (RealPageNumber / LastPageNumber) * 360  fi;
+    luaextraangle  := if (LastPageNumber < 10) : 10 else : (RealPageNumber / LastPageNumber) * 360  fi;
     luaorbitfactor := 0.25 ;
     picture p ; p := lualogo ;
     setbounds p to boundingbox fullcircle ;
@@ -252,40 +252,46 @@
   [rightpage]
   [background=page]
 
+\definemeasure[banneroffset][\bottomspace-\footerheight-\footerdistance+2cm]
+
 \startsetups pagenumber:right
   \setlayerframed
     [page]
-    [preset=rightbottom,offset=1cm]
+    [preset=rightbottom,x=1.0cm,y=\measure{banneroffset}]
     [frame=off,height=1cm,offset=overlay]
-    {\useMPgraphic{luanumber}}
+    {\strut\useMPgraphic{luanumber}}
   \setlayerframed
     [page]
-    [preset=rightbottom,offset=1cm,x=1.5cm]
-    [frame=off,height=1cm,width=1cm,offset=overlay]
-    {\pagenumber}
+    [preset=rightbottom,x=2.5cm,y=\measure{banneroffset}]
+    [frame=off,height=1cm,width=1cm,offset=overlay,
+     foregroundstyle=bold,foregroundcolor=maincolor]
+    {\strut\pagenumber}
   \setlayerframed
     [page]
-    [preset=rightbottom,offset=1cm,x=2.5cm]
-    [frame=off,height=1cm,offset=overlay]
-    {\getmarking[chapter]}
+    [preset=rightbottom,x=3.5cm,y=\measure{banneroffset}]
+    [frame=off,height=1cm,offset=overlay,
+     foregroundstyle=bold,foregroundcolor=maincolor]
+    {\strut\getmarking[chapter]}
 \stopsetups
 
 \startsetups pagenumber:left
   \setlayerframed
     [page]
-    [preset=leftbottom,offset=1cm,x=2.5cm]
-    [frame=off,height=1cm,offset=overlay]
-    {\getmarking[chapter]}
+    [preset=leftbottom,x=3.5cm,y=\measure{banneroffset}]
+    [frame=off,height=1cm,offset=overlay,
+     foregroundstyle=bold,foregroundcolor=maincolor]
+    {\strut\getmarking[chapter]}
   \setlayerframed
     [page]
-    [preset=leftbottom,offset=1cm,x=1.5cm]
-    [frame=off,height=1cm,width=1cm,offset=overlay]
-    {\pagenumber}
+    [preset=leftbottom,x=2.5cm,y=\measure{banneroffset}]
+    [frame=off,height=1cm,width=1cm,offset=overlay,
+     foregroundstyle=bold,foregroundcolor=maincolor]
+    {\strut\pagenumber}
   \setlayerframed
     [page]
-    [preset=leftbottom,offset=1cm]
+    [preset=leftbottom,x=1.0cm,y=\measure{banneroffset}]
     [frame=off,height=1cm,offset=overlay]
-    {\useMPgraphic{luanumber}}
+    {\strut\useMPgraphic{luanumber}}
 \stopsetups
 
 \unexpanded\def\nonterminal#1>{\mathematics{\langle\hbox{\rm #1}\rangle}}
@@ -311,13 +317,15 @@
   {\par
    \tt
    \startnarrower
-   \maincolor #1
+ % \maincolor
+   #1
    \stopnarrower
    \par}
 
 \unexpanded\def\syntaxbody#1%
   {\begingroup
-   \maincolor \tt #1%
+ % \maincolor
+   \tt #1%
    \endgroup}
 
 \bgroup \catcodetable\syntaxcodetable
@@ -329,7 +337,7 @@
 
 \definetyping
   [texsyntax]
-  [color=maincolor]
+% [color=maincolor]
 
 % end of wave
 
@@ -351,9 +359,14 @@
 \setuplist
   [chapter]
   [style=bold,
+   before={\testpage[4]\blank},
    color=keptcolor]
 
 \setuplist
+  [section]
+  [before={\testpage[3]}]
+
+\setuplist
   [subsection,subsubsection]
   [margin=3em,
    width=5em]
@@ -373,4 +386,57 @@
 % \setupinteractionscreen
 %   [option=bookmark]
 
+\startbuffer[stylecalculations]
+
+    \normalexpanded{\definemeasure[spinewidth] [0pt]}
+    \normalexpanded{\definemeasure[paperwidth] [\the\paperwidth ]}
+    \normalexpanded{\definemeasure[paperheight][\the\paperheight]}
+    \normalexpanded{\definemeasure[spreadwidth][\measure{paperwidth}]}
+
+\stopbuffer
+
+\getbuffer[stylecalculations]
+
+\dontcomplain
+
+\environment luatex-logos
+
+\defineregister[topicindex]
+\defineregister[primitiveindex]
+\defineregister[callbackindex]
+\defineregister[nodeindex]
+\defineregister[libraryindex]
+
+\unexpanded\def\lpr#1{\doifmode{*bodypart}{\primitiveindex[#1]{\bf\tex {#1}}}\tex {#1}}
+\unexpanded\def\prm#1{\doifmode{*bodypart}{\primitiveindex[#1]{\tex    {#1}}}\tex {#1}}
+\unexpanded\def\orm#1{\doifmode{*bodypart}{\primitiveindex[#1]{\tex    {#1}}}\tex {#1}}
+\unexpanded\def\cbk#1{\doifmode{*bodypart}{\callbackindex [#1]{\type   {#1}}}\type{#1}}
+\unexpanded\def\nod#1{\doifmode{*bodypart}{\nodeindex     [#1]{\bf\type{#1}}}\type{#1}}
+\unexpanded\def\whs#1{\doifmode{*bodypart}{\nodeindex     [#1]{\type   {#1}}}\type{#1}}
+\unexpanded\def\noa#1{\doifmode{*bodypart}{\nodeindex     [#1]{\type   {#1}}}\type{#1}}
+
+\hyphenation{sub-nodes}
+
+\def\currentlibraryindex{\namedstructureuservariable{section}{library}}
+
+\setupregister
+  [libraryindex]
+  [indicator=no,before=]
+
+\setupregister
+  [libraryindex]
+  [1]
+  [textstyle=\ttbf]
+
+\setupregister
+  [libraryindex]
+  [2]
+  [textstyle=\tttf]
+
+\unexpanded\def\lib     #1{\doifmode{*bodypart}{\expanded{\libraryindex{\currentlibraryindex+#1}}\type{\currentlibraryindex.#1}}}
+\unexpanded\def\libindex#1{\doifmode{*bodypart}{\expanded{\libraryindex{\currentlibraryindex+#1}}}}
+\unexpanded\def\libidx#1#2{\doifmode{*bodypart}{\expanded{\libraryindex{#1+#2}}\type{#1.#2}}}
+
+% \setstructurepageregister[][keys:1=,entries:1=]
+
 \stopenvironment