ccicons (17apr13)

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

7 files changed, 22 insertions, 48 deletions

diff --git a/Master/texmf-dist/doc/latex/ccicons/ccicons.pdf b/Master/texmf-dist/doc/latex/ccicons/ccicons.pdf
index 5f79272ef55..a90c4ad9e40 100644
--- a/Master/texmf-dist/doc/latex/ccicons/ccicons.pdf
+++ b/Master/texmf-dist/doc/latex/ccicons/ccicons.pdf
diff --git a/Master/texmf-dist/fonts/opentype/public/ccicons/ccicons.otf b/Master/texmf-dist/fonts/opentype/public/ccicons/ccicons.otf
new file mode 100644
index 00000000000..28265fa9ca3
--- /dev/null
+++ b/Master/texmf-dist/fonts/opentype/public/ccicons/ccicons.otf
diff --git a/Master/texmf-dist/fonts/tfm/public/ccicons/ccicons.tfm b/Master/texmf-dist/fonts/tfm/public/ccicons/ccicons.tfm
index 31d20843d25..cb6b959c74f 100644
--- a/Master/texmf-dist/fonts/tfm/public/ccicons/ccicons.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/ccicons/ccicons.tfm
diff --git a/Master/texmf-dist/fonts/type1/public/ccicons/ccicons.pfb b/Master/texmf-dist/fonts/type1/public/ccicons/ccicons.pfb
index 9942a09f856..1195715e30b 100644
--- a/Master/texmf-dist/fonts/type1/public/ccicons/ccicons.pfb
+++ b/Master/texmf-dist/fonts/type1/public/ccicons/ccicons.pfb
diff --git a/Master/texmf-dist/source/latex/ccicons/ccicons.dtx b/Master/texmf-dist/source/latex/ccicons/ccicons.dtx
index f585f012256..51c0e40419e 100644
--- a/Master/texmf-dist/source/latex/ccicons/ccicons.dtx
+++ b/Master/texmf-dist/source/latex/ccicons/ccicons.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2012 by Michael Ummels <michael.ummels@rwth-aachen.de>
+% Copyright (C) 2013 by Michael Ummels <michael.ummels@rwth-aachen.de>
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3c
@@ -14,24 +14,17 @@
 % 
 % The Current Maintainer of this work is Michael Ummels.
 %
-% This work consists of the files ccicons.dtx, ccicons.ins,
-% ccicons.map, ccicons.pfb, ccicons.tfm, ccicons-u.enc and
-% the derived files ccicons.pdf and ccicons.sty.
-%
-% The files ccicons.pfb and ccicons.tfm have been generated from the
-% file cc-icons-svg.zip available from
-% http://mirrors.creativecommons.org/presskit/icons/cc-icons-svg.zip
-% and released by Creative Commons under the Creative Commons Attribution
-% 3.0 Unported License: http://creativecommons.org/licenses/by/3.0/
+% This work consists of the files ccicons.dtx, ccicons.ins
+% and the derived files ccicons.pdf and ccicons.sty.
 %
 % \fi
 %
 % \iffalse
 %<*driver>
-\ProvidesFile{ccicons.dtx}[2012/05/22 v1.4 LaTeX support for Creative Commons icons]
+\ProvidesFile{ccicons.dtx}[2013/04/16 v1.5 LaTeX support for Creative Commons icons]
 %</driver>
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{ccicons}[2012/05/22 v1.4 LaTeX support for Creative Commons icons]
+%<package>\ProvidesPackage{ccicons}[2013/04/16 v1.5 LaTeX support for Creative Commons icons]
 %<*driver>
 \documentclass{ltxdoc}
 
@@ -286,7 +279,10 @@
 \newcommand{\ccpd}%
   {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@pd}}
 %    \end{macrocode}
-% \vspace{0pt}
+%
+% \iffalse
+%</package>
+% \fi
 %
 % \section{Version history}
 %
@@ -295,11 +291,10 @@
 % Version 1.2 (2011/05/22): Optimised some glyphs \\
 % Version 1.3 (2011/09/18): Merged font definitions into style file \\
 % Version 1.4 (2012/05/22): Added copyright logo, adjusted vertical
-% alignment, and added scale option
+% alignment, and added scale option \\
+% Version 1.5 (2013/04/16): Relicensed font components and included
+% OpenType font.
 %
-% \iffalse
-%</package>
-% \fi
 %
 % \Finale
 \endinput
