gregorio 6.1.0-beta2

MiKTeX · Feb 21, 2025 · 6caa065 · 6caa065
1 parent 169daef
commit 6caa065
Show file tree

Hide file tree

Showing 57 changed files with 5,659 additions and 4,844 deletions.
diff --git a/Admin/TPM/windows-x64/miktex-gregorio-bin-x64.tpm.in b/Admin/TPM/windows-x64/miktex-gregorio-bin-x64.tpm.in
@@ -4,9 +4,9 @@
   <rdf:Description about="http://www.miktex.org/packages/gregorio/">
     <TPM:Name>gregorio win64</TPM:Name>
     <TPM:Title>gregorio, Windows x64</TPM:Title>
-    <TPM:Copyright owner="The Gregorio Project" year="2006-2021"/>
+    <TPM:Copyright owner="The Gregorio Project" year="2006-2025"/>
     <TPM:License type="gpl3"/>
-    <TPM:Version>6.0.0-beta2</TPM:Version>
+    <TPM:Version>6.1.0-beta2</TPM:Version>
     <TPM:TargetSystem minVersion="@MIKTEX_MIN_TARGET_SYSTEM_VERSION@">windows-x64</TPM:TargetSystem>
     <TPM:Date>@MIKTEX_DATETIME_STR@</TPM:Date>
     <TPM:Description>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 * dvipng 1.18
 * dvips 2024.1
 * dvisvgm 3.4.3
+* gregorio 6.1.0-beta2
 * hitex 2.1
 * luatex 1.21.0
 * pdftex 1.40.27

diff --git a/Programs/Converters/gregorio/CMakeLists.txt b/Programs/Converters/gregorio/CMakeLists.txt
@@ -1,21 +1,10 @@
-## CMakeLists.txt                                       -*- CMake -*-
+## CMakeLists.txt
 ##
-## Copyright (C) 2017 Christian Schenk
+## Copyright (C) 2017-2025 Christian Schenk
 ## 
-## This file is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; either version 2, or (at your
-## option) any later version.
-## 
-## This file is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-## 
-## You should have received a copy of the GNU General Public License
-## along with this file; if not, write to the Free Software
-## Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-## USA.
+## This file is free software; the copyright holder gives
+## unlimited permission to copy and/or distribute it, with or
+## without modifications, as long as this notice is preserved.
 
 include(component.cmake)
 
@@ -30,114 +19,114 @@ set(USE_KPSE TRUE)
 set(PACKAGE_URL "http://gregorio-project.github.io")
 
 configure_file(
-  config_.h.cmake
-  ${CMAKE_CURRENT_BINARY_DIR}/config_.h
+    config_.h.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/config_.h
 )
 
 configure_file(
-  gregorio-version.h.in
-  ${CMAKE_CURRENT_BINARY_DIR}/gregorio-version.h
+    miktex-gregorio-version.h.in
+    ${CMAKE_CURRENT_BINARY_DIR}/miktex-gregorio-version.h
 )
 
 configure_file(
-  gregorio.rc.cmake
-  ${CMAKE_CURRENT_BINARY_DIR}/gregorio.rc
-  )
+    windows/miktex-gregorio.rc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/windows/miktex-gregorio.rc
+)
 
 include_directories(BEFORE
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-  source/src
-  source/src/gabc
-  source/src/dump
-  source/src/gregoriotex
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    source/src
+    source/src/gabc
+    source/src/dump
+    source/src/gregoriotex
 )
 
 add_definitions(
-  -Dmain=Main
-  -DUSE_MIKTEX_EXIT=1
+    -Dmain=Main
+    -DUSE_MIKTEX_EXIT=1
 )
 
 if(MIKTEX_NATIVE_WINDOWS)
