[cantarell-fonts] Work on regular #&%‰, bol d #&

[Nikolaus Waxweiler <nwaxweiler src gnome org>]

commit 432028dbb1cbb1987f3727e7ddaf8e42a708ee53
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Wed Oct 28 11:50:44 2015 +0100

    Work on regular #&%‰, bold #&

 otf/Cantarell-Bold.otf                        |  Bin 55472 -> 55472 bytes
 otf/Cantarell-Regular.otf                     |  Bin 54784 -> 54736 bytes
 src/Cantarell-Bold.sfdir/ampersand.glyph      |   53 +++++-----
 src/Cantarell-Bold.sfdir/numbersign.glyph     |   63 ++++++------
 src/Cantarell-Regular.sfdir/ampersand.glyph   |   57 ++++------
 src/Cantarell-Regular.sfdir/numbersign.glyph  |   37 +++----
 src/Cantarell-Regular.sfdir/percent.glyph     |   53 +++++-----
 src/Cantarell-Regular.sfdir/perthousand.glyph |  145 ++++++++++++-------------
 8 files changed, 196 insertions(+), 212 deletions(-)
---
diff --git a/otf/Cantarell-Bold.otf b/otf/Cantarell-Bold.otf
index b5b6d99..539937a 100644
Binary files a/otf/Cantarell-Bold.otf and b/otf/Cantarell-Bold.otf differ
diff --git a/otf/Cantarell-Regular.otf b/otf/Cantarell-Regular.otf
index a51eb0c..b8120e0 100644
Binary files a/otf/Cantarell-Regular.otf and b/otf/Cantarell-Regular.otf differ
diff --git a/src/Cantarell-Bold.sfdir/ampersand.glyph b/src/Cantarell-Bold.sfdir/ampersand.glyph
index af68dc8..d4c10e4 100644
--- a/src/Cantarell-Bold.sfdir/ampersand.glyph
+++ b/src/Cantarell-Bold.sfdir/ampersand.glyph
@@ -2,35 +2,34 @@ StartChar: ampersand
 Encoding: 38 38 91
 Width: 750
 VWidth: 1023
-Flags: HMW
+Flags: HW
 LayerCount: 3
 Fore
 SplineSet
-502 542 m 3
- 502 459 429 422 368 374 c 1
- 500 231 l 1
- 649 394 l 1
- 718 324 l 1
- 569 157 l 1
- 718 -0 l 1
- 573 -0 l 1
- 491 85 l 1
- 442 39 382 -10 264 -10 c 3
- 147 -10 68 64 68 160 c 3
- 68 277 160 339 208 376 c 1
- 166 418 121 473 121 542 c 3
- 121 641 205 706 317 706 c 3
- 421 706 502 622 502 542 c 3
-317 602 m 3
- 270 602 239 576 239 542 c 3
- 239 512 264 481 298 446 c 1
- 355 489 388 508 388 542 c 3
- 388 566 359 602 317 602 c 3
-280 303 m 1
- 228 262 182 215 182 160 c 3
- 182 114 208 91 264 91 c 3
- 322 91 382 121 419 156 c 1
- 280 303 l 1
+311 706 m 3
+ 441 706 507 617 507 534 c 3
+ 507 450 433 419 375 374 c 1
+ 500 243 l 1
+ 639 374 l 1
+ 715 297 l 1
+ 576 162 l 1
+ 730 -0 l 1
+ 571 0 l 1
+ 491 83 l 1
+ 442 37 381 -10 264 -10 c 3
+ 145 -10 63 79 63 178 c 3
+ 63 294 152 341 200 378 c 1
+ 158 420 116 465 116 534 c 3
+ 116 636 197 706 311 706 c 3
+383 534 m 3
+ 383 565 350 587 311 587 c 3
+ 266 587 244 564 244 534 c 3
+ 244 507 267 482 299 449 c 1
+ 355 491 383 504 383 534 c 3
+412 161 m 1
+ 280 297 l 1
+ 229 256 187 229 187 178 c 3
+ 187 135 210 101 264 101 c 3
+ 319 101 377 129 412 161 c 1
 EndSplineSet
-Validated: 1
 EndChar
diff --git a/src/Cantarell-Bold.sfdir/numbersign.glyph b/src/Cantarell-Bold.sfdir/numbersign.glyph
index 71ae2f1..1fc7ccc 100644
--- a/src/Cantarell-Bold.sfdir/numbersign.glyph
+++ b/src/Cantarell-Bold.sfdir/numbersign.glyph
@@ -2,44 +2,43 @@ StartChar: numbersign
 Encoding: 35 35 78
 Width: 731
 VWidth: 1023