diff --git a/Master/texmf-dist/source/latex/ccicons/ccicons.ins b/Master/texmf-dist/source/latex/ccicons/ccicons.ins
index a183f915e64..285ce2c4ebf 100644
--- a/Master/texmf-dist/source/latex/ccicons/ccicons.ins
+++ b/Master/texmf-dist/source/latex/ccicons/ccicons.ins
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2012 by Michael Ummels <michael.ummels@rwth-aachen.de>
+%% Copyright (C) 2013 by Michael Ummels <michael.ummels@rwth-aachen.de>
 %%
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -13,15 +13,8 @@
 %% 
 %% The Current Maintainer of this work is Michael Ummels.
 %%
-%% This work consists of the files ccicons.dtx, ccicons.ins,
-%% ccicons.map, ccicons.pfb, ccicons.tfm, ccicons-u.enc and
-%% the derived files ccicons.pdf and ccicons.sty.
-%%
-%% The files ccicons.pfb and ccicons.tfm have been generated from the
-%% file cc-icons-svg.zip available from
-%% http://mirrors.creativecommons.org/presskit/icons/cc-icons-svg.zip
-%% and released by Creative Commons under the Creative Commons Attribution
-%% 3.0 Unported License: http://creativecommons.org/licenses/by/3.0/
+%% This work consists of the files ccicons.dtx, ccicons.ins
+%% and the derived files ccicons.pdf and ccicons.sty.
 %%
 \input docstrip.tex
 
@@ -29,7 +22,7 @@
 
 This is a generated file.
 
-Copyright (C) 2012 by Michael Ummels <michael.ummels@rwth-aachen.de>
+Copyright (C) 2013 by Michael Ummels <michael.ummels@rwth-aachen.de>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3c
@@ -43,15 +36,8 @@ This work has the LPPL maintenance status `maintained'.
 
 The Current Maintainer of this work is Michael Ummels.
 
-This work consists of the files ccicons.dtx, ccicons.ins,
-ccicons.map, ccicons.pfb, ccicons.tfm, ccicons-u.enc and
-the derived files ccicons.pdf and ccicons.sty.
-
-The files ccicons.pfb and ccicons.tfm have been generated from the
-file cc-icons-svg.zip available from
-http://mirrors.creativecommons.org/presskit/icons/cc-icons-svg.zip
-and released by Creative Commons under the Creative Commons Attribution
-3.0 Unported License: http://creativecommons.org/licenses/by/3.0/
+This work consists of the files ccicons.dtx, ccicons.ins
+and the derived files ccicons.pdf and ccicons.sty.
 
 \endpreamble
 
diff --git a/Master/texmf-dist/tex/latex/ccicons/ccicons.sty b/Master/texmf-dist/tex/latex/ccicons/ccicons.sty
index 2b80f5114f9..7d1bc1377cc 100644
--- a/Master/texmf-dist/tex/latex/ccicons/ccicons.sty
+++ b/Master/texmf-dist/tex/latex/ccicons/ccicons.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2012 by Michael Ummels <michael.ummels@rwth-aachen.de>
+%% Copyright (C) 2013 by Michael Ummels <michael.ummels@rwth-aachen.de>
 %% 
 %% This work may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either version 1.3c
@@ -22,18 +22,11 @@
 %% 
 %% The Current Maintainer of this work is Michael Ummels.
 %% 
-%% This work consists of the files ccicons.dtx, ccicons.ins,
-%% ccicons.map, ccicons.pfb, ccicons.tfm, ccicons-u.enc and
-%% the derived files ccicons.pdf and ccicons.sty.
-%% 
-%% The files ccicons.pfb and ccicons.tfm have been generated from the
-%% file cc-icons-svg.zip available from
-%% http://mirrors.creativecommons.org/presskit/icons/cc-icons-svg.zip
-%% and released by Creative Commons under the Creative Commons Attribution
-%% 3.0 Unported License: http://creativecommons.org/licenses/by/3.0/
+%% This work consists of the files ccicons.dtx, ccicons.ins
+%% and the derived files ccicons.pdf and ccicons.sty.
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{ccicons}[2012/05/22 v1.4 LaTeX support for Creative Commons icons]
+\ProvidesPackage{ccicons}[2013/04/16 v1.5 LaTeX support for Creative Commons icons]
 \RequirePackage{xkeyval}
 \define@boolkey{ccicons.sty}[ccicons@]{copyright}[true]{}
 \newcommand{\ccicons@scale}{1.0}