ccicons (23may12)

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

8 files changed, 981 insertions, 108 deletions

diff --git a/Master/texmf-dist/doc/latex/ccicons/ccicons.pdf b/Master/texmf-dist/doc/latex/ccicons/ccicons.pdf
index 564a3ca52b8..5f79272ef55 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/enc/dvips/ccicons/ccicons-u.enc b/Master/texmf-dist/fonts/enc/dvips/ccicons/ccicons-u.enc
index b40ae81d0b2..ac0b400cd6a 100644
--- a/Master/texmf-dist/fonts/enc/dvips/ccicons/ccicons-u.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/ccicons/ccicons-u.enc
@@ -4,7 +4,7 @@
 /CCIconsEncoding [
 % 0x00
 /c /b /a /d /n /e /y /p
-/z /m /s /r /.notdef /.notdef /.notdef /.notdef
+/z /m /s /r /copyright /.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 604d496cbc9..31d20843d25 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 3683ab436e6..9942a09f856 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/fonts/ccicons/ccicons.sfd b/Master/texmf-dist/source/fonts/ccicons/ccicons.sfd
new file mode 100644
index 00000000000..11382413e46
--- /dev/null
+++ b/Master/texmf-dist/source/fonts/ccicons/ccicons.sfd
@@ -0,0 +1,795 @@
+SplineFontDB: 3.0
+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
+ItalicAngle: 0
+UnderlinePosition: -100
+UnderlineWidth: 50
+Ascent: 800
+Descent: 200
+LayerCount: 2
+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: 1337700292
+PfmFamily: 17
+TTFWeight: 500
+TTFWidth: 5
+LineGap: 90
+VLineGap: 0
+OS2TypoAscent: 0
+OS2TypoAOffset: 1
+OS2TypoDescent: 0
+OS2TypoDOffset: 1
+OS2TypoLinegap: 90
+OS2WinAscent: 0
+OS2WinAOffset: 1
+OS2WinDescent: 0
+OS2WinDOffset: 1
+HheadAscent: 0
+HheadAOffset: 1
+HheadDescent: 0
+HheadDOffset: 1
+OS2Vendor: 'PfEd'
+MarkAttachClasses: 1
+DEI: 91125
+LangName: 1033 
+Encoding: Custom
+UnicodeInterp: none
+NameList: Adobe Glyph List
+DisplaySize: -24
+AntiAlias: 1
+FitToEm: 1
+WinInfo: 0 42 16
+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
+
+StartChar: a
+Encoding: 2 97 0
+Width: 900
+VWidth: 35
+HStem: -200 82<325.243 575.67> 2 94<386.092 517.474> 393 94<389.471 522.288> 619 81<326.821 576.807>
+VStem: 0 81<125.056 371.911> 247 113<123.51 178 313 362.368> 564 115<149.09 346.917> 819 81<121.204 376.867>
+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 18 771 -67 c 0
+ 680 -156 573 -200 449 -200 c 0
+ 327 -200 222 -156 133 -68 c 0
+ 45 20 0 127 0 250 c 0
+ 0 373 45 479 133 569 c 1
+ 220 656 325 700 449 700 c 0
+451 619 m 0
+ 349 619 262 582 191 510 c 0
+ 118 436 81 349 81 250 c 0
+ 81 150 117 63 190 -9 c 0
+ 263 -82 350 -118 451 -118 c 0
+ 551 -118 639 -81 713 -8 c 0
+ 784 61 819 147 819 250 c 0
+ 819 353 783 439 711 510 c 1
+ 640 582 553 619 451 619 c 0
+564 246 m 0
+ 564 328 537 393 461 393 c 0
+ 401 393 367 366 360 313 c 1
+ 393 313 l 1
+ 304 224 l 1
+ 215 313 l 1
+ 250 313 l 1
+ 266 414 337 487 448 487 c 0
+ 589 487 679 384 679 243 c 0
+ 679 174 657 117 614 71 c 0
+ 571 25 514 2 445 2 c 0
+ 334 2 261 75 247 178 c 1
+ 360 178 l 1
+ 363 123 396 96 459 96 c 0
+ 531 96 564 168 564 246 c 0
+EndSplineSet
+EndChar
+
+StartChar: b
+Encoding: 1 98 1
+Width: 900
+VWidth: 35
+HStem: -200 82<325.243 575.67> 414 126<398.213 501.171> 619 81<324.225 576.645>
+VStem: 0 81<125.217 371.952> 329 243<177 388.609> 387 125<425.213 528.787> 819 81<120.855 376.849>
+LayerCount: 2
+Fore
+SplineSet
+449 700 m 0xf2
+ 575 700 682 657 769 570 c 0
+ 856 483 900 376 900 250 c 0
+ 900 124 857 18 771 -66 c 0
+ 680 -155 573 -200 449 -200 c 0
+ 327 -200 222 -156 133 -68 c 0
+ 45 20 0 127 0 250 c 0
+ 0 373 45 479 133 569 c 1
+ 220 656 325 700 449 700 c 0xf2
+451 619 m 0
+ 349 619 262 583 191 511 c 0
+ 118 436 81 349 81 250 c 0
+ 81 150 117 64 190 -9 c 0
+ 263 -82 350 -118 451 -118 c 0
+ 551 -118 639 -81 713 -8 c 1
+ 784 60 819 146 819 250 c 0
+ 819 352 783 439 711 511 c 0
+ 639 583 553 619 451 619 c 0
+542 390 m 2
+ 557 390 572 376 572 361 c 2
+ 572 177 l 1
+ 520 177 l 1
+ 520 -41 l 1
+ 380 -41 l 1
+ 380 177 l 1
+ 329 177 l 1
+ 329 361 l 2xfa
+ 329 377 342 390 358 390 c 2
+ 542 390 l 2
+387 477 m 0xf6
+ 387 519 408 540 450 540 c 0
+ 492 540 512 519 512 477 c 0
+ 512 435 492 414 450 414 c 0
+ 408 414 387 435 387 477 c 0xf6
+EndSplineSet
+EndChar
+
+StartChar: c
+Encoding: 0 99 2
+Width: 900
+VWidth: 0
+Flags: W
+HStem: -200 83<328.31 575.572> 110 60<291.325 380.748 550.931 640.326> 329 60<290.027 376.024 549.765 636.095> 619 81<323.51 577.019>
+VStem: 0 81<128.438 374.825> 194 81<185.384 315.822> 454 80<185.952 315.822> 819 81<119.9 374.996>
+LayerCount: 2
+Fore
+SplineSet
+449 700 m 0
+ 575 700 683 656 771 568 c 0
+ 845 494 900 388 900 250 c 0
+ 900 112 846 7 771 -66 c 0
+ 696 -140 587 -200 449 -200 c 0
+ 312 -200 206 -141 132 -67 c 0
+ 57 8 0 112 0 250 c 0
+ 0 387 58 494 133 569 c 0
+ 219 656 324 700 449 700 c 0
+451 619 m 0
+ 348 619 261 583 191 511 c 0
+ 130 449 81 363 81 250 c 0
+ 81 139 130 51 191 -9 c 0
+ 252 -70 339 -117 451 -117 c 0
+ 563 -117 652 -68 714 -8 c 0
+ 784 61 819 147 819 250 c 0
+ 819 363 773 449 712 510 c 0
+ 640 582 553 619 451 619 c 0
+194 250 m 0
+ 194 332 247 389 326 389 c 0
+ 382 389 421 367 445 324 c 1
+ 385 293 l 1
+ 375 313 359 329 335 329 c 0
+ 295 329 275 303 275 250 c 0
+ 275 206 293 170 335 170 c 0
+ 361 170 380 183 391 209 c 1
+ 446 181 l 1
+ 425 142 384 110 328 110 c 0
+ 245 110 194 165 194 250 c 0
+454 250 m 0
+ 454 332 507 389 586 389 c 0
+ 642 389 681 367 705 324 c 1
+ 645 293 l 1
+ 635 313 620 329 595 329 c 0
+ 555 329 534 303 534 250 c 0
+ 534 206 553 170 595 170 c 0
+ 621 170 639 183 650 209 c 1
+ 706 181 l 1
+ 685 143 644 110 588 110 c 0
+ 504 110 454 165 454 250 c 0
+EndSplineSet
+EndChar
+
+StartChar: d
+Encoding: 3 100 3
+Width: 900
+VWidth: 35
+HStem: -200 82<325.243 575.67> 134 77<293 620> 279 77<293 620> 619 81<326.821 576.807>
+VStem: 0 81<125.056 371.911> 819 81<121.204 376.867>
+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 18 771 -67 c 0
+ 680 -156 573 -200 449 -200 c 0
+ 327 -200 222 -156 133 -68 c 0
+ 45 20 0 127 0 250 c 0
+ 0 373 45 479 133 569 c 1
+ 220 656 325 700 449 700 c 0
+451 619 m 0
+ 349 619 262 582 191 510 c 0
+ 118 436 81 349 81 250 c 0
+ 81 150 117 63 190 -9 c 0
+ 263 -82 350 -118 451 -118 c 0
+ 551 -118 639 -81 713 -8 c 0
+ 784 61 819 147 819 250 c 0
+ 819 353 783 439 711 510 c 1
+ 640 582 553 619 451 619 c 0
+620 356 m 1
+ 620 279 l 1
+ 293 279 l 1
+ 293 356 l 1
+ 620 356 l 1
+620 211 m 1
+ 620 134 l 1
+ 293 134 l 1
+ 293 211 l 1
+ 620 211 l 1
+EndSplineSet
+EndChar
+
+StartChar: e
+Encoding: 5 101 4
+Width: 900
+VWidth: 35
+HStem: -200 82<325.243 576.025> -10 93<421.573 587.092> 174 53<212 253 420 421> 263 53<212 220 560 567> 406 90<425.029 584.194> 619 81<326.686 576.807>
+VStem: 0 81<125.217 366.42> 819 81<154.714 377.071>
+LayerCount: 2
+Fore
+SplineSet
+769 569 m 0
+ 856 482 900 376 900 250 c 0
+ 900 124 858 19 772 -66 c 0
+ 681 -155 573 -200 449 -200 c 0
+ 327 -200 222 -157 133 -68 c 0
+ 44 20 0 127 0 250 c 0
+ 0 373 44 479 133 569 c 0
+ 219 656 324 700 449 700 c 0
+ 575 700 682 656 769 569 c 0
+253 240 m 2
+ 253 244 254 259 254 263 c 1
+ 212 263 l 1
+ 212 316 l 1
+ 220 316 l 1
+ 101 369 l 1
+ 88 331 81 292 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 0
+ 738 16 759 42 775 71 c 1
+ 542 174 l 1
+ 378 174 l 1
+ 392 115 433 83 500 83 c 0
+ 532 83 561 90 586 103 c 1
+ 604 19 l 1
+ 570 0 531 -10 487 -10 c 0
+ 405 -10 340 27 303 76 c 0
+ 281 103 267 136 261 174 c 1
+ 212 174 l 1
+ 212 227 l 1
+ 253 227 l 1
+ 253 240 l 2
+420 228 m 1
+ 421 228 l 1
+ 420 228 l 1
+289 383 m 1
+ 329 452 401 496 488 496 c 0
+ 529 496 567 489 601 474 c 1
+ 580 388 l 1
+ 552 400 523 406 496 406 c 0
+ 444 406 406 381 388 340 c 1
+ 440 317 l 1
+ 567 317 l 1
+ 567 263 l 1
+ 560 263 l 1
+ 807 154 l 1
+ 815 184 819 216 819 250 c 0
+ 819 353 783 440 711 511 c 1
+ 640 583 553 619 451 619 c 0
+ 349 619 263 583 192 511 c 0
+ 173 492 156 471 141 449 c 1
+ 289 383 l 1
+EndSplineSet
+EndChar
+
+StartChar: m
+Encoding: 9 109 5
+Width: 900
+VWidth: 35
+HStem: -200 82<325.243 575.877> 205 39<158 239 658 751> 619 81<323.928 576.349>
+VStem: 0 81<125.217 372.322> 292 39<66.0232 131.3> 321 39<347.933 449.994> 351 39<4.02322 118.917> 381 38<372 488.948> 410 39<-3.99343 118.818> 440 39<397.75 521.974> 469 39<14.0232 122.7> 499 39<330.778 433.993> 529 38<4.00583 111.455> 558 38<325.667 399.994> 819 81<121.351 377.071>
+LayerCount: 2
+Fore
+SplineSet
+449 700 m 0xf082
+ 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 0xf082
+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
+440 504 m 2xf542
+ 440 514 449 522 459 522 c 0
+ 469 522 478 513 479 504 c 2
+ 479 501 l 1
+ 490 307 l 1
+ 499 414 l 2
+ 499 425 507 434 518 434 c 0
+ 529 434 538 425 538 414 c 2
+ 538 411 l 1
+ 548 267 l 1
+ 558 383 l 2
+ 559 392 567 400 577 400 c 0
+ 587 400 595 393 596 384 c 2xf556
+ 617 209 l 1
+ 627 232 l 2
+ 630 240 636 244 645 244 c 2
+ 751 244 l 1
+ 751 205 l 1
+ 658 205 l 1
+ 625 125 l 2
+ 622 116 614 113 607 113 c 0
+ 597 113 588 120 587 131 c 2
+ 580 189 l 1
+ 567 21 l 2
+ 566 12 558 4 548 4 c 0
+ 538 4 530 12 529 21 c 1
+ 529 23 l 1
+ 518 162 l 1
+ 508 31 l 1
+ 506 22 499 14 489 14 c 0
+ 479 14 470 22 469 31 c 2
+ 469 34 l 1
+ 459 190 l 1
+ 449 18 l 1
+ 449 16 l 2
+ 449 5 440 -4 429 -4 c 0
+ 418 -4 410 5 410 16 c 2
+ 410 17 l 1
+ 399 177 l 1
+ 390 23 l 1
+ 390 21 l 1
+ 388 12 380 4 370 4 c 0
+ 360 4 352 12 351 21 c 1
+ 351 23 l 1
+ 350 23 l 1
+ 350 25 l 1
+ 339 186 l 1
+ 331 83 l 2
+ 330 74 321 66 311 66 c 0
+ 301 66 294 74 292 83 c 2xfaaa
+ 272 221 l 1
+ 268 212 264 205 252 205 c 2
+ 158 205 l 1
+ 158 244 l 1
+ 239 244 l 1
+ 264 295 l 2
+ 267 302 274 306 281 306 c 0
+ 290 306 299 300 301 290 c 2
+ 306 253 l 1
+ 321 431 l 2
+ 321 442 330 450 341 450 c 0
+ 352 450 360 442 360 431 c 2
+ 360 427 l 1
+ 369 302 l 1
+ 381 470 l 1
+ 381 472 l 2
+ 382 481 389 489 399 489 c 0
+ 409 489 418 481 419 472 c 1
+ 419 470 l 1
+ 428 324 l 1
+ 440 501 l 1
+ 440 504 l 2xf542
+EndSplineSet
+EndChar
+
+StartChar: n
+Encoding: 4 110 6
+Width: 900
+VWidth: 35
+HStem: -200 83<325.45 576.039> 46 76<379.633 429 481 503.637> 378 76<408.266 429 481 529.123> 619 80<324.225 576.807>
+VStem: 0 81<125.365 367.569> 429 52<-23 46 454 523> 819 81<154.182 377.218>
+LayerCount: 2
+Fore
+SplineSet
+449 699 m 0
+ 575 699 682 657 769 570 c 0
+ 856 483 900 376 900 250 c 0
+ 900 124 857 18 771 -66 c 0
+ 680 -155 573 -200 449 -200 c 0
+ 327 -200 222 -156 133 -67 c 0
+ 45 21 0 127 0 250 c 0
+ 0 373 45 480 133 570 c 1
+ 220 657 325 699 449 699 c 0
+455 122 m 0
+ 486 122 511 135 511 167 c 0
+ 511 178 507 187 499 194 c 1
+ 466 208 435 222 403 237 c 0
+ 302 281 201 326 101 371 c 1
+ 88 334 81 294 81 250 c 0
+ 81 150 117 64 190 -9 c 0
+ 263 -81 351 -117 451 -117 c 0
+ 552 -117 640 -80 713 -7 c 0
+ 739 18 760 44 775 71 c 1
+ 605 147 l 1
+ 593 91 543 51 481 46 c 1
+ 481 -23 l 1
+ 429 -23 l 1
+ 429 46 l 1
+ 379 47 334 65 293 100 c 1
+ 354 163 l 1
+ 383 136 417 122 455 122 c 0
+458 378 m 0
+ 432 378 404 369 404 343 c 0
+ 404 339 405 336 408 332 c 1
+ 440 318 473 302 505 288 c 0
+ 606 243 707 198 808 153 c 1
+ 816 185 819 217 819 250 c 0
+ 819 353 783 440 711 511 c 1
+ 640 583 553 619 451 619 c 0
+ 349 619 262 583 191 511 c 0
+ 173 493 156 473 141 451 c 1
+ 313 373 l 1
+ 328 419 372 451 429 454 c 1
+ 429 523 l 1
+ 481 523 l 1
+ 481 454 l 1
+ 522 452 560 438 594 412 c 1
+ 535 352 l 1
+ 510 370 484 378 458 378 c 0
+EndSplineSet
+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>
+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
+
+StartChar: r
+Encoding: 11 114 8
+Width: 900
+VWidth: 35
+HStem: -200 82<325.243 575.67> 619 81<326.821 576.807>
+VStem: 0 81<125.056 371.911> 616 28<95 173> 725 28<129 207> 819 81<121.204 376.867>
+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 18 771 -67 c 0
+ 680 -156 573 -200 449 -200 c 0
+ 327 -200 222 -156 133 -68 c 0
+ 45 20 0 127 0 250 c 0
+ 0 373 45 479 133 569 c 1
+ 220 656 325 700 449 700 c 0
+451 619 m 0
+ 349 619 262 582 191 510 c 0
+ 118 436 81 349 81 250 c 0
+ 81 150 117 63 190 -9 c 0
+ 263 -82 350 -118 451 -118 c 0
+ 551 -118 639 -81 713 -8 c 0
+ 784 61 819 147 819 250 c 0
+ 819 353 783 439 711 510 c 1
+ 640 582 553 619 451 619 c 0
+753 111 m 1
+ 713 92 672 74 631 58 c 1
+ 547 91 465 127 382 160 c 1
+ 265 112 l 1
+ 150 162 l 1
+ 150 278 l 1
+ 258 323 l 1
+ 257 324 l 1
+ 257 451 l 1
+ 379 504 l 1
+ 655 390 l 1
+ 655 279 l 1
+ 753 238 l 1
+ 753 111 l 1
+616 94 m 1
+ 616 122 616 149 616 177 c 1
+ 409 261 l 1
+ 409 179 l 1
+ 616 94 l 1
+630 198 m 1
+ 702 228 l 1
+ 636 256 l 1
+ 565 226 l 1
+ 630 198 l 1
+725 129 m 1
+ 725 207 l 1
+ 644 173 l 1
+ 644 95 l 1
+ 725 129 l 1
+EndSplineSet
+EndChar
+
+StartChar: s
+Encoding: 10 115 9
+Width: 900
+VWidth: 35
+HStem: -200 82<325.243 575.67> -3 50<413 610> 120 49<290 364> 329 49<413 487 536 610> 451 50<290 487> 619 81<326.821 576.807>
+VStem: 0 81<125.056 371.911> 241 49<169 451> 364 49<47 120 169 329> 487 49<378 451> 610 49<47 329> 819 81<121.204 376.867>
+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 18 771 -67 c 0
+ 680 -156 573 -200 449 -200 c 0
+ 327 -200 222 -156 133 -68 c 0
+ 45 20 0 127 0 250 c 0
+ 0 373 45 479 133 569 c 1
+ 220 656 325 700 449 700 c 0
+451 619 m 0
+ 349 619 262 582 191 510 c 0
+ 118 436 81 349 81 250 c 0
+ 81 150 117 63 190 -9 c 0
+ 263 -82 350 -118 451 -118 c 0
+ 551 -118 639 -81 713 -8 c 0
+ 784 61 819 147 819 250 c 0
+ 819 353 783 439 711 510 c 1
+ 640 582 553 619 451 619 c 0
+634 378 m 2
+ 648 378 659 367 659 353 c 2
+ 659 22 l 2
+ 659 8 648 -3 634 -3 c 2
+ 389 -3 l 2
+ 375 -3 364 8 364 22 c 2
+ 364 120 l 1
+ 266 120 l 2
+ 252 120 241 131 241 145 c 2
+ 241 476 l 2
+ 241 490 252 499 264 501 c 1
+ 346 501 429 501 511 501 c 0
+ 525 501 536 490 536 476 c 2
+ 536 378 l 1
+ 634 378 l 2
+364 353 m 2
+ 364 366 375 376 386 378 c 1
+ 420 378 453 378 487 378 c 1
+ 487 451 l 1
+ 290 451 l 1
+ 290 169 l 1
+ 364 169 l 1
+ 364 353 l 2
+610 329 m 1
+ 413 329 l 1
+ 413 47 l 1
+ 610 47 l 1
+ 610 329 l 1
+EndSplineSet
+EndChar
+
+StartChar: y
+Encoding: 6 121 10
+Width: 900
+VWidth: 35
+HStem: -200 82<325.243 576.025> 61 70<277 393 505 609> 186 70<277 328> 619 81<326.482 576.807>
+VStem: 0 81<125.217 356.218> 393 112<-41 61 131 165> 819 81<143.928 377.071>
+LayerCount: 2
+Fore
+SplineSet
+769 569 m 0
+ 856 482 900 376 900 250 c 0
+ 900 124 858 19 772 -66 c 0
+ 681 -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 44 479 133 569 c 0
+ 219 656 324 700 449 700 c 0
+ 575 700 682 656 769 569 c 0
+713 -8 m 0
+ 735 13 753 35 768 60 c 1
+ 621 126 l 1
+ 621 61 l 1
+ 505 61 l 1
+ 505 -41 l 1
+ 393 -41 l 1
+ 393 61 l 1
+ 277 61 l 1
+ 277 131 l 1
+ 393 131 l 1
+ 393 165 l 1
+ 383 186 l 1
+ 277 186 l 1
+ 277 256 l 1
+ 328 256 l 1
+ 97 359 l 1
+ 86 324 81 288 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 0
+609 131 m 1
+ 510 175 l 1
+ 505 165 l 1
+ 505 131 l 1
+ 609 131 l 1
+621 224 m 1
+ 805 143 l 1
+ 815 176 819 212 819 250 c 0
+ 819 353 783 440 711 511 c 1
+ 640 583 553 619 451 619 c 0
+ 349 619 262 583 191 511 c 0
+ 169 489 151 466 135 441 c 1
+ 284 374 l 1
+ 234 467 l 1
+ 354 467 l 1
+ 426 311 l 1
+ 467 293 l 1
+ 546 467 l 1
+ 666 467 l 1
+ 551 256 l 1
+ 621 256 l 1
+ 621 224 l 1
+EndSplineSet
+EndChar
+
+StartChar: z
+Encoding: 8 122 11
+Width: 899
+VWidth: 35
+HStem: -200 83<325.238 575.392> -9 98<407.067 497.328> 411 98<402.672 470.939> 619 81<323.51 577.019>
+VStem: 0 81<128.288 372.392> 264 106<190.307 372.512> 530 106<127.319 325.765> 819 81<122.504 375.11>
+LayerCount: 2
+Fore
+SplineSet
+450 509 m 0
+ 590 509 636 389 636 250 c 0
+ 636 136 605 43 526 6 c 0
+ 504 -5 479 -9 450 -9 c 0
+ 310 -9 264 111 264 250 c 0
+ 264 364 295 456 374 493 c 0
+ 396 504 421 509 450 509 c 0
+450 411 m 0
+ 397 411 370 358 370 250 c 0
+ 370 226 371 205 373 187 c 1
+ 472 369 l 2
+ 476 375 478 381 478 387 c 0
+ 478 395 474 403 467 409 c 1
+ 461 410 455 411 450 411 c 0
+406 116 m 0
+ 406 99 428 89 450 89 c 0
+ 503 89 530 142 530 250 c 0
+ 530 280 528 306 524 327 c 1
+ 413 136 l 2
+ 408 128 406 122 406 116 c 0
+449 700 m 0
+ 575 700 683 656 771 568 c 0
+ 846 493 900 389 900 250 c 0
+ 900 111 846 8 771 -66 c 0
+ 696 -140 587 -200 449 -200 c 0
+ 311 -200 207 -142 132 -68 c 1
+ 58 7 0 112 0 250 c 0
+ 0 388 59 495 133 569 c 0
+ 219 656 324 700 449 700 c 0
+451 619 m 0
+ 348 619 261 583 191 511 c 0
+ 130 449 81 363 81 250 c 0
+ 81 139 130 51 191 -10 c 0
+ 252 -70 338 -117 451 -117 c 0
+ 563 -117 651 -68 713 -8 c 0
+ 783 61 819 147 819 250 c 0
+ 819 363 773 449 712 510 c 0
+ 640 582 553 619 451 619 c 0
+EndSplineSet
+EndChar
+
+StartChar: copyright
+Encoding: 12 169 12
+Width: 900
+VWidth: 0
+Flags: W
+HStem: -200 83<328.31 575.572> 26.2998 96<416.776 536.223> 376.7 96<415.039 528.843> 619 81<323.51 577.019>
+VStem: 0 81<128.438 374.825> 250.4 129.6<162.6 340.819> 819 81<119.9 374.996>
+LayerCount: 2
+Fore
+SplineSet
+449 700 m 0
+ 575 700 683 656 771 568 c 0
+ 845 494 900 388 900 250 c 0
+ 900 112 846 7 771 -66 c 0
+ 696 -140 587 -200 449 -200 c 0
+ 312 -200 206 -141 132 -67 c 0
+ 57 8 0 112 0 250 c 0
+ 0 387 58 494 133 569 c 0
+ 219 656 324 700 449 700 c 0
+451 619 m 0
+ 348 619 261 583 191 511 c 0
+ 130 449 81 363 81 250 c 0
+ 81 139 130 51 191 -9 c 0
+ 252 -70 339 -117 451 -117 c 0
+ 563 -117 652 -68 714 -8 c 0
+ 784 61 819 147 819 250 c 0
+ 819 363 773 449 712 510 c 0
+ 640 582 553 619 451 619 c 0
+250.400390625 250.299804688 m 0
+ 250.400390625 381.5 335.200195312 472.700195312 461.599609375 472.700195312 c 0
+ 551.200195312 472.700195312 613.599609375 437.5 652 368.700195312 c 1
+ 556 319.099609375 l 1
+ 540 351.099609375 514.400390625 376.700195312 476 376.700195312 c 0
+ 412 376.700195312 380 335.099609375 380 250.299804688 c 0
+ 380 179.900390625 408.799804688 122.299804688 476 122.299804688 c 0
+ 517.599609375 122.299804688 548 143.099609375 565.599609375 184.700195312 c 1
+ 653.599609375 139.900390625 l 1
+ 620 77.5 554.400390625 26.2998046875 464.799804688 26.2998046875 c 0
+ 332 26.2998046875 250.400390625 114.299804688 250.400390625 250.299804688 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 4031eaa9926..f585f012256 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) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de>
+% Copyright (C) 2012 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
@@ -28,10 +28,10 @@
 %
 % \iffalse
 %<*driver>
