installfont 1.6a (7nov10)

git-svn-id: svn://tug.org/texlive/trunk@20355 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 13 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/support/installfont/LICENSE b/Master/texmf-dist/doc/support/installfont/LICENSE
index 718ab5886fb..b1aacc34ffd 100644
--- a/Master/texmf-dist/doc/support/installfont/LICENSE
+++ b/Master/texmf-dist/doc/support/installfont/LICENSE
@@ -15,7 +15,7 @@
 %% 
 %% This work has the LPPL maintenance status "author-maintained".
 %% 
-%% This Current Maintainer of this work is Josef Kleber.
+%% The Current Maintainer of this work is Josef Kleber.
 %%
 %% This work consists of all files listed in manifest.txt.
 %%
diff --git a/Master/texmf-dist/doc/support/installfont/README b/Master/texmf-dist/doc/support/installfont/README
index 129677736be..90c0789413c 100644
--- a/Master/texmf-dist/doc/support/installfont/README
+++ b/Master/texmf-dist/doc/support/installfont/README
@@ -10,24 +10,7 @@ have a working font installation in your local TeX tree.
 
 License: LPPL
 
-New in v1.6:
+New in v1.6a:
 
-- added new switch:
-  
-  -L, --log  redirect terminal output of programms to
-             LOG file
-
-- added support for small caps font in all supported 
-  font series. The script now installs:
-  
-  * light, light italic, light small caps
-  * regular/medium, regular/medium italic,
-    regular/medium small caps
-  * semi bold, semi bold italic, semi bold small caps
-  * demi, demi italic, demi small caps
-  * bold, bold italic, bold small caps
-  * extra bold, extra bold italic, extra bold small caps
-  * ultra bold/heavy, ultra bold/heavy italic,
-    ultra bold/heavy small caps
-  
-  feature requests by: Kurt Lidwin
\ No newline at end of file
+- Bugfix: \RequirePackage{softmakerfreefont} got lost
+          in the last update
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/support/installfont/installfont b/Master/texmf-dist/doc/support/installfont/installfont
index 6242c5d136c..2a0d07224e9 100644
--- a/Master/texmf-dist/doc/support/installfont/installfont
+++ b/Master/texmf-dist/doc/support/installfont/installfont
@@ -8,10 +8,10 @@
 # The script tries to rename the fonts automatically (optional).
 # Otherwise the *.afm and *.pfb files must be named in Karl Berry scheme
 # (e.g. 5bbr8a.pfb)
-# (tested with MiKTeX 2.8) v1.6 (18.09.2010)
+# (tested with MiKTeX 2.8) v1.6a (03.11.2010)
 # (C) Josef Kleber 2009-2010  License: LPPL
 #
-VERSION="v1.6 (2010/09/18)"
+VERSION="v1.6a (2010/11/03)"
 #
 FONTFAMILY="5bb"
 FONTNAME="Softmaker Barbedor"
@@ -37,6 +37,7 @@ ADMIN=""
 OTFFONTFEATURES="-fkern -fliga"
 UNINSTALL="false"
 INSTALLAS="rmdefault"
+SMFFSTY="%"
 LOG="false"
 #
 function printHelp()
@@ -306,6 +307,7 @@ then
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
+	  SMFFSTY="\RequirePackage{softmakerfreefont}%"
     done
     # rename the semi(bold) font
     FILES=$(grep -e "Semibold" -e "SemiBold" *.afm | cut -d':' -f1 | uniq)
@@ -321,6 +323,7 @@ then
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
+	  SMFFSTY="\RequirePackage{softmakerfreefont}%"
     done
     # rename the demi(bold) font
     FILES=$(grep -e "FontName" -e "FullName" *.afm | grep -e "Demi" -e "Demibold" -e "DemiBold" | cut -d':' -f1 | uniq)
@@ -336,6 +339,7 @@ then
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
+	  SMFFSTY="\RequirePackage{softmakerfreefont}%"
     done
     # rename the extra bold font
     FILES=$(grep -e "Extrabold" -e "ExtraBold" *.afm | cut -d':' -f1 | uniq)
@@ -366,6 +370,7 @@ then
       mv "$file" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.afm;
       mv "${file%afm}pfb" ./Rename/${FONTFAMILY}${FONTCUT}${FONTENCODING}.pfb;
       echo -e "s/<${FONTFAMILY}${FONTCUT}${FONTENCODING}/<${file%.afm}/" >>map.sed;
+	  SMFFSTY="\RequirePackage{softmakerfreefont}%"
     done
     # rename the bold font
     FILES=$(grep -e "Bold" -e "bold" *.afm | cut -d':' -f1 | uniq)
diff --git a/Master/texmf-dist/doc/support/installfont/installfont.pdf b/Master/texmf-dist/doc/support/installfont/installfont.pdf
index baa422717ce..5be1c8255af 100644
--- a/Master/texmf-dist/doc/support/installfont/installfont.pdf
+++ b/Master/texmf-dist/doc/support/installfont/installfont.pdf
diff --git a/Master/texmf-dist/doc/support/installfont/installfont.tex b/Master/texmf-dist/doc/support/installfont/installfont.tex
index 971c2a82392..88575decbf0 100644
--- a/Master/texmf-dist/doc/support/installfont/installfont.tex
+++ b/Master/texmf-dist/doc/support/installfont/installfont.tex
@@ -106,10 +106,10 @@
 \renewcommand\notesname{Links}
 \title{\texttt{installfont(-tl)}}
 \Subtitle{A bash script for installing a \LaTeX{} font family}
-\Fileversion{v1.6}
+\Fileversion{v1.6a}
 \Authorline{Package authors:}
 \Author{Josef Kleber \and Christoph Bier (TeXLive version)}
-\Refline{\href{mailto:installfont@latex.josef-kleber.de}{\texttt{installfont@latex.josef-kleber.de}}\\\href{http://latex.josef-kleber.de/en_index.htm}{\texttt{http://latex.josef-kleber.de/en\_index.htm}}}
+\Refline{\href{mailto:kleberj@users.berlios.de}{\texttt{kleberj@users.berlios.de}}\\\href{http://installfont.berlios.de}{\texttt{http://installfont.berlios.de}}}
 \maketitle
 \Headline{Abstract}
 \vspace*{3cm}