-Flags: MW
+Flags: HMW
 LayerCount: 3
 Fore
 SplineSet
-180 686 m 1
- 298 686 l 1
- 298 522 l 1
- 433 522 l 1
- 433 686 l 1
- 551 686 l 1
- 551 522 l 1
- 706 522 l 1
- 706 409 l 1
- 551 409 l 1
- 551 277 l 1
- 706 277 l 1
- 706 164 l 1
- 551 164 l 1
+180 692 m 1
+ 298 692 l 1
+ 298 525 l 1
+ 433 525 l 1
+ 433 692 l 1
+ 551 692 l 1
+ 551 525 l 1
+ 706 525 l 1
+ 706 412 l 1
+ 551 412 l 1
+ 551 280 l 1
+ 706 280 l 1
+ 706 167 l 1
+ 551 167 l 1
  551 0 l 1
  433 0 l 1
- 433 164 l 1
- 298 164 l 1
+ 433 167 l 1
+ 298 167 l 1
  298 0 l 1
  180 0 l 1
- 180 164 l 1
- 26 164 l 1
- 26 277 l 1
- 180 277 l 1
- 180 409 l 1
- 25 409 l 1
- 25 522 l 1
- 180 522 l 1
- 180 686 l 1
-298 409 m 1
- 298 277 l 1
- 433 277 l 1
- 433 409 l 1
- 298 409 l 1
+ 180 167 l 1
+ 26 167 l 1
+ 26 280 l 1
+ 180 280 l 1
+ 180 412 l 1
+ 25 412 l 1
+ 25 525 l 1
+ 180 525 l 1
+ 180 692 l 1
+298 412 m 1
+ 298 280 l 1
+ 433 280 l 1
+ 433 412 l 1
+ 298 412 l 1
 EndSplineSet
-Validated: 1
 EndChar
diff --git a/src/Cantarell-Regular.sfdir/ampersand.glyph b/src/Cantarell-Regular.sfdir/ampersand.glyph
index 60f8951..16ec274 100644
--- a/src/Cantarell-Regular.sfdir/ampersand.glyph
+++ b/src/Cantarell-Regular.sfdir/ampersand.glyph
@@ -2,47 +2,36 @@ StartChar: ampersand
 Encoding: 38 38 91
 Width: 775
 VWidth: 1023
-Flags: MW
+Flags: HMW
 LayerCount: 4
 Fore
 SplineSet
-147 547 m 0
- 149 647 241 705 339 706 c 0
- 418 706 466 680 492 629 c 0
- 500 614 503 582 503 564 c 0
- 503 477 411 420 355 377 c 1
+147 554 m 3
+ 147 654 225 706 323 706 c 3
+ 424 706 503 653 503 554 c 3
+ 503 467 411 422 355 379 c 1
  525 196 l 1
- 683 368 l 1
- 729 322 l 1
- 571 147 l 1
+ 655 326 l 1
+ 708 273 l 1
+ 578 141 l 1
  709 0 l 1
  610 0 l 1
- 515 98 l 1
- 443 28 389 -10 266 -10 c 0
- 168 -10 94 53 94 146 c 0
- 94 217 117 264 172 315 c 0
- 188 330 207 345 228 362 c 2
- 246 376 l 1
- 208 417 l 2
- 167 461 147 504 147 547 c 0
-427 552 m 0
- 427 602 390 636 339 636 c 0
- 299 636 265 619 249 598 c 0
- 236 581 229 561 229 543 c 0
- 229 507 260 476 285 451 c 2
- 310 425 l 1
- 353 458 l 2
- 378 477 394 492 402 501 c 0
- 418 519 427 536 427 552 c 0
-175 173 m 0
- 175 106 229 62 295 62 c 0
- 347 62 396 75 453 130 c 1
- 469 146 l 1
- 293 328 l 1
- 243 287 l 2
- 194 246 175 217 175 173 c 0
+ 523 93 l 1
+ 473 48 425 -10 302 -10 c 3
+ 189 -10 98 79 98 168 c 3
+ 98 299 194 356 242 393 c 1
+ 203 431 147 493 147 554 c 3
+420 554 m 3
+ 420 604 374 633 323 633 c 3
+ 261 633 230 610 230 554 c 3
+ 230 524 264 472 305 434 c 1
+ 345 464 420 500 420 554 c 3
+181 168 m 3
+ 181 116 252 63 302 63 c 3
+ 385 63 428 112 471 148 c 1
+ 293 338 l 1
+ 239 294 181 258 181 168 c 3
 EndSplineSet
-Validated: 1
 Layer: 3
 SplineSet
 342.773 703.125 m 0
