[cantarell-fonts/redo-metrics] regular and bold ~. Addresses bug #642396

[Jakub Steiner <jimmac src gnome org>]

commit 5d1464ddd43f2b4710b93675fe0788bcc6838d8c
Author: Jakub Steiner <jimmac gmail com>
Date:   Sun Feb 27 21:46:11 2011 +0100

    regular and bold ~. Addresses bug #642396

 otf/Cantarell-Bold.otf    |  Bin 50996 -> 50996 bytes
 otf/Cantarell-Regular.otf |  Bin 46660 -> 46872 bytes
 src/Cantarell-Bold.sfd    |   46 ++++++++++++++++----------------
 src/Cantarell-Regular.sfd |   65 +++++++++++++++++++++-----------------------
 4 files changed, 54 insertions(+), 57 deletions(-)
---
diff --git a/otf/Cantarell-Bold.otf b/otf/Cantarell-Bold.otf
index b553bfb..7693be3 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 a586123..969f115 100644
Binary files a/otf/Cantarell-Regular.otf and b/otf/Cantarell-Regular.otf differ
diff --git a/src/Cantarell-Bold.sfd b/src/Cantarell-Bold.sfd
index 8ac0fa8..f6d3337 100644
--- a/src/Cantarell-Bold.sfd
+++ b/src/Cantarell-Bold.sfd
@@ -22,7 +22,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1236980653
-ModificationTime: 1298838697
+ModificationTime: 1298839553
 PfmFamily: 33
 TTFWeight: 700
 TTFWidth: 5
@@ -52,7 +52,7 @@ NameList: Adobe Glyph List
 DisplaySize: -96
 AntiAlias: 1
 FitToEm: 1
-WinInfo: 70 10 7
+WinInfo: 110 10 7
 Grid
 -1000 1056.64 m 0
  2000 1056.64 l 0
@@ -2623,27 +2623,27 @@ EndChar
 
 StartChar: asciitilde
 Encoding: 126 126 88
-Width: 604
-VWidth: 1023
-Flags: W
-HStem: 585 99<356.29 403.131> 674 99<215.663 262.953>
-VStem: 108 93<595.021 667.81> 415 92<687.755 763.472>
-LayerCount: 3
-Fore
-SplineSet
-386 684 m 0xb0
- 404 684 409 723 415 758 c 2
- 418 777 l 1
- 511 763 l 1
- 507 742 l 1
- 496 687 486 585 389 585 c 1xb0
- 299 589 259 674 233 674 c 0
- 215 674 210 636 204 603 c 2
- 201 583 l 1
- 108 596 l 1
- 112 617 l 2
- 123 672 133 773 230 773 c 1x70
- 320 769 361 684 386 684 c 0xb0
+Width: 583
+VWidth: 1023
+Flags: HWO
+HStem: 284 99<338.29 385.131> 373 99<197.663 244.953>
+VStem: 90 93<294.022 366.81> 397 92<386.755 462.472>
+LayerCount: 3
+Fore
+SplineSet
+368 383 m 0xb0
+ 386 383 391 422 397 457 c 2
+ 400 476 l 1
+ 493 462 l 1
+ 489 441 l 1
+ 478 386 468 284 371 284 c 1xb0
+ 281 288 241 373 215 373 c 0
+ 197 373 192 335 186 302 c 2
+ 183 282 l 1
+ 90 295 l 1
+ 94 316 l 2
+ 105 371 115 472 212 472 c 1x70
+ 302 468 343 383 368 383 c 0xb0
 EndSplineSet
 EndChar
 
diff --git a/src/Cantarell-Regular.sfd b/src/Cantarell-Regular.sfd
index 3387bed..918640d 100644
--- a/src/Cantarell-Regular.sfd
+++ b/src/Cantarell-Regular.sfd
@@ -23,7 +23,7 @@ OS2Version: 0
 OS2_WeightWidthSlopeOnly: 0
 OS2_UseTypoMetrics: 1
 CreationTime: 1236980653
-ModificationTime: 1298834445
+ModificationTime: 1298839510
 PfmFamily: 33
 TTFWeight: 500
 TTFWidth: 5
@@ -5490,36 +5490,33 @@ EndChar
 
 StartChar: asciitilde
 Encoding: 126 126 88
-Width: 683
+Width: 515
 VWidth: 1023
