Skip to content

Commit

Permalink
import gregorio-6.1.0-beta2
Browse files Browse the repository at this point in the history
git-svn-id: svn://tug.org/texlive/trunk/Build/source@74112 c570f23f-e606-0410-a88d-b1316a301751
  • Loading branch information
kberry committed Feb 18, 2025
1 parent 8c879f0 commit 737feca
Show file tree
Hide file tree
Showing 80 changed files with 582,406 additions and 56 deletions.
4 changes: 2 additions & 2 deletions texk/README
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ dvisvgm 3.4.3 - checked 11jan25
https://github.com/mgieseki/dvisvgm
https://ctan.org/pkg/dvisvgm

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

gsftopk - from Paul Vojta's xdvi.

Expand Down
6 changes: 5 additions & 1 deletion texk/gregorio/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
2025-02-18 Karl Berry <karl@freefriends.org>

* Import gregorio-6.1.0-beta2.zip.
* version.ac: updated.

2025-02-17 Karl Berry <karl@freefriends.org>

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

2025-02-15 Karl Berry <karl@freefriends.org>

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

2023-08-13 TANAKA Takuji <ttk@t-lab.opal.ne.jp>

Expand Down
15 changes: 11 additions & 4 deletions texk/gregorio/TLpatches/TL-Changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ Changes applied to the gregorio source tree as obtained from:

Update ./version.ac.
mv gregorio-src gregorio-prev
mkdir gregorio-src
zip=`ls ~/tmp/gregorio*zip`
zipinfo -1 $zip # normally unpacks into gregorio-VERSION
unzip -q ...
mv gregorio-[6789]* gregorio-src
cd gregorio-src
unzip ...

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

cd ..
autoreconf #in the TL directory (Build/source/texk/gregorio).
rebuild; a full rebuild is best.
autoreconf # in the TL directory (Build/source/texk/gregorio).
rebuild # a full rebuild is best.

# if all looks ok:
edit ./ChangeLog
edit ../README
svn commit -m"import gregorio-$VER" ../README .
22 changes: 11 additions & 11 deletions texk/gregorio/configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.72 for Gregorio (TeX Live) 6.1.0-beta1.
# Generated by GNU Autoconf 2.72 for Gregorio (TeX Live) 6.1.0-beta2.
#
# Report bugs to <tex-k@tug.org>.
#
Expand Down Expand Up @@ -614,8 +614,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Gregorio (TeX Live)'
PACKAGE_TARNAME='gregorio--tex-live-'
PACKAGE_VERSION='6.1.0-beta1'
PACKAGE_STRING='Gregorio (TeX Live) 6.1.0-beta1'
PACKAGE_VERSION='6.1.0-beta2'
PACKAGE_STRING='Gregorio (TeX Live) 6.1.0-beta2'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL='http://gregorio-project.github.io/'

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

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

Expand Down Expand Up @@ -1439,7 +1439,7 @@ fi

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

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

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

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

$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -9234,7 +9234,7 @@ fi

# Define the identity of the package.
PACKAGE='gregorio--tex-live-'
VERSION='6.1.0-beta1'
VERSION='6.1.0-beta2'


printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
Expand Down Expand Up @@ -16585,7 +16585,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."

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

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

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

Expand Down
5 changes: 5 additions & 0 deletions texk/gregorio/gregorio-src/.gregorio-version
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
6.1.0-beta2
2025

*** Do not modify this file. ***
Use VersionManager.py to change the version.
6 changes: 5 additions & 1 deletion texk/gregorio/gregorio-src/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased][CTAN]


## [6.1.0-beta1] - 2025-02-10
## [6.1.0-beta2] - 2025-02-17
### 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).
Expand All @@ -18,6 +18,10 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
- Fixed a bug that caused a custos to sometimes change into a clef. See [#1373](https://github.com/gregorio-project/gregorio/issues/1373).
- 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.
- 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).
- Fixed a bug that could cause a hyphen to appear on the wrong line. See [#1319](https://github.com/gregorio-project/gregorio/issues/1319).
- 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).
- 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).
- 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).

### Changed
- 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).
Expand Down
7 changes: 5 additions & 2 deletions texk/gregorio/gregorio-src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@ clean-pdf: clean-doc
clean-doc:
make -C doc clean-doc

gregoriotex.tds.zip: dist install-gtex.sh
gregoriotex.tds.zip: dist-zip install-gtex.sh
./install-gtex.sh tds

ctan: dist gregoriotex.tds.zip build-ctan.sh
ctan: gregoriotex.tds.zip build-ctan.sh
./build-ctan.sh

