texlive[60387] Master/texmf-dist: pst-geo (1sep21)
commits+karl at tug.org
commits+karl at tug.org
Wed Sep 1 22:44:29 CEST 2021
Revision: 60387
http://tug.org/svn/texlive?view=revision&revision=60387
Author: karl
Date: 2021-09-01 22:44:28 +0200 (Wed, 01 Sep 2021)
Log Message:
-----------
pst-geo (1sep21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/pst-geo/Changes
trunk/Master/texmf-dist/doc/generic/pst-geo/README
trunk/Master/texmf-dist/doc/generic/pst-geo/pst-geo-doc.bib
trunk/Master/texmf-dist/doc/generic/pst-geo/pst-geo-doc.pdf
trunk/Master/texmf-dist/doc/generic/pst-geo/pst-geo-doc.tex
trunk/Master/texmf-dist/tex/generic/pst-geo/pst-geo.tex
Added Paths:
-----------
trunk/Master/texmf-dist/tex/generic/pst-geo/data/README.data
Removed Paths:
-------------
trunk/Master/texmf-dist/tex/generic/pst-geo/data/README
Modified: trunk/Master/texmf-dist/doc/generic/pst-geo/Changes
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-geo/Changes 2021-09-01 05:58:30 UTC (rev 60386)
+++ trunk/Master/texmf-dist/doc/generic/pst-geo/Changes 2021-09-01 20:44:28 UTC (rev 60387)
@@ -1,4 +1,5 @@
..... pst-geo.tex
+0.07 2021-09-01 - load tx at 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
Modified: trunk/Master/texmf-dist/doc/generic/pst-geo/README
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-geo/README 2021-09-01 05:58:30 UTC (rev 60386)
+++ trunk/Master/texmf-dist/doc/generic/pst-geo/README 2021-09-01 20:44:28 UTC (rev 60387)
@@ -7,6 +7,11 @@
Install all files as usual and update
the TeX database with texhash or mktexlsr, if needed.
-
Links:
<a href="http://frmas.free.fr/li_1.htm">Data</a>
+
+%% 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 at tug.org
\ No newline at end of file
Modified: trunk/Master/texmf-dist/doc/generic/pst-geo/pst-geo-doc.bib
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-geo/pst-geo-doc.bib 2021-09-01 05:58:30 UTC (rev 60386)
+++ trunk/Master/texmf-dist/doc/generic/pst-geo/pst-geo-doc.bib 2021-09-01 20:44:28 UTC (rev 60387)
@@ -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.}
}
- at 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
}
- at MISC{xkeyval,
- author = {Hendri Adriaens},
- title = {xkeyval package},
- howpublished = {\url{CTAN:/macros/latex/contrib/xkeyval}},
- year = 2004
-}
-
- at 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
Modified: trunk/Master/texmf-dist/doc/generic/pst-geo/pst-geo-doc.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/pst-geo/pst-geo-doc.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/pst-geo/pst-geo-doc.tex 2021-09-01 05:58:30 UTC (rev 60386)
+++ trunk/Master/texmf-dist/doc/generic/pst-geo/pst-geo-doc.tex 2021-09-01 20:44:28 UTC (rev 60387)
@@ -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 @@
\xkvview{family=pst-geo,columns={key,type,default}}
\bgroup
-\raggedright
+\RaggedRight
\nocite{*}
-\bibliographystyle{plain}
-\bibliography{\jobname}
+\printbibliography
\egroup
\printindex
Deleted: trunk/Master/texmf-dist/tex/generic/pst-geo/data/README
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-geo/data/README 2021-09-01 05:58:30 UTC (rev 60386)
+++ trunk/Master/texmf-dist/tex/generic/pst-geo/data/README 2021-09-01 20:44:28 UTC (rev 60387)
@@ -1,86 +0,0 @@
-Project pst-geo-compress 2009-07-30
-========================
-
-Author: Heiko Oberdiek <oberdiek at uni-freiburg.de>
-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').
-
Added: trunk/Master/texmf-dist/tex/generic/pst-geo/data/README.data
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-geo/data/README.data (rev 0)
+++ trunk/Master/texmf-dist/tex/generic/pst-geo/data/README.data 2021-09-01 20:44:28 UTC (rev 60387)
@@ -0,0 +1,86 @@
+Project pst-geo-compress 2009-07-30
+========================
+
+Author: Heiko Oberdiek <oberdiek at uni-freiburg.de>
+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').
+
Property changes on: trunk/Master/texmf-dist/tex/generic/pst-geo/data/README.data
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/generic/pst-geo/pst-geo.tex
===================================================================
--- trunk/Master/texmf-dist/tex/generic/pst-geo/pst-geo.tex 2021-09-01 05:58:30 UTC (rev 60386)
+++ trunk/Master/texmf-dist/tex/generic/pst-geo/pst-geo.tex 2021-09-01 20:44:28 UTC (rev 60387)
@@ -5,11 +5,12 @@
%%
%% Package `pst-geo'
%%
+%% Copyright 2016, 2021
%% Manuel Luque <Mluque5130 at aol.com> (France)
%% Giuseppe Matarazzo <joematara at hotmail.com> (Italy)
%% Herbert Voss <hvoss at tug.org> (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 at 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 at key[psset]{pst-geo}{path}[data]{\def\psk at geo@Path{#1}} % chemin des donn\xE9es
+\define at key[psset]{pst-geo}{specialData}[]{\def\psk at geo@specialData{#1}}
\define at key[psset]{pst-geo}{level}[1]{\def\psk at geo@level{#1}}
\define at key[psset]{pst-geo}{type}[1]{\def\psk at 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 at key[psset]{pst-geo}{n}[n]{\def\psk at geo@n{#1}}
\psset{n=1.77245} % sqrt(pi) % pour Collignon
\define at key[psset]{pst-geo}{limiteL}[180]{\def\psk at geo@limiteL{#1}}
@@ -393,7 +394,7 @@
\geo at 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 at i}{\mapput at i[90]}}
\def\mapput at i[#1](#2,#3){\@ifnextchar[{\mapput at iii[#1](#2,#3)}{\mapput at ii[#1](#2,#3)}}
\def\mapput at ii[#1](#2,#3)#4{\mapput at iii[#1](#2,#3)[#4]{#4}}
+%
\def\mapput at iii[#1](#2,#3)[#4]#5{%
\@ifnextchar[{\mapput at iv[#1](#2,#3)[#4]#5}{\mapput at iv[#1](#2,#3)[#4]#5[\@empty]}}
\def\mapput at iv[#1](#2,#3)[#4]#5[#6]{{%
% [angle](longitude,lattitude)[node name]{node label}[country]
- \def\pst at tempb{all}
+ \def\pst at tempb{all}%
\ifx\pst at tempb\psk at geo@mapCountry
- \mapput at v[#1](#2,#3)[#4]{#5}
+ \mapput at v[#1](#2,#3)[#4]{#5}%
\else
- \def\pst at tempb{#6}
+ \def\pst at tempb{#6}%
% \typeout{Compare \pst at tempb{} with \psk at geo@mapCountry}
\ifx\pst at tempb\psk at geo@mapCountry
- \mapput at v[#1](#2,#3)[#4]{#5}
- \fi%
- \fi%
+ \mapput at v[#1](#2,#3)[#4]{#5}%
+ \fi
+ \fi
}}
\def\mapput at v[#1](#2,#3)[#4]#5{{%
- \pnodeMap(#2,#3){#4}
+ \pnodeMap(#2,#3){#4}%
% \typeout{Node: #4}
\pst at dima=\psk at geo@nodeWidth
- \pscircle[style=psNodeMapStyle](#4){\pst at dima}
- \pscircle*(#4){0.5\pst at dima}
+ \pscircle[style=psNodeMapStyle](#4){\pst at dima}%
+ \pscircle*(#4){0.5\pst at dima}%
\uput{1.2\pst at dima}[#1](#4){\psframebox[style=psNodeMapStyle]{\psNodeLabelStyle #5}}%
}}
@@ -612,6 +614,11 @@
DrawBdy
\fi
\fi
+ \ifx\psk at geo@specialData\@empty\else
+ (\psk at geo@specialData.dat) run
+ \psk at geo@specialData\space
+ DrawRivers
+ \fi
%
\ifPst at geo@maillage
% meridiens
@@ -834,7 +841,7 @@
/julien BB CC add DD add day add 1720994.5 add def
/hour \psk at 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 at geoDict begin arccos end sub def
/u1 0 def /u2 AngleRayonsSoleil cos def /u3 AngleRayonsSoleil sin def
% /Julien jd hour 24 div add def
%
More information about the tex-live-commits
mailing list.