iwona update (11jun10)

git-svn-id: svn://tug.org/texlive/trunk@18904 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 43 insertions, 48 deletions

diff --git a/Master/texmf-dist/doc/fonts/iwona/00readme.eng b/Master/texmf-dist/doc/fonts/iwona/00readme.eng
index e4014ec0cd3..3521866c704 100644
--- a/Master/texmf-dist/doc/fonts/iwona/00readme.eng
+++ b/Master/texmf-dist/doc/fonts/iwona/00readme.eng
@@ -1,12 +1,12 @@
 Font: Iwona
 Designer of the Kurier typeface: Ma\l{}gorzata Budyta, Warszawa, Poland.
 Author of the Iwona font: Janusz Marian Nowacki, Grudzi\k{a}dz, Poland.
-Version: 0.995
+Version: 0.995a
 Date: June 2010
 License:
- % Copyright 1998-2010 Janusz M. Nowacki.
- % This work is released under the GUST Font Nosource License
- %     -- see GUST-FONT-NOSOURCE-LICENSE.txt
+ % Copyright 2005-2010 Janusz M. Nowacki.
+ % This work is released under the GUST Font License
+ %     -- see GUST-FONT-LICENSE.txt
  % This work has the LPPL maintenance status "author-maintained".
  % This work consists of the files listed in the MANIFEST.txt file.
 
@@ -73,6 +73,7 @@ The current version 0.995:
 -- currently available TeX encodings (tfm, enc, map files)
     are listed in MANIFEST.txt.
 
+In the current version 0.995a only the documentation was corrected.
 
 http://www.jmn.pl/kurier.html
 e-mail: janusz@jmn.pl
diff --git a/Master/texmf-dist/doc/fonts/iwona/00readme.pol b/Master/texmf-dist/doc/fonts/iwona/00readme.pol
index d3804ce760f..37f75095e0a 100644
--- a/Master/texmf-dist/doc/fonts/iwona/00readme.pol
+++ b/Master/texmf-dist/doc/fonts/iwona/00readme.pol
@@ -2,12 +2,12 @@
 Font: Iwona
 Autor czcionek Kurier: Małgorzata Budyta, Warszawa
 Autor fontów Iwona: Janusz Marian Nowacki, Grudziądz
-Wersja: 0.995
+Wersja: 0.995a
 Data: czerwiec 2010
 Licencja:
- % Copyright 1998-2010 Janusz M. Nowacki.
- % This work is released under the GUST Font Nosource License
- %     -- see GUST-FONT-NOSOURCE-LICENSE.txt
+ % Copyright 2005-2010 Janusz M. Nowacki.
+ % This work is released under the GUST Font License
+ %     -- see GUST-FONT-LICENSE.txt
  % This work has the LPPL maintenance status "author-maintained".
  % This work consists of the files listed in the MANIFEST.txt file.
 
@@ -75,5 +75,7 @@ W wersji 0.995:
   - UWAGA!!! aktualnie dostępne TeX-owe kodowania (pliki tfm, enc, map)
     wymieniono w pliku MANIFEST.txt;
 
+W wersji 0.995a poprawiono jedynie pliki dokumentacji.
+
 http://www.jmn.pl/kurier.html
 e-mail: janusz@jmn.pl
