texlive[55566] Build/source/texk/web2c/cwebdir: [CTWILL] Prepare for

commits+ascherer at tug.org commits+ascherer at tug.org
Tue Jun 16 17:27:35 CEST 2020


Revision: 55566
          http://tug.org/svn/texlive?view=revision&revision=55566
Author:   ascherer
Date:     2020-06-16 17:27:35 +0200 (Tue, 16 Jun 2020)
Log Message:
-----------
[CTWILL] Prepare for CTWILL output format.

https://github.com/ascherer/web/releases/download/ctan-20200601/cweb.tar.gz
has an initial version of 'ctwill.pdf' in CTWILL format.

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/cwebdir/ChangeLog
    trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
    trunk/Build/source/texk/web2c/cwebdir/prod-twill.w
    trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex

Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2020-06-15 23:53:22 UTC (rev 55565)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2020-06-16 15:27:35 UTC (rev 55566)
@@ -1,3 +1,10 @@
+2020-06-16  Andreas Scherer  <https://ascherer.github.io>
+
+	* ctwill-w2c.ch,
+	* prod-twill.w: Page breaks for CWILL format.  Fix final header.
+	* texinputs/pdfctimac.tex: Alternative comment font (9pt).
+	Don't force small borders in standard macros for PDF output.
+
 2020-06-15  Andreas Scherer  <https://ascherer.github.io>
 
 	* texinputs/pdfctimac.tex: Unified color management;

Modified: trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch	2020-06-15 23:53:22 UTC (rev 55565)
+++ trunk/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch	2020-06-16 15:27:35 UTC (rev 55566)
@@ -3213,7 +3213,7 @@
   rename(check_file_name,tex_file_name);
 }
 
-@* Put ``version'' information in a single spot.
+@* Put ``version'' information in \.{COMMON}.
 Don't do this at home, kids! Push our local macro to the variable in \.{COMMON}
 for printing the |banner| and the |versionstring| from there.
 

Modified: trunk/Build/source/texk/web2c/cwebdir/prod-twill.w
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/prod-twill.w	2020-06-15 23:53:22 UTC (rev 55565)
+++ trunk/Build/source/texk/web2c/cwebdir/prod-twill.w	2020-06-16 15:27:35 UTC (rev 55566)
@@ -117,6 +117,7 @@
      |decl_head| \altt|comma| |semi| |rpar| \hfill
      $D=D$\alt $B$ $C$ \unskip$E$ & \malt {\&{int} $f(\&{int}\ x=2)$} |int b:1| \cr
 \+& |decl_head| |cast| & |decl_head| & |int f(int)|\cr
+\vfill\eject
 \+& |decl_head| \altt|int_like| |lbrace| |decl| & |fn_decl|
                    \altt|int_like| |lbrace| |decl| \hfill $F=D\,|in|\,|in|$
                              & |long time () {|\cr
@@ -207,6 +208,7 @@
    &$\langle\,$section name$\,\rangle$;\cr
 \+& |section_scrap| & |exp| &$\langle\,$section name$\,\rangle$\cr
 \+& |insert| |any| & |any| & \.{\v\#include\v}\cr
+\vfill\eject
 \+& |prelangle| & |binop| \hfill \.< & $<$ not in template\cr
 \+& |prerangle| & |binop| \hfill \.> & $>$ not in template\cr
 \+& |langle| |prerangle| & |cast| \hfill $L\.{\\,}P$ & $\langle\,\rangle$\cr
@@ -248,7 +250,7 @@
     $O$\.\ \alt $N$ $S$ & |operator delete|\cr
 \+& |operator_like| |comma| & |exp| & \&{operator},\cr
 \+\dagit& |operator_like| & |new_exp| & |operator char*|\cr
-\advance\midcol-3pt
+\vfill\eject \advance\midcol-3pt
 \+\dag200\enspace& |typedef_like| |decl_head| \alt|exp| |int_like| &
       |typedef_like| |decl_head| \hfill $D=D$\alt $E^{**}$ $I^{**}$ \unskip &
           \&{typedef} \&{char} \&{ch};\cr

Modified: trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex	2020-06-15 23:53:22 UTC (rev 55565)
+++ trunk/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex	2020-06-16 15:27:35 UTC (rev 55566)
@@ -61,6 +61,7 @@
 \font\ninebf=cmbx9
 \font\eightbf=cmbx8
 \font\sixbf=cmbx6
+\font\niness=cmss9
 \font\ninett=cmtt9
 \font\eighttt=cmtt8
 \hyphenchar\ninett=-1 \hyphenchar\eighttt=-1
@@ -117,7 +118,7 @@
   \textfont\ttfam=\ninett
   \def\ttx{\ninetex}%
   \normalbaselineskip=11pt
-  \let\cmntfont=\ninerm
+  \let\cmntfont=\niness%\ninerm
   \let\mc=\eightrm
   \let\sc=\sevenrm
   \let\big=\ninebig
@@ -155,7 +156,7 @@
 \def\eightbig#1{{\hbox{$\textfont0=\ninerm\textfont2=\ninesy
   \left#1\vbox to6.5pt{}\right.\nulldelimiterspace=0pt$}}}
 
-%\font\tenss=cmss10 \let\cmntfont\tenss % alternative comment font
+\font\tenss=cmss10 \let\cmntfont\tenss % alternative comment font
 \font\titlefont=cmr7 scaled\magstep4 % title on the contents page
 \font\ttitlefont=cmtt10 scaled\magstep2 % typewriter type in title
 
@@ -506,12 +507,6 @@
 \newcount\@n \newcount\@m \newcount\@p
 \newdimen\pageht \pageht=19cm
 \newdimen\pagewd \pagewd=13cm
-\ifacro
-  \pdfpagewidth=\pagewd  \advance\pdfpagewidth by 2cm
-  \pdfpageheight=\pageht \advance\pdfpageheight by 4cm
-  \ifpdftex \pdfhorigin=1cm \pdfvorigin=1cm
-  \else \global\hoffset=-1.54cm \global\voffset=-1.54cm \fi
-\fi
 \newdimen\colwd \colwd=\pagewd
  \advance\colwd by -2pc \divide\colwd by 3 % for three columns
 \newdimen\fullpageht \fullpageht=\pageht \advance\fullpageht by 4pc



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