-  add_definitions(
-    -DUNICODE
-    -D_UNICODE
-  )
+    add_definitions(
+        -DUNICODE
+        -D_UNICODE
+    )
 endif()
 
 set(gregorio_c_sources
-  source/src/characters.c
-  source/src/gregorio-utils.c
-  source/src/messages.c
-  source/src/sha1.c
-  source/src/struct.c
-  source/src/support.c
-  source/src/unicode.c
-  source/src/dump/dump.c
-  source/src/gabc/gabc-elements-determination.c
-  source/src/gabc/gabc-glyphs-determination.c
-  source/src/gabc/gabc-notes-determination-l.c
-  source/src/gabc/gabc-score-determination.c
-  source/src/gabc/gabc-score-determination-l.c
-  source/src/gabc/gabc-score-determination-y.c
-  source/src/gabc/gabc-write.c
-  source/src/gregoriotex/gregoriotex-position.c
-  source/src/gregoriotex/gregoriotex-write.c
-  source/src/vowel/vowel.c
-  source/src/vowel/vowel-rules-l.c
-  source/src/vowel/vowel-rules-y.c
-
-  source/src/bool.h
-  source/src/characters.h
-  source/src/config.h
-  source/src/enum_generator.h
-  source/src/gabc/gabc-score-determination-l.h
-  source/src/gabc/gabc-score-determination-y.h
-  source/src/gabc/gabc-score-determination.h
-  source/src/gabc/gabc.h
-  source/src/gregoriotex/gregoriotex.h
-  source/src/messages.h
-  source/src/plugins.h
-  source/src/sha1.h
-  source/src/struct.h
-  source/src/struct_iter.h
-  source/src/support.h
-  source/src/unicode.h
-  source/src/utf8strings.h
-  source/src/vowel/vowel-rules-l.h
-  source/src/vowel/vowel-rules-y.h
-  source/src/vowel/vowel-rules.h
-  source/src/vowel/vowel.h
+    source/src/characters.c
+    source/src/gregorio-utils.c
+    source/src/messages.c
+    source/src/sha1.c
+    source/src/struct.c
+    source/src/support.c
+    source/src/unicode.c
+    source/src/dump/dump.c
+    source/src/gabc/gabc-elements-determination.c
+    source/src/gabc/gabc-glyphs-determination.c
+    source/src/gabc/gabc-notes-determination-l.c
+    source/src/gabc/gabc-score-determination.c
+    source/src/gabc/gabc-score-determination-l.c
+    source/src/gabc/gabc-score-determination-y.c
+    source/src/gabc/gabc-write.c
+    source/src/gregoriotex/gregoriotex-position.c
+    source/src/gregoriotex/gregoriotex-write.c
+    source/src/vowel/vowel.c
+    source/src/vowel/vowel-rules-l.c
+    source/src/vowel/vowel-rules-y.c
+
+    source/src/bool.h
+    source/src/characters.h
+    source/src/config.h
+    source/src/enum_generator.h
+    source/src/gabc/gabc-score-determination-l.h
+    source/src/gabc/gabc-score-determination-y.h
+    source/src/gabc/gabc-score-determination.h
+    source/src/gabc/gabc.h
+    source/src/gregoriotex/gregoriotex.h
+    source/src/messages.h
+    source/src/plugins.h
+    source/src/sha1.h
+    source/src/struct.h
+    source/src/struct_iter.h
+    source/src/support.h
+    source/src/unicode.h
+    source/src/utf8strings.h
+    source/src/vowel/vowel-rules-l.h
+    source/src/vowel/vowel-rules-y.h
+    source/src/vowel/vowel-rules.h
+    source/src/vowel/vowel.h
 )
 
 set(gregorio_sources ${gregorio_c_sources})
 
 list(APPEND gregorio_sources
-  ${MIKTEX_LIBRARY_WRAPPER}
-  ${CMAKE_CURRENT_BINARY_DIR}/config_.h
-  ${CMAKE_CURRENT_BINARY_DIR}/gregorio-version.h
+    ${MIKTEX_LIBRARY_WRAPPER}
+    ${CMAKE_CURRENT_BINARY_DIR}/config_.h
+    ${CMAKE_CURRENT_BINARY_DIR}/gregorio-version.h
 )
 
 if(MIKTEX_NATIVE_WINDOWS)
