[gentium-commits] [SCM] gentium updated: r53 - trunk/gentium/source/fonts/gentium-tug/type1

[Pavel Far??]

Author: pavel
Date: 2022-03-24 21:45:26 +0000 (Thu, 24 Mar 2022)
New Revision: 53

Removed:
   trunk/gentium/source/fonts/gentium-tug/type1/GentiumPlus-I-Czech.kern
   trunk/gentium/source/fonts/gentium-tug/type1/GentiumPlus-R-Czech.kern
Modified:
   trunk/gentium/source/fonts/gentium-tug/type1/Makefile
   trunk/gentium/source/fonts/gentium-tug/type1/ff-gentium.pe
   trunk/gentium/source/fonts/gentium-tug/type1/generate-extra-kerns.sh
Log:
remove old fonts from the conversion scripts

- The old fonts are not converted to Type 1 now. You can safely delete
  them (after adapting the Ruby scripts).

- The support for new fonts must be fixed (BlueValues, ...). Look at the
  comments 'FIX ME'.

- In the first pass of the conversion (the first 'make') there are no
  *.afm files and you get an error message that you can ignore. In the
  second pass of 'make' this error disappears.


Modified: trunk/gentium/source/fonts/gentium-tug/type1/Makefile
===================================================================
--- trunk/gentium/source/fonts/gentium-tug/type1/Makefile	2022-03-24 14:28:25 UTC (rev 52)
+++ trunk/gentium/source/fonts/gentium-tug/type1/Makefile	2022-03-24 21:45:26 UTC (rev 53)
@@ -18,9 +18,7 @@
 PFB_PATH='../../../../fonts/type1/public/gentium-tug'
 
 all:	kerns
-	./ff-gentium.pe GentiumPlus-R.ttf GentiumPlus-I.ttf \
-		GenBasB.ttf GenBasBI.ttf \
-		Gentium{,Book}Plus-{Regular,Italic,Bold,BoldItalic}.ttf
+	./ff-gentium.pe Gentium{,Book}Plus-{Regular,Italic,Bold,BoldItalic}.ttf
 	# Change the creator to "TeX Users Group"
 	for I in *.pfb; do \
 		t1disasm $$I | sed 's/%%Creator: .*/%%Creator: TeX Users Group/' \

Modified: trunk/gentium/source/fonts/gentium-tug/type1/ff-gentium.pe
===================================================================
--- trunk/gentium/source/fonts/gentium-tug/type1/ff-gentium.pe	2022-03-24 14:28:25 UTC (rev 52)
+++ trunk/gentium/source/fonts/gentium-tug/type1/ff-gentium.pe	2022-03-24 21:45:26 UTC (rev 53)
@@ -29,17 +29,6 @@
 	Print("* Reading TrueType")
 	Open(TTF_PATH + $argv[i])
 	
-	# Removing problematic lookups "mark" and "mkmk" from GentiumPlus.
-	# This eliminates really huge amount of error messages.
-	if ( $argv[i] == "GentiumPlus-R.ttf" || $argv[i] == "GentiumPlus-I.ttf" )
-		Print("* Removing problematic lookups mark and mkmk")
-		# TODO: Don't use these hard-coded names, use GetLookups("GPOS")
-		RemoveLookup("'mark' Mark Positioning lookup 0")
-		RemoveLookup("'mark' Mark Positioning lookup 1")
-		RemoveLookup("'mkmk' Mark to Mark lookup 2")
-		RemoveLookup("'mkmk' Mark to Mark lookup 3")
-	endif
-	
 	# attempt to follow Hirwen's instructions:
 	Print("* Scaling")
 	ScaleToEm(1000)
@@ -87,6 +76,8 @@
 	# It makes sense from another point of view: two fonts from  GentiumPlus 
 	# make one family, two fonts from GentiumBasic make other family.
 	# TODO: clean-up of the following code
+	#
+	# FIX ME
 	if ( $argv[i] == "GentiumPlus-R.ttf" )
 		BlueValuesRegular = GetPrivateEntry("BlueValues")
 		OtherBluesRegular = GetPrivateEntry("OtherBlues")
@@ -106,6 +97,8 @@
 
 	# Hirwen says add forcebold and write true if font is bold (or bold italic).
 	# Adobe strongly advises to set ForceBold explicitly (true or false).
+	#
+	# FIX ME
 	if ( $argv[i] == "GentiumPlus-R.ttf" || $argv[i] == "GentiumPlus-I.ttf" )
 		ChangePrivateEntry("ForceBold", "false")
 	else
@@ -134,6 +127,8 @@
 	Print("* Setting font names")
 #	SetFontNames(fontname[,family[,fullname[,weight[,copyright-notice[,fontversion]]]]])
 	# Note that this is not at all robust. If it doesn't work, comment out all the lines in the next block except for the single line between the "else" and the "endif". This will produce names which may be less than ideal from an aesthetic point of view but should at least work.	
+	#
+	# FIX ME
 	hyphened=Strrstr($fontname,"-")
 	spaced=Strrstr($fullname," ")
 	if ( $argv[i] == "GentiumPlus-R.ttf" || $argv[i] == "GentiumPlus-I.ttf" )
@@ -154,15 +149,6 @@
 
 	# Corrections for Greek (automatically generated values) and additional kerns
 	# TODO: Don't use hard-coded names, check the existence of extra kernings instead
-	if ( $argv[i] == "GentiumPlus-R.ttf" )
-		Print("* Correction for Greek and additional kerning pairs")
-		MergeFeature("GentiumPlus-R-extra.afm")
-	endif
-	if ( $argv[i] == "GentiumPlus-I.ttf" )
-		Print("* Correction for Greek and additional kerning pairs")
-		MergeFeature("GentiumPlus-I-extra.afm")
-	endif
-
 	if ( $argv[i] == "GentiumPlus-Regular.ttf" )
 		Print("* Correction for Greek and additional kerning pairs")
 		MergeFeature("GentiumPlus-Regular-extra.afm")
@@ -197,10 +183,9 @@
 	endif
 
 
-	# Correction of the kern between D and V in "GentiumPlus-R.ttf" and some other
+	# Correction of the kern between D and V in "GentiumPlus-Regular.ttf" and some other
 	# All these fonts had 20 and it will be changed to -20.
 	if ( \
-	    $argv[i] == "GentiumPlus-R.ttf" || \
 	    $argv[i] == "GentiumPlus-Regular.ttf" || \
 	    $argv[i] == "GentiumPlus-Bold.ttf" || \
 	    $argv[i] == "GentiumBookPlus-Regular.ttf" || \

Modified: trunk/gentium/source/fonts/gentium-tug/type1/generate-extra-kerns.sh
===================================================================
--- trunk/gentium/source/fonts/gentium-tug/type1/generate-extra-kerns.sh	2022-03-24 14:28:25 UTC (rev 52)
+++ trunk/gentium/source/fonts/gentium-tug/type1/generate-extra-kerns.sh	2022-03-24 21:45:26 UTC (rev 53)
@@ -11,8 +11,7 @@
 TTF_PATH="../../../../fonts/truetype/public/gentium-tug"
 AFM_PATH="../../../../fonts/afm/public/gentium-tug"
 
-for i in GentiumPlus-R.ttf GentiumPlus-I.ttf \
-	 Gentium{,Book}Plus-{Regular,Italic,Bold,BoldItalic}.ttf; do
+for i in Gentium{,Book}Plus-{Regular,Italic,Bold,BoldItalic}.ttf; do
   echo "----------------------------------------------"
   echo "* Generating extra kerns for $i"
   echo "* Converting font to sfd"