diff --git a/.gitignore b/.gitignore index aaee5b90c..feecd06b5 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,5 @@ macosx/build macosx/Resources res.txt *.rc +gregorio-* +ctan diff --git a/.gregorio-version b/.gregorio-version index f121aa4e0..7c7713ed9 100644 --- a/.gregorio-version +++ b/.gregorio-version @@ -1,4 +1,4 @@ -4.1.1 +4.1.2 *** Do not modify this file. *** Use VersionManager.py to change the version. diff --git a/CHANGELOG.md b/CHANGELOG.md index 647a13dee..7a2f8733b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,10 @@ All notable changes to this project will be documented in this file. As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). It follows [some conventions](http://keepachangelog.com/). -[Unreleased][unreleased] +## [4.1.2] - 2016-05-08 +### Changed +- The parmesan font is now called granapadano. If you were using `\gresetgregoriofont{parmesan}`, you should now use `\gresetgregoriofont{granapadano}`. See [#1075](https://github.com/gregorio-project/gregorio/issues/1075). +- GregorioTeX is now compatible with TeXLive 2016 ## [4.1.1] - 2016-03-10 diff --git a/UPGRADE.md b/UPGRADE.md index 5520c67f8..11bf3892e 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -2,7 +2,26 @@ This file contains instructions to upgrade to a new release of Gregorio. -## Unreleased +## 4.1.2 + +### Changes to texmf tree + +To better comply with the TeXLive directory structure, the location of `gregoriotex.sty` and `gregoriosyms.sty` have changed. + +*Linux and other users installing from source:* `install-gtex.sh` should remove the old versions before installing the new one. + +*Mac users installing via pkg installer:* The installer does not attempt to remove the old versions before installing the new ones. Please run Uninstall-Gregorio.pkg before installing 4.2 to ensure that the old versions don't cause any problems. + +*Windows users:* Your installer already should remove old versions of GregorioTeX before installing the new ones. + +As always, please file a bug report if you have any problems with the update process. + + +### Parmesan font renamed to Grana Padano + +To avoid conflicts with the LilyPond Parmesan font, the Gregorio Parmesan font is now called Grana Padano. If you were using `\gresetgregoriofont{parmesan}`, you should now use `\gresetgregoriofont{granapadano}`. + +## 4.1.1 ### Vertical spacings diff --git a/build-ctan.sh b/build-ctan.sh index 75a20e24a..020f1d608 100755 --- a/build-ctan.sh +++ b/build-ctan.sh @@ -1,6 +1,6 @@ #! /usr/bin/env bash -# Script to be executed by make ctan-dist +# Script to be executed by make ctan VERSION=`head -1 .gregorio-version` FILEVERSION=`echo $VERSION | sed 's/\./_/g'` @@ -38,5 +38,8 @@ zip -r ../gregorio-$VERSION.zip * --exclude=*.DS_Store* cd .. rm -rf gregorio-$VERSION cd .. -zip -r ../gregoriotex.zip gregoriotex gregoriotex.tds.zip +zip -r ../gregoriotex.ctan.zip gregoriotex gregoriotex.tds.zip --exclude=*.DS_Store* cd .. +rm -rf ctan +rm gregorio-$VERSION.tar.bz2 +rm gregoriotex.tds.zip diff --git a/configure.ac b/configure.ac index 6a8dde28b..1b31cc4cc 100644 --- a/configure.ac +++ b/configure.ac @@ -16,8 +16,8 @@ dnl dnl You should have received a copy of the GNU General Public License dnl along with Gregorio. If not, see . -AC_INIT([gregorio],[4.1.1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) -FILENAME_VERSION="4_1_1" +AC_INIT([gregorio],[4.1.2],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) +FILENAME_VERSION="4_1_2" AC_SUBST(FILENAME_VERSION) AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names]) MK="" @@ -105,6 +105,7 @@ AC_CONFIG_FILES([ src/Makefile examples/Makefile contrib/Makefile + contrib/TeXShop/Makefile doc/Makefile tex/Makefile fonts/Makefile diff --git a/contrib/Makefile.am b/contrib/Makefile.am index d4919a81f..fbccca9ca 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -15,4 +15,6 @@ # You should have received a copy of the GNU General Public License # along with Gregorio. If not, see . -EXTRA_DIST = gprocess gabc.xml gabc.lang gabc.vim 900_gregorio.xml gregorio-scribus.lua gregorio.png gabc-syntax.plist README.md TeXShop system-setup.command system-setup.bat config-texworks.command +SUBDIRS = TeXShop + +EXTRA_DIST = gprocess gabc.xml gabc.lang gabc.vim 900_gregorio.xml gregorio-scribus.lua gregorio.png gabc-syntax.plist README.md system-setup.command system-setup.bat config-texworks.command diff --git a/contrib/TeXShop/Makefile.am b/contrib/TeXShop/Makefile.am new file mode 100644 index 000000000..ea3b5da6e --- /dev/null +++ b/contrib/TeXShop/Makefile.am @@ -0,0 +1,18 @@ +# Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md) +# +# This file is part of Gregorio. +# +# Gregorio is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Gregorio is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gregorio. If not, see . + +EXTRA_DIST = auto-configure.command LuaLaTeX+se.engine diff --git a/contrib/system-setup.bat b/contrib/system-setup.bat index 892708076..0d10be992 100644 --- a/contrib/system-setup.bat +++ b/contrib/system-setup.bat @@ -113,8 +113,8 @@ greextra.ttf ^ gregorio.ttf ^ gregorio-op.ttf ^ gresym.ttf ^ -parmesan.ttf ^ -parmesan-op.ttf ^ +granapadano.ttf ^ +granapadano-op.ttf ^ gregall.ttf ^ gregsmodern.ttf diff --git a/contrib/system-setup.command b/contrib/system-setup.command index 3280154b3..65f313de6 100755 --- a/contrib/system-setup.command +++ b/contrib/system-setup.command @@ -141,8 +141,8 @@ greextra.ttf gregorio.ttf gregorio-op.ttf gresym.ttf -parmesan.ttf -parmesan-op.ttf +granapadano.ttf +granapadano-op.ttf gregall.ttf gregsmodern.ttf" diff --git a/debian/copyright b/debian/copyright index b86d8a68c..56ff5380c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,7 +11,7 @@ Files: fonts/gregorio* Copyright: 2008-2015 The Gregorio Project License: GPL-3font+ -Files: fonts/parmesan* +Files: fonts/granapadano* Copyright: 2008-2015 Juergen Reuter, the Gregorio Project License: GPL-3font+ diff --git a/doc/Appendix_Font_Tables.tex b/doc/Appendix_Font_Tables.tex index 110fbfa6c..1b15e5059 100644 --- a/doc/Appendix_Font_Tables.tex +++ b/doc/Appendix_Font_Tables.tex @@ -7,7 +7,7 @@ \section{Font Glyph Tables}\label{glyphtable} \subsection{Score Font Glyphs} The following table lists all of the score glyphs available in the greciliae, -gregorio, and parmesan fonts, and any variant glyphs contained within. If a +gregorio, and granapadano fonts, and any variant glyphs contained within. If a variant glyph is unavailable in a given font, it will be listed as {\itshape\small N/A} under the appropriate column. Some of the glyphs listed are representative of sets of glyphs differentiated by the ambitus of the @@ -28,11 +28,11 @@ \subsection{Score Font Glyphs} {\scriptsize\bfseries Sample gabc}&% {\scriptsize\bfseries greciliae}&% {\scriptsize\bfseries gregorio}&% - {\scriptsize\bfseries parmesan}&% + {\scriptsize\bfseries granapadano}&% {\scriptsize\bfseries Name}&% {\scriptsize\bfseries greciliae}&% {\scriptsize\bfseries gregorio}&% - {\scriptsize\bfseries parmesan}\\ + {\scriptsize\bfseries granapadano}\\ \hline \endfirsthead &&&&&\multicolumn{4}{c}{\bfseries Variants}\\ @@ -41,25 +41,25 @@ \subsection{Score Font Glyphs} {\scriptsize\bfseries Sample gabc}&% {\scriptsize\bfseries greciliae}&% {\scriptsize\bfseries gregorio}&% - {\scriptsize\bfseries parmesan}&% + {\scriptsize\bfseries granapadano}&% {\scriptsize\bfseries Name}&% {\scriptsize\bfseries greciliae}&% {\scriptsize\bfseries gregorio}&% - {\scriptsize\bfseries parmesan}\\ + {\scriptsize\bfseries granapadano}\\ \hline \endhead \directlua{GregorioRef.emit_score_glyphs(#1)} \end{longtable} }% -\ScoreFontTable{'greciliae','gregorio','parmesan'} +\ScoreFontTable{'greciliae','gregorio','granapadano'} \subsection{Dominican Score Font Glyphs} The following table lists all of the score glyphs available in the Dominican -versions of the greciliae, gregorio, and parmesan fonts in the same vein as +versions of the greciliae, gregorio, and granapadano fonts in the same vein as the prior table. -\ScoreFontTable{'greciliaeOp','gregorioOp','parmesanOp'} +\ScoreFontTable{'greciliaeOp','gregorioOp','granapadanoOp'} \subsection{Extra Glyphs}\label{subsec:greextra} diff --git a/doc/Command_Index_User.tex b/doc/Command_Index_User.tex index 4c7380a69..a78f17976 100644 --- a/doc/Command_Index_User.tex +++ b/doc/Command_Index_User.tex @@ -381,7 +381,7 @@ \subsubsection{Staff Lines} \subsubsection{Score Font} -Gregorio\TeX\ currently supports 3 different fonts for the glyphs in a score (neumes, clefs, alterations, \etc): Greciliae (a customized version of Caeciliae by Fr.\ Matthew Spencer, OSJ), Gregorio, and Parmesan (developed for Lilypond by Juergen Reuter). +Gregorio\TeX\ currently supports 3 different fonts for the glyphs in a score (neumes, clefs, alterations, \etc): Greciliae (a customized version of Caeciliae by Fr.\ Matthew Spencer, OSJ), Gregorio, and Grana Padano (née Parmesan, developed for Lilypond by Juergen Reuter). \macroname{\textbackslash gresetgregoriofont}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex} Set the font used for the neumes. The optional argument \texttt{[\#1]} @@ -395,7 +395,7 @@ \subsubsection{Score Font} & \texttt{op} & Use the alternate Dominican font/rule set.\\ \#2 & \texttt{greciliae} & Use the Greciliae font (default).\\ & \texttt{gregorio} & Use the Gregorio font.\\ - & \texttt{parmesan} & Use the Parmesan font.\\ + & \texttt{granapadano} & Use the Grana Padano font.\\ \end{argtable} \macroname{\textbackslash gresetgregoriofontscaled}{[\optional{\#1}]\{\#2\}\{\#3\}}{gregoriotex-main.tex} @@ -680,7 +680,7 @@ \subsubsection{Special Characters} \textbf{Nota Bene:} The same rules apply for \#1 as in \verb=\gresetspecial=. \macroname{\textbackslash gretilde}{}{gregoriotex-main.tex} -Macro to print $\sim$. This macro is set using the above for \texttt{~}. +Macro to print $\sim$. This macro is set using the above for \texttt{$\sim$}. @@ -719,7 +719,7 @@ \subsubsection{Styling} \footnotemark[1]\textit{Special:} By default, \texttt{additionalstafflines} inherits its properties from \texttt{normalstafflines}. To decouple these environments, you must manually change \texttt{additionalstafflines} using \texttt{\textbackslash grechangestyle}. \renewcommand{\thefootnote}{\arabic{footnote}}\breakabletrue -\macroname{\textbackslash grechangestyle}{\{\#1\}\{\#2\}[\#3]}{gregoriotex.sty \textup{and} gregoriotex.tex} +\macroname{\textbackslash grechangestyle}{\{\#1\}\{\#2\}[\optional{\#3}]}{gregoriotex.sty \textup{and} gregoriotex.tex} Command to change styling of a score element. \begin{argtable} @@ -749,7 +749,7 @@ \subsubsection{Styling} \subsubsection{Text Elements} While the gabc headers provide support for some of the text elements commonly found on chant scores, Gregorio\TeX\ provides the following functions to allow you to enter and control those elements with a greater degree of precision than the gabc headers. -\macroname{\textbackslash greannotation}{[\#1]\{\#2\}}{gregoriotex-main.tex} +\macroname{\textbackslash greannotation}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex} Macro to add annotations (the text which appears above the initial) to a score. While a single call of the function does not support multiple lines, successive calls to the function will be added to the annotation as a new line below what is already there. \begin{argtable} @@ -761,7 +761,7 @@ \subsubsection{Text Elements} \textbf{Nota Bene:} The first argument does not affect the alignment of lines already in the annotation, only the way the new line aligns with the existing lines as a whole. -\macroname{\textbackslash grecommentary}{[\optional{\#2}]\{\#1\}}{gregoriotex-main.tex} +\macroname{\textbackslash grecommentary}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex} Macro to add commentary (the text flush right at the top, usually a scripture reference) to a score. While a single call of this function does not support multiple lines, successive calls to the function will add a new line to the commentary directly below the previous. \begin{argtable} diff --git a/doc/Command_Index_internal.tex b/doc/Command_Index_internal.tex index 6aa2afc59..e4aae155d 100644 --- a/doc/Command_Index_internal.tex +++ b/doc/Command_Index_internal.tex @@ -1076,7 +1076,7 @@ \section{Gregorio\TeX{} Controls} & \texttt{op} & Use the alternate Dominican font/rule set.\\ \#2 & \texttt{greciliae} & Use the Greciliae font (default).\\ & \texttt{gregorio} & Use the Gregorio font.\\ - & \texttt{parmesan} & Use the Parmesan font.\\ + & \texttt{granapadano} & Use the Grana Padano font.\\ \end{argtable} \macroname{\textbackslash gre@syllable@end}{\#1\#2\#3}{gregoriotex-syllable.tex} @@ -1179,7 +1179,7 @@ \section{Gregorio\TeX{} Controls} & \texttt{op} & Use the alternate Dominican font/rule set.\\ \#2 & \texttt{greciliae} & Use the Greciliae font (default).\\ & \texttt{gregorio} & Use the Gregorio font.\\ - & \texttt{parmesan} & Use the Parmesan font.\\ + & \texttt{granapadano} & Use the Grana Padano font.\\ \#3 & integer & the scaling factor\\ \end{argtable} @@ -1253,7 +1253,7 @@ \subsection{Fonts} The font for the default initial format in Plain \TeX. \macroname{\textbackslash gre@fontfactor@...}{}{gregoriotex-main.tex} -Macro holding the factor at which the font is loaded. There is one of these macros for each chant font which has been loaded with the ending of the macro name being the name of the chant font (gregorio, parmesan, \etc). +Macro holding the factor at which the font is loaded. There is one of these macros for each chant font which has been loaded with the ending of the macro name being the name of the chant font (gregorio, granapadano, \etc). \subsection{Character Reference Aliases} diff --git a/doc/GregorioRef.lua b/doc/GregorioRef.lua index a846f99a7..bcc35a9bb 100644 --- a/doc/GregorioRef.lua +++ b/doc/GregorioRef.lua @@ -234,11 +234,11 @@ local LIQUESCENCE = { GregorioRef = {} -function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan) +function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_granapadano) local common_glyphs = {} local greciliae = {} local gregorio = {} - local parmesan = {} + local granapadano = {} local function index_font(csname, variants, common) local glyphs = font.fonts[font.id(csname)].resources.unicodes @@ -264,7 +264,7 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan) index_font(cs_greciliae, greciliae, common_glyphs) index_font(cs_gregorio, gregorio) - index_font(cs_parmesan, parmesan) + index_font(cs_granapadano, granapadano) local function maybe_emit_glyph(csname, variants, name, variant) local cp = variants[name] @@ -307,10 +307,10 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan) end tex.sprint(string.format( [[{\scriptsize %s{\bfseries %s}{\itshape %s}%s%s}&{\ttfamily\small %s}&{\%s\char%d}&{\%s\char%d}&{\%s\char%d}&]], - fusion, shape, ambitus, debilis, liquescence, gabc or '', cs_greciliae, char, cs_gregorio, char, cs_parmesan, char + fusion, shape, ambitus, debilis, liquescence, gabc or '', cs_greciliae, char, cs_gregorio, char, cs_granapadano, char )) local emitted = false, i, variant - for i, variant in ipairs(sort_unique_keys{greciliae[name], gregorio[name], parmesan[name]}) do + for i, variant in ipairs(sort_unique_keys{greciliae[name], gregorio[name], granapadano[name]}) do if emitted then tex.sprint([[\nopagebreak&&&&&]]) else @@ -319,7 +319,7 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan) tex.sprint(string.format([[{\scriptsize %s}]], variant)) maybe_emit_glyph('greciliae', greciliae, name, variant) maybe_emit_glyph('gregorio', gregorio, name, variant) - maybe_emit_glyph('parmesan', parmesan, name, variant) + maybe_emit_glyph('granapadano', granapadano, name, variant) tex.print([[\\]]) end if not emitted then diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex index 5253fd8c8..176f880b6 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -107,10 +107,10 @@ % for the character tables \font\greciliae = {name:greciliae} at 1000000 sp\relax \font\gregorio = {name:gregorio} at 1000000 sp\relax -\font\parmesan = {name:parmesan} at 1000000 sp\relax +\font\granapadano = {name:granapadano} at 1000000 sp\relax \font\greciliaeOp = {name:greciliae-op} at 1000000 sp\relax \font\gregorioOp = {name:gregorio-op} at 1000000 sp\relax -\font\parmesanOp = {name:parmesan-op} at 1000000 sp\relax +\font\granapadanoOp = {name:granapadano-op} at 1000000 sp\relax \font\greextra = {name:greextra} at 12 pt\relax \newcommand{\excluded}[1]{{\tiny\itshape #1}} @@ -152,7 +152,7 @@ \vspace{1cm} - \large Version \textbf{4.1.1}, 10 March 2016 %% PARSE_VERSION_DATE + \large Version \textbf{4.1.2}, 8 May 2016 %% PARSE_VERSION_DATE \vspace{1.5cm} \end{center} diff --git a/fonts/Makefile.am b/fonts/Makefile.am index 7e5d31b3d..166d9ef0e 100644 --- a/fonts/Makefile.am +++ b/fonts/Makefile.am @@ -18,10 +18,10 @@ # You should have received a copy of the GNU General Public License # along with Gregorio. If not, see . -TTFFILES = gregorio.ttf greciliae.ttf parmesan.ttf \ - gregorio-op.ttf greciliae-op.ttf parmesan-op.ttf \ +TTFFILES = gregorio.ttf greciliae.ttf granapadano.ttf \ + gregorio-op.ttf greciliae-op.ttf granapadano-op.ttf \ greextra.ttf gregall.ttf gresgmodern.ttf -SOURCEFILES = gregorio-base.sfd parmesan-base.sfd greciliae-base.sfd \ +SOURCEFILES = gregorio-base.sfd granapadano-base.sfd greciliae-base.sfd \ greextra.sfd gregall.sfd gresgmodern.sfd EXTRA_DIST = $(TTFFILES) $(SOURCEFILES) squarize.py stemsschemas.py convertsfdtottf.py README.md simplify.py diff --git a/fonts/parmesan-base.sfd b/fonts/granapadano-base.sfd similarity index 99% rename from fonts/parmesan-base.sfd rename to fonts/granapadano-base.sfd index 0e8ec0f61..dc36aea19 100644 --- a/fonts/parmesan-base.sfd +++ b/fonts/granapadano-base.sfd @@ -1,7 +1,7 @@ SplineFontDB: 3.0 -FontName: parmesan -FullName: parmesan -FamilyName: parmesan +FontName: granapadano +FullName: granapadano +FamilyName: granapadano Weight: Medium Copyright: LilyPond's pretty-but-neat music font, adapted to the Gregorio Project.\nCopyright (C) 2002-2006 Juergen Reuter \nCopyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<> UComments: "2007-4-12: Created." diff --git a/fonts/parmesan.json b/fonts/granapadano.json similarity index 100% rename from fonts/parmesan.json rename to fonts/granapadano.json diff --git a/fonts/squarize.py b/fonts/squarize.py index 2f42bfca7..a7196ceb9 100644 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -78,7 +78,7 @@ 5: 'Five', } -GREGORIO_VERSION = '4.1.1' +GREGORIO_VERSION = '4.1.2' # The unicode character at which we start our numbering: # U+E000 is the start of the BMP Private Use Area diff --git a/install-gtex.sh b/install-gtex.sh index b9faee7ed..bfacd37d7 100755 --- a/install-gtex.sh +++ b/install-gtex.sh @@ -60,17 +60,29 @@ VERSION=`head -1 .gregorio-version` FILEVERSION=`echo $VERSION | sed 's/\./_/g'` -TEXFILES=(tex/gregoriotex*.tex tex/gsp-default.tex tex/gregoriotex*.lua tex/*.dat) +TEXFILES=(tex/gregoriotex*.tex tex/gsp-default.tex tex/gregoriotex*.lua + tex/*.dat) LATEXFILES=(tex/gregorio*.sty) -TTFFILES=(gregorio.ttf greciliae.ttf parmesan.ttf gregorio-op.ttf - greciliae-op.ttf parmesan-op.ttf greextra.ttf gregall.ttf +TTFFILES=(gregorio.ttf greciliae.ttf granapadano.ttf gregorio-op.ttf + greciliae-op.ttf granapadano-op.ttf greextra.ttf gregall.ttf gresgmodern.ttf) DOCFILES=(doc/Appendix*.tex doc/Command*.tex doc/Gabc.tex - doc/*Ref.tex doc/*Ref.lua doc/*.gabc doc/Gregorio*Ref-$FILEVERSION.pdf) -EXAMPLEFILES=(examples/FactusEst.gabc examples/PopulusSion.gabc examples/main-lualatex.tex) -FONTSRCFILES=(gregorio-base.sfd parmesan-base.sfd greciliae-base.sfd + doc/*Ref.tex doc/*Ref.lua doc/*.gabc + doc/Gregorio*Ref-$FILEVERSION.pdf) +EXAMPLEFILES=(examples/FactusEst.gabc examples/PopulusSion.gabc + examples/main-lualatex.tex examples/debugging.tex) +FONTSRCFILES=(gregorio-base.sfd granapadano-base.sfd greciliae-base.sfd greextra.sfd squarize.py convertsfdtottf.py gregall.sfd gresgmodern.sfd README.md) +# Files which have been eliminated, or whose installation location have been +# changed. We will remove existing versions of these files in the target texmf +# tree before installing. +LEGACYFILES=(tex/luatex/gregoriotex/gregoriotex.sty + tex/luatex/gregoriotex/gregoriosyms.sty + tex/luatex/gregoriotex/gregoriotex-ictus.tex + fonts/truetype/public/gregoriotex/parmesan.ttf + fonts/truetype/public/gregoriotex/parmesan-op.ttf + fonts/source/gregoriotex/parmesan-base.sfd) NAME=${NAME:-gregoriotex} FORMAT=${FORMAT:-luatex} @@ -78,6 +90,7 @@ LATEXFORMAT=${LATEXFORMAT:-lualatex} TEXHASH=${TEXHASH:-texhash} KPSEWHICH=${KPSEWHICH:-kpsewhich} CP=${CP:-cp} +RM=${RM:-rm} TTFFILES=("${TTFFILES[@]/#/fonts/}") FONTSRCFILES=("${FONTSRCFILES[@]/#/fonts/}") @@ -145,6 +158,18 @@ function install_to { $CP "$@" "$dir" || die } +function find_and_remove { + for files in $1; do + target="${TEXMFROOT}/${files}" + if [ -e "$target" ]; then + $RM -f "$target" + fi + done +} + +echo "Removing old files" +find_and_remove "${LEGACYFILES[@]}" + echo "Installing in '${TEXMFROOT}'." install_to "${TEXMFROOT}/tex/${FORMAT}/${NAME}" "${TEXFILES[@]}" install_to "${TEXMFROOT}/tex/${LATEXFORMAT}/${NAME}" "${LATEXFILES[@]}" diff --git a/macosx/Gregorio.pkgproj b/macosx/Gregorio.pkgproj index e1ffa84f4..e23128ae5 100755 --- a/macosx/Gregorio.pkgproj +++ b/macosx/Gregorio.pkgproj @@ -564,7 +564,7 @@ OVERWRITE_PERMISSIONS VERSION - 4.1.1 + 4.1.2 UUID 74692645-8112-42EB-8FFC-2CBE2CEDE9FB diff --git a/macosx/create_package.sh b/macosx/create_package.sh index b318e96eb..e65a9b7e7 100755 --- a/macosx/create_package.sh +++ b/macosx/create_package.sh @@ -78,7 +78,7 @@ else cp doc/*.md $EXTRASDIR/doc/ cp doc/*.gabc $EXTRASDIR/doc/ cp -r contrib/ $EXTRASDIR/contrib - rm $EXTRASDIR/contrib/Makefile* + find $EXTRASDIR/contrib -name 'Makefile*' -delete cp examples/*.tex $EXTRASDIR/examples/ cp examples/*.gabc $EXTRASDIR/examples/ cp *.md $EXTRASDIR diff --git a/macosx/douninstall.sh b/macosx/douninstall.sh index fd1186cc9..583be914d 100755 --- a/macosx/douninstall.sh +++ b/macosx/douninstall.sh @@ -14,15 +14,17 @@ writelog 6 "Uninstalling Gregorio Components" GRETEXDIR=`$KPSEWHICH gregoriotex.tex` GRETEXDIR="${GRETEXDIR%/gregoriotex.tex}" +GRELATEXDIR="${GRETEXDIR/luatex/lualatex}" TEXMFLOCAL="${GRETEXDIR%/tex/luatex/gregoriotex}" GREFONTDIR="$TEXMFLOCAL/fonts/truetype/public/gregoriotex" -GREFONTSOURCE="$TEXMFLOCAL/source/gregoriotex" +GREFONTSOURCE="$TEXMFLOCAL/fonts/source/gregoriotex" GREDOCDIR="$TEXMFLOCAL/doc/luatex/gregoriotex" rm "$BINDIR/gregorio" rm "$PKGCONFIGDIR/gregorio.pc" rm -rf "$GREINCLUDEDIR" rm -rf "$GRETEXDIR" +rm -rf "$GRELATEXDIR" rm -rf "$GREFONTDIR" rm -rf "$GREFONTSOURCE" rm -rf "$GREDOCDIR" diff --git a/macosx/postflight.sh b/macosx/postflight.sh index f7b397979..c053828e2 100755 --- a/macosx/postflight.sh +++ b/macosx/postflight.sh @@ -34,5 +34,6 @@ chmod -R 777 examples/ chmod -R 777 doc/ chmod +x contrib/TeXShop/auto-configure.command chmod +x contrib/config-texworks-mac.command +chmod +x contrib/system-setup.command writelog 6 "Installation Complete" diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty index 622f3b147..7b7d3d607 100644 --- a/tex/gregoriosyms.sty +++ b/tex/gregoriosyms.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2016/03/10 v4.1.1 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2016/05/08 v4.1.2 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX % If gregoriotex has been loaded, then we need to abort the loading process of this package here in order to avoid some conflicts. \ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi% @@ -38,7 +38,7 @@ % The version of gregorio. All gregoriotex*.tex files must have the same. % All gtex files must also have the same version. -\xdef\gre@gregorioversion{4.1.1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregorioversion{4.1.2}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index 25bbe59a2..fae4a6f15 100644 --- a/tex/gregoriotex-chars.tex +++ b/tex/gregoriotex-chars.tex @@ -18,7 +18,7 @@ % along with Gregorio. If not, see . \gre@debugmsg{general}{Loading gregoriotex-chars.tex}% -\gre@declarefileversion{gregoriotex-chars.tex}{4.1.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{4.1.2}% GREGORIO_VERSION \def\gre@char@fuse@punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}% \def\gre@char@fuse@quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}% diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex index 3344a56ed..ecaf7aadb 100644 --- a/tex/gregoriotex-main.tex +++ b/tex/gregoriotex-main.tex @@ -27,6 +27,10 @@ \gre@error{Error: this document must be compiled with LuaTeX (lualatex)}% \fi% +%%%%%%%%% +%% Debugging +%%%%%%%%% + \def\gre@debugmsg#1#2{% \IfStrEq{\gre@debug}{}{}% %false @@ -68,13 +72,18 @@ }% -\def\gre@nothing{} +\def\gre@nothing{}% \AtBeginDocument{\IfStrEq{\gre@debug}{}{}{\directlua{gregoriotex.set_debug_string([[\gre@debug]])}\typeout{GregorioTeX is in debug mode}\typeout{\gre@debug\space messages will be printed to the log.}}}% -% Depending on version of TeX / LaTeX, some primitives may or may not have a -% luatex prefix, so we need to check and handle either +%%%%%%%%%%%%%%% +%% Backwards Compatibility +%%%%%%%%%%%%%%% +% Depending on version of LuaTeX / LaTeX, some primitives have different names +% We define local aliases for this eventuality, using \ifdefined to determine which +% version of the primative is available. In all cases the 'true' branch should be the +% more recent version. \ifdefined\localleftbox% \let\gre@localleftbox\localleftbox% \else% @@ -85,6 +94,32 @@ \else% \let\gre@localrightbox\luatexlocalrightbox% \fi% +\ifdefined\pdfextension% + \def\gre@startlink{\pdfextension startlink }% + \def\gre@endlink{\pdfextension endlink\relax}% +\else% + \let\gre@startlink\pdfstartlink% + \let\gre@endlink\pdfendlink% +\fi% +\ifdefined\savepos% + \let\gre@savepos\savepos% +\else% + \let\gre@savepos\pdfsavepos% +\fi% +\ifdefined\lastxpos% + \let\gre@lastxpos\lastxpos% +\else% + \let\gre@lastxpos\pdflastxpos% +\fi% +\ifdefined\lastypos% + \let\gre@lastypos\lastypos% +\else% + \let\gre@lastypos\pdflastypos% +\fi% + +%%%%%%%%%%%%%%% + + % an attribute we put on the text nodes. % if it is 1, it means that there may be a dash here if this syllable is at the end of a line % if it is 2, it means that it's never useful to typeset a dash @@ -108,7 +143,7 @@ % The version of gregorio. All gregoriotex*.tex files must have the same. % All gtex files must also have the same version. -\xdef\gre@gregorioversion{4.1.1}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregorioversion{4.1.2}% GREGORIO_VERSION - VersionManager.py % first some macros to allow checks for version: % Tests that all gregoriotex files are of the same version. @@ -725,7 +760,7 @@ \newbox\gre@box@commentary -\def\grecommentary{\@ifnextchar[{\gre@commentary}{\gre@commentary[0pt]}} +\def\grecommentary{\@ifnextchar[{\gre@commentary}{\gre@commentary[0pt]}}% \def\gre@commentary[#1]#2{% % we initialize commentarytrueraise here, but will only calculate it's final value just before placing the commentary so that we make sure we have the correct values for the distances which go into it @@ -1719,17 +1754,22 @@ }% \def\gre@setgregoriofontscaled[#1]#2#3{% - \if\relax\detokenize{#1}\relax % - \xdef\gre@gregoriofontname{#2}% - \expandafter\xdef\csname gre@fontfactor@#2\endcsname{#3}% - \gre@loadgregoriofont% - \gdef\GreCPVirgaReversaAscendensOnDLine##1{##1}% - \else % - \xdef\gre@gregoriofontname{#2-#1}% - \expandafter\xdef\csname gre@fontfactor@#2-#1\endcsname{#3}% - \gre@loadgregoriofont% - \gdef\GreCPVirgaReversaAscendensOnDLine##1{\GreCPVirgaReversaLongqueueAscendens}% - \fi % + \IfStrEq{#2}{parmesan}{%%% DEPRECATED for removal in 5.0 + \gre@deprecated{'parmesan' font}{'granapadano' font}%%% DEPRECATED for removal in 5.0 + \gre@setgregoriofontscaled[#1]{granapadano}{#3}%%% DEPRECATED for removal in 5.0 + }{%%% DEPRECATED for removal in 5.0 + \if\relax\detokenize{#1}\relax % + \xdef\gre@gregoriofontname{#2}% + \expandafter\xdef\csname gre@fontfactor@#2\endcsname{#3}% + \gre@loadgregoriofont% + \gdef\GreCPVirgaReversaAscendensOnDLine##1{##1}% + \else % + \xdef\gre@gregoriofontname{#2-#1}% + \expandafter\xdef\csname gre@fontfactor@#2-#1\endcsname{#3}% + \gre@loadgregoriofont% + \gdef\GreCPVirgaReversaAscendensOnDLine##1{\GreCPVirgaReversaLongqueueAscendens}% + \fi % + }%%% DEPRECATED for removal in 5.0 \relax % }% @@ -1840,7 +1880,7 @@ % 0 = never compile (default) % 1 = auto compile (compile outdated scores and those lacking a compiled version) % 2 = compile all scores -\def\gre@compilegabc{0} +\def\gre@compilegabc{0}% % User macro to change compilation behavior \def\gresetcompilegabc#1{% diff --git a/tex/gregoriotex-nabc.lua b/tex/gregoriotex-nabc.lua index 659502e7d..589c29155 100644 --- a/tex/gregoriotex-nabc.lua +++ b/tex/gregoriotex-nabc.lua @@ -20,7 +20,7 @@ -- this file contains lua functions used by GregorioTeX St. Gall ancient -- neume support when called with LuaTeX. --- GREGORIO_VERSION 4.1.1 +-- GREGORIO_VERSION 4.1.2 local catcode_at_letter = luatexbase.catcodetables['gre@atletter'] diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex index 25ebe0b84..8a2b90b75 100644 --- a/tex/gregoriotex-nabc.tex +++ b/tex/gregoriotex-nabc.tex @@ -20,11 +20,11 @@ % this file contains macros for St. Gall ancient neume support \gre@debugmsg{general}{Loading gregoriotex-nabc.tex}% -\gre@declarefileversion{gregoriotex-nabc.tex}{4.1.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{4.1.2}% GREGORIO_VERSION -\xdef\gre@nabcfontname{gregall} -\xdef\gre@nabcfontsize{8} +\xdef\gre@nabcfontname{gregall}% +\xdef\gre@nabcfontsize{8}% \def\gresetnabcfont#1#2{% \xdef\gre@nabcfontname{#1}% diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua index 0acb9789e..d7064f22f 100644 --- a/tex/gregoriotex-signs.lua +++ b/tex/gregoriotex-signs.lua @@ -19,7 +19,7 @@ -- this file contains lua functions to support signs used by GregorioTeX. --- GREGORIO_VERSION 4.1.1 +-- GREGORIO_VERSION 4.1.2 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index 36ffb0a23..697bc6c93 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -23,7 +23,7 @@ \def\grebarbracewidth{.58879}% \gre@debugmsg{general}{Loading gregoriotex-signs.tex}% -\gre@declarefileversion{gregoriotex-signs.tex}{4.1.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{4.1.2}% GREGORIO_VERSION \def\gre@usestylecommon{% \ifgre@usestylefont\else % @@ -918,18 +918,18 @@ \ifgre@boxing\else % \ifcase#2 % 0 \gre@debugmsg{general}{save case 0}% - \pdfsavepos % + \gre@savepos % \or % 1 \setbox\gre@box@temp@sign=\hbox{\gre@fontchar@punctum}% \kern-\wd\gre@box@temp@sign % - \pdfsavepos % + \gre@savepos % \kern\wd\gre@box@temp@sign % \or % 2 \gre@debugmsg{general}{save case 2}% \setbox\gre@box@temp@sign=\hbox{\gre@fontchar@punctum}% \gre@dimen@temp@five=\wd\gre@box@temp@sign % \kern-.5\wd\gre@box@temp@sign % - \pdfsavepos % + \gre@savepos % \kern.5\wd\gre@box@temp@sign % \fi % \directlua{gregoriotex.var_brace_note_pos(#1, #3)}% diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index dab25f220..d5c1b8224 100644 --- a/tex/gregoriotex-spaces.tex +++ b/tex/gregoriotex-spaces.tex @@ -20,7 +20,7 @@ % this file contains definitions of spaces \gre@debugmsg{general}{Loading gregoriotex-spaces.tex}% -\gre@declarefileversion{gregoriotex-spaces.tex}{4.1.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{4.1.2}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index 2c3a9e08f..b95e3c5a0 100644 --- a/tex/gregoriotex-syllable.tex +++ b/tex/gregoriotex-syllable.tex @@ -20,7 +20,7 @@ % this file contains definitions of the glyphs and the syllables \gre@debugmsg{general}{Loading gregoriotex-syllable.tex}% -\gre@declarefileversion{gregoriotex-syllable.tex}{4.1.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{4.1.2}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for the typesetting of the different glyphs @@ -74,12 +74,12 @@ #1% \else % \ifnum\gre@generate@pointandclick=1\relax % - \pdfstartlink user{% + \gre@startlink user{% /Subtype/Link/Border[0 0 0]% /A<>% }% #1% - \pdfendlink % + \gre@endlink % \else % #1% \fi % @@ -511,7 +511,7 @@ \gre@gabcforcecenterstrue% \def\gresetgabcforcecenters#1{% - \ifcase\gre@lyriccentering\or + \ifcase\gre@lyriccentering\or% \gre@warning{\protect\gresetgabcforcecenters\space has no effect when lyrics are centered on the vowels}% \fi% \IfStrEqCase{#1}{% diff --git a/tex/gregoriotex-symbols.lua b/tex/gregoriotex-symbols.lua index bf8bbe404..1b8416053 100644 --- a/tex/gregoriotex-symbols.lua +++ b/tex/gregoriotex-symbols.lua @@ -19,7 +19,7 @@ -- this file contains lua functions to support signs used by GregorioTeX. --- GREGORIO_VERSION 4.1.1 +-- GREGORIO_VERSION 4.1.2 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex index 79edaf7ad..be08adea3 100644 --- a/tex/gregoriotex-symbols.tex +++ b/tex/gregoriotex-symbols.tex @@ -23,7 +23,7 @@ \def\gregoriotex@symbols@loaded{}% \gre@debugmsg{general}{Loading gregoriotex-symbols.tex}% -\gre@declarefileversion{gregoriotex-symbols.tex}{4.1.1}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{4.1.2}% GREGORIO_VERSION \RequireLuaModule{gregoriotex}% diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index 4f94d1a1f..72775a0a8 100644 --- a/tex/gregoriotex.lua +++ b/tex/gregoriotex.lua @@ -24,13 +24,13 @@ local hpack, traverse, traverse_id, has_attribute, count, remove, insert_after, gregoriotex = gregoriotex or {} local gregoriotex = gregoriotex -local internalversion = '4.1.1' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '4.1.2' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '4.1.1', -- GREGORIO_VERSION + version = '4.1.2', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2016/03/10", -- GREGORIO_DATE_LTX + date = "2016/05/08", -- GREGORIO_DATE_LTX description = "GregorioTeX module.", author = "The Gregorio Project (see CONTRIBUTORS.md)", copyright = "2008-2015 - The Gregorio Project", @@ -696,10 +696,9 @@ local function check_font_version() local gregoriofont = get_font_by_name('gre@font@music') if gregoriofont then local fontversion = gregoriofont.shared.rawdata.metadata.version - if fontversion ~= internalversion then + if fontversion and string.match(fontversion, "%d+%.%d+%.%d+") ~= string.match(internalversion, "%d+%.%d+%.%d+") then local fontname = gregoriofont.shared.rawdata.metadata.fontname - local fontfile = gregoriofont.shared.rawdata.metadata.origname - err("\nUncoherent file versions!\ngregoriotex.tex is version %s\nwhile %s.ttf is version %s\nplease update file\n%s", internalversion, fontname, fontversion, fontfile) + err("\nUncoherent file versions!\ngregoriotex.tex is version %s\nwhile %s.ttf is version %s\nplease reinstall one so that the\nversions match", string.match(internalversion, "%d+%.%d+%.%d+"), fontname, string.match(fontversion, "%d+%.%d+%.%d+")) end end end @@ -881,7 +880,7 @@ local function adjust_line_height(inside_discretionary) end local function var_brace_note_pos(brace, start_end) - tex.print(string.format([[\luatexlatelua{gregoriotex.late_brace_note_pos('%s', %d, %d, \number\pdflastxpos)}]], cur_score_id, brace, start_end)) + tex.print(catcode_at_letter, string.format([[\luatexlatelua{gregoriotex.late_brace_note_pos('%s', %d, %d, \number\gre@lastxpos)}]], cur_score_id, brace, start_end)) end local function late_brace_note_pos(score_id, brace, start_end, pos) @@ -912,7 +911,7 @@ local function var_brace_len(brace) end local function save_pos(index, which) - tex.print(string.format([[\pdfsavepos\luatexlatelua{gregoriotex.late_save_pos('%s', %d, %d, \number\pdflastxpos, \number\pdflastypos)}]], cur_score_id, index, which)) + tex.print(catcode_at_letter, string.format([[\gre@savepos\luatexlatelua{gregoriotex.late_save_pos('%s', %d, %d, \number\gre@lastxpos, \number\gre@lastypos)}]], cur_score_id, index, which)) end local function late_save_pos(score_id, index, which, xpos, ypos) diff --git a/tex/gregoriotex.sty b/tex/gregoriotex.sty index aadc23ec9..4a8cd01fb 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2016/03/10 v4.1.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2016/05/08 v4.1.2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX % If gregoriosyms has been loaded then there are going to be some conflicts in the definitions made in that package and this one. In order to provide for a more informative error message, we check for that conflict right away \ifcsname gregoriotex@symbols@loaded\endcsname\gre@error{Loading gregoriotex after\MessageBreak gregoriosyms is not supported. Please remove the\MessageBreak loading of gregoriosyms (its contents are loaded\MessageBreak by gregoriotex)}\fi% diff --git a/tex/gregoriotex.tex b/tex/gregoriotex.tex index ca9bf2533..982e6a17a 100644 --- a/tex/gregoriotex.tex +++ b/tex/gregoriotex.tex @@ -21,7 +21,7 @@ % This file needs to be marked with the version number. For now I've done this with the following comment, but we should check to see if PlainTeX has something similar to the version declaration of LaTeX and use that if it does. -% [2016/03/10 v4.1.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2016/05/08 v4.1.2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \edef\greoldcatcode{\the\catcode`@} diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc index 6970073a7..c979a0f3c 100644 --- a/windows/gregorio-resources.rc +++ b/windows/gregorio-resources.rc @@ -1,7 +1,7 @@ IDI_ICON1 ICON DISCARDABLE "gregorio.ico" 1 VERSIONINFO -FILEVERSION 4,1,1,30 -PRODUCTVERSION 4,1,1,30 +FILEVERSION 4,1,2,30 +PRODUCTVERSION 4,1,2,30 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "4.1.1" + VALUE "FileVersion", "4.1.2" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "4.1.1" + VALUE "ProductVersion", "4.1.2" END END diff --git a/windows/gregorio.iss b/windows/gregorio.iss index 1d01757b8..d597eaa27 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -1,6 +1,6 @@ [Setup] AppName=gregorio -AppVersion=4.1.1 +AppVersion=4.1.2 DefaultDirName={pf}\gregorio DefaultGroupName=gregorio SetupIconFile=gregorio.ico @@ -34,6 +34,8 @@ Name: "{app}\texmf" Name: "{app}\texmf\tex" Name: "{app}\texmf\tex\luatex" Name: "{app}\texmf\tex\luatex\gregoriotex" +Name: "{app}\texmf\tex\lualatex" +Name: "{app}\texmf\tex\lualatex\gregoriotex" Name: "{app}\texmf\fonts" Name: "{app}\texmf\fonts\truetype" Name: "{app}\texmf\fonts\truetype\public" @@ -43,6 +45,7 @@ Name: "{app}\texmf\fonts\source\gregoriotex" Name: "{app}\texmf\doc" Name: "{app}\texmf\doc\luatex" Name: "{app}\texmf\doc\luatex\gregoriotex" +Name: "{app}\texmf\doc\luatex\gregoriotex\examples" [Files] Source: "../src/gregorio.exe"; DestDir: "{app}\bin"; @@ -55,22 +58,31 @@ Source: "../README.md"; DestDir: "{app}"; Source: "../CONTRIBUTORS.md"; DestDir: "{app}"; Source: "../UPGRADE.md"; DestDir: "{app}"; ; PARSE_VERSION_FILE_NEXTLINE -Source: "../doc/GregorioRef-4_1_1.pdf"; DestDir: "{app}"; +Source: "../doc/Gregorio*Ref-4_1_2.pdf"; DestDir: "{app}"; ; PARSE_VERSION_FILE_NEXTLINE -Source: "../doc/GregorioNabcRef-4_1_1.pdf"; DestDir: "{app}"; +Source: "../doc/Gregorio*Ref-4_1_2.pdf"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; Source: "../COPYING.md"; DestDir: "{app}"; Source: "../contrib/system-setup.bat"; DestDir: "{app}"; Source: "../contrib/*"; DestDir: "{app}\contrib"; Excludes: "Makefile*,TeXShop\*,*.command"; Source: "../examples/*.gabc"; DestDir: "{app}\examples"; +Source: "../examples/*.gabc"; DestDir: "{app}\texmf\doc\luatex\gregoriotex\examples"; Source: "../examples/*.tex"; DestDir: "{app}\examples"; +Source: "../examples/*.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex\examples"; Source: "../tex/*.tex"; DestDir: "{app}\texmf\tex\luatex\gregoriotex"; -Source: "../tex/*.sty"; 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/*.py"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; +Source: "../fonts/README.md"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; Source: "../README.md"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/Appendix*.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/Command*.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/Gabc.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/*Ref.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/*Ref.lua"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/*.gabc"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; [InstallDelete] Type: files; Name: "{app}\gregorio.exe" diff --git a/windows/install.lua b/windows/install.lua index 212066843..959227d38 100644 --- a/windows/install.lua +++ b/windows/install.lua @@ -126,6 +126,7 @@ local old_base_dirs = { fixpath(texmflocal.."fonts/ovf/gregoriotex"), fixpath(texmflocal.."fonts/map/gregoriotex"), fixpath(texmflocal.."tex/luatex/gregoriotex"), + fixpath(texmflocal.."tex/lualatex/gregoriotex"), fixpath(texmflocal.."fonts/truetype/public/gregoriotex"), fixpath(texmflocal.."fonts/source/gregoriotex"), fixpath(texmflocal.."doc/luatex/gregoriotex"),