texlive[61174] Master: lua-widow-control (27nov21)

commits+karl at tug.org commits+karl at tug.org
Sat Nov 27 22:26:37 CET 2021


Revision: 61174
          http://tug.org/svn/texlive?view=revision&revision=61174
Author:   karl
Date:     2021-11-27 22:26:37 +0100 (Sat, 27 Nov 2021)
Log Message:
-----------
lua-widow-control (27nov21)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/luatex/lua-widow-control/README.md
    trunk/Master/texmf-dist/doc/luatex/lua-widow-control/lua-widow-control.pdf
    trunk/Master/texmf-dist/source/luatex/lua-widow-control/lwc-documentation.mkxl
    trunk/Master/texmf-dist/source/luatex/lua-widow-control/lwc-documentation.tex
    trunk/Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkxl
    trunk/Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control.sty
    trunk/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.lua
    trunk/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.tex
    trunk/Master/tlpkg/libexec/ctan2tds

Modified: trunk/Master/texmf-dist/doc/luatex/lua-widow-control/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/lua-widow-control/README.md	2021-11-27 21:25:36 UTC (rev 61173)
+++ trunk/Master/texmf-dist/doc/luatex/lua-widow-control/README.md	2021-11-27 21:26:37 UTC (rev 61174)
@@ -42,4 +42,4 @@
 Please note that a compiled document is absolutely **not** considered to be an "Executable Form" as defined by the MPL. The use of lua-widow-control in a document does not place **any** obligations on the document's author or distributors. The MPL and CC-BY-SA licenses **only** apply to you if you distribute the lua-widow-control source code or documentation. 
 
 ---
-_v1.1.0 (2021-11-08)_ <!--%%version %%date-->
+_v1.1.1 (2021-11-26)_ <!--%%version %%date-->

Modified: trunk/Master/texmf-dist/doc/luatex/lua-widow-control/lua-widow-control.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/source/luatex/lua-widow-control/lwc-documentation.mkxl
===================================================================
--- trunk/Master/texmf-dist/source/luatex/lua-widow-control/lwc-documentation.mkxl	2021-11-27 21:25:36 UTC (rev 61173)
+++ trunk/Master/texmf-dist/source/luatex/lua-widow-control/lwc-documentation.mkxl	2021-11-27 21:26:37 UTC (rev 61174)
@@ -32,6 +32,7 @@
 \setupalign[hz, hanging]
 
 \definefontfeature[lining][onum=no,lnum=yes]
+\definefontfeature[allsmall][c2sc=yes, smcp=yes]
 \define\lining{\feature[+][lining]}
 
 \starttypescript[lwc-fonts]
@@ -78,7 +79,7 @@
 \setupstructure[state=start, method=auto]
 
 % Bookmarks
-\placebookmarks[section, subsection, filename][section, subsection, filename][number=no]
+\placebookmarks[section, subsection][section, subsection][number=no]
 \setupinteractionscreen[option=bookmark]
 
 %%%%%%%%%%%%%%%%%%%%%%
@@ -91,7 +92,7 @@
 
 % Acronym styling
 \definecharacterkerning[acronymkerning][factor=0.05]
-\definealternativestyle[acronymstyle][{\word\sc\switchtobodyfont[1.1em]\setcharacterkerning[acronymkerning]}][]
+\definealternativestyle[acronymstyle][{\feature[+][allsmall]\switchtobodyfont[1.1em]\setcharacterkerning[acronymkerning]}][]
 \definehighlight[acronym][style=acronymstyle]
 
 \startuniqueMPgraphic{warning}
@@ -146,9 +147,9 @@
 \startsetups[style:section]
     \setcharacterkerning[titlekern]
     \switchtobodyfont[adventor]
-    \word
+    \WORD
     \bfb
-    \feature[+][smallcaps]
+    \feature[+][allsmall]
     \interwordspace=0.4em
     \veryraggedcenter
 \stopsetups
@@ -169,28 +170,71 @@
     number=no,
 ]
 
-\definehead[filename][subsection][
-    alternative=normal,
-    style=\ssita,
-    before={\blank[big, preference]},
-]
+% TOC
+\starttexdefinition protected SectionTOCcommand #1#2#3
+    \startcurrentlistentrywrapper % Make the whole line a link
+        \midaligned{ % Have the title and page number "glued" to the middle
+            \llap{\currentlistentrytitle}
+            \hskip 1em
+            \rlap{\color[\interactionparameter{color}]{\bf \currentlistentrypagenumber}}
+        }
+    \stopcurrentlistentrywrapper
 
