strip Trademark from NCSB too.

diff --git a/buildscripts/pfx2ttf.fontforge b/buildscripts/pfx2ttf.fontforge
index ec0f9a214abbb3ecb6f7f392e6e4da072fbe3bbf..aac582befcdd2e2bbab44a5cc43e1a29b9ce3ef9 100644 (file)
--- a/buildscripts/pfx2ttf.fontforge
+++ b/buildscripts/pfx2ttf.fontforge
@@ -3,6 +3,22 @@
 Open($1);
 MergeKern($2)
 
+
+# 
+# NCSB is broken as shipped by Fedora Core 6
+# it contains bogus ligatures TM and No in the AFM file.
+#
+# Remove the TM glyph - for want of better FF fix.  
+err = SelectIf("trademark");
+if ( err > 0 )
+   Cut();
+elseif ( err == 0 )
+   Print("Could not find \"Trademark\" glyph");
+elseif ( err < 0 )
+   Print("An error occurred while searching for the \"numero\" glyph");
+endif
+
+
 # Remove the No. glyph - for want of better FF fix.  
 err = SelectIf("afii61352");
 if ( err > 0 )

diff --git a/input/regression/font-bogus-ligature.ly b/input/regression/font-bogus-ligature.ly
new file mode 100644 (file)
index 0000000..ec7399e
--- /dev/null
+++ b/input/regression/font-bogus-ligature.ly
@@ -0,0 +1,16 @@
+\header
+{
+  texidoc = "TM and No should not be changed into trademark/number symbols.
+This may happen with incorrect font versions.
+"
+}
+
+\version "2.10.0"
+
+\paper {
+  ragged-right = ##T
+}
+
+{
+  c4^"November WHITMAN"
+}