From 29b43bcfe52d53a39659500892d1521db9c03dcb Mon Sep 17 00:00:00 2001 From: "Fr. Samuel Springuel" Date: Mon, 10 Feb 2025 09:38:23 -0500 Subject: [PATCH] Update Version number --- .gregorio-version | 4 +- CHANGELOG.md | 6 + COPYING.md | 2 +- Makefile.am | 2 +- VersionManager.py | 2 +- build-ctan.sh | 2 +- configure.ac | 6 +- contrib/900_gregorio.xml | 2 +- contrib/Makefile.am | 2 +- contrib/TeXShop/Makefile.am | 2 +- contrib/checkSyllabation.py | 2 +- contrib/gabc.lang | 2 +- contrib/gprocess | 2 +- coverage.sh | 2 +- ctan-o-mat.config | 2 +- ctan_upload.sh | 2 +- debian/copyright | 6 +- debian/manpage.xml | 2 +- doc/Appendix_Font_Tables.tex | 2 +- doc/Command_Index_User.tex | 2 +- doc/Command_Index_gregorio.tex | 2 +- doc/Command_Index_internal.tex | 2 +- doc/Gabc.tex | 2 +- doc/GregorioNabcRef.tex | 2 +- doc/GregorioRef.lua | 2 +- doc/GregorioRef.tex | 4 +- doc/Makefile.am | 2 +- doc/gsp-sample.tex | 2 +- examples/Makefile.am | 2 +- fonts/Makefile.am | 2 +- fonts/convertsfdtottf.py | 2 +- fonts/granapadano-base.sfd | 2 +- fonts/greciliae-base.sfd | 2 +- fonts/gregall.sfd | 2 +- fonts/gregorio-base.sfd | 2 +- fonts/grelaon.sfd | 2 +- fonts/gresgmodern.sfd | 2 +- fonts/install_supp_fonts.lua | 2 +- fonts/simplify.py | 2 +- fonts/squarize.py | 4 +- fonts/stemsschemas.py | 2 +- install-gtex.sh | 2 +- install.sh | 2 +- macosx/Gregorio.pkgproj | 2 +- macosx/douninstall.sh | 2 +- src/Makefile.am | 2 +- src/bool.h | 2 +- src/characters.c | 2 +- src/characters.h | 2 +- src/config.h | 2 +- src/dump/dump.c | 2 +- src/encode_utf8strings.c | 2 +- src/enum_generator.h | 2 +- src/gabc/gabc-elements-determination.c | 2 +- src/gabc/gabc-glyphs-determination.c | 2 +- src/gabc/gabc-notes-determination.l | 2 +- src/gabc/gabc-score-determination.c | 2 +- src/gabc/gabc-score-determination.h | 2 +- src/gabc/gabc-score-determination.l | 2 +- src/gabc/gabc-score-determination.y | 2 +- src/gabc/gabc-write.c | 2 +- src/gabc/gabc.h | 2 +- src/gregorio-utils.c | 4 +- src/gregoriotex/gregoriotex-position.c | 2 +- src/gregoriotex/gregoriotex-write.c | 2 +- src/gregoriotex/gregoriotex.h | 2 +- src/messages.c | 2 +- src/messages.h | 2 +- src/plugins.h | 2 +- src/sha1.c | 2 +- src/sha1.h | 2 +- src/struct.c | 2 +- src/struct.h | 2 +- src/struct_iter.h | 2 +- src/support.c | 2 +- src/support.h | 2 +- src/unicode.c | 2 +- src/unicode.h | 2 +- src/utf8strings.h.in | 2 +- src/vowel/vowel-rules.h | 2 +- src/vowel/vowel-rules.l | 2 +- src/vowel/vowel-rules.y | 2 +- src/vowel/vowel.c | 2 +- src/vowel/vowel.h | 2 +- tex/Makefile.am | 2 +- tex/gregorio-vowels.dat | 2 +- tex/gregoriosyms.sty | 6 +- tex/gregoriotex-chars.tex | 4 +- tex/gregoriotex-common.tex | 4 +- tex/gregoriotex-gsp-default.tex | 4 +- tex/gregoriotex-main.tex | 4 +- tex/gregoriotex-nabc.lua | 2 +- tex/gregoriotex-nabc.tex | 4 +- tex/gregoriotex-signs.lua | 4 +- tex/gregoriotex-signs.tex | 4 +- tex/gregoriotex-spaces.tex | 4 +- tex/gregoriotex-syllable.tex | 4 +- tex/gregoriotex-symbols.lua | 4 +- tex/gregoriotex-symbols.tex | 4 +- tex/gregoriotex.lua | 12 +- tex/gregoriotex.sty | 4 +- tex/gregoriotex.tex | 4 +- windows/gregorio-resources.rc | 8 +- windows/gregorio.iss | 392 ++++++++++++------------- windows/install.lua | 2 +- windows/uninstall.lua | 2 +- 106 files changed, 337 insertions(+), 331 deletions(-) diff --git a/.gregorio-version b/.gregorio-version index caa6c41f..41ed0120 100644 --- a/.gregorio-version +++ b/.gregorio-version @@ -1,5 +1,5 @@ -6.0.0 -2021 +6.1.0-beta1 +2025 *** Do not modify this file. *** Use VersionManager.py to change the version. diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f121245..dcfd9b31 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ 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] + + +## [Unreleased][CTAN] + + +## [6.1.0-beta1] - 2025-02-10 ### Fixed - Multiple Scribus render frames were all using the same file name, which would result in the same score appearing in all render frames. This change makes the score files use an available Scribus variable to force multiple file names. - When kpsewhich cannot write to a particular location, it generates an error which is directed to stderr but not to our glog file. This created an undocumented error when trying to write to a gtex file to a bad location. We now capture stderr output produced when compiling scores and redirect it to our glog file so that the error is properly recorded. Fixes [#1541](https://github.com/gregorio-project/gregorio/issues/1541). diff --git a/COPYING.md b/COPYING.md index 9b83602d..c3c9ae3d 100644 --- a/COPYING.md +++ b/COPYING.md @@ -1,6 +1,6 @@ #License of Gregorio -The program Gregorio is Copyright (C) 2007-2021 The Gregorio Project, +The program Gregorio is Copyright (C) 2007-2025 The Gregorio Project, see [CONTRIBUTORS.md](CONTRIBUTORS.md) for authors. It is distributed under the GPLv3 license, printed below. diff --git a/Makefile.am b/Makefile.am index 52de851b..6b13dfca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/VersionManager.py b/VersionManager.py index 70de4740..df21ea8f 100755 --- a/VersionManager.py +++ b/VersionManager.py @@ -5,7 +5,7 @@ See VersionUpdate.py -h for help - Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) This file is part of Gregorio. diff --git a/build-ctan.sh b/build-ctan.sh index 4f7a4ed0..ce86e53d 100755 --- a/build-ctan.sh +++ b/build-ctan.sh @@ -1,6 +1,6 @@ #! /usr/bin/env bash -# Copyright (C) 2016-2021 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2016-2025 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/configure.ac b/configure.ac index 9493e5af..ad0d1c10 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ dnl Gregorio -dnl Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +dnl Copyright (C) 2006-2025 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 . -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_INIT([gregorio],[6.1.0-beta1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) +FILENAME_VERSION="6_1_0-beta1" AC_SUBST(FILENAME_VERSION) AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names]) MK="" diff --git a/contrib/900_gregorio.xml b/contrib/900_gregorio.xml index 7591fd10..990516d0 100644 --- a/contrib/900_gregorio.xml +++ b/contrib/900_gregorio.xml @@ -3,7 +3,7 @@ XML file for using gregorio inside scribus. Copyright (C) 2009 Pierre Couderc . Copyright (C) 2010 Elie Roux - Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + Copyright (C) 2015-2025 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 diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 6fefd35a..f01c8f59 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/contrib/TeXShop/Makefile.am b/contrib/TeXShop/Makefile.am index c2f56efe..e2de2352 100644 --- a/contrib/TeXShop/Makefile.am +++ b/contrib/TeXShop/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/contrib/checkSyllabation.py b/contrib/checkSyllabation.py index 9b9dc5a6..c3e63b47 100755 --- a/contrib/checkSyllabation.py +++ b/contrib/checkSyllabation.py @@ -5,7 +5,7 @@ See checkSyllabation.py -h for help - Copyright (C) 2016-2021 Elie Roux + Copyright (C) 2016-2025 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 diff --git a/contrib/gabc.lang b/contrib/gabc.lang index 03f84cb1..9cee9029 100644 --- a/contrib/gabc.lang +++ b/contrib/gabc.lang @@ -2,7 +2,7 @@ + 2007-2025 &dhusername; &dhdate; diff --git a/doc/Appendix_Font_Tables.tex b/doc/Appendix_Font_Tables.tex index f89f3353..5149bf0b 100644 --- a/doc/Appendix_Font_Tables.tex +++ b/doc/Appendix_Font_Tables.tex @@ -1,7 +1,7 @@ % !TEX root = GregorioRef.tex % !TEX program = LuaLaTeX+se % -% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/doc/Command_Index_User.tex b/doc/Command_Index_User.tex index 7b85e08a..91ce3262 100644 --- a/doc/Command_Index_User.tex +++ b/doc/Command_Index_User.tex @@ -1,7 +1,7 @@ % !TEX root = GregorioRef.tex % !TEX program = LuaLaTeX+se % -% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/doc/Command_Index_gregorio.tex b/doc/Command_Index_gregorio.tex index f96974fb..e3f97d82 100644 --- a/doc/Command_Index_gregorio.tex +++ b/doc/Command_Index_gregorio.tex @@ -1,7 +1,7 @@ % !TEX root = GregorioRef.tex % !TEX program = LuaLaTeX+se % -% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/doc/Command_Index_internal.tex b/doc/Command_Index_internal.tex index cbc209be..20c9a1e0 100644 --- a/doc/Command_Index_internal.tex +++ b/doc/Command_Index_internal.tex @@ -1,7 +1,7 @@ % !TEX root = GregorioRef.tex % !TEX program = LuaLaTeX+se % -% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/doc/Gabc.tex b/doc/Gabc.tex index 54c38fec..b81cbfef 100644 --- a/doc/Gabc.tex +++ b/doc/Gabc.tex @@ -1,7 +1,7 @@ % !TEX root = GregorioRef.tex % !TEX program = LuaLaTeX+se % -% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/doc/GregorioNabcRef.tex b/doc/GregorioNabcRef.tex index 15b74f1f..a5de2e1c 100644 --- a/doc/GregorioNabcRef.tex +++ b/doc/GregorioNabcRef.tex @@ -1,6 +1,6 @@ % !TEX program = LuaLaTeX+se % -% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/doc/GregorioRef.lua b/doc/GregorioRef.lua index 88278f70..bb09a386 100644 --- a/doc/GregorioRef.lua +++ b/doc/GregorioRef.lua @@ -1,4 +1,4 @@ --- Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +-- Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) -- -- This file is part of Gregorio. -- diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex index eb16d50e..0413cdd1 100644 --- a/doc/GregorioRef.tex +++ b/doc/GregorioRef.tex @@ -1,6 +1,6 @@ % !TEX program = LuaLaTeX+se % -% Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -183,7 +183,7 @@ \vspace{1cm} - \large Version \textbf{6.0.0}, 13 March 2021 %% PARSE_VERSION_DATE + \large Version \textbf{6.1.0-beta1}, 10 February 2025 %% PARSE_VERSION_DATE \vspace{1.5cm} \gresetlinecolor{gregoriocolor} diff --git a/doc/Makefile.am b/doc/Makefile.am index f757ac8c..aa643f91 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/doc/gsp-sample.tex b/doc/gsp-sample.tex index 75402c45..ed8aff03 100644 --- a/doc/gsp-sample.tex +++ b/doc/gsp-sample.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2010-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2010-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % diff --git a/examples/Makefile.am b/examples/Makefile.am index 3ab28bdd..7569cbe4 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/fonts/Makefile.am b/fonts/Makefile.am index 5093522c..977e7588 100644 --- a/fonts/Makefile.am +++ b/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-2021 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/fonts/convertsfdtottf.py b/fonts/convertsfdtottf.py index 81434b42..a525c6f2 100644 --- a/fonts/convertsfdtottf.py +++ b/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-2021 The Gregorio Project (see CONTRIBUTORS.md) + Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) This file is part of Gregorio. diff --git a/fonts/granapadano-base.sfd b/fonts/granapadano-base.sfd index b960c70d..6a0c4c3c 100644 --- a/fonts/granapadano-base.sfd +++ b/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 \nCopyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<> +Copyright: LilyPond's pretty-but-neat music font, adapted to the Gregorio Project.\nCopyright (C) 2002-2006 Juergen Reuter \nCopyright (C) 2007-2025 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<> UComments: "2007-4-12: Created." Version: 1.0 ItalicAngle: 0 diff --git a/fonts/greciliae-base.sfd b/fonts/greciliae-base.sfd index 7e2fec7c..fa3ffef7 100644 --- a/fonts/greciliae-base.sfd +++ b/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-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 +Copyright: Greciliae font\nCopyright (C) 2007 Matthew Spencer with Reserved Font Name "Caeciliae",\nCopyright (C) 2007-2025 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 diff --git a/fonts/gregall.sfd b/fonts/gregall.sfd index d6dcb2dd..fb3787ab 100644 --- a/fonts/gregall.sfd +++ b/fonts/gregall.sfd @@ -3,7 +3,7 @@ FontName: gregall FullName: gregall FamilyName: gregall Weight: Book -Copyright: gregall font, created with FontForge.\nCopyright (C) 2014-2021 Jakub Jelinek \n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\n\nSIL OPEN FONT LICENSE\n\nVersion 1.1 - 26 February 2007\n\nPREAMBLE\n\nThe goals of the Open Font License (OFL) are to stimulate worldwide\ndevelopment of collaborative font projects, to support the font creation\nefforts of academic and linguistic communities, and to provide a free and\nopen framework in which fonts may be shared and improved in partnership\nwith others.\n\nThe OFL allows the licensed fonts to be used, studied, modified and\nredistributed freely as long as they are not sold by themselves. The\nfonts, including any derivative works, can be bundled, embedded,\nredistributed and/or sold with any software provided that any reserved\nnames are not used by derivative works. The fonts and derivatives,\nhowever, cannot be released under any other type of license. The\nrequirement for fonts to remain under this license does not apply\nto any document created using the fonts or their derivatives.\n\nDEFINITIONS\n\n"Font Software" refers to the set of files released by the Copyright\nHolder(s) under this license and clearly marked as such. This may\ninclude source files, build scripts and documentation.\n\n"Reserved Font Name" refers to any names specified as such after the\ncopyright statement(s).\n\n"Original Version" refers to the collection of Font Software components as\ndistributed by the Copyright Holder(s).\n\n"Modified Version" refers to any derivative made by adding to, deleting,\nor substituting - in part or in whole - any of the components of the\nOriginal Version, by changing formats or by porting the Font Software to a\nnew environment.\n\n"Author" refers to any designer, engineer, programmer, technical\nwriter or other person who contributed to the Font Software.\n\nPERMISSION & CONDITIONS\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of the Font Software, to use, study, copy, merge, embed, modify,\nredistribute, and sell modified and unmodified copies of the Font\nSoftware, subject to the following conditions:\n\n1) Neither the Font Software nor any of its individual components,\nin Original or Modified Versions, may be sold by itself.\n\n2) Original or Modified Versions of the Font Software may be bundled,\nredistributed and/or sold with any software, provided that each copy\ncontains the above copyright notice and this license. These can be\nincluded either as stand-alone text files, human-readable headers or\nin the appropriate machine-readable metadata fields within text or\nbinary files as long as those fields can be easily viewed by the user.\n\n3) No Modified Version of the Font Software may use the Reserved Font\nName(s) unless explicit written permission is granted by the corresponding\nCopyright Holder. This restriction only applies to the primary font name as\npresented to the users.\n\n4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\nSoftware shall not be used to promote, endorse or advertise any\nModified Version, except to acknowledge the contribution(s) of the\nCopyright Holder(s) and the Author(s) or with their explicit written\npermission.\n\n5) The Font Software, modified or unmodified, in part or in whole,\nmust be distributed entirely under this license, and must not be\ndistributed under any other license. The requirement for fonts to\nremain under this license does not apply to any document created\nusing the Font Software.\n\nTERMINATION\n\nThis license becomes null and void if any of the above conditions are\nnot met.\n\nDISCLAIMER\n\nTHE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\nOF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\nCOPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nINCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL\nDAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\nOTHER DEALINGS IN THE FONT SOFTWARE. +Copyright: gregall font, created with FontForge.\nCopyright (C) 2014-2025 Jakub Jelinek \n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\n\nSIL OPEN FONT LICENSE\n\nVersion 1.1 - 26 February 2007\n\nPREAMBLE\n\nThe goals of the Open Font License (OFL) are to stimulate worldwide\ndevelopment of collaborative font projects, to support the font creation\nefforts of academic and linguistic communities, and to provide a free and\nopen framework in which fonts may be shared and improved in partnership\nwith others.\n\nThe OFL allows the licensed fonts to be used, studied, modified and\nredistributed freely as long as they are not sold by themselves. The\nfonts, including any derivative works, can be bundled, embedded,\nredistributed and/or sold with any software provided that any reserved\nnames are not used by derivative works. The fonts and derivatives,\nhowever, cannot be released under any other type of license. The\nrequirement for fonts to remain under this license does not apply\nto any document created using the fonts or their derivatives.\n\nDEFINITIONS\n\n"Font Software" refers to the set of files released by the Copyright\nHolder(s) under this license and clearly marked as such. This may\ninclude source files, build scripts and documentation.\n\n"Reserved Font Name" refers to any names specified as such after the\ncopyright statement(s).\n\n"Original Version" refers to the collection of Font Software components as\ndistributed by the Copyright Holder(s).\n\n"Modified Version" refers to any derivative made by adding to, deleting,\nor substituting - in part or in whole - any of the components of the\nOriginal Version, by changing formats or by porting the Font Software to a\nnew environment.\n\n"Author" refers to any designer, engineer, programmer, technical\nwriter or other person who contributed to the Font Software.\n\nPERMISSION & CONDITIONS\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of the Font Software, to use, study, copy, merge, embed, modify,\nredistribute, and sell modified and unmodified copies of the Font\nSoftware, subject to the following conditions:\n\n1) Neither the Font Software nor any of its individual components,\nin Original or Modified Versions, may be sold by itself.\n\n2) Original or Modified Versions of the Font Software may be bundled,\nredistributed and/or sold with any software, provided that each copy\ncontains the above copyright notice and this license. These can be\nincluded either as stand-alone text files, human-readable headers or\nin the appropriate machine-readable metadata fields within text or\nbinary files as long as those fields can be easily viewed by the user.\n\n3) No Modified Version of the Font Software may use the Reserved Font\nName(s) unless explicit written permission is granted by the corresponding\nCopyright Holder. This restriction only applies to the primary font name as\npresented to the users.\n\n4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\nSoftware shall not be used to promote, endorse or advertise any\nModified Version, except to acknowledge the contribution(s) of the\nCopyright Holder(s) and the Author(s) or with their explicit written\npermission.\n\n5) The Font Software, modified or unmodified, in part or in whole,\nmust be distributed entirely under this license, and must not be\ndistributed under any other license. The requirement for fonts to\nremain under this license does not apply to any document created\nusing the Font Software.\n\nTERMINATION\n\nThis license becomes null and void if any of the above conditions are\nnot met.\n\nDISCLAIMER\n\nTHE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\nOF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\nCOPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nINCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL\nDAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\nOTHER DEALINGS IN THE FONT SOFTWARE. Version: 0.1 ItalicAngle: 0 UnderlinePosition: -100 diff --git a/fonts/gregorio-base.sfd b/fonts/gregorio-base.sfd index 8432b467..5e636d18 100644 --- a/fonts/gregorio-base.sfd +++ b/fonts/gregorio-base.sfd @@ -3,7 +3,7 @@ FontName: gregorio FullName: gregorio FamilyName: gregorio Weight: Medium -Copyright: Font named "gregorio"\nCopyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<> +Copyright: Font named "gregorio"\nCopyright (C) 2007-2025 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<> UComments: "2007-4-12: Created." Version: 1.2 ItalicAngle: 0 diff --git a/fonts/grelaon.sfd b/fonts/grelaon.sfd index 416a096d..2a6da8e6 100644 --- a/fonts/grelaon.sfd +++ b/fonts/grelaon.sfd @@ -3,7 +3,7 @@ FontName: grelaon FullName: grelaon FamilyName: grelaon Weight: Book -Copyright: grelaon font, created with FontForge.\nCopyright (C) 2016-2021 Jakub Jelinek \n\nThe background images in font source are taken from the LAON_BM_ms239 manuscript with permission of Bibliotheque municipale de Laon,\nhttp://manuscrit.ville-laon.fr\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\n\nSIL OPEN FONT LICENSE\n\nVersion 1.1 - 26 February 2007\n\nPREAMBLE\n\nThe goals of the Open Font License (OFL) are to stimulate worldwide\ndevelopment of collaborative font projects, to support the font creation\nefforts of academic and linguistic communities, and to provide a free and\nopen framework in which fonts may be shared and improved in partnership\nwith others.\n\nThe OFL allows the licensed fonts to be used, studied, modified and\nredistributed freely as long as they are not sold by themselves. The\nfonts, including any derivative works, can be bundled, embedded,\nredistributed and/or sold with any software provided that any reserved\nnames are not used by derivative works. The fonts and derivatives,\nhowever, cannot be released under any other type of license. The\nrequirement for fonts to remain under this license does not apply\nto any document created using the fonts or their derivatives.\n\nDEFINITIONS\n\n"Font Software" refers to the set of files released by the Copyright\nHolder(s) under this license and clearly marked as such. This may\ninclude source files, build scripts and documentation.\n\n"Reserved Font Name" refers to any names specified as such after the\ncopyright statement(s).\n\n"Original Version" refers to the collection of Font Software components as\ndistributed by the Copyright Holder(s).\n\n"Modified Version" refers to any derivative made by adding to, deleting,\nor substituting - in part or in whole - any of the components of the\nOriginal Version, by changing formats or by porting the Font Software to a\nnew environment.\n\n"Author" refers to any designer, engineer, programmer, technical\nwriter or other person who contributed to the Font Software.\n\nPERMISSION & CONDITIONS\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of the Font Software, to use, study, copy, merge, embed, modify,\nredistribute, and sell modified and unmodified copies of the Font\nSoftware, subject to the following conditions:\n\n1) Neither the Font Software nor any of its individual components,\nin Original or Modified Versions, may be sold by itself.\n\n2) Original or Modified Versions of the Font Software may be bundled,\nredistributed and/or sold with any software, provided that each copy\ncontains the above copyright notice and this license. These can be\nincluded either as stand-alone text files, human-readable headers or\nin the appropriate machine-readable metadata fields within text or\nbinary files as long as those fields can be easily viewed by the user.\n\n3) No Modified Version of the Font Software may use the Reserved Font\nName(s) unless explicit written permission is granted by the corresponding\nCopyright Holder. This restriction only applies to the primary font name as\npresented to the users.\n\n4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\nSoftware shall not be used to promote, endorse or advertise any\nModified Version, except to acknowledge the contribution(s) of the\nCopyright Holder(s) and the Author(s) or with their explicit written\npermission.\n\n5) The Font Software, modified or unmodified, in part or in whole,\nmust be distributed entirely under this license, and must not be\ndistributed under any other license. The requirement for fonts to\nremain under this license does not apply to any document created\nusing the Font Software.\n\nTERMINATION\n\nThis license becomes null and void if any of the above conditions are\nnot met.\n\nDISCLAIMER\n\nTHE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\nOF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\nCOPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nINCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL\nDAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\nOTHER DEALINGS IN THE FONT SOFTWARE. +Copyright: grelaon font, created with FontForge.\nCopyright (C) 2016-2025 Jakub Jelinek \n\nThe background images in font source are taken from the LAON_BM_ms239 manuscript with permission of Bibliotheque municipale de Laon,\nhttp://manuscrit.ville-laon.fr\n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\n\nSIL OPEN FONT LICENSE\n\nVersion 1.1 - 26 February 2007\n\nPREAMBLE\n\nThe goals of the Open Font License (OFL) are to stimulate worldwide\ndevelopment of collaborative font projects, to support the font creation\nefforts of academic and linguistic communities, and to provide a free and\nopen framework in which fonts may be shared and improved in partnership\nwith others.\n\nThe OFL allows the licensed fonts to be used, studied, modified and\nredistributed freely as long as they are not sold by themselves. The\nfonts, including any derivative works, can be bundled, embedded,\nredistributed and/or sold with any software provided that any reserved\nnames are not used by derivative works. The fonts and derivatives,\nhowever, cannot be released under any other type of license. The\nrequirement for fonts to remain under this license does not apply\nto any document created using the fonts or their derivatives.\n\nDEFINITIONS\n\n"Font Software" refers to the set of files released by the Copyright\nHolder(s) under this license and clearly marked as such. This may\ninclude source files, build scripts and documentation.\n\n"Reserved Font Name" refers to any names specified as such after the\ncopyright statement(s).\n\n"Original Version" refers to the collection of Font Software components as\ndistributed by the Copyright Holder(s).\n\n"Modified Version" refers to any derivative made by adding to, deleting,\nor substituting - in part or in whole - any of the components of the\nOriginal Version, by changing formats or by porting the Font Software to a\nnew environment.\n\n"Author" refers to any designer, engineer, programmer, technical\nwriter or other person who contributed to the Font Software.\n\nPERMISSION & CONDITIONS\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of the Font Software, to use, study, copy, merge, embed, modify,\nredistribute, and sell modified and unmodified copies of the Font\nSoftware, subject to the following conditions:\n\n1) Neither the Font Software nor any of its individual components,\nin Original or Modified Versions, may be sold by itself.\n\n2) Original or Modified Versions of the Font Software may be bundled,\nredistributed and/or sold with any software, provided that each copy\ncontains the above copyright notice and this license. These can be\nincluded either as stand-alone text files, human-readable headers or\nin the appropriate machine-readable metadata fields within text or\nbinary files as long as those fields can be easily viewed by the user.\n\n3) No Modified Version of the Font Software may use the Reserved Font\nName(s) unless explicit written permission is granted by the corresponding\nCopyright Holder. This restriction only applies to the primary font name as\npresented to the users.\n\n4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\nSoftware shall not be used to promote, endorse or advertise any\nModified Version, except to acknowledge the contribution(s) of the\nCopyright Holder(s) and the Author(s) or with their explicit written\npermission.\n\n5) The Font Software, modified or unmodified, in part or in whole,\nmust be distributed entirely under this license, and must not be\ndistributed under any other license. The requirement for fonts to\nremain under this license does not apply to any document created\nusing the Font Software.\n\nTERMINATION\n\nThis license becomes null and void if any of the above conditions are\nnot met.\n\nDISCLAIMER\n\nTHE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\nOF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\nCOPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nINCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL\nDAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\nOTHER DEALINGS IN THE FONT SOFTWARE. Version: 0.1 ItalicAngle: 0 UnderlinePosition: -100 diff --git a/fonts/gresgmodern.sfd b/fonts/gresgmodern.sfd index a560b2f4..7f7b2622 100644 --- a/fonts/gresgmodern.sfd +++ b/fonts/gresgmodern.sfd @@ -3,7 +3,7 @@ FontName: gresgmodern FullName: gresgmodern FamilyName: gresgmodern Weight: Normal -Copyright: (c) 2011 Association Saint-Benoit, Notre-Dame de Bellaigue, FR 63330 VIRLET\n\n(c) 2014-2021 Jakub Jelinek \n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\n\nSIL OPEN FONT LICENSE\n\nVersion 1.1 - 26 February 2007\n\nPREAMBLE\n\nThe goals of the Open Font License (OFL) are to stimulate worldwide\ndevelopment of collaborative font projects, to support the font creation\nefforts of academic and linguistic communities, and to provide a free and\nopen framework in which fonts may be shared and improved in partnership\nwith others.\n\nThe OFL allows the licensed fonts to be used, studied, modified and\nredistributed freely as long as they are not sold by themselves. The\nfonts, including any derivative works, can be bundled, embedded,\nredistributed and/or sold with any software provided that any reserved\nnames are not used by derivative works. The fonts and derivatives,\nhowever, cannot be released under any other type of license. The\nrequirement for fonts to remain under this license does not apply\nto any document created using the fonts or their derivatives.\n\nDEFINITIONS\n\n"Font Software" refers to the set of files released by the Copyright\nHolder(s) under this license and clearly marked as such. This may\ninclude source files, build scripts and documentation.\n\n"Reserved Font Name" refers to any names specified as such after the\ncopyright statement(s).\n\n"Original Version" refers to the collection of Font Software components as\ndistributed by the Copyright Holder(s).\n\n"Modified Version" refers to any derivative made by adding to, deleting,\nor substituting - in part or in whole - any of the components of the\nOriginal Version, by changing formats or by porting the Font Software to a\nnew environment.\n\n"Author" refers to any designer, engineer, programmer, technical\nwriter or other person who contributed to the Font Software.\n\nPERMISSION & CONDITIONS\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of the Font Software, to use, study, copy, merge, embed, modify,\nredistribute, and sell modified and unmodified copies of the Font\nSoftware, subject to the following conditions:\n\n1) Neither the Font Software nor any of its individual components,\nin Original or Modified Versions, may be sold by itself.\n\n2) Original or Modified Versions of the Font Software may be bundled,\nredistributed and/or sold with any software, provided that each copy\ncontains the above copyright notice and this license. These can be\nincluded either as stand-alone text files, human-readable headers or\nin the appropriate machine-readable metadata fields within text or\nbinary files as long as those fields can be easily viewed by the user.\n\n3) No Modified Version of the Font Software may use the Reserved Font\nName(s) unless explicit written permission is granted by the corresponding\nCopyright Holder. This restriction only applies to the primary font name as\npresented to the users.\n\n4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\nSoftware shall not be used to promote, endorse or advertise any\nModified Version, except to acknowledge the contribution(s) of the\nCopyright Holder(s) and the Author(s) or with their explicit written\npermission.\n\n5) The Font Software, modified or unmodified, in part or in whole,\nmust be distributed entirely under this license, and must not be\ndistributed under any other license. The requirement for fonts to\nremain under this license does not apply to any document created\nusing the Font Software.\n\nTERMINATION\n\nThis license becomes null and void if any of the above conditions are\nnot met.\n\nDISCLAIMER\n\nTHE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\nOF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\nCOPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nINCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL\nDAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\nOTHER DEALINGS IN THE FONT SOFTWARE. +Copyright: (c) 2011 Association Saint-Benoit, Notre-Dame de Bellaigue, FR 63330 VIRLET\n\n(c) 2014-2025 Jakub Jelinek \n\nThis Font Software is licensed under the SIL Open Font License, Version 1.1.\n\nSIL OPEN FONT LICENSE\n\nVersion 1.1 - 26 February 2007\n\nPREAMBLE\n\nThe goals of the Open Font License (OFL) are to stimulate worldwide\ndevelopment of collaborative font projects, to support the font creation\nefforts of academic and linguistic communities, and to provide a free and\nopen framework in which fonts may be shared and improved in partnership\nwith others.\n\nThe OFL allows the licensed fonts to be used, studied, modified and\nredistributed freely as long as they are not sold by themselves. The\nfonts, including any derivative works, can be bundled, embedded,\nredistributed and/or sold with any software provided that any reserved\nnames are not used by derivative works. The fonts and derivatives,\nhowever, cannot be released under any other type of license. The\nrequirement for fonts to remain under this license does not apply\nto any document created using the fonts or their derivatives.\n\nDEFINITIONS\n\n"Font Software" refers to the set of files released by the Copyright\nHolder(s) under this license and clearly marked as such. This may\ninclude source files, build scripts and documentation.\n\n"Reserved Font Name" refers to any names specified as such after the\ncopyright statement(s).\n\n"Original Version" refers to the collection of Font Software components as\ndistributed by the Copyright Holder(s).\n\n"Modified Version" refers to any derivative made by adding to, deleting,\nor substituting - in part or in whole - any of the components of the\nOriginal Version, by changing formats or by porting the Font Software to a\nnew environment.\n\n"Author" refers to any designer, engineer, programmer, technical\nwriter or other person who contributed to the Font Software.\n\nPERMISSION & CONDITIONS\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of the Font Software, to use, study, copy, merge, embed, modify,\nredistribute, and sell modified and unmodified copies of the Font\nSoftware, subject to the following conditions:\n\n1) Neither the Font Software nor any of its individual components,\nin Original or Modified Versions, may be sold by itself.\n\n2) Original or Modified Versions of the Font Software may be bundled,\nredistributed and/or sold with any software, provided that each copy\ncontains the above copyright notice and this license. These can be\nincluded either as stand-alone text files, human-readable headers or\nin the appropriate machine-readable metadata fields within text or\nbinary files as long as those fields can be easily viewed by the user.\n\n3) No Modified Version of the Font Software may use the Reserved Font\nName(s) unless explicit written permission is granted by the corresponding\nCopyright Holder. This restriction only applies to the primary font name as\npresented to the users.\n\n4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font\nSoftware shall not be used to promote, endorse or advertise any\nModified Version, except to acknowledge the contribution(s) of the\nCopyright Holder(s) and the Author(s) or with their explicit written\npermission.\n\n5) The Font Software, modified or unmodified, in part or in whole,\nmust be distributed entirely under this license, and must not be\ndistributed under any other license. The requirement for fonts to\nremain under this license does not apply to any document created\nusing the Font Software.\n\nTERMINATION\n\nThis license becomes null and void if any of the above conditions are\nnot met.\n\nDISCLAIMER\n\nTHE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT\nOF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE\nCOPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,\nINCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL\nDAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\nFROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM\nOTHER DEALINGS IN THE FONT SOFTWARE. Version: 0.3 ItalicAngle: 0 UnderlinePosition: -150 diff --git a/fonts/install_supp_fonts.lua b/fonts/install_supp_fonts.lua index d8944df3..c6cbe84c 100755 --- a/fonts/install_supp_fonts.lua +++ b/fonts/install_supp_fonts.lua @@ -1,7 +1,7 @@ #!/usr/bin/env texlua --[[ Gregorio font automatic installation script. -Copyright (C) 2010-2021 Gregorio Project authors +Copyright (C) 2010-2025 Gregorio Project authors 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 diff --git a/fonts/simplify.py b/fonts/simplify.py index 8b722546..bbbf646c 100644 --- a/fonts/simplify.py +++ b/fonts/simplify.py @@ -8,7 +8,7 @@ because simplification doesn't work in squarize.py due to bugs in fontforge. - Copyright (C) 2016-2021 The Gregorio Project (see CONTRIBUTORS.md) + Copyright (C) 2016-2025 The Gregorio Project (see CONTRIBUTORS.md) This file is part of Gregorio. diff --git a/fonts/squarize.py b/fonts/squarize.py index 46981337..336460fd 100644 --- a/fonts/squarize.py +++ b/fonts/squarize.py @@ -6,7 +6,7 @@ """ Python fontforge script to build a square notation font. - Copyright (C) 2013-2021 The Gregorio Project (see CONTRIBUTORS.md) + Copyright (C) 2013-2025 The Gregorio Project (see CONTRIBUTORS.md) This file is part of Gregorio. @@ -89,7 +89,7 @@ 14 : 'Fourteen', } -GREGORIO_VERSION = '6.0.0' +GREGORIO_VERSION = '6.1.0-beta1' # The unicode character at which we start our numbering: # U+E000 is the start of the BMP Private Use Area diff --git a/fonts/stemsschemas.py b/fonts/stemsschemas.py index 05769d86..7a11c1b3 100644 --- a/fonts/stemsschemas.py +++ b/fonts/stemsschemas.py @@ -5,7 +5,7 @@ Companion to squarize.py, building the stem length config according to various schemas. - Copyright (C) 2016-2021 The Gregorio Project (see CONTRIBUTORS.md) + Copyright (C) 2016-2025 The Gregorio Project (see CONTRIBUTORS.md) This file is part of Gregorio. diff --git a/install-gtex.sh b/install-gtex.sh index 165cfd7e..a47c35f8 100755 --- a/install-gtex.sh +++ b/install-gtex.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/install.sh b/install.sh index 9097ba92..9db2d2ed 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/macosx/Gregorio.pkgproj b/macosx/Gregorio.pkgproj index b2dc0a66..e00493e0 100755 --- a/macosx/Gregorio.pkgproj +++ b/macosx/Gregorio.pkgproj @@ -603,7 +603,7 @@ USE_HFS+_COMPRESSION VERSION - 6.0.0 + 6.1.0-beta1 TYPE 0 diff --git a/macosx/douninstall.sh b/macosx/douninstall.sh index f7eaf1c3..ea2804e9 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-6_0_0" # FILENAME_VERSION +rm "$BINDIR/gregorio-6_1_0-beta1" # FILENAME_VERSION rm "$PKGCONFIGDIR/gregorio.pc" rm -rf "$GREINCLUDEDIR" rm -rf "$GRETEXDIR" diff --git a/src/Makefile.am b/src/Makefile.am index 65708219..b5c1c2e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/src/bool.h b/src/bool.h index 911c8231..5b8c787d 100644 --- a/src/bool.h +++ b/src/bool.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header provides a minimum of C11-like bool functionality. * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/characters.c b/src/characters.c index b4971de0..08add024 100644 --- a/src/characters.c +++ b/src/characters.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX. * This file contains functions that deal with lyrics and styles. * - * Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/characters.h b/src/characters.h index 01975e2e..a74b1e68 100644 --- a/src/characters.h +++ b/src/characters.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes the lyric handling data structures and entry points. * - * Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/config.h b/src/config.h index c7040b51..8c61217d 100644 --- a/src/config.h +++ b/src/config.h @@ -4,7 +4,7 @@ * * Gregorio configuration headers. * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/dump/dump.c b/src/dump/dump.c index 20faa9b1..e3f22a62 100644 --- a/src/dump/dump.c +++ b/src/dump/dump.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX. * This file provides functions to dump out Gregorio structures. * - * Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2007-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/encode_utf8strings.c b/src/encode_utf8strings.c index e2e0bdb6..38665669 100644 --- a/src/encode_utf8strings.c +++ b/src/encode_utf8strings.c @@ -1,7 +1,7 @@ /* * Utility program to convert utf8strings.h.in into utf8strings.h * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/enum_generator.h b/src/enum_generator.h index d046ab85..945557e1 100644 --- a/src/enum_generator.h +++ b/src/enum_generator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gabc/gabc-elements-determination.c b/src/gabc/gabc-elements-determination.c index 3ba779a1..f8a551a8 100644 --- a/src/gabc/gabc-elements-determination.c +++ b/src/gabc/gabc-elements-determination.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX. * This file provides functions for determining elements from notes. * - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gabc/gabc-glyphs-determination.c b/src/gabc/gabc-glyphs-determination.c index 5d412975..d1bc168c 100644 --- a/src/gabc/gabc-glyphs-determination.c +++ b/src/gabc/gabc-glyphs-determination.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file provides functions for determining glyphs from notes. * - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gabc/gabc-notes-determination.l b/src/gabc/gabc-notes-determination.l index 784d84de..504d6cb0 100644 --- a/src/gabc/gabc-notes-determination.l +++ b/src/gabc/gabc-notes-determination.l @@ -3,7 +3,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file implements the note parser. * - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gabc/gabc-score-determination.c b/src/gabc/gabc-score-determination.c index 6dd5f6aa..adc9a894 100644 --- a/src/gabc/gabc-score-determination.c +++ b/src/gabc/gabc-score-determination.c @@ -3,7 +3,7 @@ * This file implements the score parser. * * Gregorio score determination from gabc utilities. - * Copyright (C) 2016-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2016-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gabc/gabc-score-determination.h b/src/gabc/gabc-score-determination.h index 6d32de35..dd2d9c04 100644 --- a/src/gabc/gabc-score-determination.h +++ b/src/gabc/gabc-score-determination.h @@ -3,7 +3,7 @@ * This header shares definitions between the score parser and lexer. * * Gregorio score determination from gabc. - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gabc/gabc-score-determination.l b/src/gabc/gabc-score-determination.l index 486fd66f..9d1664c5 100644 --- a/src/gabc/gabc-score-determination.l +++ b/src/gabc/gabc-score-determination.l @@ -4,7 +4,7 @@ * This file implements the score lexer. * * Gregorio score determination in gabc input. - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gabc/gabc-score-determination.y b/src/gabc/gabc-score-determination.y index 85ad7f9f..d1a1576e 100644 --- a/src/gabc/gabc-score-determination.y +++ b/src/gabc/gabc-score-determination.y @@ -4,7 +4,7 @@ * This file implements the score parser. * * Gregorio score determination from gabc. - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gabc/gabc-write.c b/src/gabc/gabc-write.c index 0da6c5e7..3aeceeb1 100644 --- a/src/gabc/gabc-write.c +++ b/src/gabc/gabc-write.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file provides functions for writing gabc from Gregorio structures. * - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gabc/gabc.h b/src/gabc/gabc.h index b095ed87..eb2128ae 100644 --- a/src/gabc/gabc.h +++ b/src/gabc/gabc.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes gabc-format handling data structures and entry points. * - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gregorio-utils.c b/src/gregorio-utils.c index 7f1ef7ba..64fb20b0 100644 --- a/src/gregorio-utils.c +++ b/src/gregorio-utils.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file implements the command line interface of Gregorio. * - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * @@ -21,7 +21,7 @@ */ static const char *copyright = -"Copyright (C) 2006-2021 Gregorio Project authors (see CONTRIBUTORS.md)"; +"Copyright (C) 2006-2025 Gregorio Project authors (see CONTRIBUTORS.md)"; #include "config.h" #include diff --git a/src/gregoriotex/gregoriotex-position.c b/src/gregoriotex/gregoriotex-position.c index dca8dd9b..a8f3c791 100644 --- a/src/gregoriotex/gregoriotex-position.c +++ b/src/gregoriotex/gregoriotex-position.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file contains the logic for positioning signs on neumes. * - * Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gregoriotex/gregoriotex-write.c b/src/gregoriotex/gregoriotex-write.c index 3714849d..c27822f6 100644 --- a/src/gregoriotex/gregoriotex-write.c +++ b/src/gregoriotex/gregoriotex-write.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file contains functions for writing GregorioTeX from Gregorio structures. * - * Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/gregoriotex/gregoriotex.h b/src/gregoriotex/gregoriotex.h index 7fc71f36..cf93984e 100644 --- a/src/gregoriotex/gregoriotex.h +++ b/src/gregoriotex/gregoriotex.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes GregorioTeX writing data structures and entry points. * - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/messages.c b/src/messages.c index cacec373..2c681ea3 100644 --- a/src/messages.c +++ b/src/messages.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file contains functions for logging messages, warnings, and errors. * - * Copyright (C) 2009-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2009-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/messages.h b/src/messages.h index c0d4cb49..86c77631 100644 --- a/src/messages.h +++ b/src/messages.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes the message logging functions. * - * Copyright (C) 2009-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2009-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/plugins.h b/src/plugins.h index 61d59047..e37144ff 100644 --- a/src/plugins.h +++ b/src/plugins.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes the "main" entry points for reading and writing data. * - * Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/sha1.c b/src/sha1.c index b519ff57..0f05e76a 100644 --- a/src/sha1.c +++ b/src/sha1.c @@ -2,7 +2,7 @@ * sha1.c - Functions to compute SHA1 message digest of files or * memory blocks according to the NIST specification FIPS-180-1. * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) * Copyright (C) 2000-2001, 2003-2006, 2008-2014 Free Software Foundation, Inc. * * This file is part of Gregorio. diff --git a/src/sha1.h b/src/sha1.h index b6f28b29..32b2e31e 100644 --- a/src/sha1.h +++ b/src/sha1.h @@ -2,7 +2,7 @@ * Declarations of functions and data types used for SHA1 sum * library functions. * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) * Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2014 Free Software * Foundation, Inc. * diff --git a/src/struct.c b/src/struct.c index a1fb0082..55fecaac 100644 --- a/src/struct.c +++ b/src/struct.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file implements the Gregorio data structures. * - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/struct.h b/src/struct.h index 971eba70..eac69bb8 100644 --- a/src/struct.h +++ b/src/struct.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header defines the Gregorio data structures and functions. * - * Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/struct_iter.h b/src/struct_iter.h index b33d9fb0..415f5ac6 100644 --- a/src/struct_iter.h +++ b/src/struct_iter.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header defines the Gregorio data structures and functions. * - * Copyright (C) 2016-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2016-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/support.c b/src/support.c index fa9fce9a..cd23ff02 100644 --- a/src/support.c +++ b/src/support.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file contains miscellaneous support functions. * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/support.h b/src/support.h index 6d5eddc8..ff5a516c 100644 --- a/src/support.h +++ b/src/support.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes the miscellaneous support functions. * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/unicode.c b/src/unicode.c index a4196ed5..ed1df773 100644 --- a/src/unicode.c +++ b/src/unicode.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file contains functions providing UTF-8 support. * - * Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/unicode.h b/src/unicode.h index db23d3cb..38cdd62d 100644 --- a/src/unicode.h +++ b/src/unicode.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes the UTF-8 support functions. * - * Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2008-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/utf8strings.h.in b/src/utf8strings.h.in index e081b473..d51330b8 100644 --- a/src/utf8strings.h.in +++ b/src/utf8strings.h.in @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header file contains UTF-8 encoded strings used by Gregorio * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/vowel/vowel-rules.h b/src/vowel/vowel-rules.h index d120534a..1ffbf4e9 100644 --- a/src/vowel/vowel-rules.h +++ b/src/vowel/vowel-rules.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header shares definitions between the vowel parser and lexer. * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/vowel/vowel-rules.l b/src/vowel/vowel-rules.l index a84ac0e6..aafddfc8 100644 --- a/src/vowel/vowel-rules.l +++ b/src/vowel/vowel-rules.l @@ -3,7 +3,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file implements the vowel rule lexer. * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/vowel/vowel-rules.y b/src/vowel/vowel-rules.y index 244ab264..e90602b8 100644 --- a/src/vowel/vowel-rules.y +++ b/src/vowel/vowel-rules.y @@ -3,7 +3,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file implements the vowel rule parser. * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 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 the Free diff --git a/src/vowel/vowel.c b/src/vowel/vowel.c index d8dcf99e..89f8e282 100644 --- a/src/vowel/vowel.c +++ b/src/vowel/vowel.c @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This file implements vowel rule handling (aside from parsing). * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/src/vowel/vowel.h b/src/vowel/vowel.h index 0d1641fc..f850ecca 100644 --- a/src/vowel/vowel.h +++ b/src/vowel/vowel.h @@ -2,7 +2,7 @@ * Gregorio is a program that translates gabc files to GregorioTeX * This header prototypes the vowel handling data structures and entry points. * - * Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) + * Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) * * This file is part of Gregorio. * diff --git a/tex/Makefile.am b/tex/Makefile.am index 509c3086..794a2ef9 100644 --- a/tex/Makefile.am +++ b/tex/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/tex/gregorio-vowels.dat b/tex/gregorio-vowels.dat index 0e0dacc5..dfcc2ef4 100644 --- a/tex/gregorio-vowels.dat +++ b/tex/gregorio-vowels.dat @@ -1,5 +1,5 @@ # Vowel rule file for Gregorio -# Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) # # This file is part of Gregorio. # diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty index a6dfe906..a6772a21 100644 --- a/tex/gregoriosyms.sty +++ b/tex/gregoriosyms.sty @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2008-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gregoriosyms} - [2021/03/13 v6.0.0 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX + [2025/02/10 v6.1.0-beta1 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}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{6.1.0-beta1}% GREGORIO_VERSION - VersionManager.py \providecommand{\gre@declarefileversion}[2]{\relax} diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex index 917cdd0a..c42dbe7d 100644 --- a/tex/gregoriotex-chars.tex +++ b/tex/gregoriotex-chars.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -17,7 +17,7 @@ % You should have received a copy of the GNU General Public License % along with Gregorio. If not, see . -\gre@declarefileversion{gregoriotex-chars.tex}{6.0.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-chars.tex}{6.1.0-beta1}% 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 cd5f1bc4..cd943dc2 100644 --- a/tex/gregoriotex-common.tex +++ b/tex/gregoriotex-common.tex @@ -1,6 +1,6 @@ %GregorioTeX common file (stuff needed by both gregoriotex and gregoriosyms) % -% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -17,7 +17,7 @@ % You should have received a copy of the GNU General Public License % along with Gregorio. If not, see . -\gre@declarefileversion{gregoriotex-common.tex}{6.0.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-common.tex}{6.1.0-beta1}% 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 index 5112b061..daed8bf3 100644 --- a/tex/gregoriotex-gsp-default.tex +++ b/tex/gregoriotex-gsp-default.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2010-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2010-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -20,7 +20,7 @@ % this file contains definitions of spaces and penalties % version check -\gre@declarefileversion{gregoriotex-gsp-default.tex}{6.0.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-gsp-default.tex}{6.1.0-beta1}% GREGORIO_VERSION %% First, the penalties diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex index ed44fade..cc72e5e0 100644 --- a/tex/gregoriotex-main.tex +++ b/tex/gregoriotex-main.tex @@ -1,6 +1,6 @@ %GregorioTeX main file. % -% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -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}% GREGORIO_VERSION - VersionManager.py +\xdef\gre@gregoriotexversion{6.1.0-beta1}% 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 index c51869fc..4f062c39 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 6.0.0 +-- GREGORIO_VERSION 6.1.0-beta1 local catcode_at_letter = luatexbase.catcodetables['gre@atletter'] diff --git a/tex/gregoriotex-nabc.tex b/tex/gregoriotex-nabc.tex index 342b38e9..1429f434 100644 --- a/tex/gregoriotex-nabc.tex +++ b/tex/gregoriotex-nabc.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2014-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2014-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -19,7 +19,7 @@ % this file contains macros for St. Gall ancient neume support -\gre@declarefileversion{gregoriotex-nabc.tex}{6.0.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-nabc.tex}{6.1.0-beta1}% GREGORIO_VERSION \xdef\gre@nabcfontname{gregall}% diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua index 2ad5ef40..f720b5be 100644 --- a/tex/gregoriotex-signs.lua +++ b/tex/gregoriotex-signs.lua @@ -1,6 +1,6 @@ --GregorioTeX Signs Lua support file. -- ---Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) +--Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) -- --This file is part of Gregorio. -- @@ -19,7 +19,7 @@ -- this file contains lua functions to support signs used by GregorioTeX. --- GREGORIO_VERSION 6.0.0 +-- GREGORIO_VERSION 6.1.0-beta1 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex index 628a8326..d242b4d7 100644 --- a/tex/gregoriotex-signs.tex +++ b/tex/gregoriotex-signs.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -22,7 +22,7 @@ \def\grebarbracewidth{.58879}% -\gre@declarefileversion{gregoriotex-signs.tex}{6.0.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-signs.tex}{6.1.0-beta1}% GREGORIO_VERSION \def\gre@usestylecommon{% \gre@trace{gre@usestylecommon}% diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex index 722e6658..279b8c3e 100644 --- a/tex/gregoriotex-spaces.tex +++ b/tex/gregoriotex-spaces.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -19,7 +19,7 @@ % this file contains definitions of spaces -\gre@declarefileversion{gregoriotex-spaces.tex}{6.0.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-spaces.tex}{6.1.0-beta1}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for tuning penalties diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex index 6db5234c..a415e1f2 100644 --- a/tex/gregoriotex-syllable.tex +++ b/tex/gregoriotex-syllable.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -19,7 +19,7 @@ % this file contains definitions of the glyphs and the syllables -\gre@declarefileversion{gregoriotex-syllable.tex}{6.0.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-syllable.tex}{6.1.0-beta1}% GREGORIO_VERSION %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% macros for the typesetting of the different glyphs diff --git a/tex/gregoriotex-symbols.lua b/tex/gregoriotex-symbols.lua index 379628fb..9db5e3cb 100644 --- a/tex/gregoriotex-symbols.lua +++ b/tex/gregoriotex-symbols.lua @@ -1,6 +1,6 @@ --GregorioTeX Symbols Lua support file. -- ---Copyright (C) 2016-2021 The Gregorio Project (see CONTRIBUTORS.md) +--Copyright (C) 2016-2025 The Gregorio Project (see CONTRIBUTORS.md) -- --This file is part of Gregorio. -- @@ -19,7 +19,7 @@ -- this file contains lua functions to support signs used by GregorioTeX. --- GREGORIO_VERSION 6.0.0 +-- GREGORIO_VERSION 6.1.0-beta1 local err = gregoriotex.module.err local warn = gregoriotex.module.warn diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex index afe9b7de..89cd9a61 100644 --- a/tex/gregoriotex-symbols.tex +++ b/tex/gregoriotex-symbols.tex @@ -1,6 +1,6 @@ %GregorioTeX file. % -% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -22,7 +22,7 @@ \ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi% \def\gregoriotex@symbols@loaded{}% -\gre@declarefileversion{gregoriotex-symbols.tex}{6.0.0}% GREGORIO_VERSION +\gre@declarefileversion{gregoriotex-symbols.tex}{6.1.0-beta1}% GREGORIO_VERSION \RequireLuaModule{gregoriotex}% diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua index aa7d3f81..99e6e8a4 100644 --- a/tex/gregoriotex.lua +++ b/tex/gregoriotex.lua @@ -1,6 +1,6 @@ --GregorioTeX Lua file. -- ---Copyright (C) 2008-2021 The Gregorio Project (see CONTRIBUTORS.md) +--Copyright (C) 2008-2025 The Gregorio Project (see CONTRIBUTORS.md) -- --This file is part of Gregorio. -- @@ -24,16 +24,16 @@ local hpack, traverse, traverse_id, has_attribute, count, remove, insert_after, gregoriotex = gregoriotex or {} local gregoriotex = gregoriotex -local internalversion = '6.0.0' -- GREGORIO_VERSION (comment used by VersionManager.py) +local internalversion = '6.1.0-beta1' -- GREGORIO_VERSION (comment used by VersionManager.py) local err, warn, info, log = luatexbase.provides_module({ name = "gregoriotex", - version = '6.0.0', -- GREGORIO_VERSION + version = '6.1.0-beta1', -- GREGORIO_VERSION greinternalversion = internalversion, - date = "2021/03/13", -- GREGORIO_DATE_LTX + date = "2025/02/10", -- GREGORIO_DATE_LTX description = "GregorioTeX module.", author = "The Gregorio Project (see CONTRIBUTORS.md)", - copyright = "2008-2021 - The Gregorio Project", + copyright = "2008-2025 - The Gregorio Project", license = "GPLv3+", }) @@ -163,7 +163,7 @@ local function gregorio_exe() local exe_version -- first look for one with the exact version - real_gregorio_exe = 'gregorio-6_0_0' -- FILENAME_VERSION + real_gregorio_exe = 'gregorio-6_1_0-beta1' -- 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 a9031ef7..0f7a4b3b 100644 --- a/tex/gregoriotex.sty +++ b/tex/gregoriotex.sty @@ -1,6 +1,6 @@ %GregorioTeX LaTeX style. % -% Copyright (C) 2007-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2007-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -19,7 +19,7 @@ \NeedsTeXFormat{LaTeX2e}% \ProvidesPackage{gregoriotex}% - [2021/03/13 v6.0.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX + [2025/02/10 v6.1.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \RequirePackage{iftex}% \RequireLuaTeX diff --git a/tex/gregoriotex.tex b/tex/gregoriotex.tex index ed24c4c8..1b485525 100644 --- a/tex/gregoriotex.tex +++ b/tex/gregoriotex.tex @@ -1,6 +1,6 @@ % GregorioTeX boostrap file for Plain TeX % -% Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md) +% Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md) % % This file is part of Gregorio. % @@ -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/13 v6.0.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX +% [2025/02/10 v6.1.0-beta1 GregorioTeX system.]% PARSE_VERSION_DATE_LTX \input iftex.sty \RequireLuaTeX% diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc index 8ba08934..67de694a 100644 --- a/windows/gregorio-resources.rc +++ b/windows/gregorio-resources.rc @@ -1,7 +1,7 @@ IDI_ICON1 ICON DISCARDABLE "gregorio.ico" 1 VERSIONINFO -FILEVERSION 6,0,0,30 -PRODUCTVERSION 6,0,0,30 +FILEVERSION 6,1,0,11 +PRODUCTVERSION 6,1,0,11 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "6.0.0" + VALUE "FileVersion", "6.1.0-beta1" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "6.0.0" + VALUE "ProductVersion", "6.1.0-beta1" END END diff --git a/windows/gregorio.iss b/windows/gregorio.iss index 8435a868..a76689f8 100644 --- a/windows/gregorio.iss +++ b/windows/gregorio.iss @@ -1,196 +1,196 @@ -[Setup] -AppName=gregorio -AppVersion=6.0.0 -DefaultDirName={pf}\gregorio -DefaultGroupName=gregorio -SetupIconFile=gregorio.ico -Compression=lzma2 -SolidCompression=yes -LicenseFile=../COPYING.md -AppCopyright=Copyright (C) 2006-2021 The Gregorio Project -AppComments=Software for engraving Gregorian Chant scores. -AppContact=gregorio-devel@googlegroups.com -AppPublisher=The Gregorio Project -AppPublisherURL=https://github.com/gregorio-project/gregorio -AppReadmeFile=https://github.com/gregorio-project/gregorio -BackColor=$D4AE65 -BackColor2=$FDF7EB -WizardSmallImageFile=gregorio-32.bmp -WizardImageFile=gregorio-image.bmp -ChangesAssociations=yes -ChangesEnvironment=true - -[Registry] -Root: HKCR; Subkey: ".gabc"; ValueType: string; ValueName: ""; ValueData: "Gregorio"; Flags: uninsdeletevalue -Root: HKCR; Subkey: "Gregorio"; ValueType: string; ValueName: ""; ValueData: "Gregorio score"; Flags: uninsdeletekey -Root: HKCR; Subkey: "Gregorio\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\gregorio.ico"; Flags: uninsdeletekey -Root: HKCR; Subkey: "Gregorio\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "texworks.exe ""%1"""; Flags: uninsdeletekey - -[Dirs] -Name: "{app}\bin" -Name: "{app}\contrib" -Name: "{app}\examples" -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" -Name: "{app}\texmf\fonts\truetype\public\gregoriotex" -Name: "{app}\texmf\fonts\source" -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] -; PARSE_VERSION_FILE_NEXTLINE -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}"; -Source: "README.txt"; DestDir: "{app}"; Flags: isreadme -Source: "../CHANGELOG.md"; DestDir: "{app}"; -Source: "../README.md"; DestDir: "{app}"; -Source: "../CONTRIBUTORS.md"; DestDir: "{app}"; -Source: "../UPGRADE.md"; DestDir: "{app}"; -Source: "../doc/*.pdf"; DestDir: "{app}"; -Source: "../doc/*.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\lualatex\gregoriotex"; -Source: "../tex/*.lua"; DestDir: "{app}\texmf\tex\luatex\gregoriotex"; -Source: "../tex/gregorio-vowels.dat"; DestDir: "{app}\texmf\tex\luatex\gregoriotex"; -Source: "../fonts/greciliae*.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex"; -Source: "../fonts/greextra.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex"; -Source: "../fonts/gregall.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex"; -Source: "../fonts/grelaon.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex"; -Source: "../fonts/gresgmodern.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex"; -Source: "../fonts/greciliae-base.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; -Source: "../fonts/greextra.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; -Source: "../fonts/gregall.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; -Source: "../fonts/grelaon.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; -Source: "../fonts/gresgmodern.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; -Source: "../fonts/*.py"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; -Source: "../fonts/fonts_README.md"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; -Source: "../doc/*.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; -Source: "../doc/*.lua"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; -Source: "../doc/*.gabc"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; -Source: "../doc/doc_README.md"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; - -[InstallDelete] -Type: files; Name: "{app}\gregorio.exe" - -[Run] -Filename: "texlua.exe"; Parameters: """{app}\install.lua"" > ""{app}\install.log"""; StatusMsg: "Adding files to texmf tree..."; Description: "Add files to texmf tree"; Flags: postinstall runascurrentuser ; WorkingDir: "{app}" - -[UninstallRun] -Filename: "texlua.exe"; Parameters: """{app}\uninstall.lua"" > ""{userdesktop}\uninstall.log"""; WorkingDir: "{app}"; RunOnceId: "Remove_texmf"; Flags: runascurrentuser - -[Tasks] -Name: modifypath; Description: "Add gregorio to PATH"; GroupDescription: "New Installs and Upgrades from 4.0 and earlier"; Flags: checkedonce - -[Code] -procedure URLLabelOnClickOne(Sender: TObject); -var - ErrorCode: Integer; -begin - ShellExec('open', 'https://www.tug.org/texlive/acquire.html', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode); -end; - -procedure URLLabelOnClickTwo(Sender: TObject); -var - ErrorCode: Integer; -begin - ShellExec('open', 'http://gregorio-project.github.io/installation-windows.html', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode); -end; - -procedure CreateTheWizardPages; -var - Page: TWizardPage; - StaticText: TNewStaticText; -begin - Page := CreateCustomPage(wpWelcome, 'Installation Requirements', 'Please read the following important information before continuing.'); - - StaticText := TNewStaticText.Create(Page); - StaticText.Top := ScaleY(0); - StaticText.Height := ScaleY(15); - StaticText.Caption := 'You are about to install the gregorio software, which is working with a'; - StaticText.Parent := Page.Surface; - - StaticText := TNewStaticText.Create(Page); - StaticText.Height := ScaleY(15); - StaticText.Top := ScaleY(13); - StaticText.Caption := 'typesetting software called LuaTeX.'; - StaticText.Parent := Page.Surface; - - StaticText := TNewStaticText.Create(Page); - StaticText.Top := ScaleY(35);; - StaticText.Caption := 'The installation and use of gregorio needs LuaTeX in order to work.'; - StaticText.Parent := Page.Surface; - - StaticText := TNewStaticText.Create(Page); - StaticText.Top := ScaleY(60);; - StaticText.Caption := 'The best way to install LuaTeX is to install the TeX Live distribution.'; - StaticText.Parent := Page.Surface; - - StaticText := TNewStaticText.Create(Page); - StaticText.Top := ScaleY(75);; - StaticText.Caption := 'If you have not already installed it, please do it before proceeding further!'; - StaticText.Parent := Page.Surface; - - StaticText := TNewStaticText.Create(Page); - StaticText.Top := ScaleY(100);; - StaticText.Caption := 'Note that you have to reboot your computer after having installed TeX Live'; - StaticText.Parent := Page.Surface; - - StaticText := TNewStaticText.Create(Page); - StaticText.Top := ScaleY(115);; - StaticText.Caption := 'and before installing Gregorio.'; - StaticText.Parent := Page.Surface; - - StaticText := TNewStaticText.Create(Page); - StaticText.Top := ScaleY(145);; - StaticText.Caption := 'https://www.tug.org/texlive/acquire.html'; - StaticText.Cursor := crHand; - StaticText.OnClick := @URLLabelOnClickOne; - StaticText.Parent := Page.Surface; - StaticText.Font.Style := StaticText.Font.Style + [fsUnderline]; - StaticText.Font.Color := clBlue; - - StaticText := TNewStaticText.Create(Page); - StaticText.Top := ScaleY(165);; - StaticText.Caption := 'http://gregorio-project.github.io/installation-windows.html'; - StaticText.Cursor := crHand; - StaticText.OnClick := @URLLabelOnClickTwo; - StaticText.Parent := Page.Surface; - StaticText.Font.Style := StaticText.Font.Style + [fsUnderline]; - StaticText.Font.Color := clBlue; -end; - -procedure InitializeWizard(); - -begin - CreateTheWizardPages; -end; - -const - ModPathName = 'modifypath'; - ModPathType = 'system'; - -function ModPathDir(): TArrayOfString; -begin - setArrayLength(Result, 1) - Result[0] := ExpandConstant('{app}\bin'); -end; -#include "modpath.iss" +[Setup] +AppName=gregorio +AppVersion=6.1.0-beta1 +DefaultDirName={pf}\gregorio +DefaultGroupName=gregorio +SetupIconFile=gregorio.ico +Compression=lzma2 +SolidCompression=yes +LicenseFile=../COPYING.md +AppCopyright=Copyright (C) 2006-2025 The Gregorio Project +AppComments=Software for engraving Gregorian Chant scores. +AppContact=gregorio-devel@googlegroups.com +AppPublisher=The Gregorio Project +AppPublisherURL=https://github.com/gregorio-project/gregorio +AppReadmeFile=https://github.com/gregorio-project/gregorio +BackColor=$D4AE65 +BackColor2=$FDF7EB +WizardSmallImageFile=gregorio-32.bmp +WizardImageFile=gregorio-image.bmp +ChangesAssociations=yes +ChangesEnvironment=true + +[Registry] +Root: HKCR; Subkey: ".gabc"; ValueType: string; ValueName: ""; ValueData: "Gregorio"; Flags: uninsdeletevalue +Root: HKCR; Subkey: "Gregorio"; ValueType: string; ValueName: ""; ValueData: "Gregorio score"; Flags: uninsdeletekey +Root: HKCR; Subkey: "Gregorio\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\gregorio.ico"; Flags: uninsdeletekey +Root: HKCR; Subkey: "Gregorio\shell\open\command"; ValueType: string; ValueName: ""; ValueData: "texworks.exe ""%1"""; Flags: uninsdeletekey + +[Dirs] +Name: "{app}\bin" +Name: "{app}\contrib" +Name: "{app}\examples" +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" +Name: "{app}\texmf\fonts\truetype\public\gregoriotex" +Name: "{app}\texmf\fonts\source" +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] +; PARSE_VERSION_FILE_NEXTLINE +Source: "../src/gregorio-6_1_0-beta1.exe"; DestDir: "{app}\bin"; +Source: "gregorio.ico"; DestDir: "{app}"; +Source: "install.lua"; DestDir: "{app}"; +Source: "uninstall.lua"; DestDir: "{app}"; +Source: "README.txt"; DestDir: "{app}"; Flags: isreadme +Source: "../CHANGELOG.md"; DestDir: "{app}"; +Source: "../README.md"; DestDir: "{app}"; +Source: "../CONTRIBUTORS.md"; DestDir: "{app}"; +Source: "../UPGRADE.md"; DestDir: "{app}"; +Source: "../doc/*.pdf"; DestDir: "{app}"; +Source: "../doc/*.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\lualatex\gregoriotex"; +Source: "../tex/*.lua"; DestDir: "{app}\texmf\tex\luatex\gregoriotex"; +Source: "../tex/gregorio-vowels.dat"; DestDir: "{app}\texmf\tex\luatex\gregoriotex"; +Source: "../fonts/greciliae*.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex"; +Source: "../fonts/greextra.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex"; +Source: "../fonts/gregall.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex"; +Source: "../fonts/grelaon.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex"; +Source: "../fonts/gresgmodern.ttf"; DestDir: "{app}\texmf\fonts\truetype\public\gregoriotex"; +Source: "../fonts/greciliae-base.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; +Source: "../fonts/greextra.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; +Source: "../fonts/gregall.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; +Source: "../fonts/grelaon.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; +Source: "../fonts/gresgmodern.sfd"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; +Source: "../fonts/*.py"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; +Source: "../fonts/fonts_README.md"; DestDir: "{app}\texmf\fonts\source\gregoriotex"; +Source: "../doc/*.tex"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/*.lua"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/*.gabc"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; +Source: "../doc/doc_README.md"; DestDir: "{app}\texmf\doc\luatex\gregoriotex"; + +[InstallDelete] +Type: files; Name: "{app}\gregorio.exe" + +[Run] +Filename: "texlua.exe"; Parameters: """{app}\install.lua"" > ""{app}\install.log"""; StatusMsg: "Adding files to texmf tree..."; Description: "Add files to texmf tree"; Flags: postinstall runascurrentuser ; WorkingDir: "{app}" + +[UninstallRun] +Filename: "texlua.exe"; Parameters: """{app}\uninstall.lua"" > ""{userdesktop}\uninstall.log"""; WorkingDir: "{app}"; RunOnceId: "Remove_texmf"; Flags: runascurrentuser + +[Tasks] +Name: modifypath; Description: "Add gregorio to PATH"; GroupDescription: "New Installs and Upgrades from 4.0 and earlier"; Flags: checkedonce + +[Code] +procedure URLLabelOnClickOne(Sender: TObject); +var + ErrorCode: Integer; +begin + ShellExec('open', 'https://www.tug.org/texlive/acquire.html', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode); +end; + +procedure URLLabelOnClickTwo(Sender: TObject); +var + ErrorCode: Integer; +begin + ShellExec('open', 'http://gregorio-project.github.io/installation-windows.html', '', '', SW_SHOWNORMAL, ewNoWait, ErrorCode); +end; + +procedure CreateTheWizardPages; +var + Page: TWizardPage; + StaticText: TNewStaticText; +begin + Page := CreateCustomPage(wpWelcome, 'Installation Requirements', 'Please read the following important information before continuing.'); + + StaticText := TNewStaticText.Create(Page); + StaticText.Top := ScaleY(0); + StaticText.Height := ScaleY(15); + StaticText.Caption := 'You are about to install the gregorio software, which is working with a'; + StaticText.Parent := Page.Surface; + + StaticText := TNewStaticText.Create(Page); + StaticText.Height := ScaleY(15); + StaticText.Top := ScaleY(13); + StaticText.Caption := 'typesetting software called LuaTeX.'; + StaticText.Parent := Page.Surface; + + StaticText := TNewStaticText.Create(Page); + StaticText.Top := ScaleY(35);; + StaticText.Caption := 'The installation and use of gregorio needs LuaTeX in order to work.'; + StaticText.Parent := Page.Surface; + + StaticText := TNewStaticText.Create(Page); + StaticText.Top := ScaleY(60);; + StaticText.Caption := 'The best way to install LuaTeX is to install the TeX Live distribution.'; + StaticText.Parent := Page.Surface; + + StaticText := TNewStaticText.Create(Page); + StaticText.Top := ScaleY(75);; + StaticText.Caption := 'If you have not already installed it, please do it before proceeding further!'; + StaticText.Parent := Page.Surface; + + StaticText := TNewStaticText.Create(Page); + StaticText.Top := ScaleY(100);; + StaticText.Caption := 'Note that you have to reboot your computer after having installed TeX Live'; + StaticText.Parent := Page.Surface; + + StaticText := TNewStaticText.Create(Page); + StaticText.Top := ScaleY(115);; + StaticText.Caption := 'and before installing Gregorio.'; + StaticText.Parent := Page.Surface; + + StaticText := TNewStaticText.Create(Page); + StaticText.Top := ScaleY(145);; + StaticText.Caption := 'https://www.tug.org/texlive/acquire.html'; + StaticText.Cursor := crHand; + StaticText.OnClick := @URLLabelOnClickOne; + StaticText.Parent := Page.Surface; + StaticText.Font.Style := StaticText.Font.Style + [fsUnderline]; + StaticText.Font.Color := clBlue; + + StaticText := TNewStaticText.Create(Page); + StaticText.Top := ScaleY(165);; + StaticText.Caption := 'http://gregorio-project.github.io/installation-windows.html'; + StaticText.Cursor := crHand; + StaticText.OnClick := @URLLabelOnClickTwo; + StaticText.Parent := Page.Surface; + StaticText.Font.Style := StaticText.Font.Style + [fsUnderline]; + StaticText.Font.Color := clBlue; +end; + +procedure InitializeWizard(); + +begin + CreateTheWizardPages; +end; + +const + ModPathName = 'modifypath'; + ModPathType = 'system'; + +function ModPathDir(): TArrayOfString; +begin + setArrayLength(Result, 1) + Result[0] := ExpandConstant('{app}\bin'); +end; +#include "modpath.iss" diff --git a/windows/install.lua b/windows/install.lua index 97e2dda0..8c039f5c 100644 --- a/windows/install.lua +++ b/windows/install.lua @@ -1,7 +1,7 @@ #!/usr/bin/env texlua --[[ Gregorio Windows automatic installation script. -Copyright (C) 2010-2021 Gregorio Project authors +Copyright (C) 2010-2025 Gregorio Project authors 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 diff --git a/windows/uninstall.lua b/windows/uninstall.lua index d49ca3b2..d7093f1b 100644 --- a/windows/uninstall.lua +++ b/windows/uninstall.lua @@ -1,7 +1,7 @@ #!/usr/bin/env texlua --[[ Gregorio Windows automatic installation script. -Copyright (C) 2010-2021 Gregorio Project authors +Copyright (C) 2010-2025 Gregorio Project authors 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