diff --git a/css/font-combodo/combodo-webfont.ttf b/css/font-combodo/combodo-webfont.ttf new file mode 100644 index 000000000..82b3b6b3e Binary files /dev/null and b/css/font-combodo/combodo-webfont.ttf differ diff --git a/css/font-combodo/combodo-webfont.woff b/css/font-combodo/combodo-webfont.woff index 9d3d05a51..3b0ebac0b 100644 Binary files a/css/font-combodo/combodo-webfont.woff and b/css/font-combodo/combodo-webfont.woff differ diff --git a/css/font-combodo/combodo-webfont.woff2 b/css/font-combodo/combodo-webfont.woff2 index ee820877c..51e43f425 100644 Binary files a/css/font-combodo/combodo-webfont.woff2 and b/css/font-combodo/combodo-webfont.woff2 differ diff --git a/css/font-combodo/combodo.sfd b/css/font-combodo/combodo.sfd index e222b4f1f..c4b500510 100644 --- a/css/font-combodo/combodo.sfd +++ b/css/font-combodo/combodo.sfd @@ -21,7 +21,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1463745065 -ModificationTime: 1464178421 +ModificationTime: 1505226311 OS2TypoAscent: 0 OS2TypoAOffset: 1 OS2TypoDescent: 0 @@ -47,7 +47,7 @@ FitToEm: 0 WinInfo: 0 31 10 BeginPrivate: 0 EndPrivate -BeginChars: 256 8 +BeginChars: 256 10 StartChar: zero Encoding: 48 48 0 @@ -210,7 +210,7 @@ StartChar: three Encoding: 51 51 3 Width: 1022 VWidth: 0 -Flags: MO +Flags: M LayerCount: 3 Fore SplineSet @@ -261,11 +261,13 @@ StartChar: C Encoding: 67 67 4 Width: 1080 VWidth: 0 -Flags: HW +Flags: W +HStem: -112 36<398.67 444.211> 97 36<463.993 575.071> 116 37<411.524 459.906> 250 37<334.123 402.464> 335 37<749.246 821.773> 387 37<836.543 929.295> 396 37<873.093 933.545> 442 37<475 482 739.647 795.664> 621 37<286.042 389.13> 650 37<510.192 579.789> +VStem: 53 37<216.048 298> 218 37<457.867 579.651> 272 36<60.6299 128.446> 439 37<479.452 577.67> 451 37<-73.2171 5.85426> 472 37<568.829 649.107> 553 37<359.872 417.574> 651 38<-34.3438 62.6665> 718 38<8.82031 164.606> 934 38<341.569 396> LayerCount: 3 Fore SplineSet -641 -116 m 4x9b20 +641 -116 m 4x9b39f0 637 -116 633 -115 630 -113 c 4 624 -110 616 -102 616 -88 c 4 616 -84 617 -80 618 -75 c 4 @@ -275,14 +277,14 @@ SplineSet 651 31 641 52 624 75 c 4 609 94 595 108 586 115 c 5 562 107 523 97 500 97 c 6 - 499 97 l 6xdb20 + 499 97 l 6xdb39f0 479 97 468 105 460 111 c 4 457 114 455 115 453 116 c 4 450 116 438 112 423 104 c 4 412 98 405 94 401 90 c 5 411 80 436 61 448 52 c 4 460 43 468 37 473 32 c 4 - 485 20 488 -4 488 -20 c 4 + 485 20 488 -4 488 -20 c 4xb93af0 488 -27 487 -33 487 -36 c 4 485 -55 477 -90 452 -105 c 4 444 -110 435 -112 426 -112 c 4 @@ -321,10 +323,10 @@ SplineSet 219 484 218 493 218 504 c 4 218 526 222 550 231 575 c 4 237 593 255 636 284 651 c 4 - 293 656 305 658 320 658 c 4xb9a0 + 293 656 305 658 320 658 c 4 342 658 367 653 389 644 c 4 416 633 437 617 452 597 c 4 - 472 571 476 537 476 508 c 4 + 472 571 476 537 476 508 c 4xb9bcf0 476 497 476 487 475 479 c 5 482 479 l 5 505 499 l 5 @@ -352,7 +354,7 @@ SplineSet 766 473 767 473 768 473 c 4 787 473 808 460 831 446 c 4 845 437 865 424 873 424 c 4 - 874 424 l 6x9d60 + 874 424 l 6x9d79f0 875 424 880 425 884 426 c 4 897 429 915 433 930 433 c 4 956 433 965 421 969 412 c 4 @@ -362,7 +364,7 @@ SplineSet 916 289 911 288 905 288 c 4 888 288 863 299 835 311 c 4 810 322 780 335 766 335 c 4 - 765 335 764 335 764 335 c 4 + 764 335 l 4 763 335 757 331 748 315 c 4 741 301 734 283 727 264 c 4 721 248 715 231 708 216 c 5 @@ -370,7 +372,7 @@ SplineSet 756 69 755 58 753 47 c 4 748 19 727 -22 708 -51 c 4 697 -68 687 -82 677 -93 c 4 - 663 -109 652 -116 641 -116 c 4x9b20 + 663 -109 652 -116 641 -116 c 4x9b39f0 308 85 m 5 308 83 312 72 340 46 c 4 357 30 374 18 374 18 c 6 @@ -387,14 +389,14 @@ SplineSet 383 55 362 72 362 90 c 4 362 92 362 93 362 95 c 4 363 100 366 113 402 134 c 4 - 410 138 435 153 453 153 c 4xb9a0 + 410 138 435 153 453 153 c 4xb9baf0 455 153 458 152 460 152 c 4 470 150 476 145 482 141 c 4 488 136 491 133 499 133 c 6 - 500 133 l 6xd920 + 500 133 l 6xd93af0 521 133 562 145 581 153 c 6 589 156 l 5 - 596 153 l 6xb920 + 596 153 l 6xb93af0 612 146 637 119 654 97 c 4 670 75 689 44 689 16 c 4 689 13 689 10 688 7 c 4 @@ -413,7 +415,7 @@ SplineSet 868 337 893 326 903 325 c 5 907 329 916 340 924 359 c 4 932 377 934 390 934 396 c 4 - 933 396 932 396 930 396 c 4xdb20 + 933 396 932 396 930 396 c 4xdb3af0 919 396 902 392 892 390 c 4 886 389 881 388 878 388 c 4 876 388 875 387 873 387 c 4 @@ -433,9 +435,9 @@ SplineSet 629 559 619 566 619 566 c 6 615 569 l 5 580 633 l 5 - 566 639 539 650 520 650 c 4x9d60 + 566 639 539 650 520 650 c 4 514 650 512 650 511 649 c 4 - 510 648 509 644 509 637 c 4 + 510 648 509 644 509 637 c 4x9d79f0 509 629 510 618 514 602 c 4 517 589 520 577 523 569 c 5 562 561 l 5 @@ -446,7 +448,7 @@ SplineSet 435 465 l 6 437 474 439 491 439 510 c 4 439 533 436 558 423 575 c 4 - 400 605 354 621 320 621 c 4x99a0 + 400 605 354 621 320 621 c 4x99bcf0 310 621 304 619 301 618 c 4 281 608 255 548 255 504 c 4 255 497 255 490 257 484 c 4 @@ -475,22 +477,25 @@ SplineSet 424 204 390 196 377 186 c 4 330 149 310 105 308 85 c 5 EndSplineSet +Validated: 1 EndChar StartChar: I Encoding: 73 73 5 Width: 1024 VWidth: 0 -Flags: HW +Flags: W +HStem: -154 166<226 365 659 798> 126 26<498.267 525.733> 151 131<288 343 681 735> 313 132<288 343 681 735> 330 32<424.389 599.754> 443 26<498.267 525.733> 584 184<226 365 659 798> +VStem: 51 175<12 151 445 584> 365 132<74 126 469 521> 366 31<282 313> 527 132<74 126 469 521> 627 31<282 313> 798 175<12 151 445 584> LayerCount: 3 Fore SplineSet -51 -154 m 1 +51 -154 m 1x8308 51 768 l 1 973 768 l 1 973 -154 l 1 - 51 -154 l 1 -497 469 m 2 + 51 -154 l 1x8308 +497 469 m 1x87a8 502 469 507 470 512 470 c 0 517 470 522 469 527 469 c 1 527 521 l 1 @@ -498,35 +503,34 @@ SplineSet 512 702 l 1 414 604 l 1 497 521 l 1 - 497 469 l 1 - 497 469 l 2 + 497 469 l 1x87a8 653 417 m 1 681 445 l 1 - 798 445 l 1 + 798 445 l 1x9328 798 584 l 1 659 584 l 1 659 467 l 1 633 440 l 1 643 433 649 425 653 417 c 1 -366 282 m 1 +366 282 m 1xb348 366 313 l 1 288 313 l 1 206 396 l 1 108 298 l 1 206 200 l 1 288 282 l 1 - 366 282 l 1 + 366 282 l 1xb348 343 445 m 1 371 417 l 1 375 425 381 433 391 440 c 1 365 467 l 1 - 365 584 l 1 + 365 584 l 1x9388 226 584 l 1 226 445 l 1 343 445 l 1 371 178 m 1 343 151 l 1 - 226 151 l 1 + 226 151 l 1xa388 226 12 l 1 365 12 l 1 365 129 l 1 @@ -535,7 +539,7 @@ SplineSet 818 396 m 1 735 313 l 1 658 313 l 1 - 658 282 l 1 + 658 282 l 1xb318 735 282 l 1 818 200 l 1 916 298 l 1 @@ -543,12 +547,12 @@ SplineSet 653 178 m 1 649 170 643 162 633 155 c 1 659 129 l 1 - 659 12 l 1 + 659 12 l 1xa328 798 12 l 1 798 151 l 1 681 151 l 1 653 178 l 1 -527 126 m 1 +527 126 m 1xc3a8 522 126 517 126 512 126 c 0 507 126 502 126 497 126 c 1 497 74 l 1 @@ -556,8 +560,7 @@ SplineSet 512 -106 l 1 610 -8 l 1 527 74 l 1 - 527 126 l 1 - 527 126 l 1 + 527 126 l 1xc3a8 610 348 m 0 584 337 549 330 512 330 c 0 475 330 441 337 414 348 c 0 @@ -567,9 +570,9 @@ SplineSet 449 157 479 152 512 152 c 0 545 152 575 157 598 167 c 0 616 174 627 184 627 192 c 2 - 627 356 l 1 + 627 356 l 1xcb58 622 353 616 351 610 348 c 0 -512 443 m 1 +512 443 m 1x8f58 479 443 449 438 426 428 c 0 408 421 397 410 397 402 c 0 397 394 408 384 426 377 c 0 @@ -577,8 +580,7 @@ SplineSet 545 362 575 367 598 377 c 0 616 384 627 394 627 402 c 0 627 410 616 421 598 428 c 0 - 575 438 545 443 512 443 c 1 - 512 443 l 1 + 575 438 545 443 512 443 c 1x8f58 EndSplineSet Validated: 5 EndChar @@ -587,7 +589,8 @@ StartChar: four Encoding: 52 52 6 Width: 1024 VWidth: 0 -Flags: H +HStem: -2 41<389.544 635.489> 292 109<316 441 550 675> 639 41<389.544 636.396> +VStem: 117 41<241.556 436.857> 441 109<167 292 401 525> 868 41<249.643 435.223> LayerCount: 3 Fore SplineSet @@ -607,7 +610,6 @@ SplineSet 909 288 892 238 861 189 c 0 835 149 801 111 757 77 c 1 801 -67 l 1 - 801 -67 l 1 649 63 m 1 733 17 l 1 710 93 l 1 @@ -618,7 +620,6 @@ SplineSet 158 174 317 39 513 39 c 0 552 39 592 49 634 59 c 2 649 63 l 1 - 649 63 l 1 675 306 m 1 675 298 667 292 657 292 c 2 550 292 l 1 @@ -640,7 +641,6 @@ SplineSet 657 401 l 2 667 401 675 394 675 386 c 2 675 306 l 1 - 675 306 l 1 EndSplineSet Validated: 5 EndChar @@ -649,15 +649,17 @@ StartChar: D Encoding: 68 68 7 Width: 1080 VWidth: 0 -Flags: HW +Flags: W +HStem: 198 131<79.9424 131.341> 306 98<835.102 921.871> 353 100<731.982 810.871> +VStem: 238 219<460.138 583.719> 292 88<67.6511 114.863> 369 100<-72.2559 6.9753> 667 66<3.74069 76.8123> LayerCount: 3 Fore SplineSet -469 -14 m 4 +469 -14 m 4x26 469 -45 459 -89 425 -89 c 4 - 397 -89 372 -53 369 -41 c 4 + 397 -89 372 -53 369 -41 c 4x26 365 -27 363 7 363 7 c 5 - 363 7 292 63 292 88 c 4 + 363 7 292 63 292 88 c 4x2a 292 113 317 164 366 202 c 4 388 219 439 225 439 225 c 5 439 225 414 269 373 269 c 4 @@ -669,7 +671,7 @@ SplineSet 119 206 108 198 97 198 c 4 78 198 76 234 76 261 c 4 76 268 76 274 76 279 c 4 - 76 288 76 295 76 295 c 6 + 76 295 l 6 76 295 82 320 96 328 c 4 97 328 98 329 99 329 c 4 121 329 217 268 217 268 c 6 @@ -696,12 +698,12 @@ SplineSet 570 401 569 394 569 388 c 4 569 355 614 330 614 330 c 5 614 330 646 364 662 384 c 4 - 678 404 734 453 763 453 c 4 + 678 404 734 453 763 453 c 4xb2 790 453 841 404 867 404 c 4 878 404 902 413 924 413 c 4 938 413 945 409 945 396 c 4 945 371 922 318 905 307 c 4 - 903 306 902 306 899 306 c 4 + 903 306 902 306 899 306 c 4x52 872 306 795 353 761 353 c 4 758 353 756 353 754 352 c 4 723 342 708 263 682 213 c 5 @@ -714,11 +716,168 @@ SplineSet 667 64 605 129 586 138 c 5 565 130 522 118 499 118 c 4 475 118 470 137 453 137 c 4 - 437 137 380 108 380 93 c 4 + 437 137 380 108 380 93 c 4x2a 380 77 446 36 460 23 c 4 - 465 18 469 3 469 -14 c 4 + 465 18 469 3 469 -14 c 4x26 EndSplineSet Validated: 1 EndChar + +StartChar: E +Encoding: 69 69 8 +Width: 1024 +VWidth: 0 +HStem: -65 248<767.992 903.557> 62.9598 56.9516<226.56 349.224 705.189 710> 143 26.9554<256.859 324.845> 192.776 27.2245<289.957 314.952> 295.071 27.9295<269.575 354.789> 344 66<376.038 439.962> 433 25<407.015 431.988> 469 248<767.951 904.873> +VStem: 66.5097 115.469<193.203 298.14> 204 32.9583<187.285 267.499> 257.966 57.0345<194.835 224.243> 335.831 30.8205<177.895 239.59> 388.713 44.4108<157.773 270.37> 407 25<433.012 457.985> 442 55.4336<365.791 447.874> 711 249<-8.06335 62 583 662.557> +LayerCount: 3 +Fore +SplineSet +279 573 m 0x7ffb + 292 573 313 570 343 563 c 0 + 462 535 489 420 496 389 c 0 + 496.963 384.737 497.434 380.795 497.434 377.167 c 0 + 497.434 354.414 478.912 344 447 344 c 0 + 422.333 344 394.111 344.889 359.074 344.889 c 0 + 341.556 344.889 322.333 344.667 301 344 c 0 + 237 342 192 300 183 241 c 0 + 182.31 236.477 181.979 231.948 181.979 227.44 c 0 + 181.979 173.142 230.063 121.847 279 120 c 0 + 280.57 119.941 282.134 119.911 283.69 119.911 c 0 + 334.636 119.911 377.296 151.452 387 199 c 0 + 388.159 204.678 388.713 210.303 388.713 215.813 c 0 + 388.713 257.852 356.437 293.232 314 295 c 0 + 312.865 295.047 311.742 295.071 310.63 295.071 c 0 + 264.267 295.071 236.958 255.02 236.958 229.128 c 0 + 236.958 206.914 253.918 170.972 286 170 c 0 + 287.107 169.97 288.186 169.955 289.238 169.955 c 0 + 323.358 169.955 329.15 185.419 334 199 c 0 + 335.206 202.378 335.831 206.221 335.831 210.207 c 0 + 335.831 222.743 329.657 236.689 316 242 c 0 + 298 249 291 238 290 234 c 0 + 289 228 294 220 299 220 c 0 + 306 220 316 220 315 206 c 0 + 314.143 195.714 302.265 192.776 292.592 192.776 c 0 + 290.98 192.776 289.429 192.857 288 193 c 0 + 278.231 193.977 257.966 202.588 257.966 228.155 c 0 + 257.966 248.46 275.443 271.256 306.289 271.256 c 0 + 308.143 271.256 310.047 271.172 312 271 c 0 + 351.28 267.429 366.651 246.325 366.651 219.783 c 0 + 366.651 216.594 366.429 213.326 366 210 c 0 + 362 179 343 143 284 143 c 0 + 225 143 204 192 204 229 c 0 + 204 266 232 322 318 323 c 0 + 318.502 323.006 319.002 323.009 319.501 323.009 c 0 + 394.354 323.009 433.124 257.543 433.124 205.254 c 0 + 433.124 198.198 432.418 191.383 431 185 c 0 + 420.148 134.686 398.59 62.9598 273.187 62.9598 c 0 + 271.478 62.9598 269.749 62.9731 268 63 c 0 + 134.539 65.8599 66.5097 196.855 66.5097 295.718 c 0 + 66.5097 300.562 66.673 305.329 67 310 c 0 + 74 410 112 447 146 480 c 0 + 204.987 537.114 264.85 531.109 264.85 543.245 c 0 + 264.85 544.071 264.573 544.981 264 546 c 0 + 260.913 551.732 257.827 557.659 257.827 562.495 c 0 + 257.827 568.625 262.788 573 279 573 c 0x7ffb +408 478 m 0 + 389 478 374 463 374 444 c 0 + 374 425 389 410 408 410 c 0 + 427 410 442 425 442 444 c 0 + 442 463 427 478 408 478 c 0 +835 717 m 0 + 904 717 960 662 960 593 c 0 + 960 524 904 469 835 469 c 0 + 798 469 751 495 731 526 c 1 + 515 456 l 1 + 503 483 491 498 481 511 c 1 + 712 583 l 2 + 712 586 711 590 711 593 c 0 + 711 662 766 717 835 717 c 0 +462 207 m 1 + 727 121 l 1 + 747 155 795 183 834 183 c 0 + 903 183 958 128 958 59 c 0 + 958 -10 903 -65 834 -65 c 0x9ff3 + 765 -65 710 -10 710 59 c 0 + 710 60 710 61 710 62 c 2 + 456 143 l 1 + 458.679 159.077 462.157 171.165 462.157 197.076 c 0 + 462.157 200.176 462.107 203.474 462 207 c 1 +407 445 m 0x1ff7 + 407 453 412 458 420 458 c 0 + 428 458 432 453 432 445 c 0 + 432 437 428 433 420 433 c 0 + 412 433 407 437 407 445 c 0x1ff7 +EndSplineSet +Validated: 1 +EndChar + +StartChar: F +Encoding: 70 70 9 +Width: 1024 +VWidth: 0 +HStem: -36.1033 86.8755<437.955 591.193> 87 38.8873<470.027 570.5> 162.662 41.3384<517.914 556.039> 240.753 41.694<518.555 577.701> 317.182 42.8413<482.813 613.091> 392 102<654.807 741.193> 528 39<697.004 734.996> +VStem: 177.33 176.243<193.178 324.666> 387 49.9722<156.73 272.373> 468.976 87.0743<171.971 203.974> 588.39 46.5555<139.223 231.693> 668.55 67.8912<122.946 266.217> 697 38<528.004 566.995> 750 85.251<426.532 559.5> +LayerCount: 3 +Fore +SplineSet +502 742 m 0xfff4 + 522 742 553 738 599 727 c 0 + 780 684 822 509 833 462 c 0 + 834.514 455.532 835.251 449.519 835.251 443.958 c 0 + 835.251 409.105 806.294 392 758 392 c 0 + 720.667 392 677.556 393.778 623.926 393.778 c 0 + 597.111 393.778 567.667 393.333 535 392 c 0 + 437 388 368 325 355 235 c 0 + 354.037 228.333 353.573 221.665 353.573 215.033 c 0 + 353.573 132.137 426.001 54.7037 501 51 c 0 + 504.087 50.8476 507.156 50.7721 510.205 50.7721 c 0 + 587.18 50.7721 651.572 98.8579 666 171 c 0 + 667.724 179.622 668.55 188.138 668.55 196.465 c 0 + 668.55 260.572 619.608 313.46 555 317 c 0 + 552.774 317.122 550.576 317.182 548.404 317.182 c 0 + 478.888 317.182 436.972 256.455 436.972 218.084 c 0 + 436.972 183.832 462.927 126.981 512 126 c 0 + 514.156 125.924 516.244 125.887 518.266 125.887 c 0 + 569.68 125.887 578.303 149.832 586 171 c 0 + 587.574 175.948 588.39 181.452 588.39 187.137 c 0 + 588.39 206.731 578.703 228.474 557 237 c 0 + 550.193 239.674 544.509 240.753 539.776 240.753 c 0 + 525.038 240.753 519.514 230.298 518 225 c 0 + 516 216 524 204 532 204 c 0 + 542.626 204 556.051 202.134 556.051 183.078 c 0 + 556.051 165.778 540.156 162.662 524.591 162.662 c 0 + 521.25 162.662 517.986 162.813 515 163 c 0 + 499.253 163.984 468.976 177.561 468.976 217.076 c 0 + 468.976 246.799 496.867 282.447 542.995 282.447 c 0 + 545.923 282.447 548.925 282.301 552 282 c 0 + 611.133 276.624 634.945 243.153 634.945 202.443 c 0 + 634.945 197.716 634.624 192.89 634 188 c 0 + 628 141 598 87 508 87 c 0 + 418 87 387 162 387 218 c 0 + 387 274 430 358 561 360 c 0 + 562.005 360.015 563.006 360.023 564.003 360.023 c 0 + 677.198 360.023 736.441 261.596 736.441 181.834 c 0 + 736.441 170.759 735.299 160.043 733 150 c 0 + 716.294 74.3313 683.171 -36.1033 494.124 -36.1033 c 0 + 490.798 -36.1033 487.423 -36.0692 484 -36 c 0 + 279.554 -32.1786 177.33 169.7 177.33 321.128 c 0 + 177.33 328.204 177.554 335.17 178 342 c 0 + 188 495 246 549 298 600 c 0 + 387.796 686.99 479.342 676.863 479.342 695.65 c 0 + 479.342 696.948 478.905 698.384 478 700 c 0 + 473.305 708.537 468.974 717.439 468.974 724.838 c 0 + 468.974 734.773 476.782 742 502 742 c 0xfff4 +698 597 m 0 + 669 597 646 574 646 545 c 0 + 646 516 669 494 698 494 c 0 + 727 494 750 516 750 545 c 0 + 750 574 727 597 698 597 c 0 +697 547 m 0xffec + 697 560 703 567 716 567 c 0 + 729 567 735 560 735 547 c 0 + 735 534 729 528 716 528 c 0 + 703 528 697 534 697 547 c 0xffec +EndSplineSet +EndChar EndChars EndSplineFont diff --git a/css/font-combodo/combodo.ttf b/css/font-combodo/combodo.ttf deleted file mode 100644 index cb5a5e746..000000000 Binary files a/css/font-combodo/combodo.ttf and /dev/null differ diff --git a/css/font-combodo/glyphs/E.svg b/css/font-combodo/glyphs/E.svg new file mode 100755 index 000000000..63aef90c9 --- /dev/null +++ b/css/font-combodo/glyphs/E.svg @@ -0,0 +1,50 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/css/font-combodo/glyphs/F.svg b/css/font-combodo/glyphs/F.svg new file mode 100755 index 000000000..924d616a2 --- /dev/null +++ b/css/font-combodo/glyphs/F.svg @@ -0,0 +1,41 @@ + + + + + + + image/svg+xml + + + + + + + + + +