diff --git a/.gitignore b/.gitignore index 2a106c1..a0caf3e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ Madan.ttf +/fonts.zip diff --git a/license.txt b/license.txt new file mode 100644 index 0000000..fe9ed65 --- /dev/null +++ b/license.txt @@ -0,0 +1,15 @@ +Open Type rules and Nepali glyphsets developed at Madan Puraskar Pustakalaya and released under GPL. + +Contacts: +Madan Puraskar Pustakalaya +Yalamaya Kendra, Patan, NEPAL +GPO Box. 42 +www.mpp.org.np +info@mpp.org.np + +Font Developers: +Gaurav Shrestha | gaurav@mpp.org.np +Anjan Ale | anjan@mpp.org.np + + +Copyright (c) 2007 by Madan Puraskar Pustakalaya. All rights reserved. diff --git a/madan-fonts-2.000-bug842965-u0970-ff2.patch b/madan-fonts-2.000-bug842965-u0970-ff2.patch deleted file mode 100644 index a56040e..0000000 --- a/madan-fonts-2.000-bug842965-u0970-ff2.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- madan/madan.sfd.old 2017-03-13 13:58:43.222651696 +0530 -+++ madan/madan.sfd 2017-03-13 14:04:19.735250509 +0530 -@@ -524,7 +524,7 @@ - AntiAlias: 1 - FitToEm: 0 - 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: 65890 465 - - StartChar: .notdef - Encoding: 65536 -1 0 -@@ -106551,5 +106551,33 @@ - Flags: W - LayerCount: 2 - EndChar -+ -+StartChar: uni0970 -+Encoding: 65889 2416 464 -+Width: 992 -+Flags: W -+LayerCount: 2 -+Fore -+SplineSet -+498 860 m 0,0,1 -+ 590 860 590 860 655 927 c 128,-1,2 -+ 720 994 720 994 720 1090 c 128,-1,3 -+ 720 1186 720 1186 655 1252 c 128,-1,4 -+ 590 1318 590 1318 498 1318 c 0,5,6 -+ 408 1318 408 1318 343 1252 c 128,-1,7 -+ 278 1186 278 1186 278 1090 c 128,-1,8 -+ 278 994 278 994 343 927 c 128,-1,9 -+ 408 860 408 860 498 860 c 0,0,1 -+496 748 m 128,-1,11 -+ 352 748 352 748 251 848 c 128,-1,12 -+ 150 948 150 948 150 1090 c 0,13,14 -+ 150 1230 150 1230 251 1330 c 128,-1,15 -+ 352 1430 352 1430 496 1430 c 128,-1,16 -+ 640 1430 640 1430 741 1330 c 128,-1,17 -+ 842 1230 842 1230 842 1090 c 0,18,19 -+ 842 948 842 948 741 848 c 128,-1,10 -+ 640 748 640 748 496 748 c 128,-1,11 -+EndSplineSet -+EndChar - EndChars - EndSplineFont diff --git a/madan-fonts.spec b/madan-fonts.spec index c4aa248..42a2f1a 100644 --- a/madan-fonts.spec +++ b/madan-fonts.spec @@ -3,51 +3,52 @@ Name: %{fontname}-fonts Version: 2.000 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Font for Nepali language License: GPL+ URL: http://madanpuraskar.org/ # Found new following working Source URL. Use wget to download this archive -Source0: http://download.com.np/uploads/nepali_unicode/madan.zip +Source0: http://ltk.org.np/downloads/fonts.zip Source1: %{name}-fontconfig.conf -Source2: ttf2sfd.pe +# Extract from font info +Source2: license.txt Source3: sfd2ttf.pe Source4: %{fontname}.metainfo.xml +# Below files will make sure "fc-scan madan.ttf |grep lang:" will show ne +Source5: madan.py +Source6: madan_u0970_glyph.svg BuildArch: noarch BuildRequires: fontforge BuildRequires: fontpackages-devel Requires: fontpackages-filesystem -# This patch will make sure "fc-scan madan.ttf |grep lang:" will show ne -# This is now newly created against fontforge2 build -Patch0: madan-fonts-2.000-bug842965-u0970-ff2.patch %description This package provides the Madan font for Nepali made by the Madan Puraskar Pustakalaya project. %prep -%setup -c -q -for file in madan/license.txt; do +%autosetup -c +cp -p %{SOURCE2} %{SOURCE3} \ + %{SOURCE5} %{SOURCE6} . + +for file in license.txt; do sed "s|\r||g" $file > $file.new && \ 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 -p0 -b .added-u0970-character -./sfd2ttf.pe madan/*.sfd +cp -p %{SOURCE2} %{SOURCE4} %{SOURCE5} . +chmod 755 sfd2ttf.pe madan.py +./madan.py madan.ttf madan_u0970_glyph.svg +./sfd2ttf.pe madan.sfd %build echo "Nothing to do in Build." %install install -m 0755 -d %{buildroot}%{_fontdir} -install -m 0644 -p %{fontname}/*.ttf %{buildroot}%{_fontdir} +install -m 0644 -p madan.ttf %{buildroot}%{_fontdir} install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \ %{buildroot}%{_fontconfig_confdir} @@ -58,14 +59,17 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \ %{buildroot}%{_fontconfig_confdir}/%{fontconf} # Add AppStream metadata -install -Dm 0644 -p %{SOURCE4} \ +install -Dm 0644 -p %{SOURCE3} \ %{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml %_font_pkg -f %{fontconf} *.ttf -%doc %{fontname}/license.txt +%doc license.txt %{_datadir}/appdata/%{fontname}.metainfo.xml %changelog +* Mon Dec 30 2019 Parag Nemade - 2.000-24 +- Fix adding U0970 based on Vishal Vijayraghavan's fix + * Thu Jul 25 2019 Fedora Release Engineering - 2.000-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/madan.py b/madan.py new file mode 100644 index 0000000..ca64675 --- /dev/null +++ b/madan.py @@ -0,0 +1,18 @@ +#!/usr/bin/python3 +# usage: +# python3 madan.py + +import fontforge as ff +import sys + +src_font_file = sys.argv[1] +src_glyph_svg_name = sys.argv[2] +output_font_file_name = "madan.sfd" +glyph_name = 'uni0970' +glyph_unicode = 0x0970 + +font = ff.open(src_font_file) +glyph = font.createChar(glyph_unicode, glyph_name) +glyph.importOutlines(src_glyph_svg_name) + +font.save(output_font_file_name) diff --git a/madan_u0970_glyph.svg b/madan_u0970_glyph.svg new file mode 100644 index 0000000..555e63e --- /dev/null +++ b/madan_u0970_glyph.svg @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/sources b/sources index 36c59b5..40f7a5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8d1b035f8b2a90a0426df5f8fe2fe976 madan.zip +SHA512 (fonts.zip) = d92fb07fe00f7eb3bad035291cb7c890427c4f1750b199c69e2787a350901c31710dc8f1c0bb7eef1c8a8a83e334390474ef57802520e6cb0d2e4d8cb98608b5 diff --git a/tests/tests.yml b/tests/tests.yml index 26506f0..e5bf6c1 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -13,4 +13,4 @@ families: - lang: ne alias: Madan2 - family: Madan2 + family: Madan diff --git a/ttf2sfd.pe b/ttf2sfd.pe deleted file mode 100644 index bc7178b..0000000 --- a/ttf2sfd.pe +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env fontforge - -Print( " ") -Print( "Generating sfd from ttf sources...") -Print( "----------------------------------") -Open($1) -Save($1:r + ".sfd") -Print( " ")