-  list(APPEND gregorio_sources
-    ${MIKTEX_COMMON_MANIFEST}
-    ${CMAKE_CURRENT_BINARY_DIR}/gregorio.rc
-  )
+    list(APPEND gregorio_sources
+        ${MIKTEX_COMMON_MANIFEST}
+        ${CMAKE_CURRENT_BINARY_DIR}/gregorio.rc
+    )
 endif()
 
 add_executable(${MIKTEX_PREFIX}gregorio ${gregorio_sources})
 
 set_property(TARGET ${MIKTEX_PREFIX}gregorio PROPERTY FOLDER ${MIKTEX_CURRENT_FOLDER})
 
 target_link_libraries(${MIKTEX_PREFIX}gregorio
-  ${app_dll_name}
-  ${kpsemu_dll_name}
+    ${app_dll_name}
+    ${kpsemu_dll_name}
 )
 
 if(MIKTEX_NATIVE_WINDOWS)
-  target_link_libraries(${MIKTEX_PREFIX}gregorio
-    ${utf8wrap_dll_name}
-  )
+    target_link_libraries(${MIKTEX_PREFIX}gregorio
+        ${utf8wrap_dll_name}
+    )
 endif()
 
 install(TARGETS ${MIKTEX_PREFIX}gregorio DESTINATION ${MIKTEX_BINARY_DESTINATION_DIR})
diff --git a/Programs/Converters/gregorio/component.cmake b/Programs/Converters/gregorio/component.cmake
@@ -1,21 +1,10 @@
-## component.cmake:
+## component.cmake
 ##
-## Copyright (C) 2017 Christian Schenk
+## Copyright (C) 2017-2025 Christian Schenk
 ## 
-## This file is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published
-## by the Free Software Foundation; either version 2, or (at your
-## option) any later version.
-## 
-## This file is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-## 
-## You should have received a copy of the GNU General Public License
-## along with this file; if not, write to the Free Software
-## Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-## USA.
+## This file is free software; the copyright holder gives
+## unlimited permission to copy and/or distribute it, with or
+## without modifications, as long as this notice is preserved.
 
 include(version.cmake)
 

diff --git a/Programs/Converters/gregorio/gregorio-version.h.in b/Programs/Converters/gregorio/gregorio-version.h.in
diff --git a/Programs/Converters/gregorio/gregorio.rc.cmake b/Programs/Converters/gregorio/gregorio.rc.cmake
diff --git a/Programs/Converters/gregorio/miktex-gregorio-version.h.in b/Programs/Converters/gregorio/miktex-gregorio-version.h.in
@@ -0,0 +1,21 @@
+/**
+ * @file miktex-gregorio-version.h
+ * @author Christian Schenk
+ * @brief Version number
+ *
+ * @copyright Copyright © 2017-2025 Christian Schenk
+ *
+ * This file is free software; the copyright holder gives unlimited permission
+ * to copy and/or distribute it, with or without modifications, as long as this
+ * notice is preserved.
+ */
+
+#define MIKTEX_COMP_MAJOR_VERSION @MIKTEX_COMP_MAJOR_VERSION@
+#define MIKTEX_COMP_MINOR_VERSION @MIKTEX_COMP_MINOR_VERSION@
+#define MIKTEX_COMP_PATCH_VERSION @MIKTEX_COMP_PATCH_VERSION@
+
+#define MIKTEX_COMP_ORIG_VERSION_STR "@MIKTEX_COMP_ORIG_VERSION_STR@"
+
+#define MIKTEX_COMP_COPYRIGHT_STR "@MIKTEX_COMP_COPYRIGHT_STR@"
+
+#include <miktex/Version>
diff --git a/Programs/Converters/gregorio/source/COPYING.md b/Programs/Converters/gregorio/source/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/Programs/Converters/gregorio/source/src/bool.h b/Programs/Converters/gregorio/source/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.
  *