Skip to content

Commit 737feca

Browse files
committed
import gregorio-6.1.0-beta2
git-svn-id: svn://tug.org/texlive/trunk/Build/source@74112 c570f23f-e606-0410-a88d-b1316a301751
1 parent 8c879f0 commit 737feca

Some content is hidden

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

80 files changed

+582406
-56
lines changed

texk/README

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ dvisvgm 3.4.3 - checked 11jan25
6767
https://github.com/mgieseki/dvisvgm
6868
https://ctan.org/pkg/dvisvgm
6969

70-
gregorio 6.1.0beta1 - checked 15feb25
71-
https://mirror.ctan.org/support/gregoriotex/gregorio-6.1.0-beta1.zip
70+
gregorio 6.1.0beta2 - checked 18feb25
71+
https://mirror.ctan.org/support/gregoriotex/
7272

7373
gsftopk - from Paul Vojta's xdvi.
7474

texk/gregorio/ChangeLog

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1+
2025-02-18 Karl Berry <[email protected]>
2+
3+
* Import gregorio-6.1.0-beta2.zip.
4+
* version.ac: updated.
5+
16
2025-02-17 Karl Berry <[email protected]>
27

38
* version.ac (gregorio_version): forgot to update the version number.
49

510
2025-02-15 Karl Berry <[email protected]>
611

712
* Import gregorio-6.1.0-beta1.zip.
8-
* version.ac: updated.
913

1014
2023-08-13 TANAKA Takuji <[email protected]>
1115

texk/gregorio/TLpatches/TL-Changes

+11-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ Changes applied to the gregorio source tree as obtained from:
33

44
Update ./version.ac.
55
mv gregorio-src gregorio-prev
6-
mkdir gregorio-src
6+
zip=`ls ~/tmp/gregorio*zip`
7+
zipinfo -1 $zip # normally unpacks into gregorio-VERSION
8+
unzip -q ...
9+
mv gregorio-[6789]* gregorio-src
710
cd gregorio-src
8-
unzip ...
911

1012
rm -rf \
1113
Makefile.in \
@@ -28,5 +30,10 @@ svn rm `!!` # if looks reasonable
2830
svn status | sed -n 's/^\!//p' # rerun, should be empty now
2931

3032
cd ..
31-
autoreconf #in the TL directory (Build/source/texk/gregorio).
32-
rebuild; a full rebuild is best.
33+
autoreconf # in the TL directory (Build/source/texk/gregorio).
34+
rebuild # a full rebuild is best.
35+
36+
# if all looks ok:
37+
edit ./ChangeLog
38+
edit ../README
39+
svn commit -m"import gregorio-$VER" ../README .

texk/gregorio/configure

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.72 for Gregorio (TeX Live) 6.1.0-beta1.
3+
# Generated by GNU Autoconf 2.72 for Gregorio (TeX Live) 6.1.0-beta2.
44
#
55
# Report bugs to <[email protected]>.
66
#
@@ -614,8 +614,8 @@ MAKEFLAGS=
614614
# Identity of this package.
615615
PACKAGE_NAME='Gregorio (TeX Live)'
616616
PACKAGE_TARNAME='gregorio--tex-live-'
617-
PACKAGE_VERSION='6.1.0-beta1'
618-
PACKAGE_STRING='Gregorio (TeX Live) 6.1.0-beta1'
617+
PACKAGE_VERSION='6.1.0-beta2'
618+
PACKAGE_STRING='Gregorio (TeX Live) 6.1.0-beta2'
619619
PACKAGE_BUGREPORT='[email protected]'
620620
PACKAGE_URL='http://gregorio-project.github.io/'
621621

@@ -1367,7 +1367,7 @@ if test "$ac_init_help" = "long"; then
13671367
# Omit some internal or obsolete options to make the list less imposing.
13681368
# This message is too long to be a string in the A/UX 3.1 sh.
13691369
cat <<_ACEOF
1370-
'configure' configures Gregorio (TeX Live) 6.1.0-beta1 to adapt to many kinds of systems.
1370+
'configure' configures Gregorio (TeX Live) 6.1.0-beta2 to adapt to many kinds of systems.
13711371

