From e2abceca35f10da35aa6711162768d389e554987 Mon Sep 17 00:00:00 2001 From: Manuel Pégourié-Gonnard Date: Wed, 15 Jul 2009 01:13:04 +0000 Subject: Undo rev 14242, 14243, 14256, 14257: apparently our Perl for windows doesn't support the open pragma. (OOPS: commited more than I wanted to. Also added files from the generic package 'shade'. This package was 'added' in r14213.) git-svn-id: svn://tug.org/texlive/trunk@14264 c570f23f-e606-0410-a88d-b1316a301751 --- Master/install-tl | 2 - Master/texmf-dist/doc/generic/shade/README | 20 ++++++++ .../texmf-dist/doc/generic/shade/description.pdf | Bin 0 -> 25940 bytes .../texmf-dist/doc/generic/shade/description.tex | 52 +++++++++++++++++++++ .../texmf-dist/fonts/source/public/shade/shade.mf | 47 +++++++++++++++++++ Master/texmf/scripts/texlive/tlmgr.pl | 2 - Master/tlpkg/TeXLive/TLMedia.pm | 2 - Master/tlpkg/TeXLive/TLPDB.pm | 2 - Master/tlpkg/TeXLive/TLPOBJ.pm | 2 - Master/tlpkg/TeXLive/TLPSRC.pm | 2 - Master/tlpkg/TeXLive/TLPaper.pm | 2 - Master/tlpkg/TeXLive/TLPostActions.pm | 2 - Master/tlpkg/TeXLive/TLTREE.pm | 2 - Master/tlpkg/TeXLive/TLUtils.pm | 2 - Master/tlpkg/TeXLive/TLWinGoo.pm | 2 - Master/tlpkg/TeXLive/TeXCatalogue.pm | 6 +-- Master/tlpkg/bin/tl-update-nsis | 2 - Master/tlpkg/bin/tlpfiles | 2 - 18 files changed, 122 insertions(+), 29 deletions(-) create mode 100644 Master/texmf-dist/doc/generic/shade/README create mode 100644 Master/texmf-dist/doc/generic/shade/description.pdf create mode 100644 Master/texmf-dist/doc/generic/shade/description.tex create mode 100644 Master/texmf-dist/fonts/source/public/shade/shade.mf diff --git a/Master/install-tl b/Master/install-tl index dff7d7b833a..84919d14957 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -44,8 +44,6 @@ BEGIN { unshift (@INC, "$::installerdir/tlpkg"); } -use open qw(:utf8 :std); - use Cwd 'abs_path'; use Getopt::Long qw(:config no_autoabbrev); use Pod::Usage; diff --git a/Master/texmf-dist/doc/generic/shade/README b/Master/texmf-dist/doc/generic/shade/README new file mode 100644 index 00000000000..a8ca869f8cf --- /dev/null +++ b/Master/texmf-dist/doc/generic/shade/README @@ -0,0 +1,20 @@ +A `frequently asked question' is that for possibilites to produce +shaded boxes. + +Since the answers usually (just as recently) point either to PostScript +\special's and PiCTeX it seems that a `simpler' and easier to use version +is not readily available --- though I did not check this. + +A small and simple approach to shaded boxes is the use of a special font +providing shaded rectangles, and some macros which automatically compose the +desired box from these characters. + +Since, of course, the finest shading can be achieved by using single pixels +for the pattern, the best shading pattern is *device dependent*. +Furthermore, one generally defined shading pattern would imply the danger, +that - because of rounding errors - at the boundaries (between two of the +characters) `lines' would occur, and that the pattern would not look completely +uniform. Consequently, since different fonts are to be used for different +printers, the dvi file is *device dependent* in this sense, too, though the +code - both for the macros and for the metafont description - is device +independent. diff --git a/Master/texmf-dist/doc/generic/shade/description.pdf b/Master/texmf-dist/doc/generic/shade/description.pdf new file mode 100644 index 00000000000..4b239d81b7f Binary files /dev/null and b/Master/texmf-dist/doc/generic/shade/description.pdf differ diff --git a/Master/texmf-dist/doc/generic/shade/description.tex b/Master/texmf-dist/doc/generic/shade/description.tex new file mode 100644 index 00000000000..920b173bd8d --- /dev/null +++ b/Master/texmf-dist/doc/generic/shade/description.tex @@ -0,0 +1,52 @@ +%%% SHADE.rdm +%%% ReadMe file for SHADE.mf and SHADE.tex/sty +%%% ------------------------------------------------------------------------- +%%% Version 1 - March 21, 1993 +%%% Peter Schmitt, Institute of Mathematics, University of Vienna +%%% Strudlhofgasse 4, A-1090 Wien, Austria +%%% e-mail A8131DAL@helios.edvz.univie.ac.at +%%% schmitt@awirap.bitnet +%%% ------------------------------------------------------------------------- + +\magnification=\magstep1 +\parindent0pt \parskip 3pt +\input shade.tex + +{\tt SHADE} is a \TeX\ tool that can be used to produce shaded boxes +neither using PostScript nor Pic\TeX. + +% The syntax is: + +\shade{This text will appear on a shaded background!} + +The shading macro first packs its argument into an hbox. + +\shade{\vbox{\hsize 5cm + \leftskip=0pt plus 1fil\rightskip=0pt plus 1fil + \parfillskip=0pt + Then it measures the dimensions of this box and produces a + shaded box slightly larger then this box, using the font + shade produced by {\tt shade.mf}. Finally it + puts the box back and overlays it with the shaded box. + \par + }} + +Since the best shading is achieved at the lowest possible resolution, +the font \shade{SHADE} is {\bf not device independent} --- it uses +the printer resolution. Therefore the .dvi file is +{\bf not device independent}, either. +The macro code, however, {\bf is device independent}. +This method was used because otherwise shading, and in particular +the boundaries between two shading characters, could turn out to be not +completely uniform. +For the same reason, the font should only be used at its true size. + +The {\tt shade} package consists of three files: + {\tt shade.mf, % MetaFont file for shading font + shade.tex, % macro file be used with LaTeX, too + shade.rdm. % this file + % it can be processed by TeX as a demo file + } +It was tested with a HP Laserjet II plus. + +\bye diff --git a/Master/texmf-dist/fonts/source/public/shade/shade.mf b/Master/texmf-dist/fonts/source/public/shade/shade.mf new file mode 100644 index 00000000000..c35addee742 --- /dev/null +++ b/Master/texmf-dist/fonts/source/public/shade/shade.mf @@ -0,0 +1,47 @@ +%%% SHADE.mf +%%% Font SHADE for use with SHADE.TEX/STY +%%% ------------------------------------------------------------------------- +%%% Version 1 - March 21, 1993 +%%% Peter Schmitt, Institute of Mathematics, University of Vienna +%%% Strudlhofgasse 4, A-1090 Wien, Austria +%%% e-mail A8131DAL@helios.edvz.univie.ac.at +%%% schmitt@awirap.bitnet +%%% ------------------------------------------------------------------------- + +mode_setup; +magnification=1000; +font_identifier "Shade"; +font_coding_scheme "Shade Style Matrix"; +font_size 10pt#; + +%%% a = side of smallest shaded square (3x3 pixels) + a#:=(3/pixels_per_inch)*1in#; + define_pixels(a); +%%% greybox produces a shaded rectangle: +%%% height 2^H*a +%%% width 2^W*a +%%% ... +%%% it consists of WxH `unit squares': .*. +%%% ... +%%% its character code is 10*W + H +%%% i.e., the first digit corresponds to the width and +%%% the second digit corresponds to the height of the character + +def greybox (expr H, W) = + HH:=2**H; WW:=2**W; + beginchar(10*W+H, WW*a#, HH*a#, 0); + pickup pencircle scaled 1; + fill (1,1)--(1,3*HH)--(3*WW,3*HH)--(3*WW,1)--cycle; + pickup pencircle scaled 2; + for x = 0 step 3 until 3*HH : undraw (0,x)--(3*WW,x); endfor; + for x = 0 step 3 until 3*WW : undraw (x,0)--(x,3*HH); endfor; + endchar; + enddef; + +%%% produce characters for H and W from 0 to 5 + +for ww = 0 upto 5 : + for hh = 0 upto 5 : greybox (hh,ww); endfor; + endfor; + +bye; diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl index ed4cd20a2a3..e02411639c6 100755 --- a/Master/texmf/scripts/texlive/tlmgr.pl +++ b/Master/texmf/scripts/texlive/tlmgr.pl @@ -56,8 +56,6 @@ BEGIN { unshift (@INC, "$Master/texmf/scripts/texlive"); } -use open ':utf8'; - use Cwd qw/abs_path/; use Pod::Usage; use Getopt::Long qw(:config no_autoabbrev permute); diff --git a/Master/tlpkg/TeXLive/TLMedia.pm b/Master/tlpkg/TeXLive/TLMedia.pm index f57454df618..bb8638a765d 100644 --- a/Master/tlpkg/TeXLive/TLMedia.pm +++ b/Master/tlpkg/TeXLive/TLMedia.pm @@ -13,8 +13,6 @@ use TeXLive::TLUtils qw(copy win32 dirname mkdirhier basename download_file use TeXLive::TLPDB; use TeXLive::TLWinGoo; -use open qw(:utf8 :std); - sub new { my ($class, @args) = @_; diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index ea6dd80f4ce..5c65d57f726 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -71,8 +71,6 @@ use TeXLive::TLPOBJ; use Cwd 'abs_path'; -use open qw(:utf8 :std); - my $_listdir; =pod diff --git a/Master/tlpkg/TeXLive/TLPOBJ.pm b/Master/tlpkg/TeXLive/TLPOBJ.pm index 2c46736c60d..87a19e70377 100644 --- a/Master/tlpkg/TeXLive/TLPOBJ.pm +++ b/Master/tlpkg/TeXLive/TLPOBJ.pm @@ -12,8 +12,6 @@ use TeXLive::TLConfig qw($DefaultCategory $CategoriesRegexp use TeXLive::TLUtils; use TeXLive::TLTREE; -use open qw(:utf8 :std); - our $_tmp; my $_containerdir; diff --git a/Master/tlpkg/TeXLive/TLPSRC.pm b/Master/tlpkg/TeXLive/TLPSRC.pm index 8807e16ea6f..4a099bc9c41 100644 --- a/Master/tlpkg/TeXLive/TLPSRC.pm +++ b/Master/tlpkg/TeXLive/TLPSRC.pm @@ -13,8 +13,6 @@ use TeXLive::TLUtils; use TeXLive::TLPOBJ; use TeXLive::TLTREE; -use open qw(:utf8 :std); - my $_tmp; my %autopatterns; # computed once internally diff --git a/Master/tlpkg/TeXLive/TLPaper.pm b/Master/tlpkg/TeXLive/TLPaper.pm index 478184cbb7e..66e39adeb07 100644 --- a/Master/tlpkg/TeXLive/TLPaper.pm +++ b/Master/tlpkg/TeXLive/TLPaper.pm @@ -31,8 +31,6 @@ C -- paper size setting use TeXLive::TLUtils qw(:DEFAULT dirname merge_into mkdirhier); -use open qw(:utf8 :std); - my %paper_sub = ( "xdvi" => \&paper_xdvi, "pdftex" => \&paper_pdftex, diff --git a/Master/tlpkg/TeXLive/TLPostActions.pm b/Master/tlpkg/TeXLive/TLPostActions.pm index 531daeefd21..f1e1f2da76c 100644 --- a/Master/tlpkg/TeXLive/TLPostActions.pm +++ b/Master/tlpkg/TeXLive/TLPostActions.pm @@ -21,8 +21,6 @@ use TeXLive::TLUtils qw(win32 mkdirhier copy conv_to_w32_path log debug info touch tlwarn); use TeXLive::TLWinGoo; -use open qw(:utf8 :std); - my $mainmenu = "TeX Live 2008"; our %PostInstall; diff --git a/Master/tlpkg/TeXLive/TLTREE.pm b/Master/tlpkg/TeXLive/TLTREE.pm index 550a163ba3f..d0897d20885 100644 --- a/Master/tlpkg/TeXLive/TLTREE.pm +++ b/Master/tlpkg/TeXLive/TLTREE.pm @@ -9,8 +9,6 @@ package TeXLive::TLTREE; use TeXLive::TLUtils; -use open qw(:utf8 :std); - sub new { my $class = shift; my %params = @_; diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 297eddd4118..3482df218d8 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -139,8 +139,6 @@ BEGIN { win32 xchdir xsystem run_cmd); } -use open qw(:utf8 :std); - use Cwd; use Digest::MD5; use Getopt::Long; diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm index d895a4580cc..d1f773f87d6 100644 --- a/Master/tlpkg/TeXLive/TLWinGoo.pm +++ b/Master/tlpkg/TeXLive/TLWinGoo.pm @@ -132,8 +132,6 @@ BEGIN { use TeXLive::TLUtils; TeXLive::TLUtils->import( qw( mkdirhier ) ); -use open qw(:utf8 :std); - my $is_win = $^O=~/^MSWin(32|64)$/i; =pod diff --git a/Master/tlpkg/TeXLive/TeXCatalogue.pm b/Master/tlpkg/TeXLive/TeXCatalogue.pm index 7322278da9f..b35bbeba8e1 100644 --- a/Master/tlpkg/TeXLive/TeXCatalogue.pm +++ b/Master/tlpkg/TeXLive/TeXCatalogue.pm @@ -10,8 +10,7 @@ use XML::Parser; use XML::XPath; use XML::XPath::XMLParser; - -use open qw(:utf8 :std); +use Encode; package TeXLive::TeXCatalogue::Entry; @@ -81,7 +80,8 @@ sub beautify{ $txt =~ s/\n/ /g; $txt =~ s/^[[:space:]]*//g; $txt =~ s/[[:space:]][[:space:]]*/ /g; - return $txt; + # turn of the utf8 flag by encoding it to utf8 + return(Encode::encode("utf-8", $txt)); } sub name { diff --git a/Master/tlpkg/bin/tl-update-nsis b/Master/tlpkg/bin/tl-update-nsis index 6a928bf2a7a..78ef875db99 100755 --- a/Master/tlpkg/bin/tl-update-nsis +++ b/Master/tlpkg/bin/tl-update-nsis @@ -16,8 +16,6 @@ our $mydir; use strict; -use open qw(:utf8 :std); - use TeXLive::TLConfig; use TeXLive::TLUtils; use TeXLive::TLPOBJ; diff --git a/Master/tlpkg/bin/tlpfiles b/Master/tlpkg/bin/tlpfiles index d2f54841d68..d5407b45aab 100755 --- a/Master/tlpkg/bin/tlpfiles +++ b/Master/tlpkg/bin/tlpfiles @@ -17,8 +17,6 @@ BEGIN { use strict; -use open qw(:utf8 :std); - use TeXLive::TLConfig qw/$RelocPrefix $RelocTree/; use TeXLive::TLPDB; use Pod::Usage; -- cgit v1.2.3