-% TOC
-\define[3]\TOCcommand{
-    \midaligned{
-        \llap{#2}
-        \hskip 1em
-        \rlap{\color[\interactionparameter{color}]{\bf #3}}
-    }
+    \par
+
+    \setbox0=\vbox{\framedtext[ % Align the subsection titles under the section title
+        frame=off,
+        width=\dimexpr\textwidth/2 - 0.5em,
+        align={flushright, wide},
+        offset=none,
+        toffset=-\lineheight,
+    ]{
+        \global\firstsubsectiontrue
+        \placelist[subsection][criterium=local]
+    }}
+    \iffirstsubsection
+        \blank[quarterline] % No subsections here
+    \else
+        \box0
+    \fi
+\stoptexdefinition
+
+\newif\iffirstsubsection
+
+\define\tocspace{\hskip 0.5em plus 0.5em minus 0.2em\relax}
+
+\unexpanded\def\toc_link#1{%
+    \startcurrentlistentrywrapper%
+        \hbox{#1}%
+    \stopcurrentlistentrywrapper%
 }
 
+\starttexdefinition protected SubsectionTOCcommand #1#2#3
+    \ss\itx
+    \dontleavehmode
+    \iffirstsubsection
+        \global\firstsubsectionfalse
+        \toc_link{#2}
+    \else
+        \discretionary{}{
+            \toc_link{#2} % No interpunct if the line splits here
+        }{
+            \tocspace{\bfa·}\tocspace\toc_link{#2}
+        }
+    \fi
+\stoptexdefinition
+
 \setupcombinedlist[content][list=section]
 \setuplist[section][
-    alternative=interactive,
-    command=\TOCcommand,
-    after=\par
+    alternative=command,
+    command=\SectionTOCcommand,
 ]
 
+\setuplist[subsection][
+    alternative=command,
+    command=\SubsectionTOCcommand,
+]
+
 %%%%%%%%%%%%%%%%%%%%%%%
 %%%%% Title Block %%%%%
 %%%%%%%%%%%%%%%%%%%%%%%

Modified: trunk/Master/texmf-dist/source/luatex/lua-widow-control/lwc-documentation.tex
===================================================================
--- trunk/Master/texmf-dist/source/luatex/lua-widow-control/lwc-documentation.tex	2021-11-27 21:25:36 UTC (rev 61173)
+++ trunk/Master/texmf-dist/source/luatex/lua-widow-control/lwc-documentation.tex	2021-11-27 21:26:37 UTC (rev 61174)
@@ -37,7 +37,7 @@
 \startdocument[
     title=lua-widow-control,
     author=Max Chernoff,
-    version=1.1.0, %%version
+    version=1.1.1, %%version
     github=https://github.com/gucci-on-fleek/lua-widow-control,
     ctan=https://www.ctan.org/pkg/lua-widow-control,
 ]
@@ -44,13 +44,12 @@
 
 \Lwc/ is a Plain~\TeX/\LaTeX/\ConTeXt{} package that removes \waos/ without any user intervention. Using the power of \LuaTeX{}, it does so \emph{without} stretching any glue or shortening any pages or columns. Instead, \lwc/ automatically lengthens a paragraph on a page or column where a \woo/ would otherwise occur. 
 
+\section{Quick Start}
+Ensure that your \TeX~Live/Mik\TeX{} distribution is up-to-date. Then, \LaTeX{} users just need to place \inlineTEX{\usepackage{lua-widow-control}} in the preamble of your document. For more details, see the \goto{Installation and Usage sections}[sec:install].
+
 \subject{Contents}
 \placecontent[criterium=all]
-\page
 
-\section{Quick Start}
-Ensure that your \TeX~Live/Mik\TeX{} distribution is up-to-date. Then, \LaTeX{} users just need to place \inlineTEX{\usepackage{lua-widow-control}} in the preamble of your document. For more details, see the \goto{Installation and Usage sections}[sec:install].
-
 \section{Motivation}
 \TeX{} provides top-notch typesetting: even 40 years after its first release, no other program produces higher quality mathematical typesetting, and its paragraph-breaking algorithm is still state-of-the-art. However, its page breaking is not quite as sophisticated as its paragraph breaking and thus suffers from some minor issues.
 
@@ -198,7 +197,7 @@
 
 \subsection{Plain \TeX}
 
-\inlineTEX{\input lua-widow-control}
+\inlineTEX{\input  lua-widow-control}
 
 \subsection{\LaTeX}
 
@@ -314,25 +313,30 @@
 \section[sec:implementation]{Implementation}
 
 \setupbodyfont[10pt]
+\setuphead[subsection][
+    alternative=normal,
+    style=\ssita,
+    before={\blank[big, preference]},
+]
 
-\filename{lua-widow-control.lua}
+\subsection{lua-widow-control.lua}
 
 \typeLUAfile{../source/lua-widow-control.lua}
 
-\filename{lua-widow-control.tex}
+\subsection{lua-widow-control.tex}
 
 \typeTEXfile{../source/lua-widow-control.tex}
 
-\filename{lua-widow-control.sty}
+\subsection{lua-widow-control.sty}
 
 \typeTEXfile{../source/lua-widow-control.sty}
 
 \def\module{\tex{module}}
-\filename{t-lua-widow-control.mkxl}
+\subsection{t-lua-widow-control.mkxl}
 
 \typeTEXfile{../source/t-lua-widow-control.mkxl}
 
-\filename{Demo from \in{Table}[tab:demo]}
+\subsection{Demo from \in{Table}[tab:demo]}
 
 \typeTEXfile{lwc-documentation-demo-text.tmp}
 

Modified: trunk/Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkxl
===================================================================
--- trunk/Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkxl	2021-11-27 21:25:36 UTC (rev 61173)
+++ trunk/Master/texmf-dist/tex/context/third/lua-widow-control/t-lua-widow-control.mkxl	2021-11-27 21:26:37 UTC (rev 61174)
@@ -1,10 +1,10 @@
 %D \module
 %D   [     file=t-lua-widow-control,
-%D      version=1.1.0, %%version
+%D      version=1.1.1, %%version
 %D        title=lua-widow-control,
 %D     subtitle=\ConTeXt module for lua-widow-control,
 %D       author=Max Chernoff,
-%D         date=2021-11-08, %%date
+%D         date=2021-11-26, %%date
 %D    copyright=Max Chernoff,
 %D      license=MPL-2.0+,
 %D          url=https://github.com/gucci-on-fleek/lua-widow-control]

Modified: trunk/Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control.sty
===================================================================
--- trunk/Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control.sty	2021-11-27 21:25:36 UTC (rev 61173)
+++ trunk/Master/texmf-dist/tex/lualatex/lua-widow-control/lua-widow-control.sty	2021-11-27 21:26:37 UTC (rev 61174)
@@ -5,7 +5,7 @@
 
 \NeedsTeXFormat{LaTeX2e}[2015/01/01] % Formats built after 2015 include \LuaTeX{}Base
 \ProvidesPackage{lua-widow-control}%
-    [2021/11/08 v1.1.0] %%version %%date
+    [2021/11/26 v1.1.1] %%version %%date
 
 \setlength{\clubpenalty}{1}
 \setlength{\widowpenalty}{1}

Modified: trunk/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.lua
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.lua	2021-11-27 21:25:36 UTC (rev 61173)
+++ trunk/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.lua	2021-11-27 21:26:37 UTC (rev 61174)
@@ -64,8 +64,8 @@
 elseif lwc.plain or lwc.latex then
     luatexbase.provides_module {
         name = lwc.name,
-        date = "2021/11/08", --%%date
-        version = "1.1.0", --%%version
+        date = "2021/11/26", --%%date
+        version = "1.1.1", --%%version
         description = [[
 
     This module provides a LuaTeX-based solution to prevent

Modified: trunk/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.tex
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.tex	2021-11-27 21:25:36 UTC (rev 61173)
+++ trunk/Master/texmf-dist/tex/luatex/lua-widow-control/lua-widow-control.tex	2021-11-27 21:26:37 UTC (rev 61174)
@@ -3,7 +3,7 @@
 % SPDX-License-Identifier: MPL-2.0+
 % SPDX-FileCopyrightText: 2021 Max Chernoff
 
-\wlog{lua-widow-control v1.1.0} %%version
+\wlog{lua-widow-control v1.1.1} %%version
 
 \input ltluatex % \LuaTeX{}Base
 

Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds	2021-11-27 21:25:36 UTC (rev 61173)
+++ trunk/Master/tlpkg/libexec/ctan2tds	2021-11-27 21:26:37 UTC (rev 61174)
@@ -3050,6 +3050,7 @@
  'mylatexformat'=> 'pdflatex',
  'nameauth'	=> 'pdflatex-preserve-pdf',
  'njuthesis'	=> 'etex',
+ 'njuvisual'	=> 'etex',
  'notespages'   => 'latex',  # requires interaction
  'nwafuthesis'	=> 'xetex',
  'nwejm'	=> 'tex',



More information about the tex-live-commits mailing list.