Update Version number

gregorio-project · Mar 13, 2021 · c796e83 · c796e83
1 parent c1da183
commit c796e83
Show file tree

Hide file tree

Showing 26 changed files with 39 additions and 34 deletions.
diff --git a/.gregorio-version b/.gregorio-version
@@ -1,4 +1,4 @@
-6.0.0-beta2
+6.0.0
 2021
 
 *** Do not modify this file. ***

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,11 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased][CTAN]
 
 
+## [6.0.0] - 2021-03-13
+
+
+
+
 ## [6.0.0-beta2] - 2021-03-04
 
 

diff --git 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],[6.0.0-beta2],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="6_0_0-beta2"
+AC_INIT([gregorio],[6.0.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="6_0_0"
 AC_SUBST(FILENAME_VERSION)
 AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
 MK=""

diff --git a/ctan-o-mat.config b/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{v6.0.0-beta2} % GREGORIO_VERSION
+\version{v6.0.0} % GREGORIO_VERSION
 % -------------------------------------------------------------------------
 % This field contains the name of the author(s).
 % The value is optional.

diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex
@@ -183,7 +183,7 @@
 
     \vspace{1cm}
 
-    \large Version \textbf{6.0.0-beta2}, 4 March 2021 %% PARSE_VERSION_DATE
+    \large Version \textbf{6.0.0}, 13 March 2021 %% PARSE_VERSION_DATE
 
     \vspace{1.5cm}
   \end{center}

diff --git a/fonts/squarize.py b/fonts/squarize.py
@@ -90,7 +90,7 @@
     14 : 'Fourteen',
 }
 
-GREGORIO_VERSION = '6.0.0-beta2'
+GREGORIO_VERSION = '6.0.0'
 
 # The unicode character at which we start our numbering:
 # U+E000 is the start of the BMP Private Use Area

diff --git a/macosx/Gregorio.pkgproj b/macosx/Gregorio.pkgproj
@@ -603,7 +603,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>6.0.0-beta2</string><!--GREGORIO_VERSION-->
+				<string>6.0.0</string><!--GREGORIO_VERSION-->
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>

diff --git 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-6_0_0-beta2" # FILENAME_VERSION
+rm "$BINDIR/gregorio-6_0_0" # FILENAME_VERSION
 rm "$PKGCONFIGDIR/gregorio.pc"
 rm -rf "$GREINCLUDEDIR"
 rm -rf "$GRETEXDIR"

diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty
@@ -19,7 +19,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{gregoriosyms}
-    [2021/03/04 v6.0.0-beta2 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+    [2021/03/13 v6.0.0 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
 
 \RequirePackage{iftex}%
 \RequireLuaTeX
@@ -41,7 +41,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{6.0.0-beta2}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregoriotexversion{6.0.0}% GREGORIO_VERSION - VersionManager.py
 
 \providecommand{\gre@declarefileversion}[2]{\relax}
 

diff --git 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}{6.0.0-beta2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-chars.tex}{6.0.0}% 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
@@ -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-common.tex}{6.0.0-beta2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-common.tex}{6.0.0}% GREGORIO_VERSION
 
 \ifnum\luatexversion<76%
   \gre@error{Error: this document must be compiled with LuaTeX (lualatex) 0.76 or later}%

diff --git a/tex/gregoriotex-gsp-default.tex b/tex/gregoriotex-gsp-default.tex
@@ -20,7 +20,7 @@
 % this file contains definitions of spaces and penalties
 
 % version check
-\gre@declarefileversion{gregoriotex-gsp-default.tex}{6.0.0-beta2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-gsp-default.tex}{6.0.0}% GREGORIO_VERSION
 
 
 %% First, the penalties

diff --git 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{6.0.0-beta2}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregoriotexversion{6.0.0}% GREGORIO_VERSION - VersionManager.py
 
 % first some macros to allow checks for version:
 % Tests that all gregoriotex files are of the same version.

diff --git 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 6.0.0-beta2
+-- GREGORIO_VERSION 6.0.0
 
 local catcode_at_letter = luatexbase.catcodetables['gre@atletter']
 

diff --git 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}{6.0.0-beta2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-nabc.tex}{6.0.0}% GREGORIO_VERSION
 
 
 \xdef\gre@nabcfontname{gregall}%