diff --git a/src/Cantarell-Regular.sfdir/numbersign.glyph b/src/Cantarell-Regular.sfdir/numbersign.glyph
index 74f4bcc..ab571a7 100644
--- a/src/Cantarell-Regular.sfdir/numbersign.glyph
+++ b/src/Cantarell-Regular.sfdir/numbersign.glyph
@@ -2,20 +2,20 @@ StartChar: numbersign
 Encoding: 35 35 78
 Width: 691
 VWidth: 1023
-Flags: MW
+Flags: HMW
 LayerCount: 4
 Fore
 SplineSet
-180 694 m 1
- 258 694 l 1
- 258 506 l 1
- 433 506 l 1
- 433 694 l 1
- 511 694 l 1
- 511 506 l 1
- 666 506 l 1
- 666 433 l 1
- 511 433 l 1
+180 692 m 1
+ 258 692 l 1
+ 258 504 l 1
+ 433 504 l 1
+ 433 692 l 1
+ 511 692 l 1
+ 511 504 l 1
+ 666 504 l 1
+ 666 431 l 1
+ 511 431 l 1
  511 261 l 1
  666 261 l 1
  666 188 l 1
@@ -30,18 +30,17 @@ SplineSet
  26 188 l 1
  26 261 l 1
  180 261 l 1
- 180 433 l 1
- 25 433 l 1
- 25 506 l 1
- 180 506 l 1
- 180 694 l 1
+ 180 431 l 1
+ 25 431 l 1
+ 25 504 l 1
+ 180 504 l 1
+ 180 692 l 1
 258 261 m 1
  433 261 l 1
- 433 433 l 1
- 258 433 l 1
+ 433 431 l 1
+ 258 431 l 1
  258 261 l 1
 EndSplineSet
-Validated: 1
 Layer: 3
 SplineSet
 24.97265625 502.9296875 m 25
diff --git a/src/Cantarell-Regular.sfdir/percent.glyph b/src/Cantarell-Regular.sfdir/percent.glyph
index 5423347..0910218 100644
--- a/src/Cantarell-Regular.sfdir/percent.glyph
+++ b/src/Cantarell-Regular.sfdir/percent.glyph
@@ -2,37 +2,36 @@ StartChar: percent
 Encoding: 37 37 86
 Width: 743
 VWidth: 1023
-Flags: MW
+Flags: HW
 LayerCount: 4
 Fore
 SplineSet
-573 48 m 0
- 640 48 661 79 661 153 c 0
- 661 217 638 260 582 260 c 0
- 519 260 493 223 493 153 c 0
- 493 84 516 48 573 48 c 0
-428 155 m 0
- 428 244 484 318 574 318 c 0
- 678 318 723 254 723 153 c 0
- 723 59 672 -10 578 -10 c 0
- 474 -10 428 50 428 155 c 0
-161 434 m 0
- 230 434 250 464 250 539 c 0
- 250 604 226 647 170 647 c 0
- 108 647 82 610 82 539 c 0
- 82 470 104 434 161 434 c 0
-20 541 m 0
- 20 631 74 706 162 706 c 0
- 267 706 315 641 315 539 c 0
- 315 444 260 376 165 376 c 0
- 63 376 20 435 20 541 c 0
-678 692 m 1
- 145 0 l 1
- 58 0 l 1
- 590 692 l 1
- 678 692 l 1
+96 538 m 3
+ 96 488 118 443 168 443 c 3
+ 218 443 240 488 240 538 c 3
+ 240 588 218 633 168 633 c 3
+ 118 633 96 588 96 538 c 3
+168 370 m 3
+ 78 370 13 448 13 538 c 3
+ 13 628 78 706 168 706 c 3
+ 258 706 323 628 323 538 c 3
+ 323 448 258 370 168 370 c 3
+503 158 m 3
+ 503 108 525 63 575 63 c 3
+ 625 63 647 108 647 158 c 3
+ 647 208 625 253 575 253 c 3
+ 525 253 503 208 503 158 c 3
+575 -10 m 3
+ 485 -10 420 68 420 158 c 3
+ 420 248 485 326 575 326 c 3
+ 665 326 730 248 730 158 c 3
+ 730 68 665 -10 575 -10 c 3
+577 692 m 1
+ 676 692 l 1
+ 147 0 l 1
+ 49 0 l 1
+ 577 692 l 1
 EndSplineSet
-Validated: 1
 Layer: 3
 SplineSet
 553.6484375 693.84765625 m 1