-\ProvidesFile{ccicons.dtx}[2011/09/18 v1.3 LaTeX support for Creative Commons icons]
+\ProvidesFile{ccicons.dtx}[2012/05/22 v1.4 LaTeX support for Creative Commons icons]
 %</driver>
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-%<package>\ProvidesPackage{ccicons}[2011/09/18 v1.3 LaTeX support for Creative Commons icons]
+%<package>\ProvidesPackage{ccicons}[2012/05/22 v1.4 LaTeX support for Creative Commons icons]
 %<*driver>
 \documentclass{ltxdoc}
 
@@ -65,7 +65,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{0}
+% \CheckSum{242}
 % \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
@@ -109,27 +109,36 @@
 % stored in a PostScript Type 1 font, they can be scaled freely without
 % diminishing their visual appearance.
 %
+% Please note that all icons that can be typeset using this package are
+% trademarks of Creative Commons and are subject to the Creative Commons
+% trademark policy (see \url{http://creativecommons.org/policies}).
+%
 % \section{Usage}
 %
 % To use this package in your \LaTeX\ document, add
 % \begin{quote}
-% |\usepackage{ccicons}|
+% |\usepackage|\oarg{options}|{ccicons}|
 % \end{quote}
-% to the preamble of your document. This makes available the following
-% commands to typeset the icons provided by Creative Commons:
+% to the preamble of your document. For the available options see
+% Section~\ref{sec:options}.
+%
+% After the package has been loaded, the following commands can
+% be used to typeset the icons provided by CreativecCommons.
+%
 % \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}
+%   |\ccLogo| & \typesetcc{\ccLogo} \\[1ex]
+%   |\ccAttribution| & \typesetcc{\ccAttribution} \\[1ex]
+%   |\ccShareAlike| & \typesetcc{\ccShareAlike} \\[1ex]
+%   |\ccNoDerivatives| & \typesetcc{\ccNoDerivatives} \\[1ex]
+%   |\ccNonCommercial| & \typesetcc{\ccNonCommercial} \\[1ex]
+%   |\ccNonCommercialEU| & \typesetcc{\ccNonCommercialEU} \\[1ex]
+%   |\ccNonCommercialJP| & \typesetcc{\ccNonCommercialJP} \\[1ex]
+%   |\ccZero| & \typesetcc{\ccZero} \\[1ex]
+%   |\ccPublicDomain| & \typesetcc{\ccPublicDomain} \\[1ex]
+%   |\ccSampling| & \typesetcc{\ccSampling} \\[1ex]
+%   |\ccShare| & \typesetcc{\ccShare} \\[1ex]
+%   |\ccRemix| & \typesetcc{\ccRemix} \\[1ex]
+%   |\ccCopy| & \typesetcc{\ccCopy}
 % \end{longtable}
 %
 % \noindent
@@ -155,95 +164,139 @@
 %  |\ccpd| & \ccpd
 % \end{tabular}
 %
-% \bigskip\noindent
-% Please note that all icons that can be typeset using this package are
-% trademarks of Creative Commons and are subject to the Creative Commons
-% trademark policy (see \url{http://creativecommons.org/policies}).
-%
-% \section{Version history}
+% \section{Options}\label{sec:options}
 %
-% 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.3 (2011/09/18): Merged font definitions into style file
+% Currently, the \pkg{ccicons} package supports two options.
+% First, the |scale=|\meta{factor} option allows to scale all
+% icons by an arbitrary factor. For example, to typeset the icons
+% at 90\% of their original size, load the package with the
+% option |scale=0.9|. Second, if the |copyright| option is
+% enabled, the command |\textcopyright| is redefined so that
+% it behaves like |\ccCopy|.
 %
 % \StopEventually{}
 %
+% \section{Implementation}
+%
 % \iffalse
 %<*package>
 % \fi
 %
-% \section{Implementation}
-%
+% We use \pkg{xkeyval}'s key mechanism to declare all options.
+% The first option controls whether |\textcopyright| is redefined.
+%    \begin{macrocode}
+\RequirePackage{xkeyval}
+\define@boolkey{ccicons.sty}[ccicons@]{copyright}[true]{}
+%    \end{macrocode}
+% The next option allows to scale the font by an arbitrary factor.
+%    \begin{macrocode}
+\newcommand{\ccicons@scale}{1.0}
+\define@key{ccicons.sty}{scale}{\renewcommand\ccicons@scale{#1}}
+%    \end{macrocode}
+% Process all options.
+%    \begin{macrocode}
+\ProcessOptionsX
+%    \end{macrocode}
 % We just declare one font family with one shape.
 %    \begin{macrocode}
 \DeclareFontFamily{U}{ccicons}{}
 \DeclareFontShape{U}{ccicons}{m}{n}{
-   <-> ccicons
+   <-> s * [\ccicons@scale] ccicons
 }{}
 %    \end{macrocode}
-%
-% We provide one internal command to access the characters of the font
+% We provide internal commands to access the characters of the font
 % directly.
 %    \begin{macrocode}
-\newcommand{\ccicons@char}[1]{{\usefont{U}{ccicons}{m}{n}\char#1}}
+\newcommand{\ccicons@font}{\usefont{U}{ccicons}{m}{n}}
+\newcommand{\ccicons@logo}{\char0}
+\newcommand{\ccicons@by}{\char1}
+\newcommand{\ccicons@sa}{\char2}
+\newcommand{\ccicons@nd}{\char3}
+\newcommand{\ccicons@nc}{\char4}
+\newcommand{\ccicons@nceu}{\char5}
+\newcommand{\ccicons@ncjp}{\char6}
+\newcommand{\ccicons@pd}{\char7}
+\newcommand{\ccicons@zero}{\char8}
+\newcommand{\ccicons@sampling}{\char9}
+\newcommand{\ccicons@share}{\char10}
+\newcommand{\ccicons@remix}{\char11}
+\newcommand{\ccicons@copy}{\char12}
 %    \end{macrocode}
-%
 % The following commands provide high-level access to to the font. We
 % define a command for each character in the font.
 %    \begin{macrocode}
-\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{\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{\ccLogo}{{\ccicons@font\ccicons@logo}}
+\newcommand{\ccAttribution}{{\ccicons@font\ccicons@by}}
+\newcommand{\ccShareAlike}{{\ccicons@font\ccicons@sa}}
+\newcommand{\ccNoDerivatives}{{\ccicons@font\ccicons@nd}}
+\newcommand{\ccNonCommercial}{{\ccicons@font\ccicons@nc}}
+\newcommand{\ccNonCommercialEU}{{\ccicons@font\ccicons@nceu}}
+\newcommand{\ccNonCommercialJP}{{\ccicons@font\ccicons@ncjp}}
+\newcommand{\ccPublicDomain}{{\ccicons@font\ccicons@pd}}
+\newcommand{\ccZero}{{\ccicons@font\ccicons@zero}}
+\newcommand{\ccSampling}{{\ccicons@font\ccicons@sampling}}
+\newcommand{\ccShare}{{\ccicons@font\ccicons@share}}
+\newcommand{\ccRemix}{{\ccicons@font\ccicons@remix}}
+\newcommand{\ccCopy}{{\ccicons@font\ccicons@copy}}
+%    \end{macrocode}
+% If the copyright option has been set, we redefine |\textcopyright|.
+%    \begin{macrocode}
+\ifccicons@copyright\renewcommand{\textcopyright}{\ccCopy}\fi
 %    \end{macrocode}
-%
 % Finally, for each CC license we define a command that prints the CC logo
 % together with the icons applicable for that license.
 %    \begin{macrocode}
 \newcommand{\ccby}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by}}
 \newcommand{\ccbysa}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccShareAlike}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@sa}}
 \newcommand{\ccbynd}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNoDerivatives}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nd}}
 \newcommand{\ccbync}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercial}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nc}}
 \newcommand{\ccbynceu}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialEU}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nceu}}
 \newcommand{\ccbyncjp}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialJP}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@ncjp}}
 \newcommand{\ccbyncsa}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercial%
