Update Version Number

.gregorio-version

@@ -1,5 +1,5 @@
-5.2.1
-2019
+6.0.0-beta1
+2021
 
 *** Do not modify this file. ***
 Use VersionManager.py to change the version.

CHANGELOG.md

@@ -3,32 +3,31 @@ 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][develop]
-### Fixed
-- Fixed some problem in 900_gregorio.xml (Scribus render frame tool).  First, the use of `filecontents` rather than `filecontents*` was leading to a comment header that made it impossible for Gregorio to find the gabc headers in the temporary score file.  Further, some of the indenting (which makes the file more human readable) was leading to errors in the formatting of the created files because they are processed in a way which handles whitespace differently from XML.  See [#1457](https://github.com/gregorio-project/gregorio/issues/1457).
-- `spacelinestext` is now based on the lyric font size instead of being a fixed distance.  As a result, large lyrics should no longer overlap with low notes.  See [#1261](https://github.com/gregorio-project/gregorio/issues/1261).
-- Added parenthesized figures for virgula (gabc: `` `?``), divisio minima (gabc: ` ,?`), flat (gabc: `x?`), natural (gabc: `y?`), and sharp (gabc: `#?`).  See [#1475](https://github.com/gregorio-project/gregorio/issues/1475).
 
-### Added
-- Default spacings are now designated internal and thus always loaded.  `gsp-sample.tex` is added to the `doc` folder to show users how to create their own custom spacing configuration.  As part of this change, spacing configuration files no longer need to be complete.  Since the default configuration is always loaded at package startup, all needed penalties and spacings will be defined and the user's configuration file need only specify those whose value they wish to customize.  Addresses issues raised in [#1460](https://github.com/gregorio-project/gregorio/issues/1460).  **This is a change to the user interface and warrants a major release.**
-- Added additional message to verbose output of command-line tool to prevent confusion when a custom Latin vowel convention is found that the internal Latin rules will be used.  See [#1470](https://github.com/gregorio-project/gregorio/issues/1470).
-- Added `$` in gabc text to prevent special interpretation of the character that follows.  See [#1515](https://github.com/gregorio-project/gregorio/issues/1515)
 
 ## [Unreleased][CTAN]
-### Changed
-- The space between a non-punctum inclinatum and the upright punctum inclinatum is renamed to uprightpunctuminclinatumshift.  This helps to better distinguish it from punctuminclinatumunisonshift (the space between two consecutive ascending or descending puncta inclinata on the same line).  See [#1507](https://github.com/gregorio-project/gregorio/issues/1507).
 
+
+## [6.0.0-beta1] - 2021-02-23
 ### Fixed
+- Fixed some problem in 900_gregorio.xml (Scribus render frame tool).  First, the use of `filecontents` rather than `filecontents*` was leading to a comment header that made it impossible for Gregorio to find the gabc headers in the temporary score file.  Further, some of the indenting (which makes the file more human readable) was leading to errors in the formatting of the created files because they are processed in a way which handles whitespace differently from XML.  See [#1457](https://github.com/gregorio-project/gregorio/issues/1457).
+- `spacelinestext` is now based on the lyric font size instead of being a fixed distance.  As a result, large lyrics should no longer overlap with low notes.  See [#1261](https://github.com/gregorio-project/gregorio/issues/1261).
+- Added parenthesized figures for virgula (gabc: `` `?``), divisio minima (gabc: ` ,?`), flat (gabc: `x?`), natural (gabc: `y?`), and sharp (gabc: `#?`).  See [#1475](https://github.com/gregorio-project/gregorio/issues/1475).
 - Staff line thickness is now set in gsp-default.tex.  This corrects a problem with the staff lines changing thickness when the default spacing configuration is loaded while the staff size is something other than the default (17).  See [#1461](https://github.com/gregorio-project/gregorio/issues/1461).
 - Corrected interaction issues between text styles and ligatures.  The LaTeX commands like `\textit` insert italics correction, preventing ligatures being formed between their arguments if two occur sequentially.  On the other hand the switches like `\itshape` do not.  Since gregorio breaks up syllables around the vowel and then applies the formating commands to each part, this behavior showed up.  We switch to using the switches to avoid this (except for underlining, for which a switch does not exist).  We also fix this for color tags by loading `luacolor` which changes how the `\color` tag is implemented to allow ligatures to span groups.  See [#1444](https://github.com/gregorio-project/gregorio/issues/1444).
 - A reuse of a save register led to the `\hyphenpenalty` not being restored correctly at the end of the score.  All save registers are now clearly identified by when they are used so as to make it harder to accidentally use the wrong one.  See [posts on mailing list](https://groups.google.com/g/gregorio-users/c/u3LmnGYnhwU).
 - Fixed an overly specific find/replace in snippets that that led to `\par` being able to slip into the snippet file under certain circumstances (and there by causing compilation to fail).  See [#1497](https://github.com/gregorio-project/gregorio/issues/1497).
 - Updated to use iftex package (the sucessor to ifluatex).  See [#1481](https://github.com/gregorio-project/gregorio/issues/1481).
 
 ### Added
+- Default spacings are now designated internal and thus always loaded.  `gsp-sample.tex` is added to the `doc` folder to show users how to create their own custom spacing configuration.  As part of this change, spacing configuration files no longer need to be complete.  Since the default configuration is always loaded at package startup, all needed penalties and spacings will be defined and the user's configuration file need only specify those whose value they wish to customize.  Addresses issues raised in [#1460](https://github.com/gregorio-project/gregorio/issues/1460).  **This is a change to the user interface and warrants a major release.**
+- Added additional message to verbose output of command-line tool to prevent confusion when a custom Latin vowel convention is found that the internal Latin rules will be used.  See [#1470](https://github.com/gregorio-project/gregorio/issues/1470).
+- Added `$` in gabc text to prevent special interpretation of the character that follows.  See [#1515](https://github.com/gregorio-project/gregorio/issues/1515)
 - GregorioTeX will now look in additional places for scores using.  Users can specify paths to look in using `\gresetgregpath`.  If scores are not found in the current working directory or the list of provided paths, we fall back on kpse to try and find them.  See [#1395](https://github.com/gregorio-project/gregorio/issues/1395).
 - Added the ability to toggle the visibility of the translation and above lines text.  See [user request on mailing list](https://groups.google.com/g/gregorio-users/c/J-V0dkBMevY).
 
 ### Changed
+- The space between a non-punctum inclinatum and the upright punctum inclinatum is renamed to uprightpunctuminclinatumshift.  This helps to better distinguish it from punctuminclinatumunisonshift (the space between two consecutive ascending or descending puncta inclinata on the same line).  See [#1507](https://github.com/gregorio-project/gregorio/issues/1507).
 - `noteadditionalspacelinestext` now calculates the actual amount of additional space needed by low notes.  To enable the old behavior (when `noteadditionalspacelinestext` is set by the user), use `\gresetnoteadditionalspacelinestext{manual}`.  See [#1521](https://github.com/gregorio-project/gregorio/issues/1521) and [#1526](https://github.com/gregorio-project/gregorio/pull/1526).
 
 ### Removed

COPYING.md

@@ -1,6 +1,6 @@
 #License of Gregorio
 
-The program Gregorio is Copyright (C) 2007-2019 The Gregorio Project,
+The program Gregorio is Copyright (C) 2007-2021 The Gregorio Project,
 see [CONTRIBUTORS.md](CONTRIBUTORS.md) for authors. It is distributed
 under the GPLv3 license, printed below.
 

Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 #
 # This file is part of Gregorio.
 #

VersionManager.py

@@ -5,7 +5,7 @@
 
     See VersionUpdate.py -h for help
 
-    Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
+    Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md)
 
     This file is part of Gregorio.
 

build-ctan.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# Copyright (C) 2016-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2016-2021 The Gregorio Project (see CONTRIBUTORS.md)
 #
 # This file is part of Gregorio.
 #

configure.ac

@@ -1,5 +1,5 @@
 dnl Gregorio
-dnl Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+dnl Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 dnl
 dnl This file is part of Gregorio.
 dnl
@@ -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.2.1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="5_2_1"
+AC_INIT([gregorio],[6.0.0-beta1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="6_0_0-beta1"
 AC_SUBST(FILENAME_VERSION)
 AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
 MK=""

contrib/900_gregorio.xml

@@ -3,7 +3,7 @@
  XML file for using gregorio inside scribus.
  Copyright (C) 2009 Pierre Couderc <[email protected]>.
  Copyright (C) 2010 Elie Roux <[email protected]>
- Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
+ Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md)
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

contrib/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 #
 # This file is part of Gregorio.
 #

contrib/TeXShop/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 #
 # This file is part of Gregorio.
 #

contrib/checkSyllabation.py

@@ -5,7 +5,7 @@
 
     See checkSyllabation.py -h for help
 
-    Copyright (C) 2016-2019 Elie Roux
+    Copyright (C) 2016-2021 Elie Roux
 
     Permission is hereby granted, free of charge, to any person obtaining a copy of
     this software and associated documentation files (the "Software"), to deal in

contrib/gabc.lang

@@ -2,7 +2,7 @@
 <!--
 
  Author: Elie Roux <[email protected]>
- Copyright (C) 2008-2019 Elie Roux <[email protected]>
+ Copyright (C) 2008-2021 Elie Roux <[email protected]>
 
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

contrib/gprocess

@@ -14,7 +14,7 @@
 # --
 #
 # v0.1
-# Copyright (C) 2008-2019 Richard Chonak <[email protected]>
+# Copyright (C) 2008-2021 Richard Chonak <[email protected]>
 #
 
 # This program is free software: you can redistribute it and/or modify

coverage.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2016-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2016-2021 The Gregorio Project (see CONTRIBUTORS.md)
 # 
 # This file is part of Gregorio.
 #

ctan-o-mat.config

@@ -20,7 +20,7 @@
 % This field contains the version of the package.
 % The value is optional.
 % The value is restricted to 32 characters.
-\version{v5.2.1} % GREGORIO_VERSION
+\version{v6.0.0-beta1} % GREGORIO_VERSION
 % -------------------------------------------------------------------------
 % This field contains the name of the author(s).
 % The value is optional.

ctan_upload.sh

@@ -1,6 +1,6 @@
 # !/usr/bin/env bash
 
-# Copyright (C) 2019-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2021-2021 The Gregorio Project (see CONTRIBUTORS.md)
 #
 # This file is part of Gregorio.
 #

debian/copyright

@@ -4,15 +4,15 @@ Upstream-Contact: Elie Roux <[email protected]>
 Source: https://github.com/gregorio-project/gregorio/releases
 
 Files: *
-Copyright: 2008-2019 The Gregorio Project
+Copyright: 2008-2021 The Gregorio Project
 License: GPL-3+
 
 Files: fonts/gregorio*
-Copyright: 2008-2019 The Gregorio Project
+Copyright: 2008-2021 The Gregorio Project
 License: GPL-3font+
 
 Files: fonts/granapadano*
-Copyright: 2008-2019 Juergen Reuter, the Gregorio Project
+Copyright: 2008-2021 Juergen Reuter, the Gregorio Project
 License: GPL-3font+
 
 Files: fonts/greciliae*

debian/manpage.xml

@@ -53,7 +53,7 @@ and docbook-xsl in your Build-Depends control field.
       &dhsurname;
     </author>
     <copyright>
-      <year>2007-2019</year> <!--Copyright Elie Roux-->
+      <year>2007-2021</year> <!--Copyright Elie Roux-->
       <holder>&dhusername;</holder>
     </copyright>
     &dhdate;

doc/Appendix_Font_Tables.tex

@@ -1,7 +1,7 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %

doc/Command_Index_User.tex

@@ -1,7 +1,7 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %

doc/Command_Index_gregorio.tex

@@ -1,7 +1,7 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %

doc/Command_Index_internal.tex

@@ -1,7 +1,7 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %

doc/Gabc.tex

@@ -1,7 +1,7 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %

doc/GregorioNabcRef.tex

@@ -1,6 +1,6 @@
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %

doc/GregorioRef.lua

@@ -1,4 +1,4 @@
--- Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+-- Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 --
 -- This file is part of Gregorio.
 --

doc/GregorioRef.tex

@@ -1,6 +1,6 @@
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -183,7 +183,7 @@
 
     \vspace{1cm}
 
-    \large Version \textbf{5.2.1}, 6 April 2019 %% PARSE_VERSION_DATE
+    \large Version \textbf{6.0.0-beta1}, 23 February 2021 %% PARSE_VERSION_DATE
 
     \vspace{1.5cm}
   \end{center}

doc/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 #
 # This file is part of Gregorio.
 #

doc/gsp-sample.tex

@@ -1,6 +1,6 @@
 %GregorioTeX file.
 %
-% Copyright (C) 2010-2019 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2010-2021 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %

examples/Makefile.am

@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 #
 # This file is part of Gregorio.
 #

fonts/Makefile.am

@@ -1,7 +1,7 @@
 ## This makefile is made to build to fonts from the sfd, it won't be useful for
 ## the average user.
 
-# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
 #
 # This file is part of Gregorio.
 #

fonts/convertsfdtottf.py

@@ -7,7 +7,7 @@
     Python fontforge script to convert from fontforge's native sfd
     to a TrueType font (ttf).
 
-    Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
+    Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md)
 
     This file is part of Gregorio.
 

fonts/granapadano-base.sfd

@@ -3,7 +3,7 @@ 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 <[email protected]>\nCopyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<<GPLV3>>
+Copyright: LilyPond's pretty-but-neat music font, adapted to the Gregorio Project.\nCopyright (C) 2002-2006 Juergen Reuter <[email protected]>\nCopyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<<GPLV3>>
 UComments: "2007-4-12: Created." 
 Version: 1.0
 ItalicAngle: 0

fonts/greciliae-base.sfd

@@ -3,7 +3,7 @@ FontName: greciliae
 FullName: greciliae
 FamilyName: greciliae
 Weight: Medium
-Copyright: Greciliae font\nCopyright (C) 2007 Matthew Spencer with Reserved Font Name "Caeciliae",\nCopyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)\nwith Reserved Font Name "Greciliae".\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\nThis license is also available with a FAQ at:\nhttp://scripts.sil.org/OFL
+Copyright: Greciliae font\nCopyright (C) 2007 Matthew Spencer with Reserved Font Name "Caeciliae",\nCopyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)\nwith Reserved Font Name "Greciliae".\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\nThis license is also available with a FAQ at:\nhttp://scripts.sil.org/OFL
 UComments: "2007-4-12: Created." 
 Version: 1.2
 ItalicAngle: 0