Skip to content

Commit 6caa065

Browse files
edocevoliedocevoli
committed
gregorio 6.1.0-beta2
1 parent 169daef commit 6caa065

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+5659
-4844
lines changed

‎Admin/TPM/windows-x64/miktex-gregorio-bin-x64.tpm.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<rdf:Description about="http://www.miktex.org/packages/gregorio/">
55
<TPM:Name>gregorio win64</TPM:Name>
66
<TPM:Title>gregorio, Windows x64</TPM:Title>
7-
<TPM:Copyright owner="The Gregorio Project" year="2006-2021"/>
7+
<TPM:Copyright owner="The Gregorio Project" year="2006-2025"/>
88
<TPM:License type="gpl3"/>
9-
<TPM:Version>6.0.0-beta2</TPM:Version>
9+
<TPM:Version>6.1.0-beta2</TPM:Version>
1010
<TPM:TargetSystem minVersion="@MIKTEX_MIN_TARGET_SYSTEM_VERSION@">windows-x64</TPM:TargetSystem>
1111
<TPM:Date>@MIKTEX_DATETIME_STR@</TPM:Date>
1212
<TPM:Description>

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* dvipng 1.18
1010
* dvips 2024.1
1111
* dvisvgm 3.4.3
12+
* gregorio 6.1.0-beta2
1213
* hitex 2.1
1314
* luatex 1.21.0
1415
* pdftex 1.40.27

‎Programs/Converters/gregorio/CMakeLists.txt

+78-89
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
1-
## CMakeLists.txt -*- CMake -*-
1+
## CMakeLists.txt
22
##
3-
## Copyright (C) 2017 Christian Schenk
3+
## Copyright (C) 2017-2025 Christian Schenk
44
##
5-
## This file is free software; you can redistribute it and/or modify
6-
## it under the terms of the GNU General Public License as published
7-
## by the Free Software Foundation; either version 2, or (at your
8-
## option) any later version.
9-
##
10-
## This file is distributed in the hope that it will be useful, but
11-
## WITHOUT ANY WARRANTY; without even the implied warranty of
12-
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13-
## General Public License for more details.
14-
##
15-
## You should have received a copy of the GNU General Public License
16-
## along with this file; if not, write to the Free Software
17-
## Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
18-
## USA.
5+
## This file is free software; the copyright holder gives
6+
## unlimited permission to copy and/or distribute it, with or
7+
## without modifications, as long as this notice is preserved.
198

209
include(component.cmake)
2110

@@ -30,114 +19,114 @@ set(USE_KPSE TRUE)
3019
set(PACKAGE_URL "http://gregorio-project.github.io")
3120

3221
configure_file(
33-
config_.h.cmake
34-
${CMAKE_CURRENT_BINARY_DIR}/config_.h
22+
config_.h.cmake
23+
${CMAKE_CURRENT_BINARY_DIR}/config_.h
3524
)
3625

3726
configure_file(
38-
gregorio-version.h.in
39-
${CMAKE_CURRENT_BINARY_DIR}/gregorio-version.h
27+
miktex-gregorio-version.h.in
28+
${CMAKE_CURRENT_BINARY_DIR}/miktex-gregorio-version.h
4029
)
4130

4231
configure_file(
43-
gregorio.rc.cmake
44-
${CMAKE_CURRENT_BINARY_DIR}/gregorio.rc
45-
)
32+
windows/miktex-gregorio.rc.in
33+
${CMAKE_CURRENT_BINARY_DIR}/windows/miktex-gregorio.rc
34+
)
4635

4736
include_directories(BEFORE
48-
${CMAKE_CURRENT_BINARY_DIR}
49-
${CMAKE_CURRENT_SOURCE_DIR}
50-
source/src
51-
source/src/gabc
52-
source/src/dump
53-
source/src/gregoriotex
37+
${CMAKE_CURRENT_BINARY_DIR}
38+
${CMAKE_CURRENT_SOURCE_DIR}
39+
source/src
40+
source/src/gabc
41+
source/src/dump
42+
source/src/gregoriotex
5443
)
5544

5645
add_definitions(
57-
-Dmain=Main
58-
-DUSE_MIKTEX_EXIT=1
46+
-Dmain=Main
47+
-DUSE_MIKTEX_EXIT=1
5948
)
6049

6150
if(MIKTEX_NATIVE_WINDOWS)
62-
add_definitions(
63-
-DUNICODE
64-
-D_UNICODE
65-
)
51+
add_definitions(
52+
-DUNICODE
53+
-D_UNICODE
54+
)
6655
endif()
6756

