diff options
Diffstat (limited to 'Master/texmf-dist/source')
4 files changed, 52 insertions, 20 deletions
diff --git a/Master/texmf-dist/source/fonts/gentium-tug/Makefile b/Master/texmf-dist/source/fonts/gentium-tug/Makefile index 0f20d302d62..66d75b5f258 100644 --- a/Master/texmf-dist/source/fonts/gentium-tug/Makefile +++ b/Master/texmf-dist/source/fonts/gentium-tug/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 147 2022-05-21 22:20:08Z karl $ +# $Id: Makefile 157 2022-05-31 22:20:57Z karl $ # This file is part of the Gentium package for TeX. # It is licensed under the Expat License, see doc//README for details. # @@ -117,5 +117,5 @@ dist: clean support-files: ./generate-support-files.rb # make maps containing everything - cd $(mapdir_pdftex); cat gentiumplus-truetype.map gentiumbook-truetype.map > gentium-truetype.map - cd $(mapdir_dvips); cat gentiumplus-type1.map gentiumbook-type1.map > gentium-type1.map + cd $(mapdir_pdftex) && cat gentiumplus-truetype.map gentiumbook-truetype.map > gentium-truetype.map + cd $(mapdir_dvips) && cat gentiumplus-type1.map gentiumbook-type1.map > gentium-type1.map diff --git a/Master/texmf-dist/source/fonts/gentium-tug/generate-support-files.rb b/Master/texmf-dist/source/fonts/gentium-tug/generate-support-files.rb index ef0b55bcf55..194c652b189 100755 --- a/Master/texmf-dist/source/fonts/gentium-tug/generate-support-files.rb +++ b/Master/texmf-dist/source/fonts/gentium-tug/generate-support-files.rb @@ -10,7 +10,7 @@ # TODO: Make it work with current version of Ruby! It works with version # 1.8.7, but not with version as old as 1.9.1. -require 'gentium' +require './gentium' # encodings encodings = EncodingSet.new diff --git a/Master/texmf-dist/source/fonts/gentium-tug/gentium.rb b/Master/texmf-dist/source/fonts/gentium-tug/gentium.rb index 3e000645cf2..6e204049583 100644 --- a/Master/texmf-dist/source/fonts/gentium-tug/gentium.rb +++ b/Master/texmf-dist/source/fonts/gentium-tug/gentium.rb @@ -281,7 +281,7 @@ class Encoding return "\\DeclareFontShape{#{name_latex_uppercase}}{gentium}{#{width1}}{#{shape1}}{<->ssub * gentium/#{width2}/#{shape2}}{}" end def generate_fd - date = "2022/05/09" + date = Time.new.strftime("%Y/%m/%d") # set creation date to current date filename = "#{name_latex}gentium.fd" File.open(File.join($path_fd,filename), 'w') do |file| @@ -301,12 +301,22 @@ class Encoding if has_bold? then file.puts declare_font_shape("b", "n", "plus-bold") file.puts declare_font_shape("b", "it", "plus-bolditalic") + # gentium book as additional weights (semi bold, extra bold) + file.puts declare_font_shape("sb", "n", "book-regular") + file.puts declare_font_shape("sb", "it", "book-italic") + file.puts declare_font_shape("eb", "n", "book-bold") + file.puts declare_font_shape("eb", "it", "book-bolditalic") # TODO: set the correct tfm names in the following two lines if has_smallcaps? then file.puts declare_font_shape("m", "sc", "plus-regular-sc") file.puts declare_font_shape("m", "scit", "plus-italic-sc") file.puts declare_font_shape("b", "sc", "plus-bold-sc") file.puts declare_font_shape("b", "scit", "plus-bolditalic-sc") + # gentium book as additional weights (semi bold, extra bold) + file.puts declare_font_shape("sb", "sc", "book-regular-sc") + file.puts declare_font_shape("sb", "scit", "book-italic-sc") + file.puts declare_font_shape("eb", "sc", "book-bold-sc") + file.puts declare_font_shape("eb", "scit", "book-bolditalic-sc") end # TODO: a clever algorithm to do replacements instead # TODO: (Pavel) Look at substitutions (bold, small caps) @@ -315,6 +325,15 @@ class Encoding file.puts declare_font_shape_sub("bx", "sl", "b", "it") file.puts declare_font_shape_sub("bx", "it", "b", "it") file.puts declare_font_shape_sub("bx", "n", "b", "n") + # substitutions for additional weights + file.puts declare_font_shape_sub("sb", "sl", "sb", "it") + file.puts declare_font_shape_sub("sbx", "sl", "sb", "it") + file.puts declare_font_shape_sub("sbx", "it", "sb", "it") + file.puts declare_font_shape_sub("sbx", "n", "sb", "n") + file.puts declare_font_shape_sub("eb", "sl", "eb", "it") + file.puts declare_font_shape_sub("ebx", "sl", "eb", "it") + file.puts declare_font_shape_sub("ebx", "it", "eb", "it") + file.puts declare_font_shape_sub("ebx", "n", "eb", "n") else file.puts declare_font_shape_sub("m", "sl", "m", "it") end @@ -334,7 +353,7 @@ class Encoding return "\\DeclareFontShape{#{name_latex_uppercase}}{gentiumbook}{#{width1}}{#{shape1}}{<->ssub * gentiumbook/#{width2}/#{shape2}}{}" end def generate_fd_book - date = "2022/05/09" + date = Time.new.strftime("%Y/%m/%d") # set creation date to current date filename = "#{name_latex}gentiumbook.fd" File.open(File.join($path_fd,filename), 'w') do |file| @@ -354,12 +373,22 @@ class Encoding if has_bold? then file.puts declare_font_shape_book("b", "n", "book-bold") file.puts declare_font_shape_book("b", "it", "book-bolditalic") + # gentium plus as additional weights (semi light, semi bold) + file.puts declare_font_shape_book("sl", "n", "plus-regular") + file.puts declare_font_shape_book("sl", "it", "plus-italic") + file.puts declare_font_shape_book("sb", "n", "plus-bold") + file.puts declare_font_shape_book("sb", "it", "plus-bolditalic") # TODO: set the correct tfm names in the following two lines if has_smallcaps? then file.puts declare_font_shape_book("m", "sc", "book-regular-sc") file.puts declare_font_shape_book("m", "scit", "book-italic-sc") file.puts declare_font_shape_book("b", "sc", "book-bold-sc") file.puts declare_font_shape_book("b", "scit", "book-bolditalic-sc") + # gentium plus as additional weights (semi light, semi bold) + file.puts declare_font_shape_book("sl", "sc", "plus-regular-sc") + file.puts declare_font_shape_book("sl", "scit", "plus-italic-sc") + file.puts declare_font_shape_book("sb", "sc", "plus-bold-sc") + file.puts declare_font_shape_book("sb", "scit", "plus-bolditalic-sc") end # TODO: a clever algorithm to do replacements instead # TODO: (Pavel) Look at substitutions (bold, small caps) @@ -368,6 +397,12 @@ class Encoding file.puts declare_font_shape_sub_book("bx", "sl", "b", "it") file.puts declare_font_shape_sub_book("bx", "it", "b", "it") file.puts declare_font_shape_sub_book("bx", "n", "b", "n") + # substitutions for additional weights + file.puts declare_font_shape_sub_book("sl", "sl", "sl", "it") + file.puts declare_font_shape_sub_book("sb", "sl", "sb", "it") + file.puts declare_font_shape_sub_book("sbx", "sl", "sb", "it") + file.puts declare_font_shape_sub_book("sbx", "it", "sb", "it") + file.puts declare_font_shape_sub_book("sbx", "n", "sb", "n") else file.puts declare_font_shape_sub_book("m", "sl", "m", "it") end diff --git a/Master/texmf-dist/source/fonts/gentium-tug/make-zip-4CTAN.sh b/Master/texmf-dist/source/fonts/gentium-tug/make-zip-4CTAN.sh index a7df3507cb8..8d8d386abf1 100755 --- a/Master/texmf-dist/source/fonts/gentium-tug/make-zip-4CTAN.sh +++ b/Master/texmf-dist/source/fonts/gentium-tug/make-zip-4CTAN.sh @@ -1,10 +1,9 @@ #!/bin/sh -# $Id: make-zip-4CTAN.sh 147 2022-05-21 22:20:08Z karl $ +# $Id: make-zip-4CTAN.sh 157 2022-05-31 22:20:57Z karl $ # This file is part of the Gentium package for TeX. # It is licensed under the Expat License, see doc//README for details. # -# Build the distribution zip file for uploading to CTAN, which includes -# a "flat" tree and another .tds.zip with the full TDS directory tree. +# Build the distribution zip file for uploading to CTAN, a "flat" tree. mydir=`cd \`dirname $0\` && pwd` @@ -46,19 +45,17 @@ $rsync "$TDS/fonts/enc/dvips/$pkgname/" "$CTAN/enc/" $rsync "$TDS/fonts/map/dvips/$pkgname/" "$CTAN/map/dvips/" $rsync "$TDS/fonts/map/pdftex/$pkgname/" "$CTAN/map/pdftex/" -printf "\f making .tds.zip:\n" -tdszip_dest=$tmpdir -(cd $TDS \ - && zip -qr $tdszip_dest/$pkgname.tds.zip [a-z]* -x \*.svn\*) # not README - -printf "\f making combined zip for upload:\n" +printf "\f making flat zip for upload:\n" ln -s doc/README $CTAN/README -(cd $tmpdir && zip -qry $tmpdir/$pkgname.zip *) # -y: keep README as symlink +(cd $tmpdir && zip -qryll $tmpdir/$pkgname.zip *) +# -y: keep README as symlink +# -ll: convert CRLF to LF (for SIL files). -# create a single .zip for upload that contains -# a) $pkgname.tds.zip -# b) $pkgname/ subdir for browsing +# create a single .zip for upload that +# a $pkgname/ subdir for browsing. # because that's what CTAN wants these days. +# We used to also distribute a .tds.zip, +# but it doubles the size of the upload to no real purpose. if $local; then :; else echo @@ -69,4 +66,4 @@ if $local; then :; else fi zipinfo -1 $tmpdir/$pkgname.zip >$tmpdir/$pkgname.lst -ls -l $tdszip_dest/$pkgname.tds.zip $tmpdir/$pkgname.zip $tmpdir/$pkgname.lst +ls -l $tmpdir/$pkgname.zip $tmpdir/$pkgname.lst |