-  \kern0.1em\ccShareAlike}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nc\kern0.1em\ccicons@sa}}
 \newcommand{\ccbyncsaeu}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialEU%
-  \kern0.1em\ccShareAlike}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nceu\kern0.1em\ccicons@sa}}
 \newcommand{\ccbyncsajp}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialJP%
-  \kern0.1em\ccShareAlike}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@ncjp\kern0.1em\ccicons@sa}}
 \newcommand{\ccbyncnd}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercial%
-  \kern0.1em\ccNoDerivatives}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nc\kern0.1em\ccicons@nd}}
 \newcommand{\ccbyncndeu}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialEU%
-  \kern0.1em\ccNoDerivatives}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nceu\kern0.1em\ccicons@nd}}
 \newcommand{\ccbyncndjp}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialJP%
-  \kern0.1em\ccNoDerivatives}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@ncjp\kern0.1em\ccicons@nd}}
 \newcommand{\cczero}%
-  {\mbox{\ccLogo\kern0.1em\ccZero}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@zero}}
 \newcommand{\ccpd}%
-  {\mbox{\ccLogo\kern0.1em\ccPublicDomain}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@pd}}
 %    \end{macrocode}
+% \vspace{0pt}
+%
+% \section{Version history}
+%
+% 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.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
+%
 % \iffalse
 %</package>
 % \fi