diff --git a/src/Cantarell-Regular.sfdir/perthousand.glyph b/src/Cantarell-Regular.sfdir/perthousand.glyph
index 115bf84..beef1ab 100644
--- a/src/Cantarell-Regular.sfdir/perthousand.glyph
+++ b/src/Cantarell-Regular.sfdir/perthousand.glyph
@@ -1,84 +1,83 @@
 StartChar: perthousand
 Encoding: 8240 8240 218
-Width: 1105
+Width: 1090
 VWidth: 1023
-Flags: MW
+Flags: HMWO
 LayerCount: 4
 Fore
 SplineSet
-935 48 m 0
- 1002 48 1023 79 1023 153 c 0
- 1023 217 1000 260 944 260 c 0
- 881 260 855 223 855 153 c 0
- 855 84 878 48 935 48 c 0
-790 155 m 0
- 790 244 846 318 936 318 c 0
- 1040 318 1085 254 1085 153 c 0
- 1085 59 1034 -10 940 -10 c 0
- 836 -10 790 50 790 155 c 0
-573 48 m 0
- 640 48 661 79 661 153 c 0
- 661 217 638 260 582 260 c 0
- 519 260 493 223 493 153 c 0
- 493 84 516 48 573 48 c 0
-428 155 m 0
- 428 244 484 318 574 318 c 0
- 678 318 723 254 723 153 c 0
- 723 59 672 -10 578 -10 c 0
- 474 -10 428 50 428 155 c 0
-161 434 m 0
- 230 434 250 464 250 539 c 0
- 250 604 226 647 170 647 c 0
- 108 647 82 610 82 539 c 0
- 82 470 104 434 161 434 c 0
-20 541 m 0
- 20 631 74 706 162 706 c 0
- 267 706 315 641 315 539 c 0
- 315 444 260 376 165 376 c 0
- 63 376 20 435 20 541 c 0
-678 692 m 1
- 145 0 l 1
- 58 0 l 1
- 590 692 l 1
- 678 692 l 1
+853 158 m 3
+ 853 108 875 63 925 63 c 3
+ 975 63 997 108 997 158 c 3
+ 997 208 975 253 925 253 c 3
+ 875 253 853 208 853 158 c 3
+925 -10 m 3
+ 835 -10 770 68 770 158 c 3
+ 770 248 835 326 925 326 c 3
+ 1015 326 1080 248 1080 158 c 3
+ 1080 68 1015 -10 925 -10 c 3
+93 538 m 3
+ 93 488 115 443 165 443 c 3
+ 215 443 237 488 237 538 c 3
+ 237 588 215 633 165 633 c 3
+ 115 633 93 588 93 538 c 3
+165 370 m 3
+ 75 370 10 448 10 538 c 3
+ 10 628 75 706 165 706 c 3
+ 255 706 320 628 320 538 c 3
+ 320 448 255 370 165 370 c 3
+500 158 m 3
+ 500 108 522 63 572 63 c 3
+ 622 63 644 108 644 158 c 3
+ 644 208 622 253 572 253 c 3
+ 522 253 500 208 500 158 c 3
+572 -10 m 3
+ 482 -10 417 68 417 158 c 3
+ 417 248 482 326 572 326 c 3
+ 662 326 727 248 727 158 c 3
+ 727 68 662 -10 572 -10 c 3
+574 692 m 1
+ 673 692 l 1
+ 144 0 l 1
+ 46 0 l 1
+ 574 692 l 1
 EndSplineSet
-Validated: 1
 Layer: 3
 SplineSet