diff --git 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 6.0.0-beta2
+-- GREGORIO_VERSION 6.0.0
 
 local err = gregoriotex.module.err
 local warn = gregoriotex.module.warn

diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex
@@ -22,7 +22,7 @@
 
 \def\grebarbracewidth{.58879}%
 
-\gre@declarefileversion{gregoriotex-signs.tex}{6.0.0-beta2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-signs.tex}{6.0.0}% GREGORIO_VERSION
 
 \def\gre@usestylecommon{%
   \gre@trace{gre@usestylecommon}%

diff --git 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}{6.0.0-beta2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-spaces.tex}{6.0.0}% GREGORIO_VERSION
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% macros for tuning penalties

diff --git 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}{6.0.0-beta2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-syllable.tex}{6.0.0}% GREGORIO_VERSION
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% macros for the typesetting of the different glyphs

diff --git 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 6.0.0-beta2
+-- GREGORIO_VERSION 6.0.0
 
 local err = gregoriotex.module.err
 local warn = gregoriotex.module.warn

diff --git 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}{6.0.0-beta2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-symbols.tex}{6.0.0}% GREGORIO_VERSION
 
 \RequireLuaModule{gregoriotex}%
 

diff --git 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 = '6.0.0-beta2' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '6.0.0' -- GREGORIO_VERSION (comment used by VersionManager.py)
 
 local err, warn, info, log = luatexbase.provides_module({
     name               = "gregoriotex",
-    version            = '6.0.0-beta2', -- GREGORIO_VERSION
+    version            = '6.0.0', -- GREGORIO_VERSION
     greinternalversion = internalversion,
-    date               = "2021/03/04", -- GREGORIO_DATE_LTX
+    date               = "2021/03/13", -- GREGORIO_DATE_LTX
     description        = "GregorioTeX module.",
     author             = "The Gregorio Project (see CONTRIBUTORS.md)",
     copyright          = "2008-2021 - 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-6_0_0-beta2' -- FILENAME_VERSION
+    real_gregorio_exe = 'gregorio-6_0_0' -- 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
@@ -19,7 +19,7 @@
 
 \NeedsTeXFormat{LaTeX2e}%
 \ProvidesPackage{gregoriotex}%
-    [2021/03/04 v6.0.0-beta2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+    [2021/03/13 v6.0.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
 
 \RequirePackage{iftex}%
 \RequireLuaTeX

diff --git 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.
-% 		[2021/03/04 v6.0.0-beta2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% 		[2021/03/13 v6.0.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
 
 \input iftex.sty
 \RequireLuaTeX%

diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc
@@ -1,20 +1,20 @@
 IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
 1 VERSIONINFO
-FILEVERSION     6,0,0,12
-PRODUCTVERSION  6,0,0,12
+FILEVERSION     6,0,0,30
+PRODUCTVERSION  6,0,0,30
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
     BLOCK "040904E4"
     BEGIN
       VALUE "CompanyName", "Gregorio project"
       VALUE "FileDescription", "Gregorio"
-      VALUE "FileVersion", "6.0.0-beta2"
+      VALUE "FileVersion", "6.0.0"
       VALUE "InternalName", "gregorio"
       VALUE "LegalCopyright", "See COPYING in the installation directory."
       VALUE "OriginalFilename", "gregorio.exe"
       VALUE "ProductName", "Gregorio"
-      VALUE "ProductVersion", "6.0.0-beta2"
+      VALUE "ProductVersion", "6.0.0"
     END
   END
 

diff --git a/windows/gregorio.iss b/windows/gregorio.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=gregorio
-AppVersion=6.0.0-beta2
+AppVersion=6.0.0
 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-6_0_0-beta2.exe"; DestDir: "{app}\bin";
+Source: "../src/gregorio-6_0_0.exe"; DestDir: "{app}\bin";
 Source: "gregorio.ico"; DestDir: "{app}";
 Source: "install.lua"; DestDir: "{app}";
 Source: "uninstall.lua"; DestDir: "{app}";