-Flags: W
-HStem: 604 149
+Flags: WO
+HStem: 281 149
 LayerCount: 4
 Fore
 SplineSet
-477 753 m 1
- 529 745 l 1
- 521 704 l 2
- 515 673 507 652 498 640 c 0
- 471 605 436 596 393 613 c 0
- 375 620 359 632 343 646 c 1
- 326 661 l 2
- 320 667 315 673 310 677 c 0
- 290 695 272 698 255 686 c 0
- 250 682 245 676 242 669 c 0
- 239 662 235 649 231 629 c 2
- 227 604 l 1
- 174 612 l 1
- 182 654 l 2
- 188 685 196 706 205 718 c 0
- 232 753 268 762 311 745 c 0
- 329 738 344 726 360 712 c 1
- 377 696 l 2
- 383 690 388 685 393 681 c 0
- 413 663 431 660 448 672 c 0
- 453 676 458 681 461 688 c 0
- 464 695 468 708 472 728 c 2
- 477 753 l 1
+383 430 m 5
+ 435 422 l 5
+ 427 381 l 6
+ 421 350 413 329 404 317 c 4
+ 377 282 342 273 299 290 c 4
+ 281 297 265 309 249 323 c 6
+ 232 338 l 6
+ 226 344 221 350 216 354 c 4
+ 188.794 378.485 159.623 373.121 148 346 c 4
+ 145 339 141 326 137 306 c 6
+ 133 281 l 5
+ 80 289 l 5
+ 88 331 l 6
+ 94 362 102 383 111 395 c 4
+ 138 430 174 439 217 422 c 4
+ 235 415 250 403 266 389 c 6
+ 283 373 l 6
+ 301.708 354.292 328.166 330.764 354 349 c 5
+ 369.911 361.729 371.793 373.966 378 405 c 6
+ 383 430 l 5
 EndSplineSet
 Layer: 3
 SplineSet
@@ -8143,7 +8140,7 @@ StartChar: Atilde
 Encoding: 195 195 144
 Width: 675
 VWidth: 0
-Flags: W
+Flags: HW
 HStem: 0 21<63 146.931 560.069 651> 202 72<235 471> 674 20<302.882 411.118> 768 149
 LayerCount: 4
 Fore
@@ -8485,7 +8482,7 @@ StartChar: Ntilde
 Encoding: 209 209 157
 Width: 810
 VWidth: 0
-Flags: W
+Flags: HW
 HStem: 0 21<142 225 590.01 708> 674 20<142 260.012 625 708> 768 149
 VStem: 142 83<0 582> 625 83<113 694>
 LayerCount: 4
@@ -8549,7 +8546,7 @@ StartChar: Otilde
 Encoding: 213 213 161
 Width: 828
 VWidth: 0
-Flags: W
+Flags: HW
 HStem: -8 74<332.31 525.429> 626 74<332.31 525.429> 768 149
 VStem: 100 94<221.501 470.277> 664 94<221.501 470.11>
 LayerCount: 4
@@ -8701,7 +8698,7 @@ StartChar: atilde
 Encoding: 227 227 169
 Width: 491
 VWidth: 0
-Flags: W
+Flags: HW
 HStem: 0 73 217 73<197 355> 408 73 556 149
 VStem: 345 82<91 224 284 384>
 LayerCount: 4
@@ -8949,7 +8946,7 @@ StartChar: otilde
 Encoding: 245 245 180
 Width: 556
 VWidth: 0
-Flags: W
+Flags: HW
 HStem: -10 65<201.366 356.188> 426 64<201.263 354.656> 558 149
 VStem: 46 83<136.024 343.789> 427 83<134.537 345.226>
 LayerCount: 4
@@ -9064,7 +9061,7 @@ StartChar: ntilde
 Encoding: 241 241 185
 Width: 548
 VWidth: 0
-Flags: W
+Flags: HW
 HStem: 0 73 408 73 558 149
 VStem: 66 82<0 397> 404 81<0 392>
 LayerCount: 4
@@ -14232,7 +14229,7 @@ StartChar: uni022C
 Encoding: 556 556 359
 Width: 828
 VWidth: 0
-Flags: W
+Flags: HW
 HStem: -8 74<332.31 525.429> 626 74<332.31 525.429> 768 149 985 73<238 643>
 VStem: 100 94<221.501 470.277> 664 94<221.501 470.11>
 LayerCount: 4