From d8917e660c5cde982cccbb975a07197a92e177b1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 15 Dec 2009 00:04:25 +0000 Subject: ccicons 1.1 (14dec09) git-svn-id: svn://tug.org/texlive/trunk@16407 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ccicons/README | 8 +-- Master/texmf-dist/doc/latex/ccicons/ccicons.pdf | Bin 93474 -> 95881 bytes .../fonts/enc/dvips/ccicons/ccicons-u.enc | 4 +- .../fonts/tfm/public/ccicons/ccicons.tfm | Bin 196 -> 200 bytes .../fonts/type1/public/ccicons/ccicons.pfb | Bin 16546 -> 7280 bytes Master/texmf-dist/source/latex/ccicons/ccicons.dtx | 67 ++++++++++++++++----- Master/texmf-dist/source/latex/ccicons/ccicons.ins | 58 +++++++++--------- Master/texmf-dist/tex/latex/ccicons/ccicons.sty | 38 +++++++++--- Master/texmf-dist/tex/latex/ccicons/uccicons.fd | 8 +-- 9 files changed, 119 insertions(+), 64 deletions(-) diff --git a/Master/texmf-dist/doc/latex/ccicons/README b/Master/texmf-dist/doc/latex/ccicons/README index 6029b32e105..9e40a5f834e 100644 --- a/Master/texmf-dist/doc/latex/ccicons/README +++ b/Master/texmf-dist/doc/latex/ccicons/README @@ -1,5 +1,5 @@ ===================================================================== -ccicons --- Typesetting Creative Commons icons with LaTeX +ccicons --- Typesetting Creative Commons icons using LaTeX ===================================================================== This package offers authors who want to publish their documents under @@ -63,9 +63,9 @@ This work consists of the files ccicons.dtx, ccicons.ins, ccicons.map, ccicons.pfb, ccicons.tfm, ccicons-u.enc and the derived files ccicons.sty and uccicons.fd. -The files ccicons.pfb and ccicons.tfm have been automatically -generated from the file cc-icons.ttf available from -http://mirrors.creativecommons.org/presskit/cc-icons.ttf +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 (http://creativecommons.org) under a Creative Commons Attribution 3.0 Unported license (http://creativecommons.org/licenses/by/3.0/). diff --git a/Master/texmf-dist/doc/latex/ccicons/ccicons.pdf b/Master/texmf-dist/doc/latex/ccicons/ccicons.pdf index 7e973724046..946b307f640 100644 Binary files a/Master/texmf-dist/doc/latex/ccicons/ccicons.pdf and b/Master/texmf-dist/doc/latex/ccicons/ccicons.pdf differ diff --git a/Master/texmf-dist/fonts/enc/dvips/ccicons/ccicons-u.enc b/Master/texmf-dist/fonts/enc/dvips/ccicons/ccicons-u.enc index 918b999570b..b40ae81d0b2 100644 --- a/Master/texmf-dist/fonts/enc/dvips/ccicons/ccicons-u.enc +++ b/Master/texmf-dist/fonts/enc/dvips/ccicons/ccicons-u.enc @@ -3,8 +3,8 @@ % /CCIconsEncoding [ % 0x00 -/c /b /a /d /n /p /m /s -/r /C /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef +/c /b /a /d /n /e /y /p +/z /m /s /r /.notdef /.notdef /.notdef /.notdef % 0x10 /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef diff --git a/Master/texmf-dist/fonts/tfm/public/ccicons/ccicons.tfm b/Master/texmf-dist/fonts/tfm/public/ccicons/ccicons.tfm index b397302d131..db16842c5f2 100644 Binary files a/Master/texmf-dist/fonts/tfm/public/ccicons/ccicons.tfm and b/Master/texmf-dist/fonts/tfm/public/ccicons/ccicons.tfm differ diff --git a/Master/texmf-dist/fonts/type1/public/ccicons/ccicons.pfb b/Master/texmf-dist/fonts/type1/public/ccicons/ccicons.pfb index ac35f00e55d..e9b821fd178 100644 Binary files a/Master/texmf-dist/fonts/type1/public/ccicons/ccicons.pfb and b/Master/texmf-dist/fonts/type1/public/ccicons/ccicons.pfb differ diff --git a/Master/texmf-dist/source/latex/ccicons/ccicons.dtx b/Master/texmf-dist/source/latex/ccicons/ccicons.dtx index 8743bdfb973..52e9e28817f 100644 --- a/Master/texmf-dist/source/latex/ccicons/ccicons.dtx +++ b/Master/texmf-dist/source/latex/ccicons/ccicons.dtx @@ -18,9 +18,9 @@ % ccicons.map, ccicons.pfb, ccicons.tfm, ccicons-u.enc and % the derived files ccicons.sty and uccicons.fd. % -% The files ccicons.pfb and ccicons.tfm have been automatically -% generated from the file cc-icons.ttf available from -% http://mirrors.creativecommons.org/presskit/cc-icons.ttf +% 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 (http://creativecommons.org) under a % Creative Commons Attribution 3.0 Unported license % (http://creativecommons.org/licenses/by/3.0/). @@ -29,8 +29,8 @@ % % \iffalse %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesPackage{ccicons}[2009/12/05 v1.0 LaTeX support for Creative Commons icons] -%\ProvidesFile{uccicons.fd}[2009/12/05 v1.0 font definitions for U/ccicons] +%\ProvidesPackage{ccicons}[2009/12/14 v1.1 LaTeX support for Creative Commons icons] +%\ProvidesFile{uccicons.fd}[2009/12/14 v1.1 font definitions for U/ccicons] % %<*driver> \documentclass{ltxdoc} @@ -52,6 +52,7 @@ % \fi % % \changes{v1.0}{2009/11/29}{Initial version} +% \changes{v1.1}{2009/12/14}{New font with new glyphs} % % \GetFileInfo{ccicons.sty} % @@ -94,17 +95,19 @@ % \newcommand{\typesetcc}[1]% % {#1\,{\large #1}\,{\Large #1}\,{\LARGE #1}\,{\huge #1}\,{\Huge #1}} % \medskip\noindent -% \begin{longtable}{ll} +% \begin{longtable}[l]{ll} % |\ccLogo| & \typesetcc{\ccLogo} \\ % |\ccAttribution| & \typesetcc{\ccAttribution} \\ % |\ccShareAlike| & \typesetcc{\ccShareAlike} \\ % |\ccNoDerivatives| & \typesetcc{\ccNoDerivatives} \\ % |\ccNonCommercial| & \typesetcc{\ccNonCommercial} \\ +% |\ccNonCommercialEU| & \typesetcc{\ccNonCommercialEU} \\ +% |\ccNonCommercialJP| & \typesetcc{\ccNonCommercialJP} \\ +% |\ccZero| & \typesetcc{\ccZero} \\ % |\ccPublicDomain| & \typesetcc{\ccPublicDomain} \\ % |\ccSampling| & \typesetcc{\ccSampling} \\ % |\ccShare| & \typesetcc{\ccShare} \\ -% |\ccRemix| & \typesetcc{\ccRemix} \\ -% |\ccFullLogo| & \typesetcc{\ccFullLogo} +% |\ccRemix| & \typesetcc{\ccRemix} % \end{longtable} % % \bigskip\noindent @@ -118,8 +121,15 @@ % |\ccbysa| & \ccbysa \\ % |\ccbynd| & \ccbynd \\ % |\ccbync| & \ccbync \\ +% |\ccbynceu| & \ccbynceu \\ +% |\ccbyncjp| & \ccbyncjp \\ % |\ccbyncsa| & \ccbyncsa \\ +% |\ccbyncsaeu| & \ccbyncsaeu \\ +% |\ccbyncsajp| & \ccbyncsajp \\ % |\ccbyncnd| & \ccbyncnd \\ +% |\ccbyncndeu| & \ccbyncndeu \\ +% |\ccbyncndjp| & \ccbyncndjp \\ +% |\cczero| & \cczero \\ % |\ccpd| & \ccpd % \end{tabular} % @@ -128,7 +138,12 @@ % trademarks of Creative Commons and are subject to the Creative Commons % trademark policy (see \url{http://creativecommons.org/policies}). % -% \StopEventually{\PrintChanges} +% \section{Version history} +% +% Version 1.0 (2009/11/29): Initial version \\ +% Version 1.1 (2209/12/14): New font with new glyphs +% +% \StopEventually{} % % \iffalse %<*package> @@ -150,11 +165,13 @@ \newcommand{\ccShareAlike}{\ccicons@char{2}} \newcommand{\ccNoDerivatives}{\ccicons@char{3}} \newcommand{\ccNonCommercial}{\ccicons@char{4}} -\newcommand{\ccPublicDomain}{\ccicons@char{5}} -\newcommand{\ccSampling}{\ccicons@char{6}} -\newcommand{\ccShare}{\ccicons@char{7}} -\newcommand{\ccRemix}{\ccicons@char{8}} -\newcommand{\ccFullLogo}{\ccicons@char{9}} +\newcommand{\ccNonCommercialEU}{\ccicons@char{5}} +\newcommand{\ccNonCommercialJP}{\ccicons@char{6}} +\newcommand{\ccPublicDomain}{\ccicons@char{7}} +\newcommand{\ccZero}{\ccicons@char{8}} +\newcommand{\ccSampling}{\ccicons@char{9}} +\newcommand{\ccShare}{\ccicons@char{10}} +\newcommand{\ccRemix}{\ccicons@char{11}} % \end{macrocode} % % Finally, for each CC license we define a command that prints the CC logo @@ -168,12 +185,30 @@ {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNoDerivatives}} \newcommand{\ccbync}% {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercial}} +\newcommand{\ccbynceu}% + {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialEU}} +\newcommand{\ccbyncjp}% + {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialJP}} \newcommand{\ccbyncsa}% {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercial% \kern0.1em\ccShareAlike}} +\newcommand{\ccbyncsaeu}% + {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialEU% + \kern0.1em\ccShareAlike}} +\newcommand{\ccbyncsajp}% + {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialJP% + \kern0.1em\ccShareAlike}} \newcommand{\ccbyncnd}% {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercial% \kern0.1em\ccNoDerivatives}} +\newcommand{\ccbyncndeu}% + {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialEU% + \kern0.1em\ccNoDerivatives}} +\newcommand{\ccbyncndjp}% + {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialJP% + \kern0.1em\ccNoDerivatives}} +\newcommand{\cczero}% + {\mbox{\ccLogo\kern0.1em\ccZero}} \newcommand{\ccpd}% {\mbox{\ccLogo\kern0.1em\ccPublicDomain}} % \end{macrocode} @@ -183,7 +218,7 @@ %<*fontdef> % \fi % -% \section{Font definitions} +% \section{The font definitions file} % % We just need to declare one family with one shape. % \begin{macrocode} @@ -197,7 +232,7 @@ % % \fi % -% \CheckSum{92} +% \CheckSum{160} % % \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 diff --git a/Master/texmf-dist/source/latex/ccicons/ccicons.ins b/Master/texmf-dist/source/latex/ccicons/ccicons.ins index 12ef9b61402..89ceab66eae 100644 --- a/Master/texmf-dist/source/latex/ccicons/ccicons.ins +++ b/Master/texmf-dist/source/latex/ccicons/ccicons.ins @@ -1,29 +1,29 @@ -% -% Copyright (C) 2009 by Michael Ummels -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% 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.sty and uccicons.fd. -% -% The files ccicons.pfb and ccicons.tfm have been automatically -% generated from the file cc-icons.ttf available from -% http://mirrors.creativecommons.org/presskit/cc-icons.ttf -% and released by Creative Commons (http://creativecommons.org) under a -% Creative Commons Attribution 3.0 Unported license -% (http://creativecommons.org/licenses/by/3.0/). -% +%% +%% Copyright (C) 2009 by Michael Ummels +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% 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.sty and uccicons.fd. +%% +%% 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 (http://creativecommons.org) under a +%% Creative Commons Attribution 3.0 Unported license +%% (http://creativecommons.org/licenses/by/3.0/). +%% \input docstrip.tex \keepsilent @@ -51,9 +51,9 @@ This work consists of the files ccicons.dtx, ccicons.ins, ccicons.map, ccicons.pfb, ccicons.tfm, ccicons-u.enc and the derived files ccicons.sty and uccicons.fd. -The files ccicons.pfb and ccicons.tfm have been automatically -generated from the file cc-icons.ttf available from -http://mirrors.creativecommons.org/presskit/cc-icons.ttf +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 (http://creativecommons.org) under a Creative Commons Attribution 3.0 Unported license (http://creativecommons.org/licenses/by/3.0/). diff --git a/Master/texmf-dist/tex/latex/ccicons/ccicons.sty b/Master/texmf-dist/tex/latex/ccicons/ccicons.sty index eb0da8ad70b..84271ad8e45 100644 --- a/Master/texmf-dist/tex/latex/ccicons/ccicons.sty +++ b/Master/texmf-dist/tex/latex/ccicons/ccicons.sty @@ -26,26 +26,28 @@ %% ccicons.map, ccicons.pfb, ccicons.tfm, ccicons-u.enc and %% the derived files ccicons.sty and uccicons.fd. %% -%% The files ccicons.pfb and ccicons.tfm have been automatically -%% generated from the file cc-icons.ttf available from -%% http://mirrors.creativecommons.org/presskit/cc-icons.ttf +%% 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 (http://creativecommons.org) under a %% Creative Commons Attribution 3.0 Unported license %% (http://creativecommons.org/licenses/by/3.0/). %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{ccicons}[2009/12/05 v1.0 LaTeX support for Creative Commons icons] +\ProvidesPackage{ccicons}[2009/12/14 v1.1 LaTeX support for Creative Commons icons] \newcommand{\ccicons@char}[1]{{\usefont{U}{ccicons}{m}{n}\char#1}} \newcommand{\ccLogo}{\ccicons@char{0}} \newcommand{\ccAttribution}{\ccicons@char{1}} \newcommand{\ccShareAlike}{\ccicons@char{2}} \newcommand{\ccNoDerivatives}{\ccicons@char{3}} \newcommand{\ccNonCommercial}{\ccicons@char{4}} -\newcommand{\ccPublicDomain}{\ccicons@char{5}} -\newcommand{\ccSampling}{\ccicons@char{6}} -\newcommand{\ccShare}{\ccicons@char{7}} -\newcommand{\ccRemix}{\ccicons@char{8}} -\newcommand{\ccFullLogo}{\ccicons@char{9}} +\newcommand{\ccNonCommercialEU}{\ccicons@char{5}} +\newcommand{\ccNonCommercialJP}{\ccicons@char{6}} +\newcommand{\ccPublicDomain}{\ccicons@char{7}} +\newcommand{\ccZero}{\ccicons@char{8}} +\newcommand{\ccSampling}{\ccicons@char{9}} +\newcommand{\ccShare}{\ccicons@char{10}} +\newcommand{\ccRemix}{\ccicons@char{11}} \newcommand{\ccby}% {\mbox{\ccLogo\kern0.1em\ccAttribution}} \newcommand{\ccbysa}% @@ -54,12 +56,30 @@ {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNoDerivatives}} \newcommand{\ccbync}% {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercial}} +\newcommand{\ccbynceu}% + {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialEU}} +\newcommand{\ccbyncjp}% + {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialJP}} \newcommand{\ccbyncsa}% {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercial% \kern0.1em\ccShareAlike}} +\newcommand{\ccbyncsaeu}% + {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialEU% + \kern0.1em\ccShareAlike}} +\newcommand{\ccbyncsajp}% + {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialJP% + \kern0.1em\ccShareAlike}} \newcommand{\ccbyncnd}% {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercial% \kern0.1em\ccNoDerivatives}} +\newcommand{\ccbyncndeu}% + {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialEU% + \kern0.1em\ccNoDerivatives}} +\newcommand{\ccbyncndjp}% + {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialJP% + \kern0.1em\ccNoDerivatives}} +\newcommand{\cczero}% + {\mbox{\ccLogo\kern0.1em\ccZero}} \newcommand{\ccpd}% {\mbox{\ccLogo\kern0.1em\ccPublicDomain}} \endinput diff --git a/Master/texmf-dist/tex/latex/ccicons/uccicons.fd b/Master/texmf-dist/tex/latex/ccicons/uccicons.fd index ce996660901..ce1ebe396c6 100644 --- a/Master/texmf-dist/tex/latex/ccicons/uccicons.fd +++ b/Master/texmf-dist/tex/latex/ccicons/uccicons.fd @@ -26,14 +26,14 @@ %% ccicons.map, ccicons.pfb, ccicons.tfm, ccicons-u.enc and %% the derived files ccicons.sty and uccicons.fd. %% -%% The files ccicons.pfb and ccicons.tfm have been automatically -%% generated from the file cc-icons.ttf available from -%% http://mirrors.creativecommons.org/presskit/cc-icons.ttf +%% 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 (http://creativecommons.org) under a %% Creative Commons Attribution 3.0 Unported license %% (http://creativecommons.org/licenses/by/3.0/). %% -\ProvidesFile{uccicons.fd}[2009/12/05 v1.0 font definitions for U/ccicons] +\ProvidesFile{uccicons.fd}[2009/12/14 v1.1 font definitions for U/ccicons] \DeclareFontFamily{U}{ccicons}{} \DeclareFontShape{U}{ccicons}{m}{n}{ <-> ccicons -- cgit v1.2.3