From a16eced7ce206f6c49ce7fe3cb15235d019f7a4a Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Thu, 2 Sep 2021 03:03:14 +0000 Subject: CTAN sync 202109020303 --- graphics/pstricks/contrib/pst-geo/Changes | 1 + graphics/pstricks/contrib/pst-geo/README | 7 +- graphics/pstricks/contrib/pst-geo/data/README | 86 --------------------- graphics/pstricks/contrib/pst-geo/data/README.data | 86 +++++++++++++++++++++ .../pstricks/contrib/pst-geo/doc/pst-geo-doc.bib | 32 ++------ .../pstricks/contrib/pst-geo/doc/pst-geo-doc.pdf | Bin 63444975 -> 63597939 bytes .../pstricks/contrib/pst-geo/doc/pst-geo-doc.tex | 9 ++- graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex | 39 ++++++---- 8 files changed, 126 insertions(+), 134 deletions(-) delete mode 100644 graphics/pstricks/contrib/pst-geo/data/README create mode 100644 graphics/pstricks/contrib/pst-geo/data/README.data (limited to 'graphics') diff --git a/graphics/pstricks/contrib/pst-geo/Changes b/graphics/pstricks/contrib/pst-geo/Changes index e690c8e591..c2b754f5e9 100644 --- a/graphics/pstricks/contrib/pst-geo/Changes +++ b/graphics/pstricks/contrib/pst-geo/Changes @@ -1,4 +1,5 @@ ..... pst-geo.tex +0.07 2021-09-01 - load tx@geoDict for arccos 0.06 2016-12-08 - bugfix for \psepicenter - changed default for borders=true 0.05 2016-12-07 - bugfix for borderss->borders diff --git a/graphics/pstricks/contrib/pst-geo/README b/graphics/pstricks/contrib/pst-geo/README index e96c8b35fa..9ff20b37bf 100644 --- a/graphics/pstricks/contrib/pst-geo/README +++ b/graphics/pstricks/contrib/pst-geo/README @@ -7,6 +7,11 @@ pst-geo.sty main LaTeX file Install all files as usual and update the TeX database with texhash or mktexlsr, if needed. - Links: Data + +%% This program can be redistributed and/or modified under the terms +%% of the LaTeX Project Public License Distributed from CTAN archives +%% in directory macros/latex/base/lppl.txt. + +hvoss@tug.org \ No newline at end of file diff --git a/graphics/pstricks/contrib/pst-geo/data/README b/graphics/pstricks/contrib/pst-geo/data/README deleted file mode 100644 index bd25910dd4..0000000000 --- a/graphics/pstricks/contrib/pst-geo/data/README +++ /dev/null @@ -1,86 +0,0 @@ -Project pst-geo-compress 2009-07-30 -======================== - -Author: Heiko Oberdiek -License is LPPL 1.3c, - maintainance status: maintained - current maintainer: author - -Files: - README (this file) - pst-geo-compress.pl - pst-geo-decompress.pl - -Requirements: Ghostscript >= 8.56 (if prediction is used) - -`pst-geo' (CTAN:graphics/pstricks/contrib/pst-geo/) comes with -huge data files: - CTAN:graphics/pstricks/contrib/pst-geo/data/data.tgz - CTAN:graphics/pstricks/contrib/pst-geo/dataII/dataII.tgz -Unpacked the data files consume about 134 MB. - -The data files (files with extension `.dat') are PostScript files. -PostScript supports compression and decompression via filter. -The Perl script `pst-geo-compress.pl' compresses the data files -using the /FlateEncode filter and adds code to decompresses the file, -if read by a PostScript interpreter. Now the space requirements of -the data files is about 24 MB. - -Caveat: Filters /FlateEncode and /FlateDecode require -PostScript language level 3 (supported by ghostscript). -(LZW compression don't need language level 3, but -the compression is less effective.) - -Size reduction details: -* Much unnecessary white space is removed. -* Some comments are removed (especially number comments - in .dat files of data.tgz), the remaining comments are preserved - (especially city names). -* /FlateEncode filter. -* PNG prediction (method `up') is used for most of the files. - Spaces at line ends are added to fill the space up to - to the columns count. This improves the prediction, - because these files contains long lists of sorted coordinate pairs. - The prediction columns count is also the maximal line length, - because of a ghostscript bug: - -Ghostscript has a bug regarding prediction, it is fixed in -version 8.56 (2007-03-14): - -| 2006-12-11T17:30:53.980862Z L. Peter Deutsch -| -| Fixes bug: the PNG predictor filters produced incorrect data for the last -| pixel of each row. (The encoder and decoder had matching bugs, so -| encode+decode produced the correct result!) Fixes a diff in PS3 CET -| 23-12U-1. - -By having each line at the same length, the last byte of a row -has always the same value (end of line character). This does -not trigger this bug (tested with gs 7.07/8.64). - -After compression the files aren't human-readable any more. -The Perl script `pst-geo-decompress.pl' can be used to -decompress a data file. - -Both scripts know option -h that prints a short usage screen. -Option --gscmd allows to configure the ghostscript programm call, -if the automatic ghostscript isn't sufficient. - -`pst-geo-compress.pl' is called inside the directory where -the data files are present. Options `-1' and `-2' choose -between the files from `data.tgz' and `dataII.tgz'. - -`pst-geo-decompress.pl' expects the data file to decompress. -If an output file is given, the result is stored there. Otherwise -standard output is used. - -History: - 2009-07-30 v1.0 First release - 2009-07-30 v1.1: - * Workaround for ghostscript bug added: - * Files that are compressed with prediction have - equal line length. - * Removing comments (except for city data files) - * Obsolete option --prediction is therefore removed - * Adding standalone test mode (option `--test'). - diff --git a/graphics/pstricks/contrib/pst-geo/data/README.data b/graphics/pstricks/contrib/pst-geo/data/README.data new file mode 100644 index 0000000000..bd25910dd4 --- /dev/null +++ b/graphics/pstricks/contrib/pst-geo/data/README.data @@ -0,0 +1,86 @@ +Project pst-geo-compress 2009-07-30 +======================== + +Author: Heiko Oberdiek +License is LPPL 1.3c, + maintainance status: maintained + current maintainer: author + +Files: + README (this file) + pst-geo-compress.pl + pst-geo-decompress.pl + +Requirements: Ghostscript >= 8.56 (if prediction is used) + +`pst-geo' (CTAN:graphics/pstricks/contrib/pst-geo/) comes with +huge data files: + CTAN:graphics/pstricks/contrib/pst-geo/data/data.tgz + CTAN:graphics/pstricks/contrib/pst-geo/dataII/dataII.tgz +Unpacked the data files consume about 134 MB. + +The data files (files with extension `.dat') are PostScript files. +PostScript supports compression and decompression via filter. +The Perl script `pst-geo-compress.pl' compresses the data files +using the /FlateEncode filter and adds code to decompresses the file, +if read by a PostScript interpreter. Now the space requirements of +the data files is about 24 MB. + +Caveat: Filters /FlateEncode and /FlateDecode require +PostScript language level 3 (supported by ghostscript). +(LZW compression don't need language level 3, but +the compression is less effective.) + +Size reduction details: +* Much unnecessary white space is removed. +* Some comments are removed (especially number comments + in .dat files of data.tgz), the remaining comments are preserved + (especially city names). +* /FlateEncode filter. +* PNG prediction (method `up') is used for most of the files. + Spaces at line ends are added to fill the space up to + to the columns count. This improves the prediction, + because these files contains long lists of sorted coordinate pairs. + The prediction columns count is also the maximal line length, + because of a ghostscript bug: + +Ghostscript has a bug regarding prediction, it is fixed in +version 8.56 (2007-03-14): + +| 2006-12-11T17:30:53.980862Z L. Peter Deutsch +| +| Fixes bug: the PNG predictor filters produced incorrect data for the last +| pixel of each row. (The encoder and decoder had matching bugs, so +| encode+decode produced the correct result!) Fixes a diff in PS3 CET +| 23-12U-1. + +By having each line at the same length, the last byte of a row +has always the same value (end of line character). This does +not trigger this bug (tested with gs 7.07/8.64). + +After compression the files aren't human-readable any more. +The Perl script `pst-geo-decompress.pl' can be used to +decompress a data file. + +Both scripts know option -h that prints a short usage screen. +Option --gscmd allows to configure the ghostscript programm call, +if the automatic ghostscript isn't sufficient. + +`pst-geo-compress.pl' is called inside the directory where +the data files are present. Options `-1' and `-2' choose +between the files from `data.tgz' and `dataII.tgz'. + +`pst-geo-decompress.pl' expects the data file to decompress. +If an output file is given, the result is stored there. Otherwise +standard output is used. + +History: + 2009-07-30 v1.0 First release + 2009-07-30 v1.1: + * Workaround for ghostscript bug added: + * Files that are compressed with prediction have + equal line length. + * Removing comments (except for city data files) + * Obsolete option --prediction is therefore removed + * Adding standalone test mode (option `--test'). + diff --git a/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.bib b/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.bib index d7ec06279c..3c0e00ec36 100644 --- a/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.bib +++ b/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.bib @@ -17,7 +17,7 @@ @Book{PSTricks2, author = {Herbert Vo\ss}, title = {{\PST} {G}rafik f\"ur \TeX{} und \LaTeX}, - edition = {forth}, + edition = {7}, publisher = {DANTE -- Lehmanns}, year = {2007}, address = {Heidelberg/Hamburg} @@ -26,7 +26,7 @@ @Book{companion04, author = {Frank Mittelbach and Michel Goosens et al}, title = {The {\LaTeX} {C}ompanion}, - edition = {second}, + edition = {2}, publisher = {Addison-Wesley Publishing Company}, year = {2004}, address = {Boston} @@ -35,7 +35,7 @@ @Book{begleiter05, author = {Frank Mittelbach and Michel Goosens et al}, title = {Der {\LaTeX} {B}egleiter}, - edition = {zweite}, + edition = {2}, publisher = {Pearson Education}, year = {2005}, address = {M\"unchen} @@ -95,19 +95,11 @@ author = {Michel Goosens and Frank Mittelbach and Sebastian Rahtz and Denis Roegel and Herbert Vo{\ss}}, title = {The {\LaTeX} {G}raphics {C}ompanion}, publisher = {{Addison-Wesley Publishing Company}}, - edition = second, + edition = 2, year = {2007}, address = {Reading, Mass.} } -@Book{voss:chaos, - author = {Herbert Vo{\ss}}, - title = {Chaos und {F}raktale selbst programmieren: von {M}andelbrotmengen {\"u}ber {F}arbmanipulationen zur perfekten Darstellung}, - publisher = {{Franzis Verlag}}, - year = {1994}, - address = {Poing} -} - @Article{girou:01:, author = {Denis Girou}, title = {Pr\'esentation de {PST}ricks}, @@ -164,18 +156,4 @@ year = 1997 } -@MISC{xkeyval, - author = {Hendri Adriaens}, - title = {xkeyval package}, - howpublished = {\url{CTAN:/macros/latex/contrib/xkeyval}}, - year = 2004 -} - -@book{voss06, - Title = {\LaTeX{} in {N}aturwissenschaften \&{} {M}athematik}, - Author = {Herbert Vo\ss}, - Publisher = {Franzis Verlag}, - Edition= {first}, - Address= {M\"unchen}, - Year= {2006}, -} +y \ No newline at end of file diff --git a/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.pdf b/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.pdf index 53bcc1ad36..fbd48e7e48 100644 Binary files a/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.pdf and b/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.pdf differ diff --git a/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.tex b/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.tex index 0fbc289c7b..9e06b2088f 100644 --- a/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.tex +++ b/graphics/pstricks/contrib/pst-geo/doc/pst-geo-doc.tex @@ -1,7 +1,6 @@ %% $Id: pst-geo-doc.tex 918 2014-05-19 12:32:37Z herbert $ \documentclass[11pt,french,BCOR10mm,DIV12,bibliography=totoc,parskip=false, smallheadings, headexclude,footexclude,oneside]{pst-doc} -\usepackage[utf8]{inputenc} \usepackage{pstricks,url} \usepackage{ragged2e,xspace} @@ -17,6 +16,9 @@ \renewcommand\bgImage{}% \definecolor{ocean}{rgb}{0.5,0.8,0.8} +\addbibresource{pst-geo-doc.bib} + + \begin{document} \title{\texttt{pst-geo}} @@ -1074,10 +1076,9 @@ améliorer ces package : \texttt{pst-geo}, n'hésitez pas à vous manifester\ldo \xkvview{family=pst-geo,columns={key,type,default}} \bgroup -\raggedright +\RaggedRight \nocite{*} -\bibliographystyle{plain} -\bibliography{\jobname} +\printbibliography \egroup \printindex diff --git a/graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex b/graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex index 7e7f2ee3bb..8d9135c6c4 100644 --- a/graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex +++ b/graphics/pstricks/contrib/pst-geo/tex/pst-geo.tex @@ -5,11 +5,12 @@ %% %% Package `pst-geo' %% +%% Copyright 2016, 2021 %% Manuel Luque (France) %% Giuseppe Matarazzo (Italy) %% Herbert Voss (Germany) %% -%% December 07, 2016 +%% September 1, 2021 %% %% This program can be redistributed and/or modified under the terms %% of the LaTeX Project Public License Distributed from CTAN archives @@ -30,16 +31,16 @@ % \edef\PstAtCode{\the\catcode`\@} \catcode`\@=11\relax - \pst@addfams{pst-geo} % -\def\fileversion{0.06} -\def\filedate{2016/12/08} +\def\fileversion{0.07} +\def\filedate{2021/09/01} \message{`PST-geo' v\fileversion, \filedate\space (ML/HV)} % \pstheader{pst-geo.pro} \define@key[psset]{pst-geo}{path}[data]{\def\psk@geo@Path{#1}} % chemin des données +\define@key[psset]{pst-geo}{specialData}[]{\def\psk@geo@specialData{#1}} \define@key[psset]{pst-geo}{level}[1]{\def\psk@geo@level{#1}} \define@key[psset]{pst-geo}{type}[1]{\def\psk@geo@type{#1}} % type=1 ==> Mercator @@ -50,7 +51,7 @@ % type=6 ==> Babinet % type=7 ==> Collignon % type=8 ==> Bonne -\psset{path=data,level=1,type=1} +\psset{path=data,level=1,type=1,specialData={}} \define@key[psset]{pst-geo}{n}[n]{\def\psk@geo@n{#1}} \psset{n=1.77245} % sqrt(pi) % pour Collignon \define@key[psset]{pst-geo}{limiteL}[180]{\def\psk@geo@limiteL{#1}} @@ -393,7 +394,7 @@ \geo@variablesMap{0} /Y #2 def /X #1 def - X CoeffX 20 div Y CoeffY 20 div){#3}% + X CoeffX 20 div Y CoeffY 20 div ){#3}% } % %------------------- hv 2004-05-08 ---------------------- @@ -403,27 +404,28 @@ \def\mapput{\@ifnextchar[{\mapput@i}{\mapput@i[90]}} \def\mapput@i[#1](#2,#3){\@ifnextchar[{\mapput@iii[#1](#2,#3)}{\mapput@ii[#1](#2,#3)}} \def\mapput@ii[#1](#2,#3)#4{\mapput@iii[#1](#2,#3)[#4]{#4}} +% \def\mapput@iii[#1](#2,#3)[#4]#5{% \@ifnextchar[{\mapput@iv[#1](#2,#3)[#4]#5}{\mapput@iv[#1](#2,#3)[#4]#5[\@empty]}} \def\mapput@iv[#1](#2,#3)[#4]#5[#6]{{% % [angle](longitude,lattitude)[node name]{node label}[country] - \def\pst@tempb{all} + \def\pst@tempb{all}% \ifx\pst@tempb\psk@geo@mapCountry - \mapput@v[#1](#2,#3)[#4]{#5} + \mapput@v[#1](#2,#3)[#4]{#5}% \else - \def\pst@tempb{#6} + \def\pst@tempb{#6}% % \typeout{Compare \pst@tempb{} with \psk@geo@mapCountry} \ifx\pst@tempb\psk@geo@mapCountry - \mapput@v[#1](#2,#3)[#4]{#5} - \fi% - \fi% + \mapput@v[#1](#2,#3)[#4]{#5}% + \fi + \fi }} \def\mapput@v[#1](#2,#3)[#4]#5{{% - \pnodeMap(#2,#3){#4} + \pnodeMap(#2,#3){#4}% % \typeout{Node: #4} \pst@dima=\psk@geo@nodeWidth - \pscircle[style=psNodeMapStyle](#4){\pst@dima} - \pscircle*(#4){0.5\pst@dima} + \pscircle[style=psNodeMapStyle](#4){\pst@dima}% + \pscircle*(#4){0.5\pst@dima}% \uput{1.2\pst@dima}[#1](#4){\psframebox[style=psNodeMapStyle]{\psNodeLabelStyle #5}}% }} @@ -612,6 +614,11 @@ DrawBdy \fi \fi + \ifx\psk@geo@specialData\@empty\else + (\psk@geo@specialData.dat) run + \psk@geo@specialData\space + DrawRivers + \fi % \ifPst@geo@maillage % meridiens @@ -834,7 +841,7 @@ /julien BB CC add DD add day add 1720994.5 add def /hour \psk@geo@hour\space def /jours julien 2454367 sub def - /AngleRayonsSoleil latitude_parallel 23.5 sin 360 jours mul 365.25 div sin mul arccos sub def + /AngleRayonsSoleil latitude_parallel 23.5 sin 360 jours mul 365.25 div sin mul tx@geoDict begin arccos end sub def /u1 0 def /u2 AngleRayonsSoleil cos def /u3 AngleRayonsSoleil sin def % /Julien jd hour 24 div add def % -- cgit v1.2.3