13721372
Usage: $0 [OPTION]... [VAR=VALUE]...
13731373

@@ -1439,7 +1439,7 @@ fi
14391439

14401440
if test -n "$ac_init_help"; then
14411441
case $ac_init_help in
1442-
short | recursive ) echo "Configuration of Gregorio (TeX Live) 6.1.0-beta1:";;
1442+
short | recursive ) echo "Configuration of Gregorio (TeX Live) 6.1.0-beta2:";;
14431443
esac
14441444
cat <<\_ACEOF
14451445

@@ -1560,7 +1560,7 @@ fi
15601560
test -n "$ac_init_help" && exit $ac_status
15611561
if $ac_init_version; then
15621562
cat <<\_ACEOF
1563-
Gregorio (TeX Live) configure 6.1.0-beta1
1563+
Gregorio (TeX Live) configure 6.1.0-beta2
15641564
generated by GNU Autoconf 2.72
15651565

15661566
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2341,7 +2341,7 @@ cat >config.log <<_ACEOF
23412341
This file contains any messages produced by compilers while
23422342
running configure, to aid debugging if configure makes a mistake.
23432343

2344-
It was created by Gregorio (TeX Live) $as_me 6.1.0-beta1, which was
2344+
It was created by Gregorio (TeX Live) $as_me 6.1.0-beta2, which was
23452345
generated by GNU Autoconf 2.72. Invocation command line was
23462346

23472347
$ $0$ac_configure_args_raw
@@ -9234,7 +9234,7 @@ fi
92349234

92359235
# Define the identity of the package.
92369236
PACKAGE='gregorio--tex-live-'
9237-
VERSION='6.1.0-beta1'
9237+
VERSION='6.1.0-beta2'
92389238

92399239

92409240
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -16585,7 +16585,7 @@ Usage: $0 [OPTIONS]
1658516585
Report bugs to <[email protected]>."
1658616586

1658716587
lt_cl_version="\
16588-
Gregorio (TeX Live) config.lt 6.1.0-beta1
16588+
Gregorio (TeX Live) config.lt 6.1.0-beta2
1658916589
configured by $0, generated by GNU Autoconf 2.72.
1659016590

1659116591
Copyright (C) 2024 Free Software Foundation, Inc.
@@ -18216,7 +18216,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
1821618216
# report actual input values of CONFIG_FILES etc. instead of their
1821718217
# values after options handling.
1821818218
ac_log="
18219-
This file was extended by Gregorio (TeX Live) $as_me 6.1.0-beta1, which was
18219+
This file was extended by Gregorio (TeX Live) $as_me 6.1.0-beta2, which was
1822018220
generated by GNU Autoconf 2.72. Invocation command line was
1822118221

1822218222
CONFIG_FILES = $CONFIG_FILES
@@ -18285,7 +18285,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
1828518285
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1828618286
ac_cs_config='$ac_cs_config_escaped'
1828718287
ac_cs_version="\\
18288-
Gregorio (TeX Live) config.status 6.1.0-beta1
18288+
Gregorio (TeX Live) config.status 6.1.0-beta2
1828918289
configured by $0, generated by GNU Autoconf 2.72,
1829018290
with options \\"\$ac_cs_config\\"
1829118291

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
6.1.0-beta2
2+
2025
3+
4+
*** Do not modify this file. ***
5+
Use VersionManager.py to change the version.

texk/gregorio/gregorio-src/CHANGELOG.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
88
## [Unreleased][CTAN]
99

1010