6857
set(gregorio_c_sources
69-
source/src/characters.c
70-
source/src/gregorio-utils.c
71-
source/src/messages.c
72-
source/src/sha1.c
73-
source/src/struct.c
74-
source/src/support.c
75-
source/src/unicode.c
76-
source/src/dump/dump.c
77-
source/src/gabc/gabc-elements-determination.c
78-
source/src/gabc/gabc-glyphs-determination.c
79-
source/src/gabc/gabc-notes-determination-l.c
80-
source/src/gabc/gabc-score-determination.c
81-
source/src/gabc/gabc-score-determination-l.c
82-
source/src/gabc/gabc-score-determination-y.c
83-
source/src/gabc/gabc-write.c
84-
source/src/gregoriotex/gregoriotex-position.c
85-
source/src/gregoriotex/gregoriotex-write.c
86-
source/src/vowel/vowel.c
87-
source/src/vowel/vowel-rules-l.c
88-
source/src/vowel/vowel-rules-y.c
89-
90-
source/src/bool.h
91-
source/src/characters.h
92-
source/src/config.h
93-
source/src/enum_generator.h
94-
source/src/gabc/gabc-score-determination-l.h
95-
source/src/gabc/gabc-score-determination-y.h
96-
source/src/gabc/gabc-score-determination.h
97-
source/src/gabc/gabc.h
98-
source/src/gregoriotex/gregoriotex.h
99-
source/src/messages.h
100-
source/src/plugins.h
101-
source/src/sha1.h
102-
source/src/struct.h
103-
source/src/struct_iter.h
104-
source/src/support.h
105-
source/src/unicode.h
106-
source/src/utf8strings.h
107-
source/src/vowel/vowel-rules-l.h
108-
source/src/vowel/vowel-rules-y.h
109-
source/src/vowel/vowel-rules.h
110-
source/src/vowel/vowel.h
58+
source/src/characters.c
59+
source/src/gregorio-utils.c
60+
source/src/messages.c
61+
source/src/sha1.c
62+
source/src/struct.c
63+
source/src/support.c
64+
source/src/unicode.c
65+
source/src/dump/dump.c
66+
source/src/gabc/gabc-elements-determination.c
67+
source/src/gabc/gabc-glyphs-determination.c
68+
source/src/gabc/gabc-notes-determination-l.c
69+
source/src/gabc/gabc-score-determination.c
70+
source/src/gabc/gabc-score-determination-l.c
71+
source/src/gabc/gabc-score-determination-y.c
72+
source/src/gabc/gabc-write.c
73+
source/src/gregoriotex/gregoriotex-position.c
74+
source/src/gregoriotex/gregoriotex-write.c
75+
source/src/vowel/vowel.c
76+
source/src/vowel/vowel-rules-l.c
77+
source/src/vowel/vowel-rules-y.c
78+
79+
source/src/bool.h
80+
source/src/characters.h
81+
source/src/config.h
82+
source/src/enum_generator.h
83+
source/src/gabc/gabc-score-determination-l.h
84+
source/src/gabc/gabc-score-determination-y.h
85+
source/src/gabc/gabc-score-determination.h
86+
source/src/gabc/gabc.h
87+
source/src/gregoriotex/gregoriotex.h
88+
source/src/messages.h
89+
source/src/plugins.h
90+
source/src/sha1.h
91+
source/src/struct.h
92+
source/src/struct_iter.h
93+
source/src/support.h
94+
source/src/unicode.h
95+
source/src/utf8strings.h
96+
source/src/vowel/vowel-rules-l.h
97+
source/src/vowel/vowel-rules-y.h
98+
source/src/vowel/vowel-rules.h
99+
source/src/vowel/vowel.h
111100
)
112101

113102
set(gregorio_sources ${gregorio_c_sources})
114103

115104
list(APPEND gregorio_sources
116-
${MIKTEX_LIBRARY_WRAPPER}
117-
${CMAKE_CURRENT_BINARY_DIR}/config_.h
118-
${CMAKE_CURRENT_BINARY_DIR}/gregorio-version.h
105+
${MIKTEX_LIBRARY_WRAPPER}
106+
${CMAKE_CURRENT_BINARY_DIR}/config_.h
107+
${CMAKE_CURRENT_BINARY_DIR}/gregorio-version.h
119108
)
120109

