summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-01-10 16:53:51 +0000
committerKarl Berry <karl@freefriends.org>2015-01-10 16:53:51 +0000
commit071d9d5f04114b971a1e98c57d2ee8d5105f319f (patch)
treef785ccbd288eb4b305bb5eb39fbc3919a5c71c4e
parentf4df876113fcb7bda86758e0c07ed4c441ed8aee (diff)
pl = pl-mf + plpsfont
git-svn-id: svn://tug.org/texlive/trunk@36012 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/mft/base/pl.mft111
-rwxr-xr-xMaster/tlpkg/bin/check-files-by-format5
-rwxr-xr-xMaster/tlpkg/bin/tlpkg-ctan-check2
-rwxr-xr-xMaster/tlpkg/bin/tlpkginfo56
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds6
-rw-r--r--Master/tlpkg/tlpsrc/pl.tlpsrc2
6 files changed, 44 insertions, 138 deletions
diff --git a/Master/texmf-dist/mft/base/pl.mft b/Master/texmf-dist/mft/base/pl.mft
deleted file mode 100644
index fc10e7b73b5..00000000000
--- a/Master/texmf-dist/mft/base/pl.mft
+++ /dev/null
@@ -1,111 +0,0 @@
-%%%% MFT style for the Polish extension of Computer Modern (PL fonts)
-%%%% CMBASE style:
-%%% } ( ) ]] {{ }} ! ^ %%%% tokens that need no special formatting
-%%% step upto downto %%%% boldface binary operators
-%%% addto fill unfill draw undraw %%%% boldface unary operators
-%%% addto filldraw unfilldraw drawdot undrawdot erase pickup
-%%% addto exitunless stop incr decr proofrulethickness screenrule
-%%% addto define_pixels define_whole_pixels define_whole_vertical_pixels
-%%% addto define_blacker_pixels define_whole_blacker_pixels
-%%% addto define_corrected_pixels lowres_fix proofoffset penstroke
-%%% addto beginchar beginarithchar italcorr font_size font_slant
-%%% addto font_normal_space font_normal_stretch font_normal_shrink font_quad
-%%% addto font_x_height font_extra_space font_identifier font_coding_scheme
-%%% addto cmchar iff generate adjust_fit math_fit labels penlabels
-%%% addto stroke circ_stroke padded
-%%% enddef endchar %%%% boldface closing
-%%% true relax mode_setup font_setup %%%% boldface nullary operators
-%%% true clearit shipit cullit openit showit clearxy clearpen
-%%% true nodisplay notransforms screenchars screenstrokes imagerules
-%%% .. ... .... -- --- %%%% path operators made of dots and dashes
-%%% length flex abs dir %%%% unary operators to be in roman type
-%%% length unitvector inverse ceiling hround vround Vround counterclockwise
-%%% length tensepath byte reflectedabout rotatedaround magstep max min
-%%% and mod dotprod intersectionpoint softjoin %%%% binary operators to be roman
-%%% ++ ** %%%% binary operators made of two special characters
-%%% penoffset goodval direction directionpoint %%%% operators that take "of"
-%%% pausing tolerance pixels_per_inch blacker o_correction %%%% internals
-%%% pausing screen_rows screen_cols currentwindow displaying
-%%% pausing pen_top pen_bot pen_lft pen_rt shrink_fit rt lft top bot
-%%% = <= >= <> %%%% conversions for the SAIL character set only
-%%% good crisp fine tiny rule light_rule cal light_cal med_cal heavy_cal
-%%% good term fudged mfudged sloped_serif tilted med_tilted
-%%% pausing slant fudge math_spread superness superpull beak_darkness ligs
-%% \outer\def^^L{\par\vfill\eject} % obeypages
-%%%%-------------------------------------------------------------------------
-%%%% So far it was CMBASE; now
-%% %--------- BJ & MR predilections & idiosyncrasies (ver. 1.09) ------------
-%%%% follow:
-%%%%-------------------------------------------------------------------------
-%%% end bye %%%% end=bye, isn't it?
-%%% screenrule proofrule %%%% proofrule=screenrule, isn't it?
-%%% def mode_def %%%% def=mode_def, isn't it?
-%%% input generate %%%% input=generate, isn't it?
-%%% for range %%%% we prefere \MF{}book convention
-%%% step thru %%%% ditto
-%%% good lower
-%%%%-------------------------------------------------------------------------
-%%%% our slight modifications:
-%%\newcount\hours \newcount\minutes
-%%\ifx\plconventions\undefined %%%% don't define some dangerous macros twice
-%%%%-------------------------------------------------------------------------
-%%\let\plconventions\relax
-%%\def\MeX{M\kern-.111em\lower.5ex\hbox{E}\kern-.125emX}
-%%\let\OSH\#
-%%\def\SH{\raise.7ex\hbox{$\scriptstyle\OSH$}} % sharp sign for sharped units
-%%\let\#\SH \def\\#1{{\let\#\OSH\it#1}}
-%%\def\finstring"#1"{\tentex"#1"\egroup}
-%%\def\frac#1/#2{\leavevmode\kern.1em
-%% \raise.5ex\hbox{\the\scriptfont0 #1}\kern-.1em
-%% /\kern-.15em\lower.25ex\hbox{\the\scriptfont0 #2}\,} %%%% \, added
-%%\let\UL\_
-%%\def\_{\ifdim\fontdimen1\the\font=0pt \UL\kern0.01em\else\kern-0.08em\UL\kern0.04em\fi}
-%%%%-------------------------------------------------------------------------
-%%%% our string treatment:
-%%\font\ttfont pltt10
-%%\def\vispace{{\ttfont\char32}}
-%%%% strings may be broken in a .TeX file:
-%%{\obeyspaces\obeylines%
-%%\gdef\prepspnl{\obeyspaces\obeylines\let \vispace\let^^M\vispace}}
-%%\def\7{\hbox\bgroup\prepspnl\nocats\frenchspacing\finstring} % string token
-%%%%-------------------------------------------------------------------------
-%%%% our comment treatment:
-%%\font\commfont plsltt10 % standard comment font
-%%\font\bif plbxti10 % comment bold italic font
-%%%% sorry, but we're using the UNderSCOre in COmments (see the dirty trick)
-%%\def\unscoco{\ifmmode_\else\_\fi} \catcode`\_\active \let_\unscoco
-%%\font\trifnt plmib10 scaled \magstep2 \def\lftri{{\trifnt \char'57}}
-%%{\obeyspaces\gdef\prepsp{\obeyspaces\everymath{\catcode`\ 10\relax}\let \ }}
-%%\fi %%%% no more dangerous macros
-%%\def\specialcomments{%
-%% \def\9{$\bgroup\def\par{\hfill\lftri\endgraf\egroup}\commfont\%\prepsp}}
-%%\def\normalcomments{%
-%% \def\9{$\bgroup\def\par{\endgraf\egroup}\hfill\commfont\%\prepsp}}
-%%\specialcomments % our favorite form of comments
-%%%%-------------------------------------------------------------------------
-%%%% DIRTY TRICK---sorry, but we're also using the underscore in file names
-%%%% (assumption: \tt appears only as \hbox{\tt...})
-%%\def\tt{\nocats\namett}
-%%{\catcode`\}\other \catcode`\)2\gdef\namett#1}{\tentex#1\egroup))
-%%%%-------------------------------------------------------------------------
-%%%% our footline:
-%%\def\oktime{% format `hh:mm'
-%%\hours=\time \divide \hours by 60 %
-%%\minutes=-\hours \multiply \minutes by 60 \advance \minutes by \time
-%%\ifnum\hours>9 \the\hours \else 0\the\hours \fi
-%%:%
-%%\ifnum\minutes>9 \the\minutes \else 0\the\minutes \fi}
-%%\def\monthnazwa{\ifcase \month
-%%\or stycznia\or lutego\or marca\or kwietnia\or maja\or czerwca\or lipca%
-%%\or sierpnia\or wrze\'snia\or pa\'zdziernika\or listopada\or grudnia%
-%%\fi}
-%%\def\makefootline{\baselineskip18pt\null\hrule\null\baselineskip12pt
-%% \line{\it\oktime\quad \the\day\ \monthnazwa\ \the\year\
-%% \hfill\llap{\tentex page \the\pageno}}}
-%%%%-------------------------------------------------------------------------
-%%%% our headline:
-%%\font\TT pltt12 scaled\magstep2
-%%\headline{\vbox to 0pt{\vss
-%% \rightline{\TT\uppercase\expandafter{\jobname.mf}}\vskip5mm}}
-%% %-------------------------------------------------------------------------
-
diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format
index c4b4f34f382..c3fa163565e 100755
--- a/Master/tlpkg/bin/check-files-by-format
+++ b/Master/tlpkg/bin/check-files-by-format
@@ -122,7 +122,8 @@ my $exclude_pfb = { '*base*' => 'texmf-dist/fonts/type1',
'public/marvosym/' => 1,
'public/mathpazo/' => 1,
'public/musixtex-fonts/' => 1, # 2nov11 wrote tennent --karl
- 'public/newtx/' => 1, # 12may12 author will fix in next release
+# 'public/newtx/' => 1, # 12may12 author will fix in next release
+# 'public/newtxtt/' => 1, # dec14 author will fix in next release
'public/ocherokee/' => 1,
'public/oinuit/' => 1,
'public/omega/' => 1,
@@ -138,7 +139,7 @@ my $exclude_pfb = { '*base*' => 'texmf-dist/fonts/type1',
'public/tex-gyre/' => 1,
'public/txfonts/' => 1,
'public/txfontsb/' => 1,
- 'public/wasy/' => 1,
+ 'public/wasy2-ps/' => 1, # too old, will not be updated
'public/xypic/' => 1,
'public/yhmath/' => 1,
'uhc/umj/' => 1,
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index fe31e40d025..65e46b476dc 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -389,7 +389,7 @@ my @TLP_working = qw(
phonetic phonrule photo physics piano picinpar pict2e
pictex pictex2 pictexsum piechartmp piff pigpen
pinlabel pitex pittetd pkfix pkfix-helper pkgloader pkuthss
- placeat placeins placeins-plain
+ pl placeat placeins placeins-plain
plain-doc plainpkg plari plantslabels plates play playfair plipsum
plnfss plstmary plweb pmgraph pmx pmxchords pnas2009
poemscol poetrytex polski poltawski
diff --git a/Master/tlpkg/bin/tlpkginfo b/Master/tlpkg/bin/tlpkginfo
index 36272a137d9..6e764c71d0a 100755
--- a/Master/tlpkg/bin/tlpkginfo
+++ b/Master/tlpkg/bin/tlpkginfo
@@ -17,8 +17,8 @@ sub main {
# erroneous or problematic tds files (when new, tell RobinF and author)
$erroneous_tds = join ("|",
- qw(countriesofeurope dad engpron gost hacm he-she hobby imtekda
- mathdesign spanish sttools titleps),
+ qw(countriesofeurope dad engpron gost hacm he-she hobby imtekda
+ mathdesign spanish sttools),
);
# Heiko's tds files (don't propagate through CTAN fast enough).
@@ -37,7 +37,7 @@ sub main {
$cjk_pkgs = "bin-(cjk|ttf)utils|dnp|(|garuda-|norasi-)c90";
if ($ARGV[0] eq "--ctan-dir") {
- my $output = &find_ctan_dir ($ARGV[1]);
+ my $output = &find_ctan_dir ($ARGV[1], 0);
print "$output\n";
return $output ? 0 : 1;
@@ -58,12 +58,12 @@ sub main {
}
}
-#
-# Return 0 for success if we find a path (and print it on stdout),
-# else return 1.
+
+# Return the location on CTAN for PKGNAME, or 1 if no PKGNAME.
+# If DO_COPY is nonzero, construct a working directory and return that.
#
sub find_ctan_dir {
- my ($pkgname) = @_;
+ my ($pkgname,$do_copy) = @_;
return 1 unless $pkgname;
# use explicit catalogue name if given in tlpsrc.
@@ -82,7 +82,7 @@ sub find_ctan_dir {
# The CTAN path to a package is sometimes stored in the TeX Catalogue,
# but old entries don't have it, etc. Still, we want to use it if present.
- my $ctan_dir = &catalogue_find_ctan_path ($me);
+ my $ctan_dir = &catalogue_find_ctan_path ($me, $do_copy);
if (! $ctan_dir) {
# fall back on many special cases
(my $me_wo_babel = $me) =~ s,^babel-,,; # remove when Catalogue ready
@@ -204,7 +204,6 @@ sub find_ctan_dir {
return $ctan_dir;
}
-
# If the .tlpsrc file for ME has a catalogue entry, return it,
# else return empty string.
@@ -224,15 +223,16 @@ sub tlpsrc_find_catalogue {
return $cat;
}
-
-# Look up ctan path for given package name in catalogue entry.
+# Look up ctan path for given PKGNAME in catalogue entry.
# xml is too hard to parse, so just look for the <ctan path...> entry.
#
# Return the ctan path if found (without leading /), or undef.
+# Except that if DO_COPY is nonzero, construct a working directory and
+# return that.
#
sub catalogue_find_ctan_path {
- my ($pkgname) = @_;
+ my ($pkgname,$do_copy) = @_;
# catalogue uses all-lowercase file/directory names.
my $firstchar = substr (lc ($pkgname), 0, 1);
@@ -298,8 +298,7 @@ sub prepare {
return undef unless $pkg;
# find the real ctan dir and return it if our tds is erroneous
- $do_copy = 1; # ask find_catalogue() to copy single files, too
- my $ctan_loc = &find_ctan_dir ($pkg);
+ my $ctan_loc = &find_ctan_dir ($pkg, 1); # pass do_copy=1
return $ctan_loc if $pkg =~ /^($erroneous_tds)$/;
# tds path is usually in ctan/install...
@@ -311,12 +310,12 @@ sub prepare {
$tds_path = "/home/ftp/tex/$pkg/$pkg.tds.zip";
# will be ignored below if it doesn't exist.
- # ...and except for context, and others...
+ # ...and except for context, and plenty more...
} elsif ($pkg eq "context") {
$tds_path = "/home/ftp/mirror/www.pragma-ade.com/context/beta/cont-tmf.zip";
} elsif ($pkg eq "enctex") {
- # not tds, but we omit the TDS_READY below
+ # not tds, but we eliminate the TDS_READY below
# and do the rest in ctan2tds as usual.
$tds_path = "$CTAN/systems/enctex/enctex.tar.gz";
@@ -324,7 +323,11 @@ sub prepare {
$tds_path = glob ("$CTAN/fonts/hfoldsty/hfoldsty-v*.zip");
} elsif ($pkg eq "pgf") {
- $tds_path = glob ("$CTAN/install/graphics/pgf/base/pgf.tds.zip");
+ $tds_path = "$CTAN/install/graphics/pgf/base/pgf.tds.zip";
+
+ } elsif ($pkg eq "xxxpl") {
+ # not tds, but we need to combine with plpsfont; see below.
+ $tds_path = "$CTAN/language/polish/pl-mf.zip";
# ...and except for files in latex-tds...
} elsif ($pkg =~ /^($latex_tds_pkgs)$/) {
@@ -348,7 +351,7 @@ sub prepare {
system ($unpack) == 0 || die "unpack failed: $!\n($unpack)";
system ("chmod -R a+rX $tmpdir");
- # put a flag for ctan2tds' donormal() to work.
+ # put a sentinel file for ctan2tds' donormal() to work.
system ("echo $tds_path >$tmpdir/TDS_READY");
# fixups ... the amslatex packages are all bundled together,
@@ -365,13 +368,14 @@ sub prepare {
}
system ("rm -rf @deldir"); # discard the rest
- } elsif ($pkg eq "enctex") {
+ } elsif ($pkg =~ /^(enctex|plxxx)$/) {
unlink ("$tmpdir/TDS_READY"); # not tds
}
return $tmpdir;
}
+
# copy file to temp dir and return that for ctan2tl to use.
#
sub copy_to_tmpdir {
@@ -388,13 +392,23 @@ sub copy_to_tmpdir {
# there's no real ctan dir for these packages, just zips.
my $zip = "";
if ($pkgname eq "cc-pl") {
- $zip = "cc-pl.zip"
+ $zip = "cc-pl.zip";
+ } elsif ($pkgname eq "pl-mf") {
+ $zip = "pl-mf.zip";
} elsif ($pkgname eq "tap") {
- $zip = "tap077.zip"
+ $zip = "tap077.zip";
}
if ($zip) {
system ("cd $pkgdir && unzip -q $zip && rm $zip");
}
+ # the pl package in TeX Live is a combination of the pl-mf and
+ # plpsfont packages on CTAN, per Thomas Esser and GUST as of many
+ # years ago. So combine them. ctan2tds will flatten everything out,
+ # so don't worry about directory levels.
+ if ($pkgname eq "pl-mf") {
+ my $plpsfont_zip = "$CTAN/language/polish/plpsfont.zip";
+ system ("cd $pkgdir && unzip -q $plpsfont_zip");
+ }
return $pkgdir;
}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index ac786f2759f..06272d2ca7c 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -783,8 +783,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'pigpen', "&MAKEflatten",
'pinlabel', "&MAKEnosymlinks",
'pitthesis', "die 'skipping, noinfo license",
-# 'pl', "&MAKEflatten",
- 'pl', "die 'skipping, many files missing from ctan",
+ 'pl', "&MAKEflatten",
'plain', "die 'skipping, just plain.tex, rest in knuth-lib",
'pl-qx', "&MAKEplqx",
'pointRuler', "die 'skipping, requires compilation'",
@@ -2396,6 +2395,7 @@ $standardmf='[0-9]\.mf';
'morse', 'morse10.mf|morse.def',
'niceframe', 'karta15\.mf|umrand[ab]\.mf', # not bbding or dingbat
'ogham', 'ogham\.mf',
+ 'pl', 'NULL',
'skak', 'skak.*[0-9].*\.mf',
'tengwar', 'tengwar\.mf',
'umrand', 'umrand[ab]\.mf',
@@ -2424,6 +2424,7 @@ $standardmfinstall = '\.mf$';
'ibygrk' => 'ibycus4\.map', # tex|mf source
'ifsym' => $standardmfinstall . '|\.gen',
'niceframe', => '(karta|umrand).*\.mf', # not bbding or dingbat
+ 'pl' => '\.mf', # include .mft
'tipa' => $standardmfinstall . '|[^c]\.def$',
'wnri' => $standardmfinstall . '|wnindic\.map',# mf source
);
@@ -2438,6 +2439,7 @@ $standardpro='\.pro$';
'epspdf' => 'NULL', # makegray.pro goes in scripts
'esint-type1' => 'config.esint',
'initials' => 'config.*',
+ 'pl' => 'config.*',
'pspicture' => 'pspicture.ps',
'tex-ps' => 'mirr.hd',
'zefonts' => 'slantcm.cfg',
diff --git a/Master/tlpkg/tlpsrc/pl.tlpsrc b/Master/tlpkg/tlpsrc/pl.tlpsrc
index 2ab0df8f242..335410c251c 100644
--- a/Master/tlpkg/tlpsrc/pl.tlpsrc
+++ b/Master/tlpkg/tlpsrc/pl.tlpsrc
@@ -1,3 +1,3 @@
-catalogue plpsfont
+catalogue pl-mf
execute addMixedMap plother.map
execute addMixedMap pltext.map