11-
## [6.1.0-beta1] - 2025-02-10
11+
## [6.1.0-beta2] - 2025-02-17
1212
### Fixed
1313
- 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.
1414
- 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).
@@ -18,6 +18,10 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
1818
- Fixed a bug that caused a custos to sometimes change into a clef. See [#1373](https://github.com/gregorio-project/gregorio/issues/1373).
1919
- Fixed the alignment of 2-line initials so that an initial's baseline more exactly aligns with the baseline of the lowest line it appears next to.
2020
- When fancyhdr and GregorioTeX are used together, GregorioTeX's disabling of hyphenation and its `post_linebreak` modification of the `post_linebreak_filter` interfere with multiline headers. Using the `fancyhdr/before` and `fancyhdr/after` hooks we temporarily reenable hyphenation and disable our `post_linebreak` modification while headers and footers are being processed in the middle of a score. See [#1603](https://github.com/gregorio-project/gregorio/issues/1603).
21+
- Fixed a bug that could cause a hyphen to appear on the wrong line. See [#1319](https://github.com/gregorio-project/gregorio/issues/1319).
22+
- Fixed the placement of above-lines text (`<alt>`) relative to a note above the staff or when the number of staff lines is not 4. See [#1613](https://github.com/gregorio-project/gregorio/issues/1613) and [#1614](https://github.com/gregorio-project/gregorio/issues/1614).
23+
- Fixed a bug where the above-lines text (`<alt>`) could collid with a note above the staff. See [#1613](https://github.com/gregorio-project/gregorio/issues/1613).
24+
- Fixed a bug that could cause the clef and staff to be printed too high. See [#1503](https://github.com/gregorio-project/gregorio/issues/1503).
2125

2226
### Changed
2327
- Modified gregorio to append to the log file specified as an argument and to send early messages to it. See [#1541](https://github.com/gregorio-project/gregorio/issues/1541).

texk/gregorio/gregorio-src/Makefile.am

+5-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,11 @@ clean-pdf: clean-doc
4242
clean-doc:
4343
make -C doc clean-doc
4444

45-
gregoriotex.tds.zip: dist install-gtex.sh
45+
gregoriotex.tds.zip: dist-zip install-gtex.sh
4646
./install-gtex.sh tds
4747

48-
ctan: dist gregoriotex.tds.zip build-ctan.sh
48+
ctan: gregoriotex.tds.zip build-ctan.sh
4949
./build-ctan.sh
50+
51+
dist-hook:
52+
rm -rf $(distdir)/windows

texk/gregorio/gregorio-src/configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ dnl
1616
dnl You should have received a copy of the GNU General Public License
1717
dnl along with Gregorio. If not, see <http://www.gnu.org/licenses/>.
1818

19-
AC_INIT([gregorio],[6.1.0-beta1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
20-
FILENAME_VERSION="6_1_0-beta1"
19+
AC_INIT([gregorio],[6.1.0-beta2],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
20+
FILENAME_VERSION="6_1_0-beta2"
2121
AC_SUBST(FILENAME_VERSION)
2222
AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
2323
MK=""
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
% !TEX root = GregorioRef.tex
2+
% !TEX program = LuaLaTeX+se
3+
%
4+
% Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md)
5+
%
6+
% This file is part of Gregorio.
7+
%
8+
% Gregorio is free software: you can redistribute it and/or modify
9+
% it under the terms of the GNU General Public License as published by
10+
% the Free Software Foundation, either version 3 of the License, or
11+
% (at your option) any later version.
12+
%
13+
% Gregorio is distributed in the hope that it will be useful,
14+
% but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
% GNU General Public License for more details.
17+
%
18+
% You should have received a copy of the GNU General Public License
19+
% along with Gregorio. If not, see <http://www.gnu.org/licenses/>.
20+
%
21+
\begin{landscape}
22+
23+
\section{Font Glyph Tables}\label{glyphtable}
24+
25+
\subsection{Score Font Glyphs}
26+
27+
The following table lists all of the score glyphs available in the greciliae
28+
font and any variant glyphs contained within. Some of the glyphs listed are
29+
representative of sets of glyphs differentiated by the ambitus of the component
30+
notes. These are listed with English words for the numbers in italics, such as
31+
{\itshape TwoTwo}. The gabc column lists a gabc sequence that uses the given
32+
glyph. If there are small, slanted characters, such as \excluded{gege} in this
33+
column, they produce glyphs additional to the given glyph, but are necessary
34+
for the given glyph to appear. Note: glyphs for the horizontal episema
35+
(activated using {\ttfamily\char`_} in gabc) are excluded from this table.
36+
37+
\newcommand\ScoreFontTable[1]{%
38+
\begin{longtable}{llc|cc|lc|cc}
39+
\caption{Score Glyphs}\\
40+
&
41+
&%
42+
&%
43+
\multicolumn{2}{c|}{\bfseries Variants}&
44+
\multicolumn{2}{c|}{\bfseries Cavum}&
45+
\multicolumn{2}{c}{\bfseries Cavum Variants}\\
46+
\hhline{>{\arrayrulecolor{lightgray}}--->{\arrayrulecolor{black}}------}
47+
{\bfseries Glyph Name}&%
48+
{\scriptsize\bfseries Sample gabc}&%
49+
{\scriptsize\bfseries Glyph}&%
50+
{\scriptsize\bfseries Name}&%
51+
{\scriptsize\bfseries Glyph}&%
52+
{\scriptsize\bfseries Sample gabc}&%
53+
{\scriptsize\bfseries Glyph}&%
54+
{\scriptsize\bfseries Name}&%
55+
{\scriptsize\bfseries Glyph}\\
56+
\hline
57+
\endfirsthead
58+
&%
59+
&%
60+
&%
61+
\multicolumn{2}{c|}{\bfseries Variants}&
62+
\multicolumn{2}{c|}{\bfseries Cavum}&
63+
\multicolumn{2}{c}{\bfseries Cavum Variants}\\
64+
\hhline{>{\arrayrulecolor{lightgray}}--->{\arrayrulecolor{black}}------}
65+
{\bfseries Glyph Name}&%
66+
{\scriptsize\bfseries Sample gabc}&%
67+
{\scriptsize\bfseries Glyph}&%
68+
{\scriptsize\bfseries Name}&%
69+
{\scriptsize\bfseries Glyph}&%
70+
{\scriptsize\bfseries Sample gabc}&%
71+
{\scriptsize\bfseries Glyph}&%
72+
{\scriptsize\bfseries Name}&%
73+
{\scriptsize\bfseries Glyph}\\
74+
\hline
75+
\endhead
76+
\directlua{GregorioRef.emit_score_glyphs(#1)}
77+
\end{longtable}
78+
}%
79+
\ScoreFontTable{'greciliae', 'greciliaeHollow'}
80+
81+
\subsection{Dominican Score Font Glyphs}
82+
83+
The following table lists all of the score glyphs available in the Dominican
84+
versions of the greciliae fonts in the same vein as the prior table.
85+
86+
\ScoreFontTable{'greciliaeOp', 'greciliaeOpHollow'}
87+
88+
\subsection{Extra Glyphs}\label{subsec:greextra}
89+
90+
The following table lists the glyphs available in the greextra font. There are
91+
score glyphs which may be substituted into the score, text glyphs meant to be
92+
used in the verses or in the \TeX{} document, and miscellaneous glyphs like
93+
decorative lines for more specialized use.
94+
95+
\begin{longtable}{lc|lc}
96+
\caption{Extra Glyphs}\\
97+
{\bfseries Glyph Name}&{\bfseries Glyph}&{\bfseries Glyph Name}&{\bfseries Glyph}\\
98+
\hline
99+
\endfirsthead
100+
{\bfseries Glyph Name}&{\bfseries Glyph}&{\bfseries Glyph Name}&{\bfseries Glyph}\\
101+
\hline
102+
\endhead
103+
\directlua{GregorioRef.emit_extra_glyphs('greextra')}
104+
\end{longtable}
105+
106+
\end{landscape}

0 commit comments

Comments
 (0)