From 7867257e546a4b71c5d1f38a902cac4f0d5b8545 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 20 Sep 2011 23:14:52 +0000 Subject: ccicons (20sep11) git-svn-id: svn://tug.org/texlive/trunk@24043 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/ccicons/ccicons.pdf | Bin 47422 -> 51345 bytes .../fonts/afm/public/ccicons/ccicons.afm | 33 ------ .../fonts/type1/public/ccicons/ccicons.pfb | Bin 11089 -> 11089 bytes Master/texmf-dist/source/latex/ccicons/ccicons.dtx | 113 ++++++++++----------- Master/texmf-dist/source/latex/ccicons/ccicons.ins | 52 ++++------ Master/texmf-dist/tex/latex/ccicons/ccicons.sty | 21 ++-- Master/texmf-dist/tex/latex/ccicons/uccicons.fd | 43 -------- 7 files changed, 86 insertions(+), 176 deletions(-) delete mode 100644 Master/texmf-dist/fonts/afm/public/ccicons/ccicons.afm delete mode 100644 Master/texmf-dist/tex/latex/ccicons/uccicons.fd (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/ccicons/ccicons.pdf b/Master/texmf-dist/doc/latex/ccicons/ccicons.pdf index 8dbec4998cc..564a3ca52b8 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/afm/public/ccicons/ccicons.afm b/Master/texmf-dist/fonts/afm/public/ccicons/ccicons.afm deleted file mode 100644 index c63aa2f83d3..00000000000 --- a/Master/texmf-dist/fonts/afm/public/ccicons/ccicons.afm +++ /dev/null @@ -1,33 +0,0 @@ -StartFontMetrics 2.0 -Comment Generated by FontForge 20110222 -Comment Creation Date: Mon May 23 14:26:17 2011 -FontName CCIcons -FullName CCIcons -FamilyName CCIcons -Weight Medium -Notice (Created by Michael Ummels, with FontForge 2.0 (http://fontforge.sf.net)) -ItalicAngle 0 -IsFixedPitch false -UnderlinePosition -100 -UnderlineThickness 50 -Version 001.001 -EncodingScheme FontSpecific -FontBBox 0 -95 900 805 -XHeight 161 -Ascender 402 -Descender -48 -StartCharMetrics 12 -C 0 ; WX 900 ; N c ; B 0 -95 900 805 ; -C 1 ; WX 900 ; N b ; B 0 -95 900 805 ; -C 2 ; WX 900 ; N a ; B 0 -95 900 805 ; -C 3 ; WX 900 ; N d ; B 0 -95 900 805 ; -C 4 ; WX 900 ; N n ; B 0 -95 900 804 ; -C 5 ; WX 900 ; N e ; B 0 -95 900 805 ; -C 6 ; WX 900 ; N y ; B 0 -95 900 805 ; -C 7 ; WX 900 ; N p ; B 0 -95 900 805 ; -C 8 ; WX 899 ; N z ; B 0 -95 900 805 ; -C 9 ; WX 900 ; N m ; B 0 -95 900 805 ; -C 10 ; WX 900 ; N s ; B 0 -95 900 805 ; -C 11 ; WX 900 ; N r ; B 0 -95 900 805 ; -EndCharMetrics -EndFontMetrics diff --git a/Master/texmf-dist/fonts/type1/public/ccicons/ccicons.pfb b/Master/texmf-dist/fonts/type1/public/ccicons/ccicons.pfb index a24c97b9f93..3683ab436e6 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 de323680300..4031eaa9926 100644 --- a/Master/texmf-dist/source/latex/ccicons/ccicons.dtx +++ b/Master/texmf-dist/source/latex/ccicons/ccicons.dtx @@ -3,7 +3,7 @@ % Copyright (C) 2011 by Michael Ummels % % This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 +% conditions of the LaTeX Project Public License, either version 1.3c % 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 @@ -16,33 +16,44 @@ % % 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 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 +% 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/). +% and released by Creative Commons under the Creative Commons Attribution +% 3.0 Unported License: http://creativecommons.org/licenses/by/3.0/ % % \fi % % \iffalse +%<*driver> +\ProvidesFile{ccicons.dtx}[2011/09/18 v1.3 LaTeX support for Creative Commons icons] +% %\NeedsTeXFormat{LaTeX2e}[1999/12/01] -%\ProvidesPackage{ccicons}[2011/05/22 v1.2 LaTeX support for Creative Commons icons] -%\ProvidesFile{uccicons.fd}[2011/05/22 v1.2 font definitions for U/ccicons] -% +%\ProvidesPackage{ccicons}[2011/09/18 v1.3 LaTeX support for Creative Commons icons] %<*driver> \documentclass{ltxdoc} \usepackage[T1]{fontenc} \usepackage{charter} -\usepackage{inconsolata} +\usepackage[scaled=1.05]{inconsolata} \usepackage{ccicons} \usepackage{longtable} +\usepackage{hypdoc} +\usepackage{microtype} + +\hypersetup{ + bookmarksnumbered, + colorlinks=false, + pdfborder={0 0 0}, + pdftitle={The ccicons package}, + pdfauthor={Michael Ummels} +} \newcommand{\pkg}[1]{\mbox{#1}} -\newcommand{\url}[1]{\mbox{\texttt{#1}}} +\newcommand{\typesetcc}[1]% + {#1\,{\large #1}\,{\Large #1}\,{\LARGE #1}\,{\huge #1}\,{\Huge #1}} \EnableCrossrefs \CodelineIndex @@ -54,11 +65,28 @@ % % \fi % -% \GetFileInfo{ccicons.sty} +% \CheckSum{0} +% \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 +% Digits \0\1\2\3\4\5\6\7\8\9 +% Exclamation \! Double quote \" Hash (number) \# +% Dollar \$ Percent \% Ampersand \& +% Acute accent \' Left paren \( Right paren \) +% Asterisk \* Plus \+ Comma \, +% Minus \- Point \. Solidus \/ +% Colon \: Semicolon \; Less than \< +% Equals \= Greater than \> Question mark \? +% Commercial at \@ Left bracket \[ Backslash \\ +% Right bracket \] Circumflex \^ Underscore \_ +% Grave accent \` Left brace \{ Vertical bar \| +% Right brace \} Tilde \~} +% +% \GetFileInfo{ccicons.dtx} % % \DoNotIndex{\newcommand} % -% \title{The \pkg{ccicons} package} +% \title{\LaTeX\ support for Creative Commons Icons} % \author{Michael Ummels \\ \texttt{michael.ummels@rwth-aachen.de}} % \date{\fileversion\ -- \filedate} % \maketitle @@ -83,16 +111,12 @@ % % \section{Usage} % -% To use this package in your \LaTeX\ document, you need to issue +% To use this package in your \LaTeX\ document, add % \begin{quote} % |\usepackage{ccicons}| % \end{quote} -% in the preamble of your document. This makes available the following +% to the preamble of your document. This makes available the following % commands to typeset the icons provided by Creative Commons: -% -% \newcommand{\typesetcc}[1]% -% {#1\,{\large #1}\,{\Large #1}\,{\LARGE #1}\,{\huge #1}\,{\Huge #1}} -% \medskip\noindent % \begin{longtable}[l]{ll} % |\ccLogo| & \typesetcc{\ccLogo} \\ % |\ccAttribution| & \typesetcc{\ccAttribution} \\ @@ -108,7 +132,7 @@ % |\ccRemix| & \typesetcc{\ccRemix} % \end{longtable} % -% \bigskip\noindent +% \noindent % Additionally, for each of the common Creative Commons licenses there is a % command to typeset the CC logo together with the icons applicable for that % license (see \url{http://creativecommons.org/licenses}): @@ -140,7 +164,8 @@ % % Version 1.0 (2009/11/29): Initial version \\ % Version 1.1 (2009/12/14): New font with additional glyphs \\ -% Version 1.2 (2011/05/22): Optimised some glyphs +% Version 1.2 (2011/05/22): Optimised some glyphs \\ +% Version 1.3 (2011/09/18): Merged font definitions into style file % % \StopEventually{} % @@ -148,7 +173,15 @@ %<*package> % \fi % -% \section{The main style file} +% \section{Implementation} +% +% We just declare one font family with one shape. +% \begin{macrocode} +\DeclareFontFamily{U}{ccicons}{} +\DeclareFontShape{U}{ccicons}{m}{n}{ + <-> ccicons +}{} +% \end{macrocode} % % We provide one internal command to access the characters of the font % directly. @@ -211,43 +244,9 @@ \newcommand{\ccpd}% {\mbox{\ccLogo\kern0.1em\ccPublicDomain}} % \end{macrocode} -% % \iffalse % -%<*fontdef> % \fi % -% \section{The font definitions file} -% -% We just need to declare one family with one shape. -% \begin{macrocode} -\DeclareFontFamily{U}{ccicons}{} -\DeclareFontShape{U}{ccicons}{m}{n}{ - <-> ccicons -}{} -% \end{macrocode} -% -% \iffalse -% -% \fi -% -% \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 -% 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 -% Digits \0\1\2\3\4\5\6\7\8\9 -% Exclamation \! Double quote \" Hash (number) \# -% Dollar \$ Percent \% Ampersand \& -% Acute accent \' Left paren \( Right paren \) -% Asterisk \* Plus \+ Comma \, -% Minus \- Point \. Solidus \/ -% Colon \: Semicolon \; Less than \< -% Equals \= Greater than \> Question mark \? -% Commercial at \@ Left bracket \[ Backslash \\ -% Right bracket \] Circumflex \^ Underscore \_ -% Grave accent \` Left brace \{ Vertical bar \| -% Right brace \} Tilde \~} -% % \Finale \endinput diff --git a/Master/texmf-dist/source/latex/ccicons/ccicons.ins b/Master/texmf-dist/source/latex/ccicons/ccicons.ins index 5fc3548bdbd..1d9e1a825d4 100644 --- a/Master/texmf-dist/source/latex/ccicons/ccicons.ins +++ b/Master/texmf-dist/source/latex/ccicons/ccicons.ins @@ -2,7 +2,7 @@ %% Copyright (C) 2011 by Michael Ummels %% %% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 +%% conditions of the LaTeX Project Public License, either version 1.3c %% 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 @@ -15,19 +15,15 @@ %% %% 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 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 +%% 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/). +%% and released by Creative Commons under the Creative Commons Attribution +%% 3.0 Unported License: http://creativecommons.org/licenses/by/3.0/ %% \input docstrip.tex -\keepsilent - -\usedir{tex/latex/ccicons} \preamble @@ -36,7 +32,7 @@ This is a generated file. Copyright (C) 2011 by Michael Ummels This work may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either version 1.3 +conditions of the LaTeX Project Public License, either version 1.3c 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 @@ -49,36 +45,24 @@ 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 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 +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/). +and released by Creative Commons under the Creative Commons Attribution +3.0 Unported License: http://creativecommons.org/licenses/by/3.0/ \endpreamble +\postamble +\endpostamble + +\keepsilent +\askforoverwritefalse + \generate{% \file{ccicons.sty}{\from{ccicons.dtx}{package}} - \file{uccicons.fd}{\from{ccicons.dtx}{fontdef}} } -\obeyspaces -\Msg{*************************************************************} -\Msg{* *} -\Msg{* To finish the installation you have to move the following *} -\Msg{* files into a directory searched by TeX: *} -\Msg{* *} -\Msg{* ccicons.sty *} -\Msg{* uccicons.fd *} -\Msg{* *} -\Msg{* To produce the documentation run the file ccicons.dtx *} -\Msg{* through LaTeX. *} -\Msg{* *} -\Msg{* Happy TeXing! *} -\Msg{* *} -\Msg{*************************************************************} - \endbatchfile diff --git a/Master/texmf-dist/tex/latex/ccicons/ccicons.sty b/Master/texmf-dist/tex/latex/ccicons/ccicons.sty index 282c06365ca..683b7934f2b 100644 --- a/Master/texmf-dist/tex/latex/ccicons/ccicons.sty +++ b/Master/texmf-dist/tex/latex/ccicons/ccicons.sty @@ -11,7 +11,7 @@ %% Copyright (C) 2011 by Michael Ummels %% %% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 +%% conditions of the LaTeX Project Public License, either version 1.3c %% 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 @@ -24,17 +24,20 @@ %% %% 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 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 +%% 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/). +%% and released by Creative Commons under the Creative Commons Attribution +%% 3.0 Unported License: http://creativecommons.org/licenses/by/3.0/ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\ProvidesPackage{ccicons}[2011/05/22 v1.2 LaTeX support for Creative Commons icons] +\ProvidesPackage{ccicons}[2011/09/18 v1.3 LaTeX support for Creative Commons icons] +\DeclareFontFamily{U}{ccicons}{} +\DeclareFontShape{U}{ccicons}{m}{n}{ + <-> ccicons +}{} \newcommand{\ccicons@char}[1]{{\usefont{U}{ccicons}{m}{n}\char#1}} \newcommand{\ccLogo}{\ccicons@char{0}} \newcommand{\ccAttribution}{\ccicons@char{1}} @@ -82,6 +85,6 @@ {\mbox{\ccLogo\kern0.1em\ccZero}} \newcommand{\ccpd}% {\mbox{\ccLogo\kern0.1em\ccPublicDomain}} -\endinput +%% %% %% End of file `ccicons.sty'. diff --git a/Master/texmf-dist/tex/latex/ccicons/uccicons.fd b/Master/texmf-dist/tex/latex/ccicons/uccicons.fd deleted file mode 100644 index 76124a480b9..00000000000 --- a/Master/texmf-dist/tex/latex/ccicons/uccicons.fd +++ /dev/null @@ -1,43 +0,0 @@ -%% -%% This is file `uccicons.fd', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% ccicons.dtx (with options: `fontdef') -%% -%% This is a generated file. -%% -%% Copyright (C) 2011 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/). -%% -\ProvidesFile{uccicons.fd}[2011/05/22 v1.2 font definitions for U/ccicons] -\DeclareFontFamily{U}{ccicons}{} -\DeclareFontShape{U}{ccicons}{m}{n}{ - <-> ccicons -}{} -\endinput -%% -%% End of file `uccicons.fd'. -- cgit v1.2.3