diff --git a/Master/texmf-dist/source/latex/ccicons/ccicons.ins b/Master/texmf-dist/source/latex/ccicons/ccicons.ins
index 1d9e1a825d4..a183f915e64 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) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de>
+%% Copyright (C) 2012 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
@@ -29,7 +29,7 @@
 
 This is a generated file.
 
-Copyright (C) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de>
+Copyright (C) 2012 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
diff --git a/Master/texmf-dist/tex/latex/ccicons/ccicons.sty b/Master/texmf-dist/tex/latex/ccicons/ccicons.sty
index 683b7934f2b..2b80f5114f9 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) 2011 by Michael Ummels <michael.ummels@rwth-aachen.de>
+%% Copyright (C) 2012 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
@@ -33,58 +33,83 @@
 %% 3.0 Unported License: http://creativecommons.org/licenses/by/3.0/
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{ccicons}[2011/09/18 v1.3 LaTeX support for Creative Commons icons]
+\ProvidesPackage{ccicons}[2012/05/22 v1.4 LaTeX support for Creative Commons icons]
+\RequirePackage{xkeyval}
+\define@boolkey{ccicons.sty}[ccicons@]{copyright}[true]{}
+\newcommand{\ccicons@scale}{1.0}
+\define@key{ccicons.sty}{scale}{\renewcommand\ccicons@scale{#1}}
+\ProcessOptionsX
 \DeclareFontFamily{U}{ccicons}{}
 \DeclareFontShape{U}{ccicons}{m}{n}{
-   <-> ccicons
+   <-> s * [\ccicons@scale] ccicons
 }{}
-\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{\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{\ccicons@font}{\usefont{U}{ccicons}{m}{n}}
+\newcommand{\ccicons@logo}{\char0}
+\newcommand{\ccicons@by}{\char1}
+\newcommand{\ccicons@sa}{\char2}
+\newcommand{\ccicons@nd}{\char3}
+\newcommand{\ccicons@nc}{\char4}
+\newcommand{\ccicons@nceu}{\char5}
+\newcommand{\ccicons@ncjp}{\char6}
+\newcommand{\ccicons@pd}{\char7}
+\newcommand{\ccicons@zero}{\char8}
+\newcommand{\ccicons@sampling}{\char9}
+\newcommand{\ccicons@share}{\char10}
+\newcommand{\ccicons@remix}{\char11}
+\newcommand{\ccicons@copy}{\char12}
+\newcommand{\ccLogo}{{\ccicons@font\ccicons@logo}}
+\newcommand{\ccAttribution}{{\ccicons@font\ccicons@by}}
+\newcommand{\ccShareAlike}{{\ccicons@font\ccicons@sa}}
+\newcommand{\ccNoDerivatives}{{\ccicons@font\ccicons@nd}}
+\newcommand{\ccNonCommercial}{{\ccicons@font\ccicons@nc}}
+\newcommand{\ccNonCommercialEU}{{\ccicons@font\ccicons@nceu}}
+\newcommand{\ccNonCommercialJP}{{\ccicons@font\ccicons@ncjp}}
+\newcommand{\ccPublicDomain}{{\ccicons@font\ccicons@pd}}
+\newcommand{\ccZero}{{\ccicons@font\ccicons@zero}}
+\newcommand{\ccSampling}{{\ccicons@font\ccicons@sampling}}
+\newcommand{\ccShare}{{\ccicons@font\ccicons@share}}
+\newcommand{\ccRemix}{{\ccicons@font\ccicons@remix}}
+\newcommand{\ccCopy}{{\ccicons@font\ccicons@copy}}
+\ifccicons@copyright\renewcommand{\textcopyright}{\ccCopy}\fi
 \newcommand{\ccby}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by}}
 \newcommand{\ccbysa}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccShareAlike}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@sa}}
 \newcommand{\ccbynd}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNoDerivatives}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nd}}
 \newcommand{\ccbync}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercial}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nc}}
 \newcommand{\ccbynceu}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialEU}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nceu}}
 \newcommand{\ccbyncjp}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialJP}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@ncjp}}
 \newcommand{\ccbyncsa}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercial%
