[gentium-commits] [SCM] gentium updated: r20 - in trunk/gentium: fonts/enc/dvips/gentium-tug [more]
mojca at gnu.org.ua
mojca at gnu.org.ua
Sun May 3 19:21:37 CEST 2015
Author: mojca
Date: 2015-05-03 20:21:37 +0300 (Sun, 03 May 2015)
New Revision: 20
Added:
trunk/gentium/fonts/enc/dvips/gentium-tug/gentium-ec-ttf-sc.enc
trunk/gentium/fonts/enc/dvips/gentium-tug/gentium-ec-ttf.enc
trunk/gentium/fonts/enc/dvips/gentium-tug/gentium-t5-ttf.enc
Modified:
trunk/gentium/fonts/map/pdftex/gentium-tug/gentium-ec.map
trunk/gentium/fonts/map/pdftex/gentium-tug/gentium-t5.map
trunk/gentium/fonts/map/pdftex/gentium-tug/gentium-truetype.map
trunk/gentium/source/fonts/gentium-tug/gentium.rb
Log:
revert r18
Modified: trunk/gentium/fonts/map/pdftex/gentium-tug/gentium-ec.map
===================================================================
--- trunk/gentium/fonts/map/pdftex/gentium-tug/gentium-ec.map 2015-05-03 09:57:14 UTC (rev 19)
+++ trunk/gentium/fonts/map/pdftex/gentium-tug/gentium-ec.map 2015-05-03 17:21:37 UTC (rev 20)
@@ -1,6 +1,6 @@
-ec-gentiumplus-regular GentiumPlus-Regular <GentiumPlus-R.ttf gentium-ec.enc
-ec-gentiumplus-regular-sc GentiumPlus-Regular <GentiumPlus-R.ttf gentium-ec-sc.enc
-ec-gentiumplus-italic GentiumPlus-Italic <GentiumPlus-I.ttf gentium-ec.enc
-ec-gentiumplus-italic-sc GentiumPlus-Italic <GentiumPlus-I.ttf gentium-ec-sc.enc
-ec-gentiumbasic-bold GentiumBasic-Bold <GenBasB.ttf gentium-ec.enc
-ec-gentiumbasic-bolditalic GentiumBasic-BoldItalic <GenBasBI.ttf gentium-ec.enc
+ec-gentiumplus-regular GentiumPlus-Regular <GentiumPlus-R.ttf gentium-ec-ttf.enc
+ec-gentiumplus-regular-sc GentiumPlus-Regular <GentiumPlus-R.ttf gentium-ec-ttf-sc.enc
+ec-gentiumplus-italic GentiumPlus-Italic <GentiumPlus-I.ttf gentium-ec-ttf.enc
+ec-gentiumplus-italic-sc GentiumPlus-Italic <GentiumPlus-I.ttf gentium-ec-ttf-sc.enc
+ec-gentiumbasic-bold GentiumBasic-Bold <GenBasB.ttf gentium-ec-ttf.enc
+ec-gentiumbasic-bolditalic GentiumBasic-BoldItalic <GenBasBI.ttf gentium-ec-ttf.enc
Modified: trunk/gentium/fonts/map/pdftex/gentium-tug/gentium-t5.map
===================================================================
--- trunk/gentium/fonts/map/pdftex/gentium-tug/gentium-t5.map 2015-05-03 09:57:14 UTC (rev 19)
+++ trunk/gentium/fonts/map/pdftex/gentium-tug/gentium-t5.map 2015-05-03 17:21:37 UTC (rev 20)
@@ -1,6 +1,6 @@
-t5-gentiumplus-regular GentiumPlus-Regular <GentiumPlus-R.ttf gentium-t5.enc
+t5-gentiumplus-regular GentiumPlus-Regular <GentiumPlus-R.ttf gentium-t5-ttf.enc
t5-gentiumplus-regular-sc GentiumPlus-Regular <GentiumPlus-R.ttf gentium-t5-sc.enc
-t5-gentiumplus-italic GentiumPlus-Italic <GentiumPlus-I.ttf gentium-t5.enc
+t5-gentiumplus-italic GentiumPlus-Italic <GentiumPlus-I.ttf gentium-t5-ttf.enc
t5-gentiumplus-italic-sc GentiumPlus-Italic <GentiumPlus-I.ttf gentium-t5-sc.enc
-t5-gentiumbasic-bold GentiumBasic-Bold <GenBasB.ttf gentium-t5.enc
-t5-gentiumbasic-bolditalic GentiumBasic-BoldItalic <GenBasBI.ttf gentium-t5.enc
+t5-gentiumbasic-bold GentiumBasic-Bold <GenBasB.ttf gentium-t5-ttf.enc
+t5-gentiumbasic-bolditalic GentiumBasic-BoldItalic <GenBasBI.ttf gentium-t5-ttf.enc
Modified: trunk/gentium/fonts/map/pdftex/gentium-tug/gentium-truetype.map
===================================================================
--- trunk/gentium/fonts/map/pdftex/gentium-tug/gentium-truetype.map 2015-05-03 09:57:14 UTC (rev 19)
+++ trunk/gentium/fonts/map/pdftex/gentium-tug/gentium-truetype.map 2015-05-03 17:21:37 UTC (rev 20)
@@ -1,11 +1,11 @@
agr-gentiumplus-regular GentiumPlus-Regular <GentiumPlus-R.ttf gentium-agr.enc
agr-gentiumplus-italic GentiumPlus-Italic <GentiumPlus-I.ttf gentium-agr.enc
-ec-gentiumplus-regular GentiumPlus-Regular <GentiumPlus-R.ttf gentium-ec.enc
-ec-gentiumplus-regular-sc GentiumPlus-Regular <GentiumPlus-R.ttf gentium-ec-sc.enc
-ec-gentiumplus-italic GentiumPlus-Italic <GentiumPlus-I.ttf gentium-ec.enc
-ec-gentiumplus-italic-sc GentiumPlus-Italic <GentiumPlus-I.ttf gentium-ec-sc.enc
-ec-gentiumbasic-bold GentiumBasic-Bold <GenBasB.ttf gentium-ec.enc
-ec-gentiumbasic-bolditalic GentiumBasic-BoldItalic <GenBasBI.ttf gentium-ec.enc
+ec-gentiumplus-regular GentiumPlus-Regular <GentiumPlus-R.ttf gentium-ec-ttf.enc
+ec-gentiumplus-regular-sc GentiumPlus-Regular <GentiumPlus-R.ttf gentium-ec-ttf-sc.enc
+ec-gentiumplus-italic GentiumPlus-Italic <GentiumPlus-I.ttf gentium-ec-ttf.enc
+ec-gentiumplus-italic-sc GentiumPlus-Italic <GentiumPlus-I.ttf gentium-ec-ttf-sc.enc
+ec-gentiumbasic-bold GentiumBasic-Bold <GenBasB.ttf gentium-ec-ttf.enc
+ec-gentiumbasic-bolditalic GentiumBasic-BoldItalic <GenBasBI.ttf gentium-ec-ttf.enc
l7x-gentiumplus-regular GentiumPlus-Regular <GentiumPlus-R.ttf gentium-l7x.enc
l7x-gentiumplus-regular-sc GentiumPlus-Regular <GentiumPlus-R.ttf gentium-l7x-sc.enc
l7x-gentiumplus-italic GentiumPlus-Italic <GentiumPlus-I.ttf gentium-l7x.enc
@@ -38,12 +38,12 @@
t2c-gentiumplus-regular-sc GentiumPlus-Regular <GentiumPlus-R.ttf gentium-t2c-sc.enc
t2c-gentiumplus-italic GentiumPlus-Italic <GentiumPlus-I.ttf gentium-t2c.enc
t2c-gentiumplus-italic-sc GentiumPlus-Italic <GentiumPlus-I.ttf gentium-t2c-sc.enc
-t5-gentiumplus-regular GentiumPlus-Regular <GentiumPlus-R.ttf gentium-t5.enc
+t5-gentiumplus-regular GentiumPlus-Regular <GentiumPlus-R.ttf gentium-t5-ttf.enc
t5-gentiumplus-regular-sc GentiumPlus-Regular <GentiumPlus-R.ttf gentium-t5-sc.enc
-t5-gentiumplus-italic GentiumPlus-Italic <GentiumPlus-I.ttf gentium-t5.enc
+t5-gentiumplus-italic GentiumPlus-Italic <GentiumPlus-I.ttf gentium-t5-ttf.enc
t5-gentiumplus-italic-sc GentiumPlus-Italic <GentiumPlus-I.ttf gentium-t5-sc.enc
-t5-gentiumbasic-bold GentiumBasic-Bold <GenBasB.ttf gentium-t5.enc
-t5-gentiumbasic-bolditalic GentiumBasic-BoldItalic <GenBasBI.ttf gentium-t5.enc
+t5-gentiumbasic-bold GentiumBasic-Bold <GenBasB.ttf gentium-t5-ttf.enc
+t5-gentiumbasic-bolditalic GentiumBasic-BoldItalic <GenBasBI.ttf gentium-t5-ttf.enc
texnansi-gentiumplus-regular GentiumPlus-Regular <GentiumPlus-R.ttf gentium-texnansi.enc
texnansi-gentiumplus-regular-sc GentiumPlus-Regular <GentiumPlus-R.ttf gentium-texnansi-sc.enc
texnansi-gentiumplus-italic GentiumPlus-Italic <GentiumPlus-I.ttf gentium-texnansi.enc
Modified: trunk/gentium/source/fonts/gentium-tug/gentium.rb
===================================================================
--- trunk/gentium/source/fonts/gentium-tug/gentium.rb 2015-05-03 09:57:14 UTC (rev 19)
+++ trunk/gentium/source/fonts/gentium-tug/gentium.rb 2015-05-03 17:21:37 UTC (rev 20)
@@ -196,6 +196,20 @@
return name_latex.upcase
end
end
+ def name_truetype
+ if ["ec", "t5"].include?(@name) then
+ return "#{@name}-ttf"
+ else
+ return @name
+ end
+ end
+ def name_truetype_sc
+ if @name == "ec" then
+ return "#{@name}-ttf-sc"
+ else
+ return "#{@name}-sc"
+ end
+ end
def is_used_in_context?
if ["ot1", "ts1", "lgr", "t2b", "t2c", "x2"].include?(@name) then
@@ -321,20 +335,22 @@
name_tfm = "#{encoding.name}-#{font.filename_tex}".ljust(33)
line_reenc = "\"gentium-#{encoding.name}Encoding ReEncodeFont\"".ljust(42)
name_enc = "gentium-#{encoding.name}.enc"
+ name_enc_ttf = "gentium-#{encoding.name_truetype}.enc"
# normal
if font.is_plus? or encoding.has_bold? then
map_lines_type1[encoding.name].push("#{name_tfm} #{font.name_something.ljust(24)} #{line_reenc} <#{name_enc.ljust(24)} <#{font.filename_type1}")
- map_lines_ttf[encoding.name].push("#{name_tfm} #{font.name_something.ljust(24)} <#{font.filename_ttf.ljust(18)} #{name_enc}")
+ map_lines_ttf[encoding.name].push("#{name_tfm} #{font.name_something.ljust(24)} <#{font.filename_ttf.ljust(18)} #{name_enc_ttf}")
end
# small caps
if font.is_plus? and encoding.has_smallcaps? then
name_tfm = "#{encoding.name}-#{font.filename_tex}-sc".ljust(33)
line_reenc = "\"gentium-#{encoding.name}scEncoding ReEncodeFont\"".ljust(42)
name_enc = "gentium-#{encoding.name}-sc.enc"
+ name_enc_ttf = "gentium-#{encoding.name_truetype_sc}.enc"
map_lines_type1[encoding.name].push("#{name_tfm} #{font.name_something.ljust(24)} #{line_reenc} <#{name_enc.ljust(24)} <#{font.filename_type1}")
- map_lines_ttf[encoding.name].push("#{name_tfm} #{font.name_something.ljust(24)} <#{font.filename_ttf.ljust(18)} #{name_enc}")
+ map_lines_ttf[encoding.name].push("#{name_tfm} #{font.name_something.ljust(24)} <#{font.filename_ttf.ljust(18)} #{name_enc_ttf}")
end
end
end
More information about the gentium-commits
mailing list