ccicons (30oct17)

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

3 files changed, 177 insertions, 65 deletions

diff --git a/Master/texmf-dist/source/fonts/ccicons/ccicons.sfd b/Master/texmf-dist/source/fonts/ccicons/ccicons.sfd
index a52ebc36d8f..fe02e902b6c 100644
--- a/Master/texmf-dist/source/fonts/ccicons/ccicons.sfd
+++ b/Master/texmf-dist/source/fonts/ccicons/ccicons.sfd
@@ -3,24 +3,25 @@ FontName: CCIcons
 FullName: CCIcons
 FamilyName: CCIcons
 Weight: Medium
-Copyright: Created by Michael Ummels, with FontForge (http://fontforge.sf.net).
-UComments: "2009-12-13: Created." 
-Version: 1.002
+Copyright: Copyright (c) 2011-2017 by Michael Ummels <michael.ummels@rwth-aachen.de>\nAll Rights Reserved.
+UComments: "2009-12-13: Created."
+Version: 1.100
 ItalicAngle: 0
 UnderlinePosition: -100
 UnderlineWidth: 50
 Ascent: 800
 Descent: 200
+InvalidEm: 0
 LayerCount: 2
-Layer: 0 0 "Back"  1
-Layer: 1 0 "Fore"  0
+Layer: 0 0 "Back" 1
+Layer: 1 0 "Fore" 0
 XUID: [1021 162 282614202 8784839]
 FSType: 8
 OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1260742743
-ModificationTime: 1366225369
+ModificationTime: 1509348281
 PfmFamily: 17
 TTFWeight: 500
 TTFWidth: 5
@@ -42,19 +43,19 @@ HheadDOffset: 1
 OS2Vendor: 'PfEd'
 MarkAttachClasses: 1
 DEI: 91125
-LangName: 1033 
+LangName: 1033
 Encoding: Custom
 UnicodeInterp: none
 NameList: Adobe Glyph List
 DisplaySize: -24
 AntiAlias: 1
 FitToEm: 1
-WinInfo: 0 42 16
+WinInfo: 0 42 15
 BeginPrivate: 1
 BlueValues 37 [-210 -200 -117 -107 609 619 700 710]
 EndPrivate
 TeXData: 1 0 0 346030 173015 115343 843777 1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
-BeginChars: 256 13
+BeginChars: 14 14
 
 StartChar: a
 Encoding: 2 97 0
@@ -473,58 +474,45 @@ EndChar
 StartChar: p
 Encoding: 7 112 7
 Width: 900
-VWidth: 35
-HStem: -200 82<325.243 575.877> 128 52<533 618.183> 208 47<302 389.19> 330 47<301 388.393 533 612.042> 619 81<323.928 576.349>
-VStem: 0 81<125.217 372.322> 239 63<128 208 255 330> 392 62<258.208 327.083> 471 62<180 324> 632 63<193.895 310.192> 819 81<121.351 377.071>
+VWidth: 15
+Flags: W
+HStem: -200 84<329.653 573.236> 17 103<417.637 529.987> 385 98<416.359 525.171> 616 84<328.325 570.347>
+VStem: 0 84<129.83 365.418> 242 133<165.638 249.947> 816 84<158.434 370.347>
 LayerCount: 2
 Fore
 SplineSet
-449 700 m 0
- 575 700 682 656 769 569 c 0
- 856 482 900 376 900 250 c 0
- 900 124 857 19 771 -66 c 0
- 680 -155 573 -200 449 -200 c 0
- 327 -200 222 -156 133 -68 c 0
- 44 20 0 127 0 250 c 0
- 0 373 45 479 133 569 c 1
- 220 656 325 700 449 700 c 0
-450 619 m 0
- 348 619 262 583 191 511 c 0
- 118 437 81 350 81 250 c 0
- 81 150 117 64 190 -9 c 0
- 263 -82 350 -118 451 -118 c 0
- 552 -118 639 -81 713 -8 c 1
- 784 61 819 147 819 250 c 0
- 819 353 783 440 711 511 c 0
- 639 583 552 619 450 619 c 0
-454 292 m 0
- 454 235 410 208 350 208 c 2
- 302 208 l 1
- 302 128 l 1
- 239 128 l 1
- 239 377 l 1
- 362 377 l 2
- 423 377 454 348 454 292 c 0
-354 255 m 2
- 378 255 392 269 392 292 c 0
- 392 317 379 330 352 330 c 2
- 301 330 l 1
- 301 255 l 1
- 354 255 l 2
-695 252 m 0
- 695 169 648 128 567 128 c 2
- 471 128 l 1
- 471 377 l 1
- 567 377 l 2
- 648 377 695 335 695 252 c 0
-632 252 m 0
- 632 296 613 324 568 324 c 2
- 533 324 l 1
- 533 180 l 1
- 569 180 l 2
- 613 180 632 208 632 252 c 0
+450 700 m 0
+ 699 700 900 499 900 250 c 0
+ 900 2 699 -200 450 -200 c 0
+ 201 -200 0 2 0 250 c 0
+ 0 499 201 700 450 700 c 0
+604 70 m 1
+ 569 39 519 17 460 17 c 0
+ 376 17 242 67 242 247 c 0
+ 242 268 244 288 248 307 c 1
+ 105 370 l 1
+ 92 332 84 292 84 250 c 0
+ 84 48 248 -116 450 -116 c 0
+ 588 -116 709 -39 771 74 c 1
+ 769 75 l 2
+ 375 250 l 1
+ 375 192 404 120 473 120 c 0
+ 479 120 507 120 533 144 c 0
+ 535 146 537 148 539 150 c 1
+ 604 70 l 1
+531 358 m 1
+ 517 372 497 385 469 385 c 0
+ 434 385 411 365 396 338 c 1
+ 802 157 l 2
+ 803 156 l 1
+ 811 186 816 217 816 250 c 0
+ 816 452 652 616 450 616 c 0
+ 322 616 209 550 144 450 c 1
+ 280 390 l 1
+ 316 446 377 483 463 483 c 0
+ 500 483 556 475 605 433 c 1
+ 531 358 l 1
 EndSplineSet
-Validated: 1
 EndChar
 
 StartChar: r
@@ -804,5 +792,62 @@ SplineSet
 EndSplineSet
 Validated: 1
 EndChar
+
+StartChar: P
+Encoding: 13 80 13
+Width: 900
+VWidth: 35
+Flags: W
+HStem: -200 82<325.243 575.877> 128 52<533 618.183> 208 47<302 389.19> 330 47<301 388.393 533 612.042> 619 81<323.928 576.349>
+VStem: 0 81<125.217 372.322> 239 63<128 208 255 330> 392 62<258.208 327.083> 471 62<180 324> 632 63<193.895 310.192> 819 81<121.351 377.071>
+LayerCount: 2
+Fore
+SplineSet
+449 700 m 0
+ 575 700 682 656 769 569 c 0
+ 856 482 900 376 900 250 c 0
+ 900 124 857 19 771 -66 c 0
+ 680 -155 573 -200 449 -200 c 0
+ 327 -200 222 -156 133 -68 c 0
+ 44 20 0 127 0 250 c 0
+ 0 373 45 479 133 569 c 1
+ 220 656 325 700 449 700 c 0
+450 619 m 0
+ 348 619 262 583 191 511 c 0
+ 118 437 81 350 81 250 c 0
+ 81 150 117 64 190 -9 c 0
+ 263 -82 350 -118 451 -118 c 0
+ 552 -118 639 -81 713 -8 c 1
+ 784 61 819 147 819 250 c 0
+ 819 353 783 440 711 511 c 0
+ 639 583 552 619 450 619 c 0
+454 292 m 0
+ 454 235 410 208 350 208 c 2
+ 302 208 l 1
+ 302 128 l 1
+ 239 128 l 1
+ 239 377 l 1
+ 362 377 l 2
+ 423 377 454 348 454 292 c 0
+354 255 m 2
+ 378 255 392 269 392 292 c 0
+ 392 317 379 330 352 330 c 2
+ 301 330 l 1
+ 301 255 l 1
+ 354 255 l 2
+695 252 m 0
+ 695 169 648 128 567 128 c 2
+ 471 128 l 1
+ 471 377 l 1
+ 567 377 l 2
+ 648 377 695 335 695 252 c 0
+632 252 m 0
+ 632 296 613 324 568 324 c 2
+ 533 324 l 1
+ 533 180 l 1
+ 569 180 l 2
+ 613 180 632 208 632 252 c 0
+EndSplineSet
+EndChar
 EndChars
 EndSplineFont
diff --git a/Master/texmf-dist/source/latex/ccicons/ccicons.dtx b/Master/texmf-dist/source/latex/ccicons/ccicons.dtx
index 51c0e40419e..0849a68763c 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) 2013 by Michael Ummels <michael.ummels@rwth-aachen.de>
+% Copyright (C) 2011-2017 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
@@ -21,10 +21,10 @@
 %
 % \iffalse
 %<*driver>