-514.6484375 693.84765625 m 1
- 597.65625 693.84765625 l 1
- 124.51171875 0 l 1
- 41.50390625 0 l 1
- 514.6484375 693.84765625 l 1
-772.4609375 304.19921875 m 4
- 813.4765625 304.19921875 883.7890625 285.64453125 883.7890625 171.38671875 c 4
- 883.7890625 82.51953125 833.984375 32.2265625 771.97265625 32.2265625 c 4
- 715.8203125 32.2265625 661.1328125 64.453125 661.1328125 171.875 c 4
- 661.1328125 261.71875 716.796875 304.19921875 772.4609375 304.19921875 c 4
-771.97265625 257.32421875 m 4
- 743.1640625 256.8359375 708.49609375 240.234375 708.49609375 172.36328125 c 4
- 708.49609375 91.796875 747.0703125 77.63671875 772.4609375 77.63671875 c 4
- 799.8046875 77.63671875 835.938476562 93.75 835.938476562 169.921875 c 4
- 835.938476562 244.140625 798.33984375 257.32421875 771.97265625 257.32421875 c 4
-476.07421875 304.19921875 m 0
- 517.08984375 304.19921875 587.40234375 285.64453125 587.40234375 171.38671875 c 0
- 587.40234375 82.51953125 537.59765625 32.2265625 475.5859375 32.2265625 c 0
- 419.43359375 32.2265625 364.74609375 64.453125 364.74609375 171.875 c 0
- 364.74609375 261.71875 420.41015625 304.19921875 476.07421875 304.19921875 c 0
-475.5859375 257.32421875 m 0
- 446.77734375 256.8359375 412.109375 240.234375 412.109375 172.36328125 c 0
- 412.109375 91.796875 450.68359375 77.63671875 476.07421875 77.63671875 c 0
- 503.41796875 77.63671875 539.55078125 93.75 539.55078125 169.921875 c 0
- 539.55078125 244.140625 501.953125 257.32421875 475.5859375 257.32421875 c 0
-159.66796875 665.52734375 m 0
- 200.68359375 665.52734375 270.5078125 647.4609375 270.5078125 533.203125 c 0
- 270.5078125 444.3359375 221.19140625 393.5546875 159.1796875 393.5546875 c 0
- 103.02734375 393.5546875 47.8515625 426.26953125 47.8515625 533.69140625 c 0
- 47.8515625 623.53515625 104.00390625 665.52734375 159.66796875 665.52734375 c 0
-159.1796875 619.140625 m 0
- 130.37109375 618.65234375 95.703125 602.05078125 95.703125 534.1796875 c 0
- 95.703125 453.61328125 134.27734375 439.453125 159.66796875 439.453125 c 0
- 187.01171875 439.453125 223.14453125 455.56640625 223.14453125 531.73828125 c 0
- 223.14453125 605.95703125 185.546875 619.140625 159.1796875 619.140625 c 0
+511.6484375 693.84765625 m 1
+ 594.65625 693.84765625 l 1
+ 121.51171875 0 l 1
+ 38.50390625 0 l 1
+ 511.6484375 693.84765625 l 1
+769.4609375 304.19921875 m 4
+ 810.4765625 304.19921875 880.7890625 285.64453125 880.7890625 171.38671875 c 4
+ 880.7890625 82.51953125 830.984375 32.2265625 768.97265625 32.2265625 c 4
+ 712.8203125 32.2265625 658.1328125 64.453125 658.1328125 171.875 c 4
+ 658.1328125 261.71875 713.796875 304.19921875 769.4609375 304.19921875 c 4
+768.97265625 257.32421875 m 4
+ 740.1640625 256.8359375 705.49609375 240.234375 705.49609375 172.36328125 c 4
+ 705.49609375 91.796875 744.0703125 77.63671875 769.4609375 77.63671875 c 4
+ 796.8046875 77.63671875 832.938476562 93.75 832.938476562 169.921875 c 4
+ 832.938476562 244.140625 795.33984375 257.32421875 768.97265625 257.32421875 c 4
+473.07421875 304.19921875 m 0
+ 514.08984375 304.19921875 584.40234375 285.64453125 584.40234375 171.38671875 c 0
+ 584.40234375 82.51953125 534.59765625 32.2265625 472.5859375 32.2265625 c 0
+ 416.43359375 32.2265625 361.74609375 64.453125 361.74609375 171.875 c 0
+ 361.74609375 261.71875 417.41015625 304.19921875 473.07421875 304.19921875 c 0
+472.5859375 257.32421875 m 0
+ 443.77734375 256.8359375 409.109375 240.234375 409.109375 172.36328125 c 0
+ 409.109375 91.796875 447.68359375 77.63671875 473.07421875 77.63671875 c 0
+ 500.41796875 77.63671875 536.55078125 93.75 536.55078125 169.921875 c 0
+ 536.55078125 244.140625 498.953125 257.32421875 472.5859375 257.32421875 c 0
+156.66796875 665.52734375 m 0
+ 197.68359375 665.52734375 267.5078125 647.4609375 267.5078125 533.203125 c 0
+ 267.5078125 444.3359375 218.19140625 393.5546875 156.1796875 393.5546875 c 0
+ 100.02734375 393.5546875 44.8515625 426.26953125 44.8515625 533.69140625 c 0
+ 44.8515625 623.53515625 101.00390625 665.52734375 156.66796875 665.52734375 c 0
+156.1796875 619.140625 m 0
+ 127.37109375 618.65234375 92.703125 602.05078125 92.703125 534.1796875 c 0
+ 92.703125 453.61328125 131.27734375 439.453125 156.66796875 439.453125 c 0
+ 184.01171875 439.453125 220.14453125 455.56640625 220.14453125 531.73828125 c 0
+ 220.14453125 605.95703125 182.546875 619.140625 156.1796875 619.140625 c 0
 EndSplineSet
 EndChar