From 1f2742f1a981ff9d19a8b7ff13a662d8d5c3ebe4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 9 May 2020 22:06:00 +0000 Subject: 2up (10may20) git-svn-id: svn://tug.org/texlive/trunk@55076 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/generic/2up/2up-doc.pdf | Bin 63111 -> 46721 bytes Master/texmf-dist/doc/generic/2up/2up-doc.tex | 15 +++--- Master/texmf-dist/doc/generic/2up/Changes | 9 ++-- Master/texmf-dist/doc/generic/2up/Makefile | 72 -------------------------- Master/texmf-dist/doc/generic/2up/README | 12 ++--- Master/texmf-dist/tex/generic/2up/2up.sty | 2 +- Master/texmf-dist/tex/generic/2up/2up.tex | 12 ++--- Master/tlpkg/libexec/ctan2tds | 1 + 8 files changed, 23 insertions(+), 100 deletions(-) delete mode 100644 Master/texmf-dist/doc/generic/2up/Makefile diff --git a/Master/texmf-dist/doc/generic/2up/2up-doc.pdf b/Master/texmf-dist/doc/generic/2up/2up-doc.pdf index dad87c4e57f..1b13e9450f7 100644 Binary files a/Master/texmf-dist/doc/generic/2up/2up-doc.pdf and b/Master/texmf-dist/doc/generic/2up/2up-doc.pdf differ diff --git a/Master/texmf-dist/doc/generic/2up/2up-doc.tex b/Master/texmf-dist/doc/generic/2up/2up-doc.tex index f68925ee7a7..00409552a68 100644 --- a/Master/texmf-dist/doc/generic/2up/2up-doc.tex +++ b/Master/texmf-dist/doc/generic/2up/2up-doc.tex @@ -1,12 +1,9 @@ -%% BEGIN 2up.doc %% -%% Documentation for 2up.tex/2up.sty. -%% See below if you want to try out two-up printing. -%% -%% $Id: 2up-doc.tex 318 2010-05-15 07:29:54Z herbert $ +%% $Id: 2up-doc.tex 1180 2020-05-09 10:02:00Z herbert $ \documentclass[12pt]{article} -\usepackage[T1]{fontenc} -\usepackage{mathpazo,url} +%\usepackage[T1]{fontenc} +\usepackage{libertinus} +\usepackage{url} \usepackage{2up} \special{landscape} @@ -96,8 +93,8 @@ \title{Documentation for 2up.tex:\\ Two-up printing for Generic TeX} -\author{Timothy Van Zandt\thanks{The documentation was put into - \LaTeX\ format by David Todd and Herbert Vo\ss}\\ \url{tvz@Princeton.EDU}} +\author{Timothy Van Zandt\thanks{Version 1.3a prepared by Herbert Voß. The documentation was put into + \LaTeX\ format by David Todd and Herbert Voß}\\ \url{tvz@Princeton.EDU}} \date{Version \TUfv\\[3pt] \today} \maketitle diff --git a/Master/texmf-dist/doc/generic/2up/Changes b/Master/texmf-dist/doc/generic/2up/Changes index b88341c02c3..8794b96bb00 100644 --- a/Master/texmf-dist/doc/generic/2up/Changes +++ b/Master/texmf-dist/doc/generic/2up/Changes @@ -1,9 +1,10 @@ -$Id: Changes 318 2010-05-15 07:29:54Z herbert $ +$Id: Changes 1180 2020-05-09 10:02:00Z herbert $ --- 2up.tex -1.3 2010-05-14 - small changes to the code (hv) - - LPPL license (hv) +1.3a 2020-05-09 - Updated documentation and small code changes +1.3 2010-05-15 - small changes to the code (hv) + - LPPL license (hv) --- 2up-doc.tex -2010-05-14 - updated and LaTeX2e compatible (hv) +2020-05-09 - updated and LaTeX2e compatible (hv) diff --git a/Master/texmf-dist/doc/generic/2up/Makefile b/Master/texmf-dist/doc/generic/2up/Makefile deleted file mode 100644 index 9893c8583be..00000000000 --- a/Master/texmf-dist/doc/generic/2up/Makefile +++ /dev/null @@ -1,72 +0,0 @@ - -# `Makefile' for `multido.pdf', hv, 2007/03/17 - -.SUFFIXES : .tex .ltx .dvi .ps .pdf .eps - -PACKAGE = 2up - -MAIN = $(PACKAGE)-doc - -TDS = ~/PSTricks/PSTricks-TDS - -LATEX = latex - -ARCHNAME = $(MAIN)-$(shell date +%y%m%d) - -ARCHFILES = $(PACKAGE).sty $(PACKAGE).tex $(PACKAGE).pro $(MAIN).tex README Changes Makefile - -all : doc clean -doc: $(MAIN).pdf - -$(MAIN).pdf : $(MAIN).ps -# GS_OPTIONS=-dAutoRotatePages=/None - ps2pdf $< - -$(MAIN).ps : $(MAIN).dvi - dvips $< - -$(MAIN).dvi : $(MAIN).tex - $(LATEX) $< - $(LATEX) $< -# if ! test -f $(basename $<).glo ; then touch $(basename $<).glo; fi -# if ! test -f $(basename $<).idx ; then touch $(basename $<).idx; fi -# makeindex -t $(basename $<).ilg -s pst-doc.ist -o $(basename $<).ind $(basename $<).idx -# makeindex -s gglo.ist -t $(basename $<).glg -o $(basename $<).gls \ -# $(basename $<).glo -# bibtex $(basename $<) -# $(LATEX) $< -# $(LATEX) $< - -clean : - $(RM) $(addprefix $(MAIN), .log .aux .glg .glo .gls .ilg .idx .ind .tmp .toc .out .blg .Roessler .bbl ) - $(RM) $(addprefix $(MAIN), .dvi .ps .xcp) - $(RM) data3d.Roessler - -veryclean : clean - $(RM) $(addprefix $(MAIN), .pdf .bbl .blg) - -arch : - zip $(ARCHNAME).zip $(ARCHFILES) - -tds: - cp -u Changes $(TDS)/doc/generic/$(PACKAGE)/ - cp -u README $(TDS)/doc/generic/$(PACKAGE)/ - cp -u $(MAIN).pdf $(TDS)/doc/generic/$(PACKAGE)/ -# - cp -u Changes $(TDS)/tex/latex/$(PACKAGE)/ - cp -u $(PACKAGE).sty $(TDS)/tex/latex/$(PACKAGE)/ -# - cp -u Changes $(TDS)/tex/generic/$(PACKAGE)/ - cp -u $(PACKAGE).tex $(TDS)/tex/generic/$(PACKAGE)/ -# - cp -u Changes $(TDS)/dvips/$(PACKAGE)/ - cp -u $(PACKAGE).pro $(TDS)/dvips/$(PACKAGE)/ - cp -u $(PACKAGE).pro ~/Links/dvips-local/ -# - cp -u Changes $(TDS)/source/$(PACKAGE)/ - cp -u $(MAIN).tex $(TDS)/source/$(PACKAGE)/ - cp -u $(MAIN).bib $(TDS)/source/$(PACKAGE)/ - cp -u Makefile $(TDS)/source/$(PACKAGE)/ - - -# EOF diff --git a/Master/texmf-dist/doc/generic/2up/README b/Master/texmf-dist/doc/generic/2up/README index 42e5388dcb0..baedb48a9be 100644 --- a/Master/texmf-dist/doc/generic/2up/README +++ b/Master/texmf-dist/doc/generic/2up/README @@ -1,9 +1,5 @@ -Save the files 2up.sty|tex in a directory, which is part of your -local TeX tree. -Then do not forget to run texhash to update this tree. -For more information see the documentation of your LATEX distribution -on installing packages into your LATEX distribution or the -TeX Frequently Asked Questions: -(http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages). - +2up works with latex (tex) and xelatex (xetex), but not +with lualatex (luatex). The package modifies the dvi +output to get two pages side by side. +hvoss@tug.org \ No newline at end of file diff --git a/Master/texmf-dist/tex/generic/2up/2up.sty b/Master/texmf-dist/tex/generic/2up/2up.sty index 15659c73981..bbc4b143da8 100644 --- a/Master/texmf-dist/tex/generic/2up/2up.sty +++ b/Master/texmf-dist/tex/generic/2up/2up.sty @@ -1,4 +1,4 @@ -%% $Id: 2up.sty 318 2010-05-15 07:29:54Z herbert $ +%% $Id: 2up.sty 1179 2020-05-09 09:57:53Z herbert $ \ProvidesPackage{2up}[2010/05/15 package wrapper for 2up.tex (hv)] \input{2up.tex} diff --git a/Master/texmf-dist/tex/generic/2up/2up.tex b/Master/texmf-dist/tex/generic/2up/2up.tex index b1f064c0e2f..080d7ce9f1f 100644 --- a/Master/texmf-dist/tex/generic/2up/2up.tex +++ b/Master/texmf-dist/tex/generic/2up/2up.tex @@ -1,8 +1,8 @@ %% -%% $Id: 2up.tex 318 2010-05-15 07:29:54Z herbert $ +%% $Id: 2up.tex 1180 2020-05-09 10:02:00Z herbert $ %% %% COPYRIGHT 1992/2010, by Timothy Van Zandt, tvz@Princeton.EDU -%% COPYRIGHT 2010, by Herbert Voss, hvoss@tug.org +%% COPYRIGHT 2010-2020, by Herbert Voss, hvoss@tug.org %% %% Copyright: %% This program can be redistributed and/or modified under the terms @@ -10,14 +10,14 @@ %% in directory macros/latex/base/lppl.txt. %% %% DESCRIPTION: -%% 2up.tex/2up.sty provides two-up printing for Generic TeX (e.g., -%% Plain, LaTeX, AmSTeX and AmS-LaTeX). It produces a standard dvi file, +%% 2up.tex/2up.sty provides two-up printing for Generic TeX or LaTeX (e.g., +%% Plain, LaTeX, xetex, xelatex, AmSTeX and AmS-LaTeX). It produces a standard (x)dvi file, %% and does not involve an additional dvi or PostScript filter. It has a %% flexible interface for specifying paper size and layout. %% % -\def\fileversion{1.3} -\def\filedate{2010/05/15} +\def\fileversion{1.3a} +\def\filedate{2020/05/09} % \csname TwoUpLoaded\endcsname \let\TwoUpLoaded\endinput diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index 49bd6d3ded5..b23eda9779e 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -69,6 +69,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`); 'TOPtesi', "die 'skipping, use toptesi'", 'TeXemplar', "die 'skipping, use texemplar'", 'TeXmacs', "die 'skipping, binary'", + '2up', "&MAKEflatten", 'a4', "die 'skipping, just a pointer to ntgclass'", 'aastex', "&MAKEflatten", 'accenti', "die 'skipping, use bosisio instead'", -- cgit v1.2.3