-\ProvidesFile{ccicons.dtx}[2013/04/16 v1.5 LaTeX support for Creative Commons icons]
+\ProvidesFile{ccicons.dtx}[2017/10/30 v1.6 LaTeX support for Creative Commons icons]
 %</driver>
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{ccicons}[2013/04/16 v1.5 LaTeX support for Creative Commons icons]
+%<package>\ProvidesPackage{ccicons}[2017/10/30 v1.6 LaTeX support for Creative Commons icons]
 %<*driver>
 \documentclass{ltxdoc}
 
@@ -58,7 +58,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{242}
+% \CheckSum{249}
 % \CharacterTable
 %  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
 %   Lower-case    \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -128,6 +128,7 @@
 %   |\ccNonCommercialJP| & \typesetcc{\ccNonCommercialJP} \\[1ex]
 %   |\ccZero| & \typesetcc{\ccZero} \\[1ex]
 %   |\ccPublicDomain| & \typesetcc{\ccPublicDomain} \\[1ex]
+%   |\ccPublicDomainAlt| & \typesetcc{\ccPublicDomainAlt} \\[1ex]
 %   |\ccSampling| & \typesetcc{\ccSampling} \\[1ex]
 %   |\ccShare| & \typesetcc{\ccShare} \\[1ex]
 %   |\ccRemix| & \typesetcc{\ccRemix} \\[1ex]