121110
if(MIKTEX_NATIVE_WINDOWS)
122-
list(APPEND gregorio_sources
123-
${MIKTEX_COMMON_MANIFEST}
124-
${CMAKE_CURRENT_BINARY_DIR}/gregorio.rc
125-
)
111+
list(APPEND gregorio_sources
112+
${MIKTEX_COMMON_MANIFEST}
113+
${CMAKE_CURRENT_BINARY_DIR}/gregorio.rc
114+
)
126115
endif()
127116

128117
add_executable(${MIKTEX_PREFIX}gregorio ${gregorio_sources})
129118

130119
set_property(TARGET ${MIKTEX_PREFIX}gregorio PROPERTY FOLDER ${MIKTEX_CURRENT_FOLDER})
131120

132121
target_link_libraries(${MIKTEX_PREFIX}gregorio
133-
${app_dll_name}
134-
${kpsemu_dll_name}
122+
${app_dll_name}
123+
${kpsemu_dll_name}
135124
)
136125

137126
if(MIKTEX_NATIVE_WINDOWS)
138-
target_link_libraries(${MIKTEX_PREFIX}gregorio
139-
${utf8wrap_dll_name}
140-
)
127+
target_link_libraries(${MIKTEX_PREFIX}gregorio
128+
${utf8wrap_dll_name}
129+
)
141130
endif()
142131

143132
install(TARGETS ${MIKTEX_PREFIX}gregorio DESTINATION ${MIKTEX_BINARY_DESTINATION_DIR})

‎Programs/Converters/gregorio/component.cmake

+5-16
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
1-
## component.cmake:
1+
## component.cmake
22
##
3-
## Copyright (C) 2017 Christian Schenk
3+
## Copyright (C) 2017-2025 Christian Schenk
44
##
5-
## This file is free software; you can redistribute it and/or modify
6-
## it under the terms of the GNU General Public License as published
7-
## by the Free Software Foundation; either version 2, or (at your
8-
## option) any later version.
9-
##
10-
## This file is distributed in the hope that it will be useful, but
11-
## WITHOUT ANY WARRANTY; without even the implied warranty of
12-
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13-
## General Public License for more details.
14-
##
15-
## You should have received a copy of the GNU General Public License
16-
## along with this file; if not, write to the Free Software
17-
## Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
18-
## USA.
5+
## This file is free software; the copyright holder gives
6+
## unlimited permission to copy and/or distribute it, with or
7+
## without modifications, as long as this notice is preserved.
198

209
include(version.cmake)
2110

‎Programs/Converters/gregorio/gregorio-version.h.in

-28
This file was deleted.

‎Programs/Converters/gregorio/gregorio.rc.cmake

-26
This file was deleted.

‎Programs/Converters/gregorio/miktex-gregorio-version.h.in

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
/**
2+
* @file miktex-gregorio-version.h
3+
* @author Christian Schenk
4+
* @brief Version number
5+
*
6+
* @copyright Copyright © 2017-2025 Christian Schenk
7+
*
8+
* This file is free software; the copyright holder gives unlimited permission
9+
* to copy and/or distribute it, with or without modifications, as long as this
10+
* notice is preserved.
11+
*/
12+
13+
#define MIKTEX_COMP_MAJOR_VERSION @MIKTEX_COMP_MAJOR_VERSION@
14+
#define MIKTEX_COMP_MINOR_VERSION @MIKTEX_COMP_MINOR_VERSION@
15+
#define MIKTEX_COMP_PATCH_VERSION @MIKTEX_COMP_PATCH_VERSION@
16+
17+
#define MIKTEX_COMP_ORIG_VERSION_STR "@MIKTEX_COMP_ORIG_VERSION_STR@"
18+
19+
#define MIKTEX_COMP_COPYRIGHT_STR "@MIKTEX_COMP_COPYRIGHT_STR@"
20+
21+
#include <miktex/Version>

‎Programs/Converters/gregorio/source/COPYING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#License of Gregorio
22

3-
The program Gregorio is Copyright (C) 2007-2021 The Gregorio Project,
3+
The program Gregorio is Copyright (C) 2007-2025 The Gregorio Project,
44
see [CONTRIBUTORS.md](CONTRIBUTORS.md) for authors. It is distributed
55
under the GPLv3 license, printed below.
66

‎Programs/Converters/gregorio/source/src/bool.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Gregorio is a program that translates gabc files to GregorioTeX
33
* This header provides a minimum of C11-like bool functionality.
44
*
5-
* Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md)
5+
* Copyright (C) 2015-2025 The Gregorio Project (see CONTRIBUTORS.md)
66
*
77
* This file is part of Gregorio.
88
*

0 commit comments

Comments
 (0)