diff --git a/Master/texmf-dist/doc/fonts/iwona/GUST-FONT-LICENSE.txt b/Master/texmf-dist/doc/fonts/iwona/GUST-FONT-LICENSE.txt
new file mode 100644
index 00000000000..507a26d3b2b
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/iwona/GUST-FONT-LICENSE.txt
@@ -0,0 +1,29 @@
+% This is version 1.0, dated 22 June 2009, of the GUST Font License.
+% (GUST is the Polish TeX Users Group, http://www.gust.org.pl)
+%
+% For the most recent version of this license see
+% http://www.gust.org.pl/fonts/licenses/GUST-FONT-LICENSE.txt
+% or
+% http://tug.org/fonts/licenses/GUST-FONT-LICENSE.txt
+%
+% This work may be distributed and/or modified under the conditions
+% of the LaTeX Project Public License, either version 1.3c of this
+% license or (at your option) any later version.
+% 
+% Please also observe the following clause:
+% 1) it is requested, but not legally required, that derived works be
+%    distributed only after changing the names of the fonts comprising this
+%    work and given in an accompanying "manifest", and that the
+%    files comprising the Work, as listed in the manifest, also be given
+%    new names. Any exceptions to this request are also given in the
+%    manifest.
+%    
+%    We recommend the manifest be given in a separate file named
+%    MANIFEST-<fontid>.txt, where <fontid> is some unique identification
+%    of the font family. If a separate "readme" file accompanies the Work, 
+%    we recommend a name of the form README-<fontid>.txt.
+%
+% The latest version of the LaTeX Project Public License is in
+% http://www.latex-project.org/lppl.txt and version 1.3c or later
+% is part of all distributions of LaTeX version 2006/05/20 or later.
+
diff --git a/Master/texmf-dist/doc/fonts/iwona/gust-font-nosource-license.txt b/Master/texmf-dist/doc/fonts/iwona/gust-font-nosource-license.txt
deleted file mode 100644
index 3f4fb91e65c..00000000000
--- a/Master/texmf-dist/doc/fonts/iwona/gust-font-nosource-license.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-%%% This is a preliminary version
-%%% of the Iwona font license barring acceptance from
-%%% the LaTeX Project Team. For the final version see
-%%% http://www.gust.org.pl/fonts/licenses/GUST-FONT-NOSOURCE-LICENSE.txt or
-
-%%% http://tug.org/fonts/licenses/GUST-FONT-NOSOURCE-LICENSE.txt
-
-%% Iwona
-%% Copyright 2005 Janusz M. Nowacki
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3a
-% of this license or (at your option) any later version provided that
-% the following additional clauses will be observed:
-%
-% 1) As there is no universally relevant concept of source files,
-%    no distinction is made between "Work" and "Compiled Work";
-%    hence, the relevant clauses of the
-%    LaTeX Project Public License should be interpreted accordingly.
-% 2) Again, due to the nature of fonts, clause 6a of the LaTeX Project
-%    Public License, version 1.3a, does not apply.  A later version of
-%    the LaTeX Project Public License may number or word this clause
-%    differently; it is the substance that is important.
-% 3) It is requested, but not legally required, that derived works be
-%    distributed only after changing the font names given at the
-%    beginning of this license; and that the files comprising the Work,
-%    as listed in the accompanying file MANIFEST.txt, also be given new
-%    names.  Any exceptions to this request are also given in
-%    MANIFEST.txt.
-%
-% The latest version of the LaTeX Project Public License is in
-%   http://www.latex-project.org/lppl.txt
-% and version 1.3a or later is part of all distributions of LaTeX
-% version 2004/10/01 or later.
-%
-% This work has the LPPL maintenance status "author-maintained".
-%
-% This work consists of the files listed in the MANIFEST.txt file.
diff --git a/Master/texmf-dist/doc/fonts/iwona/iwona-info-src.zip b/Master/texmf-dist/doc/fonts/iwona/iwona-info-src.zip
new file mode 100644
index 00000000000..f4844d30e1e
--- /dev/null
+++ b/Master/texmf-dist/doc/fonts/iwona/iwona-info-src.zip
diff --git a/Master/texmf-dist/doc/fonts/iwona/iwona-info.pdf b/Master/texmf-dist/doc/fonts/iwona/iwona-info.pdf
index 43fd130373d..cfcbcfe0d9e 100644
--- a/Master/texmf-dist/doc/fonts/iwona/iwona-info.pdf
+++ b/Master/texmf-dist/doc/fonts/iwona/iwona-info.pdf
diff --git a/Master/texmf-dist/doc/fonts/iwona/manifest.txt b/Master/texmf-dist/doc/fonts/iwona/manifest.txt
index e6cb6f6fec8..fff6f570aed 100644
--- a/Master/texmf-dist/doc/fonts/iwona/manifest.txt
+++ b/Master/texmf-dist/doc/fonts/iwona/manifest.txt
@@ -1,12 +1,13 @@
 %% Files which names should be changed in derived works as requested
-%% in clause 3 of GUST-FONT-NOSOURCE-LICENSE.txt
+%% in clause 1 of GUST-FONT-LICENSE.txt
 
 
 doc\fonts\iwona=:
  00readme.eng
  00readme.pol
- GUST-FONT-NOSOURCE-LICENSE.TXT
+ GUST-FONT-LICENSE.TXT
  iwona-info.pdf
+ iwona-info-src.zip
  iwona-latex-cyr.tex
  iwona-latex-math.tex
  iwona-latex-pl.tex