diff --git a/.gregorio-version b/.gregorio-version
index 00fc5d77d..968d80653 100644
--- a/.gregorio-version
+++ b/.gregorio-version
@@ -1,4 +1,4 @@
-5.1.0
+5.1.1
2018
*** Do not modify this file. ***
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0fab9cc2..a19e75cec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,9 @@
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][CTAN]
+## [5.1.1] - 2018-03-25
+### Fixed
+- Various issues with the documentation.
## [5.1.0] - 2018-03-11
### Added
@@ -23,7 +25,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
## [5.0.1] - 2017-04-16
### Fixed
-- Fixed a bug in the TeXLive compatibility code for Windows users. Thanks to Akira Kakuto for the catch.
+- Fixed a bug in the TeX Live compatibility code for Windows users. Thanks to Akira Kakuto for the catch.
## [5.0.0] - 2017-04-15
### Fixed
@@ -81,7 +83,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
## [4.2.1][Unreleased]
### Fixed
-- Debian build scripts now use directories compatible with the TeXLive 2016 packaging of Gregorio (see [#1241](https://github.com/gregorio-project/gregorio/issues/1241)).
+- Debian build scripts now use directories compatible with the TeX Live 2016 packaging of Gregorio (see [#1241](https://github.com/gregorio-project/gregorio/issues/1241)).
## [4.2.0] - 2016-09-23
@@ -175,7 +177,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
## [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
+- GregorioTeX is now compatible with TeX Live 2016
## [4.1.1] - 2016-03-10
@@ -216,7 +218,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
- Command line output (help message, version message, error handling) has been improved, see [#891](https://github.com/gregorio-project/gregorio/issues/891)
- Windows installer no longer copies the executable into the TeX bin directory. Instead it has the option to add its own bin directory to PATH.
- `system-setup.sh` has become `system-setup.command` so that it is double click executable on Mac.
-- Post install options for Windows installer have been simplified. There are no longer separate options for MiKTeX and TeXLive. Instead the installer will determine which you have itself and act accordingly.
+- Post install options for Windows installer have been simplified. There are no longer separate options for MiKTeX and TeX Live. Instead the installer will determine which you have itself and act accordingly.
- Windows installer will check more locations for old installations to remove.
- Height of the porrectus have been altered (first note moved up, second also moved up when second ambitus is more than one) so that they are more coherent with the punctum height. The porrectus stroke drawings have also been slightly altered to be slightly thinner and sharper around the bottom note (see [#858](https://github.com/gregorio-project/gregorio/issues/858)).
- When a syllable is preceeded by a punctum mora, gregorio now ignores the punctum mora in the spacing of the syllables by default, and also adds a custom space (defaulting to 0). You can change this behavior with `\gresetshiftaftermora{}`, see GregorioRef for its arguments. To balance the output, space before a punctum mora has been made slightly thinner, more in line with old Solesmes books. (For the change requests, see [#795](https://github.com/gregorio-project/gregorio/issues/795) and [#871](https://github.com/gregorio-project/gregorio/issues/871)).
@@ -363,7 +365,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
- The spacing of manual in-line custos (`(f+)` in gabc) is now consistent with the spacing of automatic in-line custos (`(z0)` in gabc). See [#642](https://github.com/gregorio-project/gregorio/issues/642).
- Signs on the climacus praepunctis deminutus `(ghgf~)` neume are now positioned correctly. See [#650](https://github.com/gregorio-project/gregorio/issues/650)
- Mac installer has been made SIP compliant (i.e. it now works on El Capitan).
-- Mac installer can now detect installations of TeXLive done with MacPorts or the command-line tool provided by TUG.
+- Mac installer can now detect installations of TeX Live done with MacPorts or the command-line tool provided by TUG.
- Windows executable has file version information attached correctly so that the installer can properly recognize and replace the binary during an upgrade process.
- Spacing was too large when alteration begins a syllable, see [#663](https://github.com/gregorio-project/gregorio/issues/663).
@@ -424,7 +426,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
- `\gredefsymbol` for (re-)defining an arbitrary non-score glyph that scales with the text
- `\gredefsizedsymbol` for (re-)defining an arbitary non-score glyph that requires a point-size to be specified.
See GregorioRef.pdf for full details.
-- Added `--with-kpathsea` option to configure script, to check input and output file against `openout_any` and `openin_any` settings of texmf.cnf (TeXLive only). Necessary to be included in `shell_escape_commands` in TeXLive.
+- Added `--with-kpathsea` option to configure script, to check input and output file against `openout_any` and `openin_any` settings of texmf.cnf (TeX Live only). Necessary to be included in `shell_escape_commands` in TeX Live.
- Support for `lualatex -recorder`. Autocompiled gabc and gtex files will now be properly recorded so that programs like `latexmk -recorder` can detect the need to rebuild the PDF when a gabc file changes.
- A vertical episema may now be forced to appear above or below a note. In gabc, use `'0` for the vertical episema to appear below and `'1` for the vertical episema to appear above (see [#385](https://github.com/gregorio-project/gregorio/issues/385)).
- The first word, first syllable, and first letter of the first syllable that is *not* interpreted as the initial of the score can now be styled from TeX. Use `\grechangestyle` to modify the `firstsyllableinitial`, `firstsyllable`, and `firstword` as desired.
diff --git a/Makefile.am b/Makefile.am
index 6c704930e..694de13cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,8 @@ EXTRA_DIST = README.md CHANGELOG.md CONTRIBUTING.md CONTRIBUTORS.md \
UPGRADE.md COPYING.md .gregorio-version VersionManager.py \
build.sh install.sh install-gtex.sh
+MAINTAINERCLEANFILES = gregoriotex.ctan.zip
+
export TOP_LEVEL_MAKE = true
gregorio:
diff --git a/README.md b/README.md
index 782a4e3c4..215993bde 100644
--- a/README.md
+++ b/README.md
@@ -14,11 +14,11 @@ You can also try it online [here](http://dev.illuminarepublications.com/gregorio
## Installation
-You need a recent and working [TeXLive](https://www.tug.org/texlive/), on top of which you just need to install latest [Gregorio release](https://github.com/gregorio-project/gregorio/releases). See [the website](http://gregorio-project.github.io/installation.html) for more details.
+You need a recent and working [TeX Live](https://www.tug.org/texlive/), on top of which you just need to install latest [Gregorio release](https://github.com/gregorio-project/gregorio/releases). See [the website](http://gregorio-project.github.io/installation.html) for more details.
-## Building for inclusion in TeXLive
+## Building for inclusion in TeX Live
-When building gregorio for inclusion in TeXLive, the gregorio executable must not have the version number suffix that is used for other builds. To make this happen, run `configure` with the `--disable-version-in-exe` option, and the generated Makefile will create a gregorio executable without the version number suffix (i.e., the executable will simply be named `gregorio`).
+When building gregorio for inclusion in TeX Live, the gregorio executable must not have the version number suffix that is used for other builds. To make this happen, run `configure` with the `--disable-version-in-exe` option, and the generated Makefile will create a gregorio executable without the version number suffix (i.e., the executable will simply be named `gregorio`).
## Documentation
diff --git a/UPGRADE.md b/UPGRADE.md
index 033a97747..4c33aaf86 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,6 +1,10 @@
# Upgrade Manual
-This file contains instructions to upgrade to a new release of Gregorio.
+This file contains instructions to upgrade to a new release of Gregorio. These instructions are cumulative; meaning that you should apply the instructions from all versions between the one you are upgrading from and the current version.
+
+## 5.1
+
+No additional steps are needed to upgrade from 5.0 to 5.1.
## 5.0
@@ -18,7 +22,7 @@ To install the new versions of Gregorio (the font) and Grana Padano, unzip `supp
* `system`: the appropriate font folder in `$TEXMFLOCAL`
* `user`: the appropriate font folder in `$TEXMFHOME`
* `<dir>`: the name of an alternate texmf root directory you want to use
-
+
Additionally, if you are building the fonts yourself from a git clone, `install-gtex.sh` and `install_supp_fonts.lua` will install all the fonts you have built, not just the ones they are normally distributed with.
**Note:** All the above methods assume you only need to access the fonts from within a TeX document (and thus are designed to put them into the correct folder in a texmf tree). If you want to use the fonts in other programs, then you will need to consult the documentation appropriate to your platform and/or the program and manually move, copy, or link the fonts to the necessary location.
@@ -27,7 +31,7 @@ Additionally, if you are building the fonts yourself from a git clone, `install-
As of version 5.0, ledger lines are extended through notes on either side of a ledger line that crosses a stem, as long as the notes are within the same element.
-The algorithm for this is simple so it can be predictable, and it cannot take into account spacing adjustments made it TeX. This means it may not produce the exactly desired results. In order to get the results you want, you can override the automatic behavior in gabc:
+The algorithm for this is simple so it can be predictable, and it cannot take into account spacing adjustments made in TeX. This means it may not produce the exactly desired results. In order to get the results you want, you can override the automatic behavior in gabc:
- `[oll:1]` will force an over-the-staff ledger line on a note.
- `[oll:0]` will suppress an over-the-staff ledger line on a note.
@@ -113,7 +117,7 @@ Prior to version 4.2, Gregorio inconsistenly indicated style errors. Now, error
### Changes to texmf tree
-To better comply with the TeXLive directory structure, the location of `gregoriotex.sty` and `gregoriosyms.sty` have changed.
+To better comply with the TeX Live 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.
@@ -136,7 +140,7 @@ High notes are now taken into account in vertical spacings. If you would like to
### Last line of score behavior
-`\grelooseness` is now `-1` by default. This should prevent orphaned syllable at end of score. If you prefer the old behavior, use `\def\grelooseness{\looseness}` befor including your scores.
+`\grelooseness` is now `-1` by default. This should prevent orphaned syllable at end of score. If you prefer the old behavior, use `\def\grelooseness{\looseness}` before including your scores.
## 4.1
diff --git a/VersionManager.py b/VersionManager.py
index d03b2f114..7a7c19edb 100755
--- a/VersionManager.py
+++ b/VersionManager.py
@@ -99,7 +99,7 @@
"Makefile.am",
"install.sh",
"debian/copyright",
- "debian/copyright",
+ "debian/manpage.xml",
"doc/Command_Index_User.tex",
"doc/Makefile.am",
"doc/GregorioRef.tex",
@@ -319,20 +319,48 @@ def replace_version(version_obj):
result.append(line)
with open(myfile, 'w') as outfile:
outfile.write(''.join(result))
+ sys.exit(0)
+
+def update_changelog(newver,upgradetype):
+ today = date.today()
with open('CHANGELOG.md', 'r') as infile:
result = []
+ develop = False
for line in infile:
- if '[Unreleased][unreleased]' in line:
- result.append(line)
- result.append('\n')
- result.append('\n')
- newline = '## [' + newver + '] - ' + today.strftime("%Y-%m-%d") + '\n'
- result.append(newline)
+ if upgradetype == "patch":
+ if '[Unreleased][develop]' in line:
+ print("Found an unreleased develop section.")
+ print("Patch releases should be based on ctan branch.")
+ sys.exit(1)
+ if '[Unreleased][CTAN]' in line:
+ result.append(line)
+ result.append('\n')
+ result.append('\n')
+ newline = '## [' + newver + '] - ' + today.strftime("%Y-%m-%d") + '\n'
+ result.append(newline)
+ else:
+ result.append(line)
else:
- result.append(line)
- with open('CHANGELOG.md','w') as outfile:
+ if '[Unreleased][develop]' in line:
+ develop = True
+ result.append(line)
+ result.append('\n')
+ result.append('\n')
+ result.append('## [Unreleased][CTAN]\n')
+ result.append('\n')
+ result.append('\n')
+ newline = '## [' + newver + '] - ' + today.strftime("%Y-%m-%d") + '\n'
+ result.append(newline)
+ elif '[Unreleased][CTAN]' in line and develop:
+ continue
+ else:
+ result.append(line)
+ if not develop and upgradetype != "patch":
+ print("I didn't find a unreleased develop section.")
+ print("Non-patch releases should be based on develop branch.")
+ sys.exit(1)
+ with open('CHANGELOG.md', 'w') as outfile:
outfile.write(''.join(result))
- sys.exit(0)
def confirm_replace(oldver, newver):
"Query the user to confirm action"
@@ -359,6 +387,7 @@ def release_candidate(version_obj, not_interactive):
newversion = re.sub(r'-.*', '-rc1', oldversion)
if (not not_interactive):
confirm_replace(oldversion, newversion)
+ update_changelog(newversion,"releasecandidate")
version_obj.update_version(newversion)
replace_version(version_obj)
@@ -374,6 +403,7 @@ def beta(version_obj, not_interactive):
sys.exit(1)
if (not not_interactive):
confirm_replace(oldversion, newversion)
+ update_changelog(newversion,"beta")
version_obj.update_version(newversion)
replace_version(version_obj)
@@ -384,6 +414,7 @@ def bump_major(version_obj, not_interactive):
newversion = str(int(nums.group(1)) +1) + '.0.0-beta1'
if (not not_interactive):
confirm_replace(oldversion, newversion)
+ update_changelog(newversion,"major")
version_obj.update_version(newversion)
replace_version(version_obj)
@@ -394,6 +425,7 @@ def bump_minor(version_obj, not_interactive):
newversion = nums.group(1) + str(int(nums.group(2)) +1) + '.0-beta1'
if (not not_interactive):
confirm_replace(oldversion, newversion)
+ update_changelog(newversion,"minor")
version_obj.update_version(newversion)
replace_version(version_obj)
@@ -404,6 +436,7 @@ def bump_patch(version_obj, not_interactive):
newversion = nums.group(1) + str(int(nums.group(2)) +1)
if (not not_interactive):
confirm_replace(oldversion, newversion)
+ update_changelog(newversion,"patch")
version_obj.update_version(newversion)
replace_version(version_obj)
@@ -416,6 +449,7 @@ def set_manual_version(version_obj, user_version, not_interactive):
newversion = user_version
if (not not_interactive):
confirm_replace(oldversion, newversion)
+ update_changelog(newversion,"manual")
version_obj.update_version(newversion)
replace_version(version_obj)
@@ -425,12 +459,19 @@ def do_release(version_obj, not_interactive):
newversion = re.sub(r'([\d.]+)-?.*', r'\1', oldversion)
if (not not_interactive):
confirm_replace(oldversion, newversion)
+ update_changelog(newversion,"release")
version_obj.update_version(newversion)
replace_version(version_obj)
def copyright_year():
"Check and update copyright year as needed"
fileyear = linecache.getline(VERSION_FILE, 2).strip()
+ def year_range(matchobj):
+ "Check and add a year range to the copyright"
+ if matchobj.group(1) is not None:
+ return re.sub(fileyear, CURRENTYEAR, matchobj.group(0))
+ return re.sub(fileyear, fileyear+'-'+CURRENTYEAR, matchobj.group(0))
+
if int(fileyear) != int(CURRENTYEAR):
print('Updating copyright year.')
for myfile in COPYRIGHT_FILES:
@@ -438,13 +479,13 @@ def copyright_year():
with open(myfile, 'r') as infile:
for line in infile:
if re.search(r'[C|c]opyright.*Gregorio Project', line):
- result.append(re.sub(fileyear, CURRENTYEAR, line))
+ result.append(re.sub(r'(\d{4}-)?(\d{4})', year_range, line))
elif re.search(r'[C|c]opyright.*Elie Roux', line):
- result.append(re.sub(fileyear, CURRENTYEAR, line))
+ result.append(re.sub(r'(\d{4}-)?(\d{4})', year_range, line))
elif re.search(r'[C|c]opyright.*Richard Chonak', line):
- result.append(re.sub(fileyear, CURRENTYEAR, line))
+ result.append(re.sub(r'(\d{4}-)?(\d{4})', year_range, line))
elif re.search(r'[C|c]opyright.*Jakub Jelinek', line):
- result.append(re.sub(fileyear, CURRENTYEAR, line))
+ result.append(re.sub(r'(\d{4}-)?(\d{4})', year_range, line))
else:
result.append(line)
with open(myfile, 'w') as outfile:
diff --git a/configure.ac b/configure.ac
index a2c49f7c7..4368ff1fd 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 <http://www.gnu.org/licenses/>.
-AC_INIT([gregorio],[5.1.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="5_1_0"
+AC_INIT([gregorio],[5.1.1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="5_1_1"
AC_SUBST(FILENAME_VERSION)
AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
MK=""
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index f370c408a..0b5dec22e 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -17,4 +17,4 @@
SUBDIRS = TeXShop
-EXTRA_DIST = gprocess gabc.xml gabc.lang gabc.vim 900_gregorio.xml gregorio.png gabc-syntax.plist README.md system-setup.command system-setup.bat config-texworks.command checkSyllabation.py
+EXTRA_DIST = gprocess gabc.xml gabc.lang gabc.vim 900_gregorio.xml gregorio.png gabc-syntax.plist contrib_README.md system-setup.command system-setup.bat config-texworks.command checkSyllabation.py
diff --git a/contrib/README.md b/contrib/contrib_README.md
similarity index 97%
rename from contrib/README.md
rename to contrib/contrib_README.md
index 57b1ee3ba..f0089e58e 100644
--- a/contrib/README.md
+++ b/contrib/contrib_README.md
@@ -1,6 +1,6 @@
# Third party scripts
-This repository contains various small scripts or modules for third-party softwares to use Gregorio.
+This folder contains various small scripts or modules for third-party softwares to use Gregorio.
## Scribus
diff --git a/debian/README.Debian b/debian/README.Debian
index b9637094c..e05851c2f 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -3,6 +3,6 @@ README file for Gregorio under DEBIAN GNU/Linux systems
After the installation of gregorio, if you want to benefit from the macros
compiling directly gabc fils in GregorioTeX (like \includescore), you
have to add gregorio to the list of programs allowed to run from TeX
-by TeXLive. To do so, you have to modify /etc/texmf/texmf.cnf and add
+by TeX Live. To do so, you have to modify /etc/texmf/texmf.cnf and add
gregorio to the list 'shell_escape_commands'.
diff --git a/debian/README.md b/debian/debian_README.md
similarity index 100%
rename from debian/README.md
rename to debian/debian_README.md
diff --git a/debian/manpage.xml b/debian/manpage.xml
index 069d3727d..6bafcccd7 100644
--- a/debian/manpage.xml
+++ b/debian/manpage.xml
@@ -53,7 +53,7 @@ and docbook-xsl in your Build-Depends control field.
&dhsurname;
</author>
<copyright>
- <year>2007</year>
+ <year>2007-2018</year> <!--Copyright Elie Roux-->
<holder>&dhusername;</holder>
</copyright>
&dhdate;
diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex
index 39d8c185d..2fcb8bb38 100644
--- a/doc/GregorioRef.tex
+++ b/doc/GregorioRef.tex
@@ -182,7 +182,7 @@
\vspace{1cm}
- \large Version \textbf{5.1.0}, 16 March 2018 %% PARSE_VERSION_DATE
+ \large Version \textbf{5.1.1}, 25 March 2018 %% PARSE_VERSION_DATE
\vspace{1.5cm}
\end{center}
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9966e5d44..33f9019c6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -68,4 +68,4 @@ maintainer-clean-local: clean-doc
EXTRA_DIST = $(SRCFILES) $(NABCSRCFILES) \
GregorioRef.pdf \
GregorioNabcRef.pdf \
- README.md
+ doc_README.md
diff --git a/doc/README.md b/doc/doc_README.md
similarity index 94%
rename from doc/README.md
rename to doc/doc_README.md
index 2085baa0c..199bc6cae 100644
--- a/doc/README.md
+++ b/doc/doc_README.md
@@ -12,8 +12,8 @@ internal workings of gregorio.
## Building
To compile the pdf you must have
- * an up-to-date [TeXLive](https://www.tug.org/texlive/) system, with at least the `luatex` bundle and `latexmk`
- * the [Linux Libertine](http://www.linuxlibertine.org/index.php?id=1&L=1) and [Inconsolata](http://www.levien.com/type/myfonts/inconsolata.html) fonts (distributed by TeXLive too)
+ * an up-to-date [TeX Live](https://www.tug.org/texlive/) system, with at least the `luatex` bundle and `latexmk`
+ * the [Linux Libertine](http://www.linuxlibertine.org/index.php?id=1&L=1) and [Inconsolata](http://www.levien.com/type/myfonts/inconsolata.html) fonts (distributed by TeX Live too)
* the [`pygments` library](http://pygments.org/)
Once you have run `./configure` in the main directory, run `make doc` in this directory.
diff --git a/fonts/Makefile.am b/fonts/Makefile.am
index 620af81bc..9e6ac3782 100644
--- a/fonts/Makefile.am
+++ b/fonts/Makefile.am
@@ -35,7 +35,7 @@ SOURCEFILES_GRECILIAE = greciliae-base.sfd
SOURCEFILES_GREGORIO = gregorio-base.sfd
SOURCEFILES_GRANAPADANO = granapadano-base.sfd
SOURCEFILES_EXTRA = greextra.sfd gregall.sfd gresgmodern.sfd grelaon.sfd
-SOURCEFILES_TOOLS = squarize.py stemsschemas.py convertsfdtottf.py README.md \
+SOURCEFILES_TOOLS = squarize.py stemsschemas.py convertsfdtottf.py fonts_README.md \
simplify.py
SOURCEFILES_ALL = $(SOURCEFILES_GREGORIO) $(SOURCEFILES_GRANAPADANO) \
$(SOURCEFILES_GRECILIAE)
@@ -43,6 +43,8 @@ SOURCEFILES_ALL = $(SOURCEFILES_GREGORIO) $(SOURCEFILES_GRANAPADANO) \
EXTRA_DIST = $(TTF_GRECILIAE) $(TTF_GRECILIAE_OP) $(TTF_EXTRA) \
$(SOURCEFILES_GRECILIAE) $(SOURCEFILES_EXTRA) $(SOURCEFILES_TOOLS)
+MAINTAINERCLEANFILES = supp_fonts-$(FILENAME_VERSION).zip *.pyc
+
FONTFORGE = fontforge
RM = rm
diff --git a/fonts/README.md b/fonts/fonts_README.md
similarity index 100%
rename from fonts/README.md
rename to fonts/fonts_README.md
diff --git a/fonts/greextra.sfd b/fonts/greextra.sfd
index 42a9b2fd1..6e4f3c83e 100644
--- a/fonts/greextra.sfd
+++ b/fonts/greextra.sfd
@@ -3,7 +3,7 @@ FontName: greextra
FullName: greextra
FamilyName: greextra
Weight: Extra-Light
-Copyright: greciliae font, adapted with fontforge by Elie Roux\nCopyright (C) 2007 Matthew Spencer\nwith Reserved Font Name Caeciliae\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\n\nThis license is available with a FAQ at: http://scripts.sil.org/OFL
+Copyright: greextra font, adapted with fontforge by Elie Roux\nCopyright (C) 2007-2018 Matthew Spencer\nwith Reserved Font Name Caeciliae\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\n\nThis license is available with a FAQ at: http://scripts.sil.org/OFL
Version: 1.0
ItalicAngle: 0
UnderlinePosition: -204
diff --git a/fonts/squarize.py b/fonts/squarize.py
index 08234eff8..3f7c65b07 100644
--- a/fonts/squarize.py
+++ b/fonts/squarize.py
@@ -90,7 +90,7 @@
14 : 'Fourteen',
}
-GREGORIO_VERSION = '5.1.0'
+GREGORIO_VERSION = '5.1.1'
# 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 a19f867e4..ded80fd62 100755
--- a/install-gtex.sh
+++ b/install-gtex.sh
@@ -72,11 +72,11 @@ TEXFILES=(tex/gregoriotex*.tex tex/gsp-default.tex tex/gregoriotex*.lua
tex/*.dat)
LATEXFILES=(tex/gregorio*.sty)
TTFFILES=(fonts/*.ttf)
-DOCFILES=(doc/*.tex doc/*.lua doc/*.gabc doc/*.pdf doc/README.md)
+DOCFILES=(doc/*.tex doc/*.lua doc/*.gabc doc/*.pdf doc/doc_README.md)
EXAMPLEFILES=(examples/FactusEst.gabc examples/PopulusSion.gabc
examples/main-lualatex.tex examples/debugging.tex)
FONTSRCFILES=(greextra.sfd squarize.py convertsfdtottf.py gregall.sfd
- gresgmodern.sfd README.md)
+ gresgmodern.sfd fonts_README.md)
FONTSRCFILES=("${FONTSRCFILES[@]/#/fonts/}")
FONTSRCFILES+=(fonts/*-base.sfd)
# Files which have been eliminated, or whose installation location have been
diff --git a/macosx/Gregorio.pkgproj b/macosx/Gregorio.pkgproj
index f62f9433e..2863f5614 100755
--- a/macosx/Gregorio.pkgproj
+++ b/macosx/Gregorio.pkgproj
@@ -603,7 +603,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
- <string>5.1.0</string><!--GREGORIO_VERSION-->
+ <string>5.1.1</string><!--GREGORIO_VERSION-->
</dict>
<key>TYPE</key>
<integer>0</integer>
@@ -884,7 +884,7 @@ If you have a TeX distribution installed in a non-standard location, then either
</dict>
</array>
<key>NAME</key>
- <string>TeXLive Check</string>
+ <string>TeX Live Check</string>
<key>STATE</key>
<true/>
</dict>
diff --git a/macosx/create_package.sh b/macosx/create_package.sh
index 576c1366f..7340f0df7 100755
--- a/macosx/create_package.sh
+++ b/macosx/create_package.sh
@@ -41,6 +41,7 @@ done
HERE=`pwd`
cd ..
+TOP=`pwd`
VERSION=`./VersionManager.py --get-current`
# First we compile Gregorio and build all the necessary pacakge components.
@@ -50,7 +51,7 @@ BUILDDIR=$HERE/build
if [ -d "$BUILDDIR" ]; then
echo "Using existing build"
else
- cd $HERE/..
+ cd $TOP
./build.sh --arch=x86_64
# If the build process fails we halt this script here, since we can't build the
# package without a properly compiled version of Gregorio.
@@ -75,14 +76,14 @@ else
mkdir $EXTRASDIR
mkdir $EXTRASDIR/doc
mkdir $EXTRASDIR/examples
- cd $HERE/../doc
+ cd $TOP/doc
make doc
- cd ..
+ cd $TOP
cp doc/*.tex $EXTRASDIR/doc/
cp doc/*.lua $EXTRASDIR/doc/
cp doc/*.gabc $EXTRASDIR/doc/
cp doc/*.pdf $EXTRASDIR/doc/
- cp doc/README.md $EXTRASDIR/doc/
+ cp doc/doc_README.md $EXTRASDIR/doc/
cp -r contrib/ $EXTRASDIR/contrib
find $EXTRASDIR/contrib -name 'Makefile*' -delete
cp examples/*.tex $EXTRASDIR/examples/
@@ -96,7 +97,7 @@ if [ -d "$RESOURCEDIR" ]; then
echo "Using existing installer resources"
else
mkdir $RESOURCEDIR
- cd $HERE/..
+ cd $TOP
pandoc -s ./README.md -f markdown -t html -o $RESOURCEDIR/README.html
pandoc -s ./COPYING.md -f markdown -t html -o $RESOURCEDIR/COPYING.html
# We redirect the relative links in the above files to point to particular
@@ -122,15 +123,13 @@ packagesbuild Uninstall-Gregorio.pkgproj
# Having built the pacakges, we move them out of the build directory, attaching
# the version number to the filename in the process.
-# The uninstall pacakge doesn't need the version number because it doesn't
-# care about the version of gregorio.
VERSION=`echo $VERSION | sed s:[.]:_:g`
-mv $BUILDDIR/Gregorio.pkg ../Gregorio-$VERSION.pkg
-mv $BUILDDIR/Uninstall-Gregorio.pkg ../Uninstall-Gregorio-$VERSION.pkg
+mv $BUILDDIR/Gregorio.pkg $TOP/Gregorio-$VERSION.pkg
+mv $BUILDDIR/Uninstall-Gregorio.pkg $TOP/Uninstall-Gregorio-$VERSION.pkg
# Now we clean up
if $clean; then
- cd ..
+ cd $TOP
make maintainer-clean
cd $HERE
rm -rf build/
diff --git a/macosx/douninstall.sh b/macosx/douninstall.sh
index 4d20d0356..e2d117bb9 100755
--- a/macosx/douninstall.sh
+++ b/macosx/douninstall.sh
@@ -20,7 +20,7 @@ GREFONTDIR="$TEXMFLOCAL/fonts/truetype/public/gregoriotex"
GREFONTSOURCE="$TEXMFLOCAL/fonts/source/gregoriotex"
GREDOCDIR="$TEXMFLOCAL/doc/luatex/gregoriotex"
-rm "$BINDIR/gregorio-5_1_0" # FILENAME_VERSION
+rm "$BINDIR/gregorio-5_1_1" # FILENAME_VERSION
rm "$PKGCONFIGDIR/gregorio.pc"
rm -rf "$GREINCLUDEDIR"
rm -rf "$GRETEXDIR"
diff --git a/macosx/README.md b/macosx/mac_README.md
similarity index 98%
rename from macosx/README.md
rename to macosx/mac_README.md
index 039aaf337..cb01469fb 100644
--- a/macosx/README.md
+++ b/macosx/mac_README.md
@@ -12,7 +12,7 @@ It will also build an Uninstall package which has an empty payload. This packag
## Limitations
-It is problematic (to say the least) for a package installer to place files in a user's home directory on a Mac. As a result, this installer will always target a systme-wide installation for both the command-line tool and TeXLive.
+It is problematic (to say the least) for a package installer to place files in a user's home directory on a Mac. As a result, this installer will always target a systme-wide installation for both the command-line tool and TeX Live.
This installer is only targeted at Intel based Macs.
diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty
index 910c4c17e..f1e61d0ae 100644
--- a/tex/gregoriosyms.sty
+++ b/tex/gregoriosyms.sty
@@ -19,7 +19,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gregoriosyms}
- [2018/03/16 v5.1.0 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+ [2018/03/25 v5.1.1 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%
@@ -39,7 +39,7 @@
% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
-\xdef\gre@gregoriotexversion{5.1.0}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregoriotexversion{5.1.1}% GREGORIO_VERSION - VersionManager.py
\providecommand{\gre@declarefileversion}[2]{\relax}
diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex
index 35114a39f..e9b2c0766 100644
--- a/tex/gregoriotex-chars.tex
+++ b/tex/gregoriotex-chars.tex
@@ -17,7 +17,7 @@
% You should have received a copy of the GNU General Public License
% along with Gregorio. If not, see <http://www.gnu.org/licenses/>.
-\gre@declarefileversion{gregoriotex-chars.tex}{5.1.0}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-chars.tex}{5.1.1}% 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-common.tex b/tex/gregoriotex-common.tex
index 1301defcd..b244df6b4 100644
--- a/tex/gregoriotex-common.tex
+++ b/tex/gregoriotex-common.tex
@@ -17,7 +17,7 @@
% You should have received a copy of the GNU General Public License
% along with Gregorio. If not, see <http://www.gnu.org/licenses/>.
-\gre@declarefileversion{gregoriotex-commonx.tex}{5.1.0}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-commonx.tex}{5.1.1}% GREGORIO_VERSION
%%%%%%%%%
diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex
index 637f1d811..7bcc8fa30 100644
--- a/tex/gregoriotex-main.tex
+++ b/tex/gregoriotex-main.tex
@@ -21,7 +21,7 @@
% The version of gregorio. All gregoriotex*.tex files must have the same.
% All gtex files must also have the same version.
-\xdef\gre@gregoriotexversion{5.1.0}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregoriotexversion{5.1.1}% GREGORIO_VERSION - VersionManager.py
\ifluatex%
\ifnum\luatexversion<76%
diff --git a/tex/gregoriotex-nabc.lua b/tex/gregoriotex-nabc.lua
index b9f6f9709..9a6a30f0d 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 5.1.0
+-- GREGORIO_VERSION 5.1.1
local catcode_at_letter = luatexbase.catcodetables['gre@atletter']
diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex
index aa5a3190e..bb0c2af6b 100644
--- a/tex/gregoriotex-nabc.tex
+++ b/tex/gregoriotex-nabc.tex
@@ -19,7 +19,7 @@
% this file contains macros for St. Gall ancient neume support
-\gre@declarefileversion{gregoriotex-nabc.tex}{5.1.0}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-nabc.tex}{5.1.1}% GREGORIO_VERSION
\xdef\gre@nabcfontname{gregall}%
diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua
index 3c9bd96ee..e1955d285 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 5.1.0
+-- GREGORIO_VERSION 5.1.1
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex
index ba359cd03..939af9ec2 100644
--- a/tex/gregoriotex-signs.tex
+++ b/tex/gregoriotex-signs.tex
@@ -22,7 +22,7 @@
\def\grebarbracewidth{.58879}%
-\gre@declarefileversion{gregoriotex-signs.tex}{5.1.0}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-signs.tex}{5.1.1}% GREGORIO_VERSION
\def\gre@usestylecommon{%
\gre@trace{gre@usestylecommon}%
diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex
index 1c0e9aa50..d39885df1 100644
--- a/tex/gregoriotex-spaces.tex
+++ b/tex/gregoriotex-spaces.tex
@@ -19,7 +19,7 @@
% this file contains definitions of spaces
-\gre@declarefileversion{gregoriotex-spaces.tex}{5.1.0}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-spaces.tex}{5.1.1}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for tuning penalties
diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex
index 48c891d68..f76c5b0ad 100644
--- a/tex/gregoriotex-syllable.tex
+++ b/tex/gregoriotex-syllable.tex
@@ -19,7 +19,7 @@
% this file contains definitions of the glyphs and the syllables
-\gre@declarefileversion{gregoriotex-syllable.tex}{5.1.0}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-syllable.tex}{5.1.1}% GREGORIO_VERSION
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% macros for the typesetting of the different glyphs
diff --git a/tex/gregoriotex-symbols.lua b/tex/gregoriotex-symbols.lua
index 89eefb530..3c8c7236f 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 5.1.0
+-- GREGORIO_VERSION 5.1.1
local err = gregoriotex.module.err
local warn = gregoriotex.module.warn
diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex
index 095595eb6..61fb8060d 100644
--- a/tex/gregoriotex-symbols.tex
+++ b/tex/gregoriotex-symbols.tex
@@ -22,7 +22,7 @@
\ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi%
\def\gregoriotex@symbols@loaded{}%
-\gre@declarefileversion{gregoriotex-symbols.tex}{5.1.0}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-symbols.tex}{5.1.1}% GREGORIO_VERSION
\RequireLuaModule{gregoriotex}%
diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua
index 720d9bdfd..ff2006ebf 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 = '5.1.0' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '5.1.1' -- GREGORIO_VERSION (comment used by VersionManager.py)
local err, warn, info, log = luatexbase.provides_module({
name = "gregoriotex",
- version = '5.1.0', -- GREGORIO_VERSION
+ version = '5.1.1', -- GREGORIO_VERSION
greinternalversion = internalversion,
- date = "2018/03/16", -- GREGORIO_DATE_LTX
+ date = "2018/03/25", -- GREGORIO_DATE_LTX
description = "GregorioTeX module.",
author = "The Gregorio Project (see CONTRIBUTORS.md)",
copyright = "2008-2018 - The Gregorio Project",
@@ -146,7 +146,7 @@ local function gregorio_exe()
local exe_version
-- first look for one with the exact version
- real_gregorio_exe = 'gregorio-5_1_0' -- FILENAME_VERSION
+ real_gregorio_exe = 'gregorio-5_1_1' -- FILENAME_VERSION
local cmd = string.format("%s -o %%s %s", real_gregorio_exe,
test_snippet_filename)
exe_version = get_prog_output(cmd, '*line')
diff --git a/tex/gregoriotex.sty b/tex/gregoriotex.sty
index dc78d3af6..b1ae85517 100644
--- a/tex/gregoriotex.sty
+++ b/tex/gregoriotex.sty
@@ -19,7 +19,7 @@
\NeedsTeXFormat{LaTeX2e}%
\ProvidesPackage{gregoriotex}%
- [2018/03/16 v5.1.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+ [2018/03/25 v5.1.1 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 60e8d2712..b5b590b88 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.
-% [2018/03/16 v5.1.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% [2018/03/25 v5.1.1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
\edef\greoldcatcode{\the\catcode`@}
diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc
index 113be63af..0a6cd2518 100644
--- a/windows/gregorio-resources.rc
+++ b/windows/gregorio-resources.rc
@@ -1,7 +1,7 @@
IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
1 VERSIONINFO
-FILEVERSION 5,1,0,30
-PRODUCTVERSION 5,1,0,30
+FILEVERSION 5,1,1,30
+PRODUCTVERSION 5,1,1,30
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -9,12 +9,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Gregorio project"
VALUE "FileDescription", "Gregorio"
- VALUE "FileVersion", "5.1.0"
+ VALUE "FileVersion", "5.1.1"
VALUE "InternalName", "gregorio"
VALUE "LegalCopyright", "See COPYING in the installation directory."
VALUE "OriginalFilename", "gregorio.exe"
VALUE "ProductName", "Gregorio"
- VALUE "ProductVersion", "5.1.0"
+ VALUE "ProductVersion", "5.1.1"
END
END
diff --git a/windows/gregorio.iss b/windows/gregorio.iss
index 1ad9624b6..703193d90 100644
--- a/windows/gregorio.iss
+++ b/windows/gregorio.iss
@@ -1,6 +1,6 @@
[Setup]
AppName=gregorio
-AppVersion=5.1.0
+AppVersion=5.1.1
DefaultDirName={pf}\gregorio
DefaultGroupName=gregorio
SetupIconFile=gregorio.ico
@@ -49,7 +49,7 @@ Name: "{app}\texmf\doc\luatex\gregoriotex\examples"
[Files]
; PARSE_VERSION_FILE_NEXTLINE
-Source: "../src/gregorio-5_1_0.exe"; DestDir: "{app}\bin";
+Source: "../src/gregorio-5_1_1.exe"; DestDir: "{app}\bin";
Source: "gregorio.ico"; DestDir: "{app}";
Source: "install.lua"; DestDir: "{app}";
Source: "uninstall.lua"; DestDir: "{app}";
@@ -141,7 +141,7 @@ begin
StaticText := TNewStaticText.Create(Page);
StaticText.Top := ScaleY(60);;
- StaticText.Caption := 'The best way to install LuaTeX is to install the TeXLive distribution.';
+ StaticText.Caption := 'The best way to install LuaTeX is to install the TeX Live distribution.';
StaticText.Parent := Page.Surface;
StaticText := TNewStaticText.Create(Page);
@@ -151,7 +151,7 @@ begin
StaticText := TNewStaticText.Create(Page);
StaticText.Top := ScaleY(100);;
- StaticText.Caption := 'Note that you have to reboot your computer after having installed TeXLive';
+ StaticText.Caption := 'Note that you have to reboot your computer after having installed TeX Live';
StaticText.Parent := Page.Surface;
StaticText := TNewStaticText.Create(Page);
diff --git a/windows/install.lua b/windows/install.lua
index 6a98ee1ed..f63a65d7f 100644
--- a/windows/install.lua
+++ b/windows/install.lua
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
This texlua script is called in Windows automatic installer (see gregorio.iss),
-it configures Gregorio under windows to work with TeXLive or MiKTeX.
+it configures Gregorio under windows to work with TeX Live or MiKTeX.
--]]
require("lfs")
@@ -88,7 +88,7 @@ function copy_files()
end
print("Copying files into texmf tree...")
if string.find(string.lower(texmfdist), "texlive") then
- print("Distribution is TeXLive")
+ print("Distribution is TeX Live")
print("GregorioTeX files...")
os.spawn("xcopy texmf "..texmflocal.." /e /f /y")
elseif string.find(string.lower(texmfdist), "miktex") then
diff --git a/windows/uninstall.lua b/windows/uninstall.lua
index c174e0f9e..6ad8963a1 100644
--- a/windows/uninstall.lua
+++ b/windows/uninstall.lua
@@ -129,7 +129,7 @@ function remove_texmf_install()
end
if install_was_present then
--[[Since we removed some fonts, we need to rebuild the font databases.
- Since this function is only used when extracting files from a TeXLive
+ Since this function is only used when extracting files from a TeX Live
texmf tree, we don't need to go through the distribution check.
]]--
os.spawn("luaotfload-tool -u")
diff --git a/windows/README.md b/windows/windows_README.md
similarity index 100%
rename from windows/README.md
rename to windows/windows_README.md