@@ -214,6 +215,7 @@
 \newcommand{\ccicons@share}{\char10}
 \newcommand{\ccicons@remix}{\char11}
 \newcommand{\ccicons@copy}{\char12}
+\newcommand{\ccicons@pdalt}{\char13}
 %    \end{macrocode}
 % The following commands provide high-level access to to the font. We
 % define a command for each character in the font.
@@ -226,6 +228,7 @@
 \newcommand{\ccNonCommercialEU}{{\ccicons@font\ccicons@nceu}}
 \newcommand{\ccNonCommercialJP}{{\ccicons@font\ccicons@ncjp}}
 \newcommand{\ccPublicDomain}{{\ccicons@font\ccicons@pd}}
+\newcommand{\ccPublicDomainAlt}{{\ccicons@font\ccicons@pdalt}}
 \newcommand{\ccZero}{{\ccicons@font\ccicons@zero}}
 \newcommand{\ccSampling}{{\ccicons@font\ccicons@sampling}}
 \newcommand{\ccShare}{{\ccicons@font\ccicons@share}}
@@ -293,8 +296,71 @@
 % Version 1.4 (2012/05/22): Added copyright logo, adjusted vertical
 % alignment, and added scale option \\
 % Version 1.5 (2013/04/16): Relicensed font components and included
-% OpenType font.
+% OpenType font. \\
+% Version 1.6 (2017/10/30): Incorporated new Public Domain icon
 %
 %
 % \Finale
-\endinput
+% \endinput
+%
+% \iffalse
+%<*test>
+% \fi
+%    \begin{macrocode}
+\documentclass[a4paper]{article}
+
+\usepackage[copyright]{ccicons}
+
+\setlength{\parindent}{0pt}
+\pagestyle{empty}
+
+\begin{document}
+\ccLogo
+\ccAttribution
+\ccShareAlike
+\ccNoDerivatives
+\ccNonCommercial
+\ccNonCommercialJP
+\ccZero
+\ccPublicDomain
+\ccPublicDomainAlt
+\ccSampling
+\ccShare
+\ccRemix
+\ccCopy
+
+\textcopyright
+
+\ccby
+
+\ccbysa
+
+\ccbynd
+
+\ccbync
+
+\ccbynceu
+
+\ccbyncjp
+
+\ccbyncsa
+
+\ccbyncsaeu
+
+\ccbyncsajp
+
+\ccbyncnd
+
+\ccbyncndeu
+
+\ccbyncndjp
+
+\cczero
+
+\ccpd
+\end{document}
+%    \end{macrocode}
+%
+% \iffalse
+%</test>
+% \fi
diff --git a/Master/texmf-dist/source/latex/ccicons/ccicons.ins b/Master/texmf-dist/source/latex/ccicons/ccicons.ins
index 285ce2c4ebf..d5f46ccd1e3 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) 2013 by Michael Ummels <michael.ummels@rwth-aachen.de>
+%% Copyright (C) 2011-2015 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,7 +22,7 @@
 
 This is a generated file.
 
-Copyright (C) 2013 by Michael Ummels <michael.ummels@rwth-aachen.de>
+Copyright (C) 2011-2017 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
@@ -49,6 +49,7 @@ and the derived files ccicons.pdf and ccicons.sty.
 
 \generate{%
   \file{ccicons.sty}{\from{ccicons.dtx}{package}}
+  \file{test-ccicons.tex}{\from{ccicons.dtx}{test}}
 }
 
 \endbatchfile