dist-hook:
rm -rf $(distdir)/windows
4 changes: 2 additions & 2 deletions texk/gregorio/gregorio-src/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dnl
dnl You should have received a copy of the GNU General Public License
dnl along with Gregorio. If not, see <http://www.gnu.org/licenses/>.

AC_INIT([gregorio],[6.1.0-beta1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
FILENAME_VERSION="6_1_0-beta1"
AC_INIT([gregorio],[6.1.0-beta2],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
FILENAME_VERSION="6_1_0-beta2"
AC_SUBST(FILENAME_VERSION)
AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
MK=""
Expand Down
106 changes: 106 additions & 0 deletions texk/gregorio/gregorio-src/doc/Appendix_Font_Tables.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
% !TEX root = GregorioRef.tex
% !TEX program = LuaLaTeX+se
%
% Copyright (C) 2006-2025 The Gregorio Project (see CONTRIBUTORS.md)
%
% This file is part of Gregorio.
%
% Gregorio 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 3 of the License, or
% (at your option) any later version.
%
% Gregorio 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 Gregorio. If not, see <http://www.gnu.org/licenses/>.
%
\begin{landscape}

\section{Font Glyph Tables}\label{glyphtable}

\subsection{Score Font Glyphs}

The following table lists all of the score glyphs available in the greciliae
font and any variant glyphs contained within. Some of the glyphs listed are
representative of sets of glyphs differentiated by the ambitus of the component
notes. These are listed with English words for the numbers in italics, such as
{\itshape TwoTwo}. The gabc column lists a gabc sequence that uses the given
glyph. If there are small, slanted characters, such as \excluded{gege} in this
column, they produce glyphs additional to the given glyph, but are necessary
for the given glyph to appear. Note: glyphs for the horizontal episema
(activated using {\ttfamily\char`_} in gabc) are excluded from this table.

\newcommand\ScoreFontTable[1]{%
\begin{longtable}{llc|cc|lc|cc}
\caption{Score Glyphs}\\
&
&%
&%
\multicolumn{2}{c|}{\bfseries Variants}&
\multicolumn{2}{c|}{\bfseries Cavum}&
\multicolumn{2}{c}{\bfseries Cavum Variants}\\
\hhline{>{\arrayrulecolor{lightgray}}--->{\arrayrulecolor{black}}------}
{\bfseries Glyph Name}&%
{\scriptsize\bfseries Sample gabc}&%
{\scriptsize\bfseries Glyph}&%
{\scriptsize\bfseries Name}&%
{\scriptsize\bfseries Glyph}&%
{\scriptsize\bfseries Sample gabc}&%
{\scriptsize\bfseries Glyph}&%
{\scriptsize\bfseries Name}&%
{\scriptsize\bfseries Glyph}\\
\hline
\endfirsthead
&%
&%
&%
\multicolumn{2}{c|}{\bfseries Variants}&
\multicolumn{2}{c|}{\bfseries Cavum}&
\multicolumn{2}{c}{\bfseries Cavum Variants}\\
\hhline{>{\arrayrulecolor{lightgray}}--->{\arrayrulecolor{black}}------}
{\bfseries Glyph Name}&%
{\scriptsize\bfseries Sample gabc}&%
{\scriptsize\bfseries Glyph}&%
{\scriptsize\bfseries Name}&%
{\scriptsize\bfseries Glyph}&%
{\scriptsize\bfseries Sample gabc}&%
{\scriptsize\bfseries Glyph}&%
{\scriptsize\bfseries Name}&%
{\scriptsize\bfseries Glyph}\\
\hline
\endhead
\directlua{GregorioRef.emit_score_glyphs(#1)}
\end{longtable}
}%
\ScoreFontTable{'greciliae', 'greciliaeHollow'}

\subsection{Dominican Score Font Glyphs}

The following table lists all of the score glyphs available in the Dominican
versions of the greciliae fonts in the same vein as the prior table.

\ScoreFontTable{'greciliaeOp', 'greciliaeOpHollow'}

\subsection{Extra Glyphs}\label{subsec:greextra}

The following table lists the glyphs available in the greextra font. There are
score glyphs which may be substituted into the score, text glyphs meant to be
used in the verses or in the \TeX{} document, and miscellaneous glyphs like
decorative lines for more specialized use.

\begin{longtable}{lc|lc}
\caption{Extra Glyphs}\\
{\bfseries Glyph Name}&{\bfseries Glyph}&{\bfseries Glyph Name}&{\bfseries Glyph}\\
\hline
\endfirsthead
{\bfseries Glyph Name}&{\bfseries Glyph}&{\bfseries Glyph Name}&{\bfseries Glyph}\\
\hline
\endhead
\directlua{GregorioRef.emit_extra_glyphs('greextra')}
\end{longtable}

\end{landscape}
Loading

0 comments on commit 737feca

Please sign in to comment.