From 49e1e1ecf13d1fcc759f3360da9c3f42d0ef4cbe Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Tue, 16 Jun 2020 15:27:35 +0000 Subject: [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. git-svn-id: svn://tug.org/texlive/trunk@55566 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/cwebdir/ChangeLog | 7 +++++++ Build/source/texk/web2c/cwebdir/ctwill-w2c.ch | 2 +- Build/source/texk/web2c/cwebdir/prod-twill.w | 4 +++- Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex | 11 +++-------- 4 files changed, 14 insertions(+), 10 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 03923520f23..86787d60fc6 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,10 @@ +2020-06-16 Andreas Scherer + + * 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 * texinputs/pdfctimac.tex: Unified color management; diff --git a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch index 5833d75886b..108a52ef6cd 100644 --- a/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch +++ b/Build/source/texk/web2c/cwebdir/ctwill-w2c.ch @@ -3213,7 +3213,7 @@ else { 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. diff --git a/Build/source/texk/web2c/cwebdir/prod-twill.w b/Build/source/texk/web2c/cwebdir/prod-twill.w index abeb8bea6c0..227bc6a3832 100644 --- a/Build/source/texk/web2c/cwebdir/prod-twill.w +++ b/Build/source/texk/web2c/cwebdir/prod-twill.w @@ -117,6 +117,7 @@ We use \\{in}, \\{out}, \\{back} and |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 @@ We use \\{in}, \\{out}, \\{back} and &$\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 @@ We use \\{in}, \\{out}, \\{back} and $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 diff --git a/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex b/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex index 7e06f9d0512..17e2e85a56d 100644 --- a/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex +++ b/Build/source/texk/web2c/cwebdir/texinputs/pdfctwimac.tex @@ -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 -- cgit v1.2.3