diff --git a/65-0-madan.conf b/65-0-madan.conf
index 3feac83..6a7e863 100644
--- a/65-0-madan.conf
+++ b/65-0-madan.conf
@@ -35,4 +35,14 @@
+
+
+ Madan
+
+
+ true
+
+
+
+
diff --git a/madan-fonts-2.000-bug842965-u0970.patch b/madan-fonts-2.000-bug842965-u0970.patch
new file mode 100644
index 0000000..e3d3726
--- /dev/null
+++ b/madan-fonts-2.000-bug842965-u0970.patch
@@ -0,0 +1,202 @@
+diff -rup madan-fonts-2.000/madan/madan.sfd madan-fonts-2.000_mod/madan/madan.sfd
+--- madan-fonts-2.000/madan/madan.sfd 2012-08-03 12:29:23.716814853 +0530
++++ madan-fonts-2.000_mod/madan/madan.sfd 2012-08-03 11:22:15.111502519 +0530
+@@ -519,8 +520,9 @@ NameList: Adobe Glyph List
+ DisplaySize: -24
+ AntiAlias: 1
+ FitToEm: 1
++WinInfo: 2240 56 18
+ AnchorClass2: "Anchor-0" "'abvm' Above Base Mark in Devanagari lookup 0 subtable" "Anchor-1" "'abvm' Above Base Mark in Devanagari lookup 1 subtable" "Anchor-2" "'abvm' Above Base Mark in Devanagari lookup 2 subtable" "Anchor-3" "'abvm' Above Base Mark in Devanagari lookup 4 subtable" "Anchor-4" "'abvm' Above Base Mark in Devanagari lookup 5 subtable" "Anchor-5" "'blwm' Below Base Mark in Devanagari lookup 6 subtable" "Anchor-6" "'blwm' Below Base Mark in Devanagari lookup 7 subtable"
+-BeginChars: 65889 464
++BeginChars: 65889 465
+
+ StartChar: .notdef
+ Encoding: 65536 -1 0
+@@ -2920,79 +2922,79 @@ AnchorPoint: "Anchor-1" 870 1290 basecha
+ LayerCount: 2
+ Fore
+ SplineSet
+-768 126 m 1,0,-1
+- 768 503 l 1,1,2
+- 753 492 753 492 729.5 474 c 128,-1,3
+- 706 456 706 456 673 438.5 c 128,-1,4
+- 640 421 640 421 597 408 c 128,-1,5
+- 554 395 554 395 500 395 c 0,6,7
+- 458 395 458 395 413.5 408 c 128,-1,8
+- 369 421 369 421 326.5 445.5 c 128,-1,9
+- 284 470 284 470 246 503.5 c 128,-1,10
+- 208 537 208 537 179.5 578.5 c 128,-1,11
+- 151 620 151 620 134 667.5 c 128,-1,12
+- 117 715 117 715 117 767 c 0,13,14
+- 117 835 117 835 141.5 890.5 c 128,-1,15
+- 166 946 166 946 208.5 985 c 128,-1,16
+- 251 1024 251 1024 309 1045.5 c 128,-1,17
+- 367 1067 367 1067 434 1067 c 0,18,19
+- 512 1067 512 1067 597.5 1030 c 128,-1,20
+- 683 993 683 993 768 926 c 1,21,-1
+- 768 1297 l 1,22,-1
+- 0 1297 l 1,23,-1
+- -81 1434 l 1,24,-1
+- 1676 1434 l 1,25,-1
+- 1757 1297 l 1,26,-1
+- 933 1297 l 1,27,-1
+- 933 872 l 1,28,29
+- 952 889 952 889 980 910 c 128,-1,30
+- 1008 931 1008 931 1039.5 949 c 128,-1,31
+- 1071 967 1071 967 1105 979.5 c 128,-1,32
+- 1139 992 1139 992 1171 992 c 0,33,34
+- 1234 992 1234 992 1301 961 c 128,-1,35
+- 1368 930 1368 930 1423.5 877.5 c 128,-1,36
+- 1479 825 1479 825 1514.5 754.5 c 128,-1,37
+- 1550 684 1550 684 1550 605 c 0,38,39
+- 1550 561 1550 561 1540 522 c 128,-1,40
+- 1530 483 1530 483 1514 448.5 c 128,-1,41
+- 1498 414 1498 414 1477 384.5 c 128,-1,42
+- 1456 355 1456 355 1435 331 c 0,43,44
+- 1385 274 1385 274 1321 230 c 1,45,46
+- 1308 241 1308 241 1287.5 259 c 128,-1,47
+- 1267 277 1267 277 1247 296 c 1,48,49
+- 1223 317 1223 317 1197 342 c 1,50,51
+- 1218 352 1218 352 1254.5 379 c 128,-1,52
+- 1291 406 1291 406 1326.5 447 c 128,-1,53
+- 1362 488 1362 488 1387.5 541.5 c 128,-1,54
+- 1413 595 1413 595 1413 660 c 0,55,56
+- 1413 696 1413 696 1400.5 732.5 c 128,-1,57
+- 1388 769 1388 769 1365.5 799 c 128,-1,58
+- 1343 829 1343 829 1311 848 c 128,-1,59
+- 1279 867 1279 867 1239 867 c 0,60,61
+- 1206 867 1206 867 1173.5 856.5 c 128,-1,62
+- 1141 846 1141 846 1104 820.5 c 128,-1,63
+- 1067 795 1067 795 1025.5 751.5 c 128,-1,64
+- 984 708 984 708 933 642 c 1,65,-1
+- 933 -32 l 1,66,-1
+- 768 126 l 1,0,-1
+-416 510 m 0,67,68
+- 480 510 480 510 537 533.5 c 128,-1,69
+- 594 557 594 557 640 589.5 c 128,-1,70
+- 686 622 686 622 719 655.5 c 128,-1,71
+- 752 689 752 689 768 710 c 1,72,-1
+- 768 831 l 1,73,74
+- 756 840 756 840 734.5 859 c 128,-1,75
+- 713 878 713 878 679 896.5 c 128,-1,76
+- 645 915 645 915 598.5 929 c 128,-1,77
+- 552 943 552 943 490 943 c 0,78,79
+- 430 943 430 943 385 920 c 128,-1,80
+- 340 897 340 897 309.5 862 c 128,-1,81
+- 279 827 279 827 263.5 785 c 128,-1,82
+- 248 743 248 743 248 705 c 0,83,84
+- 248 658 248 658 264.5 622 c 128,-1,85
+- 281 586 281 586 306 561 c 128,-1,86
+- 331 536 331 536 360.5 523 c 128,-1,87
+- 390 510 390 510 416 510 c 0,67,68
++768 126 m 5,0,-1
++ 768 503 l 5,1,2
++ 753 492 753 492 729.5 474 c 132,-1,3
++ 706 456 706 456 673 438.5 c 132,-1,4
++ 640 421 640 421 597 408 c 132,-1,5
++ 554 395 554 395 500 395 c 4,6,7
++ 458 395 458 395 413.5 408 c 132,-1,8
++ 369 421 369 421 326.5 445.5 c 132,-1,9
++ 284 470 284 470 246 503.5 c 132,-1,10
++ 208 537 208 537 179.5 578.5 c 132,-1,11
++ 151 620 151 620 134 667.5 c 132,-1,12
++ 117 715 117 715 117 767 c 4,13,14
++ 117 835 117 835 141.5 890.5 c 132,-1,15
++ 166 946 166 946 208.5 985 c 132,-1,16
++ 251 1024 251 1024 309 1045.5 c 132,-1,17
++ 367 1067 367 1067 434 1067 c 4,18,19
++ 512 1067 512 1067 597.5 1030 c 132,-1,20
++ 683 993 683 993 768 926 c 5,21,-1
++ 768 1297 l 5,22,-1
++ 0 1297 l 5,23,-1
++ -81 1434 l 5,24,-1
++ 1676 1434 l 5,25,-1
++ 1757 1297 l 5,26,-1
++ 933 1297 l 5,27,-1
++ 933 872 l 5,28,29
++ 952 889 952 889 980 910 c 132,-1,30
++ 1008 931 1008 931 1039.5 949 c 132,-1,31
++ 1071 967 1071 967 1105 979.5 c 132,-1,32
++ 1139 992 1139 992 1171 992 c 4,33,34
++ 1234 992 1234 992 1301 961 c 132,-1,35
++ 1368 930 1368 930 1423.5 877.5 c 132,-1,36
++ 1479 825 1479 825 1514.5 754.5 c 132,-1,37
++ 1550 684 1550 684 1550 605 c 4,38,39
++ 1550 561 1550 561 1540 522 c 132,-1,40
++ 1530 483 1530 483 1514 448.5 c 132,-1,41
++ 1498 414 1498 414 1477 384.5 c 132,-1,42
++ 1456 355 1456 355 1435 331 c 4,43,44
++ 1385 274 1385 274 1321 230 c 5,45,46
++ 1308 241 1308 241 1287.5 259 c 132,-1,47
++ 1267 277 1267 277 1247 296 c 5,48,49
++ 1223 317 1223 317 1197 342 c 5,50,51
++ 1218 352 1218 352 1254.5 379 c 132,-1,52
++ 1291 406 1291 406 1326.5 447 c 132,-1,53
++ 1362 488 1362 488 1387.5 541.5 c 132,-1,54
++ 1413 595 1413 595 1413 660 c 4,55,56
++ 1413 696 1413 696 1400.5 732.5 c 132,-1,57
++ 1388 769 1388 769 1365.5 799 c 132,-1,58
++ 1343 829 1343 829 1311 848 c 132,-1,59
++ 1279 867 1279 867 1239 867 c 4,60,61
++ 1206 867 1206 867 1173.5 856.5 c 132,-1,62
++ 1141 846 1141 846 1104 820.5 c 132,-1,63
++ 1067 795 1067 795 1025.5 751.5 c 132,-1,64
++ 984 708 984 708 933 642 c 5,65,-1
++ 933 -32 l 5,66,-1
++ 768 126 l 5,0,-1
++416 510 m 4,67,68
++ 480 510 480 510 537 533.5 c 132,-1,69
++ 594 557 594 557 640 589.5 c 132,-1,70
++ 686 622 686 622 719 655.5 c 132,-1,71
++ 752 689 752 689 768 710 c 5,72,-1
++ 768 831 l 5,73,74
++ 756 840 756 840 734.5 859 c 132,-1,75
++ 713 878 713 878 679 896.5 c 132,-1,76
++ 645 915 645 915 598.5 929 c 132,-1,77
++ 552 943 552 943 490 943 c 4,78,79
++ 430 943 430 943 385 920 c 132,-1,80
++ 340 897 340 897 309.5 862 c 132,-1,81
++ 279 827 279 827 263.5 785 c 132,-1,82
++ 248 743 248 743 248 705 c 4,83,84
++ 248 658 248 658 264.5 622 c 132,-1,85
++ 281 586 281 586 306 561 c 132,-1,86
++ 331 536 331 536 360.5 523 c 132,-1,87
++ 390 510 390 510 416 510 c 4,67,68
+ EndSplineSet
+ EndChar
+
+@@ -106547,5 +106549,34 @@ Width: 0
+ Flags: W
+ LayerCount: 2
+ EndChar
++
++StartChar: uni0970
++Encoding: 2416 2416 464
++Width: 992
++VWidth: 1024
++Flags: HW
++LayerCount: 2
++Fore
++SplineSet
++498 860.5 m 0,0,1
++ 590 860.5 590 860.5 655 927.5 c 128,-1,2
++ 720 994.5 720 994.5 720 1090.5 c 128,-1,3
++ 720 1186.5 720 1186.5 655 1252.5 c 128,-1,4
++ 590 1318.5 590 1318.5 498 1318.5 c 0,5,6
++ 408 1318.5 408 1318.5 343 1252.5 c 128,-1,7
++ 278 1186.5 278 1186.5 278 1090.5 c 128,-1,8
++ 278 994.5 278 994.5 343 927.5 c 128,-1,9
++ 408 860.5 408 860.5 498 860.5 c 0,0,1
++496 748.5 m 128,-1,11
++ 352 748.5 352 748.5 251 848.5 c 128,-1,12
++ 150 948.5 150 948.5 150 1090.5 c 0,13,14
++ 150 1230.5 150 1230.5 251 1330.5 c 128,-1,15
++ 352 1430.5 352 1430.5 496 1430.5 c 128,-1,16
++ 640 1430.5 640 1430.5 741 1330.5 c 128,-1,17
++ 842 1230.5 842 1230.5 842 1090.5 c 0,18,19
++ 842 948.5 842 948.5 741 848.5 c 128,-1,10
++ 640 748.5 640 748.5 496 748.5 c 128,-1,11
++EndSplineSet
++EndChar
+ EndChars
+ EndSplineFont
diff --git a/madan-fonts.spec b/madan-fonts.spec
index 4ac7f08..3e29df9 100644
--- a/madan-fonts.spec
+++ b/madan-fonts.spec
@@ -3,7 +3,7 @@
Name: %{fontname}-fonts
Version: 2.000
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Font for Nepali language
Group: User Interface/X
License: GPL+
@@ -12,9 +12,13 @@ URL: http://madanpuraskar.org/
#Source0: http://madanpuraskar.org/index.php?option=com_docman&task=doc_download&gid=8&Itemid=63
Source0: madan.zip
Source1: %{fontconf}
+Source2: ttf2sfd.pe
+Source3: sfd2ttf.pe
BuildArch: noarch
+BuildRequires: fontforge
BuildRequires: fontpackages-devel
Requires: fontpackages-filesystem
+Patch0: madan-fonts-2.000-bug842965-u0970.patch
%description
This package provides the Madan font for Nepali made by the
@@ -27,6 +31,12 @@ for file in madan/license.txt; do
touch -r $file $file.new && \
mv $file.new $file
done
+cp -p %{SOURCE2} %{SOURCE3} .
+chmod 755 ttf2sfd.pe sfd2ttf.pe
+./ttf2sfd.pe madan/*.ttf
+rm -rf madan/*ttf
+%patch0 -p1 -b .added-u0970-character
+./sfd2ttf.pe madan/*.sfd
%build
@@ -49,6 +59,10 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
%changelog
+* Fri Aug 03 2012 Parag - 2.000-8
+- Resolves: rh#842965, added character u0970
+- Enabled autohint in fontconf file
+
* Thu Jul 19 2012 Fedora Release Engineering - 2.000-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
diff --git a/sfd2ttf.pe b/sfd2ttf.pe
new file mode 100644
index 0000000..34a4f04
--- /dev/null
+++ b/sfd2ttf.pe
@@ -0,0 +1,8 @@
+#!/usr/bin/env fontforge
+
+Print( " ")
+Print( "Generating ttf from sfd sources...")
+Print( "----------------------------------")
+Open($1)
+Generate($1:r + ".ttf", "", 0x800)
+Print( " ")
diff --git a/ttf2sfd.pe b/ttf2sfd.pe
new file mode 100644
index 0000000..bc7178b
--- /dev/null
+++ b/ttf2sfd.pe
@@ -0,0 +1,8 @@
+#!/usr/bin/env fontforge
+
+Print( " ")
+Print( "Generating sfd from ttf sources...")
+Print( "----------------------------------")
+Open($1)
+Save($1:r + ".sfd")
+Print( " ")