-  \kern0.1em\ccShareAlike}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nc\kern0.1em\ccicons@sa}}
 \newcommand{\ccbyncsaeu}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialEU%
-  \kern0.1em\ccShareAlike}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nceu\kern0.1em\ccicons@sa}}
 \newcommand{\ccbyncsajp}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialJP%
-  \kern0.1em\ccShareAlike}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@ncjp\kern0.1em\ccicons@sa}}
 \newcommand{\ccbyncnd}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercial%
-  \kern0.1em\ccNoDerivatives}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nc\kern0.1em\ccicons@nd}}
 \newcommand{\ccbyncndeu}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialEU%
-  \kern0.1em\ccNoDerivatives}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@nceu\kern0.1em\ccicons@nd}}
 \newcommand{\ccbyncndjp}%
-  {\mbox{\ccLogo\kern0.1em\ccAttribution\kern0.1em\ccNonCommercialJP%
-  \kern0.1em\ccNoDerivatives}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@by%
+  \kern0.1em\ccicons@ncjp\kern0.1em\ccicons@nd}}
 \newcommand{\cczero}%
-  {\mbox{\ccLogo\kern0.1em\ccZero}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@zero}}
 \newcommand{\ccpd}%
-  {\mbox{\ccLogo\kern0.1em\ccPublicDomain}}
+  {\mbox{\ccicons@font\ccicons@logo\kern0.1em\ccicons@pd}}
 %% 
 %%
 %% End of file `ccicons.sty'.