Merge pull request gregorio-project#1318 from rpspringuel/fonts

Fonts
rpspringuel · Mar 2, 2017 · 8052b5b · 8052b5b
2 parents dc1688f + 4e8b587
commit 8052b5b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -10,7 +10,7 @@ The `autocompile` option is now the default option for the behavior of `\gregori
 
 ### Additional fonts
 
-With the addition of more cavum shapes, the number of font options which come with Gregorio (the package) by default has been reduced in order to control the download size.  From now on only Greciliae will be installed by default.  The Gregorio and Grana Padano fonts, as well as their "-op" Dominican variants, will now be available as a separate download.  If you were using these fonts, either download `supp_fonts-5_0_0.zip` and install them or switch to Greciliae.
+With the addition of more cavum shapes, the number of font options which come with Gregorio (the package) by default has been reduced in order to control the download size.  From now on only Greciliae (and its "-op" Dominican variant) will be installed by default.  The Gregorio and Grana Padano fonts, as well as their "-op" Dominican variants, will now be available as a separate download.  If you were using these fonts, either download `supp_fonts-5_0_0.zip` and install them or switch to Greciliae.
 
 To install the new versions of Gregorio (the font) and Grana Padano, unzip `supp_fonts-5_0_0.zip`, navigate to the uncompressed folder in Terminal (or Command Prompt on Windows) and execute `texlua install_supp_fonts.lua` after you have installed the main Gregorio distribution.  This script will look for the location of Greciliae and copy the other fonts to that location.  If you wish to control the installation of the fonts manually, the script takes an optional argument with one of the following values:
 

diff --git a/doc/Gabc.tex b/doc/Gabc.tex
@@ -84,7 +84,7 @@ \subsection{Headers}
   placed above the initial unless one of the following conditions are
   met:
   \begin{itemize}
-  \item There is a \verb=\greannotation= defined immediatly prior to \verb=\gregorioscore=.
+  \item There is a \verb=\greannotation= defined immediately prior to \verb=\gregorioscore=.
   \item The \texttt{annotation} header field is defined.
   \end{itemize}
 \item[mode-modifier] The mode ``modifier'' of the piece. This may be any

diff --git a/install-gtex.sh b/install-gtex.sh
@@ -277,6 +277,7 @@ if [ "$arg" = 'tds' ]
 then
     echo "Making TDS-ready archive ${TDS_ZIP}."
     rm -f ${TDS_ZIP}
+    (rm ${TEXMFROOT}/fonts/source/gregoriotex/gregorio-base.sfd ${TEXMFROOT}/fonts/source/gregoriotex/granapadano-base.sfd ) || die
     (cd ${TEXMFROOT} && zip -9 ../${TDS_ZIP} -q -r .) || die
     rm -r ${TEXMFROOT} || die
 else

diff --git a/macosx/create_package.sh b/macosx/create_package.sh
@@ -60,6 +60,11 @@ else
     fi
     make DESTDIR=$BUILDDIR install
     ./install-gtex.sh dir:$BUILDDIR/tmp/gregorio
+    # Since install-gtex.sh will pick-up all the source files, we need
+    # to delete the ones corresponding to the fonts not included in the
+    # basic distribution
+    rm $BUILDDIR/tmp/gregorio/fonts/source/gregoirotex/gregorio-base.sfd
+    rm $BUILDDIR/tmp/gregorio/fonts/source/gregoirotex/granapadano-base.sfd
 fi
 
 # Documentation and other extras

diff --git a/windows/gregorio.iss b/windows/gregorio.iss
@@ -71,8 +71,16 @@ Source: "../tex/*.tex"; DestDir: "{app}\texmf\tex\luatex\gregoriotex";
 Source: "../tex/*.sty"; DestDir: "{app}\texmf\tex\lualatex\gregoriotex";
 Source: "../tex/*.lua"; DestDir: "{app}\texmf\tex\luatex\gregoriotex";
 Source: "../tex/gregorio-vowels.dat"; DestDir: "{app}\texmf\tex\luatex\gregoriotex";
-Source: "../fonts/*.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex";
-Source: "../fonts/*.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex";
+Source: "../fonts/greciliae*.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex";
+Source: "../fonts/greextra.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex";
+Source: "../fonts/gregall.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex";
+Source: "../fonts/grelaon.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex";
+Source: "../fonts/gresgmodern.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex";
+Source: "../fonts/greciliae-base.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex";
+Source: "../fonts/greextra.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex";
+Source: "../fonts/gregall.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex";
+Source: "../fonts/grelaon.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex";
+Source: "../fonts/gresgmodern.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex";
 Source: "../fonts/*.py"; DestDir: "{app}\texmf\fonts\source\gregoriotex";
 Source: "../fonts/README.md"; DestDir: "{app}\texmf\fonts\source\gregoriotex";
 Source: "../doc/*.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex";