summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-12-09 22:20:21 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2015-12-09 22:20:21 +0000
commitfbfb4e16cc7761a5aefcae7cacf662fec7092c92 (patch)
tree0a1f90f31434d7c8fc766c97df33cb3e2456ef75
parentb4c906f1397a603ffc06957cb835ddd687c8fe2b (diff)
Import Gregorio-4.0.0.
git-svn-id: svn://tug.org/texlive/trunk@39063 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/gregorio/ChangeLog5
-rwxr-xr-xBuild/source/texk/gregorio/configure26
-rw-r--r--Build/source/texk/gregorio/gregorio-4.0.0-rc1-PATCHES/patch-01-protos24
-rw-r--r--Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/TeXShop/gregorio.scpt27
-rw-r--r--Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Command_Index_gregorio.tex886
-rw-r--r--Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioNabcRef-4_0_0-rc1.pdfbin274430 -> 0 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioRef-4_0_0-rc1.pdfbin500289 -> 0 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/config_.h.in83
-rw-r--r--Build/source/texk/gregorio/gregorio-src-PATCHES/ChangeLog (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1-PATCHES/ChangeLog)5
-rw-r--r--Build/source/texk/gregorio/gregorio-src-PATCHES/TL-Changes (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1-PATCHES/TL-Changes)10
-rw-r--r--Build/source/texk/gregorio/gregorio-src/._CHANGELOG.mdbin0 -> 171 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/.gregorio-version (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/.gregorio-version)2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/CHANGELOG.md (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/CHANGELOG.md)71
-rw-r--r--Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/CONTRIBUTING.md)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/CONTRIBUTORS.md (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/CONTRIBUTORS.md)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/COPYING.md (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/COPYING.md)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/Makefile.am (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/Makefile.am)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/README.md (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/README.md)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/UPGRADE.md (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/UPGRADE.md)20
-rw-r--r--[-rwxr-xr-x]Build/source/texk/gregorio/gregorio-src/VersionManager.py (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/VersionManager.py)67
-rwxr-xr-xBuild/source/texk/gregorio/gregorio-src/build.sh (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/build.sh)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/configure.ac (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/configure.ac)4
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/900_gregorio.xml)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/Makefile.am)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/README.md (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/README.md)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/._.DS_Storebin0 -> 120 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/._Configure TeXShop.appbin0 -> 120 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Info.plist86
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/MacOS/Application Stubbin0 -> 14464 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/AutomatorApplet.icnsbin0 -> 1263871 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Dutch.lproj/ApplicationStub.nibbin0 -> 15457 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/English.lproj/ApplicationStub.nibbin0 -> 13350 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/French.lproj/ApplicationStub.nibbin0 -> 12848 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/German.lproj/ApplicationStub.nibbin0 -> 12615 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Italian.lproj/ApplicationStub.nibbin0 -> 12531 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Japanese.lproj/ApplicationStub.nibbin0 -> 16679 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Spanish.lproj/ApplicationStub.nibbin0 -> 12619 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ar.lproj/ApplicationStub.nibbin0 -> 12737 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ca.lproj/ApplicationStub.nibbin0 -> 12653 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/cs.lproj/ApplicationStub.nibbin0 -> 12856 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/da.lproj/ApplicationStub.nibbin0 -> 12416 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/el.lproj/ApplicationStub.nibbin0 -> 12987 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/es_MX.lproj/ApplicationStub.nibbin0 -> 12637 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/fi.lproj/ApplicationStub.nibbin0 -> 12362 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/he.lproj/ApplicationStub.nibbin0 -> 12708 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/hr.lproj/ApplicationStub.nibbin0 -> 12585 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/hu.lproj/ApplicationStub.nibbin0 -> 12909 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/id.lproj/ApplicationStub.nibbin0 -> 12474 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ko.lproj/ApplicationStub.nibbin0 -> 12404 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ms.lproj/ApplicationStub.nibbin0 -> 12432 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/no.lproj/ApplicationStub.nibbin0 -> 15698 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/pl.lproj/ApplicationStub.nibbin0 -> 16221 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/pt.lproj/ApplicationStub.nibbin0 -> 15760 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/pt_PT.lproj/ApplicationStub.nibbin0 -> 12444 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ro.lproj/ApplicationStub.nibbin0 -> 12722 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ru.lproj/ApplicationStub.nibbin0 -> 12986 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/sk.lproj/ApplicationStub.nibbin0 -> 12853 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/sv.lproj/ApplicationStub.nibbin0 -> 12565 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/th.lproj/ApplicationStub.nibbin0 -> 12787 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/tr.lproj/ApplicationStub.nibbin0 -> 12694 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/uk.lproj/ApplicationStub.nibbin0 -> 13041 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/vi.lproj/ApplicationStub.nibbin0 -> 12798 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/zh_CN.lproj/ApplicationStub.nibbin0 -> 12194 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/zh_TW.lproj/ApplicationStub.nibbin0 -> 12242 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/document.wflow365
-rw-r--r--[-rwxr-xr-x]Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaLaTeX+se.engine (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/TeXShop/LuaLaTeX+se.engine)0
-rwxr-xr-xBuild/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.sh17
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gabc-syntax.plist (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gabc-syntax.plist)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gabc.lang)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gabc.vim)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gabc.xml (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gabc.xml)0
-rw-r--r--[-rwxr-xr-x]Build/source/texk/gregorio/gregorio-src/contrib/gprocess (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gprocess)42
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gregorio-scribus.lua (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gregorio-scribus.lua)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gregorio.png (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gregorio.png)bin916 -> 916 bytes
-rw-r--r--[-rwxr-xr-x]Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/system-setup.bat)0
-rwxr-xr-xBuild/source/texk/gregorio/gregorio-src/contrib/system-setup.sh (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/system-setup.sh)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/Appendix_Font_Tables.tex (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Appendix_Font_Tables.tex)78
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Command_Index_User.tex)655
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex889
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Command_Index_internal.tex)724
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Gabc.tex)87
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_0_0.pdfbin0 -> 279368 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.tex (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioNabcRef.tex)241
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_0_0.pdfbin0 -> 515934 bytes
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioRef.lua)4
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioRef.tex)180
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/Makefile.am (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Makefile.am)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/factus.gabc (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/factus.gabc)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/doc/veni.gabc (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/veni.gabc)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/examples/FactusEst.gabc (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/examples/FactusEst.gabc)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/examples/Makefile.am (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/examples/Makefile.am)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/examples/PopulusSion.gabc (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/examples/PopulusSion.gabc)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/examples/main-lualatex.tex (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/examples/main-lualatex.tex)24
-rwxr-xr-xBuild/source/texk/gregorio/gregorio-src/install-gtex.sh (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/install-gtex.sh)0
-rwxr-xr-xBuild/source/texk/gregorio/gregorio-src/install.sh (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/install.sh)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/m4/ax_check_compile_flag.m4 (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/m4/ax_check_compile_flag.m4)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/m4/ax_check_link_flag.m4 (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/m4/ax_check_link_flag.m4)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/m4/pkg.m4 (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/m4/pkg.m4)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/Makefile.am (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/Makefile.am)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/bool.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/bool.h)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/characters.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/characters.c)62
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/characters.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/characters.h)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/config.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/config.h)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/dump/dump.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/dump/dump.c)77
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/encode_utf8strings.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/encode_utf8strings.c)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-elements-determination.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-elements-determination.c)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-glyphs-determination.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-glyphs-determination.c)15
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-notes-determination-l.c)311
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-notes-determination.l)83
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-l.c)201
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-l.h)2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-y.c)96
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-y.h)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination.h)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination.l)25
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.y (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination.y)24
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-write.c)51
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gabc/gabc.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc.h)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gregorio-utils.c)68
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gregoriotex/gregoriotex-position.c)435
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gregoriotex/gregoriotex-write.c)184
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gregoriotex/gregoriotex.h)13
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/messages.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/messages.c)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/messages.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/messages.h)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/plugins.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/plugins.h)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/sha1.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/sha1.c)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/sha1.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/sha1.h)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/struct.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/struct.c)222
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/struct.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/struct.h)57
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/support.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/support.c)49
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/support.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/support.h)7
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/unicode.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/unicode.c)8
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/unicode.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/unicode.h)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/utf8strings.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/utf8strings.h)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/utf8strings.h.in (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/utf8strings.h.in)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules-l.c)50
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules-l.h)2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules-y.c)37
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules-y.h)0
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules.h)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.l (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules.l)6
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.y (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules.y)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.c (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel.c)41
-rw-r--r--Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.h (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel.h)3
-rw-r--r--Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/windows/gregorio-resources.rc)8
-rw-r--r--Build/source/texk/gregorio/gregorio-src/windows/gregorio.ico (renamed from Build/source/texk/gregorio/gregorio-4.0.0-rc1/windows/gregorio.ico)bin282350 -> 282350 bytes
-rw-r--r--Build/source/texk/gregorio/version.ac2
147 files changed, 3734 insertions, 3069 deletions
diff --git a/Build/source/texk/gregorio/ChangeLog b/Build/source/texk/gregorio/ChangeLog
index c85f961dc3c..cb878a36e24 100644
--- a/Build/source/texk/gregorio/ChangeLog
+++ b/Build/source/texk/gregorio/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-10 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ Import gregorio-4.0.0.
+ * version.ac: Adapted.
+
2015-10-09 Peter Breitenlohner <peb@mppmu.mpg.de>
Import gregorio-4.0.0-rc1.
diff --git a/Build/source/texk/gregorio/configure b/Build/source/texk/gregorio/configure
index 3a024fe7fa4..94151e5c7c4 100755
--- a/Build/source/texk/gregorio/configure
+++ b/Build/source/texk/gregorio/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ChkTeX (TeX Live) 4.0.0-rc1.
+# Generated by GNU Autoconf 2.69 for ChkTeX (TeX Live) 4.0.0.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,12 +590,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ChkTeX (TeX Live)'
PACKAGE_TARNAME='chktex--tex-live-'
-PACKAGE_VERSION='4.0.0-rc1'
-PACKAGE_STRING='ChkTeX (TeX Live) 4.0.0-rc1'
+PACKAGE_VERSION='4.0.0'
+PACKAGE_STRING='ChkTeX (TeX Live) 4.0.0'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
-ac_unique_file="gregorio-4.0.0-rc1/src/gregorio-utils.c"
+ac_unique_file="gregorio-src/src/gregorio-utils.c"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -1329,7 +1329,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 ChkTeX (TeX Live) 4.0.0-rc1 to adapt to many kinds of systems.
+\`configure' configures ChkTeX (TeX Live) 4.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1400,7 +1400,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ChkTeX (TeX Live) 4.0.0-rc1:";;
+ short | recursive ) echo "Configuration of ChkTeX (TeX Live) 4.0.0:";;
esac
cat <<\_ACEOF
@@ -1519,7 +1519,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ChkTeX (TeX Live) configure 4.0.0-rc1
+ChkTeX (TeX Live) configure 4.0.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2175,7 +2175,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 ChkTeX (TeX Live) $as_me 4.0.0-rc1, which was
+It was created by ChkTeX (TeX Live) $as_me 4.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -7860,7 +7860,7 @@ fi
# Define the identity of the package.
PACKAGE='chktex--tex-live-'
- VERSION='4.0.0-rc1'
+ VERSION='4.0.0'
cat >>confdefs.h <<_ACEOF
@@ -13702,7 +13702,7 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
esac
-GREGORIO_TREE=gregorio-4.0.0-rc1
+GREGORIO_TREE=gregorio-src
PERL5='/usr/bin/env perl'
@@ -14121,7 +14121,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-ChkTeX (TeX Live) config.lt 4.0.0-rc1
+ChkTeX (TeX Live) config.lt 4.0.0
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -15708,7 +15708,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 ChkTeX (TeX Live) $as_me 4.0.0-rc1, which was
+This file was extended by ChkTeX (TeX Live) $as_me 4.0.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15774,7 +15774,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ChkTeX (TeX Live) config.status 4.0.0-rc1
+ChkTeX (TeX Live) config.status 4.0.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1-PATCHES/patch-01-protos b/Build/source/texk/gregorio/gregorio-4.0.0-rc1-PATCHES/patch-01-protos
deleted file mode 100644
index f4efe78f7fc..00000000000
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1-PATCHES/patch-01-protos
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur gregorio-4.0.0-rc1.orig/src/gabc/gabc-score-determination.y gregorio-4.0.0-rc1/src/gabc/gabc-score-determination.y
---- gregorio-4.0.0-rc1.orig/src/gabc/gabc-score-determination.y 2015-10-09 03:44:39.000000000 +0200
-+++ gregorio-4.0.0-rc1/src/gabc/gabc-score-determination.y 2015-10-09 09:50:00.000000000 +0200
-@@ -412,7 +412,7 @@
- current_syllable->translation_type = TR_NORMAL;
- }
-
--static void rebuild_characters()
-+static void rebuild_characters(void)
- {
- bool has_initial = score->initial_style != NO_INITIAL;
-
-diff -ur gregorio-4.0.0-rc1.orig/src/gabc/gabc-score-determination-y.c gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-y.c
---- gregorio-4.0.0-rc1.orig/src/gabc/gabc-score-determination-y.c 2015-10-09 12:17:57.000000000 +0200
-+++ gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-y.c 2015-10-09 09:50:07.000000000 +0200
-@@ -486,7 +486,7 @@
- current_syllable->translation_type = TR_NORMAL;
- }
-
--static void rebuild_characters()
-+static void rebuild_characters(void)
- {
- bool has_initial = score->initial_style != NO_INITIAL;
-
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/TeXShop/gregorio.scpt b/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/TeXShop/gregorio.scpt
deleted file mode 100644
index 36fafce2923..00000000000
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/TeXShop/gregorio.scpt
+++ /dev/null
@@ -1,27 +0,0 @@
---Applescript
--- Tracy Llenos <tllenos@gmail.com>
--- a workaround macro for compiling Gregorio gabc files inside TeXShop
-
-set fileName to #FILEPATH#
-if fileName is equal to ""
-activate
-display dialog "Please save the file first" buttons {"OK"} default button "OK"
-return
-end if
-
--- finds proper filenames
--- from the Claus Gerhardt TeXShop macros
-set fileName to #NAMEPATH#
-set n to (number of characters of contents of fileName)
-set fileNamequoted to quoted form of fileName
-set baseName to do shell script "basename " & fileNamequoted
-set m to (number of characters of contents of baseName)
-set dirName to quoted form of (characters 1 thru (n - m - 1) of fileName as string)
-set gabcName to baseName & ".gabc"
-
-do shell script "cd " & dirName & ";" & "/usr/local/bin/gregorio " & gabcName
-
-tell application "TeXShop"
-activate
-end tell
--- we return to TeXShop TODO: the option of opening the tex file?
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Command_Index_gregorio.tex b/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Command_Index_gregorio.tex
deleted file mode 100644
index e8425c0910f..00000000000
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Command_Index_gregorio.tex
+++ /dev/null
@@ -1,886 +0,0 @@
-% !TEX root = GregorioRef.tex
-% !TEX program = LuaLaTeX+se
-\section{Gregorio Controls}
-
-These functions are the ones written by Gregorio to the gtex file.
-While one could, in theory, use/change them to alter the appearance of
-elements of the score, it is far better to make your changes in the
-gabc file and let Gregorio make the changes to the gtex file.
-
-\macroname{\textbackslash GreAnnotationLines}{\#1\#2}{gregoriotex-main.tex}
-A wrapper macro for placing annotations above the initial. The
-arguments are provided by the \texttt{gabc} file in the
-\texttt{annotation} header field. This macro tests for the presence
-of the annotation box which means that the annotation is explicitly
-defined in the \texttt{main.tex} file. If so, this macro does nothing,
-respecting the annotation value in the \texttt{main.tex} file.
-
-\begin{argtable}
- \#1 & string & First line text to place above the initial.\\
- \#2 & string & Second line text to place above the initial.\\
-\end{argtable}
-
-\macroname{\textbackslash GreBeginScore}{\#1\#2\#3\#4\#5\#6}{gregoriotex-main.tex}
-Macro to start a score.
-
-\begin{argtable}
- \#1 & string & a unique identifier for the score (currently an SHA-1-based digest of the gabc file)\\
- \#2 & integer & the height number of the top pitch of the entire score, including signs\\
- \#3 & integer & the height number of the bottom pitch of the entire score, including signs\\
- \#4 & 0 & there is no translation line in the score\\
- & 1 & there is a translation line somewhere in the score\\
- \#5 & 0 & there is no above lines text in the score\\
- & 1 & there is above lines text somewhere in the score\\
- \#6 & string & the absolute filename of the gabc file if point-and-click is enabled.
-\end{argtable}
-
-\macroname{\textbackslash GreEndScore}{}{gregoriotex-main.tex}
-Macro to end a score.
-
-\macroname{\textbackslash GreAccentus}{\#1\#2}{gregoriotex-signs.tex}
-Macro for typesetting an accentus.
-
-\begin{argtable}
- \#1 & integer & height number of episemus\\
- \#2 & string & Type of glyph the episemus is attached to. See \nameref{EpisemusSpecial} argument for description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreAdditionalLine}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro to typeset the additional line above or below the staff.
-
-\begin{argtable}
- \#1 & string & See \nameref{EpisemusSpecial}.\\
- \#2 & integer & The ambitus of the porrectus or porrectus flexus if the first references these glyph types; ignored otherwise.\\
- \#3 & integer & Set horizontal episemus (0), horizontal episemus under a note (1), line at top of staff (2), line at bottom of staff (3), choral sign (4).\\
-\end{argtable}
-
-\macroname{\textbackslash GreAdjustSecondLine}{}{gregoriotex.tex}
-%didn't actually find this one in gregoriotex-write.c, classified it here based on it’s related function GreAdjustThirdLine
-Macro to call before first syllable, but after \verb=\GreSetInitialClef=.
-
-\macroname{\textbackslash GreAdjustThirdLine}{}{gregoriotex-main.tex}
-Macro to call during the second line.
-
-\macroname{\textbackslash GreAugmentumDuplex}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro for typesetting an augmentum duplex (a pair of punctum mora)
-
-\begin{argtable}
- \#1 & integer & Height number for first punctum mora.\\
- \#2 & integer & Height number for second punctum mora.\\
- \#3 & integer & First punctum mora occurs before last note of a podatus, prorectus, or toculus resupinus (1), or not (0).\\
-\end{argtable}
-
-\macroname{\textbackslash GreBarBrace}{\#1}{gregoriotex-signs.tex}
-Macro for typesetting a bar brace.
-
-\begin{argtable}
- \#1 & string & Type of glyph the episemus is attached to. See \nameref{EpisemusSpecial} argument for description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreBarSyllable}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-syllable.tex}
-Macro for typesetting a bar syllable.
-
-\begin{argtable}
- \#1 & string & First part of syllable text associated with the bar.\\
- \#2 & string & Middle part of the syllable text associated with the bar.\\
- \#3 & string & End part of the syllable text associated with the bar.\\
- \#4 & & Not used.\\
- \#5 & \TeX\ code & Code to execute before calculating \texttt{nextbegindifference}.\\
- \#6 & & Not used.\\
- \#7 & $0 <$ integer $< 19$ & the type of notes alignment. See \nameref{notesalign}.\\
- & $20 <$ integer $< 39$ & Same as below 20 except there is a flat before the notes. Subtract 20 to get the type of notes alignment.\\
- & $40 <$ integer $< 59$ & Same as below 20 except there is a natural before the notes. Subtract 40 to get the type of notes alignment.\\
- \#8 & \TeX\ code & Code to execute before printing anything.\\
- \#9 & \TeX\ code & The bar line (usually a \textit{writebar} call).
-\end{argtable}
-
-\macroname{\textbackslash GreBarVEpisemus}{\#1}{gregoriotex-signs.tex}
-Macro to typeset a vertical episemus around a bar.
-
-\begin{argtable}
- \#1 & string & Type of glyph the episemus is attached to. See \nameref{EpisemusSpecial} argument for description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreBeginEUOUAE}{}{gregoriotex-main.tex}
-Macro to mark the beginning of a EUOUAE block. Alters spacings and prohibits a line break until the end of the block.
-
-\macroname{\textbackslash GreBeginNLBArea}{\#1\#2}{gregoriotex-main.tex}
-Macro called at beginning of a no line break area.
-
-\begin{argtable}
- \#1 & 0 & Not in the neumes.\\
- & 1 & In the neumes.\\
- \#2 & 0 & Call didn't come from translation centering.\\
- & 1 & Call came from translation centering.
-\end{argtable}
-
-\macroname{\textbackslash GreBeginNotes}{}{gregoriotex.tex}
-Macro to draw the staff lines. Comes after the initial but before the clef.
-
-\macroname{\textbackslash GreBold}{\#1}{gregoriotex.sty and gregoriotex.tex}
-Makes argument bold. Accesses \LaTeX\ \verb=\textbf= (\textit{gregoriotex.sty}) or Plain\TeX\ \verb=\bf= (\textit{gregoriotex.tex}) as appropriate. Corresponds to ``<b></b>'' tags in gabc.
-
-\begin{argtable}
- \#1 & string & Text to be typeset in bold.\\
-\end{argtable}
-
-\macroname{\textbackslash GreChangeClef}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
-Macro called when key changes
-
-\begin{argtable}
- \#1 & character & Type of new clef (c or f).\\
- \#2 & integer & Line of new clef.\\
- \#3 & 0 & Print space before clef.\\
- & 1 & Do not print space before clef.\\
- \#4 & integer & Height number of flat in key (`0' for no flat).\\
-\end{argtable}
-
-\macroname{\textbackslash GreCirculus}{\#1\#2}{gregoriotex-signs.tex}
-Macro for typesetting a circulus.
-
-\begin{argtable}
- \#1 & integer & Height number of circulus.\\
- \#2 & string & Type of glyph the circulus is attached to. See \nameref{EpisemusSpecial} argument for description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreColored}{\#1}{gregoriotex.sty and gregoriotex.tex}
-Colors argument (a string) in \verb=gregoriocolor.= Corresponds to ``<c></c>'' tags in gabc. Does nothing in Plain\TeX\ because color is not supported there.
-
-\macroname{\textbackslash GreCPVirgaReversaAscendensOnDLine}{\#1}{gregoriotex-main.tex}
-Allows the Dominican rule set to force long stems to be used for virga
-reversa ascendens neumes on the ``d'' (lowest) line. This macro is
-defined and re-defined by the \verb=\gresetgregoriofont= macro.
-
-\begin{argtable}
- \#1 & \TeX{} code & The \TeX{} code to use when long stems are not forced.\\
-\end{argtable}
-
-\macroname{\textbackslash GreCP...}{}{gregoriotex-main.tex}
-A class of macros which point to the individual characters in a Gregoiro\TeX\ compatible font. This class of macros is dynamically mapped from the glyph names embedded in the \texttt{ttf} file via a Lua script to ensure that the code points match up with the installed font.
-
-\macroname{\textbackslash GreCustos}{\#1}{gregoriotex-signs.tex}
-Typesets a custos.
-
-\begin{argtable}
- \#1 & integer & Height number of custos.\\
-\end{argtable}
-
-\macroname{\textbackslash GreDagger}{}{gregoriotex-symbols.tex}
-Macro to typeset a dagger (\GreDagger).
-
-\macroname{\textbackslash GreDiscretionary}{\#1\#2\#3}{gregoriotex-signs.tex}
-A GregorioTeX specific discretionary. Currently only used to avoid clef change at beginning or end of line, or even with more complex data (z0::c3 for instance). We require a special function because in the normal discretionary function you cannot use \verb=\hskip= (but you can use \verb=\kern=) and you cannot use \verb=\penalty= (which is useless indeed). This macro corrects for these two limitations. The first argument allows to select the penalty assigned to the discretionary by recent version of LuaTeX.
-
-\begin{argtable}
- \#1 & integer & Type of discretionary (for penalty assignment). Currently possible value is 0 for clef change discretionaries.\\
- \#2 & \TeX\ code & First argument of resulting \verb=\discretionary=.\\
- \#3 & \TeX\ code & Third argument of resulting \verb=\discretionary=.\\
-\end{argtable}
-
-\macroname{\textbackslash GreDivisioFinalis}{\#1}{gregoriotex-signs.tex}
-Macro to typeset a divisio finalis.
-
-\begin{argtable}
- \#1 & code & Macros which may happen before the skip but after the divisio finalis (typically \verb=\grevepisemus=).\\
-\end{argtable}
-
-\macroname{\textbackslash GreDivisioMaior}{\#1}{gregoriotex-signs.tex}
-Macro to typeset a divisio maior.
-
-\begin{argtable}
- \#1 & code & Macros which may happen before the skip but after the divisio maior (typically \verb=\grevepisemus=).\\
-\end{argtable}
-
-\macroname{\textbackslash GreDivisioMinima}{\#1}{gregoriotex-signs.tex}
-Macro to typeset a divisio minima.
-
-\begin{argtable}
- \#1 & code & Macros which may happen before the skip but after the divisio minima (typically \verb=\grevepisemus=).\\
-\end{argtable}
-
-\macroname{\textbackslash GreDivisioMinor}{\#1}{gregoriotex-signs.tex}
-Macro to typeset a divisio minor.
-
-\begin{argtable}
- \#1 & code & Macros which may happen before the skip but after the divisio minor (typically \verb=\grevepisemus=).\\
-\end{argtable}
-
-\macroname{\textbackslash GreDominica}{\#1\#2}{gregoriotex-signs.tex}
-Macro to typeset a dominican bar.
-
-\begin{argtable}
- \#1 & integer 1-- 6& Type of dominican bar. Corresponds to bar types 6--11 in \verb=\grewritebar=.\\
- \#2 & code & Macros which may happen before the skip but after the divisio dominica (typically \verb=\grevepisemus=).\\
-\end{argtable}
-
-\macroname{\textbackslash GreEndEUOUAE}{\#1}{gregoriotex-main.tex}
-Macro to mark the end of a EUOUAE block.
-
-\begin{argtable}
- \#1 & 0 & ending element\\
- & 1 & ending syllable\\
- & 2 & ending score\\
- & 3 & before bar
-\end{argtable}
-
-\macroname{\textbackslash GreEndOfElement}{\#1\#2}{gregoriotex-main.tex}
-Macro to end elements.
-
-\begin{argtable}
- \#1 & 0 & Default space.\\
- & 1 & Larger space.\\
- & 2 & Glyph space.\\
- & 3 & Zero-width space.\\
- \#2 & 0 & Space is breakable.\\
- & 1 & Space is unbreakable.\\
-\end{argtable}
-
-\macroname{\textbackslash GreEndNLBArea}{\#1\#2}{gregoriotex-main.tex}
-Macro to end a no line break area.
-
-\begin{argtable}
- \#1 & 0 & ending element\\
- & 1 & ending syllable\\
- & 2 & ending score\\
- & 3 & before bar\\
- \#2 & 0 & ??\\ %I can’t tell what this flag is for
- & else & ??
-\end{argtable}
-
-\macroname{\textbackslash GreEndOfGlyph}{\#1}{gregoriotex-main.tex}
-Macro to end a glyph without ending the element.
-
-\begin{argtable}
- \#1 & 0 & Default space.\\
- & 1 & Zero-width space.\\
- & 2 & Space between flat or natural and a note.\\
- & 3 & Space between two puncta inclinata.\\
- & 4 & Space between bivirga or trivirga.\\
- & 5 & space between bistropha or tristropha.\\
- & 6 & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
- & 7 & Space between a punctum inclinatum and a punctum inclinatum debilis.\\
- & 8 & Space between two puncta inclinata debilis.\\
- & 9 & Space before a punctum (or something else) and a punctum inclinatum.\\
- & 10 & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\
- & 11 & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).\\
-\end{argtable}
-
-\macroname{\textbackslash GreFinalDivisioFinalis}{\#1}{gregoriotex-signs.tex}
-Macro to end a score with a divisio finalis.
-
-\begin{argtable}
- \#1 & 0 & Something does not need to be placed after the divisio finalis.\\
- & 1 & Something needs to be placed after the divisio finalis.\\
-\end{argtable}
-
-\macroname{\textbackslash GreFinalDivisioMaior}{\#1}{gregoriotex-signs.tex}
-Macro to end a score with a divisio maior.
-
-\begin{argtable}
- \#1 & 0 & Something does not need to be placed after the divisio maior.\\
- & 1 & Something needs to be placed after the divisio maior.\\
-\end{argtable}
-
-\macroname{\textbackslash GreFirstSyllable}{\{\#1\}}{gregoriotex-syllable.tex}
-A macro which is called with the text of the first syllable, excluding the
-initial of the score. This macro may be redefined to style the first syllable
-appropriately. This macro may be called up to three times: for the letters
-before the centered letters, for the centered letters, and for the letters
-after the centered letters.
-
-\begin{argtable}
- \#1 & string & Text from the first syllable.
-\end{argtable}
-
-\macroname{\textbackslash GreFirstSyllableInitial}{\{\#1\}}{gregoriotex-syllable.tex}
-A macro which is called with the first letter of the first syllable which is
-not the initial of the score. If the \texttt{initial-style} is \texttt{0}, the
-first letter of the syllable will be passed. If the \texttt{initial-style} is
-\texttt{1} or \texttt{2}, the \emph{second} letter will be passed. This macro
-may be redefined to style the first letter appropriately.
-
-\begin{argtable}
- \#1 & string & The first letter of the first syllable which is not the
- initial of the score.
-\end{argtable}
-
-\macroname{\textbackslash GreFirstWord}{\{\#1\}}{gregoriotex-syllable.tex}
-A macro which is called with the text of the first word, excluding the
-initial of the score. This macro may be redefined to style the first word
-appropriately. This macro may be called multiple times, depending on how
-many syllables are in the word.
-
-\begin{argtable}
- \#1 & string & Text from the first syllable.
-\end{argtable}
-
-\macroname{\textbackslash GreFlat}{\#1\#2}{gregoriotex-signs.tex}
-Macro to typeset a flat.
-
-\begin{argtable}
- \#1 & integer & Height number of the flat.\\
- \#2 & 0 & No flat for a key change.\\
- & 1 & Indicates the flat for a key change.\\
-\end{argtable}
-
-\macroname{\textbackslash GreFuseTwo}{\#1\#2}{gregoriotex-main.tex}
-Macro for fusing two glyphs to create a larger neume.
-
-\begin{argtable}
- \#1 & Gregorio\TeX\ glyph & The first glyph in the sequence.\\
- \#2 & Gregorio\TeX\ glyph & The second.
-\end{argtable}
-
-\macroname{\textbackslash GreGlyph}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-syllable.tex}
-Macro to typeset a glyph.
-
-\begin{argtable}
- \#1 & character & the character that it must call\\
- \#2 & integer & The number for where the glyph is located. \texttt{a} in gabc is 1, \texttt{b} is 2, \etc\\
- \#3 & integer & height number of the next note\\
- \#4 & 0 & One-note glyph or more than two notes glyph except porrectus: \ie, we must put the aligncenter in the middle of the first note\\
- & 1 & Two notes glyph (podatus is considered as a one-note glyph): \ie, we put the aligncenter in the middle of the glyph\\
- & 2 & Porrectus: has a special align center.\\
- & 3 & initio-debilis : same as 1 but the first note is much smaller\\
- & 4 & case of a glyph starting with a quilisma\\
- & 5 & case of a glyph starting with an oriscus\\
- & 6 & case of a punctum inclinatum\\
- & 7 & case of a stropha\\
- & 8 & flexus with an ambitus of one\\
- & 9 & flexus deminutus\\
- \#5 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
- \#6 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
- \#7 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled
-\end{argtable}
-
-\macroname{\textbackslash GreGlyphHeights}{\#1\#2}{gregoriotex-syllable.tex}
-Passes the glyph height limits. Currently does nothing, but will eventually be part of dynamic vertical spacing.
-
-\begin{argtable}
- \#1 & integer & the high height\\
- \#2 & integer & the low height
-\end{argtable}
-
-\macroname{\textbackslash GregorioTeXAPIVersion}{\#1}{gregoriotex-main.tex}
-Checks to see if Gregorio\TeX\ API is version specified by argument (and
-therefore compatible with the score.
-
-\begin{argtable}
- \#1 & string & Version number for Gregorio\TeX.\\
-\end{argtable}
-
-\macroname{\textbackslash GreHEpisemus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset a episemus.
-
-\begin{argtable}
- \#1 & integer & Height number of the episemus.\\
- \#2 & string & See \nameref{EpisemusSpecial}.\\
- \#3 & integer & The ambitus for a two note episemus at the diagonal stroke of a
- porrectus, porrectus flexus, orculus resupinus, or torculus resupinus
- flexus.\\
- \#4 & 0 & an horizontal episemus\\
- & 1 & an horizontal episemus under a note\\
- & 2 & a line at the top\\
- & 3 & a line at the bottom\\
- \#5 & f & a normal episemus\\
- & l & a small episemus aligned left\\
- & c & a small episemus aligned center\\
- & r & a small episemus aligned right\\
- \#6 & integer & Replacement for \#1 if a bridge causes a height substitution.\\
-\end{argtable}
-
-\macroname{\textbackslash GreHEpisemusBridge}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro to typeset a bridge episemus father the last note of a glyph
-(element, syllable) if the next episemus is at the same height.
-
-\begin{argtable}
- \#1 & integer & Height number of the episemus.\\
- \#2 & 0 & Episemus above the note.\\
- & 1 & Episemus below the note.\\
- \#3 & 0 & Default space.\\
- & 1 & Zero-width space.\\
- & 2 & Space between flat or natural and a note.\\
- & 3 & Space between two puncta inclinata.\\
- & 4 & Space between bivirga or trivirga.\\
- & 5 & space between bistropha or tristropha.\\
- & 6 & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
- & 7 & Space between a punctum inclinatum and a punctum inclinatum debilis.\\
- & 8 & Space between two puncta inclinata debilis.\\
- & 9 & Space before a punctum (or something else) and a punctum inclinatum.\\
- & 10 & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\
- & 11 & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).
-\end{argtable}
-
-\macroname{\textbackslash GreHighChoralSign}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro for typesetting high choral signs.
-
-\begin{argtable}
- \#1 & integer & Height number of the sign.\\
- \#2 & string & The choral sign.\\
- \#3 & 0 & Choral sign does not occur before last note of podatus, porrectus, or torculus resupinus.\\
- & 1 & Choral sign occurs before last note of podatus, porrectus, or torculus resupinus.\\
-\end{argtable}
-
-\macroname{\textbackslash GreHyph}{}{gregoriotex-main.tex}
-Macro used for end of line hyphens. Defaults to \verb=\grenormalhyph=.
-
-\macroname{\textbackslash GreInDivisioFinalis}{\#1}{gregoriotex-signs.tex}
-Same as \verb=\GreDivisioFinalis= except inside a syllable.
-
-\macroname{\textbackslash GreInDivisioMaior}{\#1}{gregoriotex-signs.tex}
-Same as \verb=\GreDivisioMaior= except inside a syllable.
-
-\macroname{\textbackslash GreInDivisioMinima}{\#1}{gregoriotex-signs.tex}
-Same as \verb=\GreDivisioMinima= except inside a syllable.
-
-\macroname{\textbackslash GreInDivisioMinor}{\#1}{gregoriotex-signs.tex}
-Same as \verb=\GreDivisioMinor= except inside a syllable.
-
-\macroname{\textbackslash GreInDominica}{\#1\#2}{gregoriotex-signs.tex}
-Same as \verb=\GreDominica= except inside a syllable.
-
-\macroname{\textbackslash GreInVirgula}{\#1\#2}{gregoriotex-signs.tex}
-Same as \verb=\GreVirgula= except inside a syllable.
-
-\macroname{\textbackslash GreItalic}{\#1}{gregoriotex.sty or gregoriotex.tex}
-Makes argument (a string) italic. Accesses \LaTeX\ \verb=\textit= or
-Plain\TeX\ \verb=\it= as appropriate. Corresponds to ``<i></i>'' tags
-in gabc.
-
-\begin{argtable}
- \#1 & string & Text to be typeset in italic font.\\
-\end{argtable}
-
-\macroname{\textbackslash GreLastOfLine}{}{gregoriotex-main.tex}
-Macro to set \verb=\gre@lastoflinecount= to 1 (\ie, mark that this syllable is the last of the line).
-
-\macroname{\textbackslash GreLastOfScore}{}{gregoriotex-main.tex}
-Macro to mark the syllable as the last of the score.
-
-\macroname{\textbackslash GreLinea}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro for typesetting a linea.
-
-\begin{argtable}
- \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
- \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
- \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
-\end{argtable}
-
-\macroname{\textbackslash GreLineaPunctumCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset a linea punctum cavum.
-
-\begin{argtable}
- \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
- \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
- \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
- \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
- \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
- \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
-\end{argtable}
-
-\macroname{\textbackslash GreLowChoralSign}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro for typesetting low choral signs.
-
-\begin{argtable}
- \#1 & integer & Height number of the sign.\\
- \#2 & string & The choral sign.\\
- \#3 & 0 & Choral sign does not occur before last note of podatus, porrectus, or torculus resupinus.\\
- & 1 & Choral sign occurs before last note of podatus, porrectus, or torculus resupinus.\\
-\end{argtable}
-
-\macroname{\textbackslash GreManualCustos}{\#1}{gregoriotex-signs.tex}
-Macro to typeset a custos manually.
-
-\begin{argtable}
- \#1 & integer & height number of the custos.
-\end{argtable}
-
-\macroname{\textbackslash GreMode}{\#1}{gregoriotex-main.tex}
-If the gabc file contains a mode in the header, then this function
-places said mode as the first (top) annotation. If the user has
-manually added a first annotation in the \TeX\ file, then this
-function does nothing. Also, if the \texttt{annotation} header field
-is used, then this function does nothing.
-
-\begin{argtable}
- \#1 & 1--8 & The mode. Other values are ignored.\\
-\end{argtable}
-
-\macroname{\textbackslash GreNatural}{\#1\#2}{gregoriotex-signs.tex}
-Macro to typeset a natural.
-
-\begin{argtable}
- \#1 & integer & Height number of the natural.\\
- \#2 & 0 & No flat for a key change.\\
- & 1 & Indicates the flat for a key change.\\
-\end{argtable}
-
-\macroname{\textbackslash GreNewLine}{}{gregoriotex-main.tex}
-Macro to call if you want to go to the next line.
-
-\macroname{\textbackslash GreNewParLine}{}{gregoriotex-main.tex}
-Same as \verb=\GreNewLine= except line is not justified.
-
-\macroname{\textbackslash GreNextCustos}{\#1}{gregoriotex-signs.tex}
-Sets the pitch to use for the next custos if it were to happen at the point
-where this macro is called.
-
-\begin{argtable}
- \#1 & integer & Height number of the custos.\\
-\end{argtable}
-
-\macroname{\textbackslash GreNoInitial}{}{gregoriotex-main.tex}
-Macro called when no initial is being set.
-
-\macroname{\textbackslash GreOverBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
-Macro to typeset a round brace above the lines.
-
-\begin{argtable}
- \#1 & length & The width of the brace.\\
- \#2 & length & A vertical shift.\\
- \#3 & length & A horizontal shift.\\
- \#4 & 0 & Don't shift before starting the brace.\\
- & 1 & Shift back a punctum's width before starting the brace.
-\end{argtable}
-
-\macroname{\textbackslash GreOverCurlyBrace}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
-Macro to typeset a curly brace above the lines.
-
-\begin{argtable}
- \#1 & length & The width of the brace.\\
- \#2 & length & A vertical shift.\\
- \#3 & length & A horizontal shift.\\
- \#4 & 0 & Don't shift before starting the brace.\\
- & 1 & Shift back a punctum's width before starting the brace.\\
- \#5 & 0 & No accentus above the brace.\\
- & 1 & Typeset an accentus above the brace.
-\end{argtable}
-
-\macroname{\textbackslash GrePunctumCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset a punctum cavum.
-
-\begin{argtable}
- \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
- \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
- \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
- \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
- \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
- \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
-\end{argtable}
-
-\macroname{\textbackslash GrePunctumCavumInclinatum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset a punctum cavum inclinatus.
-
-\begin{argtable}
- \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
- \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
- \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
- \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
- \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
- \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
-\end{argtable}
-
-\macroname{\textbackslash GrePunctumCavumInclinatumAuctus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset a punctum cavum inclinatus auctus.
-
-\begin{argtable}
- \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
- \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
- \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
- \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
- \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
- \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
-\end{argtable}
-
-\macroname{\textbackslash GrePunctumMora}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
-Macro for typesetting punctum mora.
-
-\begin{argtable}
- \#1 & integer & Height number of punctum mora.\\
- \#2 & 1 & Go back to end of punctum.\\
- & 2 & Shift left width of 1 punctum.\\
- & 3 & Shift left width of 1 punctum and ambitus of 1.\\
- \#3 & 0 & Punctum mora does not occur before last note of podatus, porrectus, or torculus resupinus.\\
- & 1 & Punctum mora occurs before last note of podatus, porrectus, or torculus resupinus.\\
- \#4 & 0 & No punctum inclinatum.\\
- & 1 & Punctum inclinatum.\\
-\end{argtable}
-
-\macroname{\textbackslash GreReversedAccentus}{\#1\#2}{gregoriotex-signs.tex}
-Macro for typesetting a reversed accentus.
-
-\begin{argtable}
- \#1 & integer & Height number of accentus.\\
- \#2 & string & Type of glyph the accentus is attached to. See \nameref{EpisemusSpecial} argument for description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreReversedSemicirculus}{\#1\#2}{gregoriotex-signs.tex}
-Macro for typesetting a reversed semicirculus.
-
-\begin{argtable}
- \#1 & integer & Height number of semicirculus.\\
- \#2 & string & Type of glyph the semicirculus is attached to. See \nameref{EpisemusSpecial} argument for description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreScoreReference}{\#1}{gregoriotex-main.tex}
-Currently does nothing.
-
-\macroname{\textbackslash GreSemicirculus}{\#1\#2}{gregoriotex-signs.tex}
-Macro for typesetting a semicirculus.
-
-\begin{argtable}
- \#1 & integer & Height number of semicirculus.\\
- \#2 & string & Type of glyph the semicirculus is attached to. See \nameref{EpisemusSpecial} argument for description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreSetBigInitial}{}{gregoriotex-main.tex}
-Macro which indicates that a 2-line initial is desired.
-
-\macroname{\textbackslash GreSetFixedNextTextFormat}{\#1}{gregoriotex-syllable.tex}
-Same as \verb=\GreSetFixedTextFormat= except for next syllable.
-
-\macroname{\textbackslash GreSetFixedTextFormat}{\#1}{gregoriotex-syllable.tex}
-Macro to specify a text which is different from \verb=#1#2#3= (of \verb=\GreSyllable=). It is useful for styles, for instance with:
-\par\medskip
-\begin{gabccode}
- <i>ffj</i>(gh)
-\end{gabccode}
-
-we will have
-
-\begin{latexcode}
- #1 = \textit{f}
- #2 = \textit{f}
- #3 = \textit{j}
-\end{latexcode}
-
-and thus \verb=#1#2#3= will be \verb=\textit{f}\textit{f}\textit{j}=, which won't typeset
-ligatures. In this example we should call \verb=\grefixedtext{\textit{ffj}}=.
-
-\begin{argtable}
- \#1 & 0 & nothing (normal text)\\
- & 1& italic\\
- & 2 & bold\\
- & 3 & small caps\\
- & 4 & typewriter\\
- & 5 & underline
-\end{argtable}
-
-\macroname{\textbackslash GreSetInitial}{\#1}{gregoriotex-main.tex}
-Macro to set the initial in the score.
-
-\begin{argtable}
- \#1 & character & The initial letter of the score.\\
-\end{argtable}
-
-\macroname{\textbackslash GreSetInitialClef}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro for writing initial key.
-
-\begin{argtable}
- \#1 & \texttt{c} or \texttt{f} & Type of clef.\\
- \#2 & 1--4 & Line of key.\\
- \#3 & integer & Height number of flat in key (\texttt{0} for no flat).\\
-\end{argtable}
-
-\macroname{\textbackslash GreSetLinesClef}{\#1\#2\#3\#4}{gregoriotex-main.tex}
-Macro to define the clef that will appear at the beginning of the lines.
-
-\begin{argtable}
- \#1 & \texttt{c} or \texttt{f} & Type of clef.\\
- \#2 & 1--4 & Line of key.\\
- \#3 & 0 & No space after clef.\\
- & 1 & Space after clef.\\
- \#4 & integer & Height of flat in key (\texttt{0} for no flat).\\
-\end{argtable}
-
-\macroname{\textbackslash GreSetNextSyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
-Macro to set the text of the next syllable for spacing purposes.
-
-\begin{argtable}
- \#1 & string & the first letters of the syllable, that don't count for the alignment\\
- \#2 & string & the middle letters of the syllable, we must align in the middle of them\\
- \#3 & string & the end letters, they don't count for alignment\\
-\end{argtable}
-
-\macroname{\textbackslash GreSetTextAboveLines}{\#1}{gregoriotex-main.tex}
-Macro to place argument above the lines and empty
-\verb=\gre@currenttextabovelines= when done.
-
-\begin{argtable}
- \#1 & string & Text to be placed above the lines.\\
-\end{argtable}
-
-\macroname{\textbackslash GreSetThisSyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
-Macro to set the text of the current syllable.
-
-\begin{argtable}
- \#1 & string & the first letters of the syllable, that don't count for the alignment\\
- \#2 & string & the middle letters of the syllable, we must align in the middle of them\\
- \#3 & string & the end letters, they don't count for alignment\\
-\end{argtable}
-
-\macroname{\textbackslash GreSharp}{\#1\#2}{gregoriotex-signs.tex}
-Macro to typeset a sharp.
-
-\begin{argtable}
- \#1 & integer & Height number of the sharp.\\
- \#2 & 0 & No flat for a key change.\\
- & 1 & Indicates the flat for a key change.\\
-\end{argtable}
-
-\macroname{\textbackslash GreSmallCaps}{\#1}{gregoriotex.sty and gregoriotex.tex}
-Makes argument small capitals. Accesses \LaTeX\ \verb=\textsc= or
-Plain\TeX\ \verb=\sc= as appropriate Corresponds to ``<sc></sc>'' tags
-in gabc.
-
-\begin{argtable}
- \#1 & string & Text to be typeset in small caps font.\\
-\end{argtable}
-
-\macroname{\textbackslash GreStar}{}{gregoriotex-symbol.tex}
-Macro to typeset an asterisk (\GreStar).
-
-\macroname{\textbackslash GreSyllable}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-syllable.tex}
-Macro to typeset the syllable.
-
-\begin{argtable}
- \#1 & \TeX\ code & macro setting syllable letters for the current syllable\\
- \#2 & empty & reserved for future use\\
- \#3 & \TeX\ control sequence & the control sequence to use for styling the hyphen\\
- \#4 & 0 & this syllable is not the end of a word\\
- & 1 & this syllable is the end of a word\\
- \#5 & \TeX\ code & macros setting syllable letters for the next syllable\\
- \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
- \#7 & & alignment type of the first next glyph\\
- \#8 &\TeX\ code & other macros (translation, double text, etc.) that don't fit in the limitation of the number of arguments\\
- \#9 & Gregorio\TeX\ glyphs & all the notes
-\end{argtable}
-
-\macroname{\textbackslash GreTilde}{}{gregoriotex-main.tex}
-Macro to print $\sim$.
-
-\macroname{\textbackslash GreTranslationCenterEnd}{}{gregoriotex-main.tex}
-Macro to end the centering of the translation text.
-
-\macroname{\textbackslash GreTypewriter}{\#1}{gregoriotex.sty and gregoriotex.tex}
-Makes argument typewriter font. Accesses \LaTeX\ \verb=\texttt= or
-Plain\TeX\ \verb=\tt= as appropriate.
-
-\begin{argtable}
- \#1 & string & Text to typeset in typewriter font.\\
-\end{argtable}
-
-\macroname{\textbackslash GreUnderBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
-Macro to typeset a round brace below the lines.
-
-\begin{argtable}
- \#1 & length & The width of the brace.\\
- \#2 & length & A vertical shift.\\
- \#3 & length & A horizontal shift.\\
- \#4 & 0 & Don't shift before starting the brace.\\
- & 1 & Shift back a punctum's width before starting the brace.
-\end{argtable}
-
-\macroname{\textbackslash GreUnderline}{\#1}{gregoriotex.sty and gregoriotex.tex}
-Makes argument underlined under \LaTeX\ using \verb=\underline=. Does
-nothing in Plain\TeX.
-
-\begin{argtable}
- \#1 & string & Text to typeset underlined.\\
-\end{argtable}
-
-\macroname{\textbackslash GreUnstyled}{\#1}{gregoriotex-syllable.tex}
-Returns its argument as-is.
-
-\begin{argtable}
- \#1 & string & Text to typeset without any extra styling.\\
-\end{argtable}
-
-\macroname{\textbackslash GreVarBraceLength}{\#1}{gregoriotex-signs.tex}
-Returns the computed length of the given brace.
-
-\begin{argtable}
- \#1 & string & unique identifier for the brace within the score.
-\end{argtable}
-
-\macroname{\textbackslash GreVarBraceSavePos}{\#1\#2\#3}{gregoriotex-signs.tex}
-Records positions to compute the lengths of variable-sized braces.
-
-\begin{argtable}
- \#1 & string & unique identifier for the brace within the score.\\
- \#2 & 0 & Don't shift before recording the position.\\
- & 1 & Shift back a punctum's width before recording the position.\\
- \#3 & 1 & Position to save is the start of brace.\\
- & 2 & Position to save is the end of brace.
-\end{argtable}
-
-\macroname{\textbackslash GreVEpisemus}{\#1\#2}{gregoriotex-signs.tex}
-Macro for typesetting the vertical episemus.
-
-\begin{argtable}
- \#1 & integer & Height number of episemus.\\
- \#2 & string & Type of glyph the episemus is attached to. See \nameref{EpisemusSpecial} argument for description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreVirgula}{\#1}{gregoriotex-signs.tex}
-Macro to typeset a virgula.
-
-\begin{argtable}
- \#1 & code & Macros which may happen before the skip but after the virgula (typically \verb=\grevepisemus=).\\
-\end{argtable}
-
-\macroname{\textbackslash GreWriteTranslation}{\#1}{gregoriotex-main.tex}
-Macro to typeset argument in the translation position.
-
-\begin{argtable}
- \#1 & string & Text to typeset in the translation.\\
-\end{argtable}
-
-\macroname{\textbackslash GreWriteTranslationWithCenterBeginning}{\#1}{gregoriotex-main.tex}
-Macro to typeset argument (a string) in the translation position (at
-the beginning of a line?).
-
-\begin{argtable}
- \#1 & string & Text to typeset in the translation (at the beginning of a line).\\
-\end{argtable}
-
-\macroname{\textbackslash GreZeroHyph}{}{gregoriotex-main.tex}
-Macro to typeset a zero-width hyphen (the hyphen is visible, it is only
-treated as if it had 0 width). Used for fine tuning spacing
-(especially at line endings).
-
-\macroname{\textbackslash GreForceBreak}{}{gregoriotex-spaces.tex}
-Macro used to force a line break to occur at a given position.
-
-\macroname{\textbackslash GreNoBreak}{}{gregoriotex-spaces.tex}
-Macro used to prevent a line break from occurring at a given position.
-
-\macroname{\textbackslash GreScoreId}{}{gregoriotex-main.tex}
-A Lua\TeX\ attribute which designates a unique identifier for each score.
-
-\macroname{\textbackslash GreNABCNeumes}{\#1\#2}{gregoriotex-nabc.tex}
-Macro to print a nabc character above the lines.
-
-\begin{argtable}
- \#1 & int & the line on which the character should appear (currently unused)\\
- \#2 & string & The \texttt{nabc} syntax which indicates what neumes are to be printed\\
-\end{argtable}
-
-\macroname{\textbackslash GreNABCChar}{\#1}{gregoriotex-nabc.tex}
-Macro to print a nabc character.
-
-\begin{argtable}
- \#1 & string & The \texttt{nabc} syntax which indicates what neumes are to be printed\\
-\end{argtable}
-
-\macroname{\textbackslash GreScoreNABCLines}{\#1}{gregoriotex-nabc.tex}
-Macro which sets the number of \texttt{nabc} lines in the score.
-
-\begin{argtable}
- \#1 & int & the number of \texttt{nabc} lines (currently only 1 is supported)\\
-\end{argtable}
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: "GregorioRef"
-%%% End:
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioNabcRef-4_0_0-rc1.pdf b/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioNabcRef-4_0_0-rc1.pdf
deleted file mode 100644
index 45a4cf85b03..00000000000
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioNabcRef-4_0_0-rc1.pdf
+++ /dev/null
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioRef-4_0_0-rc1.pdf b/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioRef-4_0_0-rc1.pdf
deleted file mode 100644
index 7b6d99bb5eb..00000000000
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioRef-4_0_0-rc1.pdf
+++ /dev/null
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/config_.h.in b/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/config_.h.in
deleted file mode 100644
index 5ac194127f1..00000000000
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/config_.h.in
+++ /dev/null
@@ -1,83 +0,0 @@
-/* src/config_.h.in. Generated from configure.ac by autoheader. */
-
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdalign.h> header file. */
-#undef HAVE_STDALIGN_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Use kpathsea */
-#undef USE_KPSE
-
-/* Version number of package */
-#undef VERSION
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
- significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-# define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-# undef WORDS_BIGENDIAN
-# endif
-#endif
-
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
- `char[]'. */
-#undef YYTEXT_POINTER
-
-/* Always define this. */
-#undef _GNU_SOURCE
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1-PATCHES/ChangeLog b/Build/source/texk/gregorio/gregorio-src-PATCHES/ChangeLog
index 6a754d2b4cf..64900a1ec94 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1-PATCHES/ChangeLog
+++ b/Build/source/texk/gregorio/gregorio-src-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-10 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ Import gregorio-4.0.0.
+ * patch-01-protos (removed): Included upstream.
+
2015-10-09 Peter Breitenlohner <peb@mppmu.mpg.de>
Import gregorio-4.0.0-rc1.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1-PATCHES/TL-Changes b/Build/source/texk/gregorio/gregorio-src-PATCHES/TL-Changes
index e9cce6960b8..48192dc9060 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1-PATCHES/TL-Changes
+++ b/Build/source/texk/gregorio/gregorio-src-PATCHES/TL-Changes
@@ -1,6 +1,5 @@
-Changes applied to the gregorio-4.0.0-rc1 tree as obtained from:
- https://github.com/gregorio-project/gregorio/releases/download/v4.0.0-beta2/
- https://github.com/gregorio-project/gregorio/releases/tag/v4.0.0-rc1/
+Changes applied to the gregorio-4.0.0 tree as obtained from:
+ https://github.com/gregorio-project/gregorio/releases/tag/v4.0.0/
Remove:
Makefile.in
@@ -10,9 +9,8 @@ Remove:
contrib/Makefile.in
doc/Makefile.in
examples/Makefile.in
- fonts/Makefile.in
- macosx/
+ fonts/
src/Makefile.in
src/config_.h.in
- tex/Makefile.in
+ tex/
diff --git a/Build/source/texk/gregorio/gregorio-src/._CHANGELOG.md b/Build/source/texk/gregorio/gregorio-src/._CHANGELOG.md
new file mode 100644
index 00000000000..cd621b2a872
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/._CHANGELOG.md
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/.gregorio-version b/Build/source/texk/gregorio/gregorio-src/.gregorio-version
index da280b9dbd1..a4948dcb4b9 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/.gregorio-version
+++ b/Build/source/texk/gregorio/gregorio-src/.gregorio-version
@@ -1,4 +1,4 @@
-4.0.0-rc1
+4.0.0
*** Do not modify this file. ***
Use VersionManager.py to change the version.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/CHANGELOG.md b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
index 2fefd9cb9a0..2e861cc866d 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/CHANGELOG.md
+++ b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
@@ -3,33 +3,9 @@ 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][unreleased]
-### Fixed
-- Deactivating the end of line shifts now prevents lyrics from stretching under the custos at the end of the line.
-- All of the keywords for `\grescaledim` were now work as described in the documentation.
-### Changed
-- `\grecreatedim` and `\grechangedim` now take keywords for their third argument (`scalable` and `fixed`( instead of integers (`1` and `0`) to make the more in keeping with the overall user command conventions.
-- `\grescaledim` now accepts `scalable` as a keyword to turn on scalable (in keeping with the above change)
-- Alterations are partially ignored when aligning lines on the notes (i.e. `\gresetbolshifts{enabled}`). They are not allowed to get any closer to the clef than `beforealterationspace` and the lyrics are not allowed to get any closer to the left-hand margin than `minimalspaceatlinebeginning`, but other than that GregorioTeX will shift them left as much as possible to make the notes align `spaceafterlineclef` away from the clef. Note that for the default values of these distances, only the natural is small enough to acheive true alignment.
-- `gregoriotex.sty` and `gregoriosyms.sty` now check to make sure that they are not both loaded. If `gregoriotex` detects that `gregoriosyms` is loaded, then an error is raised. If `gregoriosyms` detects that `gregoriotex` is loaded, then the loading of `gregoriosyms` is silently aborted and compilation proceeds.
-- Liquescence on a bistropha or tristropha will only appear on the note(s) marked by `<` in gabc, rather than on all notes in the figure. This means that a figure like `(gsss<)` will only have a liquescent "tail" on the final note. If you would like all notes to be liquescent for some reason, you can use a figure like `(gs<gs<gs<)` instead.
-
-### Added
-- New distance, `initialraise`, which will lift (or lower, if negative) the initial.
-- The first word of the score is now passed to a macro that allow it to be styled from TeX. The first word is passed to `\GreFirstWord#1` and is styled by changing the `firstword` style.
-- A new type of lyric centering, enabled with `\gresetlyriccentering{firstletter}`, which aligns the neume with the first letter of each syllable.
-- `\greornamentation` allows access to the two ornamentation glyphs. The ability to access these two glyphs via `{\gregoriosymbolfont \char 75}` was broken by the new interface to the glyphs in greextra.
-- The missing liquescent salicus glyphs.
-
-## [4.0.0-beta2] - 2015-08-26
-### Fixed
-- Corrected the rendering of explicit automatic and manual custos at the end of lines when the clef change that follows it is pushed to the next line (see [#569](https://github.com/gregorio-project/gregorio/issues/569)).
-- Distinguished between `eolshift` and `bolshift` giving each their own flag and user commmand for turning them on and off. `\seteolshift{enable}` allows the lyric text to stretch under the custos at the end of the line. `\setbolshift{enable}` aligns the beginning of each line on the notes instead of the text. Both are on by default, but can be turned off with `\seteolshift{disable}` and `\setbolshift{disable}`.
-
-### Added
-- `\greillumination`: allows user to specify arbitrary content (usually an image) to be used as the initial.
-## [4.0.0-beta] - 2015-08-01
+## [4.0.0] - 2015-12-08
### Fixed
- Handling of the first syllable in gabc is now more consistent with the all other syllables. This centers the syllable correctly when using latin syllable centering (see [#42](https://github.com/gregorio-project/gregorio/issues/42)) and makes the use of styles less surprising in the first syllable (see [#135](https://github.com/gregorio-project/gregorio/issues/135)).
- Handling of manually-placed custos is improved. In particular, a manual custos at the end of the score should no longer be lost when the bar happens to be at the end of the line.
@@ -40,6 +16,14 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
- Gregorio will now try harder to select an appropriate pitch for an automatic custos (`z0`) on a clef change (see [#446](https://github.com/gregorio-project/gregorio/issues/446)). If results are not satisfactory, use a manual custos (`+`) to select a pitch manually.
- The centering of styled text under notes is now correct (See [#509](https://github.com/gregorio-project/gregorio/issues/509)).
- Space for above lines text is now correctly added as needed, even at the beginning of a score (see [#533](https://github.com/gregorio-project/gregorio/issues/533)).
+- Corrected the rendering of explicit automatic and manual custos at the end of lines when the clef change that follows it is pushed to the next line (see [#569](https://github.com/gregorio-project/gregorio/issues/569)).
+- Distinguished between `eolshift` and `bolshift` giving each their own flag and user commmand for turning them on and off. `\seteolshift{enable}` allows the lyric text to stretch under the custos at the end of the line. `\setbolshift{enable}` aligns the beginning of each line on the notes instead of the text. Both are on by default, but can be turned off with `\seteolshift{disable}` and `\setbolshift{disable}`.
+- The spacing of manual in-line custos (`(f+)` in gabc) is now consistent with the spacing of automatic in-line custos (`(z0)` in gabc). See [#642](https://github.com/gregorio-project/gregorio/issues/642).
+- Signs on the climacus praepunctis deminutus `(ghgf~)` neume are now positioned correctly. See [#650](https://github.com/gregorio-project/gregorio/issues/650)
+- Mac installer has been made SIP compliant (i.e. it now works on El Capitan).
+- Mac installer can now detect installations of TeXLive done with MacPorts or the command-line tool provided by TUG.
+- Windows executable has file version information attached correctly so that the installer can properly recognize and replace the binary during an upgrade process.
+- Spacing was too large when alteration begins a syllable, see [#663](https://github.com/gregorio-project/gregorio/issues/663).
### Changed
- A new, more systematic naming scheme has been created for GregorioTeX macros. The naming scheme should reduce the chances of naming conflicts with other packages and make it easier to identify what a particular macro is for and how to use it. Most user functions have been renamed in order to bring them into line with this scheme. Please see GregorioRef for a complete list of the new function names. In general, old names will still work, but they will raise a deprecation warning and will be dropped from GregorioTeX in a future relase.
@@ -77,9 +61,14 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
- Style for score elements can now be changed via the `\grechangestyle` command. This replaces the mixed system of styling commands which could be redefined for some elements and specialized commands for applying styles to others. See GregorioRef for details.
- Annotations with more than two lines are now supported (originally requested [on the user list](http://www.mail-archive.com/gregorio-users%40gna.org/msg00164.html) when two line annoations were made possible). To build the annotation box use `\greannoataion`. See GregorioRef for details.
- The `annotation` header field in `gabc` now places its value(s) above the inital if no annotation is explicitly given by the user via `\greannotation` (see [#44](https://github.com/gregorio-project/gregorio/issues/44)).
-- `\grescaledim` now takes two arguments to bring it into line with the systemized naming scheme. The second argument should be `yes`, `true`, or `on` if you want the distance to scale when the staff size changes. Anything else will make the distance independent of the staff size.
+- `\grescaledim` now takes two arguments to bring it into line with the systemized naming scheme. The second argument should be `scalable` if you want the distance to scale when the staff size changes, `fixed` if you don't.
- Gregorio is now able to make individual lines of a score taller, when the position of the note require extra space, without affecting the rest of the lines. This is the new default behavior. See [UPGRADE.md](UPGRADE.md) and GregorioRef for details (for the change request, see [#59](https://github.com/gregorio-project/gregorio/issues/59)).
- Braces are now rendered using MetaPost by default. This allows the line weight to remain more consistent when braces are stretched. The old behavior (which uses the score font instead) can be restored using `\gresetbracerendering{font}`. See [UPGRADE.md](UPGRADE.md) and GregorioRef for details (for the change request, see [#535](https://github.com/gregorio-project/gregorio/issues/535)).
+- `\grecreatedim` and `\grechangedim` now take keywords for their third argument (`scalable` and `fixed`) instead of integers (`1` and `0`) to make the more in keeping with the overall user command conventions.
+- Alterations are partially ignored when aligning lines on the notes (i.e. `\gresetbolshifts{enabled}`). They are not allowed to get any closer to the clef than `beforealterationspace` and the lyrics are not allowed to get any closer to the left-hand margin than `minimalspaceatlinebeginning`, but other than that GregorioTeX will shift them left as much as possible to make the notes align `spaceafterlineclef` away from the clef. Note that for the default values of these distances, only the natural is small enough to acheive true alignment.
+- `gregoriotex.sty` and `gregoriosyms.sty` now check to make sure that they are not both loaded. If `gregoriotex` detects that `gregoriosyms` is loaded, then an error is raised. If `gregoriosyms` detects that `gregoriotex` is loaded, then the loading of `gregoriosyms` is silently aborted and compilation proceeds.
+- Liquescence on a bistropha or tristropha will only appear on the note(s) marked by `<` in gabc, rather than on all notes in the figure. This means that a figure like `(gsss<)` will only have a liquescent "tail" on the final note. If you would like all notes to be liquescent for some reason, you can use a figure like `(gs<gs<gs<)` instead.
+- `alterationspace` is now a fixed dimension, see [UPGRADE.md](UPGRADE.md) for details.
### Added
- With thanks to Jakub Jelínek, St. Gallen style adiastematic notation is now handled through [nabc syntax](http://gregoriochant.org/dokuwiki/doku.php/language) (see GregorioNabcRef.pdf for details and [the new example](examples/FactusEst.gabc)). Only one line above the notes is currently handled. This is a preview, backward incompatible change are possible in future releases.
@@ -96,7 +85,7 @@ See GregorioRef.pdf for full details.
- Added `--with-kpathsea` option to configure script, to check input and output file against `openout_any` and `openin_any` settings of texmf.cnf (TeXLive only). Necessary to be included in `shell_escape_commands` in TeXLive.
- Support for `lualatex -recorder`. Autocompiled gabc and gtex files will now be properly recorded so that programs like `latexmk -recorder` can detect the need to rebuild the PDF when a gabc file changes.
- A vertical episema may now be forced to appear above or below a note. In gabc, use `'0` for the vertical episema to appear below and `'1` for the vertical episema to appear above (see [#385](https://github.com/gregorio-project/gregorio/issues/385)).
-- The first syllable and first letter of the first syllable that is *not* interpreted as the initial of the score are now passed to macros that allow them to be styled from TeX. The first syllable is passed to `\GreFirstSyllable#1` and the first letter of the first syllable is passed to `\GreFirstSyllableInitial#1`.
+- The first word, first syllable, and first letter of the first syllable that is *not* interpreted as the initial of the score can now be styled from TeX. Use `\grechangestyle` to modify the `firstsyllableinitial`, `firstsyllable`, and `firstword` as desired.
- The final line of a score may now be forced to be fully justified (rather than ragged) using `\gresetlastline{justified}` before including the score (see [#43](https://github.com/gregorio-project/gregorio/issues/43)). Use `\gresetlastline{ragged}` to switch back to a ragged last line.
- `\gresethyphen{force}` forces GregorioTeX to put a hyphen between each syllable in a polysyllabic word. `\gresethyphen{auto}` restores behavior to normal.
- Support for custom vowel centering rules. Put a file called `gregorio-vowels.dat` into your project directory or into a directory accessible from TEXMF and add the header `language: name;` to your gabc file. The `gregorio-vowels.dat` file describes how vowels are to be located in the *name* language. See GregorioRef for details.
@@ -105,6 +94,13 @@ See GregorioRef.pdf for full details.
- The ability to add LilyPond-like point-and-click textedit links into the PDF file to aid with debugging scores. This must be explicitly enabled and **should be turned off** when producing files for distribution as it embeds path information into the output. To enable this, you must pass the `-p` option to gregorio when compiling gabc files and add `\gresetpointandclick{on}` before including the score. It may be toggled back off with `\gresetpointandclick{off}`. See GregorioRef for details (for the change request, see [#528](https://github.com/gregorio-project/gregorio/issues/528)).
- New score fonts with glyphs unique to Dominican chant. These fonts replace the epiphonus and the augmented liquescents with corresponding figures from Dominican liturgical books. To use the new fonts, pass the `[op]` option to the `\gresetgregoriofont` command (i.e., `\gresetgregoriofont[op]{greciliae}`). See GregorioRef for details (for the change request, see [#1](https://github.com/gregorio-project/gregorio/issues/1)).
- Support for "punctum cavum inclinatum" and "punctum cavum inclinatum auctus" figures. The gabc for these are `(Gr)` and `(Gr<)`, where `G` is the capitalized pitch letter.
+- `\greillumination`: allows user to specify arbitrary content (usually an image) to be used as the initial.
+- New distance, `initialraise`, which will lift (or lower, if negative) the initial.
+- A new type of lyric centering, enabled with `\gresetlyriccentering{firstletter}`, which aligns the neume with the first letter of each syllable.
+- `\greornamentation` allows access to the two ornamentation glyphs. The ability to access these two glyphs via `{\gregoriosymbolfont \char 75}` was broken by the new interface to the glyphs in greextra.
+- The missing liquescent salicus glyphs.
+- The ability to force a hyphen after an empty first syllable, enabled by default since this was the behavior prior to 4.0. Version 4.0 has an improved spacing algorithm which will eliminate the hyphen if the notes for the first syllable are too close to the second. To switch to this behavior, use `\gresetemptyfirstsyllablehyphen{auto}`. See [UPGRADE.md](UPGRADE.md) and GregorioRef for details (for the change request, see [#653](https://github.com/gregorio-project/gregorio/issues/653)).
+- Shell scripts for configuring TeXShop and TeXworks on a Mac.
### Deprecated
- `\GreSetStaffLinesFormat`, supplanted by `\grechangeformat{normalstafflines}...`
@@ -114,9 +110,7 @@ See GregorioRef.pdf for full details.
- `\greabovelinestextstyle`, if you were redefining this command, use `\grechangeformat{abovelinestext}...` instead
- `\grelowchoralsignstyle`, if you were redefining this command, use `\grechangeformat{lowchoralsign}...` instead
- `\grehighchoralsignstyle`, if you were redefining this command, use `\grechangeformat{highchoralsign}...` instead
-- `centering-scheme` gabc header, supplanted by `\grelyriccentering` in TeX. See GregorioRef for syntax.
- `\setaboveinitialseparation`, supplanted by `\grechangedim{annotationseparation}...`
-- `gregoriotex-font` gabc header, supplanted by `\gresetgregoriofont` in TeX. See GregorioRef for syntax.
- `\scorereference`, supplanted by `\grescorereference`
- `\GreScoreReference`, supplanted by `\grescorereference`
- `\commentary`, supplanted by `\grecommentary`
@@ -148,8 +142,8 @@ See GregorioRef.pdf for full details.
- `\GreUseZeroHyphen`, supplanted by `\greseteolhyphen{zero}`
- `\greremoveclef`, supplanted by `\gresetclef{invisible}`
- `\grenormalclef`, supplanted by `\gresetclef{visible}`
-- `\AddHEpisemusBridges`, supplanted by `\gresethepisemus{bridge}`
-- `\RemoveHEpisemusBridges`, supplanted by `\gresethepisemus{break}`
+- `\AddHEpisemusBridges`, supplanted by `\gresethepisema{bridge}`
+- `\RemoveHEpisemusBridges`, supplanted by `\gresethepisema{break}`
- `\UseAlternatePunctumCavum`, supplanted by `\gresetpunctumcavum{alternate}`
- `\UseNormalPunctumCavum`, supplanted by `\gresetpunctumcavum{normal}`
- `\clivisalignmentalways`, supplanted by `\gresetclivisalignment{always}`
@@ -162,7 +156,9 @@ See GregorioRef.pdf for full details.
- `\setspaceafterinitial`, supplanted by `\grechangedim{afterinitialshift}...`
- `\setspacebeforeinitial`, supplanted by `\grechangedim{beforeinitialshift}...`
- `\setinitialspacing`, supplanted by `\grechangedim{beforeinitialshift}...`, `\grechangedim{manualinitialwidth}...`, and `\grechangedime{afterinitialshift}...`
-
+- `centering-scheme` gabc header, supplanted by `\grelyriccentering` in TeX. See GregorioRef for syntax.
+- `gregoriotex-font` gabc header, supplanted by `\gresetgregoriofont` in TeX. See GregorioRef for syntax.
+- The meaningless `gabc-version` header in gabc (see [#664](https://github.com/gregorio-project/gregorio/issues/664)).
### Removed
- GregorioXML and OpusTeX output
@@ -180,7 +176,10 @@ See GregorioRef.pdf for full details.
- `\GreSetAboveInitialSeparation`, supplanted by `\grechangedim{annotationseparation}...`
- `\gresetstafflinefactor`, supplanted by `\grechangestafflinethickness`
- `greg-book` and `greg-lily-book` engines, supplanted by improved capabilities of `\gregorioscore` for compiling gabc files at time of document compilation.
+- The TeXShop script for compiling gabc files. Supplanted by the new autocompile feature of the package.
+### Known Bugs
+- When beginning of line clefs are invisible and bol shifts are enabled, lyric text will stick out into the margin. Further the notes on the first and subsequent lines do not align properly. See [#683](https://github.com/gregorio-project/gregorio/issues/683).
## [3.0.3] - 2015-07-01
@@ -245,10 +244,10 @@ See GregorioRef.pdf for full details.
- Clivis and pes quadratum alignment now follows Solesmes' conventions more closely (see [#10](https://github.com/gregorio-project/gregorio/issues/10)).
### Fixed
-- Reducing horizontal episemus width.
+- Reducing horizontal episema width.
- Reducing flat stem length.
- `mode` and `anotation-line` now do their job.
-- Low episemus (`_0`) under consecutive notes are now aligned correctly.
+- Low episema (`_0`) under consecutive notes are now aligned correctly.
- Quilisma was melting too much with next note when in a second interval.
- Fixed custo blocking possibility.
- Fixing glyphs disapearing when importing into Illustrator.
@@ -280,7 +279,7 @@ See GregorioRef.pdf for full details.
- adding requested features: Dominican bars, choral signs, text above staff lines
- enabling comments in gabc files
- adding ability to write verbatim TeX at {note, glyph, element} level
-- introducing horizontal episemus bridges
+- introducing horizontal episema bridges
- default output is now utf8 directly; the `-O` option allows old-style TeX output, i.e. `\char XXXX`
- new static build system for packaged distributions
@@ -338,7 +337,7 @@ See GregorioRef.pdf for full details.
- adding support for end of lines
- adding support for compilation on MAC OSX
-
+
## 0.2.2 - 2007-06-14
### Added
- adding styles and centering in text
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/CONTRIBUTING.md b/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md
index a70eb74467f..a70eb74467f 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/CONTRIBUTING.md
+++ b/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/CONTRIBUTORS.md b/Build/source/texk/gregorio/gregorio-src/CONTRIBUTORS.md
index 586d97762b4..586d97762b4 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/CONTRIBUTORS.md
+++ b/Build/source/texk/gregorio/gregorio-src/CONTRIBUTORS.md
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/COPYING.md b/Build/source/texk/gregorio/gregorio-src/COPYING.md
index e4e2580e978..e4e2580e978 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/COPYING.md
+++ b/Build/source/texk/gregorio/gregorio-src/COPYING.md
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/Makefile.am b/Build/source/texk/gregorio/gregorio-src/Makefile.am
index 53b9ca918f3..53b9ca918f3 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/Makefile.am
+++ b/Build/source/texk/gregorio/gregorio-src/Makefile.am
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/README.md b/Build/source/texk/gregorio/gregorio-src/README.md
index f59a0be3b91..f59a0be3b91 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/README.md
+++ b/Build/source/texk/gregorio/gregorio-src/README.md
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/UPGRADE.md b/Build/source/texk/gregorio/gregorio-src/UPGRADE.md
index 7cc757a5d40..b227cc95f88 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/UPGRADE.md
+++ b/Build/source/texk/gregorio/gregorio-src/UPGRADE.md
@@ -18,9 +18,9 @@ A naming scheme for GregorioTeX commands has been established and so most comman
Old command names should still work for now, but will raise a deprecation warning which indicates the name of the correct command to use. Exceptions are noted below:
-- `\grescaledim`: This function now takes two arguments. The second should be `yes`, `true`, or `on` to acheive the old behavior.
+- `\grescaledim`: This function now takes two arguments. The second should be `yes`, `true`, `on`, or `scalable` to acheive the old behavior.
-Additionally a new package option has been added. The option `deprecated=false` is helpful if you wish to ensure that your TeX file is compliant with the new naming system. This option causes all deprecated commands to raise an error, halting TeX, thus allowing you to actively find all deprecated commands and update them in your TeX file.
+Additionally a new package option has been added. This option, `deprecated=false`, is helpful if you wish to ensure that your TeX file is compliant with the new naming system. This option causes all deprecated commands to raise an error, halting TeX, thus allowing you to actively find all deprecated commands and update them in your TeX file.
### Barred letters
@@ -34,7 +34,7 @@ The `gregorio` executable now uses the `.gtex` extension by default (instead of
### Custom spacings
-If you are using custom spacings, please update the values of `interwordspacetext`, `intersyllablespacenotes` and `interwordspacenotes` to match their new definitions (in the comments in `gsp-default.tex`).
+If you are using custom spacings, please update the values of `interwordspacetext`, `intersyllablespacenotes` and `interwordspacenotes` to match their new definitions (in the comments in `gsp-default.tex`). Also note that `alterationspace` is now fixed and cannot take `plus` or `minus` values.
### Euouae blocks
@@ -116,7 +116,7 @@ As is normal, calls to the deprecated command names will raise a warning but sti
#### The Annotation Header
-The `annotation` header in gabc files now passes its value(s) to gregoriotex for placement above the inital letter of the score. Up to two `annotation` fields are supported, the first for the first line above the initial, and the second field for the second line.
+The `annotation` header in gabc files now passes its value(s) to GregorioTeX for placement above the inital letter of the score. Up to two `annotation` fields are supported, the first for the first line above the initial, and the second field for the second line.
annotation: 1 Ant.;
annotation: VII a;
@@ -130,7 +130,7 @@ If you define annotation(s) in the main TeX file via `\greannotation`, then the
#### Variable Height Line Spacing
-Gregorio is now able to make individual lines of a score taller when the position of the note requires extra space, without affecting the rest of the lines. This is the new default behavior. If you prefer the uniform line heights of earlier versions, use:
+GregorioTeX is now able to make individual lines of a score taller when the position of the note requires extra space, without affecting the rest of the lines. This is the new default behavior. If you prefer the uniform line heights of earlier versions, use:
\gresetlineheightexpansion{uniform}
@@ -152,7 +152,7 @@ It should also be noted that this new feature, besides requiring two passes, als
#### MetaPost brace rendering
-Gregorio now uses MetaPost (by default) to render braces. This allows fine-tuning to better maintain optical line weight when braces are stretched. Since the shapes are slightly different, you may prefer the old behavior, which may be restored by using:
+GregorioTeX now uses MetaPost (by default) to render braces. This allows fine-tuning to better maintain optical line weight when braces are stretched. Since the shapes are slightly different, you may prefer the old behavior, which may be restored by using:
\gresetbracerendering{font}
@@ -170,6 +170,14 @@ In order to better match the new command naming conventions, the third argument
In order to be more consistent, making a bistropha or tristropha liquescent by adding `<` in gabc will now only affect the note thus marked. This means that a tristropha like `(gsss<)` will only show the final stropha as liquescent, which is different from the older behavior of making every stropha liquescent. If you prefer the old behavior, mark every note explicitly as liquescent with something like `(gs<gs<gs<)`.
+### Empty first syllable hyphen
+
+Prior to version 4.0, GregorioTeX would put a hyphen below an empty first syllable (which happens when the first syllable consists only of the initial). The spacing algorithm is improved in 4.0, but that eliminates the hyphen if there is not enough space between the note of the first syllable and the next syllable. The `\gresetemptyfirstsyllablehyphen` command controls this behavior. It defaults to `force`, which restores the pre-4.0 behavior, but may be changed to `auto` (i.e., `\gresetemptyfirstsyllablehyphen{auto}`) if you prefer the space-based behavior.
+
+### gabc-version header
+
+The gabc-version header has become meaningless. It is now deprecated. Please remove it from your gabc files if you had been using it.
+
## 3.0
### TeX Live 2013
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/VersionManager.py b/Build/source/texk/gregorio/gregorio-src/VersionManager.py
index 9b7bfa17706..50422bc7884 100755..100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/VersionManager.py
+++ b/Build/source/texk/gregorio/gregorio-src/VersionManager.py
@@ -77,16 +77,20 @@ def get_parser():
action='store_true', default=False)
modify = parser.add_mutually_exclusive_group()
+ modify.add_argument('-b', '--beta',
+ help='Increment -betax+1',
+ action='store_true', default=False,
+ dest='beta')
modify.add_argument('--manual=',
help='Manually set the version.',
action='store',
dest='manual_version')
modify.add_argument('-m', '--major',
- help='Increment the major version: x+1.0.0-beta',
+ help='Increment the major version: x+1.0.0-beta1',
action='store_true', default=False,
dest='major')
modify.add_argument('-e', '--enhancement',
- help='Increment the minor version: x.y+1.0-beta',
+ help='Increment the minor version: x.y+1.0-beta1',
action='store_true', default=False,
dest='minor')
modify.add_argument('-p', '--patch',
@@ -112,11 +116,22 @@ class Version(object):
self.filename_version = self.filename_version_from_version(self.version)
self.short_tag = None
self.date = None
+ self.binary_version = self.binary_version_from_version(self.version)
def filename_version_from_version(self, version):
"Return filename-compatible version"
return version.replace('.', '_')
+ def binary_version_from_version(self, version):
+ "Return binary version number for Windows FILEVERSION"
+ bin = version.replace('.',',')
+ if '-' in bin:
+ bin = bin.replace('-beta',',1')
+ bin = bin.replace('-rc',',2')
+ else:
+ bin += ',30'
+ return bin
+
def read_version(self):
"Return version for instance variable"
with open(self.versionfile, 'r') as verfile:
@@ -147,6 +162,7 @@ class Version(object):
"Update self.version and .gregorio-version with the new version."
self.version = newversion
self.filename_version = self.filename_version_from_version(newversion)
+ self.binary_version = self.binary_version_from_version(newversion)
print('Updating {0} with the new version: {1}\n'.format(
self.versionfile, self.version))
with open(self.versionfile, 'w') as verfile:
@@ -158,6 +174,7 @@ def replace_version(version_obj):
"Change version in file according to heuristics."
newver = version_obj.version
newver_filename = version_obj.filename_version
+ newbinver = version_obj.binary_version
today = date.today()
print('Updating source files to version {0}\n'.format(newver))
for myfile in GREGORIO_FILES:
@@ -184,7 +201,11 @@ def replace_version(version_obj):
result.append(re.sub(r'(\d+\/\d+/\d+)', today.strftime("%Y/%m/%d"), newline, 1))
elif 'PARSE_VERSION_DATE' in line:
newline = re.sub(r'(\d+\.\d+\.\d+(?:[-+~]\w+)*)', newver, line, 1)
- result.append(re.sub(r'([ \d]\d [A-Z][a-z]+ \d{4})', today.strftime("%e %B %Y"), newline, 1))
+ result.append(re.sub(r'(\d{1,2} [A-Z][a-z]+ \d{4})', today.strftime("%-d %B %Y"), newline, 1))
+ elif 'FILEVERSION' in line:
+ result.append(re.sub(r'\d+,\d+,\d+,\d+', newbinver, line, 1))
+ elif 'PRODUCTVERSION' in line:
+ result.append(re.sub(r'\d+,\d+,\d+,\d+', newbinver, line, 1))
elif 'PARSE_VERSION_FILE_NEXTLINE' in line:
result.append(line)
following_line_filename = True
@@ -195,6 +216,19 @@ def replace_version(version_obj):
result.append(line)
with open(myfile, 'w') as outfile:
outfile.write(''.join(result))
+ with open('CHANGELOG.md', 'r') as infile:
+ result = []
+ for line in infile:
+ if '[Unreleased][unreleased]' in line:
+ result.append(line)
+ result.append('\n')
+ result.append('\n')
+ newline = '## [' + newver + '] - ' + today.strftime("%Y-%m-%d") + '\n'
+ result.append(newline)
+ else:
+ result.append(line)
+ with open('CHANGELOG.md','w') as outfile:
+ outfile.write(''.join(result))
sys.exit(0)
def confirm_replace(oldver, newver):
@@ -225,21 +259,36 @@ def release_candidate(version_obj, not_interactive):
version_obj.update_version(newversion)
replace_version(version_obj)
+def beta(version_obj, not_interactive):
+ "Increments x.y.z-betax+1"
+ oldversion = version_obj.version
+ if '-beta' in oldversion:
+ newversion = re.sub(r'\d+$', lambda x: str(int(x.group()) +1),
+ oldversion)
+ else:
+ print('Version number not in beta stage')
+ print('Use --major (-m) or --enhancement (-e) to start a new beta')
+ sys.exit(1)
+ if (not not_interactive):
+ confirm_replace(oldversion, newversion)
+ version_obj.update_version(newversion)
+ replace_version(version_obj)
+
def bump_major(version_obj, not_interactive):
- "Changed the major version number: x.y.z --> x+1.0.0-beta"
+ "Changed the major version number: x.y.z --> x+1.0.0-beta1"
oldversion = version_obj.version
nums = re.search(r'(\d+)(\.\d+)(\.\d+)', oldversion)
- newversion = str(int(nums.group(1)) +1) + '.0.0-beta'
+ newversion = str(int(nums.group(1)) +1) + '.0.0-beta1'
if (not not_interactive):
confirm_replace(oldversion, newversion)
version_obj.update_version(newversion)
replace_version(version_obj)
def bump_minor(version_obj, not_interactive):
- "Changed the minor version number: x.y.z --> x.y+1.0-beta"
+ "Changed the minor version number: x.y.z --> x.y+1.0-beta1"
oldversion = version_obj.version
nums = re.search(r'(\d+\.)(\d+)(\.\d+)', oldversion)
- newversion = nums.group(1) + str(int(nums.group(2)) +1) + '.0-beta'
+ newversion = nums.group(1) + str(int(nums.group(2)) +1) + '.0-beta1'
if (not not_interactive):
confirm_replace(oldversion, newversion)
version_obj.update_version(newversion)
@@ -259,7 +308,7 @@ def set_manual_version(version_obj, user_version, not_interactive):
"Changed the version number to a user supplied value"
oldversion = version_obj.version
if not re.match(r'(\d+\.\d+\.\d+(?:[-+~]\w+)*)$', user_version):
- print('Bad version string. Use this style: x.y.z or x.y.z-beta')
+ print('Bad version string. Use this style: x.y.z or x.y.z-betax')
sys.exit(1)
newversion = user_version
if (not not_interactive):
@@ -293,6 +342,8 @@ def main():
gregorio_version.fetch_version_debian_stable()
elif args.get_debian_git:
gregorio_version.fetch_version_debian_git()
+ elif args.beta:
+ beta(gregorio_version, not_interactive)
elif args.major:
bump_major(gregorio_version, not_interactive)
elif args.minor:
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/build.sh b/Build/source/texk/gregorio/gregorio-src/build.sh
index 9625bc85ec3..9625bc85ec3 100755
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/build.sh
+++ b/Build/source/texk/gregorio/gregorio-src/build.sh
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/configure.ac b/Build/source/texk/gregorio/gregorio-src/configure.ac
index 6ebc78e04ef..ce816caba51 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/configure.ac
+++ b/Build/source/texk/gregorio/gregorio-src/configure.ac
@@ -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],[4.0.0-rc1],[gregorio-devel@gna.org])
-FILENAME_VERSION="4_0_0-rc1"
+AC_INIT([gregorio],[4.0.0],[gregorio-devel@gna.org])
+FILENAME_VERSION="4_0_0"
AC_SUBST(FILENAME_VERSION)
MK=""
AC_SUBST(MK)
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/900_gregorio.xml b/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml
index 72d9c438f28..72d9c438f28 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/900_gregorio.xml
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/Makefile.am b/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am
index 86279d62983..86279d62983 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/Makefile.am
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/README.md b/Build/source/texk/gregorio/gregorio-src/contrib/README.md
index c4e43da23f9..c4e43da23f9 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/README.md
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/README.md
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/._.DS_Store b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/._.DS_Store
new file mode 100644
index 00000000000..09fa6bdda3a
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/._.DS_Store
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/._Configure TeXShop.app b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/._Configure TeXShop.app
new file mode 100644
index 00000000000..705c71abe4f
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/._Configure TeXShop.app
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Info.plist b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Info.plist
new file mode 100644
index 00000000000..e3b8bce04cd
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Info.plist
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>AMIsApplet</key>
+ <true/>
+ <key>AMStayOpen</key>
+ <false/>
+ <key>BuildMachineOSBuild</key>
+ <string>14D49</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleDocumentTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>*</string>
+ </array>
+ <key>CFBundleTypeName</key>
+ <string>Automator workflow file</string>
+ <key>CFBundleTypeOSTypes</key>
+ <array>
+ <string>****</string>
+ </array>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
+ </dict>
+ </array>
+ <key>CFBundleExecutable</key>
+ <string>Application Stub</string>
+ <key>CFBundleIconFile</key>
+ <string>AutomatorApplet</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.automator.Configure TeXShop</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>Configure TeXShop</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>1.2</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleURLTypes</key>
+ <array/>
+ <key>CFBundleVersion</key>
+ <string>409.2</string>
+ <key>DTCompiler</key>
+ <string>com.apple.compilers.llvm.clang.1_0</string>
+ <key>DTPlatformBuild</key>
+ <string>6D97u</string>
+ <key>DTPlatformVersion</key>
+ <string>GM</string>
+ <key>DTSDKBuild</key>
+ <string>14D42</string>
+ <key>DTSDKName</key>
+ <string>macosx10.10internal</string>
+ <key>DTXcode</key>
+ <string>0630</string>
+ <key>DTXcodeBuild</key>
+ <string>6D97u</string>
+ <key>LSMinimumSystemVersion</key>
+ <string>10.5</string>
+ <key>LSMinimumSystemVersionByArchitecture</key>
+ <dict>
+ <key>x86_64</key>
+ <string>10.6</string>
+ </dict>
+ <key>LSUIElement</key>
+ <true/>
+ <key>NSAppleScriptEnabled</key>
+ <string>YES</string>
+ <key>NSMainNibFile</key>
+ <string>ApplicationStub</string>
+ <key>NSPrincipalClass</key>
+ <string>NSApplication</string>
+ <key>NSServices</key>
+ <array/>
+ <key>UTExportedTypeDeclarations</key>
+ <array/>
+ <key>UTImportedTypeDeclarations</key>
+ <array/>
+</dict>
+</plist>
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/MacOS/Application Stub b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/MacOS/Application Stub
new file mode 100644
index 00000000000..5cba5b5569c
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/MacOS/Application Stub
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/AutomatorApplet.icns b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/AutomatorApplet.icns
new file mode 100644
index 00000000000..1e1593e8aaf
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/AutomatorApplet.icns
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Dutch.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Dutch.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..d1d3946fec5
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Dutch.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/English.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/English.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..80dce3747f0
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/English.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/French.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/French.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..de88db65ae0
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/French.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/German.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/German.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..9a210d835a8
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/German.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Italian.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Italian.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..7a78b2ea03b
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Italian.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Japanese.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Japanese.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..9703dcf05a4
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Japanese.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Spanish.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Spanish.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..9bc20f088a7
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/Spanish.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ar.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ar.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..bd164ff8d67
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ar.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ca.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ca.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..e4a0be7c24a
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ca.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/cs.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/cs.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..1d4bc4617ec
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/cs.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/da.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/da.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..59483548dee
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/da.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/el.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/el.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..68c8a8b9b66
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/el.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/es_MX.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/es_MX.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..0536c591da8
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/es_MX.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/fi.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/fi.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..8b559394d00
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/fi.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/he.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/he.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..0a8a78dabde
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/he.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/hr.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/hr.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..02217857418
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/hr.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/hu.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/hu.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..ee2318940ee
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/hu.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/id.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/id.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..f5e0ac1ab0d
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/id.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ko.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ko.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..a7b39bf8c5a
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ko.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ms.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ms.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..f1ccd79b049
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ms.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/no.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/no.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..fefd799e132
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/no.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/pl.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/pl.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..2d3f738b72b
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/pl.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/pt.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/pt.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..a0fd885091a
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/pt.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/pt_PT.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/pt_PT.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..df40ec20a50
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/pt_PT.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ro.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ro.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..df641210966
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ro.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ru.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ru.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..b7b01428652
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/ru.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/sk.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/sk.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..b257fe88d07
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/sk.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/sv.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/sv.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..f8e64aa5482
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/sv.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/th.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/th.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..e6149ef9deb
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/th.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/tr.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/tr.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..fef396d076c
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/tr.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/uk.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/uk.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..78a188987a1
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/uk.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/vi.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/vi.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..a2c647fcef3
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/vi.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/zh_CN.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/zh_CN.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..f361cf638f8
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/zh_CN.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/zh_TW.lproj/ApplicationStub.nib b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/zh_TW.lproj/ApplicationStub.nib
new file mode 100644
index 00000000000..1cf50bc1cc6
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/Resources/zh_TW.lproj/ApplicationStub.nib
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/document.wflow b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/document.wflow
new file mode 100644
index 00000000000..1cf10ff6517
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Configure TeXShop.app/Contents/document.wflow
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>AMApplicationBuild</key>
+ <string>409.2</string>
+ <key>AMApplicationVersion</key>
+ <string>2.5</string>
+ <key>AMDocumentVersion</key>
+ <string>2</string>
+ <key>actions</key>
+ <array>
+ <dict>
+ <key>action</key>
+ <dict>
+ <key>AMAccepts</key>
+ <dict>
+ <key>Container</key>
+ <string>List</string>
+ <key>Optional</key>
+ <true/>
+ <key>Types</key>
+ <array>
+ <string>com.apple.cocoa.path</string>
+ </array>
+ </dict>
+ <key>AMActionVersion</key>
+ <string>2.1.1</string>
+ <key>AMApplication</key>
+ <array>
+ <string>Finder</string>
+ </array>
+ <key>AMParameterProperties</key>
+ <dict>
+ <key>itemType</key>
+ <dict/>
+ <key>predicate</key>
+ <dict/>
+ <key>searchPath</key>
+ <dict>
+ <key>isPathPopUp</key>
+ <true/>
+ <key>variableUUIDsInMenu</key>
+ <array/>
+ </dict>
+ </dict>
+ <key>AMProvides</key>
+ <dict>
+ <key>Container</key>
+ <string>List</string>
+ <key>Types</key>
+ <array>
+ <string>com.apple.cocoa.path</string>
+ </array>
+ </dict>
+ <key>AMRequiredResources</key>
+ <array/>
+ <key>AMSelectedInputType</key>
+ <string>com.apple.cocoa.path</string>
+ <key>AMSelectedOutputType</key>
+ <string>com.apple.cocoa.path</string>
+ <key>ActionBundlePath</key>
+ <string>/System/Library/Automator/Find Finder Items 2.action</string>
+ <key>ActionName</key>
+ <string>Find Finder Items</string>
+ <key>ActionParameters</key>
+ <dict>
+ <key>itemType</key>
+ <string>com.apple.cocoa.path</string>
+ <key>predicate</key>
+ <data>
+ YnBsaXN0MDDUAQIDBAUGbm9YJHZlcnNpb25Y
+ JG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGG
+ oK8QFgcIDxQcJicpMTU6O0BESk9QVV1iZ2lV
+ JG51bGzTCQoLDA0OXxAXTlNDb21wb3VuZFBy
+ ZWRpY2F0ZVR5cGVfEA9OU1N1YnByZWRpY2F0
+ ZXNWJGNsYXNzEAGAAoAV0hALERNaTlMub2Jq
+ ZWN0c6ESgAOAFNQLFRYXGBkaG18QEU5TUmln
+ aHRFeHByZXNzaW9uXxAQTlNMZWZ0RXhwcmVz
+ c2lvbl8QE05TUHJlZGljYXRlT3BlcmF0b3KA
+ E4AOgASAEdUdHh8gCyEiIyQlWU5TT3BlcmFu
+ ZF5OU1NlbGVjdG9yTmFtZV8QEE5TRXhwcmVz
+ c2lvblR5cGVbTlNBcmd1bWVudHOABoAFEAOA
+ CIANXHZhbHVlRm9yS2V5OtIfCwwogAfSKiss
+ LVokY2xhc3NuYW1lWCRjbGFzc2VzXxAQTlNT
+ ZWxmRXhwcmVzc2lvbqMuLzBfEBBOU1NlbGZF
+ eHByZXNzaW9uXE5TRXhwcmVzc2lvblhOU09i
+ amVjdNIQCzI0oTOACYAM0wsfNjc4OVlOU0tl
+ eVBhdGiACxAKgApUbmFtZdIqKzw9XxAcTlNL
+ ZXlQYXRoU3BlY2lmaWVyRXhwcmVzc2lvbqM+
+ PzBfEBxOU0tleVBhdGhTcGVjaWZpZXJFeHBy
+ ZXNzaW9uXE5TRXhwcmVzc2lvbtIqK0FCXk5T
+ TXV0YWJsZUFycmF5o0FDMFdOU0FycmF50ior
+ RUZfEBNOU0tleVBhdGhFeHByZXNzaW9upEdI
+ STBfEBNOU0tleVBhdGhFeHByZXNzaW9uXxAU
+ TlNGdW5jdGlvbkV4cHJlc3Npb25cTlNFeHBy
+ ZXNzaW9u00sfC0xNTl8QD05TQ29uc3RhbnRW
+ YWx1ZYAPEACAEF8QEkx1YUxhVGVYK3NlLmVu
+ Z2luZdIqK1FSXxAZTlNDb25zdGFudFZhbHVl
+ RXhwcmVzc2lvbqNTVDBfEBlOU0NvbnN0YW50
+ VmFsdWVFeHByZXNzaW9uXE5TRXhwcmVzc2lv
+ btULVldYWVpNWyNcWk5TTW9kaWZpZXJYTlNO
+ ZWdhdGVZTlNPcHRpb25zXk5TT3BlcmF0b3JU
+ eXBlgBIIEATSKiteX18QG05TRXF1YWxpdHlQ
+ cmVkaWNhdGVPcGVyYXRvcqNgYTBfEBtOU0Vx
+ dWFsaXR5UHJlZGljYXRlT3BlcmF0b3JfEBNO
+ U1ByZWRpY2F0ZU9wZXJhdG9y0iorY2RfEBVO
+ U0NvbXBhcmlzb25QcmVkaWNhdGWjZWYwXxAV
+ TlNDb21wYXJpc29uUHJlZGljYXRlW05TUHJl
+ ZGljYXRl0iorQ2iiQzDSKitqa18QE05TQ29t
+ cG91bmRQcmVkaWNhdGWjbG0wXxATTlNDb21w
+ b3VuZFByZWRpY2F0ZVtOU1ByZWRpY2F0ZV8Q
+ D05TS2V5ZWRBcmNoaXZlctFwcVRyb290gAEA
+ CAARABoAIwAtADIANwBQAFYAXQB3AIkAkACS
+ AJQAlgCbAKYAqACqAKwAtQDJANwA8gD0APYA
+ +AD6AQUBDwEeATEBPQE/AUEBQwFFAUcBVAFZ
+ AVsBYAFrAXQBhwGLAZ4BqwG0AbkBuwG9Ab8B
+ xgHQAdIB1AHWAdsB4AH/AgMCIgIvAjQCQwJH
+ Ak8CVAJqAm8ChQKcAqkCsALCAsQCxgLIAt0C
+ 4gL+AwIDHgMrAzYDQQNKA1QDYwNlA2YDaANt
+ A4sDjwOtA8MDyAPgA+QD/AQIBA0EEAQVBCsE
+ LwRFBFEEYwRmBGsAAAAAAAACAQAAAAAAAABy
+ AAAAAAAAAAAAAAAAAAAEbQ==
+ </data>
+ <key>searchPath</key>
+ <string>/Users/Shared</string>
+ </dict>
+ <key>BundleIdentifier</key>
+ <string>com.apple.Automator.Find_Finder_Items_2</string>
+ <key>CFBundleVersion</key>
+ <string>2.1.1</string>
+ <key>CanShowSelectedItemsWhenRun</key>
+ <false/>
+ <key>CanShowWhenRun</key>
+ <true/>
+ <key>Category</key>
+ <array>
+ <string>AMCategoryFilesAndFolders</string>
+ </array>
+ <key>Class Name</key>
+ <string>Find_Finder_Items_2</string>
+ <key>InputUUID</key>
+ <string>CACAEF8E-1695-469E-9B00-400A78AE643A</string>
+ <key>Keywords</key>
+ <array/>
+ <key>OutputUUID</key>
+ <string>B91AE25A-F878-4B64-963E-0B26610470EF</string>
+ <key>UUID</key>
+ <string>E4D2579F-F34B-44EC-8212-5DFDB48C3AC8</string>
+ <key>UnlocalizedApplications</key>
+ <array>
+ <string>Finder</string>
+ </array>
+ <key>arguments</key>
+ <dict>
+ <key>0</key>
+ <dict>
+ <key>default value</key>
+ <string>com.apple.cocoa.path</string>
+ <key>name</key>
+ <string>itemType</string>
+ <key>required</key>
+ <string>0</string>
+ <key>type</key>
+ <string>0</string>
+ <key>uuid</key>
+ <string>0</string>
+ </dict>
+ <key>1</key>
+ <dict>
+ <key>default value</key>
+ <string></string>
+ <key>name</key>
+ <string>searchPath</string>
+ <key>required</key>
+ <string>0</string>
+ <key>type</key>
+ <string>0</string>
+ <key>uuid</key>
+ <string>1</string>
+ </dict>
+ <key>2</key>
+ <dict>
+ <key>default value</key>
+ <data>
+ </data>
+ <key>name</key>
+ <string>predicate</string>
+ <key>required</key>
+ <string>0</string>
+ <key>type</key>
+ <string>0</string>
+ <key>uuid</key>
+ <string>2</string>
+ </dict>
+ </dict>
+ <key>conversionLabel</key>
+ <integer>0</integer>
+ <key>isViewVisible</key>
+ <true/>
+ <key>location</key>
+ <string>301.500000:412.000000</string>
+ <key>nibPath</key>
+ <string>/System/Library/Automator/Find Finder Items 2.action/Contents/Resources/Base.lproj/main.nib</string>
+ </dict>
+ <key>isViewVisible</key>
+ <true/>
+ </dict>
+ <dict>
+ <key>action</key>
+ <dict>
+ <key>AMAccepts</key>
+ <dict>
+ <key>Container</key>
+ <string>List</string>
+ <key>Optional</key>
+ <false/>
+ <key>Types</key>
+ <array>
+ <string>com.apple.cocoa.path</string>
+ </array>
+ </dict>
+ <key>AMActionVersion</key>
+ <string>v.2.0.1</string>
+ <key>AMApplication</key>
+ <array>
+ <string>Finder</string>
+ </array>
+ <key>AMParameterProperties</key>
+ <dict>
+ <key>replaceExisting</key>
+ <dict/>
+ <key>toDirectory</key>
+ <dict>
+ <key>isPathPopUp</key>
+ <true/>
+ <key>selectedVariableUUID</key>
+ <string>36136622-5A18-42D0-A4E7-37F18EEA695E</string>
+ <key>variableUUIDsInMenu</key>
+ <array>
+ <string>36136622-5A18-42D0-A4E7-37F18EEA695E</string>
+ </array>
+ </dict>
+ </dict>
+ <key>AMProvides</key>
+ <dict>
+ <key>Container</key>
+ <string>List</string>
+ <key>Types</key>
+ <array>
+ <string>com.apple.cocoa.path</string>
+ </array>
+ </dict>
+ <key>ActionBundlePath</key>
+ <string>/System/Library/Automator/Copy Finder Items.action</string>
+ <key>ActionName</key>
+ <string>Copy Finder Items</string>
+ <key>ActionParameters</key>
+ <dict>
+ <key>replaceExisting</key>
+ <true/>
+ <key>toDirectory</key>
+ <string></string>
+ </dict>
+ <key>BundleIdentifier</key>
+ <string>com.apple.Automator.CopyFiles</string>
+ <key>CFBundleVersion</key>
+ <string>2.0.1</string>
+ <key>CanShowSelectedItemsWhenRun</key>
+ <true/>
+ <key>CanShowWhenRun</key>
+ <true/>
+ <key>Category</key>
+ <array>
+ <string>AMCategoryFilesAndFolders</string>
+ </array>
+ <key>Class Name</key>
+ <string>AMCopyFilesAction</string>
+ <key>InputUUID</key>
+ <string>DB1B2594-1D74-4C65-9BE5-EC9C37A0AA5A</string>
+ <key>Keywords</key>
+ <array>
+ <string>File</string>
+ <string>Copy</string>
+ </array>
+ <key>OutputUUID</key>
+ <string>27CB786B-CD13-4BBC-81FA-30BEACEFC499</string>
+ <key>UUID</key>
+ <string>281EB016-CA8F-441C-BCA0-3D2CF4E89114</string>
+ <key>UnlocalizedApplications</key>
+ <array>
+ <string>Finder</string>
+ </array>
+ <key>arguments</key>
+ <dict>
+ <key>0</key>
+ <dict>
+ <key>default value</key>
+ <string>~/Desktop</string>
+ <key>name</key>
+ <string>toDirectory</string>
+ <key>required</key>
+ <string>0</string>
+ <key>type</key>
+ <string>0</string>
+ <key>uuid</key>
+ <string>0</string>
+ </dict>
+ <key>1</key>
+ <dict>
+ <key>default value</key>
+ <false/>
+ <key>name</key>
+ <string>replaceExisting</string>
+ <key>required</key>
+ <string>0</string>
+ <key>type</key>
+ <string>0</string>
+ <key>uuid</key>
+ <string>1</string>
+ </dict>
+ </dict>
+ <key>conversionLabel</key>
+ <integer>0</integer>
+ <key>isViewVisible</key>
+ <true/>
+ <key>location</key>
+ <string>301.500000:695.000000</string>
+ <key>nibPath</key>
+ <string>/System/Library/Automator/Copy Finder Items.action/Contents/Resources/Base.lproj/main.nib</string>
+ </dict>
+ <key>isViewVisible</key>
+ <true/>
+ </dict>
+ </array>
+ <key>connectors</key>
+ <dict>
+ <key>F12D6A3B-3C4B-4667-AD73-95EC8CAACCF4</key>
+ <dict>
+ <key>from</key>
+ <string>E4D2579F-F34B-44EC-8212-5DFDB48C3AC8 - E4D2579F-F34B-44EC-8212-5DFDB48C3AC8</string>
+ <key>to</key>
+ <string>281EB016-CA8F-441C-BCA0-3D2CF4E89114 - 281EB016-CA8F-441C-BCA0-3D2CF4E89114</string>
+ </dict>
+ </dict>
+ <key>variables</key>
+ <array>
+ <dict>
+ <key>UUID</key>
+ <string>36136622-5A18-42D0-A4E7-37F18EEA695E</string>
+ <key>identifier</key>
+ <string>com.apple.Automator.Variable.Path</string>
+ <key>name</key>
+ <string>~/Library/TeXShop/Engines</string>
+ <key>value</key>
+ <string>/</string>
+ </dict>
+ </array>
+ <key>workflowMetaData</key>
+ <dict>
+ <key>workflowTypeIdentifier</key>
+ <string>com.apple.Automator.application</string>
+ </dict>
+</dict>
+</plist>
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/TeXShop/LuaLaTeX+se.engine b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaLaTeX+se.engine
index a1fb7c72d06..a1fb7c72d06 100755..100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/TeXShop/LuaLaTeX+se.engine
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/LuaLaTeX+se.engine
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.sh b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.sh
new file mode 100755
index 00000000000..3025c0e44e4
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+# This script is designed to automatically configure a TeXShop distribution.
+
+ENGINEDIR="$HOME/Library/TeXShop/Engines"
+if [ ! -d "$ENGINEDIR" ]; then
+ mkdir -p "$ENGINEDIR"
+fi
+SOURCE="/Users/Shared/Gregorio/contrib/TeXShop/LuaLaTeX+se.engine"
+if [ -e "$SOURCE" ]; then
+ cp "$SOURCE" "$ENGINEDIR"
+else
+ echo "Cannot find LuaLaTeX+se.engine"
+ echo "Please try running the Gregorio intaller again"
+ exit 1
+fi
+defaults write TeXShop OtherTeXExtensions -array-add "gabc"
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gabc-syntax.plist b/Build/source/texk/gregorio/gregorio-src/contrib/gabc-syntax.plist
index 39396b46089..39396b46089 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gabc-syntax.plist
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/gabc-syntax.plist
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gabc.lang b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang
index 08258507fc0..08258507fc0 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gabc.lang
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gabc.vim b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
index 654c06bab90..654c06bab90 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gabc.vim
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gabc.xml b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.xml
index e84ec8975f2..e84ec8975f2 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gabc.xml
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.xml
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gprocess b/Build/source/texk/gregorio/gregorio-src/contrib/gprocess
index 91f603e4db0..dc6d3ae87c6 100755..100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gprocess
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/gprocess
@@ -35,12 +35,7 @@ use strict;
## USER-MODIFIABLE COMMAND PATHS
-# search for a PDF viewer among these file paths; take the first
-my @PDFVIEWERS = grep { -e $_ && -x $_ }
- ("/usr/bin/kpdf","/usr/bin/okular","/usr/local/bin/acroread","/usr/bin/acroread");
-my $PDFVIEWER = $PDFVIEWERS[0];
-
-my $TEXCOMPILER = "lualatex";
+my $TEXCOMPILER = "lualatex --shell-escape";
## END OF USER-MODIFIABLE COMMAND PATHS
@@ -53,6 +48,8 @@ if ($#ARGV < 0) {
my $GABCFILE = $ARGV[0];
+my $GABCNAME = $GABCFILE;
+$GABCNAME =~ s/.gabc//;
my $SCORENAME;
my $ANNOTATION;
my $REFERENCE;
@@ -62,11 +59,8 @@ my $KEEPSEARCHING = 1;
my $INLINE = "";
-my $SCORETEXFILE = $GABCFILE;
-$SCORETEXFILE =~ s/gabc$/tex/;
-
-my $SCOREWRAPTEX = $SCORETEXFILE;
-$SCOREWRAPTEX =~ s/.tex$/-main.tex/;
+my $SCOREWRAPTEX = $GABCFILE;
+$SCOREWRAPTEX =~ s/.gabc$/-main.tex/;
#### GET THE SCORE TITLE FROM THE GABC FILE ####
@@ -116,7 +110,7 @@ my @TEMPLATELINES;
#### MAKE SUBSTITUTIONS ####
&do_subst ("XXXX-SCORENAME-XXXX", $SCORENAME);
-&do_subst ("XXXX-SCORETEXFILE-XXXX", $SCORETEXFILE);
+&do_subst ("XXXX-GABCFILE-XXXX", $GABCNAME);
&do_subst ("XXXX-ANNOTATION-XXXX", $ANNOTATION);
&do_subst ("XXXX-OFFICEPART-XXXX", $OFFICEPART);
&do_subst ("XXXX-REFERENCE-XXXX", $REFERENCE);
@@ -141,18 +135,13 @@ $GAUXFILE =~ s/tex$/gaux/;
# remove product files so that we don't accidentally view results
# from a prior run
-unlink $SCORETEXFILE;
unlink $PDFFILE;
-
-do_cmd("gregorio $GABCFILE");
do_cmd("$TEXCOMPILER $SCOREWRAPTEX");
unlink $AUXFILE;
unlink $GAUXFILE;
print "\n\nOutput is in $PDFFILE .\n";
-do_cmd ("$PDFVIEWER $PDFFILE");
-
exit;
@@ -181,28 +170,13 @@ __END__
\usepackage[T1]{fontenc}
\usepackage[utf8]{luainputenc}
\usepackage{palatino}
-\usepackage{gregoriotex}
-\usepackage{color}
-\usepackage{ifthen}
+\usepackage[autocompile,allowdeprecated=false]{gregoriotex}
\pagestyle{empty}
\begin{document}
-\redlines
\begin{center}\begin{huge}\textsc{XXXX-SCORENAME-XXXX}\end{huge}\end{center}
-\setspaceafterinitial{3.2mm plus 0em minus 0em}
-\setspacebeforeinitial{3.2mm plus 0em minus 0em}
-
-\def\greinitialformat#1{%
-{\fontsize{43}{43}\selectfont #1}%
-}
-
-\gresetfirstlineaboveinitial{\small \textsc{\textbf{XXXX-ANNOTATION-XXXX}}}{\small \textsc{\textbf{XXXX-ANNOTATION-XXXX}}}
-\commentary{{\small \emph{XXXX-REFERENCE-XXXX}}}
-
-\setgrefactor{17}
-\grespaceabovelines=5mm
-\includescore{XXXX-SCORETEXFILE-XXXX}
+\gregorioscore{XXXX-GABCFILE-XXXX}
\end{document}
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gregorio-scribus.lua b/Build/source/texk/gregorio/gregorio-src/contrib/gregorio-scribus.lua
index 0bc11aa7b1c..0bc11aa7b1c 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gregorio-scribus.lua
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/gregorio-scribus.lua
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gregorio.png b/Build/source/texk/gregorio/gregorio-src/contrib/gregorio.png
index d58efff6a27..d58efff6a27 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/gregorio.png
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/gregorio.png
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/system-setup.bat b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
index 597cd798ff3..597cd798ff3 100755..100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/system-setup.bat
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/system-setup.sh b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.sh
index 3c320d0927c..3c320d0927c 100755
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/contrib/system-setup.sh
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.sh
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Appendix_Font_Tables.tex b/Build/source/texk/gregorio/gregorio-src/doc/Appendix_Font_Tables.tex
index 2eaddd777f6..d1912d57868 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Appendix_Font_Tables.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/Appendix_Font_Tables.tex
@@ -1,5 +1,5 @@
% !TEX root = GregorioRef.tex
-% !TEX program = LuaLaTeX
+% !TEX program = LuaLaTeX+se
\begin{landscape}
\section{Font Glyph Tables}\label{glyphtable}
@@ -20,36 +20,36 @@ horizontal episema (activated using {\ttfamily\char`_} in gabc) are excluded fro
this table.
\newcommand\ScoreFontTable[1]{%
- \begin{longtable}{llccccccc}
- \caption{Score Glyphs}\\
- &&&&&\multicolumn{4}{c}{\bfseries Variants}\\
- \hhline{>{\arrayrulecolor{lightgray}}----->{\arrayrulecolor{black}}----}
- {\bfseries Glyph Name}&%
- {\scriptsize\bfseries gabc}&%
- {\scriptsize\bfseries greciliae}&%
- {\scriptsize\bfseries gregorio}&%
- {\scriptsize\bfseries parmesan}&%
- {\scriptsize\bfseries Name}&%
- {\scriptsize\bfseries greciliae}&%
- {\scriptsize\bfseries gregorio}&%
- {\scriptsize\bfseries parmesan}\\
- \hline
- \endfirsthead
- &&&&&\multicolumn{4}{c}{\bfseries Variants}\\
- \hhline{>{\arrayrulecolor{lightgray}}----->{\arrayrulecolor{black}}----}
- {\bfseries Glyph Name}&%
- {\scriptsize\bfseries gabc}&%
- {\scriptsize\bfseries greciliae}&%
- {\scriptsize\bfseries gregorio}&%
- {\scriptsize\bfseries parmesan}&%
- {\scriptsize\bfseries Name}&%
- {\scriptsize\bfseries greciliae}&%
- {\scriptsize\bfseries gregorio}&%
- {\scriptsize\bfseries parmesan}\\
- \hline
- \endhead
- \directlua{GregorioRef.emit_score_glyphs(#1)}
- \end{longtable}
+ \begin{longtable}{llccccccc}
+ \caption{Score Glyphs}\\
+ &&&&&\multicolumn{4}{c}{\bfseries Variants}\\
+ \hhline{>{\arrayrulecolor{lightgray}}----->{\arrayrulecolor{black}}----}
+ {\bfseries Glyph Name}&%
+ {\scriptsize\bfseries gabc}&%
+ {\scriptsize\bfseries greciliae}&%
+ {\scriptsize\bfseries gregorio}&%
+ {\scriptsize\bfseries parmesan}&%
+ {\scriptsize\bfseries Name}&%
+ {\scriptsize\bfseries greciliae}&%
+ {\scriptsize\bfseries gregorio}&%
+ {\scriptsize\bfseries parmesan}\\
+ \hline
+ \endfirsthead
+ &&&&&\multicolumn{4}{c}{\bfseries Variants}\\
+ \hhline{>{\arrayrulecolor{lightgray}}----->{\arrayrulecolor{black}}----}
+ {\bfseries Glyph Name}&%
+ {\scriptsize\bfseries gabc}&%
+ {\scriptsize\bfseries greciliae}&%
+ {\scriptsize\bfseries gregorio}&%
+ {\scriptsize\bfseries parmesan}&%
+ {\scriptsize\bfseries Name}&%
+ {\scriptsize\bfseries greciliae}&%
+ {\scriptsize\bfseries gregorio}&%
+ {\scriptsize\bfseries parmesan}\\
+ \hline
+ \endhead
+ \directlua{GregorioRef.emit_score_glyphs(#1)}
+ \end{longtable}
}%
\ScoreFontTable{'greciliae','gregorio','parmesan'}
@@ -69,14 +69,14 @@ 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')}
+ \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}
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Command_Index_User.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex
index a3d97274a6e..64324d2b321 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Command_Index_User.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex
@@ -18,30 +18,30 @@ The optional arguments are:
\bigskip\rowcolors{1}{lightgray}{lightgray}
\begin{tabular}{lp{10cm plus .5cm}}
- Argument & Description \\
- \hline
- debug & Debug messages will be printed to the output log. Can also be specified as \verb:debug={<types>}:, in which case only messages of the types listed will be printed to the output log.\\
- \hline
- nevercompile & Default. The classic behavior of Gregorio\TeX. The user is %
- responsible for compiling gabc scores into gtex files.\\
- autocompile & Gregorio\TeX\ will automatically compile gtex files from gabc %
- files when necessary. If the gabc has been modified, or the %
- gtex has an outdated version, or the gtex file does not exist, %
- THEN Gregorio\TeX\ will compile a new gtex file.\\
- forcecompile & Gregorio\TeX\ will compile all scores from their gabc files.\\
- \hline
- allowdeprecated=false & Force all deprecated commands to raise a package error %
- rather than a warning. This allows the user to ensure that their file is %
- compliant with the current version of Gregorio\TeX.\\
+ Argument & Description \\
+ \hline
+ \texttt{debug} & Debug messages will be printed to the output log. Can also be specified as \verb:debug={<types>}:, in which case only messages of the types listed will be printed to the output log.\\
+ \hline
+ \texttt{nevercompile} & Default. The classic behavior of Gregorio\TeX. The user is %
+ responsible for compiling gabc scores into gtex files.\\
+ \texttt{autocompile} & Gregorio\TeX\ will automatically compile gtex files from gabc %
+ files when necessary. If the gabc has been modified, or the %
+ gtex has an outdated version, or the gtex file does not exist, %
+ THEN Gregorio\TeX\ will compile a new gtex file.\\
+ \texttt{forcecompile} & Gregorio\TeX\ will compile all scores from their gabc files.\\
+ \hline
+ \texttt{allowdeprecated=false} & Force all deprecated commands to raise a package error %
+ rather than a warning. This allows the user to ensure that their file is %
+ compliant with the current version of Gregorio\TeX.\\
\end{tabular}\bigskip
\textbf{Note:} \verb=nevercompile=, \verb=autocompile=, and
\verb=forcecompile= conflict with eachother. Only one should be
specified in the options list.\bigskip
-To use the package in a Plain\TeX\ document, include \verb=\input gregoriotex.tex= near the top of the document (the area which would correspond to the preamble in \LaTeX).
+To use the package in a Plain \TeX\ document, include \verb=\input gregoriotex.tex= near the top of the document (the area which would correspond to the preamble in \LaTeX).
-To use the \texttt{debug} option in Plain\TeX, you'll need to define \verb=\gre@debug= manually as a string listing the kinds of messages you want printed (or as \verb=all= if you want all messages printed).
+To use the \texttt{debug} option in Plain \TeX, you'll need to define \verb=\gre@debug= manually as a string listing the kinds of messages you want printed (or as \verb=all= if you want all messages printed).
To use the \texttt{allowdeprecated=false} option, you'll need \verb=\gre@allowdeprecatedfalse=.
@@ -67,7 +67,7 @@ Due to recent changes (September 2015) in the \LaTeX\ kernel and the resulting u
Gregorio\TeX\ does not require \texttt{fontspec}, so documents which do not use \texttt{fontspec} are not affected by these changes.
-\textit{Nota bene:} Some font packages (such as \texttt{libertine}) make use of \texttt{fontspec} and thus must also be loaded before \texttt{gregoriotex}.
+\textit{Nota bene:} Some font packages (such as \texttt{libertine}) make use of \texttt{fontspec} internally and thus must also be loaded before \texttt{gregoriotex}.
\subsection{Commands}
@@ -79,90 +79,90 @@ Once you've included the package in your document (as explained above) the follo
Macro for including scores. Works on both gabc and tex files.
\begin{argtable}
- \#1 & \texttt{n} & Optional. \#2 will be included as is. \\
- & \texttt{a} & Optional. Gregorio\TeX\ will automatically compile gabc files if necessary.\\
- & \texttt{f} & Optional. Forces Gregorio\TeX\ to compile the gabc file.\\
- \#2 & string & Relative or absolute path to the score.\\
+ \#1 & \texttt{n} & Optional. \#2 will be included as is. \\
+ & \texttt{a} & Optional. Gregorio\TeX\ will automatically compile gabc files if necessary.\\
+ & \texttt{f} & Optional. Forces Gregorio\TeX\ to compile the gabc file.\\
+ \#2 & string & Relative or absolute path to the score.\\
\end{argtable}
Example:\par\medskip
\begin{latexcode}
- \includescore[n]{TecumPrincipium.tex}
- \includescore{Chant/VirgoVirginum.gabc}
- \includescore{/home/user/chant/AdTeLevavi}
- \includescore[a]{AveMaria}
-
- %The following lines include the same score:
- \includescore{Christus}
- \includescore{Christus.gtex}
- \includescore{./Christus}
- \includescore{./Christus.gabc}
-
- %With the optional arg [f], #2 must be a file usable by TeX.
- \includescore[f]{TecumPrincipium.gabc} % Wrong
+ \gregorioscore[n]{TecumPrincipium.gtex}
+ \gregorioscore{Chant/VirgoVirginum.gabc}
+ \gregorioscore{/home/user/chant/AdTeLevavi}
+ \gregorioscore[a]{AveMaria}
+
+ %The following lines include the same score:
+ \gregorioscore{Christus}
+ \gregorioscore{Christus.gtex}
+ \gregorioscore{./Christus}
+ \gregorioscore{./Christus.gabc}
+
+ %With the optional arg [f], #2 must be a file usable by \TeX.
+ \gregorioscore[f]{TecumPrincipium.gabc} % Wrong
\end{latexcode}
\textbf{Important:} For the sake of clarity it is recommended that the
-file extension be omitted from \texttt{\#2}. When the nevercompile
+file extension be omitted from \texttt{\#2} unless using the \texttt{nevercompile} option. When the \texttt{nevercompile}
option is in effect (either via package option
\texttt{[nevercompile]}, or \verb=\gresetcompilegabc{never}=, or
-\verb=\includescore[n]=) \#2 must be a \TeX\ file that exists and
-\texttt{.tex} is the only extension that may be omitted.
+\verb=\gregorioscore[n]=) \#2 must be a \TeX\ file that exists and
+the file extension (normally gtex) must be given.
When called with the optional argument \texttt{[a]} Gregorio\TeX\ will
automatically generate a \texttt{gtex} file in this format:
\texttt{\textit{scorename}-x\_x\_x.gtex} where \texttt{x\_x\_x} is the
gregorio version. This resulting file is not intended to be modified
by the user and will be removed when the gabc file is recompiled. The
-rules that Gregorio\TeX uses to determine if a gabc file needs to be
+rules that Gregorio\TeX\ uses to determine if a gabc file needs to be
compiled are:
\begin{itemize}
\item If a gtex file does not exist.
\item If the modification time of the gabc file is newer than its
- corresponding gtex file.
+ corresponding gtex file.
\item If the version of the gtex file is outdated.
\end{itemize}
When called with the optional argument \texttt{[n]} Gregorio\TeX\ will
include the score without doing anything else. This is the same as the
-old behavior of Gregorio\TeX and the default behavior.
+old behavior of Gregorio\TeX\ and therefore the default behavior.
-When called with the optional argument \texttt{[f]} Gregorio\TeX will
+When called with the optional argument \texttt{[f]} Gregorio\TeX\ will
compile the gabc file into a gtex file. This is similar to
\texttt{[a]} except the gabc is compiled every time.
-\macroname{\textbackslash gresetcompilegabc}{\{\#1\}}{gregoriotex-main.tex}
+\macroname{\textbackslash gresetcompilegabc}{\{\#1\}}{gregoriotex-main.tex}
A macro to change the behavior of the way Gregorio\TeX\ includes scores. This is similar to using the package options \verb=[forcecompile]=, \verb=[autocompile]=, and \verb=[nevercompile]=, but does not necessarly apply to the entire document.
\begin{argtable}
- \#1 & force & all later calls of \verb=\includescore= will compile the gabc
+ \#1 & \texttt{force} & all later calls of \verb=\gregorioscore= will compile the gabc
file into a gtex file.\\
- & auto & all later calls of \verb=\includescore= will use Gregorio\TeX's
+ & \texttt{auto} & all later calls of \verb=\gregorioscore= will use Gregorio\TeX's
automatic compilation of gabc files.\\
- & never & all later calls of \verb=\includescore= will include the score
+ & \texttt{never} & all later calls of \verb=\gregorioscore= will include the score
without doing anything else.
\end{argtable}
\medskip This macro can be combined in the same document with different arguments to
-switch between different includescore behaviors: \par\medskip
+switch between different behaviors: \par\medskip
\begin{latexcode}
- \usepackage{gregoriotex} % [nevercompile] is the default.
- ----
- \includescore{TecumPrincipium} % gabc never compiled.
- \includescore[f]{TecumPrincipium} % gabc always compiled.
- \includescore[a]{TecumPrincipium} % gabc auto compiled.
-
- \gresetcompilegabc{auto}
- \includescore{TecumPrincipium} % gabc auto compiled.
- \includescore[n]{TecumPrincipium} % gabc never compiled.
- \includescore[f]{TecumPrincipium} % gabc always compiled.
-
- \gresetcompilegabc{force}
- \includescore{TecumPrincipium} % gabc always compiled.
- \includescore[n]{TecumPrincipium} % gabc never compiled.
- \includescore[a]{TecumPrincipium} % gabc auto compiled.
+ \usepackage{gregoriotex} % [nevercompile] is the default.
+ ----
+ \gregorioscore{TecumPrincipium} % gabc never compiled.
+ \gregorioscore[f]{TecumPrincipium} % gabc always compiled.
+ \gregorioscore[a]{TecumPrincipium} % gabc auto compiled.
+
+ \gresetcompilegabc{auto}
+ \gregorioscore{TecumPrincipium} % gabc auto compiled.
+ \gregorioscore[n]{TecumPrincipium} % gabc never compiled.
+ \gregorioscore[f]{TecumPrincipium} % gabc always compiled.
+
+ \gresetcompilegabc{force}
+ \gregorioscore{TecumPrincipium} % gabc always compiled.
+ \gregorioscore[n]{TecumPrincipium} % gabc never compiled.
+ \gregorioscore[a]{TecumPrincipium} % gabc auto compiled.
\end{latexcode}
\macroname{\textbackslash gabcsnippet}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
@@ -172,13 +172,13 @@ may be used to specify a gabc \texttt{initial-style}, which defaults to
\texttt{1}.
\begin{argtable}
- \#1 & number & Optional. The gabc \texttt{initial-style} value to use.\\
- \#2 & string & The gabc to insert into the document.\\
+ \#1 & number & Optional. The gabc \texttt{initial-style} value to use.\\
+ \#2 & string & The gabc to insert into the document.\\
\end{argtable}
\medskip For example:\par\medskip
\begin{latexcode}
- \gabcsnippet[0]{(c3) Al(eg~)le(gv.fhg)lu(efe___)ia(e.) (::)}
+ \gabcsnippet[0]{(c3) Al(eg~)le(gv.fhg)lu(efe___)ia(e.) (::)}
\end{latexcode}
@@ -208,8 +208,8 @@ disabled by default.
Macro to enable or disable the point-and-click feature.
\begin{argtable}
- \#1 & on & Enable point-and-click link generation.\\
- & off & Disable point-and-click link generation.
+ \#1 & \texttt{on} & Enable point-and-click link generation.\\
+ & \texttt{off} & Disable point-and-click link generation (default).
\end{argtable}
This feature may be switched on and off as desired between scores.
@@ -222,14 +222,14 @@ While the default size for Gregorio scores is designed to approximate that found
Macro to adjust the size of the staff.
\begin{argtable}
- \#1 & integer & The size of the staff lines. Default value is 17. Higher numbers yield larger staves.
+ \#1 & integer & The size of the staff lines. Default value is 17. Higher numbers yield larger staves.
\end{argtable}
\macroname{\textbackslash grechangestafflinethickness}{\{\#1\}}{gregoriotex-spaces.tex}
Macro to adjust the thickness of the staff lines.
\begin{argtable}
- \#1 & integer & The thickness of the staff lines. The default value is same as staff size.
+ \#1 & integer & The thickness of the staff lines. The default value is same as staff size.
\end{argtable}
@@ -237,49 +237,49 @@ Macro to adjust the thickness of the staff lines.
In addition to providing control over the overall size of your scores, Gregorio\TeX\ allows you to fine tune the spacings around and between the various elements using the following functions.
\macroname{\textbackslash grecreatedim}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-spaces.tex}
-Macro to create one of Gregorio\TeX’s distances. Used to initialize distances in a space configuration file.
+Macro to create one of Gregorio\TeX’s distances. Used to initialize distances in a space configuration file. For an example of such a file, please see \textit{gsp-default.tex}, which contains the default spacing configuration for Gregorio\TeX.
\begin{argtable}
- \#1 & string & The name of the distance to be changed. See \nameref{distances} below.\\
- \#2 & string & The distance in string format. \textbf{Note:} You cannot use a length register for this argument. You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
- \#3 & fixed & Distance will not scale when staff size is changed.\\
- & scalable & Distance will scale when staff size is changed.
+ \#1 & string & The name of the distance to be changed. See \nameref{distances} below.\\
+ \#2 & string & The distance in string format. \textbf{Note:} You cannot use a length register for this argument. You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
+ \#3 & \texttt{fixed} & Distance will not scale when staff size is changed.\\
+ & \texttt{scalable} & Distance will scale when staff size is changed.
\end{argtable}
\macroname{\textbackslash grechangedim}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-spaces.tex}
Macro to change one of Gregorio\TeX’s distances. This function will check to make sure the distance you are trying to change exists first.
\begin{argtable}
- \#1 & string & The name of the distance to be changed. See \nameref{distances} below.\\
- \#2 & string & The distance in string format. \textbf{Note:} You cannot use a length register for this argument. You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
- \#3 & fixed & Distance will not scale when staff size is changed.\\
- & scalable & Distance will scale when staff size is changed.
+ \#1 & string & The name of the distance to be changed. See \nameref{distances} below.\\
+ \#2 & string & The distance in string format. \textbf{Note:} You cannot use a length register for this argument. You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
+ \#3 & \texttt{fixed} & Distance will not scale when staff size is changed.\\
+ & \texttt{scalable} & Distance will scale when staff size is changed.
\end{argtable}
\macroname{\textbackslash grescaledim}{\{\#1\}\{\#2\}}{gregoriotex-spaces.tex}
Macro to turn on or off scaling with the staff size for a particular distance.
\begin{argtable}
- \#1 & string & The name of the distance for which scaling is to changed. See \nameref{distances} below.\\
- \#2 & \texttt{yes}/\texttt{true}/\texttt{on}/\texttt{scalable} & Scale the distance when changing the size of the staff.\\
- & \textit{other} & Do not scale the distance when changing the size of the staff.
+ \#1 & string & The name of the distance for which scaling is to changed. See \nameref{distances} below.\\
+ \#2 & \texttt{yes}/\texttt{true}/\texttt{on}/\texttt{scalable} & Choose just one of the given keywords. Scale the distance when changing the size of the staff.\\
+ & string not in list above & Do not scale the distance when changing the size of the staff.
\end{argtable}
\textbf{Nota bene:} This macro also can be used to change whether or not the staff line thickness scales with the staff size by specifying \texttt{stafflinefactor} for the first argument.
\macroname{\textbackslash greloadspaceconf}{\{\#1\}}{gregoriotex-spaces.tex}
-Macro to load a space configuration file. Space configuration file names have the format \verb=gsp-identifier.tex= and must be in the same directory as your project or in your texmf directory. This function is \texttt{gre}-prefixed to highlight that it only loads distances for Gregorio\TeX.
+Macro to load a space configuration file. Space configuration file names have the format \verb=gsp-identifier.tex= and must be in the same directory as your project or in your texmf directory.
\begin{argtable}
- \#1 & string & The identifier of the space configuration file.
+ \#1 & string & The identifier of the space configuration file.
\end{argtable}
Example:\par\medskip
\begin{latexcode}
- % loads gsp-default.tex, the default configuration file
- \greloadspaceconf{default}
- % loads a custom configuration called gsp-myspaces.tex
- \greloadspaceconf{myspaces}
+ % loads gsp-default.tex, the default configuration file
+ \greloadspaceconf{default}
+ % loads a custom configuration called gsp-myspaces.tex
+ \greloadspaceconf{myspaces}
\end{latexcode}
\macroname{\textbackslash greconffactor}{}{gsp-default.tex}
@@ -290,9 +290,9 @@ Macro to configure line height expansion behavior when notes appear
above or below the staff lines.
\begin{argtable}
- \#1 & \texttt{variable} & Expand lines within a score independently
- of each other \\
- & \texttt{uniform} & Expand all lines within a score uniformly
+ \#1 & \texttt{variable} & Expand lines within a score independently
+ of each other \\
+ & \texttt{uniform} & Expand all lines within a score uniformly
\end{argtable}
By default, Gregorio\TeX{} uses \texttt{variable} line expansion. This
@@ -312,50 +312,48 @@ necessary.
\begin{small}
\begin{framed}
- \textit{For experts only:}\bigskip
-
- It is possible to suppress the line height computation and just use
- whatever has been computed from the previous run. If you are sure
- that the score line heights haven't changed from the previous run,
- define the \verb=\greskipheightcomputation= control sequence before
- including the Gregorio\TeX{} package. This will save a little bit
- of time per run.
+ \textit{For experts only:}\bigskip
+
+ It is possible to suppress the line height computation and just use
+ whatever has been computed from the previous run. If you are sure
+ that the score line heights haven't changed from the previous run,
+ define the \verb=\greskipheightcomputation= control sequence before
+ including the Gregorio\TeX{} package. This will save a little bit
+ of time per run.
\end{framed}
\end{small}
-
\subsubsection{Staff Lines}
-
\macroname{\textbackslash gresetlinecolor}{\{\#1\}}{gregoriotex.sty \textup{and} gregoriotex.tex}
Macro for changing the color of the staff lines. The two most common colors you're going to want to use are \texttt{gregoriocolor} (see \nameref{colors}) and \texttt{black} (the default).
\begin{argtable}
- \#1 & \textit{color name} & The color of the staff lines
+ \#1 & color name & The color of the staff lines
\end{argtable}
\macroname{\textbackslash gresetlines}{\{\#1\}}{gregoriotex-main.tex}
Macro for setting whether the staff lines should be rendered or not.
\begin{argtable}
- \#1 & visible & The staff lines should be printed (default)\\
- & invisible & The staff lines should not be printed
+ \#1 & \texttt{visible} & The staff lines should be printed (default)\\
+ & \texttt{invisible} & The staff lines should not be printed
\end{argtable}
\macroname{\textbackslash gresetlinesbehindpunctumcavum}{\{\#1\}}{gregoriotex-signs.tex}
Macro for setting whether the staff lines behind a punctum cavum should be shown or not.
\begin{argtable}
- \#1 & visible & The staff lines behind a punctum cavum should be printed (default)\\
- & invisible & The staff lines behind a punctum cavum should not be printed
+ \#1 & \texttt{visible} & The staff lines behind a punctum cavum should be printed (Plain \TeX\ default)\\
+ & \texttt{invisible} & The staff lines behind a punctum cavum should not be printed (\LaTeX\ default)
\end{argtable}
\macroname{\textbackslash gresetlinesbehindalteration}{\{\#1\}}{gregoriotex-signs.tex}
Macro for setting whether the staff lines behind an alternation (\ie, an accidental) should be shown or not.
\begin{argtable}
- \#1 & visible & The staff lines behind an alteration should be printed (default)\\
- & invisible & The staff lines behind an alteration should not be printed
+ \#1 & \texttt{visible} & The staff lines behind an alteration should be printed (Plain \TeX\ default)\\
+ & \texttt{invisible} & The staff lines behind an alteration should not be printed (\LaTeX\ default)
\end{argtable}
@@ -368,11 +366,11 @@ may be used to specify an alternate font/rule set. Currently, the only
available alternate font/rule set is \texttt{op} for Dominican neumes.
\begin{argtable}
- \#1 & \textit{(omitted)} & Use the normal font and rule set (default).\\
- & op & Use the alternate Dominican font/rule set.\\
- \#2 & greciliae & Use the Greciliae font (default).\\
- & gregorio & Use the Gregorio font.\\
- & parmesan & Use the Parmesan font.\\
+ \#1 & \textit{(omitted)} & Use the normal font and rule set (default).\\
+ & \texttt{op} & Use the alternate Dominican font/rule set.\\
+ \#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
+ & \texttt{gregorio} & Use the Gregorio font.\\
+ & \texttt{parmesan} & Use the Parmesan font.\\
\end{argtable}
@@ -384,11 +382,11 @@ Substitutes the given Gregorio\TeX\ score glyph with the specified glyph
from the specified font.
\begin{argtable}
- \#1 & string & The name of the GregorioTeX glyph to replace.\\
- \#2 & string & The name of the font to use.\\
- \#3 & number & The code point of the glyph to use.\\
- & \texttt{.}string & The name of the variant (appended to \#1) to use.\\
- & string & (any other string) The name of the glyph to use.
+ \#1 & string & The name of the Gregorio\TeX\ glyph to replace.\\
+ \#2 & string & The name of the font to use.\\
+ \#3 & number & The code point of the glyph to use.\\
+ & \texttt{.}string & The name of the variant (appended to \#1) to use.\\
+ & string & (any other string) The name of the glyph to use.
\end{argtable}
\medskip If \texttt{\#1} has a wildcard (a \texttt{*}) in it, then
@@ -402,22 +400,22 @@ to be available in all score fonts.
\medskip For example, to use the old glyphs (from Caeciliae) for the
strophicus, use the following:\par\medskip
\begin{latexcode}
- \grechangeglyph{Stropha}{greciliae}{.caeciliae}
- \grechangeglyph{StrophaAucta}{greciliae}{.caeciliae}
+ \grechangeglyph{Stropha}{greciliae}{.caeciliae}
+ \grechangeglyph{StrophaAucta}{greciliae}{.caeciliae}
\end{latexcode}
\medskip To replace all torculus resupinus glyphs with their alternate
versions, use the following:\par\medskip
\begin{latexcode}
- \grechangeglyph{TorculusResupinus*}{*}{.alt}
+ \grechangeglyph{TorculusResupinus*}{*}{.alt}
\end{latexcode}
\macroname{\textbackslash greresetglyph}{\{\#1\}}{gregoriotex-main.tex}
-Removes a GregorioTeX score glyph substitution, restoring it back to
+Removes a Gregorio\TeX\ score glyph substitution, restoring it back to
its original form.
\begin{argtable}
- \#1 & string & The name of the GregorioTeX glyph to restore.\\
+ \#1 & string & The name of the Gregorio\TeX\ glyph to restore.\\
\end{argtable}
\medskip If \texttt{\#1} has a wildcard (a \texttt{*}) in it, then
@@ -426,25 +424,25 @@ all glyphs matching \texttt{\#1} will be restored.
\medskip For example, to restore the strophicus back to the new glyphs,
use the following:\par\medskip
\begin{latexcode}
- \greresetglyph{Stropha}
- \greresetglyph{StrophaAucta}
+ \greresetglyph{Stropha}
+ \greresetglyph{StrophaAucta}
\end{latexcode}
\medskip To restore all torculus resupinus glyphs to their original
form, use the following:\par\medskip
\begin{latexcode}
- \greresetglyph{TorculusResupinus*}
+ \greresetglyph{TorculusResupinus*}
\end{latexcode}
\macroname{\textbackslash gredefsymbol}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-symbols.tex}
-Defines (or redefines) a TeX control sequence to be a non-score symbol.
+Defines (or redefines) a \TeX\ control sequence to be a non-score symbol.
If defined this way, the symbol will scale with the text font.
\begin{argtable}
- \#1 & string & The name of the TeX control sequence (without leading backslash).\\
- \#2 & string & The name of the font to use.\\
- \#3 & number & The code point of the glyph to use.\\
- & string & The name of the glyph to use.
+ \#1 & string & The name of the \TeX\ control sequence (without leading backslash).\\
+ \#2 & string & The name of the font to use.\\
+ \#3 & number & The code point of the glyph to use.\\
+ & string & The name of the glyph to use.
\end{argtable}
\macroname{\textbackslash gredefsizedsymbol}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-symbols.tex}
@@ -453,45 +451,45 @@ which requires a single numeric argument (in points) to which the symbol
will be scaled.
\begin{argtable}
- \#1 & string & The name of the TeX control sequence (without leading backslash).\\
- \#2 & string & The name of the font to use.\\
- \#3 & number & The code point of the glyph to use.\\
- & string & The name of the glyph to use.
+ \#1 & string & The name of the \TeX\ control sequence (without leading backslash).\\
+ \#2 & string & The name of the font to use.\\
+ \#3 & number & The code point of the glyph to use.\\
+ & string & The name of the glyph to use.
\end{argtable}
-\macroname{\textbackslash gresethepisemus}{\{\#1\}}{gregoriotex-signs.tex}
-Determines whether Gregorio\TeX\ should join (bridge) horizontal episema on adjacent notes.
+\macroname{\textbackslash gresethepisema}{\{\#1\}}{gregoriotex-signs.tex}
+Determines whether Gregorio\TeX\ should join (bridge) horizontal episemata on adjacent notes.
\begin{argtable}
- \#1 & bridge & Adjacent horizontal episema are joined together (default).\\
- & break & Adjacent horizontal episema are not joined.
+ \#1 & \texttt{bridge} & Adjacent horizontal episemata are joined together (default).\\
+ & \texttt{break} & Adjacent horizontal episemata are not joined.
\end{argtable}
\macroname{\textbackslash gresetpunctumcavum}{\{\#1\}}{gregoriotex-signs.tex}
A shortcut for switching to the alternative punctum cavum and back.
\begin{argtable}
- \#1 & alternate & use the alternate punctum cavum\\
- & normal & use the normal punctum cavum
+ \#1 & \texttt{alternate} & use the alternate punctum cavum\\
+ & \texttt{normal} & use the normal punctum cavum
\end{argtable}
Using the alternate punctum cavum is the equivalent of issuing the following commands:
\begin{latexcode}
- \grechangeglyph{PunctumCavum}{greciliae}{.caeciliae}%
- \grechangeglyph{LineaPunctumCavum}{greciliae}{.caeciliae}%
- \grechangeglyph{PunctumCavumHole}{greciliae}{.caeciliae}%
- \grechangeglyph{LineaPunctumCavumHole}{greciliae}{.caeciliae}%
+ \grechangeglyph{PunctumCavum}{greciliae}{.caeciliae}%
+ \grechangeglyph{LineaPunctumCavum}{greciliae}{.caeciliae}%
+ \grechangeglyph{PunctumCavumHole}{greciliae}{.caeciliae}%
+ \grechangeglyph{LineaPunctumCavumHole}{greciliae}{.caeciliae}%
\end{latexcode}
\macroname{\textbackslash gresetglyphstyle}{\{\#1\}}{gregoriotex-chars.tex}
Gregorio\TeX\ supports several glyph styles which can be changed with this macro. These style replace some non-note glyphs with alternatives.
\begin{argtable}
- \#1 & default & Use the default style\\
- & medicaea & Use a Medicaea style\\
- & hufnagel & Use the hufnagel style\\
- & mensural & Use the mensural style
+ \#1 & \texttt{default} & Use the default style\\
+ & \texttt{medicaea} & Use a Medicaea style\\
+ & \texttt{hufnagel} & Use the hufnagel style\\
+ & \texttt{mensural} & Use the mensural style
\end{argtable}
%%% Should there be a table here or in the appendix which shows the affected glyphs in each of the styles?
@@ -503,35 +501,35 @@ Gregorio\TeX\ supports several glyph styles which can be changed with this macro
Redefines a \TeX\ control sequence to be a a barred symbol.
\begin{argtable}
- \#1 & character & must be \texttt{A}, \texttt{R}, or \texttt{V}.\\
- \#2 & dimension & how much the bar will be shifted left.\\
+ \#1 & character & must be \texttt{A}, \texttt{R}, or \texttt{V}.\\
+ \#2 & dimension & how much the bar will be shifted left.\\
\end{argtable}
-Gregorio does not have precomposed barred letters, instead, it has bars that you
-can you to composed barred letters in your text font. This command is the most
+Gregorio\TeX\ does not have precomposed barred letters, instead, it has bars that you
+can use to composed barred letters in your text font. This command is the most
simple version.
For example:
\medskip \begin{latexcode}
- \gresimpledefbarglyph{A}{0.3em}
+ \gresimpledefbarredsymbol{A}{0.3em}
\end{latexcode}
Will define \texttt{\textbackslash Abar} to be a A with a bar shifted right
of \texttt{0.3em} from the beginning of the glyph. This is the default definition
and fits well with the Linux Libertine font. If you use another font, you'll
-certainly have to change this value by calling the \texttt{gresimpledefbarglyph} command.
+certainly have to change this value by calling the \texttt{\textbackslash gresimpledefbarglyph} command.
\macroname{\textbackslash gredefbarredsymbol}{\{\#1\}\{\#2\}\{\#3\}\{\#4\}\{\#5\}\{\#6\}}{gregoriotex-symbols.tex}
Redefines a \TeX\ control sequence to be a barred symbol.
\begin{argtable}
- \#1 & string & the name of the command you want to define.\\
- \#2 & string & command to typeset the text.\\
- \#3 & string & symbol of the bar (must be defined through \texttt{gredefsizedsymbol}).\\
- \#4 & number & the size of greextra to use (in pt).\\
- \#5 & dimension & horizontal right shift of the bar.\\
- \#6 & dimension & vertical shift of the bar glyph.\\
+ \#1 & string & the name of the command you want to define.\\
+ \#2 & string & command to typeset the text.\\
+ \#3 & string & symbol of the bar (must be defined through \texttt{gredefsizedsymbol}).\\
+ \#4 & number & the size of greextra to use (in pt).\\
+ \#5 & dimension & horizontal right shift of the bar.\\
+ \#6 & dimension & vertical shift of the bar glyph.\\
\end{argtable}
This is a more complete version of the previous command, it allows you to define
@@ -542,13 +540,12 @@ For example:
\begin{footnotesize}
\begin{latexcode}
- \gredefbarredsymbol{RBarBold}{\textbf{R}}{greRBarSmall}{13}{1.7mm}{0.1mm}
+ \gredefbarredsymbol{RBarBold}{\textbf{R}}{greRBarSmall}{13}{1.7mm}{0.1mm}
\end{latexcode}
\end{footnotesize}
\gredefbarredsymbol{RBarBold}{\textbf{R}}{greRBarSmall}{13}{1.7mm}{0.1mm}
-
-Will define \texttt{\textbackslash RBarBold} to be a bold \textbf{R} with
+Will define \texttt{\textbackslash RBarBold} to be a bold \textbf{R} with
the bar made for small text (a bit bolder, named \texttt{RBarSmall} in greextra)
, at 12pt, shifted right of \texttt{1.7mm} from the beginning of the glyph, and lowered down
by \texttt{0.1mm}. The result is that \texttt{\textbackslash RBarBold} will typeset \RBarBold .
@@ -562,14 +559,14 @@ Redefines a \TeX\ control sequence to be a barred symbol.
\bigskip\textbf{Only available in \LaTeX.}
\begin{argtable}
- \#1 & character & must be \texttt{A}, \texttt{R}, or \texttt{V}.\\
- \#2 & dimension & how much the bar will be shifted left when upright and medium weight.\\
- \#3 & dimension & how much the bar will be shifted left when italic/slanted and medium weight.\\
- \#4 & dimension & how much the bar will be shifted left when upright and bold.\\
- \#5 & dimension & how much the bar will be shifted left when italic/slanted and bold.\\
+ \#1 & character & must be \texttt{A}, \texttt{R}, or \texttt{V}.\\
+ \#2 & dimension & how much the bar will be shifted left when upright and medium weight.\\
+ \#3 & dimension & how much the bar will be shifted left when italic/slanted and medium weight.\\
+ \#4 & dimension & how much the bar will be shifted left when upright and bold.\\
+ \#5 & dimension & how much the bar will be shifted left when italic/slanted and bold.\\
\end{argtable}
-This is like \verb=gresimpledefbarglyph=, but allows setting different shifts
+This is like \verb=\gresimpledefbarglyph=, but allows setting different shifts
for different font shapes and weights. If you need something more elaborate,
you will need to redefine the bar macro(s) manually. This macro is only
available in \LaTeX{} because it depends upon the \LaTeX{} font system.
@@ -580,80 +577,82 @@ definitions. Instead, it actually generates the code that would show the
barred symbol.
\begin{argtable}
- \#1 & string & command to typeset the text.\\
- \#2 & string & symbol of the bar (must be defined through \texttt{gredefsizedsymbol}).\\
- \#3 & number & the size of greextra to use (in pt).\\
- \#4 & dimension & horizontal right shift of the bar.\\
- \#5 & dimension & vertical shift of the bar glyph.\\
+ \#1 & string & command to typeset the text.\\
+ \#2 & string & symbol of the bar (must be defined through \texttt{gredefsizedsymbol}).\\
+ \#3 & number & the size of greextra to use (in pt).\\
+ \#4 & dimension & horizontal right shift of the bar.\\
+ \#5 & dimension & vertical shift of the bar glyph.\\
\end{argtable}
\macroname{\textbackslash greseparator}{\{\#1\}\{\#2\}}{gregoriotex-symbols.tex}
A macro for invoking one of the five separators (fancy lines) which are contained in the greextra font.
\begin{argtable}
- \#1 & 1--5 & the line desired\\
- \#2 & integer & the point size at which to print the line\\
+ \#1 & \texttt{1}--\texttt{5} & Choose the number of the line desired\\
+ \#2 & integer & the point size at which to print the line\\
\end{argtable}
\macroname{\textbackslash greornamentation}{\{\#1\}\{\#2\}}{gregoriotex-symbols.tex}
A macro for invoking one of the ornamentation elements which are contained in the greextra font.
\begin{argtable}
- \#1 & 1--2 & the line desired\\
- \#2 & integer & the point size at which to print the line\\
+ \#1 & \texttt{1}--\texttt{2} & Choose the number of the ornamentation desired\\
+ \#2 & integer & the point size at which to print the line\\
\end{argtable}
\subsubsection{Styling}
Different elements of an include score have different styles applied. These elements and their defaults are listed below:
+\begin{adjustbox}{center}
\let\stylename\texttt
\renewcommand{\thefootnote}{\fnsymbol{footnote}}
\bigskip\rowcolors{1}{lightgray}{lightgray}
\begin{tabular}{lp{7cm plus .5cm}r}
- Element Name & Description & Default\\
- \hline
- \stylename{initial} & Normal Initials & 40 pt font\\
- \stylename{biginitial} & Big (2-Line) Initials & 80 pt font\\
- \stylename{translation} & Translation text (appears below lyrics) & {\it italics}\\
- \stylename{abovelinestext} & Above line text (\texttt{<alt></alt>} in gabc, appears above the staff) & normal\\
- \stylename{normalstafflines} & Full length staff lines & none\\
- \stylename{additionalstafflines} & short lines behind notes above or below the staff & special\footnotemark[1]\\
- \stylename{lowchoralsign} & low choral signs & none\\
- \stylename{highchoralsign} & high choral signs & none\\
- \stylename{firstsyllableinitial} & the first letter of the first syllable of a score which is not the score initial & none\\
- \stylename{firstsyllable} & the first syllable of the score excluding the score initial & none\\
- \stylename{firstword} & the first word of the first score excluding the score initial & none\\
- \stylename{modeline} & the rendered annotation from the \texttt{mode: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textsc{\textbf{Bold Small Capitals}}}\\
- \stylename{nabc} & ancient notation & {\color{gregoriocolor}gregoriocolor} (\LaTeX)\\
- && none (Plain\TeX)\\
+ Element Name & Description & Default\\
+ \hline
+ \stylename{initial} & Normal Initials & 40 pt font\\
+ \stylename{biginitial} & Big (2-Line) Initials & 80 pt font\\
+ \stylename{translation} & Translation text (appears below lyrics) & {\it italics}\\
+ \stylename{abovelinestext} & Above line text (\texttt{<alt></alt>} in gabc, appears above the staff) & normal\\
+ \stylename{normalstafflines} & Full length staff lines & none\\
+ \stylename{additionalstafflines} & short lines behind notes above or below the staff & special\footnotemark[1]\\
+ \stylename{lowchoralsign} & low choral signs & none\\
+ \stylename{highchoralsign} & high choral signs & none\\
+ \stylename{firstsyllableinitial} & the first letter of the first syllable of a score which is not the score initial & none\\
+ \stylename{firstsyllable} & the first syllable of the score excluding the score initial & none\\
+ \stylename{firstword} & the first word of the first score excluding the score initial & none\\
+ \stylename{modeline} & the rendered annotation from the \texttt{mode: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textsc{\textbf{Bold Small Capitals}}}\\
+ \stylename{nabc} & ancient notation & {\color{gregoriocolor}gregoriocolor} (\LaTeX)\\
+ && none (Plain \TeX)\\
\end{tabular}
+\end{adjustbox}
\footnotemark[1]\textit{Special:} By default, \texttt{additionalstafflines} inherits its properties from \texttt{normalstafflines}. To decouple these environments, you must manually change \texttt{additionalstafflines} using \texttt{\textbackslash grechangestyle}.
-\renewcommand{\thefootnote}{\arabic{footnote}}
+\renewcommand{\thefootnote}{\arabic{footnote}}\breakabletrue
\macroname{\textbackslash grechangestyle}{\{\#1\}\{\#2\}[\#3]}{gregoriotex.sty \textup{and} gregoriotex.tex}
Command to change styling of a score element.
\begin{argtable}
- \#1 & string & element whose styling is to be changed (see list above for options)\\
- \#2 & \TeX\ code & the code necessary to turn on the styling\\
- \#3 & \TeX\ code & Optional. The code necessary to turn off the styling (\eg, if the code to turn on the styling contains a \verb=\begin{environment}= then the code to turn it off must have the matching \verb=\end{environment}=.
+ \#1 & string & element whose styling is to be changed (see list above for options)\\
+ \#2 & \TeX\ code & the code necessary to turn on the styling\\
+ \#3 & \TeX\ code & Optional. The code necessary to turn off the styling (\eg, if the code to turn on the styling contains a \verb=\begin{environment}= then the code to turn it off must have the matching \verb=\end{environment}=.
\end{argtable}
Examples:\par\medskip
\begin{latexcode}
- % This one works for both PlainTeX and LaTeX this would make
- % the translations bold and italic
- \grechangestyle{translation}{\it\bf}
-
- % This one is LaTeX only, and would make the above lines
- % text small and italic
- \grechangestyle{abovelinetext}{\begin{small}\begin{italic}}%
- [\end{italic}\end{small}]
-
- % This would make the initial print in 36pt font.
- \grechangestyle{initial}{\fontsize{36}{36}\selectfont}
+ % This one works for both PlainTeX and LaTeX this would make
+ % the translations bold and italic
+ \grechangestyle{translation}{\it\bf}
+
+ % This one is LaTeX only, and would make the above lines
+ % text small and italic
+ \grechangestyle{abovelinetext}{\begin{small}\begin{italic}}%
+ [\end{italic}\end{small}]
+
+ % This would make the initial print in 36pt font.
+ \grechangestyle{initial}{\fontsize{36}{36}\selectfont}
\end{latexcode}
\bigskip
@@ -666,10 +665,10 @@ While the gabc headers provide support for some of the text elements commonly fo
Macro to add annotations (the text which appears above the initial) to a score. While a single call of the function does not support multiple lines, successive calls to the function will be added to the annotation as a new line below what is already there.
\begin{argtable}
- \#1 & c & When adding a new line, align the center of the new line with the center of the existing lines\\
- & l & When adding a new line, align the left side of the new line with the left side of the existing lines\\
- & r & When adding a new line, align the right side of the new line with the right side of the existing lines\\
- \#2 & string & the text of the annotation
+ \#1 & \texttt{c} & When adding a new line, align the center of the new line with the center of the existing lines\\
+ & \texttt{l} & When adding a new line, align the left side of the new line with the left side of the existing lines\\
+ & \texttt{r} & When adding a new line, align the right side of the new line with the right side of the existing lines\\
+ \#2 & string & the text of the annotation
\end{argtable}
\textbf{Nota Bene:} The first argument does not affect the alignment of lines already in the annotation, only the way the new line aligns with the existing lines as a whole.
@@ -678,7 +677,7 @@ Macro to add annotations (the text which appears above the initial) to a score.
Macro to add commentary (the text flush right at the top, usually a scripture reference) to a score. While a single call of this function does not support multiple lines, successive calls to the function will add a new line to the commentary directly below the previous.
\begin{argtable}
- \#1 & string & The text of the commentary.\\
+ \#1 & string & The text of the commentary.\\
\end{argtable}
\textbf{Nota Bene:} This command should appear directly before \verb=\gregorioscore= when used.
@@ -687,14 +686,14 @@ Macro to add commentary (the text flush right at the top, usually a scripture re
Macro to hold the score reference. Currently the score reference does not print.
\begin{argtable}
- \#1 & string & The text of the score reference.\\
+ \#1 & string & The text of the score reference.\\
\end{argtable}
\macroname{\textbackslash greillumination}{\{\#1\}}{gregoriotex-main.tex}
Macro to add an illuminated initial.
\begin{argtable}
- \#1 & \TeX\ code & the code necessary to make the illuminated initial appear\\
+ \#1 & \TeX\ code & the code necessary to make the illuminated initial appear\\
\end{argtable}
\textbf{Nota Bene:} Usually the argument of this command should be an \verb=\includegraphics= command, but you may use what ever you want as the illuminated initial.
@@ -713,9 +712,9 @@ Macro to set how the text of the lyrics aligns with the alignment point of its r
\end{itemize}
\begin{argtable}
- \#1 & vowel & The center of the vowel in the syllable will align with the alignment point of the neumes\\
- & syllable & The center of the syllable will align with the alignment point of the neumes\\
- & firstletter & The center of the first letter/character of the syllable will align with the alignment point of the neumes\\
+ \#1 & \texttt{vowel} & The center of the vowel in the syllable will align with the alignment point of the neumes\\
+ & \texttt{syllable} & The center of the syllable will align with the alignment point of the neumes\\
+ & \texttt{firstletter} & The center of the first letter/character of the syllable will align with the alignment point of the neumes\\
\end{argtable}
\textbf{Nota Bene:} What constitutes the ``vowel'' of the syllable is determined by the language the lyric text is written in, as specified by the use of the \texttt{language} header in the gabc file. Out of the box, Gregorio\TeX\ explicitly supports only Latin and English, but the rules for Latin have a high degree of overlap with many Romance languages, allowing them to fall back on the Latin rules with acceptable results.
@@ -728,8 +727,8 @@ Finally, in cases where you want some sort of exceptional alignment, you can for
Macro to specify how the translation text should be aligned with it respective syllable text.
\begin{argtable}
- \#1 & left & The translation text is left aligned with its respective syllable text.\\
- & center & The translation text is centered under its respective syllable.
+ \#1 & \texttt{left} & The translation text is left aligned with its respective syllable text.\\
+ & \texttt{center} & The translation text is centered under its respective syllable.
\end{argtable}
@@ -740,24 +739,24 @@ While Gregorio\TeX\ will automatically wrap scores to fit your page, there are s
Macro to determine whether line breaks are allowed inside a EUOUAE area (delimited by \texttt{<eu></eu>} tags in gabc).
\begin{argtable}
- \#1 & allow & Line breaks are allowed\\
- & prohibit & Line breaks are prohibited, the entire EUOUAE area should appear on one line
+ \#1 & \texttt{allow} & Line breaks are allowed\\
+ & \texttt{prohibit} & Line breaks are prohibited, the entire EUOUAE area should appear on one line
\end{argtable}
\macroname{\textbackslash gresetbreakintranslation}{\{\#1\}}{gregoriotex-main.tex}
Macro to determine whether line breaks are allowed inside a translation.
\begin{argtable}
- \#1 & allow & Line breaks are allowed\\
- & prohibit & Line breaks are prohibited, the entire translation should appear on one line
+ \#1 & \texttt{allow} & Line breaks are allowed\\
+ & \texttt{prohibit} & Line breaks are prohibited, the entire translation should appear on one line
\end{argtable}
\macroname{\textbackslash greseteolcustos}{\{\#1\}}{gregoriotex-main.tex}
Macro to determine whether Gregorio\TeX\ should automatically place the custos at a line break.
\begin{argtable}
- \#1 & auto & Custos will be automatically placed at each line break\\
- & manual & Custos will only be placed at line breaks if they are specified in the gabc (\eg \texttt{(g+z)})
+ \#1 & \texttt{auto} & Custos will be automatically placed at each line break\\
+ & \texttt{manual} & Custos will only be placed at line breaks if they are specified in the gabc (\eg \texttt{(g+z)})
\end{argtable}
\textbf{Nota Bene:} This command only effects the custos that appears at the end of a line. Custos which are placed at a key change are unaffected. Further, if custos are specified in the gabc file manually and Gregorio\TeX\ is set to place custos automatically, you will get two custos at the line breaks.
@@ -766,46 +765,53 @@ Macro to determine whether Gregorio\TeX\ should automatically place the custos a
Macro to determine whether Gregorio\TeX\ should apply a small shift at the end of each line which allows lyrics to stretch under the final custos.
\begin{argtable}
- \#1 & enable & The shifts are applied (default)\\
- & disable & The shifts are not applied.
+ \#1 & \texttt{enable} & The shifts are applied (default)\\
+ & \texttt{disable} & The shifts are not applied.
\end{argtable}
\macroname{\textbackslash gresetbolshifts}{\{\#1\}}{gregoriotex-main.tex}
Macro to determine whether Gregorio\TeX\ should apply a small shift at the beginning of each line so that lines are aligned on the notes rather than the syllable text.
\begin{argtable}
- \#1 & enable & The shifts are applied (default)\\
- & disable & The shifts are not applied.
+ \#1 & \texttt{enable} & The shifts are applied (default)\\
+ & \texttt{disable} & The shifts are not applied.
\end{argtable}
\macroname{\textbackslash gresetlastline}{\{\#1\}}{gregoriotex-main.tex}
Macro to determine whether the last line of the score should be justified or not.
\begin{argtable}
- \#1 & justified & Set the last line justified with the rest of the score\\
- & ragged & Set the last line ragged (default)
+ \#1 & \texttt{justified} & Set the last line justified with the rest of the score\\
+ & \texttt{ragged} & Set the last line ragged (default)
\end{argtable}
\subsubsection{Hyphenation}
\macroname{\textbackslash gresethyphen}{\{\#1\}}{gregoriotex-main.tex}
-Tell Gregorio\TeX\ to when to place a hyphen between
-syllables in polysyllabic words in a score. This is done by overriding \texttt{maximumspacewithoutdash} so subsequent changes to this dimension will override this command.
+Tells Gregorio\TeX\ how to place a hyphen between syllables in polysyllabic words in a score. This is done by overriding \texttt{maximumspacewithoutdash} so subsequent changes to this dimension will override this command.
\begin{argtable}
- \#1 & force & Hyphens will appear between all syllables in polysyllabic words.\\
- & auto & Hyphens will appear based on the setting of \texttt{maximumspacewithoutdash}
+ \#1 & \texttt{force} & Hyphens will appear between all syllables in polysyllabic words.\\
+ & \texttt{auto} & Hyphens will appear based on the setting of \texttt{maximumspacewithoutdash} (default)
\end{argtable}
\textbf{Nota Bene:} \verb=\gresethyphen{auto}= restores \texttt{maximumspacewithoutdash} to the value found in \textit{gsp-default.tex}. If you have changed your score size, you may need to change this distance to a more appropriate value using \verb=\grechangedim=.
+\macroname{\textbackslash gresetemptyfirstsyllablehyphen}{\{\#1\}}{gregoriotex-syllable.tex}
+Tells Gregorio\TeX\ how to place a hyphen after an empty first syllable (\ie, when the first syllable consists only of the big initial).
+
+\begin{argtable}
+ \#1 & \texttt{force} & A hyphen will appear after an empty first syllable. (default)\\
+ & \texttt{auto} & A hyphen will appear after an empty first syllable based on the setting of \texttt{maximumspacewithoutdash}
+\end{argtable}
+
\macroname{\textbackslash greseteolhyphen}{\{\#1\}}{gregoriotex-main.tex}
-Marco to determine how much space the hyphen at the end of a line occupies for the purposes of spacing caluclations.
+Marco to determine how much space the hyphen at the end of a line occupies for the purposes of spacing calculations (the visible appearance of the hyphen is unchanged).
\begin{argtable}
- \#1 & normal & The hyphen occupies its normal space\\
- & zero & The hyphen is considered to take up no space
+ \#1 & \texttt{normal} & The hyphen occupies its normal space\\
+ & \texttt{zero} & The hyphen is considered to take up no space
\end{argtable}
@@ -815,8 +821,8 @@ Marco to determine how much space the hyphen at the end of a line occupies for t
Macro to tell Gregorio\TeX\ whether the clefs should be printed or not.
\begin{argtable}
- \#1 & visible & Clefs will be printed (default)\\
- & invisible & Clefs will not be printed
+ \#1 & \texttt{visible} & Clefs will be printed (default)\\
+ & \texttt{invisible} & Clefs will not be printed
\end{argtable}
@@ -827,9 +833,9 @@ Since the center of the clivis is different from most neumes, Gregorio\TeX\ supp
Macro to determine the method used for aligning the clivis with its lyrics.
\begin{argtable}
- \#1 & always & Align on the real center of the clivis\\
- & never & align on the center of the first punctum in the clivis\\
- & special & align on the real center of the clivis except when (1) notes would go left of text or (2) - consonants after vowels are larger than \verb=\gre@dimen@clivisalignmentmin= (default)
+ \#1 & \texttt{always} & Align on the real center of the clivis\\
+ & \texttt{never} & align on the center of the first punctum in the clivis\\
+ & \texttt{special} & align on the real center of the clivis except when (1) notes would go left of text or (2) consonants after vowels are larger than \verb=\gre@dimen@clivisalignmentmin= (default)
\end{argtable}
@@ -844,13 +850,13 @@ harmonize (and thus match best) with greciliae, but they still look good
with the other score fonts.
\begin{argtable}
- \#1 & metapost & \MP{} will be used to render braces (default)\\
- & font & The score font will be used to render braces
+ \#1 & \texttt{metapost} & \MP{} will be used to render braces (default)\\
+ & \texttt{font} & The score font will be used to render braces
\end{argtable}
\macroname{\textbackslash grebarbracewidth}{}{gregoriotex-signs.tex}
Returns the em-relative width of a bar brace when braces are rendered by
-\MP{} (as opposed to fonts). The value is scaled by the gregorio score
+\MP{} (as opposed to fonts). The value is scaled by the Gregorio\TeX\ score
size factor and thus is a score-relative value with a precise (but
obscure) mathematical meaning. Suffice it to say that larger numbers
make the bar brace wider and smaller numbers make the brace narrower.
@@ -866,8 +872,8 @@ For a full description of how to make use of the ancient notation capabilities o
Macro to set the font to be used for the ancient notation.
\begin{argtable}
- \#1 & string & the name of the font\\
- \#2 & integer & point size at which the font should be loaded\\
+ \#1 & string & the name of the font\\
+ \#2 & integer & point size at which the font should be loaded\\
\end{argtable}
@@ -875,205 +881,212 @@ Macro to set the font to be used for the ancient notation.
Each of the following distances controls some aspect of the spacing of the Gregorio\TeX\ score. They are changed using \verb=\grechangedim=, documented above. If the distance permits a rubber value, then the default value will indicate the stretch and shrink (even if they are zero by default). Distances whose default value does not include a stretch or shrink may not take a rubber value.
-\emph{Note:} Because of the way Gregorio\TeX\ handles distances, these cannot be manipulated as if they were normal \TeX\ dimensions or skips. As a result they should only be changed using the command defined by Gregorio\TeX\ for this purpose.
+While it may seem strange that many of these distances are defined to 5 decimal places in centimeters (much smaller than most people can see) this is a legacy of how these distances were originally defined in small points. Since most people don’t know what small points are, the distances were converted to a unit more familiar to most people, but no rounding was applied to the conversions so that scores wouldn’t change their appearance as a result of the conversion. Users should feel under no obligation to maintain this level of precision when adjusting them to suit their own tastes.
+
+\textbf{Nota Bene:} Because of the way Gregorio\TeX\ handles distances, these cannot be manipulated as if they were normal \TeX\ dimensions or skips. As a result they should only be changed using the command defined by Gregorio\TeX\ for this purpose.
\macroname{additionallineswidth}{}{gsp-default.tex}
-The additional width of the additional lines (compared to the width of the glyph they're associated with).
+The additional width of the additional lines (\ie, the value added to the width of the glyph with which they're associated to get the width of the line).
Default: \unit[0.14584]{cm}
\macroname{alterationspace}{}{gsp-default.tex}
-Space between an alteration (flat or natural) and the next glyph.
+Space between an alteration (flat or natural) and the next glyph.
-Default: \unit[0.07747]{cm} plus \unit[0.01276]{cm} minus \unit[0.00455]{cm}
+Default: \unit[0.07747]{cm}
\macroname{beforealterationspace}{}{gsp-default.tex}
-When bolshifts are enabled, minimal space between a clef at the beginning of the line and a leading alteration glyph (should be larger than \texttt{clefflatspace} so that a flatted clef can be distinguished from a flat which is part of the first glyph on a line, but also smaller than \texttt{spaceafterlineclef}, the distance from the clef to the first notes).
+When beginning of line shifts (bolshifts) are enabled, minimum space between a clef at the beginning of the line and a leading alteration glyph. This distance should be larger than \texttt{clefflatspace} so that a flatted clef can be distinguished from a flat which is part of the first glyph on a line, but also smaller than \texttt{spaceafterlineclef}, the distance from the clef to the first notes.
-Default: $\unit[-0.32816]{cm}$ plus \unit[0.01093]{cm} minus \unit[0.01093]{cm}
+Default: \unit[0.1]{cm}
\macroname{beforelowchoralsignspace}{}{gsp-default.tex}
-Space before a low choral sign.
+Space before a low choral sign.
Default: \unit[0.04556]{cm} plus \unit[0.00638]{cm} minus \unit[0.00638]{cm}
\macroname{clefflatspace}{}{gsp-default.tex}
-Space between a clef and a flat (for clefs with flat).
+Space between a clef and a flat (for clefs with flat).
Default: \unit[0.05469]{cm} plus \unit[0.00638]{cm} minus \unit[0.00638]{cm}
\macroname{interglyphspace}{}{gsp-default.tex}
-Space between glyphs in the same element.
+Space between glyphs in the same element.
Default: \unit[0.06927]{cm} plus \unit[0.00363]{cm} minus \unit[0.00363]{cm}
\macroname{zerowidthspace}{}{gsp-default.tex}
-Null space.
+Null space.
Default: \unit[0]{cm} plus \unit[0]{cm} minus \unit[0]{cm}
\macroname{interelementspace}{}{gsp-default.tex}
-Space between elements.
+Space between elements.
Default: \unit[0.06927]{cm} plus \unit[0.00182]{cm} minus \unit[0.00363]{cm}
\macroname{largerspace}{}{gsp-default.tex}
-Larger space between elements.
+Larger space between elements.
Default: \unit[0.10938]{cm} plus \unit[0.01822]{cm} minus \unit[0.00911]{cm}
\macroname{glyphspace}{}{gsp-default.tex}
-Space between elements which has the size of a note.
+Space between elements which has the size of a note.
Default: \unit[0.21877]{cm} plus \unit[0.01822]{cm} minus \unit[0.01822]{cm}
\macroname{intersyllablespacenotes}{}{gsp-default.tex}
-Minimum space between two notes of different syllables.
+Minimum space between two notes of different syllables.
Default: \unit[0.25523]{cm} plus \unit[0.31903]{cm} minus \unit[0]{cm}
-\macroname{spacebeforecustos}{}{gsp-default.tex}
-Space before custos.
+\macroname{spacebeforeeolcustos}{}{gsp-default.tex}
+Space before custos at the end of a line.
Default: \unit[0.1823]{cm} plus \unit[0.31903]{cm} minus \unit[0.0638]{cm}
+\macroname{spacebeforeinlinecustos}{}{gsp-default.tex}
+Space before custos within a line.
+
+Default: \unit[0]{cm} plus \unit[0]{cm} minus \unit[0]{cm}
+
\macroname{spacebeforesigns}{}{gsp-default.tex}
-Space before punctum mora and augmentum duplex.
+Space before punctum mora and augmentum duplex.
Default: \unit[0.05469]{cm} plus \unit[0.00455]{cm} minus \unit[0.00455]{cm}
\macroname{spaceaftersigns}{}{gsp-default.tex}
-Space after punctum mora and augmentum duplex.
+Space after punctum mora and augmentum duplex.
Default: \unit[0.08203]{cm} plus \unit[0.0082]{cm} minus \unit[0.0082]{cm}
\macroname{spaceafterlineclef}{}{gsp-default.tex}
-Space after a clef at the beginning of a line.
+Space after a clef at the beginning of a line.
Default: \unit[0.27345]{cm} plus \unit[0.14584]{cm} minus \unit[0.01367]{cm}
\macroname{interwordspacenotes}{}{gsp-default.tex}
-Space after at the end of a word when the last written symbol is a note and the first is a note.
+Space after at the end of a word when the last written symbol is a note and the first is a note.
Default: \unit[0.29169]{cm} plus \unit[0.08751]{cm} minus \unit[0.05469]{cm}
\macroname{interwordspacetext}{}{gsp-default.tex}
-Space after at the end of a word when the last written symbol is text and the first is text.
+Space after at the end of a word when the last written symbol is text and the first is text.
Default: \unit[0.22787]{cm} plus \unit[0.41019]{cm} minus \unit[0.07292]{cm}
\macroname{interwordspacenotes@euouae}{}{gsp-default.tex}
-Space after at the end of a word when the last written symbol is a note and the first is a note in \texttt{euouae} blocks.
+Space after at the end of a word when the last written symbol is a note and the first is a note in \texttt{euouae} blocks.
Default: \unit[0.19]{cm} plus \unit[0.1]{cm} minus \unit[0.05]{cm}
\macroname{interwordspacetext@euouae}{}{gsp-default.tex}
-Space after at the end of a word when the last written symbol is text and the first is text in \texttt{euouae} blocks.
+Space after at the end of a word when the last written symbol is text and the first is text in \texttt{euouae} blocks.
Default: \unit[0.27]{cm} plus \unit[0.1]{cm} minus \unit[0.05]{cm}
\macroname{bitrivirspace}{}{gsp-default.tex}
-Space between notes of a bivirga or trivirga.
+Space between notes of a bivirga or trivirga.
Default: \unit[0.06927]{cm} plus \unit[0.00182]{cm} minus \unit[0.00546]{cm}
\macroname{bitristrospace}{}{gsp-default.tex}
-Space between notes of a bistropha or tristrophae.
+Space between notes of a bistropha or tristrophae.
Default: \unit[0.06927]{cm} plus \unit[0.00182]{cm} minus \unit[0.00546]{cm}
\macroname{punctuminclinatumshift}{}{gsp-default.tex}
-Space between two punctum inclinatum.
+Space between two punctum inclinatum.
Default: \unit[-0.03918]{cm} plus \unit[0.0009]{cm} minus \unit[0.0009]{cm}
\macroname{beforepunctainclinatashift}{}{gsp-default.tex}
-Space before puncta inclinata.
+Space before puncta inclinata.
Default: \unit[0.05286]{cm} plus \unit[0.00728]{cm} minus \unit[0.00455]{cm}
\macroname{punctuminclinatumanddebilisshift}{}{gsp-default.tex}
-Space between a punctum inclinatum and a punctum inclinatum deminutus.
+Space between a punctum inclinatum and a punctum inclinatum deminutus.
Default: \unit[-0.02278]{cm} plus \unit[0.0009]{cm} minus \unit[0.0009]{cm}
\macroname{punctuminclinatumdebilisshift}{}{gsp-default.tex}
-Space between two punctum inclinatum deminutus.
+Space between two punctum inclinatum deminutus.
Default: \unit[-0.00728]{cm} plus \unit[0.0009]{cm} minus \unit[0.0009]{cm}
\macroname{punctuminclinatumbigshift}{}{gsp-default.tex}
-Space between puncta inclinata, larger ambitus (range=3rd).
+Space between puncta inclinata, larger ambitus (range=3rd).
Default: \unit[0.07565]{cm} plus \unit[0.0009]{cm} minus \unit[0.0009]{cm}
\macroname{punctuminclinatummaxshift}{}{gsp-default.tex}
-Space between puncta inclinata, larger ambitus (range=4th -or more?-).
+Space between puncta inclinata, larger ambitus (range=4th -or more?-).
Default: \unit[0.17865]{cm} plus \unit[0.0009]{cm} minus \unit[0.0009]{cm}
\macroname{spacearoundsmallbar}{}{gsp-default.tex}
-Space around virgula and divisio minima.
+Space around virgula and divisio minima.
Default: \unit[0.1823]{cm} plus \unit[0.22787]{cm} minus \unit[0.05469]{cm}
\macroname{spacearoundminor}{}{gsp-default.tex}
-Space around divisio minor.
+Space around divisio minor.
Default: \unit[0.1823]{cm} plus \unit[0.22787]{cm} minus \unit[0.05469]{cm}
\macroname{spacearoundmaior}{}{gsp-default.tex}
-Space around divisio maior.
+Space around divisio maior.
Default: \unit[0.1823]{cm} plus \unit[0.22787]{cm} minus \unit[0.05469]{cm}
\macroname{spacearoundfinalis}{}{gsp-default.tex}
-Space around divisio finalis.
+Space around divisio finalis.
Default: \unit[0.1823]{cm} plus \unit[0.1823]{cm} minus \unit[0.05469]{cm}
\macroname{spacebeforefinalfinalis}{}{gsp-default.tex}
-A special space for finalis, for when it is the last glyph.
+A special space for finalis, for when it is the last glyph.
Default: \unit[0.29169]{cm} plus \unit[0.07292]{cm} minus \unit[0.27345]{cm}
\macroname{spacearoundclefbars}{}{gsp-default.tex}
-Additional space that will appear around bars that are preceded by a custos and followed by a key.
+Additional space that will appear around bars that are preceded by a custos and followed by a key.
Default: \unit[0.03645]{cm} plus \unit[0.00455]{cm} minus \unit[0.0009]{cm}
\macroname{textbartextspace}{}{gsp-default.tex}
-Space between the text and the text of the bar.
+Space between the text and the text of the bar.
Default: \unit[0.24611]{cm} plus \unit[0.13672]{cm} minus \unit[0.04921]{cm}
\macroname{notebarspace}{}{gsp-default.tex}
-Minimal space between a note and a bar.
+Minimal space between a note and a bar.
Default: \unit[0.31903]{cm} plus \unit[0.27345]{cm} minus \unit[0.02824]{cm}
\macroname{maximumspacewithoutdash}{}{gsp-default.tex}
-Maximal space between two syllables for which we consider a dash is not needed.
+Maximal space between two syllables for which we consider a dash is not needed.
Default: \unit[0.02005]{cm}
\macroname{afterclefnospace}{}{gsp-default.tex}
-An extensible space for the beginning of lines.
+An extensible space for the beginning of lines.
Default: \unit[0]{cm} plus \unit[0.27345]{cm} minus \unit[0]{cm}
\macroname{additionalcustoslineswidth}{}{gsp-default.tex}
-Width of the additional lines, used only for the custos. The width is the one for the custos at end of lines, the line for custos in the middle of a score is the same multiplied by 2.
+Width of the additional lines, used only for the custos. The width is the one for the custos at end of lines, the line for custos in the middle of a score is the same multiplied by 2.
Default: \unit[0.09114]{cm}
\macroname{afterinitialshift}{}{gsp-default.tex}
-Space between the initial and the beginning of the score.
+Space between the initial and the beginning of the score.
Default: \unit[0.2457]{cm} plus \unit[0]{cm} minus \unit[0]{cm}
\macroname{beforeinitialshift}{}{gsp-default.tex}
-Space between the initial and the beginning of the score.
+Space between the initial and the beginning of the score.
Default: \unit[0.2457]{cm} plus \unit[0]{cm} minus \unit[0]{cm}
@@ -1083,12 +1096,12 @@ Minimal space in front of the lyrics at the beginning of a line when \texttt{bol
Default: \unit[1.7]{cm}
\macroname{manualinitialwidth}{}{gsp-default.tex}
-Space to force the initial width to. Ignored when 0.
+Space to force the initial width to. Ignored when 0.
Default: \unit[0]{cm}
\macroname{annotationseparation}{}{gsp-default.tex}
-This space is the one between lines in the annotation (text above the initial).
+This space is the one between lines in the annotation (text above the initial).
Default: \unit[0.85]{cm}
@@ -1098,27 +1111,17 @@ Amount to raise (positive) or lower (negative) the annotation from it's normal p
Default: \unit[0]{cm}
\macroname{noclefspace}{}{gsp-default.tex}
-Space at the beginning of the lines if there is no clef.
+Space at the beginning of the lines if there is no clef.
Default: \unit[0.1]{cm}
-\macroname{abovesignsspace}{}{gsp-default.tex}
-Space above the chironomic signs.
-
-Default: \unit[0.8]{cm}
-
-\macroname{belowsignsspace}{}{gsp-default.tex}
-Space below the chironomic signs.
-
-Default: \unit[0]{cm}
-
\macroname{choralsigndownshift}{}{gsp-default.tex}
The distance to shift choral signs down. The following choral signs are shifted down:
\begin{itemize}
- \item Low choral signs that are not lower than the note
- \item High choral signs which are in a space
- \item Low choral signs that are lower than the note which are in a space
+ \item Low choral signs that are not lower than the note
+ \item High choral signs which are in a space
+ \item Low choral signs that are lower than the note which are in a space
\end{itemize}
Default: \unit[0.00911]{cm}
@@ -1127,49 +1130,49 @@ Default: \unit[0.00911]{cm}
The distance to shift choral signs up. The following choral signs are shifted up:
\begin{itemize}
- \item High choral signs which are on a line
- \item Low choral signs that are lower than the note which are on a line
+ \item High choral signs which are on a line
+ \item Low choral signs that are lower than the note which are on a line
\end{itemize}
Default: \unit[0.04556]{cm}
\macroname{translationheight}{}{gsp-default.tex}
-The space for the translation.
+The space for the translation.
Default: \unit[0.5]{cm}
\macroname{spaceabovelines}{}{gsp-default.tex}
-The space above the lines.
+The space above the lines.
Default: \unit[0.45576]{cm} plus \unit[0.36461]{cm} minus \unit[0.09114]{cm}
\macroname{spacelinestext}{}{gsp-default.tex}
-The space between the lines and the bottom of the text.
+The space between the lines and the bottom of the text.
Default: \unit[0.60617]{cm} plus \unit[0]{cm} minus \unit[0]{cm}
\macroname{spacebeneathtext}{}{gsp-default.tex}
-The space beneath the text.
+The space beneath the text.
Default: \unit[0]{cm} plus \unit[0]{cm} minus \unit[0]{cm}
\macroname{abovelinestextraise}{}{gsp-default.tex}
-Height of the text above the note line.
+Height of the text above the note line.
Default: \unit[1.7]{cm}
\macroname{abovelinestextheight}{}{gsp-default.tex}
-Height that is added at the top of the lines if there is text above the lines (it must be bigger than the text for it to be taken into consideration).
+Height that is added at the top of the lines if there is text above the lines (it must be bigger than the text for it to be taken into consideration).
Default: \unit[0.3]{cm}
\macroname{braceshift}{}{gsp-default.tex}
-An additional shift you can give to the brace above the bars.
+An additional shift you can give to the brace above the bars.
Default: \unit[0]{cm}
\macroname{curlybraceaccentusshift}{}{gsp-default.tex}
-A shift you can give to the accentus above the curly brace.
+A shift you can give to the accentus above the curly brace.
Default: $\unit[-0.05]{cm}$
@@ -1194,7 +1197,7 @@ Space around a clef change.
Default: \unit[0.01768]{cm} plus \unit[0.00175]{cm} minus \unit[0.01768]{cm}
\macroname{initialraise}{}{gsp-default.tex}
-Distance the initial will be raised by (by default the baseline for the initial coincides with the baseline for the text below the staff).
+Distance the initial will be raised above its default baseline. The default baseline for the initial coincides with the baseline for the text below the staff.
Default: \unit[0]{cm}
@@ -1260,7 +1263,7 @@ Default: 10001
\macroname{\textbackslash grenewlinepenalty}{}{gsp-default.tex}
Penalty to force a line break.
-Default: -10001
+Default: $-10001$
\macroname{\textbackslash grelooseness}{}{gsp-default.tex}
The \TeX\ looseness within a score.
@@ -1285,23 +1288,23 @@ Default: $-1$ (Lua\TeX\ versions prior to 0.80) or \verb=\pretolerance= (version
\subsection{Colors}\label{colors}
Colors are strictly a \LaTeX\ phenomena as currently implemented. All
-commands which change a color will raise a warning in Plain\TeX, but will not alter the document.
+commands which change a color will raise a warning in Plain \TeX, but will not alter the document.
All colors can be redefined using \verb=\definecolor=. See the
\verb=xcolor= package for documentation.
Example:\par\medskip
\begin{latexcode}
- \definecolor{gregoriocolor}{RGB}{229,53,44}
+ \definecolor{gregoriocolor}{RGB}{229,53,44}
\end{latexcode}
\macroname{grebackgroundcolor}{}{gregoriotex.sty}
The color Gregorio\TeX\ uses to block out elements which have been printed,
but shouldn't show (\eg, the staff line going through the interior of
-a punctum cavum) \verb={RGB}{255,255,255}= (white)
+a punctum cavum). The default is white.
\macroname{gregoriocolor}{}{gregoriotex.sty}
-A red similar to that found in liturgical documents. This is the color that Gregorio\TeX\ uses for text formated with \texttt{<c></c>} tags in gabc.
+A red similar to that found in liturgical documents. This is the color that Gregorio\TeX\ uses for text formatted with \texttt{<c></c>} tags in gabc.
%%% Local Variables:
%%% mode: latex
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex
new file mode 100644
index 00000000000..aff6c6b7ea6
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex
@@ -0,0 +1,889 @@
+% !TEX root = GregorioRef.tex
+% !TEX program = LuaLaTeX+se
+\section{Gregorio Controls}
+
+These functions are the ones written by gregorio to the gtex file.
+While one could, in theory, use/change them to alter the appearance of
+elements of the score, it is far better to make your changes in the
+gabc file and let gregorio make the changes to the gtex file.
+
+\macroname{\textbackslash GreAnnotationLines}{\#1\#2}{gregoriotex-main.tex}
+A wrapper macro for placing annotations above the initial. The
+arguments are provided by the \texttt{gabc} file in the
+\texttt{annotation} header field. This macro tests for the presence
+of the annotation box which means that the annotation is explicitly
+defined in the \texttt{main.tex} file. If so, this macro does nothing,
+respecting the annotation value in the \texttt{main.tex} file.
+
+\begin{argtable}
+ \#1 & string & First line text to place above the initial.\\
+ \#2 & string & Second line text to place above the initial.\\
+\end{argtable}
+
+\macroname{\textbackslash GreBeginScore}{\#1\#2\#3\#4\#5\#6}{gregoriotex-main.tex}
+Macro to start a score.
+
+\begin{argtable}
+ \#1 & string & a unique identifier for the score (currently an SHA-1-based digest of the gabc file)\\
+ \#2 & integer & the height number of the top pitch of the entire score, including signs\\
+ \#3 & integer & the height number of the bottom pitch of the entire score, including signs\\
+ \#4 & 0 & there is no translation line in the score\\
+ & 1 & there is a translation line somewhere in the score\\
+ \#5 & 0 & there is no above lines text in the score\\
+ & 1 & there is above lines text somewhere in the score\\
+ \#6 & string & the absolute filename of the gabc file if point-and-click is enabled.
+\end{argtable}
+
+\macroname{\textbackslash GreEndScore}{}{gregoriotex-main.tex}
+Macro to end a score.
+
+\macroname{\textbackslash GreAccentus}{\#1\#2}{gregoriotex-signs.tex}
+Macro for typesetting an accentus.
+
+\begin{argtable}
+ \#1 & integer & height number of episema\\
+ \#2 & string & Type of glyph the episema is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+\end{argtable}
+
+\macroname{\textbackslash GreAdditionalLine}{\#1\#2\#3}{gregoriotex-signs.tex}
+Macro to typeset the additional line above or below the staff.
+
+\begin{argtable}
+ \#1 & string & See \nameref{EpisemaSpecial}.\\
+ \#2 & integer & The ambitus of the porrectus or porrectus flexus if the first references these glyph types; ignored otherwise.\\
+ \#3 & integer & Set horizontal episema (0), horizontal episema under a note (1), line at top of staff (2), line at bottom of staff (3), choral sign (4).\\
+\end{argtable}
+
+\macroname{\textbackslash GreAdjustSecondLine}{}{gregoriotex.tex}
+%didn't actually find this one in gregoriotex-write.c, classified it here based on it’s related function GreAdjustThirdLine
+Macro to call before first syllable, but after \verb=\GreSetInitialClef=.
+
+\macroname{\textbackslash GreAdjustThirdLine}{}{gregoriotex-main.tex}
+Macro to call during the second line.
+
+\macroname{\textbackslash GreAugmentumDuplex}{\#1\#2\#3}{gregoriotex-signs.tex}
+Macro for typesetting an augmentum duplex (a pair of punctum mora)
+
+\begin{argtable}
+ \#1 & integer & Height number for first punctum mora.\\
+ \#2 & integer & Height number for second punctum mora.\\
+ \#3 & integer & First punctum mora occurs before last note of a podatus, prorectus, or toculus resupinus (1), or not (0).\\
+\end{argtable}
+
+\macroname{\textbackslash GreBarBrace}{\#1}{gregoriotex-signs.tex}
+Macro for typesetting a bar brace.
+
+\begin{argtable}
+ \#1 & string & Type of glyph the episema is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+\end{argtable}
+
+\macroname{\textbackslash GreBarSyllable}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-syllable.tex}
+Macro for typesetting a bar syllable.
+
+\begin{argtable}
+ \#1 & string & First part of syllable text associated with the bar.\\
+ \#2 & string & Middle part of the syllable text associated with the bar.\\
+ \#3 & string & End part of the syllable text associated with the bar.\\
+ \#4 & & Not used.\\
+ \#5 & \TeX\ code & Code to execute before calculating \texttt{nextbegindifference}.\\
+ \#6 & & Not used.\\
+ \#7 & $0 <$ integer $< 19$ & the type of notes alignment. See \nameref{notesalign}.\\
+ & $20 <$ integer $< 39$ & Same as below 20 except there is a flat before the notes. Subtract 20 to get the type of notes alignment.\\
+ & $40 <$ integer $< 59$ & Same as below 20 except there is a natural before the notes. Subtract 40 to get the type of notes alignment.\\
+ \#8 & \TeX\ code & Code to execute before printing anything.\\
+ \#9 & \TeX\ code & The bar line (usually a \textit{writebar} call).
+\end{argtable}
+
+\macroname{\textbackslash GreBarVEpisema}{\#1}{gregoriotex-signs.tex}
+Macro to typeset a vertical episema on a bar.
+
+\begin{argtable}
+ \#1 & string & Type of glyph the episema is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+\end{argtable}
+
+\macroname{\textbackslash GreBeginEUOUAE}{}{gregoriotex-main.tex}
+Macro to mark the beginning of a EUOUAE block. Alters spacings and prohibits a line break until the end of the block.
+
+\macroname{\textbackslash GreBeginNLBArea}{\#1\#2}{gregoriotex-main.tex}
+Macro called at beginning of a no line break area.
+
+\begin{argtable}
+ \#1 & \texttt{0} & Not in the neumes.\\
+ & \texttt{1} & In the neumes.\\
+ \#2 & \texttt{0} & Call didn't come from translation centering.\\
+ & \texttt{1} & Call came from translation centering.
+\end{argtable}
+
+\macroname{\textbackslash GreBeginNotes}{}{gregoriotex.tex}
+Macro to draw the staff lines. Comes after the initial but before the clef.
+
+\macroname{\textbackslash GreBold}{\#1}{gregoriotex.sty and gregoriotex.tex}
+Makes argument bold. Accesses \LaTeX\ \verb=\textbf= (\textit{gregoriotex.sty}) or Plain \TeX\ \verb=\bf= (\textit{gregoriotex.tex}) as appropriate. Corresponds to ``<b></b>'' tags in gabc.
+
+\begin{argtable}
+ \#1 & string & Text to be typeset in bold.\\
+\end{argtable}
+
+\macroname{\textbackslash GreChangeClef}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
+Macro called when key changes
+
+\begin{argtable}
+ \#1 & character & Type of new clef (c or f).\\
+ \#2 & integer & Line of new clef.\\
+ \#3 & \texttt{0} & Print space before clef.\\
+ & \texttt{1} & Do not print space before clef.\\
+ \#4 & integer & Height number of flat in key (\texttt{0} for no flat).\\
+\end{argtable}
+
+\macroname{\textbackslash GreCirculus}{\#1\#2}{gregoriotex-signs.tex}
+Macro for typesetting a circulus.
+
+\begin{argtable}
+ \#1 & integer & Height number of circulus.\\
+ \#2 & string & Type of glyph the circulus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+\end{argtable}
+
+\macroname{\textbackslash GreColored}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
+Colors argument (a string) in \verb=gregoriocolor.= Corresponds to ``<c></c>'' tags in gabc. Does nothing in Plain \TeX\ because color is not supported there.
+
+\macroname{\textbackslash GreCPVirgaReversaAscendensOnDLine}{\#1}{gregoriotex-main.tex}
+Allows the Dominican rule set to force long stems to be used for virga
+reversa ascendens neumes on the ``d'' (lowest) line. This macro is
+defined and re-defined by the \verb=\gresetgregoriofont= macro.
+
+\begin{argtable}
+ \#1 & \TeX{} code & The \TeX{} code to use when long stems are not forced.\\
+\end{argtable}
+
+\macroname{\textbackslash GreCP...}{}{gregoriotex-main.tex}
+A class of macros which point to the individual characters in a Gregoiro\TeX\ compatible font. This class of macros is dynamically mapped from the glyph names embedded in the \texttt{ttf} file via a Lua script to ensure that the code points match up with the installed font.
+
+\macroname{\textbackslash GreCustos}{\#1}{gregoriotex-signs.tex}
+Typesets a custos.
+
+\begin{argtable}
+ \#1 & integer & Height number of custos.\\
+\end{argtable}
+
+\macroname{\textbackslash GreDagger}{}{gregoriotex-symbols.tex}
+Macro to typeset a dagger (\GreDagger).
+
+\macroname{\textbackslash GreDiscretionary}{\#1\#2\#3}{gregoriotex-signs.tex}
+A Gregorio\TeX-specific discretionary. Currently only used to avoid clef change at beginning or end of line, or even with more complex data (z0::c3 for instance). We require a special function because in the normal discretionary function you cannot use \verb=\hskip= (but you can use \verb=\kern=) and you cannot use \verb=\penalty= (which is useless indeed). This macro corrects for these two limitations. The first argument allows to select the penalty assigned to the discretionary by recent version of Lua\TeX.
+
+\begin{argtable}
+ \#1 & integer & Type of discretionary (for penalty assignment). Currently possible value is 0 for clef change discretionaries.\\
+ \#2 & \TeX\ code & First argument of resulting \verb=\discretionary=.\\
+ \#3 & \TeX\ code & Third argument of resulting \verb=\discretionary=.\\
+\end{argtable}
+
+\macroname{\textbackslash GreDivisioFinalis}{\#1}{gregoriotex-signs.tex}
+Macro to typeset a divisio finalis.
+
+\begin{argtable}
+ \#1 & \TeX\ code & Macros which may happen before the skip but after the divisio finalis (typically \verb=\grevepisema=).\\
+\end{argtable}
+
+\macroname{\textbackslash GreDivisioMaior}{\#1}{gregoriotex-signs.tex}
+Macro to typeset a divisio maior.
+
+\begin{argtable}
+ \#1 & \TeX\ code & Macros which may happen before the skip but after the divisio maior (typically \verb=\grevepisema=).\\
+\end{argtable}
+
+\macroname{\textbackslash GreDivisioMinima}{\#1}{gregoriotex-signs.tex}
+Macro to typeset a divisio minima.
+
+\begin{argtable}
+ \#1 & \TeX\ code & Macros which may happen before the skip but after the divisio minima (typically \verb=\grevepisema=).\\
+\end{argtable}
+
+\macroname{\textbackslash GreDivisioMinor}{\#1}{gregoriotex-signs.tex}
+Macro to typeset a divisio minor.
+
+\begin{argtable}
+ \#1 & \TeX\ code & Macros which may happen before the skip but after the divisio minor (typically \verb=\grevepisema=).\\
+\end{argtable}
+
+\macroname{\textbackslash GreDominica}{\#1\#2}{gregoriotex-signs.tex}
+Macro to typeset a dominican bar.
+
+\begin{argtable}
+ \#1 & \texttt{1}--\texttt{6} & Type of dominican bar. Corresponds to bar types 6--11 in \verb=\grewritebar=.\\
+ \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio dominica (typically \verb=\grevepisema=).\\
+\end{argtable}
+
+\macroname{\textbackslash GreEndEUOUAE}{\#1}{gregoriotex-main.tex}
+Macro to mark the end of a EUOUAE block.
+
+\begin{argtable}
+ \#1 & \texttt{0} & ending element\\
+ & \texttt{1} & ending syllable\\
+ & \texttt{2} & ending score\\
+ & \texttt{3} & before bar
+\end{argtable}
+
+\macroname{\textbackslash GreEndOfElement}{\#1\#2}{gregoriotex-main.tex}
+Macro to end elements.
+
+\begin{argtable}
+ \#1 & \texttt{0} & Default space.\\
+ & \texttt{1} & Larger space.\\
+ & \texttt{2} & Glyph space.\\
+ & \texttt{3} & Zero-width space.\\
+ \#2 & \texttt{0} & Space is breakable.\\
+ & \texttt{1} & Space is unbreakable.\\
+\end{argtable}
+
+\macroname{\textbackslash GreEndNLBArea}{\#1\#2}{gregoriotex-main.tex}
+Macro to end a no line break area.
+
+\begin{argtable}
+ \#1 & 0 & ending element\\
+ & \texttt{1} & ending syllable\\
+ & \texttt{2} & ending score\\
+ & \texttt{3} & before bar\\
+ \#2 & \texttt{0} & ??\\ %I can’t tell what this flag is for
+ & else & ??
+\end{argtable}
+
+\macroname{\textbackslash GreEndOfGlyph}{\#1}{gregoriotex-main.tex}
+Macro to end a glyph without ending the element.
+
+\begin{argtable}
+ \#1 & \texttt{0} & Default space.\\
+ & \texttt{1} & Zero-width space.\\
+ & \texttt{2} & Space between flat or natural and a note.\\
+ & \texttt{3} & Space between two puncta inclinata.\\
+ & \texttt{4} & Space between bivirga or trivirga.\\
+ & \texttt{5} & space between bistropha or tristropha.\\
+ & \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
+ & \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis.\\
+ & \texttt{8} & Space between two puncta inclinata debilis.\\
+ & \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
+ & \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\
+ & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).\\
+\end{argtable}
+
+\macroname{\textbackslash GreFinalCustos}{\#1}{gregoriotex-signs.tex}
+Typesets a custos after the final bar in a score.
+
+\begin{argtable}
+ \#1 & integer & Height number of custos.\\
+\end{argtable}
+
+\macroname{\textbackslash GreFinalDivisioFinalis}{\#1}{gregoriotex-signs.tex}
+Macro to end a score with a divisio finalis.
+
+\begin{argtable}
+ \#1 & \texttt{0} & Something does not need to be placed after the divisio finalis.\\
+ & \texttt{1} & Something needs to be placed after the divisio finalis.\\
+\end{argtable}
+
+\macroname{\textbackslash GreFinalDivisioMaior}{\#1}{gregoriotex-signs.tex}
+Macro to end a score with a divisio maior.
+
+\begin{argtable}
+ \#1 & \texttt{0} & Something does not need to be placed after the divisio maior.\\
+ & \texttt{1} & Something needs to be placed after the divisio maior.\\
+\end{argtable}
+
+\macroname{\textbackslash GreFirstSyllable}{\#1}{gregoriotex-syllable.tex}
+A macro which is called with the text of the first syllable, excluding the
+initial of the score. This macro may be redefined to style the first syllable
+appropriately. This macro may be called up to three times: for the letters
+before the centered letters, for the centered letters, and for the letters
+after the centered letters.
+
+\begin{argtable}
+ \#1 & string & Text from the first syllable.
+\end{argtable}
+
+\macroname{\textbackslash GreFirstSyllableInitial}{\#1}{gregoriotex-syllable.tex}
+A macro which is called with the first letter of the first syllable which is
+not the initial of the score. If the \texttt{initial-style} is \texttt{0}, the
+first letter of the syllable will be passed. If the \texttt{initial-style} is
+\texttt{1} or \texttt{2}, the \emph{second} letter will be passed. This macro
+may be redefined to style the first letter appropriately.
+
+\begin{argtable}
+ \#1 & string & The first letter of the first syllable which is not the
+ initial of the score.
+\end{argtable}
+
+\macroname{\textbackslash GreFirstWord}{\#1}{gregoriotex-syllable.tex}
+A macro which is called with the text of the first word, excluding the
+initial of the score. This macro may be redefined to style the first word
+appropriately. This macro may be called multiple times, depending on how
+many syllables are in the word.
+
+\begin{argtable}
+ \#1 & string & Text from the first word.
+\end{argtable}
+
+\macroname{\textbackslash GreFlat}{\#1\#2}{gregoriotex-signs.tex}
+Macro to typeset a flat.
+
+\begin{argtable}
+ \#1 & integer & Height number of the flat.\\
+ \#2 & \texttt{0} & No flat for a key change.\\
+ & \texttt{1} & Indicates the flat for a key change.\\
+\end{argtable}
+
+\macroname{\textbackslash GreForceHyphen}{}{gregoriotex-syllable.tex}
+Macro that indicates that a hyphen should be forced (if enabled) after the given syllable.
+
+\macroname{\textbackslash GreFuseTwo}{\#1\#2}{gregoriotex-main.tex}
+Macro for fusing two glyphs to create a larger neume.
+
+\begin{argtable}
+ \#1 & Gregorio\TeX\ glyph & The first glyph in the sequence.\\
+ \#2 & Gregorio\TeX\ glyph & The second.
+\end{argtable}
+
+\macroname{\textbackslash GreGlyph}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-syllable.tex}
+Macro to typeset a glyph.
+
+\begin{argtable}
+ \#1 & character & the character that it must call\\
+ \#2 & integer & The number for where the glyph is located. \texttt{a} in gabc is 1, \texttt{b} is 2, \etc\\
+ \#3 & integer & height number of the next note\\
+ \#4 & \texttt{0} & One-note glyph or more than two notes glyph except porrectus: \ie, we must put the aligncenter in the middle of the first note\\
+ & \texttt{1} & Two notes glyph (podatus is considered as a one-note glyph): \ie, we put the aligncenter in the middle of the glyph\\
+ & \texttt{2} & Porrectus: has a special align center.\\
+ & \texttt{3} & initio-debilis : same as 1 but the first note is much smaller\\
+ & \texttt{4} & case of a glyph starting with a quilisma\\
+ & \texttt{5} & case of a glyph starting with an oriscus\\
+ & \texttt{6} & case of a punctum inclinatum\\
+ & \texttt{7} & case of a stropha\\
+ & \texttt{8} & flexus with an ambitus of one\\
+ & \texttt{9} & flexus deminutus\\
+ \#5 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
+ \#6 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
+ \#7 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled
+\end{argtable}
+
+\macroname{\textbackslash GreGlyphHeights}{\#1\#2}{gregoriotex-syllable.tex}
+Passes the glyph height limits.
+
+\begin{argtable}
+ \#1 & integer & the high height\\
+ \#2 & integer & the low height
+\end{argtable}
+
+\macroname{\textbackslash GregorioTeXAPIVersion}{\#1}{gregoriotex-main.tex}
+Checks to see if Gregorio\TeX\ API is version specified by argument (and
+therefore compatible with the score.
+
+\begin{argtable}
+ \#1 & string & Version number for Gregorio\TeX.\\
+\end{argtable}
+
+\macroname{\textbackslash GreHEpisema}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset an horizontal episema.
+
+\begin{argtable}
+ \#1 & integer & Height number of the episema.\\
+ \#2 & string & See \nameref{EpisemaSpecial}.\\
+ \#3 & integer & The ambitus for a two note episema at the diagonal stroke of a
+ porrectus, porrectus flexus, orculus resupinus, or torculus resupinus
+ flexus.\\
+ \#4 & \texttt{0} & an horizontal episema\\
+ & \texttt{1} & an horizontal episema under a note\\
+ & \texttt{2} & a line at the top\\
+ & \texttt{3} & a line at the bottom\\
+ \#5 & \texttt{f} & a normal episema\\
+ & \texttt{l} & a small episema aligned left\\
+ & \texttt{c} & a small episema aligned center\\
+ & \texttt{r} & a small episema aligned right\\
+ \#6 & integer & Replacement for \#1 if a bridge causes a height substitution.\\
+\end{argtable}
+
+\macroname{\textbackslash GreHEpisemaBridge}{\#1\#2\#3}{gregoriotex-signs.tex}
+Macro to typeset a bridge episema for the last note of a glyph
+(element, syllable) if the next episema is at the same height.
+
+\begin{argtable}
+ \#1 & integer & Height number of the episema.\\
+ \#2 & \texttt{0} & Episema above the note.\\
+ & \texttt{1} & Episema below the note.\\
+ \#3 & \texttt{0} & Default space.\\
+ & \texttt{1} & Zero-width space.\\
+ & \texttt{2} & Space between flat or natural and a note.\\
+ & \texttt{3} & Space between two puncta inclinata.\\
+ & \texttt{4} & Space between bivirga or trivirga.\\
+ & \texttt{5} & space between bistropha or tristropha.\\
+ & \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
+ & \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis.\\
+ & \texttt{8} & Space between two puncta inclinata debilis.\\
+ & \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
+ & \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\
+ & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).
+\end{argtable}
+
+\macroname{\textbackslash GreHighChoralSign}{\#1\#2\#3}{gregoriotex-signs.tex}
+Macro for typesetting high choral signs.
+
+\begin{argtable}
+ \#1 & integer & Height number of the sign.\\
+ \#2 & string & The choral sign.\\
+ \#3 & \texttt{0} & Choral sign does not occur before last note of podatus, porrectus, or torculus resupinus.\\
+ & \texttt{1} & Choral sign occurs before last note of podatus, porrectus, or torculus resupinus.\\
+\end{argtable}
+
+\macroname{\textbackslash GreHyph}{}{gregoriotex-main.tex}
+Macro used for end of line hyphens. Defaults to \verb=\gre@char@normalhyph=.
+
+\macroname{\textbackslash GreInDivisioFinalis}{\#1}{gregoriotex-signs.tex}
+Same as \verb=\GreDivisioFinalis= except inside a syllable.
+
+\macroname{\textbackslash GreInDivisioMaior}{\#1}{gregoriotex-signs.tex}
+Same as \verb=\GreDivisioMaior= except inside a syllable.
+
+\macroname{\textbackslash GreInDivisioMinima}{\#1}{gregoriotex-signs.tex}
+Same as \verb=\GreDivisioMinima= except inside a syllable.
+
+\macroname{\textbackslash GreInDivisioMinor}{\#1}{gregoriotex-signs.tex}
+Same as \verb=\GreDivisioMinor= except inside a syllable.
+
+\macroname{\textbackslash GreInDominica}{\#1\#2}{gregoriotex-signs.tex}
+Same as \verb=\GreDominica= except inside a syllable.
+
+\macroname{\textbackslash GreInVirgula}{\#1\#2}{gregoriotex-signs.tex}
+Same as \verb=\GreVirgula= except inside a syllable.
+
+\macroname{\textbackslash GreItalic}{\#1}{gregoriotex.sty or gregoriotex.tex}
+Makes argument (a string) italic. Accesses \LaTeX\ \verb=\textit= or
+Plain \TeX\ \verb=\it= as appropriate. Corresponds to ``<i></i>'' tags
+in gabc.
+
+\begin{argtable}
+ \#1 & string & Text to be typeset in italic font.\\
+\end{argtable}
+
+\macroname{\textbackslash GreLastOfLine}{}{gregoriotex-main.tex}
+Macro to set \verb=\gre@lastoflinecount= to 1 (\ie, mark that this syllable is the last of the line).
+
+\macroname{\textbackslash GreLastOfScore}{}{gregoriotex-main.tex}
+Macro to mark the syllable as the last of the score.
+
+\macroname{\textbackslash GreLinea}{\#1\#2\#3}{gregoriotex-signs.tex}
+Macro for typesetting a linea.
+
+\begin{argtable}
+ \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+ \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+ \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+\end{argtable}
+
+\macroname{\textbackslash GreLineaPunctumCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset a linea punctum cavum.
+
+\begin{argtable}
+ \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+ \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+ \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+ \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
+ \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+ \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+\end{argtable}
+
+\macroname{\textbackslash GreLowChoralSign}{\#1\#2\#3}{gregoriotex-signs.tex}
+Macro for typesetting low choral signs.
+
+\begin{argtable}
+ \#1 & integer & Height number of the sign.\\
+ \#2 & string & The choral sign.\\
+ \#3 & \texttt{0} & Choral sign does not occur before last note of podatus, porrectus, or torculus resupinus.\\
+ & \texttt{1} & Choral sign occurs before last note of podatus, porrectus, or torculus resupinus.\\
+\end{argtable}
+
+\macroname{\textbackslash GreMode}{\#1}{gregoriotex-main.tex}
+If the gabc file contains a mode in the header, then this function
+places said mode as the first (top) annotation. If the user has
+manually added a first annotation in the \TeX\ file, then this
+function does nothing. Also, if the \texttt{annotation} header field
+is used, then this function does nothing.
+
+\begin{argtable}
+ \#1 & \texttt{1}--\texttt{8} & The mode. Other values are ignored.\\
+\end{argtable}
+
+\macroname{\textbackslash GreNatural}{\#1\#2}{gregoriotex-signs.tex}
+Macro to typeset a natural.
+
+\begin{argtable}
+ \#1 & integer & Height number of the natural.\\
+ \#2 & \texttt{0} & No flat for a key change.\\
+ & \texttt{1} & Indicates the flat for a key change.\\
+\end{argtable}
+
+\macroname{\textbackslash GreNewLine}{}{gregoriotex-main.tex}
+Macro to call if you want to go to the next line.
+
+\macroname{\textbackslash GreNewParLine}{}{gregoriotex-main.tex}
+Same as \verb=\GreNewLine= except line is not justified.
+
+\macroname{\textbackslash GreNextCustos}{\#1}{gregoriotex-signs.tex}
+Sets the pitch to use for the next custos if it were to happen at the point
+where this macro is called.
+
+\begin{argtable}
+ \#1 & integer & Height number of the custos.\\
+\end{argtable}
+
+\macroname{\textbackslash GreNoInitial}{}{gregoriotex-main.tex}
+Macro called when no initial is being set.
+
+\macroname{\textbackslash GreOverBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
+Macro to typeset a round brace above the lines.
+
+\begin{argtable}
+ \#1 & length & The width of the brace.\\
+ \#2 & length & A vertical shift.\\
+ \#3 & length & A horizontal shift.\\
+ \#4 & \texttt{0} & Don't shift before starting the brace.\\
+ & \texttt{1} & Shift back a punctum's width before starting the brace.
+\end{argtable}
+
+\macroname{\textbackslash GreOverCurlyBrace}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
+Macro to typeset a curly brace above the lines.
+
+\begin{argtable}
+ \#1 & length & The width of the brace.\\
+ \#2 & length & A vertical shift.\\
+ \#3 & length & A horizontal shift.\\
+ \#4 & \texttt{0} & Don't shift before starting the brace.\\
+ & \texttt{1} & Shift back a punctum's width before starting the brace.\\
+ \#5 & \texttt{0} & No accentus above the brace.\\
+ & \texttt{1} & Typeset an accentus above the brace.
+\end{argtable}
+
+\macroname{\textbackslash GrePunctumCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset a punctum cavum.
+
+\begin{argtable}
+ \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+ \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+ \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+ \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
+ \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+ \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+\end{argtable}
+
+\macroname{\textbackslash GrePunctumCavumInclinatum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset a punctum cavum inclinatus.
+
+\begin{argtable}
+ \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+ \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+ \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+ \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
+ \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+ \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+\end{argtable}
+
+\macroname{\textbackslash GrePunctumCavumInclinatumAuctus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset a punctum cavum inclinatus auctus.
+
+\begin{argtable}
+ \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+ \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+ \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+ \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
+ \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+ \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+\end{argtable}
+
+\macroname{\textbackslash GrePunctumMora}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
+Macro for typesetting punctum mora.
+
+\begin{argtable}
+ \#1 & integer & Height number of punctum mora.\\
+ \#2 & \texttt{1} & Go back to end of punctum.\\
+ & \texttt{2} & Shift left width of 1 punctum.\\
+ & \texttt{3} & Shift left width of 1 punctum and ambitus of 1.\\
+ \#3 & \texttt{0} & Punctum mora does not occur before last note of podatus, porrectus, or torculus resupinus.\\
+ & \texttt{1} & Punctum mora occurs before last note of podatus, porrectus, or torculus resupinus.\\
+ \#4 & \texttt{0} & No punctum inclinatum.\\
+ & \texttt{1} & Punctum inclinatum.\\
+\end{argtable}
+
+\macroname{\textbackslash GreReversedAccentus}{\#1\#2}{gregoriotex-signs.tex}
+Macro for typesetting a reversed accentus.
+
+\begin{argtable}
+ \#1 & integer & Height number of accentus.\\
+ \#2 & string & Type of glyph the accentus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+\end{argtable}
+
+\macroname{\textbackslash GreReversedSemicirculus}{\#1\#2}{gregoriotex-signs.tex}
+Macro for typesetting a reversed semicirculus.
+
+\begin{argtable}
+ \#1 & integer & Height number of semicirculus.\\
+ \#2 & string & Type of glyph the semicirculus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+\end{argtable}
+
+\macroname{\textbackslash GreScoreReference}{\#1}{gregoriotex-main.tex}
+Currently does nothing.
+
+\macroname{\textbackslash GreSemicirculus}{\#1\#2}{gregoriotex-signs.tex}
+Macro for typesetting a semicirculus.
+
+\begin{argtable}
+ \#1 & integer & Height number of semicirculus.\\
+ \#2 & string & Type of glyph the semicirculus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+\end{argtable}
+
+\macroname{\textbackslash GreSetBigInitial}{}{gregoriotex-main.tex}
+Macro which indicates that a 2-line initial is desired.
+
+\macroname{\textbackslash GreSetFixedNextTextFormat}{\#1}{gregoriotex-syllable.tex}
+Same as \verb=\GreSetFixedTextFormat= except for next syllable.
+
+\macroname{\textbackslash GreSetFixedTextFormat}{\#1}{gregoriotex-syllable.tex}
+Macro to specify a text which is different from \verb=#1#2#3= (of \verb=\GreSyllable=). It is useful for styles, for instance with:
+\par\medskip
+\begin{gabccode}
+ <i>ffj</i>(gh)
+\end{gabccode}
+
+we will have
+
+\begin{latexcode}
+ #1 = \textit{f}
+ #2 = \textit{f}
+ #3 = \textit{j}
+\end{latexcode}
+
+and thus \verb=#1#2#3= will be \verb=\textit{f}\textit{f}\textit{j}=, which won't typeset
+ligatures. In this example we should call \verb=\grefixedtext{\textit{ffj}}=.
+
+\begin{argtable}
+ \#1 & \texttt{0} & nothing (normal text)\\
+ & \texttt{1}& italic\\
+ & \texttt{2} & bold\\
+ & \texttt{3} & small caps\\
+ & \texttt{4} & typewriter\\
+ & \texttt{5} & underline
+\end{argtable}
+
+\macroname{\textbackslash GreSetInitial}{\#1}{gregoriotex-main.tex}
+Macro to set the initial in the score.
+
+\begin{argtable}
+ \#1 & character & The initial letter of the score.\\
+\end{argtable}
+
+\macroname{\textbackslash GreSetInitialClef}{\#1\#2\#3}{gregoriotex-signs.tex}
+Macro for writing initial key.
+
+\begin{argtable}
+ \#1 & \texttt{c} or \texttt{f} & Type of clef.\\
+ \#2 & \texttt{1}--\texttt{4} & Line of key.\\
+ \#3 & integer & Height number of flat in key (\texttt{0} for no flat).\\
+\end{argtable}
+
+\macroname{\textbackslash GreSetLinesClef}{\#1\#2\#3\#4}{gregoriotex-main.tex}
+Macro to define the clef that will appear at the beginning of the lines.
+
+\begin{argtable}
+ \#1 & \texttt{c} or \texttt{f} & Type of clef.\\
+ \#2 & \texttt{1}--\texttt{4} & Line of key.\\
+ \#3 & \texttt{0} & No space after clef.\\
+ & \texttt{1} & Space after clef.\\
+ \#4 & integer & Height of flat in key (\texttt{0} for no flat).\\
+\end{argtable}
+
+\macroname{\textbackslash GreSetNextSyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
+Macro to set the text of the next syllable for spacing purposes.
+
+\begin{argtable}
+ \#1 & string & the first letters of the syllable, that don't count for the alignment\\
+ \#2 & string & the middle letters of the syllable, we must align in the middle of them\\
+ \#3 & string & the end letters, they don't count for alignment\\
+\end{argtable}
+
+\macroname{\textbackslash GreSetTextAboveLines}{\#1}{gregoriotex-main.tex}
+Macro to place argument above the lines and empty
+\verb=\gre@currenttextabovelines= when done.
+
+\begin{argtable}
+ \#1 & string & Text to be placed above the lines.\\
+\end{argtable}
+
+\macroname{\textbackslash GreSetThisSyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
+Macro to set the text of the current syllable.
+
+\begin{argtable}
+ \#1 & string & the first letters of the syllable, that don't count for the alignment\\
+ \#2 & string & the middle letters of the syllable, we must align in the middle of them\\
+ \#3 & string & the end letters, they don't count for alignment\\
+\end{argtable}
+
+\macroname{\textbackslash GreSharp}{\#1\#2}{gregoriotex-signs.tex}
+Macro to typeset a sharp.
+
+\begin{argtable}
+ \#1 & integer & Height number of the sharp.\\
+ \#2 & \texttt{0} & No flat for a key change.\\
+ & \texttt{1} & Indicates the flat for a key change.\\
+\end{argtable}
+
+\macroname{\textbackslash GreSmallCaps}{\#1}{gregoriotex.sty and gregoriotex.tex}
+Makes argument small capitals. Accesses \LaTeX\ \verb=\textsc= or
+Plain \TeX\ \verb=\sc= as appropriate Corresponds to ``<sc></sc>'' tags
+in gabc.
+
+\begin{argtable}
+ \#1 & string & Text to be typeset in small caps font.\\
+\end{argtable}
+
+\macroname{\textbackslash GreStar}{}{gregoriotex-symbol.tex}
+Macro to typeset an asterisk (\GreStar).
+
+\macroname{\textbackslash GreSyllable}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-syllable.tex}
+Macro to typeset the syllable.
+
+\begin{argtable}
+ \#1 & \TeX\ code & macro setting syllable letters for the current syllable\\
+ \#2 & empty & reserved for future use\\
+ \#3 & \TeX\ control sequence & the control sequence to use for styling the hyphen\\
+ \#4 & \texttt{0} & this syllable is not the end of a word\\
+ & \texttt{1} & this syllable is the end of a word\\
+ \#5 & \TeX\ code & macros setting syllable letters for the next syllable\\
+ \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
+ \#7 & & alignment type of the first next glyph\\
+ \#8 &\TeX\ code & other macros (translation, double text, etc.) that don't fit in the limitation of the number of arguments\\
+ \#9 & Gregorio\TeX\ glyphs & all the notes
+\end{argtable}
+
+\macroname{\textbackslash GreTilde}{}{gregoriotex-main.tex}
+Macro to print $\sim$.
+
+\macroname{\textbackslash GreTranslationCenterEnd}{}{gregoriotex-main.tex}
+Macro to end the centering of the translation text.
+
+\macroname{\textbackslash GreTypewriter}{\#1}{gregoriotex.sty and gregoriotex.tex}
+Makes argument typewriter font. Accesses \LaTeX\ \verb=\texttt= or
+Plain \TeX\ \verb=\tt= as appropriate.
+
+\begin{argtable}
+ \#1 & string & Text to typeset in typewriter font.\\
+\end{argtable}
+
+\macroname{\textbackslash GreUnderBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
+Macro to typeset a round brace below the lines.
+
+\begin{argtable}
+ \#1 & length & The width of the brace.\\
+ \#2 & length & A vertical shift.\\
+ \#3 & length & A horizontal shift.\\
+ \#4 & \texttt{0} & Don't shift before starting the brace.\\
+ & \texttt{1} & Shift back a punctum's width before starting the brace.
+\end{argtable}
+
+\macroname{\textbackslash GreUnderline}{\#1}{gregoriotex.sty and gregoriotex.tex}
+Makes argument underlined under \LaTeX\ using \verb=\underline=. Does
+nothing in Plain \TeX.
+
+\begin{argtable}
+ \#1 & string & Text to typeset underlined.\\
+\end{argtable}
+
+\macroname{\textbackslash GreUnstyled}{\#1}{gregoriotex-syllable.tex}
+Returns its argument as-is.
+
+\begin{argtable}
+ \#1 & string & Text to typeset without any extra styling.\\
+\end{argtable}
+
+\macroname{\textbackslash GreVarBraceLength}{\#1}{gregoriotex-signs.tex}
+Returns the computed length of the given brace.
+
+\begin{argtable}
+ \#1 & string & unique identifier for the brace within the score.
+\end{argtable}
+
+\macroname{\textbackslash GreVarBraceSavePos}{\#1\#2\#3}{gregoriotex-signs.tex}
+Records positions to compute the lengths of variable-sized braces.
+
+\begin{argtable}
+ \#1 & string & unique identifier for the brace within the score.\\
+ \#2 & \texttt{0} & Don't shift before recording the position.\\
+ & \texttt{1} & Shift back a punctum's width before recording the position.\\
+ \#3 & \texttt{1} & Position to save is the start of brace.\\
+ & \texttt{2} & Position to save is the end of brace.
+\end{argtable}
+
+\macroname{\textbackslash GreVEpisema}{\#1\#2}{gregoriotex-signs.tex}
+Macro for typesetting the vertical episema.
+
+\begin{argtable}
+ \#1 & integer & Height number of episema.\\
+ \#2 & string & Type of glyph the episema is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+\end{argtable}
+
+\macroname{\textbackslash GreVirgula}{\#1}{gregoriotex-signs.tex}
+Macro to typeset a virgula.
+
+\begin{argtable}
+ \#1 & code & Macros which may happen before the skip but after the virgula (typically \verb=\grevepisema=).\\
+\end{argtable}
+
+\macroname{\textbackslash GreWriteTranslation}{\#1}{gregoriotex-main.tex}
+Macro to typeset argument in the translation position.
+
+\begin{argtable}
+ \#1 & string & Text to typeset in the translation.\\
+\end{argtable}
+
+\macroname{\textbackslash GreWriteTranslationWithCenterBeginning}{\#1}{gregoriotex-main.tex}
+Macro to typeset argument (a string) in the translation position (at
+the beginning of a line?).
+
+\begin{argtable}
+ \#1 & string & Text to typeset in the translation (at the beginning of a line).\\
+\end{argtable}
+
+\macroname{\textbackslash GreZeroHyph}{}{gregoriotex-main.tex}
+Macro to typeset a zero-width hyphen (the hyphen is visible, it is only
+treated as if it had 0 width when calculating spaces). Used for fine tuning spacing
+(especially at line endings).
+
+\macroname{\textbackslash GreForceBreak}{}{gregoriotex-spaces.tex}
+Macro used to force a line break to occur at a given position.
+
+\macroname{\textbackslash GreNoBreak}{}{gregoriotex-spaces.tex}
+Macro used to prevent a line break from occurring at a given position.
+
+\macroname{\textbackslash GreScoreId}{}{gregoriotex-main.tex}
+A Lua\TeX\ attribute which designates a unique identifier for each score.
+
+\macroname{\textbackslash GreNABCNeumes}{\#1\#2}{gregoriotex-nabc.tex}
+Macro to print a nabc character above the lines.
+
+\begin{argtable}
+ \#1 & integer & the line on which the character should appear (currently unused)\\
+ \#2 & string & The \texttt{nabc} syntax which indicates what neumes are to be printed\\
+\end{argtable}
+
+\macroname{\textbackslash GreNABCChar}{\#1}{gregoriotex-nabc.tex}
+Macro to print a nabc character.
+
+\begin{argtable}
+ \#1 & string & The \texttt{nabc} syntax which indicates what neumes are to be printed\\
+\end{argtable}
+
+\macroname{\textbackslash GreScoreNABCLines}{\#1}{gregoriotex-nabc.tex}
+Macro which sets the number of \texttt{nabc} lines in the score.
+
+\begin{argtable}
+ \#1 & integer & the number of \texttt{nabc} lines (currently only 1 is supported)\\
+\end{argtable}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: "GregorioRef"
+%%% End:
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Command_Index_internal.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex
index d2840d73105..5367ec09e60 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Command_Index_internal.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex
@@ -11,7 +11,7 @@ only.
Prints an error to the \TeX\ output log.
\begin{argtable}
- \#1 & string & error message\\
+ \#1 & string & error message\\
\end{argtable}
@@ -19,14 +19,14 @@ Prints an error to the \TeX\ output log.
Prints a warning to the \TeX\ output log.
\begin{argtable}
- \#1 & string & warning message\\
+ \#1 & string & warning message\\
\end{argtable}
\macroname{\textbackslash gre@metapost}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
Executes \MP{} commands using luamplib.
\begin{argtable}
- \#1 & \MP{} commands & The \MP{} commands to execute.
+ \#1 & \MP{} commands & The \MP{} commands to execute.
\end{argtable}
\macroname{\textbackslash gre@deprecated}{\#1\#2}{gregoriotex-main.tex}
@@ -36,16 +36,16 @@ are allowed and a warning is printed. If the package option
package error, halting \TeX.
\begin{argtable}
- \#1 & string & name of the deprecated macro\\
- \#2 & string & name of the correct macro to use\\
+ \#1 & string & name of the deprecated macro\\
+ \#2 & string & name of the correct macro to use\\
\end{argtable}
\macroname{\textbackslash gre@obsolete}{\#1\#2}{gregoriotex-main.tex}
Macro that handles obsolescence errors.
\begin{argtable}
- \#1 & string & name of the obsolete macro\\
- \#2 & string & name of the correct macro to use\\
+ \#1 & string & name of the obsolete macro\\
+ \#2 & string & name of the correct macro to use\\
\end{argtable}
\macroname{\textbackslash gre@loadgregoriofont}{}{gregoriotex-main.tex}
@@ -65,35 +65,35 @@ Macro which calculates \verb=\gre@additionalbottomspace= and\\
\verb=\gre@additionaltopspace=
\begin{argtable}
- \#1 & integer & the height number of the top pitch, including signs\\
- \#2 & integer & the height number of the bottom pitch, including signs\\
- \#3 & 0 & there is no translation line\\
- & 1 & there is a translation line\\
- \#4 & 0 & there is no above lines text\\
- & 1 & there is above lines text
+ \#1 & integer & the height number of the top pitch, including signs\\
+ \#2 & integer & the height number of the bottom pitch, including signs\\
+ \#3 & \texttt{0} & there is no translation line\\
+ & \texttt{1} & there is a translation line\\
+ \#4 & \texttt{0} & there is no above lines text\\
+ & \texttt{1} & there is above lines text
\end{argtable}
\macroname{\textbackslash gre@calculate@textaligncenter}{\#1\#2\#3}{gregoriotex-spaces.tex}
Macro for calculating \verb=\gre@textaligncenter=.
\begin{argtable}
- \#1 & string & The first part of the syllable (any preceding consonants in Latin).\\
- \#2 & string & The middle part of the syllable (the vowel in Latin, the whole syllable in English).\\
- \#3 & 0 & Calculation is being performed for the current syllable.\\
- & 1 & Calculation is being performed for the next syllable.\\
+ \#1 & string & The first part of the syllable (any preceding consonants in Latin).\\
+ \#2 & string & The middle part of the syllable (the vowel in Latin, the whole syllable in English).\\
+ \#3 & \texttt{0} & Calculation is being performed for the current syllable.\\
+ & \texttt{1} & Calculation is being performed for the next syllable.\\
\end{argtable}
\macroname{\textbackslash gre@calculate@annotationtrueraise}{}{gregoriotex-spaces.tex}
Macro to calculate \verb=\gre@dimen@annotationtrueraise=.
\macroname{\textbackslash gre@calculate@textlower}{}{gregoriotex-spaces.tex}
-Calculates the default value of \texttt{textlower}. Default is \texttt{spacebeneathtext}.
+Calculates the value of \texttt{textlower}. Default is \texttt{spacebeneathtext}.
\macroname{\textbackslash gre@calculate@linewidth}{}{gregoriotex-spaces.tex}
-Calculates the default line width. Default is the width of the printable space (\verb=\hsize=).
+Calculates the line width. Default is the width of the printable space (\verb=\hsize=).
\macroname{\textbackslash gre@calculate@stafflinewidth}{}{gregoriotex-spaces.tex}
-Calculates the default width of the staff lines. Default is \texttt{linewidth}.
+Calculates the width of the staff lines. Default is \texttt{linewidth}.
\macroname{\textbackslash gre@calculate@stafflineheight}{}{gregoriotex-spaces.tex}
Calculates the height (thickness) of the staff lines. Dependent on \texttt{stafflineheightfactor} and \texttt{gre@factor}.
@@ -117,91 +117,88 @@ Aggregates all of the global distance calculations and calls them in the order n
Calculates the raise values for a glyph (glyphraisevalue and addedraisevalue) based on where it is to be placed and what kind of a glyph it is. This is a time of use calculation.
\begin{argtable}
- \#1 & integer & The number for where the glyph is located. \texttt{a} in gabc is 1, \texttt{b} is 2, \etc\\
- \#2 & 0 & no modification\\
- & 1 & puts the value on the interline just above if it is on a line\\
- & 2 & puts the value on the interline just beneath if it is on a line\\
- & 3 & case of the vertical episemus, which is not placed at the same place if the corresponding note is on a line or not\\
- & 4 & case of the punctum mora, for the same reason\\
- & 5 & case of the horizontal episemus under a note, that must be placed a bit lower if the note is on a line\\
- & 6 & case of the signs above (accentus, \etc)\\
- & 8 & case of the punctum mora of the first note of a podatus or the 2nd note of a porrectus, \etc\\
- & 9 & case of the horizontal episemus, that must be placed a bit lower if the note is on a line\\
- & 10 & case of the low choral sign\\
- & 11 & case of the high choral sign\\
- & 12 & case of the low choral sign which is lower than the note\\
- & 13 & case of the brace above the bars
+ \#1 & integer & The number for where the glyph is located. \texttt{a} in gabc is \texttt{1}, \texttt{b} is \texttt{2}, \etc\\
+ \#2 & \texttt{0} & no modification\\
+ & \texttt{1} & puts the value on the interline just above if it is on a line\\
+ & \texttt{2} & puts the value on the interline just beneath if it is on a line\\
+ & \texttt{3} & case of the vertical episema, which is not placed at the same place if the corresponding note is on a line or not\\
+ & \texttt{4} & case of the punctum mora, for the same reason\\
+ & \texttt{5} & case of the horizontal episema under a note, that must be placed a bit lower if the note is on a line\\
+ & \texttt{6} & case of the signs above (accentus, \etc)\\
+ & \texttt{8} & case of the punctum mora of the first note of a podatus or the 2nd note of a porrectus, \etc\\
+ & \texttt{9} & case of the horizontal episema, that must be placed a bit lower if the note is on a line\\
+ & \texttt{10} & case of the low choral sign\\
+ & \texttt{11} & case of the high choral sign\\
+ & \texttt{12} & case of the low choral sign which is lower than the note\\
+ & \texttt{13} & case of the brace above the bars
\end{argtable}
\macroname{\textbackslash gre@stafflinefactor}{}{gregoriotex-spaces.tex}
A number indicating the thickness of the staff lines.
-\macroname{\textbackslash gre@scale@stafflinefactor}{}{gregoriotex-spaces.tex}
-Flag indicating whether the stafflinefactor should scale with changes of grefactor (1), or not (0).
-
\macroname{\textbackslash gre@calculate@textaligncenter}{\#1\#2\#3}{gregoriotex-spaces.tex}
Macro to calculate the distance from the beginning of the text of a syllable to its alignment point (the center of the vowel for Latin centering, the center of the syllable for English centering). This is a time of use calculation.
\begin{argtable}
- \#1 & string & the first part of the syllable\\
- \#2 & string & the middle part of the syllable\\
- \#3 & 0 & perform this calculation for the current syllable\\
- & 1 & perform this calculation for the next syllable
+ \#1 & string & the first part of the syllable\\
+ \#2 & string & the middle part of the syllable\\
+ \#3 & \texttt{0} & perform this calculation for the current syllable\\
+ & \texttt{1} & perform this calculation for the next syllable
\end{argtable}
\macroname{\textbackslash gre@calculate@enddifference}{\#1\#2\#3\#4\#5}{gregoriotex-spaces.tex}
Calculates the difference between the end of the notes and the end of the syllable text. Also stores the value for the previous syllable if needed. This is a time of use calculation.
\begin{argtable}
- \#1 & length & the total width of the notes\\
- \#2 & length & the total width of the syllable text\\
- \#3 & length & the alignment distance for the text (\texttt{textaligncenter})\\
- \#4 & length & the alignment distance for the notes (\texttt{notesaligncenter})\\
- \#5 & 0 & do not save the value for the previous syllable before calculating the new value\\
- & 1 & save the value for the previous syllable before calculating the new value
+ \#1 & length & the total width of the notes\\
+ \#2 & length & the total width of the syllable text\\
+ \#3 & length & the alignment distance for the text (\texttt{textaligncenter})\\
+ \#4 & length & the alignment distance for the notes (\texttt{notesaligncenter})\\
+ \#5 & \texttt{0} & do not save the value for the previous syllable before calculating the new value\\
+ & \texttt{1} & save the value for the previous syllable before calculating the new value
\end{argtable}
\macroname{\textbackslash gre@changeonedimenfactor}{\#1\#2\#3}{gregoriotex-spaces.tex}
Change the scale of a single distance from one factor to another.
\begin{argtable}
- \#1 & string & name of the distance to be scaled. See \nameref{distances}.\\
- \#2 & integer & the factor the distance is currently in\\
- \#3 & integer & the factor the distance is to be put into\\
+ \#1 & string & name of the distance to be scaled. See \nameref{distances}.\\
+ \#2 & integer & the factor the distance is currently in\\
+ \#3 & integer & the factor the distance is to be put into\\
\end{argtable}
\macroname{\textbackslash gre@changedimenfactor}{\#1\#2}{gregoriotex-spaces.tex}
-Rescales all the distances (and stafflinefactor) which are supposed to scale with a change in factor.
+Rescales all the distances (and \texttt{stafflinefactor}) which are supposed to scale with a change in staff size.
\begin{argtable}
- \#1 & integer & the factor the distance is currently in\\
- \#2 & integer & the factor the distance is to be put into\\
+ \#1 & integer & the factor the distances are currently in\\
+ \#2 & integer & the factor the distances are to be put into\\
\end{argtable}
\macroname{\textbackslash gre@calculate@nextbegindifference}{\#1\#2\#3\#4}{gregoriotex-spaces.tex}
Macro to calculate \texttt{nextbegindifference}.
\begin{argtable}
- \#1 & string & the first letters of the next syllable\\
- \#2 & string & the middle letters of the next syllable (the vowel in Latin, the whole syllable in English)\\
- \#3 & string & the end letters of the next syllable\\
- \#4 & $0 \le$ integer $\le 19$ & the type of notes alignment. See \nameref{notesalign}.\\
- & $20 \le$ integer $\le 39$ & Same as below 20 except there is a flat before the notes. Subtract 20 to get the type of notes alignment.\\
- & $40 \le$ integer $\le 59$ & Same as below 20 except there is a natural before the notes. Subtract 40 to get the type of notes alignment.
+ \#1 & string & the first letters of the next syllable\\
+ \#2 & string & the middle letters of the next syllable (the vowel in Latin, the whole syllable in English)\\
+ \#3 & string & the end letters of the next syllable\\
+ \#4 & $0 \le$ integer $\le 19$ & the type of notes alignment. See \nameref{notesalign}.\\
+ & $20 \le$ integer $\le 39$ & Same as below 20 except there is a flat before the notes. Subtract 20 to get the type of notes alignment.\\
+ & $40 \le$ integer $\le 59$ & Same as below 20 except there is a natural before the notes. Subtract 40 to get the type of notes alignment.
\end{argtable}
\macroname{\textbackslash gre@makein}{\#1}{gregoriotex-spaces.tex}
Strips the decimals and units from a distance.
\begin{argtable}
- \#1 & distance & should be in the form ``[0-9]+.[0-9]+pt''. (\ie the result of applying \verb=\the= to a distance register)
+ \#1 & distance & should be in the form ``[0-9]+.[0-9]+pt’’. (\ie the result of applying \verb=\the= to a distance register)
\end{argtable}
\macroname{\textbackslash gre@makenum}{\#1}{gregoriotex-spaces.tex}
Strips the units from a distance.
\begin{argtable}
- \#1 & distance & should be in the form ``[0-9]+.[0-9]+pt''. (\ie the result of applying \verb=\the= to a distance register)
+ \#1 & distance & should be in the form ``[0-9]+.[0-9]+pt’’. (\ie the result of applying \verb=\the= to a distance register)
\end{argtable}
\macroname{\textbackslash gre@unitfactor}{}{gregoriotex-spaces.tex}
@@ -217,8 +214,8 @@ Temporary count used in calculations. There are currently three of these.
Macro which converts a distance into a particular set of units. Result is placed in \verb=\gre@converted= as a string.
\begin{argtable}
- \#1 & string & two letter abbreviation for the units. Should recognize all legal TeX units.\\
- \#2 & distance & Distance to be converted.
+ \#1 & string & two letter abbreviation for the units. Should recognize all legal \TeX\ units.\\
+ \#2 & distance & Distance to be converted.
\end{argtable}
\macroname{\textbackslash gre@converted}{}{gregoriotex-spaces.tex}
@@ -228,8 +225,8 @@ Macro holding result of last call to \verb=\gre@convertto=.
This function takes a distance and formats it as a string so that its units conform to the pattern set by a string representation of a distance. Result is placed in \verb=\gre@stringdist=.
\begin{argtable}
- \#1 & string & the standard whose format is to be matched.\\
- \#2 & distance & the distance to be adjusted.
+ \#1 & string & the standard whose format is to be matched.\\
+ \#2 & distance & the distance to be adjusted.
\end{argtable}
\macroname{\textbackslash gre@stringdist}{}{gregoriotex-spaces.tex}
@@ -240,7 +237,7 @@ Macro that handles \verb=\gregorioscore= calls when they do not have an
optional argument.
\begin{argtable}
- \#1 & string & Relative or absolute path to the score.\\
+ \#1 & string & Relative or absolute path to the score.\\
\end{argtable}
\macroname{\textbackslash gre@gregorioscore@option}{[\#1]\#2}{gregoriotex-main.tex}
@@ -248,10 +245,10 @@ Macro that handles \verb=\gregorioscore= calls when they have an optional
argument.
\begin{argtable}
- \#1 & \texttt{n} & \#2 will be included as is. \\
- & \texttt{a} & Gregoriotex will automatically compile gabc files if necessary.\\
- & \texttt{f} & Forces gregoriotex to compile the gabc file.\\
- \#2 & string & Relative or absolute path to the score.\\
+ \#1 & \texttt{n} & \#2 will be included as is. \\
+ & \texttt{a} & Gregorio\TeX\ will automatically compile gabc files if necessary.\\
+ & \texttt{f} & Forces Gregorio\TeX\ to compile the gabc file.\\
+ \#2 & string & Relative or absolute path to the score.\\
\end{argtable}
\macroname{\textbackslash gre@gabcsnippet}{\#1}{gregoriotex-main.tex}
@@ -259,7 +256,7 @@ Macro that handles \verb=\gabcsnippet= calls when they do not have an
optional argument.
\begin{argtable}
- \#1 & string & Snippet of gabc code.\\
+ \#1 & string & Snippet of gabc code.\\
\end{argtable}
\macroname{\textbackslash gre@gabcsnippet@option}{[\#1]\#2}{gregoriotex-main.tex}
@@ -267,8 +264,8 @@ Macro that handles \verb=\gabcsnippet= calls when they have an optional
argument.
\begin{argtable}
- \#1 & int & Value of initial style to be passed to gregorio \\
- \#2 & string & Snippet of gabc code.\\
+ \#1 & int & Value of initial style to be passed to gregorio \\
+ \#2 & string & Snippet of gabc code.\\
\end{argtable}
\macroname{\textbackslash gre@writemode}{\#1}{gregoriotex-main.tex}
@@ -277,22 +274,22 @@ argument typically is given to this macro by \verb=\GreMode= in the
gtex file.
\begin{argtable}
- \#1 & string & Text to place above the initial of a score.\\
+ \#1 & string & Text to place above the initial of a score.\\
\end{argtable}
\macroname{\textbackslash gre@brace@common}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
Common macro used internally to render braces.
\begin{argtable}
- \#1 & length & The width of the brace.\\
- \#2 & length & A vertical shift.\\
- \#3 & length & A horizontal shift.\\
- \#4 & 0 & Don't shift before starting the brace.\\
- & 1 & Shift back a punctum's width before starting the brace.\\
- \#5 & 0 & No accentus above the brace.\\
- & 1 & Typeset an accentus above the brace.\\
- \#6 & integer & The height number for the brace.\\
- \#7 & csname & The control sequence name representing the brace.
+ \#1 & length & The width of the brace.\\
+ \#2 & length & A vertical shift.\\
+ \#3 & length & A horizontal shift.\\
+ \#4 & \texttt{0} & Don’t shift before starting the brace.\\
+ & \texttt{1} & Shift back a punctum’s width before starting the brace.\\
+ \#5 & \texttt{0} & No accentus above the brace.\\
+ & \texttt{1} & Typeset an accentus above the brace.\\
+ \#6 & integer & The height number for the brace.\\
+ \#7 & csname & The control sequence name representing the brace.
\end{argtable}
\macroname{\textbackslash grebracemetapostpreamble}{\#1}{gregoriotex-signs.tex}
@@ -300,44 +297,44 @@ Returns the \MP{} preamble for braces. The control sequence name does
not have the \texttt{@} symbol because this macro is used within \MP{}.
\begin{argtable}
- \#1 & string & the width of the brace; if \texttt{*}, use the bar brace width.
+ \#1 & string & the width of the brace; if \texttt{*}, use the bar brace width.
\end{argtable}
\macroname{\textbackslash gre@draw@curlybrace}{\#1}{gregoriotex-signs.tex}
Draws a curly over-brace using \MP{}.
\begin{argtable}
- \#1 & length & the width of the brace.
+ \#1 & length & the width of the brace.
\end{argtable}
\macroname{\textbackslash gre@draw@brace}{\#1}{gregoriotex-signs.tex}
Draws a round over-brace using \MP{}.
\begin{argtable}
- \#1 & string & the width of the brace; if \texttt{*}, use the bar brace width.
+ \#1 & string & the width of the brace; if \texttt{*}, use the bar brace width.
\end{argtable}
\macroname{\textbackslash gre@draw@underbrace}{\#1}{gregoriotex-signs.tex}
Draws a round under-brace using \MP{}.
\begin{argtable}
- \#1 & length & the width of the brace.
+ \#1 & length & the width of the brace.
\end{argtable}
\macroname{\textbackslash gre@draw@roundbrace}{\#1}{gregoriotex-signs.tex}
Draws a round over- or under-brace using \MP{}.
\begin{argtable}
- \#1 & length & the width of the brace.\\
- \#2 & number & the height of the bounding box in em-relative units.\\
- \#3 & \MP{} commands & \MP{} commands to draw the brace outline.
+ \#1 & length & the width of the brace.\\
+ \#2 & number & the height of the bounding box in em-relative units.\\
+ \#3 & \MP{} commands & \MP{} commands to draw the brace outline.
\end{argtable}
\macroname{\textbackslash gre@iflatex}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
Evaluates to \verb=#1= if running under \LaTeX{}.
\begin{argtable}
- \#1 & \TeX{} code & the \TeX{} code to use if running under \LaTeX{}.
+ \#1 & \TeX{} code & the \TeX{} code to use if running under \LaTeX{}.
\end{argtable}
\macroname{\textbackslash gre@latex@barredsymbol}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
@@ -347,10 +344,10 @@ the cascading of conditionals used to implement that macro.
\bigskip\textbf{Only available in \LaTeX.}
\begin{argtable}
- \#1 & string & the value of \verb=\f@series/\f@shape= to match.\\
- \#2 & \TeX{} code & the \TeX{} for the base symbol (\ie, \texttt{A}, \texttt{R}, or \texttt{V}).\\
- \#3 & string & the control sequence name created by \verb=\gredefsizedsymbol= to use for the bar.\\
- \#4 & dimension & the amount to shift the bar to the left from the end of the base symbol.
+ \#1 & string & the value of \verb=\f@series/\f@shape= to match.\\
+ \#2 & \TeX{} code & the \TeX{} for the base symbol (\ie, \texttt{A}, \texttt{R}, or \texttt{V}).\\
+ \#3 & string & the control sequence name created by \verb=\gredefsizedsymbol= to use for the bar.\\
+ \#4 & dimension & the amount to shift the bar to the left from the end of the base symbol.
\end{argtable}
\macroname{\textbackslash gre@additionalbottomcustoslineend}{}{gregoriotex-signs.tex}
@@ -369,7 +366,7 @@ Macro to place a top custos with an additional line (positions \texttt{l} and \t
Macro to pick the appropriate custos character.
\begin{argtable}
- \#1 & integer & height of the custos character to be placed\\
+ \#1 & integer & height of the custos character to be placed\\
\end{argtable}
\macroname{\textbackslash gre@addspaceabove}{}{gregoriotex-main.tex}
@@ -382,19 +379,19 @@ Macro to decrease the space above the lines as there is no longer any above line
Macro to typeset an alteration.
\begin{argtable}
- \#1 & integer & height of the alteration\\
- \#2 & character alias & the alteration\\
- \#3 & character alias & the hole of the alteration\\
- \#4 & 1 & the alteration is a flat for a key change\\
- & 0 & all other cases\\
+ \#1 & integer & height of the alteration\\
+ \#2 & character alias & the alteration\\
+ \#3 & character alias & the hole of the alteration\\
+ \#4 & \texttt{1} & the alteration is a flat for a key change\\
+ & \texttt{0} & all other cases\\
\end{argtable}
\macroname{\textbackslash gre@calculate@clefnum}{\#1\#2}{gregoriotex-signs.tex}
Macro calculating the \verb=\gre@clefnum= from the letter and number.
\begin{argtable}
- \#1 & charcter & type of clef (\texttt{c} or \texttt{f})\\
- \#2 & integer & line number\\
+ \#1 & charcter & type of clef (\texttt{c} or \texttt{f})\\
+ \#2 & integer & line number\\
\end{argtable}
\macroname{\textbackslash gre@clefnum}{}{gregoriotex-signs.tex}
@@ -425,10 +422,10 @@ Macro to (re)populate the box containing the lines.
Macro to shorten the lines to account for the presence of the initial.
\macroname{\textbackslash gre@knownline}{}{gregoriotex-main.tex}
-A count which keeps track of which line of the score we're on.
+A count which keeps track of which line of the score we’re on.
\macroname{\textbackslash gre@lastoflinecount}{}{gregoriotex-main.tex}
-Count to track where on the line we are. Values are 0 (we are not near the end of a line), 1 (we're at the last syllable of the line), and 2 (we just set the last syllable of the line and so are at the first syllable of a new line).
+Count to track where on the line we are. Values are \texttt{0} (we are not near the end of a line), \texttt{1} (we’re at the last syllable of the line), and \texttt{2} (we just set the last syllable of the line and so are at the first syllable of a new line).
\macroname{\textbackslash gre@savedlastoflinecount}{}{gregoriotex-main.tex}
A spot to save the \verb=\gre@lastoflinecount= so we can change it temporarily and revert to the saved value later.
@@ -437,28 +434,28 @@ A spot to save the \verb=\gre@lastoflinecount= so we can change it temporarily a
The macro which needs to be called each time a new lines is started.
\begin{argtable}
- \#1 & 0 & Justifying the line being ended\\
- & 1 & Do not justify the line being ended\\
+ \#1 & \texttt{0} & Justifying the line being ended\\
+ & \texttt{1} & Do not justify the line being ended\\
\end{argtable}
\macroname{\textbackslash gre@endafterbar}{\#1}{gregoriotex-main.tex}
Macro to call after ending a bar.
\begin{argtable}
- \#1 & 0 & We are at the end of a line\\
- & 1 & We not at the end of a line\\
+ \#1 & \texttt{0} & We are at the end of a line\\
+ & \texttt{1} & We not at the end of a line\\
\end{argtable}
\macroname{\textbackslash gre@endofsyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
Macro called at end of a syllable, adds a penalty and a space.
\begin{argtable}
- \#1 & 0 & to only add the penalty\\
- & 1 & otherwise\\
- \#2 & 0 & if end of syllable\\
- & 1 & if end of word\\
- \#3 & 1 & if next syllable is a bar\\
- & 0 & otherwise\\
+ \#1 & \texttt{0} & to only add the penalty\\
+ & \texttt{1} & adds both penalty and space\\
+ \#2 & \texttt{0} & if end of syllable\\
+ & \texttt{1} & if end of word\\
+ \#3 & \texttt{1} & if next syllable is a bar\\
+ & \texttt{0} & otherwise\\
\end{argtable}
\macroname{\textbackslash gre@exhyphencharsave}{}{gregoriotex-main.tex}
@@ -473,30 +470,30 @@ Default: 17 (approximately the size found in graduals)
Macro to fill the hole in a glyph so that staff lines do not show through a hole in it.
\begin{argtable}
- \#1 & Gregorio\TeX\ char & character to use to fill the hole\\
+ \#1 & Gregorio\TeX\ char & character to use to fill the hole\\
\end{argtable}
\macroname{\textbackslash gre@calculate@notesaligncenter}{\#1}{gregoriotex-syllable.tex}
Macro to find the alignment center for a group of notes. The value is the distance from the left edge of the group to the alignment point and is stored in \verb=\gre@dimen@notesaligncenter=.
\begin{argtable}
- \#1 & Note alignment type & See \ref{notesalign}\\
+ \#1 & Note alignment type & See \ref{notesalign}\\
\end{argtable}
\macroname{\textbackslash gre@calculate@nextnotesaligncenter}{\#1}{gregoriotex-syllable.tex}
Same as previous, but for the next syllable.
\begin{argtable}
- \#1 & Note alignment type & See \ref{notesalign}\\
+ \#1 & Note alignment type & See \ref{notesalign}\\
\end{argtable}
\macroname{\textbackslash gre@calculate@simplenotesaligncenter}{\#1\#2}{gregoriotex-syllable.tex}
-Workhorse function behind \verb=\gre@calculate@notesaligncenter= and \verb=\gre@calculate@nextnotesaligncenter=.
+Workhorse function behind \verb=\gre@calculate@notesaligncenter= and\\ \verb=\gre@calculate@nextnotesaligncenter=.
\begin{argtable}
- \#1 & Note alignment type & See \ref{notesalign}\\
- \#2 & 0 & this is for the current syllable\\
- & 1 & this is for the next syllable\\
+ \#1 & Note alignment type & See \ref{notesalign}\\
+ \#2 & \texttt{0} & this is for the current syllable\\
+ & \texttt{1} & this is for the next syllable\\
\end{argtable}
\macroname{\textbackslash gre@gregoriofontname}{}{gregoriotex-main.tex}
@@ -506,89 +503,89 @@ Macro which stores the name of the currently selected font for the neumes.
Macro for aligning clivis syllables according to the flag \verb=\gre@clivisalignment=.
\begin{argtable}
- \#1 & Gregorio\TeX\ glyph & Glyph to use when aligning clivis on its center\\
- \#2 & Gregorio\TeX\ glyph & Glyph to use when aligning clivis on the center of the first punctum\\
- \#3 & 0 & this is for the current syllable\\
- & 1 & this is for the next syllable\\
+ \#1 & Gregorio\TeX\ glyph & Glyph to use when aligning clivis on its center\\
+ \#2 & Gregorio\TeX\ glyph & Glyph to use when aligning clivis on the center of the first punctum\\
+ \#3 & \texttt{0} & this is for the current syllable\\
+ & \texttt{1} & this is for the next syllable\\
\end{argtable}
\macroname{\textbackslash gre@hepisorline}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
-Macro to typeset a horizontal line (either an additional staff line or an episemus).
+Macro to typeset a horizontal line (either an additional staff line or an episema).
\begin{argtable}
- \#1 & character & The letter of the height of the episemus (not the height of the note it corresponds to).\\
- \#2 & 0 & go back to the beginning of the previous glyph; this starts the episemus at the beginning of the previous glyph\\
- & 1 & stay at the end of the glyph; doesn't make much sense to use this\\
- & 2 & go back the width of \#1; this starts the episemus at the glyph from the end that starts at \#1's width from the end\\
- & 3 & go back to the beginning of the previous glyph and then forward the width of \#1; this starts the episemus at the glyph from the start that starts just after \#1's width from the start\\
- \#3 & integer &the ambitus for a two note episemus at the diagonal stroke of a porrectus, porrectus flexus, orculus resupinus, or torculus resupinus flexus\\
- \#4 & 0 & an horizontal episemus\\
- & 1 & an horizontal episemus under a note\\
- & 3 & a line at the bottom\\
- & 2 & a line at the top\\
- \#5 & f & a normal episemus\\
- & l & a small episemus aligned left\\
- & c & a small episemus aligned center\\
- & r & for a small episemus aligned right\\
+ \#1 & character & The letter of the height of the episema (not the height of the note it corresponds to).\\
+ \#2 & \texttt{0} & go back to the beginning of the previous glyph; this starts the episema at the beginning of the previous glyph\\
+ & \texttt{1} & stay at the end of the glyph; doesn’t make much sense to use this\\
+ & \texttt{2} & go back the width of \#1; this starts the episema at the glyph from the end that starts at \#1’s width from the end\\
+ & \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1; this starts the episema at the glyph from the start that starts just after \#1’s width from the start\\
+ \#3 & integer &the ambitus for a two note episema at the diagonal stroke of a porrectus, porrectus flexus, orculus resupinus, or torculus resupinus flexus\\
+ \#4 & \texttt{0} & an horizontal episema\\
+ & \texttt{1} & an horizontal episema under a note\\
+ & \texttt{2} & a line at the top\\
+ & \texttt{3} & a line at the bottom\\
+ \#5 & \texttt{f} & a normal episema\\
+ & \texttt{l} & a small episema aligned left\\
+ & \texttt{c} & a small episema aligned center\\
+ & \texttt{r} & for a small episema aligned right\\
\end{argtable}
\macroname{\textbackslash gre@hepisorlineaux}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
-Macro that will help in the typesetting of a horizontal episemus and additional lines.
+Macro that will help in the typesetting of a horizontal episema and additional lines.
\begin{argtable}
- \#1 & Gregorio\TeX\ glyph & an offset glyph (see \#3, below)\\
- \#2 & Gregorio\TeX\ glyph & the episemus glyph\\
- \#3 & 0 & go back to the beginning of the previous glyph; this starts the episemus at the beginning of the previous glyph\\
- & 1 & stay at the end of the glyph; doesn't make much sense to use this\\
- & 2 & go back the width of \#1; this starts the episemus at the glyph from the end that starts at \#1's width from the end\\
- & 3 & go back to the beginning of the previous glyph and then forward the width of \#1; this starts the episemus at the glyph from the start that starts just after \#1's width from the start\\
- \#4 & 0 & an horizontal episemus\\
- & 1 & an horizontal episemus under a note\\
- & 3 & a line at the bottom\\
- & 2 & a line at the top\\
+ \#1 & Gregorio\TeX\ glyph & an offset glyph (see \#3, below)\\
+ \#2 & Gregorio\TeX\ glyph & the episema glyph\\
+ \#3 & \texttt{0} & go back to the beginning of the previous glyph; this starts the episema at the beginning of the previous glyph\\
+ & \texttt{1} & stay at the end of the glyph; doesn’t make much sense to use this\\
+ & \texttt{2} & go back the width of \#1; this starts the episema at the glyph from the end that starts at \#1’s width from the end\\
+ & \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1; this starts the episema at the glyph from the start that starts just after \#1’s width from the start\\
+ \#4 & \texttt{0} & an horizontal episema\\
+ & \texttt{1} & an horizontal episema under a note\\
+ & \texttt{2} & a line at the top\\
+ & \texttt{3} & a line at the bottom\\
\end{argtable}
-\macroname{\textbackslash gre@vepisemusorrare}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
-Macro to typeset a vertical episemus or a rare accent (like accentus, circulus, etc.). This function must be called after a call to \verb=\GreGlyph=.
+\macroname{\textbackslash gre@vepisemaorrare}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
+Macro to typeset a vertical episema or a rare accent (like accentus, circulus, etc.). This function must be called after a call to \verb=\GreGlyph=.
\begin{argtable}
- \#1 & character & the letter of the height of the episemus (not the height of the note it corresponds to.\\
- \#2 & integer & See \nameref{EpisemusSpecial}\\
- \#3 & Gregorio\TeX\ glyph & the sign glyph\\
- \#4 & 1 & vertical episemus\\
- & 2 & rare sign\\
- & 3 & choral sign\\
- & 4 & brace above the bar\\
- \#5 & string & the choral sign, if relevant\\
+ \#1 & character & the letter of the height of the episema (not the height of the note it corresponds to.\\
+ \#2 & integer & See \nameref{EpisemaSpecial}\\
+ \#3 & Gregorio\TeX\ glyph & the sign glyph\\
+ \#4 & \texttt{1} & vertical episema\\
+ & \texttt{2} & rare sign\\
+ & \texttt{3} & choral sign\\
+ & \texttt{4} & brace above the bar\\
+ \#5 & string & the choral sign, if relevant\\
\end{argtable}
-\macroname{\textbackslash gre@vepisemusorrareaux}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
-Macro to help typesetting vertical episemus.
+\macroname{\textbackslash gre@vepisemaorrareaux}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
+Macro to help typesetting vertical episema.
\begin{argtable}
- \#1 & Gregorio\TeX\ glyph & is an offset glyph (see \#3 below)\\
- \#2 & Gregorio\TeX glyph & the glyph upon which the sign is to be centered\\
- \#3 & 0 & go back to the beginning of the previous glyph and then forward half the width of \#2; this puts the sign at the beginning of the previous glyph, whose first note is the size of \#2\\
- & 1 & go back half the width of \#2; this puts the sign at the end of the previous glyph, whose last note is the size of \#2\\
- & 2 & go back the width of \#1 and then forward half the width of \#2; this puts the sign at the glyph from the end that starts at \#1's width from the end\\
- & 3 & go back to the beginning of the previous glyph and then forward the width of \#1 and then back half the width of \#2; this puts the sign at the glyph from the start that ends at \#1's width from the start\\
- \#4 & dimension & a shift that we want to get applied, useful for punctum inclinatum for example\\
- \#5 & integer & is the glyph number\\
- \#6 & 1 & vertical episemus\\
- & 2 & rare sign\\
- & 3 & choral sign\\
- & 4 & brace above the bar\\
- \#7 & string & the choral sign if relevant\\
+ \#1 & Gregorio\TeX\ glyph & is an offset glyph (see \#3 below)\\
+ \#2 & Gregorio\TeX glyph & the glyph upon which the sign is to be centered\\
+ \#3 & \texttt{0} & go back to the beginning of the previous glyph and then forward half the width of \#2; this puts the sign at the beginning of the previous glyph, whose first note is the size of \#2\\
+ & \texttt{1} & go back half the width of \#2; this puts the sign at the end of the previous glyph, whose last note is the size of \#2\\
+ & \texttt{2} & go back the width of \#1 and then forward half the width of \#2; this puts the sign at the glyph from the end that starts at \#1’s width from the end\\
+ & \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1 and then back half the width of \#2; this puts the sign at the glyph from the start that ends at \#1’s width from the start\\
+ \#4 & dimension & a shift that we want to get applied, useful for punctum inclinatum for example\\
+ \#5 & integer & is the glyph number\\
+ \#6 & \texttt{1} & vertical episema\\
+ & \texttt{2} & rare sign\\
+ & \texttt{3} & choral sign\\
+ & \texttt{4} & brace above the bar\\
+ \#7 & string & the choral sign if relevant\\
\end{argtable}
\macroname{\textbackslash gre@newglyphcommon}{}{gregoriotex-syllable.tex}
Macro called before each glyph.
\macroname{\textbackslash gre@normalinitial}{}{gregoriotex-main.tex}
-Macro called at the end of the score to ensure that a big initial setting doesn't carry into the next score.
+Macro called at the end of the score to ensure that a big initial setting doesn’t carry into the next score.
\macroname{\textbackslash greoldcatcode}{}{gregoriotex.tex}
-Macro to store the catcode for ``\@'' so that we can use said symbol in function names under Plain\TeX\ and then restore the original catcode after the package is done loading.
+Macro to store the catcode for ``@'' so that we can use said symbol in function names under Plain \TeX\ and then restore the original catcode after the package is done loading.
\macroname{\textbackslash gre@setstylefont}{}{gregoriotex-main.tex}
Macro for opening up greextra font.
@@ -597,7 +594,7 @@ Macro for opening up greextra font.
Macro for populating \verb=\gre@box@syllablenotes=.
\begin{argtable}
- \#1 & string & The contents to be placed in the box\\
+ \#1 & string & The contents to be placed in the box\\
\end{argtable}
\macroname{\textbackslash gre@symbolfontsize}{}{gregoriotex-symbols.tex}
@@ -610,13 +607,13 @@ Macro which applies the default text format.
Macro which typesets the key.
\begin{argtable}
- \#1 & character & the type of the key: c or f\\
- \#2 & integer & the line of the key (1 is the lowest)\\
- \#3 & 0 & no need to use small key characters (inside a line)\\
- & 1 & we must use small key characters (inside a line)\\
- \#4 & 0 & no extra space is needed after the key\\
- & 1 & we must type a space after the key\\
- \#5 & integer & if 3, it means that we must not put a flat after the key, otherwise it's the height of the flat\\
+ \#1 & character & the type of the key: c or f\\
+ \#2 & integer & the line of the key (1 is the lowest)\\
+ \#3 & \texttt{0} & no need to use small key characters (inside a line)\\
+ & \texttt{1} & we must use small key characters (inside a line)\\
+ \#4 & \texttt{0} & no extra space is needed after the key\\
+ & \texttt{}1 & we must type a space after the key\\
+ \#5 & integer & if \texttt{3}, it means that we must not put a flat after the key, otherwise it’s the height of the flat\\
\end{argtable}
\macroname{\textbackslash gre@updateleftbox}{}{gregoriotex-main.tex}
@@ -632,15 +629,15 @@ Macro for calculating the width of its argument and storing it in \verb=\gre@dim
Macro to write a bar.
\begin{argtable}
- \#1 & 0 & virgula\\
- & 1 & minima\\
- & 2 & minor\\
- & 3 & major\\
- & 4 & finalis\\
- & 5 & the last finalis\\
- \#2 & 0 & in a syllable containing only this bar\\
- & 1 & in a syllable containing other notes\\
- \#3 & \TeX\ code & macros that may happen before the skip after the bar (typically GreVEpisemus)\\
+ \#1 & \texttt{0} & virgula\\
+ & \texttt{1} & minima\\
+ & \texttt{2} & minor\\
+ & \texttt{3} & major\\
+ & \texttt{4} & finalis\\
+ & \texttt{5} & the last finalis\\
+ \#2 & \texttt{0} & in a syllable containing only this bar\\
+ & \texttt{1} & in a syllable containing other notes\\
+ \#3 & \TeX\ code & macros that may happen before the skip after the bar (typically GreVEpisema)\\
\end{argtable}
\macroname{\textbackslash gre@@arg}{}{gregoriotex-syllable.tex}
@@ -653,17 +650,17 @@ A dummy macro which has not contents. Used for \verb=\ifx= comparisons.
Workhorse function behind \verb=\greannotation=.
\begin{argtable}
- \#1 & \texttt{c} & center align the new line with the existing annotation content\\
- & \texttt{l} & left align the new line with the existing annotation content\\
- & \texttt{r} & right align the new line with the existing annotation content\\
- \#2 & string & the new annotation content\\
+ \#1 & \texttt{c} & center align the new line with the existing annotation content\\
+ & \texttt{l} & left align the new line with the existing annotation content\\
+ & \texttt{r} & right align the new line with the existing annotation content\\
+ \#2 & string & the new annotation content\\
\end{argtable}
\macroname{\textbackslash gre@atletter}{}{gregoriotex-main.tex}
-A Lua\TeX\ catcode table which makes sure that Lua\TeX\ treats `@' corectly.
+A Lua\TeX\ catcode table which makes sure that Lua\TeX\ treats `@‘ corectly.
\macroname{\textbackslash gre@baseunit}{}{gregoriotex-spaces.tex}
-The units attached to base dimension in a string distance. These units are extracted as part of coercing one distance to have the same units as another (\verb=\gre@consistentunits=).
+The units attached to base dimension in a string distance. These units are extracted as part of coercing one distance to have the same units as another\\ (\verb=\gre@consistentunits=).
\macroname{\textbackslash gre@stretchunit}{}{gregoriotex-spaces.tex}
The units attached to stretch dimension in a string distance. These units are extracted as part of coercing one distance to have the same units as another (\verb=\gre@consistentunits=).
@@ -675,38 +672,33 @@ The units attached to shrink dimension in a string distance. These units are ex
Macro for raising a bug error when some calculation goes awry and comes up with a non-sensical result. Generally will be found in Lua code, not \TeX\ code.
\macroname{\textbackslash gre@changestyle}{\#1\#2[\#3]}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Workhorse function behind \verb=\grechangestyle=. Necessary because the internals of the definition are slightly different in \LaTeX\ and Plain\TeX.
+Workhorse function behind \verb=\grechangestyle=. Necessary because the internals of the definition are slightly different in \LaTeX\ and Plain \TeX.
\macroname{\textbackslash gre@calculate@bolshift}{\#1\#2}{gregoriotex-spaces.tex}
-Macro used in \verb=\GreSyllable=. Sets \verb=\gre@skip@bolshift= to the left kern that should appear at the beginning of a line in case of a forced linebreak. The goal of this left kern is to have all lines aligned on notes.
+Macro used in \verb=\GreSyllable=. Sets \verb=\gre@skip@bolshift= to the left kern that should appear at the beginning of a line in case of a forced linebreak. The goal of this left kern is to have all lines aligned on notes. This shift is applied to the right before every syllable and then to the left after placing an empty box. At the beginning of the line the shift to the right is ignored by \TeX\ as leading white space, but the shift left is not because of the presence of the “character” of the empty box.
\begin{argtable}
- \#1 & dimension & \verb=\gre@dimen@begindifference= of the first syllable of the line\\
- \#2 & 0 & No need to worry about a Lua\TeX\ bug\\
- & 1 & Apply correction for Lua\TeX\ bug\\
+ \#1 & dimension & \verb=begindifference= of the syllable\\
\end{argtable}
\macroname{\textbackslash gre@calculate@eolshift}{\#1}{gregoriotex-spaces.tex}
Macro used in \verb=\GreSyllable=. Sets \verb=\gre@skip@eolshift= to the left kern that
should appear before an end of line. The improvement is tiny: when
text go further than notes in the last syllable of a line, the idea
-is to allow text to go a bit further right, under the custos.
-\verb=\gre@skip@eolshift= should be called at the end of the last syllable of the
-line, just before the linebreak penalty, so that LaTeX believes the
-line is a bit shorter, and expands it more.
+is to allow text to go a bit further right, under the custos. This shift is applied to the left after every syllable and then to the right after setting the line break penalty. If the line break occurs after this syllable, it will occur between the two shifts, pushing the shift right to the beginning of the next line where \TeX\ will ignore it as leading white space.
\begin{argtable}
- \#1 & dimension & The \verb=\gre@dimen@enddifference= of the corresponding syllable\\
+ \#1 & dimension & The \verb=enddifference= of the corresponding syllable\\
\end{argtable}
\macroname{\textbackslash gre@calculate@syllablefinalskip}{\#1\#2}{gregoriotex-spaces.tex}
Macro computing the skip at the end of the syllable.
\begin{argtable}
- \#1 & 0 & if end of syllable\\
- & 1 & if end of word\\
- \#2 & 0 & if next syllable is normal\\
- & 1 & if it's a bar\\
+ \#1 & \texttt{0} & if end of syllable\\
+ & \texttt{1} & if end of word\\
+ \#2 & \texttt{0} & if next syllable is normal\\
+ & \texttt{1} & if it’s a bar\\
\end{argtable}
\macroname{\textbackslash gre@convert}{}{gregoriotex-spaces.tex}
@@ -719,46 +711,46 @@ Macro to hold the list of debug messages which should be designated as printing.
Macro to print debugging messages.
\begin{argtable}
- \#1 & string & The category of the message (used in conjunction with \verb=\gre@debug= to determine whether to print the message or not\\
- \#2 & string & The debug message\\
+ \#1 & string & The category of the message (used in conjunction with \verb=\gre@debug= to determine whether to print the message or not\\
+ \#2 & string & The debug message\\
\end{argtable}
\macroname{\textbackslash gre@declarefileversion}{\#1\#2}{gregoriotex-main.tex}
Macro which checks for version consistency between Gregorio\TeX\ files.
\begin{argtable}
- \#1 & string & name of the current file\\
- \#2 & string & version of the current file\\
+ \#1 & string & name of the current file\\
+ \#2 & string & version of the current file\\
\end{argtable}
\macroname{\textbackslash gre@def@char@he}{\#1\#2}{gregoriotex-chars.tex}
Macro for defining the various types of horizontal episema.
\begin{argtable}
- \#1 & string & name of the horizontal episemus to be defined\\
- \#2 & string & Camel case name of horizontal episemus to be defined\\
+ \#1 & string & name of the horizontal episema to be defined\\
+ \#2 & string & Camel case name of horizontal episema to be defined\\
\end{argtable}
\macroname{\textbackslash gre@def@char@he@porr}{\#1\#2}{gregoriotex-chars.tex}
Macro for defining the various types of horizontal episema porrectus.
\begin{argtable}
- \#1 & string & name of the horizontal episemus porrectus to be defined\\
- \#2 & string & Camel case name of horizontal episemus porrectus to be defined\\
+ \#1 & string & name of the horizontal episema porrectus to be defined\\
+ \#2 & string & Camel case name of horizontal episema porrectus to be defined\\
\end{argtable}
\macroname{\textbackslash gre@char@cavum}{\#1\#2\#3\#4\#5\#6\#7\#8}{gregoriotex-signs.tex}
-Macro to typeset a "cavum" character.
+Macro to typeset a “cavum” character.
\begin{argtable}
- \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
- \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
- \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
- \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
- \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
- \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.\\
- \#7 & control sequence & The control sequence for the glyph.\\
- \#8 & control sequence & The control sequence for the hole glyph.
+ \#1 & length & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+ \#2 & length & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+ \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+ \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
+ \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+ \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.\\
+ \#7 & control sequence & The control sequence for the glyph.\\
+ \#8 & control sequence & The control sequence for the hole glyph.
\end{argtable}
\macroname{\textbackslash gre@get@spaceskip}{\#1}{gregoriotex-signs.tex}
@@ -766,18 +758,18 @@ Loads \verb=\gre@skip@temp@four= with the appropriate rubber length given the
desired case.
\begin{argtable}
- \#1 & 0 & Default space.\\
- & 1 & Zero-width space.\\
- & 2 & Space between flat or natural and a note.\\
- & 3 & Space between two puncta inclinata.\\
- & 4 & Space between bivirga or trivirga.\\
- & 5 & space between bistropha or tristropha.\\
- & 6 & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
- & 7 & Space between a punctum inclinatum and a punctum inclinatum debilis.\\
- & 8 & Space between two puncta inclinata debilis.\\
- & 9 & Space before a punctum (or something else) and a punctum inclinatum.\\
- & 10 & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\
- & 11 & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).\\
+ \#1 & \texttt{0} & Default space.\\
+ & \texttt{1} & Zero-width space.\\
+ & \texttt{2} & Space between flat or natural and a note.\\
+ & \texttt{3} & Space between two puncta inclinata.\\
+ & \texttt{4} & Space between bivirga or trivirga.\\
+ & \texttt{5} & space between bistropha or tristropha.\\
+ & \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
+ & \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis.\\
+ & \texttt{8} & Space between two puncta inclinata debilis.\\
+ & \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
+ & \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\
+ & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).\\
\end{argtable}
\macroname{\textbackslash gre@nabcfontname}{}{gregoriotex-main.tex}
@@ -808,14 +800,14 @@ Macro which stores the middle part of the next syllable (the part which aligns w
A macro which applies formatting that needs to apply to the whole syllable (rather than the parts individually) for the current syllable. Necessary to preserve ligatures across parts within a syllable.
\begin{argtable}
- \#1 & string & The syllable (usually built as \verb=\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart=\\
+ \#1 & string & The syllable (usually built as \verb=\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart=\\
\end{argtable}
\macroname{\textbackslash gre@fixednexttextformat}{\#1}{gregoriotex-syllable.tex}
A macro which applies formatting that needs to apply to the whole syllable (rather than the parts individually) for the next syllable. Necessary to preserve ligatures across parts within a syllable.
\begin{argtable}
- \#1 & string & The syllable (usually built as \verb=\gre@nextfirstsyllablepart\gre@nextmiddlesyllablepart\gre@nextendsyllablepart=\\
+ \#1 & string & The syllable (usually built as \verb=\gre@nextfirstsyllablepart\gre@nextmiddlesyllablepart\gre@nextendsyllablepart=\\
\end{argtable}
\macroname{\textbackslash gre@gabcname}{}{gregoriotex-main.tex}
@@ -855,43 +847,43 @@ If any note appears below this pitch, the space below the lines must be adjusted
Macro to generate the point-and-click links.
\begin{argtable}
- \#1 & \TeX\ code & the entity which is to contain the link\\
- \#2 & link target & line:char:column for the link\\
+ \#1 & \TeX\ code & the entity which is to contain the link\\
+ \#2 & link target & line:char:column for the link\\
\end{argtable}
\macroname{\textbackslash gre@prefix}{}{gregoriotex-spaces.tex}
-Either ``skip'' or ``dimen'' according to the distance being set or changed at the given moment.
+Either ``skip’’ or ``dimen’’ according to the distance being set or changed at the given moment.
\macroname{\textbackslash gre@rubberpermit}{\#1}{gregoriotex-spaces.tex}
Determines whether the given distance is allowed to take a rubber length.
\begin{argtable}
- \#1 & string & the name of the distance to check\\
+ \#1 & string & the name of the distance to check\\
\end{argtable}
\macroname{\textbackslash gre@setgregoriofont}{[\#1]\#2}{gregoriotex-main.tex}
Workhorse function behind \verb=\gresetgregoriofont=.
\begin{argtable}
- \#1 & \textit{(omitted)} & Use the normal font and rule set (default).\\
- & op & Use the alternate Dominican font/rule set.\\
- \#2 & greciliae & Use the Greciliae font (default).\\
- & gregorio & Use the Gregorio font.\\
- & parmesan & Use the Parmesan font.\\
+ \#1 & \textit{(omitted)} & Use the normal font and rule set (default).\\
+ & \texttt{op} & Use the alternate Dominican font/rule set.\\
+ \#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
+ & \texttt{gregorio} & Use the Gregorio font.\\
+ & \texttt{parmesan} & Use the Parmesan font.\\
\end{argtable}
\macroname{\textbackslash gre@syllable@end}{\#1\#2\#3}{gregoriotex-syllable.tex}
Macro to make a few checks and call the right macros between \verb=\endbeforebar, \endofword, \endofsyllable=.
\begin{argtable}
- \#1 & & next syllable type (\#7 of \verb=\GreSyllable=)\\
- \#2 & string & next syllable text\\
- \#3 & 0 & this syllable is not the end of a word\\
- & 1 & this syllable is the end of a word\\
+ \#1 & & next syllable type (\#7 of \verb=\GreSyllable=)\\
+ \#2 & string & next syllable text\\
+ \#3 & \texttt{0} & this syllable is not the end of a word\\
+ & \texttt{1} & this syllable is the end of a word\\
\end{argtable}
\macroname{\textbackslash gre@typeout}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Macro which points to \verb=\typeout= in \LaTeX\ or \verb=\message= in Plain\TeX.
+Macro which points to \verb=\typeout= in \LaTeX\ or \verb=\message= in Plain \TeX.
\macroname{\textbackslash gre@unsetfixedtextformat}{}{gregoriotex-syllable.tex}
Macro which changes \verb=\gre@fixedtextformat= back to normal text.
@@ -906,10 +898,10 @@ Empty macro which is used to determine if the symbols have been loaded and preve
Alias for \verb=\hskip= or \verb=\kern=. We use this rather than those functions directly so that the same element can appear in discretionaries where \verb=\kern= is allowed but \verb=\hskip= is not by simply changing the assignment of this macro when we enter one.
\macroname{\textbackslash gre@localleftbox}{}{gregoriotex-main.tex}
-Alias for \verb=\luatexlocalleftbox=.
+Alias for \verb=\luatexlocalleftbox= or \verb=\localleftbox=, depending on \LaTeX\ version.
\macroname{\textbackslash gre@localrightbox}{}{gregoriotex-main.tex}
-Alias for \verb=\luatexlocalrightbox=.
+Alias for \verb=\luatexlocalrightbox= or \verb=\localrightbox=, depending on \LaTeX\ version.
\macroname{\textbackslash gre@resizebox}{}{gregoriotex-main.tex}
Alias for \verb=\resizebox=.
@@ -933,7 +925,7 @@ Macro for closing the auxiliary file.
Macro for writing the auxiliary file.
\begin{argtable}
- \#1 & string & contents to be written to the auxiliary file\\
+ \#1 & string & contents to be written to the auxiliary file\\
\end{argtable}
@@ -941,7 +933,7 @@ Macro for writing the auxiliary file.
Gregorio\TeX\ loads a number of fonts which are referred to by the following macros.
\macroname{\textbackslash gre@font@music}{}{gregoriotex-main.tex}
-The font for the neumes.
+The font for the neumes and other principle score elements.
\macroname{\textbackslash gre@font@style}{}{gregoriotex-main.tex}
The font for some of the extra characters, such as the bar for barred letters.
@@ -950,10 +942,10 @@ The font for some of the extra characters, such as the bar for barred letters.
The font for ancient notation.
\macroname{\textbackslash gre@font@biginitial}{}{gregoriotex.tex}
-The font for the default big initial format in Plain\TeX.
+The font for the default big initial format in Plain \TeX.
\macroname{\textbackslash gre@font@initial}{}{gregoriotex.tex}
-The font for the default initial format in Plain\TeX.
+The font for the default initial format in Plain \TeX.
\subsection{Character Reference Aliases}
@@ -1013,8 +1005,8 @@ The punctum mora character.
\macroname{\textbackslash gre@fontchar@underbrace}{}{gregoriotex-signs.tex}
The under brace character.
-\macroname{\textbackslash gre@fontchar@verticalepisemus}{}{gregoriotex-chars.tex}
-The vertical episemus character.
+\macroname{\textbackslash gre@fontchar@verticalepisema}{}{gregoriotex-chars.tex}
+The vertical episema character.
\macroname{\textbackslash gre@fontchar@brace}{}{gregoriotex-signs.tex}
The (rounded) brace character.
@@ -1107,8 +1099,8 @@ Boolean used to specify whether the staff lines behind a punctum cavum should be
\macroname{\textbackslash ifgre@hidealtlines}{}{gregoriotex-signs.tex}
Boolean used to specify whether the staff lines behind an alteration should be hidden.
-\macroname{\textbackslash ifgre@hepisemusbridge}{}{gregoriotex-signs.tex}
-Boolean used to specify whether adjacent horizontal episema should be joined together.
+\macroname{\textbackslash ifgre@hepisemabridge}{}{gregoriotex-signs.tex}
+Boolean used to specify whether adjacent horizontal episemata should be joined together.
\macroname{\textbackslash ifgre@drawbraces}{}{gregoriotex-signs.tex}
Boolean used to specify whether braces should be drawn by \MP{} as
@@ -1118,7 +1110,7 @@ opposed to rendered via the score font.
Count to track whether the initial is big (2-lines) or normal (1-line).
\macroname{\textbackslash ifgre@boxing}{}{gregoriotex-syllable.tex}
-Boolean to track whether we're placing the contents of syllable notes into their box or actually printing that box (helps prevent spurious spaces from occurring when the box is being filled but not printed).
+Boolean to track whether we’re placing the contents of syllable notes into their box or actually printing that box (helps prevent spurious spaces from occurring when the box is being filled but not printed).
\macroname{\textbackslash ifgre@mustdotranslationcenterend}{}{gregoriotex-main.tex}
Boolean to track whether we must do translation centering.
@@ -1148,13 +1140,13 @@ A Lua\TeX\ attribute which identifies the high point of the glyph. Used for dyn
A Lua\TeX\ attribute which identifies the low point of the glyph. Used for dynamic line spacing.
\macroname{\textbackslash gre@clivisalignment}{}{gregoriotex-syllable.tex}
-Count to indicate how the clivis is to be aligned with its respective syllable text. Values: 0) always align clivis on its center; 1) align clivis on first punctum; 2) align clivis on its center, except if notes would go left of text or consonants after vowels are larger than \verb=\gre@dimen@clivisalignmentmin=.
+Count to indicate how the clivis is to be aligned with its respective syllable text. Values: \texttt{0}) always align clivis on its center; \texttt{1}) align clivis on first punctum; \texttt{2}) align clivis on its center, except if notes would go left of text or consonants after vowels are larger than \verb=\gre@dimen@clivisalignmentmin=.
\macroname{\textbackslash gre@insidediscretionary}{}{gregoriotex-signs.tex}
-Macro which indicates whether we are currently inside a discretionary (1) or not (0). Cannot be converted to a \TeX\ boolean because it's value needs to be passed to Lua.
+Macro which indicates whether we are currently inside a discretionary (\texttt{1}) or not (\texttt{0}). Cannot be converted to a \TeX\ boolean because it’s value needs to be passed to Lua.
\macroname{\textbackslash ifgre@isonaline}{}{gregoriotex-syllable.tex}
-Boolean which indicates whether the current note is on a line or not (used to adjust the height of some symbols so they won't print on a line).
+Boolean which indicates whether the current note is on a line or not (used to adjust the height of some symbols so they won’t print on a line).
\macroname{\textbackslash ifgre@lastispunctum}{}{gregoriotex-syllable.tex}
Boolean which indicates if the most recent note was a punctum mora.
@@ -1163,7 +1155,7 @@ Boolean which indicates if the most recent note was a punctum mora.
Boolean for storing \verb=\ifgre@lastispunctum= so that it can be restored later.
\macroname{\textbackslash gre@nlbstate}{}{gregoriotex-main.tex}
-Macro which indicates if we are in a no line break area due to translation centering (1), an explicit no line break designation in the gabc (2), or not at all (0).
+Macro which indicates if we are in a no line break area due to translation centering (\texttt{1}), an explicit no line break designation in the gabc (\texttt{2}), or not at all (\texttt{0}).
\macroname{\textbackslash gre@nlbinitialstate}{}{gregoriotex-main.tex}
Macro to store \verb=\gre@nlbstate= as we initialize or end a no line break area so that we can manipulate said flag as part of the process.
@@ -1175,16 +1167,16 @@ Boolean which specifies whether the style font should be loaded or not.
Boolean which specifies if we have to keep the localrightbox until the end.
\macroname{\textbackslash gre@compilegabc}{}{gregoriotex-main.tex}
-Macro which specifies the default compilation behavior: never compile (0), auto compile (1), or always compile (2).
+Macro which specifies the default compilation behavior: never compile (\texttt{0}), auto compile (\texttt{1}), or always compile (\texttt{2}).
\macroname{\textbackslash ifgre@nabcfontloaded}{}{gregoriotex-nabc.tex}
Boolean which indicates whether the \texttt{nabc} font has been loaded.
\macroname{\textbackslash gre@generate@pointandclick}{}{gregoriotex-syllable.tex}
-Count which indicates whether the point-and-click functionality should be implemented (1) or not (0). Not a boolean because it needs to be readable by Lua.
+Count which indicates whether the point-and-click functionality should be implemented (\texttt{1}) or not (\texttt{0}). Not a boolean because it needs to be readable by Lua.
\macroname{\textbackslash gre@variableheightexpansion}{}{gregoriotex-main.tex}
-Count to indicated if the spacing between lines should be variable (1) or fixed (0). Not a boolean because it needs to be readable by Lua.
+Count to indicated if the spacing between lines should be variable (\texttt{1}) or fixed (\texttt{0}). Not a boolean because it needs to be readable by Lua.
\macroname{\textbackslash ifgre@blockeolcustos}{}{gregoriotex-main.tex}
Boolean which indicates whether the custos at the end of the line should be blocked.
@@ -1210,6 +1202,14 @@ Boolean which indicates that the last line of the score should be justified.
\macroname{\textbackslash ifgre@showclef}{}{gregoriotex-main.tex}
Boolean which indicates that the clef should be visible.
+\macroname{\textbackslash ifgre@forceemptyfirstsyllablehyphen}{}{gregoriotex-syllable.tex}
+Boolean which indicates that a hyphen after an empty first syllable should be forced.
+
+\macroname{\textbackslash ifgre@showhyphenafterthissyllable}{}{gregoriotex-syllable.tex}
+Boolean used by \verb=\GreSyllable= to decide if a hyphen should be shown after the syllable.
+
+\macroname{\textbackslash ifgre@scale@stafflinefactor}{}{gregoriotex-spaces.tex}
+Boolean indicating whether the stafflinefactor should scale with changes of \texttt{grefactor}, or not.
@@ -1248,7 +1248,7 @@ Box holding the notes associated with a syllable.
Box holding the text associated with a syllable.
\macroname{\textbackslash gre@box@hep}{}{gregoriotex-chars.tex}
-Box holding the horizontal episemus.
+Box holding the horizontal episema.
\subsection{Distances}
@@ -1304,7 +1304,7 @@ Dimension representing the space allocated above the lines for text.
The total height of the staff including the width of the lines and the spaces between them.
\macroname{\textbackslash gre@dimen@stafflinediff}{}{gregoriotex-spaces.tex}
-Distance representing the difference between the actual size of the staff lines and the ``standard'' size.
+Distance representing the difference between the actual size of the staff lines and the ``standard’’ size.
\macroname{\textbackslash gre@dimen@stafflineheight}{}{gregoriotex-spaces.tex}
The height of the staff line.
@@ -1401,21 +1401,21 @@ These are the macros that Gregorio\TeX\ uses to manipulate the penalties in orde
Top level function that aliases \verb=\gre@truepenalty= or \verb=\gre@falsepenalty= according to whether penalties should be in play or not.
\begin{argtable}
- \#1 & integer & The penalty to be applied or gobbled\\
+ \#1 & integer & The penalty to be applied or gobbled\\
\end{argtable}
\macroname{\textbackslash gre@truepenalty}{\#1}{gregoriotex-signs.tex}
Alias for \verb=\penalty=.
\begin{argtable}
- \#1 & integer & The penalty to be applied\\
+ \#1 & integer & The penalty to be applied\\
\end{argtable}
\macroname{\textbackslash gre@falsepenalty}{\#1}{gregoriotex-signs.tex}
Macro to gobble (suppress) its argument.
\begin{argtable}
- \#1 & integer & The penalty to be gobbled\\
+ \#1 & integer & The penalty to be gobbled\\
\end{argtable}
\macroname{\textbackslash gre@cancelpenalties}{}{gregoriotex-spaces.tex}
@@ -1424,12 +1424,6 @@ Macro called at the beginning of the score to swap text penalties for score pena
\macroname{\textbackslash gre@restorepenalties}{}{gregoriotex-spaces.tex}
Macro called at the end of the score to restore the text penalties.
-\macroname{\textbackslash gre@dofinetuning}{}{gregoriotex-spaces.tex}
-Macro called at the beginning of the score to swap text penalties for score penalties.
-
-\macroname{\textbackslash gre@endfinetuning}{}{gregoriotex-spaces.tex}
-Macro called at the end of the score to restore the text penalties.
-
\macroname{\textbackslash gre@brokenpenaltysave}{}{gregoriotex-spaces.tex}
A place to save the current value of the broken penalty so that we can change it temporarily and then restore it later.
@@ -1483,8 +1477,8 @@ A place to save the current value of the pretolerance so that we can change it t
-\subsection{\LaTeX/Plain\TeX\ compatibility}
-While every effort has been made to use only primitives which are compatible with both \LaTeX\ and Plain\TeX, it is sometimes necessary to use primitives which are defined for one but not the other (usually its \LaTeX\ that has what we need built in). In these cases we have to provide an equivalent macro to the \TeX\ version which is lacking.
+\subsection{\LaTeX/Plain \TeX\ compatibility}
+While every effort has been made to use only primitives which are compatible with both \LaTeX\ and Plain \TeX, it is sometimes necessary to use primitives which are defined for one but not the other (usually its \LaTeX\ that has what we need built in). In these cases we have to provide an equivalent macro to the \TeX\ version which is lacking.
\macroname{\textbackslash MessageBreak}{}{gregoriotex.tex}
Creates a line break in typeout, warning, bug, and error messages. Copied from \LaTeX\ source.
@@ -1505,24 +1499,24 @@ rather than have multiple definitions.
\subsection{Note Alignment Type}\label{notesalign}
\rowcolors{1}{lightgray}{lightgray}
\begin{tabulary}{\textwidth}{cL}
- \multicolumn{2}{c}{Integer with the following possibilities:} \\
- \hline
- 0 & one-note glyph or more than two notes glyph except porrectus : here we must put the aligncenter in the middle of the first note\\
- 1 & two notes glyph (podatus is considered as a one-note glyph) : here we put the aligncenter in the middle of the glyph\\
- 2 & porrectus : has a special align center\\
- 3 & initio-debilis : same as 1 but the first note is much smaller\\
- 4 & case of a glyph starting with a quilisma\\
- 5 & case of a glyph starting with an oriscus\\
- 6 & case of a punctum inclinatum\\
- 7 & case of a stropha\\
- 8 & flexus with an ambitus of one\\
- 9 & flexus deminutus\\
- 10 & virgula\\
- 11 & divisio minima, minor and maior\\
- 12 & divisio finalis
+ \multicolumn{2}{c}{Integer with the following possibilities:} \\
+ \hline
+ \texttt{0} & one-note glyph or more than two notes glyph except porrectus : here we must put the aligncenter in the middle of the first note\\
+ \texttt{1} & two notes glyph (podatus is considered as a one-note glyph) : here we put the aligncenter in the middle of the glyph\\
+ \texttt{2} & porrectus : has a special align center\\
+ \texttt{3} & initio-debilis : same as 1 but the first note is much smaller\\
+ \texttt{4} & case of a glyph starting with a quilisma\\
+ \texttt{5} & case of a glyph starting with an oriscus\\
+ \texttt{6} & case of a punctum inclinatum\\
+ \texttt{7} & case of a stropha\\
+ \texttt{8} & flexus with an ambitus of one\\
+ \texttt{9} & flexus deminutus\\
+ \texttt{10} & virgula\\
+ \texttt{11} & divisio minima, minor and maior\\
+ \texttt{12} & divisio finalis
\end{tabulary}
-\subsection{Episemus Special}\label{EpisemusSpecial}
+\subsection{Episema Special}\label{EpisemaSpecial}
\definecolor{shadecolor}{named}{lightgray}%
\begin{shaded*}%
\vspace{-1.4\baselineskip}
@@ -1531,66 +1525,66 @@ rather than have multiple definitions.
\hrule
\vspace{-0.8\baselineskip}
\begin{description}
- \item[FinalPunctum] Last note, which is a standard punctum (works with pes).
- \item[FinalDeminutus] Same, but the last note is a deminutus.
- \item[PenultBeforePunctumWide] The note before the last note, which is a standard punctum.
- \item[PenultBeforeDeminutus] Idem, but the note is the note preceding a deminutus.
- \item[AntepenultBeforePunctum] The note before the note before the last note (for porrectus flexus).
- \item[AntepenultBeforeDeminutus] Idem, but when the two last notes are a deminutus.
- \item[InitialPunctum] The first note, if it is a standard punctum.
- \item[InitioDebilis] The first note, if it is an initio debilis.
- \item[PorrNonAuctusInitialWide] first note of a non-auctus porrectus with a second ambitus of at least two.
- \item[PorrNonAuctusInitialOne] first note of a non-auctus porrectus with a second ambitus of one
- \item[PorrAuctusInitialAny] first note of an auctus porrectus, regardless of second ambitus
- \item[FinalInclinatum] punctum inclinatum as last note
- \item[FinalInclinatumDeminutus] punctum inclinatum deminutus as last note
- \item[FinalStropha] stropha as last note
- \item[FinalQuilisma] quilisma as last note
- \item[FinalOriscus] oriscus as last note
- \item[PenultBeforePunctumOne] second-to-last note, with a second ambitus of one, when last note is a standard punctum (like the second note of ghg)
- \item[FinalUpperPunctum] "upper smaller punctum" as last note (concerning simple podatus, podatus, and torculus resupinus)
- \item[InitialOriscus] oriscus as first note, disconnected from next note
- \item[InitialQuilisma] quilisma as first note, disconnected from next note
- \item[TorcResNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with a punctum, with a first and second ambitus of at least two
- \item[TorcResNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with a punctum, with a first ambitus of one and a second ambitus of at least two
- \item[TorcResDebilisNonAuctusSecondAnyWide] second note of a non-auctus torculus resupinus initio debilis with any first ambitus and a second ambitus of at least two
- \item[FinalLineaPunctum] linea punctum (cavum) as last note
- \item[BarStandard] standard bar
- \item[BarVirgula] virgula
- \item[BarDivisioFinalis] divisio finalis
- \item[TorcResQuilismaNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with a quilisma, with a first and second ambitus of at least two
- \item[TorcResOriscusNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with an oriscus, with a first and second ambitus of at least two
- \item[TorcResQuilismaNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with a quilisma, with a first ambitus of one and and second ambitus of at least two
- \item[TorcResOriscusNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with an oriscus, with a first ambitus of one and and second ambitus of at least two
- \item[TorcResNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with a punctum, with a first ambitus of at least two and a second ambitus of one
- \item[TorcResDebilisNonAuctusSecondAnyOne] second note of a non-auctus torculus resupinus initio debilis with any first ambitus and a second ambitus of one
- \item[TorcResQuilismaNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with a quilisma, with a first ambitus of at least two and a second ambitus of one
- \item[TorcResOriscusNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with an oriscus, with a first ambitus of at least two and a second ambitus of one
- \item[TorcResNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with a punctum, with a first and second ambitus of one
- \item[TorcResQuilismaNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with a quilisma, with a first and second ambitus of one
- \item[TorcResOriscusNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with an oriscus, with a first and second ambitus of one
- \item[TorcResAuctusSecondWideAny] second note of an auctus torculus resupinus starting with a punctum, with a first ambitus of at least two and any second ambitus
- \item[TorcResDebilisAuctusSecondAnyAny] second note of an auctus torculus resupinus initio debilis with any first and second ambitus
- \item[TorcResQuilismaAuctusSecondWideAny] second note of an auctus torculus resupinus starting with a quilisma, with a first ambitus of at least two and any second ambitus
- \item[TorcResOriscusAuctusSecondWideAny] second note of an auctus torculus resupinus starting with an oriscus, with a first ambitus of at least two and any second ambitus
- \item[TorcResAuctusSecondOneAny] second note of an auctus torculus resupinus starting with a punctum, with a first ambitus of one and any second ambitus
- \item[TorcResQuilismaAuctusSecondOneAny] second note of an auctus torculus resupinus starting with a quilisma, with a first ambitus of one and any second ambitus
- \item[TorcResOriscusAuctusSecondOneAny] second note of an auctus torculus resupinus starting with an oriscus, with a first ambitus of one and any second ambitus
- \item[ConnectedPenultBeforePunctumWide] second-to-last note connected to prior note, with a second ambitus of at least two, when last note is a standard punctum (like the second note of \textit{gig})
- \item[ConnectedPenultBeforePunctumOne] second-to-last note connected to prior note, with a second ambitus of one, when last note is a standard punctum (like the second note of \textit{gih})
- \item[InitialConnectedPunctum] standard punctum as first note, connected to next higher note
- \item[InitialConnectedVirga] "virga" as first note, connected to next lower note
- \item[InitialConnectedQuilisma] quilisma as first note, connected to next higher note
- \item[InitialConnectedOriscus] oriscus as first note, connected to next higher note
- \item[FinalConnectedPunctum] punctum as last note, connected to prior higher note
- \item[FinalConnectedAuctus] auctus as last note, connected to prior lower note
- \item[FinalVirgaAuctus] virga aucta as last note
- \item[FinalConnectedVirga] "virga" as last note, connected to prior lower note
- \item[InitialVirga] "virga" as first note, disconnected from next note
+ \item[FinalPunctum] Last note, which is a standard punctum (works with pes).
+ \item[FinalDeminutus] Same, but the last note is a deminutus.
+ \item[PenultBeforePunctumWide] The note before the last note, which is a standard punctum.
+ \item[PenultBeforeDeminutus] Idem, but the note is the note preceding a deminutus.
+ \item[AntepenultBeforePunctum] The note before the note before the last note (for porrectus flexus).
+ \item[AntepenultBeforeDeminutus] Idem, but when the two last notes are a deminutus.
+ \item[InitialPunctum] The first note, if it is a standard punctum.
+ \item[InitioDebilis] The first note, if it is an initio debilis.
+ \item[PorrNonAuctusInitialWide] first note of a non-auctus porrectus with a second ambitus of at least two.
+ \item[PorrNonAuctusInitialOne] first note of a non-auctus porrectus with a second ambitus of one
+ \item[PorrAuctusInitialAny] first note of an auctus porrectus, regardless of second ambitus
+ \item[FinalInclinatum] punctum inclinatum as last note
+ \item[FinalInclinatumDeminutus] punctum inclinatum deminutus as last note
+ \item[FinalStropha] stropha as last note
+ \item[FinalQuilisma] quilisma as last note
+ \item[FinalOriscus] oriscus as last note
+ \item[PenultBeforePunctumOne] second-to-last note, with a second ambitus of one, when last note is a standard punctum (like the second note of ghg)
+ \item[FinalUpperPunctum] “upper smaller punctum” as last note (concerning simple podatus, podatus, and torculus resupinus)
+ \item[InitialOriscus] oriscus as first note, disconnected from next note
+ \item[InitialQuilisma] quilisma as first note, disconnected from next note
+ \item[TorcResNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with a punctum, with a first and second ambitus of at least two
+ \item[TorcResNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with a punctum, with a first ambitus of one and a second ambitus of at least two
+ \item[TorcResDebilisNonAuctusSecondAnyWide] second note of a non-auctus torculus resupinus initio debilis with any first ambitus and a second ambitus of at least two
+ \item[FinalLineaPunctum] linea punctum (cavum) as last note
+ \item[BarStandard] standard bar
+ \item[BarVirgula] virgula
+ \item[BarDivisioFinalis] divisio finalis
+ \item[TorcResQuilismaNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with a quilisma, with a first and second ambitus of at least two
+ \item[TorcResOriscusNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with an oriscus, with a first and second ambitus of at least two
+ \item[TorcResQuilismaNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with a quilisma, with a first ambitus of one and and second ambitus of at least two
+ \item[TorcResOriscusNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with an oriscus, with a first ambitus of one and and second ambitus of at least two
+ \item[TorcResNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with a punctum, with a first ambitus of at least two and a second ambitus of one
+ \item[TorcResDebilisNonAuctusSecondAnyOne] second note of a non-auctus torculus resupinus initio debilis with any first ambitus and a second ambitus of one
+ \item[TorcResQuilismaNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with a quilisma, with a first ambitus of at least two and a second ambitus of one
+ \item[TorcResOriscusNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with an oriscus, with a first ambitus of at least two and a second ambitus of one
+ \item[TorcResNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with a punctum, with a first and second ambitus of one
+ \item[TorcResQuilismaNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with a quilisma, with a first and second ambitus of one
+ \item[TorcResOriscusNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with an oriscus, with a first and second ambitus of one
+ \item[TorcResAuctusSecondWideAny] second note of an auctus torculus resupinus starting with a punctum, with a first ambitus of at least two and any second ambitus
+ \item[TorcResDebilisAuctusSecondAnyAny] second note of an auctus torculus resupinus initio debilis with any first and second ambitus
+ \item[TorcResQuilismaAuctusSecondWideAny] second note of an auctus torculus resupinus starting with a quilisma, with a first ambitus of at least two and any second ambitus
+ \item[TorcResOriscusAuctusSecondWideAny] second note of an auctus torculus resupinus starting with an oriscus, with a first ambitus of at least two and any second ambitus
+ \item[TorcResAuctusSecondOneAny] second note of an auctus torculus resupinus starting with a punctum, with a first ambitus of one and any second ambitus
+ \item[TorcResQuilismaAuctusSecondOneAny] second note of an auctus torculus resupinus starting with a quilisma, with a first ambitus of one and any second ambitus
+ \item[TorcResOriscusAuctusSecondOneAny] second note of an auctus torculus resupinus starting with an oriscus, with a first ambitus of one and any second ambitus
+ \item[ConnectedPenultBeforePunctumWide] second-to-last note connected to prior note, with a second ambitus of at least two, when last note is a standard punctum (like the second note of \textit{gig})
+ \item[ConnectedPenultBeforePunctumOne] second-to-last note connected to prior note, with a second ambitus of one, when last note is a standard punctum (like the second note of \textit{gih})
+ \item[InitialConnectedPunctum] standard punctum as first note, connected to next higher note
+ \item[InitialConnectedVirga] “virga” as first note, connected to next lower note
+ \item[InitialConnectedQuilisma] quilisma as first note, connected to next higher note
+ \item[InitialConnectedOriscus] oriscus as first note, connected to next higher note
+ \item[FinalConnectedPunctum] punctum as last note, connected to prior higher note
+ \item[FinalConnectedAuctus] auctus as last note, connected to prior lower note
+ \item[FinalVirgaAuctus] virga aucta as last note
+ \item[FinalConnectedVirga] “virga” as last note, connected to prior lower note
+ \item[InitialVirga] “virga” as first note, disconnected from next note
\end{description}
\end{shaded*}
%%% Local Variables:
%%% mode: latex
-%%% TeX-master: "GregorioRef"
+%%% TeX-master: “GregorioRef”
%%% End:
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Gabc.tex b/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex
index 1d6c8a626d7..13e6a70c668 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Gabc.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex
@@ -1,4 +1,5 @@
% !TEX root = GregorioRef.tex
+% !TEX program = LuaLaTeX+se
\section{The GABC File}
gabc is a simple notation based exclusively on ASCII characters that
@@ -18,7 +19,7 @@ This section will cover the elements of a gabc file.
Files written in gabc have the extension \texttt{.gabc} and have the
following structure:
-\begin{lstlisting}
+\begin{lstlisting}[autogobble]
name: incipit;
gabc-copyright: copyright on this gabc file;
score-copyright: copyright on the source score;
@@ -27,7 +28,6 @@ occasion: in church calendar;
meter: for metrical hymns;
commentary: source of words;
arranger: name of arranger;
-gabc-version: 0.9.3;
author: if known;
date: xi c;
manuscript: ms name;
@@ -36,6 +36,7 @@ manuscript-storage-place: library/monastery;
book: from which score taken;
transcriber: writer of gabc;
transcription-date: 2009;
+language: latin;
initial-style: 1;
user-notes: whatever other comments you wish to make;
mode: 6;
@@ -58,36 +59,60 @@ Here is a detailed description of each header field:
\begin{description}
\item[name] This is the name of the piece, in almost all cases the
- incipit, the first few words. In the case of the mass ordinary, the
- form as \texttt{Kyrie X Alme Pater} or \texttt{Sanctus XI} is
- recommended where appropriate. \textbf{This field is required.}
+ incipit, the first few words. In the case of the mass ordinary, the
+ form as \texttt{Kyrie X Alme Pater} or \texttt{Sanctus XI} is
+ recommended where appropriate. \textbf{This field is required.}
+\item[gabc-copyright] This license is the copyright notice (in English) of the gabc file, as chosen by the person named in the transcriber field. As well as the notice itself, it may include a brief description of the license, such as public domain, CC-by-sa; for a list of commonly found open source licenses and exceptions, please see \url{https://spdx.org/licenses/}. A separate text file will be necessary for the complete legal license. For the legal issues about Gregorian chant scores, please see \url{http://gregorio-project.github.io/legalissues}. An example of this field would be:
+ \begin{lstlisting}[autogobble]
+ gabc-copyright: CC0-1.0 by Elie Roux, 2009 <http://creativecommons.org/publicdomain/zero/1.0/>;
+ \end{lstlisting}
+\item[score-copyright] This license is the copyright notice (in English) of the score itself from which the gabc was transcribed. Like the \texttt{gabc-copyright}, there may be a brief description of the license too. In unclear or complex cases it may be omitted; it is most suitable for use when the transcriber is the copyright holder and licensor of the score as well. One again, reading the page on legal issues (linked above) is recommended. An example of this field would be:
+ \begin{lstlisting}[autogobble]
+ score-copyright: (C) Abbaye de Solesmes, 1934;
+ \end{lstlisting}
+\item[office-part] The office-part is the category of chant (in Latin), according to its liturgical rôle. Examples are: antiphona, hymnus, responsorium brevium, responsorium prolixum, introitus, graduale, tractus, offertorium, communio, kyrie, gloria, credo, sanctus, benedictus, agnus dei.
+\item[occasion] The occasion is the liturgical occasion, in Latin. For example, Dominica II Adventus, Commune doctorum, Feria secunda.
+\item[meter] For hymns and anything else with repetitive stanzas, the meter, the numbers of syllables in each line of a stanza. For example, 8.8.8.8 for typical Ambrosian-style hymns: 4 lines each of 8 syllables.
+\item[commentary] This is intended for notes about the source of the text, such as references to the Bible.
+\item[arranger] The name of a modern arranger, when a traditional chant melody has been adapted for new words, or when a manuscript is transcribed into square notation. This may be a corporate name, like Solesmes.
+\item[author] The author of the piece, if known; of course, the author of most traditional chant is not known.
+\item[date] The date of composition, or the date of earliest attestation. With most traditional chant, this will only be approximate; e.g. XI. s. for eleventh century. The convention is to put it with the latin style, like the previous examples (capital letters, roman numerals, s for seculum and the dots).
+\item[manuscript] For transcriptions direct from a manuscript, the text normally used to identify the manuscript, for example Montpellier H.159
+\item[manuscript-reference] A unique reference for the piece, according to some well-known system. For example, the reference beginning cao in the Cantus database of office chants. If the reference is unclear as to which system it uses, it should be prefixed by the name of the system. Note that this should be a reference identifying the piece, not the manuscript as a whole; anything identifying the manuscript as a whole should be put in the manuscript field.
+\item[manuscript-storage-place] For transcriptions direct from a manuscript, where the manuscript is held; e.g. Bibliothèque Nationale, Paris.
+\item[book] For transcriptions from a modern book (such as Solesmes editions; modern goes back at least to the 19th century revival), the name of the book; e.g. Liber Usualis.
+\item[transcriber] The name of the transcriber into gabc.
+\item[transcription-date] The date the gabc was written, with the following convention yyyymmdd, like 20090129 for january the 29th 2009.
+\item[language] The language of the lyrics.
+\item[initial-style] The style of the initial letter. 0 means no initial letter, 1 a normal one, and 2 a large one, on two lines. Note that if you want to use the initial on two lines, you have to specify at least the two first line breaks.
+\item[user-notes] This may contain any text in addition to the other headers -- any notes the transcriber may wish. However, it is recommended to use the specific header fields where they are suitable, so that it is easier to find particular information.
\item[mode] The mode of the piece. This should normally be an arabic
- number between 1 and 8, but may be any text required for unusual
- cases. The mode number will be converted to roman numerals and
- placed above the initial unless one of the following conditions are
- met:
- \begin{itemize}
- \item There is a \verb=\greannotation= defined immediatly prior to \verb=\gregorioscore=.
- \item The \texttt{annotation} header field is defined.
- \end{itemize}
+ number between 1 and 8, but may be any text required for unusual
+ cases. The mode number will be converted to roman numerals and
+ placed above the initial unless one of the following conditions are
+ met:
+ \begin{itemize}
+ \item There is a \verb=\greannotation= defined immediatly prior to \verb=\gregorioscore=.
+ \item The \texttt{annotation} header field is defined.
+ \end{itemize}
\item[annotation] The annotation is the text to appear above the
- initial letter. Usually this is an abbreviation of the office-part
- in the upper line, and an indication of the mode (and differentia
- for antiphons) in the lower. Either one or two annotation fields may
- be used; if two are used, the first is the upper line, the second
- the lower. Example:
- \begin{lstlisting}
- annotation:Ad Magnif.;
- annotation:VIII G;
- \end{lstlisting}
- Full \TeX markup is accepted:
- \begin{lstlisting}
- annotation:{\color{red}Ad Magnif.};
- annotation:{\color{red}VIII G};
- \end{lstlisting}
- If the user already defined annotation(s) in the main TeX file via
- \verb=\greannotation= then the \texttt{annotation} header field will not
- overwrite that definition.
+ initial letter. Usually this is an abbreviation of the office-part
+ in the upper line, and an indication of the mode (and differentia
+ for antiphons) in the lower. Either one or two annotation fields may
+ be used; if two are used, the first is the upper line, the second
+ the lower. Example:
+ \begin{lstlisting}[autogobble]
+ annotation:Ad Magnif.;
+ annotation:VIII G;
+ \end{lstlisting}
+ Full \TeX\ markup is accepted:
+ \begin{lstlisting}[autogobble]
+ annotation:{\color{red}Ad Magnif.};
+ annotation:{\color{red}VIII G};
+ \end{lstlisting}
+ If the user already defined annotation(s) in the main \TeX\ file via
+ \verb=\greannotation= then the \texttt{annotation} header field will not
+ overwrite that definition.
\end{description}
@@ -183,7 +208,7 @@ the syllabic consonants \emph{l} and \emph{r} in Czech.
By way of example, here is a vowel file that works for English:
-\begin{lstlisting}
+\begin{lstlisting}[autogobble]
alias [english] to [English];
language [English];
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_0_0.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_0_0.pdf
new file mode 100644
index 00000000000..ccf6696f01d
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_0_0.pdf
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioNabcRef.tex b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.tex
index 885976b562b..db4857191c8 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioNabcRef.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.tex
@@ -22,25 +22,25 @@
\huge{nabc language for gregorio}
\end{center}
- \vspace{1.5cm}
- \begingroup%
- \gredefbarredsymbol{Vbar}{V}{greVBar}{9.5}{0.05em}{0pt}%
- \greannotation{\scriptsize{AL}}
- \greannotation{\scriptsize{II}}
- \color{black!60}
- \setmainfont[SmallCapsFont=AlegreyaSC]{Alegreya}%
- \addtolength{\hsize}{-4cm}%
- \setlength{\fboxsep}{5mm}%
- \begin{list}{}{%
- \setlength{\topsep}{0pt}%
- \setlength{\leftmargin}{1.5cm}%
- \setlength{\rightmargin}{1.5cm}%
- \setlength{\listparindent}{0pt}%
- \setlength{\itemindent}{0pt}%
- \setlength{\parsep}{0pt}%
- }\item[]{\fbox{\parbox{\hsize}{\gregorioscore[f]{veni}}}}%
- \end{list}%
- \endgroup%
+ \vspace{1.5cm}
+ \begingroup%
+ \gredefbarredsymbol{Vbar}{V}{greVBar}{9.5}{0.05em}{0pt}%
+ \greannotation{\scriptsize{AL}}
+ \greannotation{\scriptsize{II}}
+ \color{black!60}
+ \setmainfont[SmallCapsFont=AlegreyaSC]{Alegreya}%
+ \addtolength{\hsize}{-4cm}%
+ \setlength{\fboxsep}{5mm}%
+ \begin{list}{}{%
+ \setlength{\topsep}{0pt}%
+ \setlength{\leftmargin}{1.5cm}%
+ \setlength{\rightmargin}{1.5cm}%
+ \setlength{\listparindent}{0pt}%
+ \setlength{\itemindent}{0pt}%
+ \setlength{\parsep}{0pt}%
+ }\item[]{\fbox{\parbox{\hsize}{\gregorioscore[f]{veni}}}}%
+ \end{list}%
+ \endgroup%
\vfill
\pagebreak
@@ -48,32 +48,44 @@
\gresetnabcfont{gresgmodern}{8}
\gresetnabcfont{gregall}{8}
-\def\neume#1{%
- \begingroup %
- \catcode`\~=12{}%
- \catcode`\@=11{}%
- \vbox{\hbox{\vspace{1mm}}\hbox{\noindent\GreNABCChar{#1}\hspace{1mm}}%
- \hbox{\vspace{1mm}}\hbox{\noindent{\fontsize{6}{6}\texttt{#1}\hspace{1mm}}}}%
- \endgroup %
+\def\neume{%
+ \begingroup %
+ \catcode`\~=12{}%
+ \catcode`\@=11{}%
+ \neumebody%
}
-\def\neumer#1{%
- \begingroup %
- \catcode`\~=12{}%
- \catcode`\@=11{}%
- \vbox{\hbox{\vspace{1mm}}\hbox{\noindent\hspace{8mm}\GreNABCChar{#1}\hspace{1mm}}%
- \hbox{\vspace{1mm}}\hbox{\noindent{\fontsize{6}{6}\texttt{#1}\hspace{1mm}}}}%
- \endgroup %
+\def\neumebody#1{%
+ \vbox{\hbox{\vspace{1mm}}\hbox{\noindent\GreNABCChar{#1}\hspace{1mm}}%
+ \hbox{\vspace{1mm}}\hbox{\noindent{\fontsize{6}{6}\texttt{#1}\hspace{1mm}}}}%
+ \endgroup %
}
-\def\sneume#1{%
- \begingroup %
- \catcode`\~=12{}%
- \catcode`\@=11{}%
- \font\grefontnabc={name:gregall} at 6pt\grefontnabc\begin{gre@style@nabc}%
- \directlua{tex.sprint(gregoriotex.nabc_font_tables["gregall"]["\luatexluaescapestring{#1}"] or "")}%
- \end{gre@style@nabc}%
- \endgroup %
+\def\neumer{%
+ \begingroup %
+ \catcode`\~=12{}%
+ \catcode`\@=11{}%
+ \neumerbody%
+}
+
+\def\neumerbody#1{%
+ \vbox{\hbox{\vspace{1mm}}\hbox{\noindent\hspace{8mm}\GreNABCChar{#1}\hspace{1mm}}%
+ \hbox{\vspace{1mm}}\hbox{\noindent{\fontsize{6}{6}\texttt{#1}\hspace{1mm}}}}%
+ \endgroup %
+}
+
+\def\sneume{%
+ \begingroup %
+ \catcode`\~=12{}%
+ \catcode`\@=11{}%
+ \sneumebody%
+}
+
+\def\sneumebody#1{%
+ \font\grefontnabc={name:gregall} at 6pt\grefontnabc\begin{gre@style@nabc}%
+ \directlua{tex.sprint(gregoriotex.nabc_font_tables["gregall"]["\luatexluaescapestring{#1}"] or "")}%
+ \end{gre@style@nabc}%
+ \endgroup %
}
{
@@ -120,10 +132,10 @@ The \textit{horizontal spacing adjustment descriptor}
consists of a sequence of horizontal spacing adjustment characters
\texttt{/} and \texttt{`}.
\begin{itemize}
- \item \texttt{//} move by \texttt{nabclargerspace} skip to the right
- \item \texttt{/} move by \texttt{nabcinterelementspace} skip to the right
- \item \texttt{``} move by \texttt{nabclargerspace} skip to the left
- \item \texttt{`} move by \texttt{nabcinterelementspace} skip to the left
+ \item \texttt{//} move by \texttt{nabclargerspace} skip to the right
+ \item \texttt{/} move by \texttt{nabcinterelementspace} skip to the right
+ \item \texttt{``} move by \texttt{nabclargerspace} skip to the left
+ \item \texttt{`} move by \texttt{nabcinterelementspace} skip to the left
\end{itemize}
The \textit{complex glyph descriptor} consists of a \textit{glyph descriptor},
@@ -171,12 +183,12 @@ following table:
The \texttt{glyph modifiers} is a possibly empty sequence of following
characters optionally followed by a number:
\begin{itemize}
- \item \texttt{S} modification of the mark
- \item \texttt{G} modification of the grouping (neumatic break)
- \item \texttt{M} melodic modification
- \item \texttt{-} addition of episema
- \item \texttt{>} augmentive liquescence
- \item ~~\texttt{\~} diminutive liquescence
+ \item \texttt{S} modification of the mark
+ \item \texttt{G} modification of the grouping (neumatic break)
+ \item \texttt{M} melodic modification
+ \item \texttt{-} addition of episema
+ \item \texttt{>} augmentive liquescence
+ \item ~~\texttt{\~} diminutive liquescence
\end{itemize}
If Dom Cardine's table contains multiple glyphs with the same modifiers,
a positive number is added afterwards. E.g.\ for augmentive liquescent
@@ -203,12 +215,12 @@ optionally by a modifier letter from the following table and finally a mandatory
positive number of repetitions. If the modifier letter is missing, it is a
punctum.
\begin{itemize}
- \item \texttt{t} \sneume{ta} tractulus
- \item \texttt{u} \sneume{ta-} tractulus with episema
- \item \texttt{v} \sneume{suv1} tractulus with double episema
- \item \texttt{w} \sneume{gr} gravis
- \item \texttt{x} \sneume{st>} liquescens stropha
- \item \texttt{y} \sneume{gr-} gravis with episema
+ \item \texttt{t} \sneume{ta} tractulus
+ \item \texttt{u} \sneume{ta-} tractulus with episema
+ \item \texttt{v} \sneume{suv1} tractulus with double episema
+ \item \texttt{w} \sneume{gr} gravis
+ \item \texttt{x} \sneume{st>} liquescens stropha
+ \item \texttt{y} \sneume{gr-} gravis with episema
\end{itemize}
Only subpunctis are normally used in neume classification, the prepunctis is
a \texttt{nabc} concept to describe the rising sequence of punctis, tractulis
@@ -349,7 +361,7 @@ scandicus & \neume{sc} & & \neume{sc-} & \neume{scS} & \neume{scG}\neume{scG1} &
\vbox{\hbox{pes}\hbox{subbipunctis}} & \neume{pesu2} & \neume{vippt1su2lsc3} & \neume{pe-su2}\neume{pe-1su2} & \neume{peSsu2}\neume{peSsut2} & \neume{vippt1su2} & \neume{vi-!ci}\neume{pesu1suw1} & \neume{pesu1sux1} & \neume{to>} \\
& & & \multicolumn{1}{r|}{\neume{pe-1sut2}} & & \multicolumn{1}{r|}{\neume{toS2sut1}} & & & \\
\vbox{\hbox{scandicus}\hbox{flexus}} & \neume{sf} & \neume{sflsc3} & \neume{sf-} & \neume{sfS} & \neume{vi-tohk}\neume{peclhi} & \neume{sfM} & \neume{cl>ppt2} & \neume{sc>} \\
-\vbox{\hbox{torculus}\hbox{resuspinus}} & \neume{tr} & \neume{trlsc2}\neume{trlst2} & \multicolumn{1}{r|}{\neume{tr-1}} & \neume{trS} & \neume{trG}\neume{trG1}\neume{trG2} & \neume{trM} & \neume{tr>} & \neume{tr~} \\ \hline
+\vbox{\hbox{torculus}\hbox{resupinus}} & \neume{tr} & \neume{trlsc2}\neume{trlst2} & \multicolumn{1}{r|}{\neume{tr-1}} & \neume{trS} & \neume{trG}\neume{trG1}\neume{trG2} & \neume{trM} & \neume{tr>} & \neume{tr~} \\ \hline
apostropha & \neume{st} & & \neume{st-} & \neume{stS} & & & \neume{st>} & \\
distropha & \neume{ds} & \neume{ds-lsx6} & \neume{ds-} & & & & \neume{ds>} & \\
tristropha & \neume{ts} & \neume{ts-lsx6} & \neume{ts-} & & & \neume{tsM} & \neume{ts>} & \\
@@ -378,40 +390,40 @@ Table with nabc strings and corresponding gregall and gresgmodern glyphs:
\end{center}
\begin{luacode*}
- local i
- local last
- local key
- local str
- local keym
- local arr = {}
- for key in pairs(gregoriotex.nabc_font_tables['gregall']) do
- table.insert(arr, key)
- end
- for key in pairs(gregoriotex.nabc_font_tables['gresgmodern']) do
- table.insert(arr, key)
- end
- table.sort(arr)
- tex.sprint("\\begin{multicols}{3}\\noindent");
- for i, key in ipairs(arr) do
- if last ~= key then
- last = key
- keym = key:gsub("~","\\~{}")
- str = keym .. "\\hfill"
- if gregoriotex.nabc_font_tables['gregall'][key] then
- str = str .. "{\\font\\grefontnabc={name:gregall} at 8pt\\grefontnabc\\begin{gre@style@nabc}" .. gregoriotex.nabc_font_tables['gregall'][key] .. "\\end{gre@style@nabc}}"
- else
- str = str .. "{\\color{blue}missing}"
- end
- str = str .. "\\hfill"
- if gregoriotex.nabc_font_tables['gresgmodern'][key] then
- str = str .. "{\\font\\grefontnabc={name:gresgmodern} at 8pt\\grefontnabc\\begin{gre@style@nabc}" .. gregoriotex.nabc_font_tables['gresgmodern'][key] .. "\\end{gre@style@nabc}}"
- else
- str = str .. "{\\color{blue}missing}"
- end
- tex.sprint(str .. "\\\\")
- end
- end
- tex.sprint("\\end{multicols}")
+ local i
+ local last
+ local key
+ local str
+ local keym
+ local arr = {}
+ for key in pairs(gregoriotex.nabc_font_tables['gregall']) do
+ table.insert(arr, key)
+ end
+ for key in pairs(gregoriotex.nabc_font_tables['gresgmodern']) do
+ table.insert(arr, key)
+ end
+ table.sort(arr)
+ tex.sprint("\\begin{multicols}{3}\\noindent");
+ for i, key in ipairs(arr) do
+ if last ~= key then
+ last = key
+ keym = key:gsub("~","\\~{}")
+ str = keym .. "\\hfill"
+ if gregoriotex.nabc_font_tables['gregall'][key] then
+ str = str .. "{\\font\\grefontnabc={name:gregall} at 8pt\\grefontnabc\\begin{gre@style@nabc}" .. gregoriotex.nabc_font_tables['gregall'][key] .. "\\end{gre@style@nabc}}"
+ else
+ str = str .. "{\\color{blue}missing}"
+ end
+ str = str .. "\\hfill"
+ if gregoriotex.nabc_font_tables['gresgmodern'][key] then
+ str = str .. "{\\font\\grefontnabc={name:gresgmodern} at 8pt\\grefontnabc\\begin{gre@style@nabc}" .. gregoriotex.nabc_font_tables['gresgmodern'][key] .. "\\end{gre@style@nabc}}"
+ else
+ str = str .. "{\\color{blue}missing}"
+ end
+ tex.sprint(str .. "\\\\")
+ end
+ end
+ tex.sprint("\\end{multicols}")
\end{luacode*}
\vfill
@@ -548,6 +560,7 @@ only present in the font source file to help drawing the glyphs.}
\texttt{E42A} Anima nostra \texttt{GT466}\\
\texttt{E51R} Reges tharsis \texttt{OT21}\\
\texttt{E69P} Posuisti Domine \texttt{GT477}\\
+\texttt{E75G} Gaudeamus omnes \texttt{GT545}\\
\texttt{E82D} De profundis \texttt{GT673}\\
\texttt{E92I} Immutemur \texttt{GT65}\\
\texttt{E104S} Sicut oculi \texttt{GT77}\\
@@ -587,6 +600,7 @@ only present in the font source file to help drawing the glyphs.}
\texttt{H16A} Aspiciebam in visu \texttt{NR111}\\
\texttt{H16M} Missus est Gabriel \texttt{NR111}\\
\texttt{H16V} Ave Maria \texttt{NR113}\\
+\texttt{H22S} Sicut mater consolator \texttt{NR127}\\
\texttt{H23E} Egredietur Dominus de Samaria \texttt{NR129}\\
\texttt{H25E} Ecce mitto Angelum \texttt{AM201}\\
\texttt{H26G} Grata facta est \texttt{NR25*}\\
@@ -594,6 +608,7 @@ only present in the font source file to help drawing the glyphs.}
\texttt{H29E} Ecce radix Jesse \texttt{NR137}\\
\texttt{H32N} Nascetur nobis \texttt{NR149}\\
\texttt{H33I} Iuravi dicit Dominus \texttt{NR151}\\
+\texttt{H34F} Festina ne tardaveris \texttt{NR130}\\
\texttt{H35G} Germinaverunt campi \texttt{NR144}\\
\texttt{H36A} Adnuntiatum est\\
\texttt{H48B} Beata et venerabilis\\
@@ -612,6 +627,8 @@ only present in the font source file to help drawing the glyphs.}
\texttt{H103M} Magnus Dominus \texttt{NR516}\\
\texttt{H104T} Te Deum patrem\\
\texttt{H112S} Stans a dextris \texttt{AM798}\\
+\texttt{H114C} Corde et animo \texttt{AM1033}\\
+\texttt{H114N} Nativitas tua \texttt{AM1035}\\
\texttt{H118G} Gaude, Maria Virgo \texttt{NR130*}\\
\texttt{H119C} Cum inducerent\\
\texttt{H179L} Liberavit Dominus \texttt{ARII183}\\
@@ -770,7 +787,7 @@ only present in the font source file to help drawing the glyphs.}
\sneume{po-1} & \texttt{po-1} & \texttt{C26A} & tuum\\
\sneume{poG} & \texttt{poG} & \texttt{C40V} & salutare\\
\sneume{po>} & \texttt{po>} & \texttt{C80Q} & commovebitur\\
-\sneume{po~} & \texttt{po~} & \texttt{C58A} & aeternum\\
+\sneume{po~} & \texttt{po\char`\~} & \texttt{C58A} & aeternum\\
\sneume{poG-} & \texttt{poG-} & \texttt{A167O} & meum\\
\sneume{posu2} & \texttt{posu2} & \texttt{C46O} & gloria\\
\sneume{po-1su2} & \texttt{po-1su2} & \texttt{H269R} & alleluia\\ \hline
@@ -787,7 +804,8 @@ only present in the font source file to help drawing the glyphs.}
\sneume{toS3} & \texttt{toS3} & \texttt{C104V} & circumfodit\\
\sneume{toG} & \texttt{toG} & \texttt{G12T} & eius\\
\sneume{toM} & \texttt{toM} & \texttt{C49I} & servum\\
-\sneume{toM1} & \texttt{toM1} & \texttt{C39B} & mirabile\\
+\sneume{toM1} & \texttt{toM1} & \texttt{H22S} & auxilium & \fbox{1.71x}\\
+\sneume{toM3} & \texttt{toM3} & \texttt{C39B} & mirabile\\
\sneume{to>} & \texttt{to>} & \texttt{C26A} & misericordiam\\
\textit{Cf.} \sneume{pe>} & \texttt{pe>}\\
\sneume{toS3lst2} & \texttt{toS3lst2} & \texttt{C59D} & tuae\\
@@ -847,7 +865,10 @@ only present in the font source file to help drawing the glyphs.}
\sneume{vi-sut4} & \texttt{vi-sut4} & \texttt{H16A} & servient & \fbox{1.7x}\\
\sneume{vi-suu2} & \texttt{vi-suu2} & \texttt{H23E} & ecce & \fbox{1.7x}\\
\sneume{vi-suu3} & \texttt{vi-suu3} & \texttt{H35G} & veniet & \fbox{1.7x}\\
-\sneume{visu2sux1} & \texttt{visu2sux1} & \texttt{H48B} & mater & \fbox{1.7x}\\ \hline
+\sneume{visu2sux1} & \texttt{visu2sux1} & \texttt{H48B} & mater & \fbox{1.7x}\\
+\sneume{vi-sut1su2} & \texttt{vi-sut1su2} & \texttt{H22S} & elegi & \fbox{1.71x}\\
+\sneume{vi-su1suu1} & \texttt{vi-su1suu1} & \texttt{H114C} & gloriam & \fbox{1.71x}\\
+\sneume{vi-su1suu1su2} & \texttt{vi-su1suu1su2} & \texttt{H114N} & nobis & \fbox{1.71x}\\ \hline
& \multicolumn{3}{l}{\textbf{scandicus}} & \\
\sneume{sc} & \texttt{sc} & \texttt{G11P} & imperium & \fbox{0.85x}\\
\sneume{sc1} & \texttt{sc1} \textit{Cf.} \sneume{vipp4} & \multicolumn{3}{l}{\texttt{vipp4} minus first punctum}\\
@@ -934,9 +955,9 @@ only present in the font source file to help drawing the glyphs.}
\sneume{trG2} & \texttt{trG2} & \texttt{E147L} & Laetare & \fbox{2.166x}\\
\sneume{trM} & \texttt{trM} & \texttt{E336I} & resistere & \fbox{2.166x}\\
\sneume{tr>} & \texttt{tr>} & \texttt{C82V} & nonconfundentur\\
-\sneume{tr~} & \texttt{tr~} & \texttt{C60S} & Altissimus\\
-\sneume{tr-~} & \texttt{tr-~} & \texttt{C27Q} & et\\
-\sneume{tr-~1} & \texttt{tr-~1} & \texttt{C107A} & Alleluia.\\
+\sneume{tr~} & \texttt{tr\char`\~} & \texttt{C60S} & Altissimus\\
+\sneume{tr-~} & \texttt{tr-\char`\~} & \texttt{C27Q} & et\\
+\sneume{tr-~1} & \texttt{tr-\char`\~1} & \texttt{C107A} & Alleluia.\\
\sneume{trS-} & \texttt{trS-} & \texttt{C89T} & pedes,\\
\sneume{trS1} & \texttt{trS1} & \texttt{E26L} & eeiieiue & \fbox{2.166x}\\ \hline
& \multicolumn{3}{l}{\textbf{stropha}} & \\
@@ -1005,8 +1026,9 @@ only present in the font source file to help drawing the glyphs.}
\sneume{sa-1} & \texttt{sa-1} & \texttt{G30E} & tribulationis\\
\sneume{saG} & \texttt{saG} & \texttt{C107A} & Alleluia.\\
\sneume{saM} & \texttt{saM} & \texttt{H16V} & venient & \fbox{1.7x}\\
-\sneume{saM1} & \texttt{saM1} & \texttt{E10P} & omnis & \fbox{2.166x}\\
+\sneume{saM1} & \texttt{saM1} & \texttt{H23E} & homo & \fbox{1.71x}\\
\sneume{saM2} & \texttt{saM2} & \texttt{C27Q} & regis\\
+\sneume{saM4} & \texttt{saM4} & \texttt{E10P} & omnis & \fbox{2.166x}\\
\sneume{sa>} & \texttt{sa>} & \texttt{C27E} & sanctos\\
\sneume{sa->1} & \texttt{sa->1} & \texttt{H77A} & magi\\
\textit{Cf.} \sneume{pe>2} & \texttt{pe>2}\\
@@ -1082,7 +1104,9 @@ only present in the font source file to help drawing the glyphs.}
\sneume{su2suy1} & \texttt{su2suy1} \textit{Cf.} \sneume{pe-su2suy1} & \multicolumn{2}{l}{\texttt{pe-su2suy1}}\\
\sneume{suw2} & \texttt{suw2} \textit{Cf.} \sneume{pe-1suw2} & \multicolumn{2}{l}{\texttt{pe-1suw2}}\\
\sneume{sut2suu1} & \texttt{sut2suu1} \textit{Cf.} \sneume{ql-ppt1sut2suu1} & \multicolumn{2}{l}{\texttt{ql-ppt1sut2suu1}}\\
-\sneume{suu3} & \texttt{suu3} \textit{Cf.} \sneume{vi-suu3} & \multicolumn{2}{l}{\texttt{vi-suu3}}\\ \hline
+\sneume{suu3} & \texttt{suu3} \textit{Cf.} \sneume{vi-suu3} & \multicolumn{2}{l}{\texttt{vi-suu3}}\\
+\sneume{su1} & \texttt{su1} \textit{Cf.} \sneume{ci} & \multicolumn{2}{l}{\texttt{ci}}\\
+\sneume{sut1} & \texttt{sut1} \textit{Cf.} \sneume{ciS1} & \multicolumn{2}{l}{\texttt{ciS1}}\\ \hline
\\
& \multicolumn{3}{l}{\textbf{prepunctis}} & \\
\sneume{pp2} & \texttt{pp2} \textit{Cf.} \sneume{vi-pp2} & \texttt{vi-pp2}\\
@@ -1095,7 +1119,8 @@ only present in the font source file to help drawing the glyphs.}
\sneume{pp3} & \texttt{pp3} \textit{Cf.} \sneume{pp4} & \texttt{pp4}\\
\sneume{ppt3} & \texttt{ppt3} \textit{Cf.} \sneume{vi>ppt3} & \texttt{vi>ppt3}\\
\sneume{ppt4} & \texttt{ppt4} & \texttt{N69G} & amin.\\
-\sneume{ppt5} & \texttt{ppt5} & \texttt{A56C} & videant\\ \hline
+\sneume{ppt5} & \texttt{ppt5} & \texttt{A56C} & videant\\
+\sneume{pp1} & \texttt{pp1} \textit{Cf.} \sneume{vi-pp2} & \texttt{vi-pp2}\\ \hline
\\
& \multicolumn{3}{l}{\textbf{combined glyphs}} & \\
\sneume{cl!pi} & \texttt{cl!pi} & \texttt{C82R} & Domine\\
@@ -1130,6 +1155,7 @@ only present in the font source file to help drawing the glyphs.}
\sneume{qi-su2} & \texttt{qi-su2} & \texttt{H73S} & cedebat\\
\sneume{qi-su1sut2} & \texttt{qi-su1sut2} \textit{Cf.} \sneume{qi-ppt1su1sut2} & \multicolumn{3}{l}{\texttt{qi-ppt1su1sut2} minus tractulus}\\
\sneume{qi-su1sux1} & \texttt{qi-su1sux1} & \texttt{H26G} & certamine & \fbox{1.7x}\\
+\sneume{ql-su1suu2} & \texttt{ql-su1suu2} & \texttt{H34F} & facinora & \fbox{1.71x}\\
\sneume{qi!cl} & \texttt{qi!cl} & \texttt{C82B} & spiritu\\
\sneume{qi!cl-} & \texttt{qi!cl-} & \texttt{C148A} & factus\\
\sneume{qi!cl>} & \texttt{qi!cl>} & \texttt{H77S} & Magi\\
@@ -1153,10 +1179,14 @@ only present in the font source file to help drawing the glyphs.}
\sneume{ql!cl-ppt1} & \texttt{ql!cl-ppt1} & \texttt{C40A} & terram.\\
\sneume{ql!clMppt1} & \texttt{ql!clMppt1} & \texttt{E324R} & tuum & \fbox{2.166x}\\
\sneume{ql!cl->ppt1} & \texttt{ql!cl->ppt1} & \texttt{G132A} & Alleluia. & \fbox{0.85x}\\
+\sneume{ql!clS-2ppt1sut1} & \texttt{ql!clS-2ppt1sut1} & \texttt{E3D} & et. & \fbox{2.0x}\\
+\sneume{ql!clS-2sut1} & \texttt{ql!clS-2sut1} \textit{Cf.} \sneume{ql!clS-2ppt1sut1} & \multicolumn{3}{l}{\texttt{ql!clS-2ppt1sut1} minus tractulus}\\
+\sneume{ql!clS-2ppt1} & \texttt{ql!clS-2ppt1} \textit{Cf.} \sneume{ql!clS-2ppt1sut1} & \multicolumn{3}{l}{\texttt{ql!clS-2ppt1sut1} minus tractulus}\\
+\sneume{ql!clS-2} & \texttt{ql!clS-2} \textit{Cf.} \sneume{ql!clS-2ppt1sut1} & \multicolumn{3}{l}{\texttt{ql!clS-2ppt1sut1} minus 2 tractulis}\\
\sneume{ql!poppt1} & \texttt{ql!poppt1} & \texttt{C59D} & Domine.\\
\sneume{ql!po-1ppt1} & \texttt{ql!po-1ppt1} & \texttt{C58A} & homo.\\
-\sneume{ql!po~ppt1} & \texttt{ql!po~ppt1} & \texttt{H179L} & pauperem\\
-\sneume{ql!po~} & \texttt{ql!po~} \textit{Cf.} \sneume{ql!po~} & \multicolumn{3}{l}{\texttt{ql!po~} minus tractulus}\\
+\sneume{ql!po~ppt1} & \texttt{ql!po\char`\~ppt1} & \texttt{H179L} & pauperem\\
+\sneume{ql!po~} & \texttt{ql!po\char`\~} \textit{Cf.} \sneume{ql!po~} & \multicolumn{3}{l}{\texttt{ql!po\char`\~} minus tractulus}\\
\sneume{ql-ppt1su2} & \texttt{ql-ppt1su2} & \texttt{H72V} & Jerusalem\\
\sneume{ql-ppt1su1sux1} & \texttt{ql-ppt1su1sux1} & \texttt{H73O} & Reges\\
\sneume{ql-ppt1su1sut2} & \texttt{ql-ppt1su1sut2} & \texttt{H75I} & patris\\
@@ -1192,7 +1222,10 @@ only present in the font source file to help drawing the glyphs.}
\sneume{cl!po-1} & \texttt{cl!po-1} & \texttt{H119C} & in\\
\sneume{tr-1su2} & \texttt{tr-1su2} & \texttt{H73O} & dona\\
\sneume{ci-pp2} & \texttt{ci-pp2} & \texttt{H73S} & magno\\
-\sneume{toS2su2} & \texttt{toS2su2} & \texttt{H73S} & eam\\ \hline
+\sneume{toS2su2} & \texttt{toS2su2} & \texttt{H73S} & eam\\
+\sneume{toS2sut2} & \texttt{toS2sut2} & \texttt{C150L} & dicta\\
+\sneume{po-1pp2su1sux1} & \texttt{po-1pp2su1sux1} & \texttt{E75G} & filium & \fbox{2.2x}\\
+\sneume{po-1su1sux1} & \texttt{po-1su1sux1} \textit{Cf.} \sneume{po-1pp2su1sux1} & \multicolumn{3}{l}{\texttt{po-1pp2su1sux1} minus bipunctis}\\ \hline
\end{supertabular}
\begin{supertabular}{llllll}\noindent
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_0_0.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_0_0.pdf
new file mode 100644
index 00000000000..10f1ae7a552
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_0_0.pdf
Binary files differ
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioRef.lua b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua
index e48041f92f4..ee02ff0f79c 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioRef.lua
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua
@@ -122,7 +122,7 @@ local GABC = {
TorculusQuilisma = [[gwig]],
TorculusResupinus = [[gigi]],
TorculusResupinusQuilisma = [[gwigi]],
- VEpisemus = [[\excluded{g}^^^^0027]],
+ VEpisema = [[\excluded{g}^^^^0027]],
Virga = [[gv]],
VirgaLongqueue = [[hv]],
VirgaReversa = [[gV]],
@@ -156,7 +156,7 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
local glyphs = font.fonts[font.id(csname)].resources.unicodes
local glyph, cp
for glyph, cp in pairs(glyphs) do
- if cp >= 0xe000 and not EXCLUDE[glyph] and not glyph:match('^HEpisemus') then
+ if cp >= 0xe000 and not EXCLUDE[glyph] and not glyph:match('^HEpisema') then
local name, variant = glyph:match('^([^.]*)(%.%a*)$')
if name then
local glyph_variants = variants[name]
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioRef.tex b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
index a54675e0f7b..1f35efd09c2 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/GregorioRef.tex
+++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
@@ -4,26 +4,26 @@
\usepackage{fontspec}
\defaultfontfeatures{Ligatures=TeX}
\setmainfont[
- BoldFont=LinLibertineOZ,
- BoldItalicFont=LinLibertineOZI,
- SmallCapsFont=LinLibertineO,
- SmallCapsFeatures={Letters=SmallCaps},
+ BoldFont=LinLibertineOZ,
+ BoldItalicFont=LinLibertineOZI,
+ SmallCapsFont=LinLibertineO,
+ SmallCapsFeatures={Letters=SmallCaps},
]{LinuxLibertineO}
\setsansfont[Extension=.otf,
- BoldFont=LinBiolinum_RB,
- ItalicFont=LinBiolinum_RI,
- BoldItalicFont=LinBiolinum_RB,% fake
- SmallCapsFont=LinBiolinum_R,
- SmallCapsFeatures={Letters=SmallCaps},
- ]{LinBiolinum_R}
+ BoldFont=LinBiolinum_RB,
+ ItalicFont=LinBiolinum_RI,
+ BoldItalicFont=LinBiolinum_RB,% fake
+ SmallCapsFont=LinBiolinum_R,
+ SmallCapsFeatures={Letters=SmallCaps},
+ ]{LinBiolinum_R}
\setmonofont[Extension=.otf,
- ItalicFont=Inconsolatazi4-Regular,
- BoldFont=Inconsolatazi4-Bold,
- BoldItalicFont=Inconsolatazi4-Bold,
- AutoFakeSlant,
- ItalicFeatures={FakeSlant},
- BoldItalicFeatures={FakeSlant}
- ]{Inconsolatazi4-Regular}
+ ItalicFont=Inconsolatazi4-Regular,
+ BoldFont=Inconsolatazi4-Bold,
+ BoldItalicFont=Inconsolatazi4-Bold,
+ AutoFakeSlant,
+ ItalicFeatures={FakeSlant},
+ BoldItalicFeatures={FakeSlant}
+ ]{Inconsolatazi4-Regular}
\usepackage{enumitem}
\usepackage{xspace}
\usepackage{multicol}
@@ -32,6 +32,7 @@
\usepackage{url}
\usepackage{tabulary}
\usepackage{tabularx}
+\usepackage{adjustbox}
\usepackage{makeidx}
\makeindex
@@ -42,7 +43,13 @@
\definecolor{myred}{HTML}{FF3333}
\usepackage{minted} % must be after xcolor
-\newminted{latex}{gobble=1,bgcolor=lightgray}% Originally had 'gobble=2' but this creates problems on systems where the 2-space indentation is switched out for single tabs (Br. Samuel's, for one, does this). Should be set to autogobble once every developer is using TeXLive 2015 or later (as the autogobble feature doesn't appear in TeXLive 2014 or earlier).
+\makeatletter
+\@ifpackagelater{minted}{2013/12/21}{%
+ \newminted{latex}{autogobble,bgcolor=lightgray}%
+}{%
+ \newminted{latex}{gobble=2,bgcolor=lightgray}%
+}%
+\makeatother
%\newminted{gabc}{bgcolor=lightgray} % can this be done?
\newenvironment{gabccode}{\tt}{}
@@ -60,6 +67,7 @@
\usepackage{pdflscape}
\usepackage{hhline}
\usepackage{listings}
+\usepackage{lstautogobble}
\directlua{dofile('GregorioRef.lua')}
\newcommand*{\eg}{e.g.\@\xspace}
@@ -67,23 +75,33 @@
\newcommand*{\ie}{i.e.\@\xspace}
\newcommand*{\etc}{etc.\@\xspace}
+\newif\ifbreakable
+\let\oldsubsection\subsection
+\def\subsection{\filbreak\breakablefalse\oldsubsection}
+\let\oldsubsubsection\subsubsection
+\def\subsubsection{\filbreak\breakablefalse\oldsubsubsection}
+
\newcommand{\macroname}[3]{%
- \vspace{3.25ex plus 1ex minus .2ex}%
- \pagebreak[3]%
- \makebox[\linewidth]{\ttfamily\bfseries #1#2%
- \hspace{\fill}\normalfont\itshape #3}%
- \vspace{1.5ex plus .2ex}%
- \index{#1}}
- %\addcontentsline{toc}{subsubsection}{#1}}
+ \vspace{3.25ex plus 1ex minus .2ex}%
+ \ifbreakable%
+ \filbreak%
+ \else%
+ \breakabletrue%
+ \fi%
+ \makebox[\linewidth]{\ttfamily\bfseries #1#2%
+ \hspace{\fill}\normalfont\itshape #3}%
+ \vspace{1.5ex plus .2ex}%
+ \index{#1}}
+ %\addcontentsline{toc}{subsubsection}{#1}}
\newcommand{\optional}[1]{{\itshape #1}}
\lstset{backgroundcolor=\color{lightgray},
- basicstyle=\small\ttfamily,
- numbers=left,
- numberstyle=\footnotesize,
- stepnumber=1,
- numbersep=5pt}
+ basicstyle=\small\ttfamily,
+ numbers=left,
+ numberstyle=\footnotesize,
+ stepnumber=1,
+ numbersep=5pt}
% for the character tables
\font\greciliae = {name:greciliae} at 1000000 sp\relax
@@ -96,53 +114,53 @@
\newcommand{\excluded}[1]{{\tiny\itshape #1}}
\newenvironment{argtable}{%
- \bigskip\rowcolors{1}{lightgray}{lightgray}
- \tabularx{\textwidth}{clX}
- Arg & Value & Description \\
- \hline}%
- {\endtabularx\bigskip}
+ \bigskip\rowcolors{1}{lightgray}{lightgray}
+ \tabularx{\textwidth}{clX}
+ Arg & Value & Description \\
+ \hline}%
+ {\endtabularx\bigskip}
\setlength{\parindent}{0mm} % Default is 15pt
\begin{document}
\begin{titlepage}
- \begin{center}
- \Huge
- \textcolor{myred}{Gregorio} and \textcolor{myred}{Gregorio\TeX}:
-
- Tools for gregorian score engraving.
-
- \vspace{1cm}
-
- \large Version \textbf{4.0.0-rc1}, 8 October 2015 %% PARSE_VERSION_DATE
-
- \vspace{1.5cm}
- \end{center}
- \gresetlinecolor{gregoriocolor}
- \grechangestyle{lowchoralsign}{\cminfamily\small}%
- \grechangestyle{highchoralsign}{\cminfamily\small}%
- \def\GreStar{\greheightstar}%
- \greannotation{\scriptsize{Comm.}}%
- \greannotation{\scriptsize{VII}}%
- \begingroup%
- \color{black!60}%
- \setmainfont[SmallCapsFont=AlegreyaSC]{Alegreya}%
- \newlength{\mini}%
- \setlength{\mini}{\hsize}%
- \addtolength{\mini}{-4cm}%
- \setlength{\fboxsep}{5mm}%
- \hfill\fbox{\parbox{\mini}{\gregorioscore[f]{factus}}}\hfill%
- \endgroup
- \begin{center}
- \vspace{1.5cm}%
- \href{http://gregorio-project.github.io/}{Homepage}
-
- Source code available on
- \href{http://github.com/gregorio-project/gregorio}{GitHub}.
- \end{center}
-
- \vspace{2cm}
+ \begin{center}
+ \Huge
+ \textcolor{myred}{Gregorio} and \textcolor{myred}{Gregorio\TeX}:
+
+ Tools for gregorian score engraving.
+
+ \vspace{1cm}
+
+ \large Version \textbf{4.0.0}, 8 December 2015 %% PARSE_VERSION_DATE
+
+ \vspace{1.5cm}
+ \end{center}
+ \gresetlinecolor{gregoriocolor}
+ \grechangestyle{lowchoralsign}{\cminfamily\small}%
+ \grechangestyle{highchoralsign}{\cminfamily\small}%
+ \def\GreStar{\greheightstar}%
+ \greannotation{\scriptsize{Comm.}}%
+ \greannotation{\scriptsize{VII}}%
+ \begingroup%
+ \color{black!60}%
+ \setmainfont[SmallCapsFont=AlegreyaSC]{Alegreya}%
+ \newlength{\mini}%
+ \setlength{\mini}{\hsize}%
+ \addtolength{\mini}{-4cm}%
+ \setlength{\fboxsep}{5mm}%
+ \hfill\fbox{\parbox{\mini}{\gregorioscore[f]{factus}}}\hfill%
+ \endgroup
+ \begin{center}
+ \vspace{1.5cm}%
+ \href{http://gregorio-project.github.io/}{Homepage}
+
+ Source code available on
+ \href{http://github.com/gregorio-project/gregorio}{GitHub}.
+ \end{center}
+
+ \vspace{2cm}
\end{titlepage}
\cleardoublepage
@@ -159,7 +177,8 @@ The following sections document the macros available in the Gregorio\TeX{} packa
Description of macro.
\begin{argtable}
- Arg \# & Data type & Description of argument\\
+ Arg \# & Data type & Description of argument\\
+ Arg \# & \texttt{keyword} & Description of the setting the keyword corresponds to
\end{argtable}
The source file where the macro is defined is included for developers
@@ -176,15 +195,18 @@ Macros are divided into three groups:
\end{description}
-\input{Command_Index_User}
-\input{Command_Index_gregorio}
-\input{Command_Index_internal}
-\input{Gabc}
+\include{Command_Index_User}
+\include{Command_Index_gregorio}
+\include{Command_Index_internal}
+\include{Gabc}
\begin{appendices}
- \renewcommand\thetable{\thesection\arabic{table}}
- \renewcommand\thefigure{\thesection\arabic{figure}}
- \input{Appendix_Font_Tables}
+ %Turn off the \filbreak stuff to prevent it from messing up the long tables in the appendicies
+ \let\subsection\oldsubsection
+ \let\subsubsection\oldsubsubsection
+ \renewcommand\thetable{\thesection\arabic{table}}
+ \renewcommand\thefigure{\thesection\arabic{figure}}
+ \include{Appendix_Font_Tables}
\end{appendices}
\addcontentsline{toc}{section}{Index}
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Makefile.am b/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am
index 0c971c18a05..0c971c18a05 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/Makefile.am
+++ b/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/factus.gabc b/Build/source/texk/gregorio/gregorio-src/doc/factus.gabc
index b152d5a8219..b152d5a8219 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/factus.gabc
+++ b/Build/source/texk/gregorio/gregorio-src/doc/factus.gabc
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/veni.gabc b/Build/source/texk/gregorio/gregorio-src/doc/veni.gabc
index a5ab3ab0b39..a5ab3ab0b39 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/doc/veni.gabc
+++ b/Build/source/texk/gregorio/gregorio-src/doc/veni.gabc
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/examples/FactusEst.gabc b/Build/source/texk/gregorio/gregorio-src/examples/FactusEst.gabc
index fc4a467e5d2..fc4a467e5d2 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/examples/FactusEst.gabc
+++ b/Build/source/texk/gregorio/gregorio-src/examples/FactusEst.gabc
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/examples/Makefile.am b/Build/source/texk/gregorio/gregorio-src/examples/Makefile.am
index 2d75dfa24ea..2d75dfa24ea 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/examples/Makefile.am
+++ b/Build/source/texk/gregorio/gregorio-src/examples/Makefile.am
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/examples/PopulusSion.gabc b/Build/source/texk/gregorio/gregorio-src/examples/PopulusSion.gabc
index bf1476914c6..bf1476914c6 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/examples/PopulusSion.gabc
+++ b/Build/source/texk/gregorio/gregorio-src/examples/PopulusSion.gabc
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/examples/main-lualatex.tex b/Build/source/texk/gregorio/gregorio-src/examples/main-lualatex.tex
index 64b2f3d6375..d6ea2632c10 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/examples/main-lualatex.tex
+++ b/Build/source/texk/gregorio/gregorio-src/examples/main-lualatex.tex
@@ -1,4 +1,4 @@
-% !TEX TS-program = LuaLaTeX+se
+% !TEX program = LuaLaTeX+se
% This is a simple template for a LuaLaTeX document using gregorio scores.
@@ -10,7 +10,6 @@
\usepackage{geometry} % See geometry.pdf to learn the layout options. There are lots.
\geometry{a4paper} % or letterpaper (US) or a5paper or....
\usepackage{gregoriotex} % for gregorio score inclusion
-\usepackage{gregoriosyms} % to be able to define \ABar, \VBar, etc.
\usepackage{fullpage} % to reduce the margins
\usepackage{libertine} % Decent (free) font for Gregorian, but should be changed if you have high standards
@@ -21,26 +20,27 @@
% Here we set the space around the initial.
% Please report to http://home.gna.org/gregorio/gregoriotex/details for more details and options
-\setspaceafterinitial{2.2mm}{1}
-\setspacebeforeinitial{2.2mm}{1}
+\grechangedim{beforeinitialshift}{2.2mm}{scalable}
+\grechangedim{afterinitialshift}{2.2mm}{scalable}
% Here we set the initial font. Change 43 if you want a bigger initial.
-\def\greinitialformat#1{%
-{\fontsize{43}{43}\selectfont #1}%
-}
+\grechangestyle{initial}{\fontsize{43}{43}\selectfont}%
% We set red lines here, comment it if you want black ones.
-\redlines
+\gresetlinecolor{gregoriocolor}
% We set VII above the initial.
-\gresetfirstlineaboveinitial{\small \textsc{\textbf{VII}}}{\small \textsc{\textbf{VII}}}
+\greannotation{\small \textsc{\textbf{VII}}}
% We type a text in the top right corner of the score:
-\commentary{{\small \emph{Cf. Is. 30, 19 . 30 ; Ps. 79}}}
+\grecommentary{{\small \emph{Cf. Is. 30, 19 . 30 ; Ps. 79}}}
% and finally we include the scores. The file must be in the same directory as this one.
-\includescore[a]{PopulusSion}
+\gregorioscore[a]{PopulusSion}
-\includescore[a]{FactusEst}
+\bigskip
+\begin{center}\begin{huge}\textsc{Factus Est}\end{huge}\end{center}
+
+\gregorioscore[a]{FactusEst}
\end{document}
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/install-gtex.sh b/Build/source/texk/gregorio/gregorio-src/install-gtex.sh
index d0183efae3e..d0183efae3e 100755
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/install-gtex.sh
+++ b/Build/source/texk/gregorio/gregorio-src/install-gtex.sh
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/install.sh b/Build/source/texk/gregorio/gregorio-src/install.sh
index 91ff8e5ccc1..91ff8e5ccc1 100755
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/install.sh
+++ b/Build/source/texk/gregorio/gregorio-src/install.sh
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/m4/ax_check_compile_flag.m4 b/Build/source/texk/gregorio/gregorio-src/m4/ax_check_compile_flag.m4
index a7680d72ef8..a7680d72ef8 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/m4/ax_check_compile_flag.m4
+++ b/Build/source/texk/gregorio/gregorio-src/m4/ax_check_compile_flag.m4
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/m4/ax_check_link_flag.m4 b/Build/source/texk/gregorio/gregorio-src/m4/ax_check_link_flag.m4
index 9352950ed58..9352950ed58 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/m4/ax_check_link_flag.m4
+++ b/Build/source/texk/gregorio/gregorio-src/m4/ax_check_link_flag.m4
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/m4/pkg.m4 b/Build/source/texk/gregorio/gregorio-src/m4/pkg.m4
index 75a89ecfe73..75a89ecfe73 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/m4/pkg.m4
+++ b/Build/source/texk/gregorio/gregorio-src/m4/pkg.m4
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/Makefile.am b/Build/source/texk/gregorio/gregorio-src/src/Makefile.am
index e2424dcbec7..e2424dcbec7 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/Makefile.am
+++ b/Build/source/texk/gregorio/gregorio-src/src/Makefile.am
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/bool.h b/Build/source/texk/gregorio/gregorio-src/src/bool.h
index e32bade4d77..d40d0b4412c 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/bool.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/bool.h
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header provides a minimum of C11-like bool functionality.
+ *
* Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/characters.c b/Build/source/texk/gregorio/gregorio-src/src/characters.c
index 13ecf577b4c..7cf856985b6 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/characters.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/characters.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX.
+ * This file contains functions that deal with lyrics and styles.
+ *
* Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -42,6 +45,7 @@
#include "unicode.h"
#include "characters.h"
#include "messages.h"
+#include "support.h"
#include "utf8strings.h"
#include "vowel/vowel.h"
@@ -84,11 +88,7 @@ static bool read_vowel_rules(char *const lang) {
char buf[PATH_MAX];
size_t capacity = 16, size = 0;
- if (!(filenames = malloc(capacity * sizeof(char *)))) {
- gregorio_messagef("read_patterns", VERBOSITY_FATAL, 0,
- _("unable to allocate memory"));
- return false;
- }
+ filenames = gregorio_malloc(capacity * sizeof(char *));
file = popen("kpsewhich " VOWEL_FILE, "r");
if (!file) {
@@ -100,15 +100,11 @@ static bool read_vowel_rules(char *const lang) {
while (!feof(file) && !ferror(file) && fgets(buf, PATH_MAX, file)) {
rtrim(buf);
if (strlen(buf) > 0) {
- filenames[size++] = strdup(buf);
+ filenames[size++] = gregorio_strdup(buf);
if (size >= capacity) {
capacity <<= 1;
- if (!(filenames = realloc(filenames,
- capacity * sizeof(char *)))) {
- gregorio_messagef("read_patterns", VERBOSITY_FATAL, 0,
- _("unable to allocate memory"));
- return false;
- }
+ filenames = gregorio_realloc(filenames,
+ capacity * sizeof(char *));
}
} else {
gregorio_messagef("read_patterns", VERBOSITY_WARNING, 0,
@@ -216,7 +212,7 @@ static void determine_center(gregorio_character *character, int *start,
if (count == 0) {
return;
}
- subject = (grewchar *)malloc((count + 1) * sizeof(grewchar));
+ subject = (grewchar *)gregorio_malloc((count + 1) * sizeof(grewchar));
for (count = 0, ch = character; ch; ch = ch->next_character) {
if (ch->is_character) {
subject[count ++] = ch->cos.character;
@@ -268,7 +264,7 @@ static void style_push(det_style **current_style, unsigned char style)
if (!current_style) {
return;
}
- element = (det_style *) malloc(sizeof(det_style));
+ element = (det_style *) gregorio_malloc(sizeof(det_style));
element->style = style;
element->previous_style = NULL;
element->next_style = (*current_style);
@@ -359,7 +355,7 @@ static __inline void verb_or_sp(gregorio_character **ptr_character,
ptr_character = &current_character;
return;
}
- text = (grewchar *) malloc((i + 1) * sizeof(grewchar));
+ text = (grewchar *) gregorio_malloc((i + 1) * sizeof(grewchar));
current_character = begin_character;
while (j < i) {
if (current_character->is_character) {
@@ -463,17 +459,7 @@ void gregorio_write_first_letter_alignment_text(const bool skip_initial,
}
/* go to the first character */
- if (go_to_end_initial(&current_character)) {
- if (!current_character->next_character) {
- return;
- }
- if (skip_initial) {
- /* move to the character after the initial */
- current_character = current_character->next_character;
- } else {
- gregorio_go_to_first_character(&current_character);
- }
- }
+ gregorio_go_to_first_character(&current_character);
begin(f, ST_SYLLABLE_INITIAL);
@@ -494,9 +480,21 @@ void gregorio_write_first_letter_alignment_text(const bool skip_initial,
switch (current_character->cos.s.style) {
case ST_CENTER:
case ST_FORCED_CENTER:
- case ST_INITIAL:
/* ignore */
break;
+ case ST_INITIAL:
+ if (skip_initial) {
+ while (current_character) {
+ if (!current_character->is_character
+ && current_character->cos.s.type == ST_T_END
+ && current_character->cos.s.style ==
+ ST_INITIAL) {
+ break;
+ }
+ current_character = current_character->next_character;
+ }
+ } /* else ignore */
+ break;
case ST_VERBATIM:
verb_or_sp(&current_character, ST_VERBATIM, f, printverb);
close_first_letter = first_letter_open;
@@ -531,6 +529,10 @@ void gregorio_write_first_letter_alignment_text(const bool skip_initial,
break;
}
+ if (!current_character->next_character && first_letter_open) {
+ close_first_letter = first_letter_open;
+ }
+
if (close_first_letter) {
first_letter_open = false;
@@ -702,7 +704,7 @@ static void insert_style_before(unsigned char type,
unsigned char style, gregorio_character *current_character)
{
gregorio_character *element =
- (gregorio_character *) malloc(sizeof(gregorio_character));
+ (gregorio_character *) gregorio_malloc(sizeof(gregorio_character));
element->is_character = 0;
element->cos.s.type = type;
element->cos.s.style = style;
@@ -726,7 +728,7 @@ static void insert_style_after(unsigned char type, unsigned char style,
gregorio_character **current_character)
{
gregorio_character *element =
- (gregorio_character *) malloc(sizeof(gregorio_character));
+ (gregorio_character *) gregorio_malloc(sizeof(gregorio_character));
element->is_character = 0;
element->cos.s.type = type;
element->cos.s.style = style;
@@ -744,7 +746,7 @@ static void insert_char_after(grewchar c,
gregorio_character **current_character)
{
gregorio_character *element =
- (gregorio_character *) malloc(sizeof(gregorio_character));
+ (gregorio_character *) gregorio_malloc(sizeof(gregorio_character));
element->is_character = 1;
element->cos.character = c;
element->next_character = (*current_character)->next_character;
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/characters.h b/Build/source/texk/gregorio/gregorio-src/src/characters.h
index 94bec9c2d09..1575fc0d1c9 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/characters.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/characters.h
@@ -1,4 +1,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-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/config.h b/Build/source/texk/gregorio/gregorio-src/src/config.h
index 04f8734cb3b..9519115cbb8 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/config.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/config.h
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header wraps the generated config_.h to provide version macros.
+ *
* Gregorio configuration headers.
*
* Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/dump/dump.c b/Build/source/texk/gregorio/gregorio-src/src/dump/dump.c
index c2806748ae1..f1c8fc6b8c9 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/dump/dump.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/dump/dump.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX.
+ * This file provides functions to dump out Gregorio structures.
+ *
* Copyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -443,12 +446,12 @@ static const char *dump_signs(gregorio_sign signs)
return "_PUNCTUM_MORA";
case _AUCTUM_DUPLEX:
return "_AUCTUM_DUPLEX";
- case _V_EPISEMUS:
- return "_V_EPISEMUS";
- case _V_EPISEMUS_PUNCTUM_MORA:
- return "_V_EPISEMUS_PUNCTUM_MORA";
- case _V_EPISEMUS_AUCTUM_DUPLEX:
- return "_V_EPISEMUS_AUCTUM_DUPLEX";
+ case _V_EPISEMA:
+ return "_V_EPISEMA";
+ case _V_EPISEMA_PUNCTUM_MORA:
+ return "_V_EPISEMA_PUNCTUM_MORA";
+ case _V_EPISEMA_AUCTUM_DUPLEX:
+ return "_V_EPISEMA_AUCTUM_DUPLEX";
default:
return "unknown";
}
@@ -468,18 +471,18 @@ static const char *dump_special_sign(gregorio_sign special_sign)
return "_SEMI_CIRCULUS";
case _SEMI_CIRCULUS_REVERSUS:
return "_SEMI_CIRCULUS_REVERSUS";
- case _V_EPISEMUS:
- return "_V_EPISEMUS";
- case _V_EPISEMUS_BAR_H_EPISEMUS:
- return "_V_EPISEMUS_BAR_H_EPISEMUS";
- case _BAR_H_EPISEMUS:
- return "_BAR_H_EPISEMUS";
+ case _V_EPISEMA:
+ return "_V_EPISEMA";
+ case _V_EPISEMA_BAR_H_EPISEMA:
+ return "_V_EPISEMA_BAR_H_EPISEMA";
+ case _BAR_H_EPISEMA:
+ return "_BAR_H_EPISEMA";
default:
return "unknown";
}
}
-static const char *dump_h_episemus_size(grehepisemus_size size)
+static const char *dump_h_episema_size(grehepisema_size size)
{
switch (size) {
case H_NORMAL:
@@ -864,16 +867,16 @@ void dump_write_score(FILE *f, gregorio_score *score)
fprintf(f, " signs %d (%s)\n",
note->signs, dump_signs(note->signs));
}
- if (note->signs & _V_EPISEMUS && note->v_episemus_height) {
- if (note->v_episemus_height < note->u.note.pitch) {
- fprintf(f, " v episemus forced BELOW\n");
+ if (note->signs & _V_EPISEMA && note->v_episema_height) {
+ if (note->v_episema_height < note->u.note.pitch) {
+ fprintf(f, " v episema forced BELOW\n");
}
else {
- fprintf(f, " v episemus forced ABOVE\n");
+ fprintf(f, " v episema forced ABOVE\n");
}
}
if ((note->signs == _PUNCTUM_MORA
- || note->signs == _V_EPISEMUS_PUNCTUM_MORA)
+ || note->signs == _V_EPISEMA_PUNCTUM_MORA)
&& note->mora_vposition) {
fprintf(f, " mora vposition %s\n",
dump_vposition(note->mora_vposition));
@@ -883,28 +886,28 @@ void dump_write_score(FILE *f, gregorio_score *score)
note->special_sign,
dump_special_sign(note->special_sign));
}
- if (note->h_episemus_above == HEPISEMUS_AUTO
- && note->h_episemus_below == HEPISEMUS_AUTO) {
- fprintf(f, " auto hepisemus size %d (%s)\n",
- note->h_episemus_above_size,
- dump_h_episemus_size(note->h_episemus_above_size));
- fprintf(f, " auto hepisemus bridge %s\n",
- dump_bool(note->h_episemus_above_connect));
+ if (note->h_episema_above == HEPISEMA_AUTO
+ && note->h_episema_below == HEPISEMA_AUTO) {
+ fprintf(f, " auto hepisema size %d (%s)\n",
+ note->h_episema_above_size,
+ dump_h_episema_size(note->h_episema_above_size));
+ fprintf(f, " auto hepisema bridge %s\n",
+ dump_bool(note->h_episema_above_connect));
}
else {
- if (note->h_episemus_above == HEPISEMUS_FORCED) {
- fprintf(f, " above hepisemus size %d (%s)\n",
- note->h_episemus_above_size,
- dump_h_episemus_size(note->h_episemus_above_size));
- fprintf(f, " above hepisemus bridge %s\n",
- dump_bool(note->h_episemus_above_connect));
+ if (note->h_episema_above == HEPISEMA_FORCED) {
+ fprintf(f, " above hepisema size %d (%s)\n",
+ note->h_episema_above_size,
+ dump_h_episema_size(note->h_episema_above_size));
+ fprintf(f, " above hepisema bridge %s\n",
+ dump_bool(note->h_episema_above_connect));
}
- if (note->h_episemus_below == HEPISEMUS_FORCED) {
- fprintf(f, " below hepisemus size %d (%s)\n",
- note->h_episemus_below_size,
- dump_h_episemus_size(note->h_episemus_below_size));
- fprintf(f, " below hepisemus bridge %s\n",
- dump_bool(note->h_episemus_below_connect));
+ if (note->h_episema_below == HEPISEMA_FORCED) {
+ fprintf(f, " below hepisema size %d (%s)\n",
+ note->h_episema_below_size,
+ dump_h_episema_size(note->h_episema_below_size));
+ fprintf(f, " below hepisema bridge %s\n",
+ dump_bool(note->h_episema_below_connect));
}
}
}
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/encode_utf8strings.c b/Build/source/texk/gregorio/gregorio-src/src/encode_utf8strings.c
index d932a9aeb4a..d932a9aeb4a 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/encode_utf8strings.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/encode_utf8strings.c
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-elements-determination.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-elements-determination.c
index eefdc86e49f..3991760f8ee 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-elements-determination.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-elements-determination.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX.
+ * This file provides functions for determining elements from notes.
+ *
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-glyphs-determination.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-glyphs-determination.c
index d4713e99801..37328ee1d95 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-glyphs-determination.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-glyphs-determination.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file provides functions for determining glyphs from notes.
+ *
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -724,16 +727,16 @@ gregorio_glyph *gabc_det_glyphs_from_notes(gregorio_note *current_note,
case GRE_BAR:
/* we calculate the signs of the bars */
- if (current_note->signs == _V_EPISEMUS) {
- sign = _V_EPISEMUS;
+ if (current_note->signs == _V_EPISEMA) {
+ sign = _V_EPISEMA;
} else {
sign = current_note->special_sign;
}
- if (current_note->h_episemus_above) {
- if (sign == _V_EPISEMUS) {
- sign = _V_EPISEMUS_BAR_H_EPISEMUS;
+ if (current_note->h_episema_above) {
+ if (sign == _V_EPISEMA) {
+ sign = _V_EPISEMA_BAR_H_EPISEMA;
} else {
- sign = _BAR_H_EPISEMUS;
+ sign = _BAR_H_EPISEMA;
}
}
break;
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-notes-determination-l.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c
index be6374b8e5c..cf07911a96c 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-notes-determination-l.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c
@@ -7200,6 +7200,9 @@ char *gabc_notes_determination_text;
#line 1 "gabc/gabc-notes-determination.l"
#line 2 "gabc/gabc-notes-determination.l"
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the note parser.
+ *
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -7236,7 +7239,7 @@ char *gabc_notes_determination_text;
static gregorio_scanner_location notes_lloc;
static gregorio_note *current_note;
static char char_for_brace;
-static unsigned int nbof_isolated_episemus;
+static unsigned int nbof_isolated_episema;
static char *notesmacros[10];
static char tempstr[256];
static int brace_var_counter;
@@ -7259,7 +7262,7 @@ static gregorio_shape punctum(const char pitch)
static __inline void lex_add_note(int i, gregorio_shape shape, char signs,
char liquescentia)
{
- nbof_isolated_episemus = 0;
+ nbof_isolated_episema = 0;
gregorio_add_note(&current_note,
pitch_letter_to_height(tolower((unsigned char)gabc_notes_determination_text[i])),
shape, signs, liquescentia, NULL, &notes_lloc);
@@ -7267,7 +7270,7 @@ static __inline void lex_add_note(int i, gregorio_shape shape, char signs,
static __inline void add_bar_as_note(gregorio_bar bar)
{
- nbof_isolated_episemus = 0;
+ nbof_isolated_episema = 0;
gregorio_add_bar_as_note(&current_note, bar, &notes_lloc);
}
@@ -7278,8 +7281,8 @@ static __inline void error(void)
gabc_notes_determination_text[3] - '0');
}
-static void add_h_episemus(void) {
- grehepisemus_size size = H_NORMAL;
+static void add_h_episema(void) {
+ grehepisema_size size = H_NORMAL;
gregorio_vposition vposition = VPOS_AUTO;
bool disable_bridge = false;
@@ -7308,14 +7311,14 @@ static void add_h_episemus(void) {
break;
default:
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
- _("unrecognized horizontal episemus modifier: %c"),
+ _("unrecognized horizontal episema modifier: %c"),
current);
break;
};
}
- gregorio_add_h_episemus(current_note, size, vposition, disable_bridge,
- &nbof_isolated_episemus);
+ gregorio_add_h_episema(current_note, size, vposition, disable_bridge,
+ &nbof_isolated_episema);
}
static void add_sign(gregorio_sign sign) {
@@ -7348,7 +7351,7 @@ static __inline void add_alteration(const gregorio_type type) {
-#line 7352 "gabc/gabc-notes-determination-l.c"
+#line 7355 "gabc/gabc-notes-determination-l.c"
#define INITIAL 0
#define texverbnote 1
@@ -7570,9 +7573,9 @@ YY_DECL
}
{
-#line 169 "gabc/gabc-notes-determination.l"
+#line 172 "gabc/gabc-notes-determination.l"
-#line 7576 "gabc/gabc-notes-determination-l.c"
+#line 7579 "gabc/gabc-notes-determination-l.c"
while ( 1 ) /* loops until end-of-file is reached */
{
@@ -7619,7 +7622,7 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 170 "gabc/gabc-notes-determination.l"
+#line 173 "gabc/gabc-notes-determination.l"
{
BEGIN(comments);
}
@@ -7627,35 +7630,35 @@ YY_RULE_SETUP
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 173 "gabc/gabc-notes-determination.l"
+#line 176 "gabc/gabc-notes-determination.l"
{
BEGIN(INITIAL);
}
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 176 "gabc/gabc-notes-determination.l"
+#line 179 "gabc/gabc-notes-determination.l"
{
/* ignored */
}
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 179 "gabc/gabc-notes-determination.l"
+#line 182 "gabc/gabc-notes-determination.l"
{
BEGIN(choralsign);
}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 182 "gabc/gabc-notes-determination.l"
+#line 185 "gabc/gabc-notes-determination.l"
{
BEGIN(choralnabc);
}
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 185 "gabc/gabc-notes-determination.l"
+#line 188 "gabc/gabc-notes-determination.l"
{
char_for_brace = gabc_notes_determination_text[4]-'0';
BEGIN(overbrace);
@@ -7663,7 +7666,7 @@ YY_RULE_SETUP
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 189 "gabc/gabc-notes-determination.l"
+#line 192 "gabc/gabc-notes-determination.l"
{
char_for_brace = gabc_notes_determination_text[4]-'0';
BEGIN(underbrace);
@@ -7671,7 +7674,7 @@ YY_RULE_SETUP
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 193 "gabc/gabc-notes-determination.l"
+#line 196 "gabc/gabc-notes-determination.l"
{
char_for_brace = gabc_notes_determination_text[5]-'0';
BEGIN(overcurlybrace);
@@ -7679,7 +7682,7 @@ YY_RULE_SETUP
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 197 "gabc/gabc-notes-determination.l"
+#line 200 "gabc/gabc-notes-determination.l"
{
char_for_brace = gabc_notes_determination_text[6]-'0';
BEGIN(overcurlyaccentusbrace);
@@ -7687,7 +7690,7 @@ YY_RULE_SETUP
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 201 "gabc/gabc-notes-determination.l"
+#line 204 "gabc/gabc-notes-determination.l"
{
if (overbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -7701,13 +7704,13 @@ YY_RULE_SETUP
"\\GreVarBraceSavePos{%d}{%d}{1}"
"\\GreOverBrace{\\GreVarBraceLength{%d}}{0pt}{0pt}{%d}",
overbrace_var, char_for_brace, overbrace_var, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 217 "gabc/gabc-notes-determination.l"
+#line 220 "gabc/gabc-notes-determination.l"
{
if (underbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -7720,13 +7723,13 @@ YY_RULE_SETUP
"\\GreVarBraceSavePos{%d}{%d}{1}"
"\\GreUnderBrace{\\GreVarBraceLength{%d}}{0pt}{0pt}{%d}",
underbrace_var, char_for_brace, underbrace_var, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 232 "gabc/gabc-notes-determination.l"
+#line 235 "gabc/gabc-notes-determination.l"
{
if (overbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -7740,13 +7743,13 @@ YY_RULE_SETUP
"\\GreVarBraceSavePos{%d}{%d}{1}"
"\\GreOverCurlyBrace{\\GreVarBraceLength{%d}}{0pt}{0pt}{%d}{0}",
overbrace_var, char_for_brace, overbrace_var, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 248 "gabc/gabc-notes-determination.l"
+#line 251 "gabc/gabc-notes-determination.l"
{
if (overbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -7760,13 +7763,13 @@ YY_RULE_SETUP
"\\GreVarBraceSavePos{%d}{%d}{1}"
"\\GreOverCurlyBrace{\\GreVarBraceLength{%d}}{0pt}{0pt}{%d}{1}",
overbrace_var, char_for_brace, overbrace_var, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 264 "gabc/gabc-notes-determination.l"
+#line 267 "gabc/gabc-notes-determination.l"
{
if (!overbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -7783,13 +7786,13 @@ YY_RULE_SETUP
"\\GreVarBraceSavePos{%d}{%d}{2}", overbrace_var,
char_for_brace);
overbrace_var = 0;
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 283 "gabc/gabc-notes-determination.l"
+#line 286 "gabc/gabc-notes-determination.l"
{
if (!underbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -7801,13 +7804,13 @@ YY_RULE_SETUP
"\\GreVarBraceSavePos{%d}{%d}{2}", underbrace_var,
char_for_brace);
underbrace_var = 0;
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 297 "gabc/gabc-notes-determination.l"
+#line 300 "gabc/gabc-notes-determination.l"
{
if (!overbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -7824,13 +7827,13 @@ YY_RULE_SETUP
"\\GreVarBraceSavePos{%d}{%d}{2}", overbrace_var,
char_for_brace);
overbrace_var = 0;
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 316 "gabc/gabc-notes-determination.l"
+#line 319 "gabc/gabc-notes-determination.l"
{
if (!overbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -7847,91 +7850,91 @@ YY_RULE_SETUP
"\\GreVarBraceSavePos{%d}{%d}{2}", overbrace_var,
char_for_brace);
overbrace_var = 0;
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 335 "gabc/gabc-notes-determination.l"
+#line 338 "gabc/gabc-notes-determination.l"
{
if (notesmacros[gabc_notes_determination_text[3]-'0']) {
gregorio_add_texverb_to_note(&current_note,
- strdup(notesmacros[gabc_notes_determination_text[3]-'0']));
+ gregorio_strdup(notesmacros[gabc_notes_determination_text[3]-'0']));
} else error();
}
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 341 "gabc/gabc-notes-determination.l"
+#line 344 "gabc/gabc-notes-determination.l"
{
if (notesmacros[gabc_notes_determination_text[3]-'0']) {
gregorio_add_texverb_as_note(&current_note,
- strdup(notesmacros[gabc_notes_determination_text[3]-'0']),
+ gregorio_strdup(notesmacros[gabc_notes_determination_text[3]-'0']),
GRE_TEXVERB_GLYPH, &notes_lloc);
} else error();
}
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 348 "gabc/gabc-notes-determination.l"
+#line 351 "gabc/gabc-notes-determination.l"
{
if (notesmacros[gabc_notes_determination_text[3]-'0']) {
gregorio_add_texverb_as_note(&current_note,
- strdup(notesmacros[gabc_notes_determination_text[3]-'0']),
+ gregorio_strdup(notesmacros[gabc_notes_determination_text[3]-'0']),
GRE_TEXVERB_ELEMENT, &notes_lloc);
} else error();
}
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 355 "gabc/gabc-notes-determination.l"
+#line 358 "gabc/gabc-notes-determination.l"
{
if (notesmacros[gabc_notes_determination_text[5]-'0']) {
gregorio_add_texverb_as_note(&current_note,
- strdup(notesmacros[gabc_notes_determination_text[5]-'0']),
+ gregorio_strdup(notesmacros[gabc_notes_determination_text[5]-'0']),
GRE_TEXVERB_ELEMENT, &notes_lloc);
} else error();
}
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 362 "gabc/gabc-notes-determination.l"
+#line 365 "gabc/gabc-notes-determination.l"
{
BEGIN(texverbnote);
}
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 365 "gabc/gabc-notes-determination.l"
+#line 368 "gabc/gabc-notes-determination.l"
{
BEGIN(texverbglyph);
}
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 368 "gabc/gabc-notes-determination.l"
+#line 371 "gabc/gabc-notes-determination.l"
{
BEGIN(texverbelement);
}
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 371 "gabc/gabc-notes-determination.l"
+#line 374 "gabc/gabc-notes-determination.l"
{
BEGIN(alt);
}
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 374 "gabc/gabc-notes-determination.l"
+#line 377 "gabc/gabc-notes-determination.l"
{
gregorio_add_nlba_as_note(&current_note, NLBA_BEGINNING, &notes_lloc);
}
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 377 "gabc/gabc-notes-determination.l"
+#line 380 "gabc/gabc-notes-determination.l"
{
gregorio_add_nlba_as_note(&current_note, NLBA_END, &notes_lloc);
}
@@ -7939,130 +7942,132 @@ YY_RULE_SETUP
case 28:
/* rule 28 can match eol */
YY_RULE_SETUP
-#line 380 "gabc/gabc-notes-determination.l"
+#line 383 "gabc/gabc-notes-determination.l"
{
gregorio_snprintf(tempstr, sizeof tempstr,
"\\GreOverBrace{%s}{0pt}{0pt}{%d}",
gabc_notes_determination_text, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
YY_BREAK
case 29:
/* rule 29 can match eol */
YY_RULE_SETUP
-#line 386 "gabc/gabc-notes-determination.l"
+#line 389 "gabc/gabc-notes-determination.l"
{
gregorio_snprintf(tempstr, sizeof tempstr,
"\\GreUnderBrace{%s}{0pt}{0pt}{%d}",
gabc_notes_determination_text, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
YY_BREAK
case 30:
/* rule 30 can match eol */
YY_RULE_SETUP
-#line 392 "gabc/gabc-notes-determination.l"
+#line 395 "gabc/gabc-notes-determination.l"
{
gregorio_snprintf(tempstr, sizeof tempstr,
"\\GreOverCurlyBrace{%s}{0pt}{0pt}{%d}{0}",
gabc_notes_determination_text, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
YY_BREAK
case 31:
/* rule 31 can match eol */
YY_RULE_SETUP
-#line 398 "gabc/gabc-notes-determination.l"
+#line 401 "gabc/gabc-notes-determination.l"
{
gregorio_snprintf(tempstr, sizeof tempstr,
"\\GreOverCurlyBrace{%s}{0pt}{0pt}{%d}{1}",
gabc_notes_determination_text, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
YY_BREAK
case 32:
/* rule 32 can match eol */
YY_RULE_SETUP
-#line 404 "gabc/gabc-notes-determination.l"
+#line 407 "gabc/gabc-notes-determination.l"
{
gregorio_add_cs_to_note(&current_note,
- strdup(gabc_notes_determination_text), false);
+ gregorio_strdup(gabc_notes_determination_text), false);
}
YY_BREAK
case 33:
/* rule 33 can match eol */
YY_RULE_SETUP
-#line 408 "gabc/gabc-notes-determination.l"
+#line 411 "gabc/gabc-notes-determination.l"
{
gregorio_add_cs_to_note(&current_note,
- strdup(gabc_notes_determination_text), true);
+ gregorio_strdup(gabc_notes_determination_text), true);
}
YY_BREAK
case 34:
/* rule 34 can match eol */
YY_RULE_SETUP
-#line 412 "gabc/gabc-notes-determination.l"
+#line 415 "gabc/gabc-notes-determination.l"
{
gregorio_add_texverb_to_note(&current_note,
- strdup(gabc_notes_determination_text));
+ gregorio_strdup(gabc_notes_determination_text));
}
YY_BREAK
case 35:
/* rule 35 can match eol */
YY_RULE_SETUP
-#line 416 "gabc/gabc-notes-determination.l"
+#line 419 "gabc/gabc-notes-determination.l"
{
gregorio_add_texverb_as_note(&current_note,
- strdup(gabc_notes_determination_text), GRE_TEXVERB_GLYPH,
- &notes_lloc);
+ gregorio_strdup(gabc_notes_determination_text),
+ GRE_TEXVERB_GLYPH, &notes_lloc);
}
YY_BREAK
case 36:
/* rule 36 can match eol */
YY_RULE_SETUP
-#line 421 "gabc/gabc-notes-determination.l"
+#line 424 "gabc/gabc-notes-determination.l"
{
gregorio_add_texverb_as_note(&current_note,
- strdup(gabc_notes_determination_text), GRE_TEXVERB_ELEMENT,
- &notes_lloc);
+ gregorio_strdup(gabc_notes_determination_text),
+ GRE_TEXVERB_ELEMENT, &notes_lloc);
}
YY_BREAK
case 37:
/* rule 37 can match eol */
YY_RULE_SETUP
-#line 426 "gabc/gabc-notes-determination.l"
+#line 429 "gabc/gabc-notes-determination.l"
{
gregorio_add_texverb_as_note(&current_note,
- strdup(gabc_notes_determination_text), GRE_ALT, &notes_lloc);
+ gregorio_strdup(gabc_notes_determination_text), GRE_ALT,
+ &notes_lloc);
}
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 430 "gabc/gabc-notes-determination.l"
+#line 434 "gabc/gabc-notes-determination.l"
{
BEGIN(INITIAL);
}
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 433 "gabc/gabc-notes-determination.l"
+#line 437 "gabc/gabc-notes-determination.l"
{
- gregorio_add_texverb_as_note(&current_note, strdup("\\hbox to 0pt{"),
- GRE_TEXVERB_ELEMENT, &notes_lloc);
+ gregorio_add_texverb_as_note(&current_note,
+ gregorio_strdup("\\hbox to 0pt{"), GRE_TEXVERB_ELEMENT,
+ &notes_lloc);
}
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 437 "gabc/gabc-notes-determination.l"
+#line 442 "gabc/gabc-notes-determination.l"
{
gregorio_add_texverb_as_note(&current_note,
- strdup("\\hss%\n}%\n\\GreNoBreak\\relax "), GRE_TEXVERB_ELEMENT,
- &notes_lloc);
+ gregorio_strdup("\\hss%\n}%\n\\GreNoBreak\\relax "),
+ GRE_TEXVERB_ELEMENT, &notes_lloc);
}
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 442 "gabc/gabc-notes-determination.l"
+#line 447 "gabc/gabc-notes-determination.l"
{
gregorio_add_manual_custos_as_note(&current_note,
pitch_letter_to_height(gabc_notes_determination_text[0]),
@@ -8072,12 +8077,12 @@ YY_RULE_SETUP
case 42:
/* rule 42 can match eol */
YY_RULE_SETUP
-#line 447 "gabc/gabc-notes-determination.l"
+#line 452 "gabc/gabc-notes-determination.l"
/* ignore ends of line and tabs */;
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 448 "gabc/gabc-notes-determination.l"
+#line 453 "gabc/gabc-notes-determination.l"
{
gregorio_add_end_of_line_as_note(&current_note, GRE_END_OF_LINE,
&notes_lloc);
@@ -8085,14 +8090,14 @@ YY_RULE_SETUP
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 452 "gabc/gabc-notes-determination.l"
+#line 457 "gabc/gabc-notes-determination.l"
{
gregorio_add_custo_as_note(&current_note, &notes_lloc);
}
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 455 "gabc/gabc-notes-determination.l"
+#line 460 "gabc/gabc-notes-determination.l"
{
gregorio_add_end_of_line_as_note(&current_note, GRE_END_OF_PAR,
&notes_lloc);
@@ -8100,7 +8105,7 @@ YY_RULE_SETUP
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 459 "gabc/gabc-notes-determination.l"
+#line 464 "gabc/gabc-notes-determination.l"
{
if (gabc_notes_determination_text[0]=='c') {
gregorio_add_clef_change_as_note(&current_note, GRE_C_KEY_CHANGE,
@@ -8113,7 +8118,7 @@ YY_RULE_SETUP
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 468 "gabc/gabc-notes-determination.l"
+#line 473 "gabc/gabc-notes-determination.l"
{
if (gabc_notes_determination_text[0]=='c') {
gregorio_add_clef_change_as_note(&current_note,
@@ -8128,224 +8133,224 @@ YY_RULE_SETUP
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 479 "gabc/gabc-notes-determination.l"
+#line 484 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_VIRGULA);
}
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 482 "gabc/gabc-notes-determination.l"
+#line 487 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINIMA);
}
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 485 "gabc/gabc-notes-determination.l"
+#line 490 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR_D1);
}
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 488 "gabc/gabc-notes-determination.l"
+#line 493 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR_D2);
}
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 491 "gabc/gabc-notes-determination.l"
+#line 496 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR_D3);
}
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 494 "gabc/gabc-notes-determination.l"
+#line 499 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR_D4);
}
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 497 "gabc/gabc-notes-determination.l"
+#line 502 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR_D5);
}
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 500 "gabc/gabc-notes-determination.l"
+#line 505 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR_D6);
}
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 503 "gabc/gabc-notes-determination.l"
+#line 508 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR);
}
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 506 "gabc/gabc-notes-determination.l"
+#line 511 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR_D1);
}
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 509 "gabc/gabc-notes-determination.l"
+#line 514 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR_D2);
}
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 512 "gabc/gabc-notes-determination.l"
+#line 517 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR_D3);
}
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 515 "gabc/gabc-notes-determination.l"
+#line 520 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR_D4);
}
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 518 "gabc/gabc-notes-determination.l"
+#line 523 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR_D5);
}
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 521 "gabc/gabc-notes-determination.l"
+#line 526 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MINOR_D6);
}
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 524 "gabc/gabc-notes-determination.l"
+#line 529 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_MAIOR);
}
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 527 "gabc/gabc-notes-determination.l"
+#line 532 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_DIVISIO_FINALIS);
}
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 530 "gabc/gabc-notes-determination.l"
+#line 535 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_PUNCTUM_CAVUM);
}
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 533 "gabc/gabc-notes-determination.l"
+#line 538 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_LINEA_PUNCTUM);
}
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 536 "gabc/gabc-notes-determination.l"
+#line 541 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_LINEA_PUNCTUM_CAVUM);
}
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 539 "gabc/gabc-notes-determination.l"
+#line 544 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _ACCENTUS);
}
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 542 "gabc/gabc-notes-determination.l"
+#line 547 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _ACCENTUS_REVERSUS);
}
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 545 "gabc/gabc-notes-determination.l"
+#line 550 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _CIRCULUS);
}
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 548 "gabc/gabc-notes-determination.l"
+#line 553 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _SEMI_CIRCULUS);
}
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 551 "gabc/gabc-notes-determination.l"
+#line 556 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _SEMI_CIRCULUS_REVERSUS);
}
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 554 "gabc/gabc-notes-determination.l"
+#line 559 "gabc/gabc-notes-determination.l"
{
add_alteration(GRE_FLAT);
}
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 557 "gabc/gabc-notes-determination.l"
+#line 562 "gabc/gabc-notes-determination.l"
{
add_alteration(GRE_SHARP);
}
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 560 "gabc/gabc-notes-determination.l"
+#line 565 "gabc/gabc-notes-determination.l"
{
add_alteration(GRE_NATURAL);
}
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 563 "gabc/gabc-notes-determination.l"
+#line 568 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(&current_note, SP_NEUMATIC_CUT, &notes_lloc);
}
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 566 "gabc/gabc-notes-determination.l"
+#line 571 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(&current_note, SP_LARGER_SPACE, &notes_lloc);
}
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 569 "gabc/gabc-notes-determination.l"
+#line 574 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(&current_note, SP_GLYPH_SPACE, &notes_lloc);
}
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 572 "gabc/gabc-notes-determination.l"
+#line 577 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(&current_note, SP_NEUMATIC_CUT_NB,
&notes_lloc);
@@ -8353,7 +8358,7 @@ YY_RULE_SETUP
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 576 "gabc/gabc-notes-determination.l"
+#line 581 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(&current_note, SP_LARGER_SPACE_NB,
&notes_lloc);
@@ -8361,7 +8366,7 @@ YY_RULE_SETUP
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 580 "gabc/gabc-notes-determination.l"
+#line 585 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(&current_note, SP_GLYPH_SPACE_NB,
&notes_lloc);
@@ -8374,77 +8379,77 @@ YY_LINENO_REWIND_TO(yy_bp + 1);
(yy_c_buf_p) = yy_cp = yy_bp + 1;
YY_DO_BEFORE_ACTION; /* set up gabc_notes_determination_text again */
YY_RULE_SETUP
-#line 584 "gabc/gabc-notes-determination.l"
+#line 589 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(&current_note, SP_ZERO_WIDTH, &notes_lloc);
}
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 587 "gabc/gabc-notes-determination.l"
+#line 592 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_LINEA);
}
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 590 "gabc/gabc-notes-determination.l"
+#line 595 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_BIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 593 "gabc/gabc-notes-determination.l"
+#line 598 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_TRIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 596 "gabc/gabc-notes-determination.l"
+#line 601 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_BIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 599 "gabc/gabc-notes-determination.l"
+#line 604 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_TRIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 602 "gabc/gabc-notes-determination.l"
+#line 607 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_DISTROPHA, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 605 "gabc/gabc-notes-determination.l"
+#line 610 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_DISTROPHA, _NO_SIGN, L_AUCTA);
}
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 608 "gabc/gabc-notes-determination.l"
+#line 613 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_TRISTROPHA, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 611 "gabc/gabc-notes-determination.l"
+#line 616 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_TRISTROPHA, _NO_SIGN, L_AUCTA);
}
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 614 "gabc/gabc-notes-determination.l"
+#line 619 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, punctum(gabc_notes_determination_text[0]), _NO_SIGN,
L_NO_LIQUESCENTIA);
@@ -8452,7 +8457,7 @@ YY_RULE_SETUP
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 618 "gabc/gabc-notes-determination.l"
+#line 623 "gabc/gabc-notes-determination.l"
{
lex_add_note(1, punctum(gabc_notes_determination_text[1]), _NO_SIGN,
L_INITIO_DEBILIS);
@@ -8460,105 +8465,105 @@ YY_RULE_SETUP
YY_BREAK
case 94:
YY_RULE_SETUP
-#line 622 "gabc/gabc-notes-determination.l"
+#line 627 "gabc/gabc-notes-determination.l"
{
- add_sign(_V_EPISEMUS);
+ add_sign(_V_EPISEMA);
}
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 625 "gabc/gabc-notes-determination.l"
+#line 630 "gabc/gabc-notes-determination.l"
{
- add_h_episemus();
+ add_h_episema();
}
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 628 "gabc/gabc-notes-determination.l"
+#line 633 "gabc/gabc-notes-determination.l"
{
add_sign(_PUNCTUM_MORA);
}
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 631 "gabc/gabc-notes-determination.l"
+#line 636 "gabc/gabc-notes-determination.l"
{
gregorio_add_liquescentia(current_note, L_DEMINUTUS);
}
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 634 "gabc/gabc-notes-determination.l"
+#line 639 "gabc/gabc-notes-determination.l"
{
gregorio_add_liquescentia(current_note, L_AUCTUS_DESCENDENS);
}
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 637 "gabc/gabc-notes-determination.l"
+#line 642 "gabc/gabc-notes-determination.l"
{
gregorio_add_liquescentia(current_note, L_AUCTUS_ASCENDENS);
}
YY_BREAK
case 100:
YY_RULE_SETUP
-#line 640 "gabc/gabc-notes-determination.l"
+#line 645 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_QUADRATUM);
}
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 643 "gabc/gabc-notes-determination.l"
+#line 648 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_ORISCUS);
}
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 646 "gabc/gabc-notes-determination.l"
+#line 651 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_ORISCUS_SCAPUS);
}
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 649 "gabc/gabc-notes-determination.l"
+#line 654 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_QUILISMA);
}
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 652 "gabc/gabc-notes-determination.l"
+#line 657 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_QUILISMA_QUADRATUM);
}
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 655 "gabc/gabc-notes-determination.l"
+#line 660 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_VIRGA);
}
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 658 "gabc/gabc-notes-determination.l"
+#line 663 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_VIRGA_REVERSA);
}
YY_BREAK
case 107:
YY_RULE_SETUP
-#line 661 "gabc/gabc-notes-determination.l"
+#line 666 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_STROPHA);
}
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 664 "gabc/gabc-notes-determination.l"
+#line 669 "gabc/gabc-notes-determination.l"
{
gregorio_messagef("det_notes_from_string", VERBOSITY_ERROR, 0,
_("unrecognized character: \"%c\""),
@@ -8567,10 +8572,10 @@ YY_RULE_SETUP
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 670 "gabc/gabc-notes-determination.l"
+#line 675 "gabc/gabc-notes-determination.l"
ECHO;
YY_BREAK
-#line 8574 "gabc/gabc-notes-determination-l.c"
+#line 8579 "gabc/gabc-notes-determination-l.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(texverbnote):
case YY_STATE_EOF(texverbglyph):
@@ -9542,7 +9547,7 @@ void gabc_notes_determination_free (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 670 "gabc/gabc-notes-determination.l"
+#line 675 "gabc/gabc-notes-determination.l"
@@ -9565,7 +9570,7 @@ gregorio_note *gabc_det_notes_from_string(char *str, char *newmacros[10],
for (i = 0; i < 10; i++) {
notesmacros[i] = newmacros[i];
}
- nbof_isolated_episemus = 0;
+ nbof_isolated_episema = 0;
current_note = NULL;
buf = gabc_notes_determination__scan_string(str);
gabc_notes_determination_lex();
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-notes-determination.l b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l
index d5a141fb538..f48875aea4a 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-notes-determination.l
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l
@@ -1,5 +1,8 @@
%{
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the note parser.
+ *
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -36,7 +39,7 @@
static gregorio_scanner_location notes_lloc;
static gregorio_note *current_note;
static char char_for_brace;
-static unsigned int nbof_isolated_episemus;
+static unsigned int nbof_isolated_episema;
static char *notesmacros[10];
static char tempstr[256];
static int brace_var_counter;
@@ -59,7 +62,7 @@ static gregorio_shape punctum(const char pitch)
static __inline void lex_add_note(int i, gregorio_shape shape, char signs,
char liquescentia)
{
- nbof_isolated_episemus = 0;
+ nbof_isolated_episema = 0;
gregorio_add_note(&current_note,
pitch_letter_to_height(tolower((unsigned char)gabc_notes_determination_text[i])),
shape, signs, liquescentia, NULL, &notes_lloc);
@@ -67,7 +70,7 @@ static __inline void lex_add_note(int i, gregorio_shape shape, char signs,
static __inline void add_bar_as_note(gregorio_bar bar)
{
- nbof_isolated_episemus = 0;
+ nbof_isolated_episema = 0;
gregorio_add_bar_as_note(&current_note, bar, &notes_lloc);
}
@@ -78,8 +81,8 @@ static __inline void error(void)
gabc_notes_determination_text[3] - '0');
}
-static void add_h_episemus(void) {
- grehepisemus_size size = H_NORMAL;
+static void add_h_episema(void) {
+ grehepisema_size size = H_NORMAL;
gregorio_vposition vposition = VPOS_AUTO;
bool disable_bridge = false;
@@ -108,14 +111,14 @@ static void add_h_episemus(void) {
break;
default:
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
- _("unrecognized horizontal episemus modifier: %c"),
+ _("unrecognized horizontal episema modifier: %c"),
current);
break;
};
}
- gregorio_add_h_episemus(current_note, size, vposition, disable_bridge,
- &nbof_isolated_episemus);
+ gregorio_add_h_episema(current_note, size, vposition, disable_bridge,
+ &nbof_isolated_episema);
}
static void add_sign(gregorio_sign sign) {
@@ -211,7 +214,7 @@ static __inline void add_alteration(const gregorio_type type) {
"\\GreVarBraceSavePos{%d}{%d}{1}"
"\\GreOverBrace{\\GreVarBraceLength{%d}}{0pt}{0pt}{%d}",
overbrace_var, char_for_brace, overbrace_var, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
<INITIAL>\[ub:[01]\{\] {
@@ -226,7 +229,7 @@ static __inline void add_alteration(const gregorio_type type) {
"\\GreVarBraceSavePos{%d}{%d}{1}"
"\\GreUnderBrace{\\GreVarBraceLength{%d}}{0pt}{0pt}{%d}",
underbrace_var, char_for_brace, underbrace_var, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
<INITIAL>\[ocb:[01]\{\] {
@@ -242,7 +245,7 @@ static __inline void add_alteration(const gregorio_type type) {
"\\GreVarBraceSavePos{%d}{%d}{1}"
"\\GreOverCurlyBrace{\\GreVarBraceLength{%d}}{0pt}{0pt}{%d}{0}",
overbrace_var, char_for_brace, overbrace_var, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
<INITIAL>\[ocba:[01]\{\] {
@@ -258,7 +261,7 @@ static __inline void add_alteration(const gregorio_type type) {
"\\GreVarBraceSavePos{%d}{%d}{1}"
"\\GreOverCurlyBrace{\\GreVarBraceLength{%d}}{0pt}{0pt}{%d}{1}",
overbrace_var, char_for_brace, overbrace_var, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
<INITIAL>\[ob:[01]\}\] {
@@ -277,7 +280,7 @@ static __inline void add_alteration(const gregorio_type type) {
"\\GreVarBraceSavePos{%d}{%d}{2}", overbrace_var,
char_for_brace);
overbrace_var = 0;
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
<INITIAL>\[ub:[01]\}\] {
@@ -291,7 +294,7 @@ static __inline void add_alteration(const gregorio_type type) {
"\\GreVarBraceSavePos{%d}{%d}{2}", underbrace_var,
char_for_brace);
underbrace_var = 0;
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
<INITIAL>\[ocb:[01]\}\] {
@@ -310,7 +313,7 @@ static __inline void add_alteration(const gregorio_type type) {
"\\GreVarBraceSavePos{%d}{%d}{2}", overbrace_var,
char_for_brace);
overbrace_var = 0;
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
<INITIAL>\[ocba:[01]\}\] {
@@ -329,33 +332,33 @@ static __inline void add_alteration(const gregorio_type type) {
"\\GreVarBraceSavePos{%d}{%d}{2}", overbrace_var,
char_for_brace);
overbrace_var = 0;
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
}
<INITIAL>\[nm[1-9]\] {
if (notesmacros[gabc_notes_determination_text[3]-'0']) {
gregorio_add_texverb_to_note(&current_note,
- strdup(notesmacros[gabc_notes_determination_text[3]-'0']));
+ gregorio_strdup(notesmacros[gabc_notes_determination_text[3]-'0']));
} else error();
}
<INITIAL>\[gm[1-9]\] {
if (notesmacros[gabc_notes_determination_text[3]-'0']) {
gregorio_add_texverb_as_note(&current_note,
- strdup(notesmacros[gabc_notes_determination_text[3]-'0']),
+ gregorio_strdup(notesmacros[gabc_notes_determination_text[3]-'0']),
GRE_TEXVERB_GLYPH, &notes_lloc);
} else error();
}
<INITIAL>\[em[1-9]\] {
if (notesmacros[gabc_notes_determination_text[3]-'0']) {
gregorio_add_texverb_as_note(&current_note,
- strdup(notesmacros[gabc_notes_determination_text[3]-'0']),
+ gregorio_strdup(notesmacros[gabc_notes_determination_text[3]-'0']),
GRE_TEXVERB_ELEMENT, &notes_lloc);
} else error();
}
<INITIAL>\[altm[1-9]\] {
if (notesmacros[gabc_notes_determination_text[5]-'0']) {
gregorio_add_texverb_as_note(&current_note,
- strdup(notesmacros[gabc_notes_determination_text[5]-'0']),
+ gregorio_strdup(notesmacros[gabc_notes_determination_text[5]-'0']),
GRE_TEXVERB_ELEMENT, &notes_lloc);
} else error();
}
@@ -381,63 +384,65 @@ static __inline void add_alteration(const gregorio_type type) {
gregorio_snprintf(tempstr, sizeof tempstr,
"\\GreOverBrace{%s}{0pt}{0pt}{%d}",
gabc_notes_determination_text, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
<underbrace>[^\]]+ {
gregorio_snprintf(tempstr, sizeof tempstr,
"\\GreUnderBrace{%s}{0pt}{0pt}{%d}",
gabc_notes_determination_text, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
<overcurlybrace>[^\]]+ {
gregorio_snprintf(tempstr, sizeof tempstr,
"\\GreOverCurlyBrace{%s}{0pt}{0pt}{%d}{0}",
gabc_notes_determination_text, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
<overcurlyaccentusbrace>[^\]]+ {
gregorio_snprintf(tempstr, sizeof tempstr,
"\\GreOverCurlyBrace{%s}{0pt}{0pt}{%d}{1}",
gabc_notes_determination_text, char_for_brace);
- gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+ gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
}
<choralsign>[^\]]+ {
gregorio_add_cs_to_note(&current_note,
- strdup(gabc_notes_determination_text), false);
+ gregorio_strdup(gabc_notes_determination_text), false);
}
<choralnabc>[^\]]+ {
gregorio_add_cs_to_note(&current_note,
- strdup(gabc_notes_determination_text), true);
+ gregorio_strdup(gabc_notes_determination_text), true);
}
<texverbnote>[^\]]+ {
gregorio_add_texverb_to_note(&current_note,
- strdup(gabc_notes_determination_text));
+ gregorio_strdup(gabc_notes_determination_text));
}
<texverbglyph>[^\]]+ {
gregorio_add_texverb_as_note(&current_note,
- strdup(gabc_notes_determination_text), GRE_TEXVERB_GLYPH,
- &notes_lloc);
+ gregorio_strdup(gabc_notes_determination_text),
+ GRE_TEXVERB_GLYPH, &notes_lloc);
}
<texverbelement>[^\]]+ {
gregorio_add_texverb_as_note(&current_note,
- strdup(gabc_notes_determination_text), GRE_TEXVERB_ELEMENT,
- &notes_lloc);
+ gregorio_strdup(gabc_notes_determination_text),
+ GRE_TEXVERB_ELEMENT, &notes_lloc);
}
<alt>[^\]]+ {
gregorio_add_texverb_as_note(&current_note,
- strdup(gabc_notes_determination_text), GRE_ALT, &notes_lloc);
+ gregorio_strdup(gabc_notes_determination_text), GRE_ALT,
+ &notes_lloc);
}
<texverbnote,texverbglyph,texverbelement,choralsign,choralnabc,alt,overcurlyaccentusbrace,overcurlybrace,overbrace,underbrace>\] {
BEGIN(INITIAL);
}
\{ {
- gregorio_add_texverb_as_note(&current_note, strdup("\\hbox to 0pt{"),
- GRE_TEXVERB_ELEMENT, &notes_lloc);
+ gregorio_add_texverb_as_note(&current_note,
+ gregorio_strdup("\\hbox to 0pt{"), GRE_TEXVERB_ELEMENT,
+ &notes_lloc);
}
\} {
gregorio_add_texverb_as_note(&current_note,
- strdup("\\hss%\n}%\n\\GreNoBreak\\relax "), GRE_TEXVERB_ELEMENT,
- &notes_lloc);
+ gregorio_strdup("\\hss%\n}%\n\\GreNoBreak\\relax "),
+ GRE_TEXVERB_ELEMENT, &notes_lloc);
}
[a-m]\+ {
gregorio_add_manual_custos_as_note(&current_note,
@@ -620,10 +625,10 @@ r5 {
L_INITIO_DEBILIS);
}
\'[01]? {
- add_sign(_V_EPISEMUS);
+ add_sign(_V_EPISEMA);
}
_[0-5]* {
- add_h_episemus();
+ add_h_episema();
}
\.[01]? {
add_sign(_PUNCTUM_MORA);
@@ -688,7 +693,7 @@ gregorio_note *gabc_det_notes_from_string(char *str, char *newmacros[10],
for (i = 0; i < 10; i++) {
notesmacros[i] = newmacros[i];
}
- nbof_isolated_episemus = 0;
+ nbof_isolated_episema = 0;
current_note = NULL;
buf = yy_scan_string(str);
yylex();
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-l.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c
index 09228015645..fe52c82613f 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-l.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c
@@ -770,6 +770,9 @@ char *gabc_score_determination_text;
#line 1 "gabc/gabc-score-determination.l"
#line 2 "gabc/gabc-score-determination.l"
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the score lexer.
+ *
* Gregorio score determination in gabc input.
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
@@ -795,6 +798,7 @@ char *gabc_score_determination_text;
#include <string.h>
#include "struct.h"
#include "messages.h"
+#include "support.h"
#include "gabc.h"
#include "gabc-score-determination.h"
@@ -849,7 +853,7 @@ static unsigned char style_stack = 0;
for (a) single-line values, ending with a semicolon at end of line or a
double semicolon, (b) multi-line values, which end at a double
semicolon. */
-#line 853 "gabc/gabc-score-determination-l.c"
+#line 857 "gabc/gabc-score-determination-l.c"
#define INITIAL 0
#define attribute 1
@@ -1071,9 +1075,9 @@ YY_DECL
}
{
-#line 102 "gabc/gabc-score-determination.l"
+#line 106 "gabc/gabc-score-determination.l"
-#line 1077 "gabc/gabc-score-determination-l.c"
+#line 1081 "gabc/gabc-score-determination-l.c"
while ( 1 ) /* loops until end-of-file is reached */
{
@@ -1133,7 +1137,7 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 103 "gabc/gabc-score-determination.l"
+#line 107 "gabc/gabc-score-determination.l"
{
/* BOM written by a lot of windows softwares when they write UTF-8 */
}
@@ -1141,14 +1145,14 @@ YY_RULE_SETUP
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 106 "gabc/gabc-score-determination.l"
+#line 110 "gabc/gabc-score-determination.l"
{
/* ignoring empty lines */
}
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 109 "gabc/gabc-score-determination.l"
+#line 113 "gabc/gabc-score-determination.l"
{
BEGIN(inicomments);
}
@@ -1156,21 +1160,21 @@ YY_RULE_SETUP
case 4:
/* rule 4 can match eol */
YY_RULE_SETUP
-#line 112 "gabc/gabc-score-determination.l"
+#line 116 "gabc/gabc-score-determination.l"
{
BEGIN(INITIAL);
}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 115 "gabc/gabc-score-determination.l"
+#line 119 "gabc/gabc-score-determination.l"
{
/* ignored */
}
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 118 "gabc/gabc-score-determination.l"
+#line 122 "gabc/gabc-score-determination.l"
{
BEGIN(attribute);
return COLON;
@@ -1179,16 +1183,17 @@ YY_RULE_SETUP
case 7:
/* rule 7 can match eol */
YY_RULE_SETUP
-#line 122 "gabc/gabc-score-determination.l"
+#line 126 "gabc/gabc-score-determination.l"
{
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return ATTRIBUTE;
}
YY_BREAK
case 8:
/* rule 8 can match eol */
YY_RULE_SETUP
-#line 126 "gabc/gabc-score-determination.l"
+#line 131 "gabc/gabc-score-determination.l"
{
BEGIN(INITIAL);
return SEMICOLON;
@@ -1196,7 +1201,7 @@ YY_RULE_SETUP
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 130 "gabc/gabc-score-determination.l"
+#line 135 "gabc/gabc-score-determination.l"
{
gabc_score_determination_lval.character = gabc_score_determination_text[5];
return DEF_MACRO;
@@ -1204,210 +1209,210 @@ YY_RULE_SETUP
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 134 "gabc/gabc-score-determination.l"
+#line 139 "gabc/gabc-score-determination.l"
{
return NUMBER_OF_VOICES;
}
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 137 "gabc/gabc-score-determination.l"
+#line 142 "gabc/gabc-score-determination.l"
{
return NAME;
}
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 140 "gabc/gabc-score-determination.l"
+#line 145 "gabc/gabc-score-determination.l"
{
return SCORE_COPYRIGHT;
}
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 143 "gabc/gabc-score-determination.l"
+#line 148 "gabc/gabc-score-determination.l"
{
return GABC_COPYRIGHT;
}
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 146 "gabc/gabc-score-determination.l"
+#line 151 "gabc/gabc-score-determination.l"
{
return OFFICE_PART;
}
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 149 "gabc/gabc-score-determination.l"
+#line 154 "gabc/gabc-score-determination.l"
{
return OCCASION;
}
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 152 "gabc/gabc-score-determination.l"
+#line 157 "gabc/gabc-score-determination.l"
{
return METER;
}
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 155 "gabc/gabc-score-determination.l"
+#line 160 "gabc/gabc-score-determination.l"
{
return COMMENTARY;
}
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 158 "gabc/gabc-score-determination.l"
+#line 163 "gabc/gabc-score-determination.l"
{
return ARRANGER;
}
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 161 "gabc/gabc-score-determination.l"
+#line 166 "gabc/gabc-score-determination.l"
{
return GABC_VERSION;
}
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 164 "gabc/gabc-score-determination.l"
+#line 169 "gabc/gabc-score-determination.l"
{
return INITIAL_STYLE;
}
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 167 "gabc/gabc-score-determination.l"
+#line 172 "gabc/gabc-score-determination.l"
{
return MODE;
}
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 170 "gabc/gabc-score-determination.l"
+#line 175 "gabc/gabc-score-determination.l"
{
return ANNOTATION;
}
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 173 "gabc/gabc-score-determination.l"
+#line 178 "gabc/gabc-score-determination.l"
{
return AUTHOR;
}
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 176 "gabc/gabc-score-determination.l"
+#line 181 "gabc/gabc-score-determination.l"
{
return DATE;
}
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 179 "gabc/gabc-score-determination.l"
+#line 184 "gabc/gabc-score-determination.l"
{
return MANUSCRIPT;
}
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 182 "gabc/gabc-score-determination.l"
+#line 187 "gabc/gabc-score-determination.l"
{
return MANUSCRIPT_REFERENCE;
}
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 185 "gabc/gabc-score-determination.l"
+#line 190 "gabc/gabc-score-determination.l"
{
return MANUSCRIPT_STORAGE_PLACE;
}
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 188 "gabc/gabc-score-determination.l"
+#line 193 "gabc/gabc-score-determination.l"
{
return BOOK;
}
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 191 "gabc/gabc-score-determination.l"
+#line 196 "gabc/gabc-score-determination.l"
{
return TRANSCRIBER;
}
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 194 "gabc/gabc-score-determination.l"
+#line 199 "gabc/gabc-score-determination.l"
{
return GENERATED_BY;
}
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 197 "gabc/gabc-score-determination.l"
+#line 202 "gabc/gabc-score-determination.l"
{
return CENTERING_SCHEME;
}
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 200 "gabc/gabc-score-determination.l"
+#line 205 "gabc/gabc-score-determination.l"
{
return LANGUAGE;
}
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 203 "gabc/gabc-score-determination.l"
+#line 208 "gabc/gabc-score-determination.l"
{
return TRANSCRIPTION_DATE;
}
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 206 "gabc/gabc-score-determination.l"
+#line 211 "gabc/gabc-score-determination.l"
{
return STYLE;
}
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 209 "gabc/gabc-score-determination.l"
+#line 214 "gabc/gabc-score-determination.l"
{
return VIRGULA_POSITION;
}
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 212 "gabc/gabc-score-determination.l"
+#line 217 "gabc/gabc-score-determination.l"
{
return GREGORIOTEX_FONT;
}
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 215 "gabc/gabc-score-determination.l"
+#line 220 "gabc/gabc-score-determination.l"
{
return NABC_LINES;
}
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 218 "gabc/gabc-score-determination.l"
+#line 223 "gabc/gabc-score-determination.l"
{
return USER_NOTES;
}
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 221 "gabc/gabc-score-determination.l"
+#line 226 "gabc/gabc-score-determination.l"
{
return VOICE_CHANGE;
}
@@ -1415,7 +1420,7 @@ YY_RULE_SETUP
case 40:
/* rule 40 can match eol */
YY_RULE_SETUP
-#line 224 "gabc/gabc-score-determination.l"
+#line 229 "gabc/gabc-score-determination.l"
{
BEGIN(score);
return END_OF_DEFINITIONS;
@@ -1423,7 +1428,7 @@ YY_RULE_SETUP
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 228 "gabc/gabc-score-determination.l"
+#line 233 "gabc/gabc-score-determination.l"
{
gregorio_messagef("det_score", VERBOSITY_ERROR, 0,
_("unrecognized character: \"%c\" in definition part"),
@@ -1433,15 +1438,16 @@ YY_RULE_SETUP
case 42:
/* rule 42 can match eol */
YY_RULE_SETUP
-#line 233 "gabc/gabc-score-determination.l"
+#line 238 "gabc/gabc-score-determination.l"
{
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return CHARACTERS;
}
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 237 "gabc/gabc-score-determination.l"
+#line 243 "gabc/gabc-score-determination.l"
{
BEGIN(style);
style_stack ++;
@@ -1450,21 +1456,21 @@ YY_RULE_SETUP
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 242 "gabc/gabc-score-determination.l"
+#line 248 "gabc/gabc-score-determination.l"
{
return BNLBA;
}
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 245 "gabc/gabc-score-determination.l"
+#line 251 "gabc/gabc-score-determination.l"
{
return ENLBA;
}
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 248 "gabc/gabc-score-determination.l"
+#line 254 "gabc/gabc-score-determination.l"
{
style_stack --;
if (style_stack == 0) {
@@ -1475,7 +1481,7 @@ YY_RULE_SETUP
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 255 "gabc/gabc-score-determination.l"
+#line 261 "gabc/gabc-score-determination.l"
{
BEGIN(style);
style_stack ++;
@@ -1484,7 +1490,7 @@ YY_RULE_SETUP
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 260 "gabc/gabc-score-determination.l"
+#line 266 "gabc/gabc-score-determination.l"
{
style_stack --;
if (style_stack == 0) {
@@ -1495,7 +1501,7 @@ YY_RULE_SETUP
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 267 "gabc/gabc-score-determination.l"
+#line 273 "gabc/gabc-score-determination.l"
{
BEGIN(style);
style_stack ++;
@@ -1504,7 +1510,7 @@ YY_RULE_SETUP
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 272 "gabc/gabc-score-determination.l"
+#line 278 "gabc/gabc-score-determination.l"
{
style_stack --;
if (style_stack == 0) {
@@ -1515,7 +1521,7 @@ YY_RULE_SETUP
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 279 "gabc/gabc-score-determination.l"
+#line 285 "gabc/gabc-score-determination.l"
{
BEGIN(style);
style_stack ++;
@@ -1524,7 +1530,7 @@ YY_RULE_SETUP
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 284 "gabc/gabc-score-determination.l"
+#line 290 "gabc/gabc-score-determination.l"
{
style_stack --;
if (style_stack == 0) {
@@ -1535,7 +1541,7 @@ YY_RULE_SETUP
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 291 "gabc/gabc-score-determination.l"
+#line 297 "gabc/gabc-score-determination.l"
{
BEGIN(style);
style_stack ++;
@@ -1544,7 +1550,7 @@ YY_RULE_SETUP
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 296 "gabc/gabc-score-determination.l"
+#line 302 "gabc/gabc-score-determination.l"
{
style_stack --;
if (style_stack == 0) {
@@ -1555,7 +1561,7 @@ YY_RULE_SETUP
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 303 "gabc/gabc-score-determination.l"
+#line 309 "gabc/gabc-score-determination.l"
{
BEGIN(style);
style_stack ++;
@@ -1564,7 +1570,7 @@ YY_RULE_SETUP
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 308 "gabc/gabc-score-determination.l"
+#line 314 "gabc/gabc-score-determination.l"
{
style_stack --;
if (style_stack == 0) {
@@ -1575,7 +1581,7 @@ YY_RULE_SETUP
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 315 "gabc/gabc-score-determination.l"
+#line 321 "gabc/gabc-score-determination.l"
{
BEGIN(style);
style_stack ++;
@@ -1584,7 +1590,7 @@ YY_RULE_SETUP
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 320 "gabc/gabc-score-determination.l"
+#line 326 "gabc/gabc-score-determination.l"
{
style_stack --;
if (style_stack == 0) {
@@ -1596,15 +1602,16 @@ YY_RULE_SETUP
case 59:
/* rule 59 can match eol */
YY_RULE_SETUP
-#line 327 "gabc/gabc-score-determination.l"
+#line 333 "gabc/gabc-score-determination.l"
{
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return CHARACTERS;
}
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 331 "gabc/gabc-score-determination.l"
+#line 338 "gabc/gabc-score-determination.l"
{
BEGIN(comments);
}
@@ -1612,21 +1619,21 @@ YY_RULE_SETUP
case 61:
/* rule 61 can match eol */
YY_RULE_SETUP
-#line 334 "gabc/gabc-score-determination.l"
+#line 341 "gabc/gabc-score-determination.l"
{
BEGIN(score);
}
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 337 "gabc/gabc-score-determination.l"
+#line 344 "gabc/gabc-score-determination.l"
{
/* ignored */
}
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 340 "gabc/gabc-score-determination.l"
+#line 347 "gabc/gabc-score-determination.l"
{
BEGIN(verb);
return VERB_BEGINNING;
@@ -1634,7 +1641,7 @@ YY_RULE_SETUP
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 344 "gabc/gabc-score-determination.l"
+#line 351 "gabc/gabc-score-determination.l"
{
if (style_stack == 0) {
BEGIN(score);
@@ -1647,37 +1654,39 @@ YY_RULE_SETUP
case 65:
/* rule 65 can match eol */
YY_RULE_SETUP
-#line 352 "gabc/gabc-score-determination.l"
+#line 359 "gabc/gabc-score-determination.l"
{
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return CHARACTERS;
}
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 356 "gabc/gabc-score-determination.l"
+#line 364 "gabc/gabc-score-determination.l"
{
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return CHARACTERS;
}
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 360 "gabc/gabc-score-determination.l"
+#line 369 "gabc/gabc-score-determination.l"
{
return CENTER_BEGINNING;
}
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 363 "gabc/gabc-score-determination.l"
+#line 372 "gabc/gabc-score-determination.l"
{
return CENTER_END;
}
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 366 "gabc/gabc-score-determination.l"
+#line 375 "gabc/gabc-score-determination.l"
{
BEGIN(alt);
return ALT_BEGIN;
@@ -1686,15 +1695,16 @@ YY_RULE_SETUP
case 70:
/* rule 70 can match eol */
YY_RULE_SETUP
-#line 370 "gabc/gabc-score-determination.l"
+#line 379 "gabc/gabc-score-determination.l"
{
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return CHARACTERS;
}
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 374 "gabc/gabc-score-determination.l"
+#line 384 "gabc/gabc-score-determination.l"
{
BEGIN(score);
return ALT_END;
@@ -1702,42 +1712,42 @@ YY_RULE_SETUP
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 378 "gabc/gabc-score-determination.l"
+#line 388 "gabc/gabc-score-determination.l"
{
return EUOUAE_B;
}
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 381 "gabc/gabc-score-determination.l"
+#line 391 "gabc/gabc-score-determination.l"
{
return EUOUAE_E;
}
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 384 "gabc/gabc-score-determination.l"
+#line 394 "gabc/gabc-score-determination.l"
{
return TRANSLATION_CENTER_END;
}
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 387 "gabc/gabc-score-determination.l"
+#line 397 "gabc/gabc-score-determination.l"
{
return TRANSLATION_BEGINNING;
}
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 390 "gabc/gabc-score-determination.l"
+#line 400 "gabc/gabc-score-determination.l"
{
return TRANSLATION_END;
}
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 393 "gabc/gabc-score-determination.l"
+#line 403 "gabc/gabc-score-determination.l"
{
BEGIN(notes);
return OPENING_BRACKET;
@@ -1746,29 +1756,30 @@ YY_RULE_SETUP
case 78:
/* rule 78 can match eol */
YY_RULE_SETUP
-#line 397 "gabc/gabc-score-determination.l"
+#line 407 "gabc/gabc-score-determination.l"
{
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return NOTES;
}
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 401 "gabc/gabc-score-determination.l"
+#line 412 "gabc/gabc-score-determination.l"
{
return VOICE_CUT;
}
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 404 "gabc/gabc-score-determination.l"
+#line 415 "gabc/gabc-score-determination.l"
{
return NABC_CUT;
}
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 407 "gabc/gabc-score-determination.l"
+#line 418 "gabc/gabc-score-determination.l"
{
BEGIN(score);
return CLOSING_BRACKET;
@@ -1777,7 +1788,7 @@ YY_RULE_SETUP
case 82:
/* rule 82 can match eol */
YY_RULE_SETUP
-#line 411 "gabc/gabc-score-determination.l"
+#line 422 "gabc/gabc-score-determination.l"
{
BEGIN(score);
return CLOSING_BRACKET_WITH_SPACE;
@@ -1785,10 +1796,10 @@ YY_RULE_SETUP
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 415 "gabc/gabc-score-determination.l"
+#line 426 "gabc/gabc-score-determination.l"
ECHO;
YY_BREAK
-#line 1792 "gabc/gabc-score-determination-l.c"
+#line 1803 "gabc/gabc-score-determination-l.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(attribute):
case YY_STATE_EOF(score):
@@ -2765,7 +2776,7 @@ void gabc_score_determination_free (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 415 "gabc/gabc-score-determination.l"
+#line 426 "gabc/gabc-score-determination.l"
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-l.h b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h
index adf6e4656d3..39fa2afbb0c 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-l.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h
@@ -322,7 +322,7 @@ extern int gabc_score_determination_lex (void);
#undef YY_DECL
#endif
-#line 415 "gabc/gabc-score-determination.l"
+#line 426 "gabc/gabc-score-determination.l"
#line 329 "gabc/gabc-score-determination-l.h"
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-y.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.c
index 92f3abdde80..f3ecdfb6f08 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-y.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.c
@@ -74,6 +74,9 @@
#line 1 "gabc/gabc-score-determination.y" /* yacc.c:339 */
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the score parser.
+ *
* Gregorio score determination in gabc input.
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
@@ -109,6 +112,7 @@
#include "unicode.h"
#include "messages.h"
#include "characters.h"
+#include "support.h"
#include "sha1.h"
#include "plugins.h"
#include "gabc.h"
@@ -409,7 +413,7 @@ static void end_definitions(void)
}
/* voice is now voice-1, so that it can be the index of elements */
voice = 0;
- elements = (gregorio_element **) malloc(number_of_voices *
+ elements = (gregorio_element **) gregorio_malloc(number_of_voices *
sizeof(gregorio_element *));
for (i = 0; i < number_of_voices; i++) {
elements[i] = NULL;
@@ -598,7 +602,7 @@ static void gregorio_gabc_add_text(char *mbcharacters)
static void set_centering_scheme(char *sc)
{
gregorio_message("\"centering-scheme\" header is deprecated. Please use "
- "\\setlyriccentering in TeX instead.", "set_centering_scheme",
+ "\\gresetlyriccentering in TeX instead.", "set_centering_scheme",
VERBOSITY_DEPRECATION, 0);
if (strncmp((const char *) sc, "latine", 6) == 0) {
score->centering = SCHEME_VOWEL;
@@ -704,15 +708,15 @@ static void gabc_y_add_notes(char *notes, YYLTYPE loc) {
"happen!"), "gabc_y_add_notes", VERBOSITY_FATAL, 0);
}
if (!current_element->nabc) {
- current_element->nabc = (char **) calloc (nabc_lines,
+ current_element->nabc = (char **) gregorio_calloc (nabc_lines,
sizeof (char *));
}
- current_element->nabc[nabc_state-1] = strdup(notes);
+ current_element->nabc[nabc_state-1] = gregorio_strdup(notes);
current_element->nabc_lines = nabc_state;
}
}
-#line 716 "gabc/gabc-score-determination-y.c" /* yacc.c:339 */
+#line 720 "gabc/gabc-score-determination-y.c" /* yacc.c:339 */
# ifndef YY_NULLPTR
# if defined __cplusplus && 201103L <= __cplusplus
@@ -923,7 +927,7 @@ int gabc_score_determination_parse (void);
/* Copy the second part of user declarations. */
-#line 927 "gabc/gabc-score-determination-y.c" /* yacc.c:358 */
+#line 931 "gabc/gabc-score-determination-y.c" /* yacc.c:358 */
#ifdef short
# undef short
@@ -1229,8 +1233,8 @@ static const yytype_uint8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 668, 668, 672, 677, 678, 682, 695, 702, 713,
- 720, 729, 736, 743, 753, 760, 767, 774, 781, 788,
+ 0, 672, 672, 676, 681, 682, 686, 699, 706, 717,
+ 724, 733, 740, 747, 757, 764, 771, 778, 785, 792,
802, 812, 823, 832, 843, 850, 857, 864, 872, 880,
887, 894, 902, 913, 926, 933, 939, 943, 949, 950,
951, 952, 953, 954, 955, 956, 957, 958, 959, 960,
@@ -2072,7 +2076,7 @@ yyparse (void)
yychar = YYEMPTY; /* Cause a token to be read. */
/* User initialization code. */
-#line 642 "gabc/gabc-score-determination.y" /* yacc.c:1429 */
+#line 646 "gabc/gabc-score-determination.y" /* yacc.c:1429 */
{
yylloc.first_line = 1;
yylloc.first_column = 0;
@@ -2082,7 +2086,7 @@ yyparse (void)
yylloc.last_offset = 0;
}
-#line 2086 "gabc/gabc-score-determination-y.c" /* yacc.c:1429 */
+#line 2090 "gabc/gabc-score-determination-y.c" /* yacc.c:1429 */
yylsp[0] = yylloc;
goto yysetstate;
@@ -2269,15 +2273,15 @@ yyreduce:
switch (yyn)
{
case 3:
-#line 672 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 676 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
end_definitions();
}
-#line 2277 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2281 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 6:
-#line 682 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 686 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
number_of_voices=atoi((yyvsp[0]).text);
free((yyvsp[0]).text);
@@ -2288,20 +2292,20 @@ yyreduce:
}
gregorio_set_score_number_of_voices (score, number_of_voices);
}
-#line 2292 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2296 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 7:
-#line 695 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 699 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
free(macros[(yyvsp[-1]).character - '0']);
macros[(yyvsp[-1]).character - '0'] = (yyvsp[0]).text;
}
-#line 2301 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2305 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 8:
-#line 702 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 706 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
if ((yyvsp[0]).text==NULL) {
gregorio_message("name can't be empty","det_score",
@@ -2310,49 +2314,49 @@ yyreduce:
check_multiple("name", score->name != NULL);
gregorio_set_score_name (score, (yyvsp[0]).text);
}
-#line 2314 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2318 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 9:
-#line 713 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 717 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
set_centering_scheme((yyvsp[0]).text);
free((yyvsp[0]).text);
}
-#line 2323 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2327 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 10:
-#line 720 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 724 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
check_multiple("language", got_language);
gregorio_set_centering_language((yyvsp[0]).text);
free((yyvsp[0]).text);
got_language = true;
}
-#line 2334 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2338 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 11:
-#line 729 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 733 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
check_multiple("gabc-copyright", score->gabc_copyright != NULL);
gregorio_set_score_gabc_copyright (score, (yyvsp[0]).text);
}
-#line 2343 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2347 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 12:
-#line 736 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 740 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
check_multiple("score_copyright", score->score_copyright != NULL);
gregorio_set_score_score_copyright (score, (yyvsp[0]).text);
}
-#line 2352 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2356 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 13:
-#line 743 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 747 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
gregorio_message("\"gregoriotex-font\" header is deprecated. "
"Please use \\gresetgregoriofont in TeX instead.",
@@ -2360,65 +2364,61 @@ yyreduce:
check_multiple("GregorioTeX font", score->gregoriotex_font != NULL);
score->gregoriotex_font=(yyvsp[0]).text;
}
-#line 2364 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2368 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 14:
-#line 753 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 757 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
check_multiple("office part", score->office_part != NULL);
gregorio_set_score_office_part (score, (yyvsp[0]).text);
}
-#line 2373 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2377 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 15:
-#line 760 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 764 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
check_multiple("occasion", score->occasion != NULL);
gregorio_set_score_occasion (score, (yyvsp[0]).text);
}
-#line 2382 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2386 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 16:
-#line 767 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 771 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
check_multiple("meter", score->meter != NULL);
gregorio_set_score_meter (score, (yyvsp[0]).text);
}
-#line 2391 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2395 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 17:
-#line 774 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 778 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
check_multiple("commentary", score->commentary != NULL);
gregorio_set_score_commentary (score, (yyvsp[0]).text);
}
-#line 2400 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2404 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 18:
-#line 781 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 785 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
{
check_multiple("arranger", score->arranger != NULL);
gregorio_set_score_arranger (score, (yyvsp[0]).text);
}
-#line 2409 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2413 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
break;
case 19:
-#line 788 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
- {
- /* So far this handling of the version is rudimentary. When
- * we start supporting multiple input versions, it will become
- * more complex. For the moment, just issue a warning. */
- if (strcmp ((yyvsp[0]).text, GABC_CURRENT_VERSION) != 0) {
- gregorio_message(_("gabc-version is not the current one "
- GABC_CURRENT_VERSION " ; there may be problems"),
- "det_score", VERBOSITY_WARNING, 0);
- }
+#line 792 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+ {
+ /* Deprecated */
+ gregorio_message("\"gabc-version\" header is deprecated and will be "
+ "ignored.", "gabc_score_determination_parse",
+ VERBOSITY_DEPRECATION, 0);
free((yyvsp[0]).text);
}
#line 2425 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-y.h b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.h
index d68c9b6f591..d68c9b6f591 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination-y.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.h
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination.h b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.h
index 0eb91794321..3098ec17766 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.h
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header shares definitions between the score parser and lexer.
+ *
* Gregorio score determination in gabc input.
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination.l b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l
index 4d2a07992e4..1001a2f72a6 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination.l
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l
@@ -1,5 +1,8 @@
%{
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the score lexer.
+ *
* Gregorio score determination in gabc input.
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
@@ -25,6 +28,7 @@
#include <string.h>
#include "struct.h"
#include "messages.h"
+#include "support.h"
#include "gabc.h"
#include "gabc-score-determination.h"
@@ -120,7 +124,8 @@ semicolon. */
return COLON;
}
<attribute>[^;\n\r]*(;[^;\n\r]+)*([\n\r]+[^;]*(;[^;]+)*)? {
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return ATTRIBUTE;
}
<attribute>;(;|[\n\r]+) {
@@ -231,7 +236,8 @@ semicolon. */
gabc_score_determination_text[0]);
}
<score>[^\{\}\(\[\]<%]+ {
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return CHARACTERS;
}
<score,style><i> {
@@ -325,7 +331,8 @@ semicolon. */
return SP_END;
}
<style>[^<\{\}]* {
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return CHARACTERS;
}
<score>\% {
@@ -350,11 +357,13 @@ semicolon. */
return VERB_END;
}
<verb>[^<]* {
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return CHARACTERS;
}
<verb,style,score,alt>< {
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return CHARACTERS;
}
<score,style>\{ {
@@ -368,7 +377,8 @@ semicolon. */
return ALT_BEGIN;
}
<alt>[^<]* {
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return CHARACTERS;
}
<alt><\/alt> {
@@ -395,7 +405,8 @@ semicolon. */
return OPENING_BRACKET;
}
<notes>[^&|\)]* {
- gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+ gabc_score_determination_lval.text =
+ gregorio_strdup(gabc_score_determination_text);
return NOTES;
}
<notes>& {
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination.y b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.y
index e823f3785ec..fde1ecf2708 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-score-determination.y
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.y
@@ -1,5 +1,8 @@
%{
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the score parser.
+ *
* Gregorio score determination in gabc input.
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
@@ -35,6 +38,7 @@
#include "unicode.h"
#include "messages.h"
#include "characters.h"
+#include "support.h"
#include "sha1.h"
#include "plugins.h"
#include "gabc.h"
@@ -335,7 +339,7 @@ static void end_definitions(void)
}
/* voice is now voice-1, so that it can be the index of elements */
voice = 0;
- elements = (gregorio_element **) malloc(number_of_voices *
+ elements = (gregorio_element **) gregorio_malloc(number_of_voices *
sizeof(gregorio_element *));
for (i = 0; i < number_of_voices; i++) {
elements[i] = NULL;
@@ -524,7 +528,7 @@ static void gregorio_gabc_add_text(char *mbcharacters)
static void set_centering_scheme(char *sc)
{
gregorio_message("\"centering-scheme\" header is deprecated. Please use "
- "\\setlyriccentering in TeX instead.", "set_centering_scheme",
+ "\\gresetlyriccentering in TeX instead.", "set_centering_scheme",
VERBOSITY_DEPRECATION, 0);
if (strncmp((const char *) sc, "latine", 6) == 0) {
score->centering = SCHEME_VOWEL;
@@ -630,10 +634,10 @@ static void gabc_y_add_notes(char *notes, YYLTYPE loc) {
"happen!"), "gabc_y_add_notes", VERBOSITY_FATAL, 0);
}
if (!current_element->nabc) {
- current_element->nabc = (char **) calloc (nabc_lines,
+ current_element->nabc = (char **) gregorio_calloc (nabc_lines,
sizeof (char *));
}
- current_element->nabc[nabc_state-1] = strdup(notes);
+ current_element->nabc[nabc_state-1] = gregorio_strdup(notes);
current_element->nabc_lines = nabc_state;
}
}
@@ -786,14 +790,10 @@ arranger_definition:
gabc_version_definition:
GABC_VERSION attribute {
- /* So far this handling of the version is rudimentary. When
- * we start supporting multiple input versions, it will become
- * more complex. For the moment, just issue a warning. */
- if (strcmp ($2.text, GABC_CURRENT_VERSION) != 0) {
- gregorio_message(_("gabc-version is not the current one "
- GABC_CURRENT_VERSION " ; there may be problems"),
- "det_score", VERBOSITY_WARNING, 0);
- }
+ /* Deprecated */
+ gregorio_message("\"gabc-version\" header is deprecated and will be "
+ "ignored.", "gabc_score_determination_parse",
+ VERBOSITY_DEPRECATION, 0);
free($2.text);
}
;
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-write.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c
index e5375f62316..bd733a2af8d 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc-write.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file provides functions for writing gabc from Gregorio structures.
+ *
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -318,13 +321,13 @@ static void gabc_write_bar(FILE *f, char type)
static void gabc_write_bar_signs(FILE *f, char type)
{
switch (type) {
- case _V_EPISEMUS:
+ case _V_EPISEMA:
fprintf(f, "'");
break;
- case _V_EPISEMUS_BAR_H_EPISEMUS:
+ case _V_EPISEMA_BAR_H_EPISEMA:
fprintf(f, "'_");
break;
- case _BAR_H_EPISEMUS:
+ case _BAR_H_EPISEMA:
fprintf(f, "_");
break;
default:
@@ -332,8 +335,8 @@ static void gabc_write_bar_signs(FILE *f, char type)
}
}
-static void gabc_hepisemus(FILE *f, const char *prefix, bool connect,
- grehepisemus_size size)
+static void gabc_hepisema(FILE *f, const char *prefix, bool connect,
+ grehepisema_size size)
{
fprintf(f, "_%s", prefix);
if (!connect) {
@@ -355,12 +358,12 @@ static void gabc_hepisemus(FILE *f, const char *prefix, bool connect,
}
}
-static const char *vepisemus_position(gregorio_note *note)
+static const char *vepisema_position(gregorio_note *note)
{
- if (!note->v_episemus_height) {
+ if (!note->v_episema_height) {
return "";
}
- if (note->v_episemus_height < note->u.note.pitch) {
+ if (note->v_episema_height < note->u.note.pitch) {
return "0";
}
return "1";
@@ -510,14 +513,14 @@ static void gabc_write_gregorio_note(FILE *f, gregorio_note *note,
case _AUCTUM_DUPLEX:
fprintf(f, "..");
break;
- case _V_EPISEMUS:
- fprintf(f, "'%s", vepisemus_position(note));
+ case _V_EPISEMA:
+ fprintf(f, "'%s", vepisema_position(note));
break;
- case _V_EPISEMUS_PUNCTUM_MORA:
- fprintf(f, "'%s.%s", vepisemus_position(note), mora_vposition(note));
+ case _V_EPISEMA_PUNCTUM_MORA:
+ fprintf(f, "'%s.%s", vepisema_position(note), mora_vposition(note));
break;
- case _V_EPISEMUS_AUCTUM_DUPLEX:
- fprintf(f, "'%s..", vepisemus_position(note));
+ case _V_EPISEMA_AUCTUM_DUPLEX:
+ fprintf(f, "'%s..", vepisema_position(note));
break;
default:
break;
@@ -541,18 +544,18 @@ static void gabc_write_gregorio_note(FILE *f, gregorio_note *note,
default:
break;
}
- if (note->h_episemus_above == HEPISEMUS_AUTO
- && note->h_episemus_below == HEPISEMUS_AUTO) {
- gabc_hepisemus(f, "", note->h_episemus_above_connect,
- note->h_episemus_above_size);
+ if (note->h_episema_above == HEPISEMA_AUTO
+ && note->h_episema_below == HEPISEMA_AUTO) {
+ gabc_hepisema(f, "", note->h_episema_above_connect,
+ note->h_episema_above_size);
} else {
- if (note->h_episemus_below == HEPISEMUS_FORCED) {
- gabc_hepisemus(f, "0", note->h_episemus_below_connect,
- note->h_episemus_below_size);
+ if (note->h_episema_below == HEPISEMA_FORCED) {
+ gabc_hepisema(f, "0", note->h_episema_below_connect,
+ note->h_episema_below_size);
}
- if (note->h_episemus_above == HEPISEMUS_FORCED) {
- gabc_hepisemus(f, "1", note->h_episemus_above_connect,
- note->h_episemus_above_size);
+ if (note->h_episema_above == HEPISEMA_FORCED) {
+ gabc_hepisema(f, "1", note->h_episema_above_connect,
+ note->h_episema_above_size);
}
}
if (note->texverb) {
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc.h b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc.h
index 69aa7c64210..73c7f64f60a 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gabc/gabc.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc.h
@@ -1,4 +1,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-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gregorio-utils.c b/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c
index c2a4b8b579d..486dfd22e52 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gregorio-utils.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the command line interface of Gregorio.
+ *
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -66,19 +69,18 @@ typedef enum gregorio_file_format {
#define realpath(path,resolved_path) _fullpath(resolved_path, path, PATH_MAX)
#endif
+/* define_path attempts to canonicalize the pathname of a given string */
static char *define_path(char *current_directory, char *string)
{
int length;
char *file_name;
- char temp_name[PATH_MAX];
+ char *temp_name;
char *base_name;
#ifdef _WIN32
char *last_backslash;
#endif
- file_name = malloc(PATH_MAX * sizeof(char));
-
- strcpy(temp_name, string);
+ temp_name = gregorio_strdup(string);
base_name = strrchr(temp_name, '/');
#ifdef _WIN32
last_backslash = strrchr(temp_name, '\\');
@@ -93,27 +95,27 @@ static char *define_path(char *current_directory, char *string)
base_name++;
/* try to resolve it */
- if (!realpath(temp_name, file_name)) {
+ file_name = realpath(temp_name, NULL);
+ if (!file_name) {
fprintf(stderr, "the directory %s for %s does not exist\n",
- file_name, base_name);
- exit(-1);
+ temp_name, base_name);
+ exit(1);
}
} else {
/* no path was supplied */
base_name = string;
+ file_name = gregorio_malloc(
+ strlen(current_directory) + strlen(base_name) + 2);
strcpy(file_name, current_directory);
}
- /* make sure we're not bigger than PATH_MAX */
- length = strlen(file_name);
- if (length + strlen(base_name) + 1 >= PATH_MAX) {
- fprintf(stderr, "filename too long: %s/%s\n", file_name, base_name);
- exit(-1);
- }
/* build the file name */
+ length = strlen(file_name);
+ file_name = gregorio_realloc(file_name, length + strlen(base_name) + 2);
file_name[length] = '/';
strcpy(file_name + length + 1, base_name);
+ free(temp_name);
return file_name;
}
@@ -128,7 +130,7 @@ static char *get_base_filename(char *fbasename)
return NULL;
}
l = strlen(fbasename) - strlen(p);
- ret = (char *) malloc((l + 1) * sizeof(char));
+ ret = (char *) gregorio_malloc((l + 1) * sizeof(char));
gregorio_snprintf(ret, l + 1, "%s", fbasename);
ret[l] = '\0';
return ret;
@@ -139,7 +141,7 @@ static char *get_output_filename(char *fbasename, const char *extension)
{
char *output_filename = NULL;
output_filename =
- (char *) malloc(sizeof(char) *
+ (char *) gregorio_malloc(sizeof(char) *
(strlen(extension) + strlen(fbasename) + 2));
output_filename = strcpy(output_filename, fbasename);
output_filename = strcat(output_filename, ".");
@@ -202,12 +204,12 @@ static void check_input_clobber(char *input_file_name, char *output_file_name)
char *current_directory;
int file_cmp;
if (input_file_name && output_file_name) {
- current_directory = malloc(PATH_MAX * sizeof(char));
+ current_directory = gregorio_malloc(PATH_MAX * sizeof(char));
current_directory = getcwd(current_directory, PATH_MAX);
if (current_directory == NULL) {
fprintf(stderr, _("can't determine current directory"));
free(current_directory);
- exit(-1);
+ exit(1);
}
absolute_input_file_name = define_path(current_directory, input_file_name);
absolute_output_file_name = define_path(current_directory, output_file_name);
@@ -219,7 +221,7 @@ static void check_input_clobber(char *input_file_name, char *output_file_name)
free(absolute_input_file_name);
free(absolute_output_file_name);
if (file_cmp == 0) {
- exit(-1);
+ exit(1);
}
}
}
@@ -228,15 +230,16 @@ static char *encode_point_and_click_filename(char *input_file_name)
{
/* percent-encoding favors capital hex digits */
static const char *const hex = "0123456789ABCDEF";
- char filename[PATH_MAX], *result = NULL, *r = NULL, *p;
+ char *filename, *result = NULL, *r = NULL, *p;
- if (!realpath(input_file_name, filename)) {
+ filename = realpath(input_file_name, NULL);
+ if (!filename) {
fprintf(stderr, "error: unable to resolve %s\n", input_file_name);
- exit(-1);
+ exit(1);
}
/* 2 extra characters for a possible leading slash and final NUL */
- r = result = malloc((strlen(filename) * 4 + 2) * sizeof(char));
+ r = result = gregorio_malloc((strlen(filename) * 4 + 2) * sizeof(char));
#ifdef _WIN32
*(r++) = '/';
@@ -461,7 +464,7 @@ int main(int argc, char **argv)
if (!input_file) { /* input not undefined (could be stdin) */
fprintf(stderr, "error: no input file specified\n");
print_usage(argv[0]);
- exit(-1);
+ exit(1);
}
} else {
input_file_name = argv[optind];
@@ -493,7 +496,7 @@ int main(int argc, char **argv)
if (!kpse_in_name_ok(input_file_name)) {
fprintf(stderr, "Error: kpse doesn't allow to read from file %s\n",
input_file_name);
- exit(-1);
+ exit(1);
}
#endif
@@ -519,7 +522,7 @@ int main(int argc, char **argv)
break;
default:
fprintf(stderr, "error: unsupported format");
- exit(-1);
+ exit(1);
}
}
}
@@ -536,7 +539,7 @@ int main(int argc, char **argv)
if (!kpse_out_name_ok(output_file_name)) {
fprintf(stderr, "Error: kpse doesn't allow to write in file %s\n",
output_file_name);
- exit(-1);
+ exit(1);
}
#endif
output_file = fopen(output_file_name, "wb");
@@ -558,7 +561,7 @@ int main(int argc, char **argv)
if (!input_file) {
fprintf(stderr, "error: can't open file %s for reading\n",
input_file_name);
- exit(-1);
+ exit(1);
}
gregorio_set_file_name(gregorio_basename(input_file_name));
if (point_and_click) {
@@ -575,7 +578,7 @@ int main(int argc, char **argv)
if (!error_file) {
fprintf(stderr, "error: can't open file %s for writing\n",
error_file_name);
- exit(-1);
+ exit(1);
}
gregorio_set_error_out(error_file);
}
@@ -594,7 +597,7 @@ int main(int argc, char **argv)
fprintf(stderr, "error : invalid input format\n");
fclose(input_file);
fclose(output_file);
- exit(-1);
+ exit(1);
break;
}
@@ -602,7 +605,7 @@ int main(int argc, char **argv)
if (score == NULL) {
fclose(output_file);
fprintf(stderr, "error in file parsing\n");
- exit(-1);
+ exit(1);
}
gregorio_fix_initial_keys(score, DEFAULT_KEY);
@@ -621,7 +624,7 @@ int main(int argc, char **argv)
fprintf(stderr, "error : invalid output format\n");
gregorio_free_score(score);
fclose(output_file);
- exit(-1);
+ exit(1);
break;
}
fclose(output_file);
@@ -633,6 +636,9 @@ int main(int argc, char **argv)
gabc_score_determination_lex_destroy();
gabc_notes_determination_lex_destroy();
gregorio_vowel_rulefile_lex_destroy();
+ if (error_file_name) {
+ fclose(error_file);
+ }
exit(gregorio_get_return_value());
}
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gregoriotex/gregoriotex-position.c b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c
index 8a7808b40d9..987cddd7372 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gregoriotex/gregoriotex-position.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file contains the logic for positioning signs on neumes.
+ *
* Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -83,6 +86,28 @@ OFFSET_CASE(InitialVirga);
OFFSET_CASE(SalicusOriscusWide);
OFFSET_CASE(SalicusOriscusOne);
+static __inline const char *note_before_last_note_case_ignoring_deminutus(
+ const gregorio_note *const current_note)
+{
+ if ((current_note->u.note.pitch - current_note->next->u.note.pitch) == 1
+ || (current_note->u.note.pitch -
+ current_note->next->u.note.pitch) == -1) {
+ if (!current_note->previous || current_note->u.note.pitch -
+ current_note->previous->u.note.pitch > 1) {
+ return ConnectedPenultBeforePunctumOne;
+ } else {
+ return PenultBeforePunctumOne;
+ }
+ } else {
+ if (!current_note->previous || current_note->u.note.pitch -
+ current_note->previous->u.note.pitch > 1) {
+ return ConnectedPenultBeforePunctumWide;
+ } else {
+ return PenultBeforePunctumWide;
+ }
+ }
+}
+
static __inline const char *note_before_last_note_case(
const gregorio_glyph *const current_glyph,
const gregorio_note *const current_note)
@@ -92,23 +117,7 @@ static __inline const char *note_before_last_note_case(
&& current_note->next) {
return PenultBeforeDeminutus;
} else {
- if ((current_note->u.note.pitch - current_note->next->u.note.pitch) == 1
- || (current_note->u.note.pitch -
- current_note->next->u.note.pitch) == -1) {
- if (!current_note->previous || current_note->u.note.pitch -
- current_note->previous->u.note.pitch > 1) {
- return ConnectedPenultBeforePunctumOne;
- } else {
- return PenultBeforePunctumOne;
- }
- } else {
- if (!current_note->previous || current_note->u.note.pitch -
- current_note->previous->u.note.pitch > 1) {
- return ConnectedPenultBeforePunctumWide;
- } else {
- return PenultBeforePunctumWide;
- }
- }
+ return note_before_last_note_case_ignoring_deminutus(current_note);
}
}
@@ -122,7 +131,7 @@ static __inline const char *last_note_case(
if (current_glyph->u.notes.liquescentia & L_DEMINUTUS) {
/*
* may seem strange, but it is unlogical to typeset a small horizontal
- * episemus at the end of a flexus deminutus
+ * episema at the end of a flexus deminutus
*/
return FinalDeminutus;
}
@@ -197,20 +206,20 @@ static __inline gregorio_vposition below_if_auctus(
return VPOS_ABOVE;
}
-static __inline gregorio_vposition above_if_h_episemus(
+static __inline gregorio_vposition above_if_h_episema(
const gregorio_note *const note)
{
- if (note && note->h_episemus_above) {
+ if (note && note->h_episema_above) {
return VPOS_ABOVE;
}
return VPOS_BELOW;
}
-static __inline gregorio_vposition above_if_either_h_episemus(
+static __inline gregorio_vposition above_if_either_h_episema(
const gregorio_note *const note)
{
- if ((note->previous && note->previous->h_episemus_above)
- || (note->next && note->next->h_episemus_above)) {
+ if ((note->previous && note->previous->h_episema_above)
+ || (note->next && note->next->h_episema_above)) {
return VPOS_ABOVE;
}
return VPOS_BELOW;
@@ -263,8 +272,8 @@ static __inline void high_low_set_lower(const gregorio_glyph *const glyph,
}
}
-/* a function that finds the good sign (additional line, vepisemus or
- * hepisemus) number, according to the gregoriotex convention (described in
+/* a function that finds the good sign (additional line, vepisema or
+ * hepisema) number, according to the gregoriotex convention (described in
* gregoriotex.tex)
* this function is REALLY a pain in the ass, but it is sadly necessary */
/*
@@ -338,8 +347,8 @@ static __inline void high_low_set_lower(const gregorio_glyph *const glyph,
static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
gregorio_note *const note, int i, const gtex_type type)
{
- gregorio_vposition h_episemus = VPOS_AUTO, v_episemus = VPOS_AUTO;
- bool v_episemus_below_is_lower = false, done;
+ gregorio_vposition h_episema = VPOS_AUTO, v_episema = VPOS_AUTO;
+ bool v_episema_below_is_lower = false, done;
/* no need to clear is_lower_note/is_upper_note because we used calloc */
@@ -347,12 +356,12 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
case T_PES:
case T_PESQUILISMA:
/*
- * in the case of a pes, we put the episemus just under the bottom note
+ * in the case of a pes, we put the episema just under the bottom note
*/
if (i == 1) {
if (glyph->u.notes.liquescentia & L_INITIO_DEBILIS) {
note->gtex_offset_case = InitioDebilis;
- h_episemus = above_if_h_episemus(note->next);
+ h_episema = above_if_h_episema(note->next);
} else {
note->is_lower_note = true;
if (note->u.note.shape == S_QUILISMA) {
@@ -360,9 +369,9 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
} else {
note->gtex_offset_case = FinalPunctum;
}
- h_episemus = above_if_auctus(glyph);
+ h_episema = above_if_auctus(glyph);
}
- v_episemus = VPOS_BELOW;
+ v_episema = VPOS_BELOW;
} else { /* i=2 */
if (!(glyph->u.notes.liquescentia & L_INITIO_DEBILIS)) {
note->is_upper_note = true;
@@ -372,8 +381,8 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
} else {
note->gtex_offset_case = FinalUpperPunctum;
}
- h_episemus = VPOS_ABOVE;
- v_episemus = below_if_auctus(glyph);
+ h_episema = VPOS_ABOVE;
+ v_episema = below_if_auctus(glyph);
}
break;
case T_PESQUADRATUM:
@@ -381,8 +390,8 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
case T_PESQUILISMAQUADRATUM:
if (i == 1) {
note->gtex_offset_case = first_note_case(note, glyph);
- h_episemus = above_if_h_episemus(note->next);
- v_episemus = VPOS_BELOW;
+ h_episema = above_if_h_episema(note->next);
+ v_episema = VPOS_BELOW;
} else { /* i=2 */
if (glyph->u.notes.liquescentia & L_DEMINUTUS) {
note->gtex_offset_case = InitioDebilis;
@@ -390,8 +399,8 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
note->gtex_offset_case = last_note_case(glyph, FinalPunctum,
note, true);
}
- h_episemus = VPOS_ABOVE;
- v_episemus = VPOS_BELOW;
+ h_episema = VPOS_ABOVE;
+ v_episema = VPOS_BELOW;
}
break;
case T_FLEXUS:
@@ -409,22 +418,22 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
note->gtex_offset_case = InitialConnectedVirga;
}
}
- h_episemus = VPOS_ABOVE;
+ h_episema = VPOS_ABOVE;
if (glyph->u.notes.liquescentia & L_DEMINUTUS) {
- v_episemus = below_if_next_ambitus_allows(note);
+ v_episema = below_if_next_ambitus_allows(note);
} else {
- v_episemus = VPOS_BELOW;
+ v_episema = VPOS_BELOW;
}
} else { /* i=2 */
high_low_set_lower(glyph, note);
note->gtex_offset_case = last_note_case(glyph, FinalPunctum, note,
false);
if (glyph->u.notes.liquescentia & L_DEMINUTUS) {
- h_episemus = VPOS_BELOW;
+ h_episema = VPOS_BELOW;
} else {
- h_episemus = above_if_h_episemus(note->previous);
+ h_episema = above_if_h_episema(note->previous);
}
- v_episemus = VPOS_BELOW;
+ v_episema = VPOS_BELOW;
}
break;
case T_TORCULUS_RESUPINUS_FLEXUS:
@@ -432,10 +441,10 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
switch (i) {
case 1:
note->gtex_offset_case = first_note_case(note, glyph);
- h_episemus = above_if_h_episemus(note->next);
- v_episemus = VPOS_BELOW;
+ h_episema = above_if_h_episema(note->next);
+ v_episema = VPOS_BELOW;
break;
- case HEPISEMUS_FIRST_TWO:
+ case HEPISEMA_FIRST_TWO:
case 2:
if (glyph->u.notes.liquescentia & L_INITIO_DEBILIS) {
note->gtex_offset_case = TorcResDebilisAuctusSecondAnyAny;
@@ -470,9 +479,9 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
}
}
}
- h_episemus = VPOS_ABOVE;
- v_episemus = VPOS_BELOW;
- v_episemus_below_is_lower = true;
+ h_episema = VPOS_ABOVE;
+ v_episema = VPOS_BELOW;
+ v_episema_below_is_lower = true;
break;
default:
--i;
@@ -486,12 +495,12 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
/* else fallthrough to the next case! */
case T_PORRECTUS_FLEXUS:
switch (i) {
- case HEPISEMUS_FIRST_TWO:
+ case HEPISEMA_FIRST_TWO:
case 1:
note->gtex_offset_case = PorrAuctusInitialAny;
- h_episemus = VPOS_ABOVE;
- v_episemus = VPOS_BELOW;
- v_episemus_below_is_lower = true;
+ h_episema = VPOS_ABOVE;
+ v_episema = VPOS_BELOW;
+ v_episema_below_is_lower = true;
break;
case 2:
if (glyph->u.notes.liquescentia & L_DEMINUTUS) {
@@ -499,17 +508,17 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
} else {
note->gtex_offset_case = AntepenultBeforePunctum;
}
- h_episemus = above_if_either_h_episemus(note);
- v_episemus = VPOS_BELOW;
+ h_episema = above_if_either_h_episema(note);
+ v_episema = VPOS_BELOW;
break;
case 3:
high_low_set_upper(glyph, note);
- h_episemus = VPOS_ABOVE;
+ h_episema = VPOS_ABOVE;
if ((glyph->u.notes.liquescentia & L_DEMINUTUS) && note->next) {
- v_episemus = below_if_next_ambitus_allows(note);
+ v_episema = below_if_next_ambitus_allows(note);
note->gtex_offset_case = PenultBeforeDeminutus;
} else {
- v_episemus = VPOS_BELOW;
+ v_episema = VPOS_BELOW;
note->gtex_offset_case = note_before_last_note_case(glyph,
note);
}
@@ -518,8 +527,8 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
high_low_set_lower(glyph, note);
note->gtex_offset_case = last_note_case(glyph, FinalPunctum, note,
false);
- h_episemus = above_if_h_episemus(note->previous);
- v_episemus = VPOS_BELOW;
+ h_episema = above_if_h_episema(note->previous);
+ v_episema = VPOS_BELOW;
break;
}
break;
@@ -528,10 +537,10 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
switch (i) {
case 1:
note->gtex_offset_case = first_note_case(note, glyph);
- h_episemus = above_if_h_episemus(note->next);
- v_episemus = VPOS_BELOW;
+ h_episema = above_if_h_episema(note->next);
+ v_episema = VPOS_BELOW;
break;
- case HEPISEMUS_FIRST_TWO:
+ case HEPISEMA_FIRST_TWO:
case 2:
if (glyph->u.notes.liquescentia &
(L_AUCTUS_ASCENDENS | L_AUCTUS_DESCENDENS | L_AUCTA)) {
@@ -650,9 +659,9 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
}
}
}
- h_episemus = VPOS_ABOVE;
- v_episemus = VPOS_BELOW;
- v_episemus_below_is_lower = true;
+ h_episema = VPOS_ABOVE;
+ v_episema = VPOS_BELOW;
+ v_episema_below_is_lower = true;
break;
default:
--i;
@@ -666,7 +675,7 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
/* else fallthrough to the next case! */
case T_PORRECTUS:
switch (i) {
- case HEPISEMUS_FIRST_TWO:
+ case HEPISEMA_FIRST_TWO:
case 1:
if (glyph->u.notes.liquescentia &
(L_AUCTUS_ASCENDENS | L_AUCTUS_DESCENDENS | L_AUCTA)) {
@@ -680,9 +689,9 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
/* non-auctus with a second ambitus of at least 2 */
note->gtex_offset_case = PorrNonAuctusInitialWide;
}
- h_episemus = VPOS_ABOVE;
- v_episemus = VPOS_BELOW;
- v_episemus_below_is_lower = true;
+ h_episema = VPOS_ABOVE;
+ v_episema = VPOS_BELOW;
+ v_episema_below_is_lower = true;
break;
case 2:
low_high_set_lower(glyph, note);
@@ -694,15 +703,15 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
} else {
note->gtex_offset_case = FinalPunctum;
}
- h_episemus = above_if_h_episemus(note->previous);
- v_episemus = VPOS_BELOW;
+ h_episema = above_if_h_episema(note->previous);
+ v_episema = VPOS_BELOW;
break;
default: /* case 3 */
low_high_set_upper(glyph, note);
note->gtex_offset_case = last_note_case(glyph, FinalUpperPunctum,
note, true);
- h_episemus = VPOS_ABOVE;
- v_episemus = below_if_auctus(glyph);
+ h_episema = VPOS_ABOVE;
+ v_episema = below_if_auctus(glyph);
break;
}
break;
@@ -710,8 +719,8 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
switch (i) {
case 1:
note->gtex_offset_case = first_note_case(note, glyph);
- h_episemus = VPOS_BELOW;
- v_episemus = VPOS_BELOW;
+ h_episema = VPOS_BELOW;
+ v_episema = VPOS_BELOW;
break;
case 2:
low_high_set_lower(glyph, note);
@@ -720,25 +729,25 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
} else {
note->gtex_offset_case = FinalConnectedPunctum;
}
- h_episemus = VPOS_BELOW;
- v_episemus = VPOS_BELOW;
+ h_episema = VPOS_BELOW;
+ v_episema = VPOS_BELOW;
break;
default:
low_high_set_upper(glyph, note);
note->gtex_offset_case = last_note_case(glyph, FinalPunctum, note,
true);
- h_episemus = VPOS_ABOVE;
- v_episemus = VPOS_BELOW;
+ h_episema = VPOS_ABOVE;
+ v_episema = VPOS_BELOW;
break;
}
break;
case T_SALICUS:
case T_SALICUS_LONGQUEUE:
- v_episemus = VPOS_BELOW;
+ v_episema = VPOS_BELOW;
switch (i) {
case 1:
note->gtex_offset_case = InitialConnectedPunctum;
- h_episemus = above_if_h_episemus(note->next);
+ h_episema = above_if_h_episema(note->next);
break;
case 2:
if (note->next->u.note.pitch - note->u.note.pitch == 1) {
@@ -746,44 +755,62 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
} else {
note->gtex_offset_case = SalicusOriscusWide;
}
- h_episemus = VPOS_ABOVE;
+ h_episema = VPOS_ABOVE;
break;
default:
note->gtex_offset_case = last_note_case(glyph, FinalPunctum, note,
false);
if (glyph->u.notes.liquescentia & L_DEMINUTUS) {
- v_episemus = VPOS_ABOVE;
+ v_episema = VPOS_ABOVE;
}
- h_episemus = VPOS_ABOVE;
+ h_episema = VPOS_ABOVE;
break;
}
break;
+ case T_TORCULUS_LIQUESCENS:
+ done = true;
+ switch (i) {
+ case 1:
+ note->gtex_offset_case = first_note_case(note, glyph);
+ h_episema = above_if_h_episema(note->next);
+ v_episema = VPOS_BELOW;
+ break;
+ case 2:
+ note->gtex_offset_case =
+ note_before_last_note_case_ignoring_deminutus(note);
+ h_episema = VPOS_ABOVE;
+ v_episema = VPOS_BELOW;
+ break;
+ default:
+ --i;
+ done = false;
+ break;
+ }
+
+ if (done) {
+ break;
+ }
+ /* else fallthrough to the next case! */
case T_ANCUS:
case T_ANCUS_LONGQUEUE:
switch (i) {
case 1:
note->gtex_offset_case = first_note_case(note, glyph);
- h_episemus = above_if_h_episemus(note->next);
- v_episemus = VPOS_BELOW;
+ h_episema = above_if_h_episema(note->next);
+ v_episema = VPOS_BELOW;
break;
case 2:
- note->gtex_offset_case = note_before_last_note_case(glyph, note);
- h_episemus = VPOS_ABOVE;
- v_episemus = VPOS_BELOW;
- break;
- case 3:
note->is_upper_note = true;
- note->gtex_offset_case = last_note_case(glyph, FinalPunctum, note,
- false);
- h_episemus = VPOS_ABOVE;
- v_episemus = VPOS_BELOW;
+ note->gtex_offset_case = note_before_last_note_case(glyph, note);
+ h_episema = VPOS_ABOVE;
+ v_episema = below_if_next_ambitus_allows(note);
break;
default:
note->is_lower_note = true;
note->gtex_offset_case = last_note_case(glyph, FinalPunctum, note,
false);
- h_episemus = VPOS_BELOW;
- v_episemus = VPOS_BELOW;
+ h_episema = VPOS_BELOW;
+ v_episema = VPOS_BELOW;
break;
}
break;
@@ -791,31 +818,31 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
switch (i) {
case 1:
note->gtex_offset_case = first_note_case(note, glyph);
- h_episemus = above_if_h_episemus(note->next);
- v_episemus = VPOS_BELOW;
+ h_episema = above_if_h_episema(note->next);
+ v_episema = VPOS_BELOW;
break;
case 2:
high_low_set_upper(glyph, note);
note->gtex_offset_case = note_before_last_note_case(glyph, note);
- h_episemus = VPOS_ABOVE;
+ h_episema = VPOS_ABOVE;
if (glyph->u.notes.liquescentia & L_DEMINUTUS) {
- v_episemus = below_if_next_ambitus_allows(note);
+ v_episema = below_if_next_ambitus_allows(note);
} else {
- v_episemus = VPOS_BELOW;
+ v_episema = VPOS_BELOW;
}
break;
default:
high_low_set_lower(glyph, note);
note->gtex_offset_case = last_note_case(glyph, FinalPunctum, note,
false);
- h_episemus = above_if_h_episemus(note->previous);
- v_episemus = VPOS_BELOW;
+ h_episema = above_if_h_episema(note->previous);
+ v_episema = VPOS_BELOW;
break;
}
break;
default: /* case T_ONE_NOTE */
- h_episemus = VPOS_ABOVE;
- v_episemus = VPOS_BELOW;
+ h_episema = VPOS_ABOVE;
+ v_episema = VPOS_BELOW;
switch (note->u.note.shape) {
case S_PUNCTUM_INCLINATUM_DEMINUTUS:
note->gtex_offset_case = FinalInclinatumDeminutus;
@@ -862,36 +889,36 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
break;
}
- if (note->signs & _V_EPISEMUS) {
- if (note->v_episemus_height) {
- if (note->v_episemus_height > note->u.note.pitch) {
+ if (note->signs & _V_EPISEMA) {
+ if (note->v_episema_height) {
+ if (note->v_episema_height > note->u.note.pitch) {
/* above is always higher because of GregorioTeX's design */
- note->v_episemus_height += (int)VPOS_ABOVE;
+ note->v_episema_height += (int)VPOS_ABOVE;
}
}
else {
- note->v_episemus_height = note->u.note.pitch + (int)v_episemus;
- if ((v_episemus == VPOS_BELOW && v_episemus_below_is_lower)
- || v_episemus == VPOS_ABOVE) {
+ note->v_episema_height = note->u.note.pitch + (int)v_episema;
+ if ((v_episema == VPOS_BELOW && v_episema_below_is_lower)
+ || v_episema == VPOS_ABOVE) {
/* above is always higher because of GregorioTeX's design */
- note->v_episemus_height += (int)v_episemus;
+ note->v_episema_height += (int)v_episema;
}
}
}
- return h_episemus;
+ return h_episema;
}
-static __inline char compute_h_episemus_height(
+static __inline char compute_h_episema_height(
const gregorio_glyph *const glyph, const gregorio_note *const note,
const gregorio_vposition vpos)
{
char height = note->u.note.pitch;
- if (note->signs & _V_EPISEMUS) {
- if ((vpos == VPOS_ABOVE && note->v_episemus_height >= height)
- || (vpos == VPOS_BELOW && note->v_episemus_height <= height)) {
- height = note->v_episemus_height;
+ if (note->signs & _V_EPISEMA) {
+ if ((vpos == VPOS_ABOVE && note->v_episema_height >= height)
+ || (vpos == VPOS_BELOW && note->v_episema_height <= height)) {
+ height = note->v_episema_height;
}
}
@@ -929,7 +956,7 @@ typedef struct height_computation {
bool (*const is_applicable)(const gregorio_note *);
bool (*const is_shown)(const gregorio_note *);
bool (*const is_connected)(const gregorio_note *);
- grehepisemus_size (*const get_size)(const gregorio_note *);
+ grehepisema_size (*const get_size)(const gregorio_note *);
bool (*const is_better_height)(signed char, signed char);
void (*const position)(gregorio_note *, signed char, bool);
@@ -942,61 +969,61 @@ typedef struct height_computation {
gregorio_note *last_connected_note;
} height_computation;
-static bool is_h_episemus_above_applicable(const gregorio_note *const note)
+static bool is_h_episema_above_applicable(const gregorio_note *const note)
{
- return note->h_episemus_above || !note->is_lower_note;
+ return note->h_episema_above || !note->is_lower_note;
}
-static bool is_h_episemus_below_applicable(const gregorio_note *const note)
+static bool is_h_episema_below_applicable(const gregorio_note *const note)
{
- return note->h_episemus_below || !note->is_upper_note;
+ return note->h_episema_below || !note->is_upper_note;
}
-bool gtex_is_h_episemus_above_shown(const gregorio_note *const note)
+bool gtex_is_h_episema_above_shown(const gregorio_note *const note)
{
- return note->h_episemus_above;
+ return note->h_episema_above;
}
-bool gtex_is_h_episemus_below_shown(const gregorio_note *const note)
+bool gtex_is_h_episema_below_shown(const gregorio_note *const note)
{
- return note->h_episemus_below;
+ return note->h_episema_below;
}
-static bool is_h_episemus_above_connected(const gregorio_note *const note)
+static bool is_h_episema_above_connected(const gregorio_note *const note)
{
- return note->h_episemus_above_connect;
+ return note->h_episema_above_connect;
}
-static bool is_h_episemus_below_connected(const gregorio_note *const note)
+static bool is_h_episema_below_connected(const gregorio_note *const note)
{
- return note->h_episemus_below_connect;
+ return note->h_episema_below_connect;
}
-static grehepisemus_size get_h_episemus_above_size(
+static grehepisema_size get_h_episema_above_size(
const gregorio_note *const note)
{
- return note->h_episemus_above_size;
+ return note->h_episema_above_size;
}
-static grehepisemus_size get_h_episemus_below_size(
+static grehepisema_size get_h_episema_below_size(
const gregorio_note *const note)
{
- return note->h_episemus_below_size;
+ return note->h_episema_below_size;
}
-static bool is_h_episemus_above_better_height(const signed char new_height,
+static bool is_h_episema_above_better_height(const signed char new_height,
const signed char old_height)
{
return new_height > old_height;
}
-static bool is_h_episemus_below_better_height(const signed char new_height,
+static bool is_h_episema_below_better_height(const signed char new_height,
const signed char old_height)
{
return new_height < old_height;
}
-static __inline void start_h_episemus(height_computation *const h,
+static __inline void start_h_episema(height_computation *const h,
const gregorio_element *const element,
const gregorio_glyph *const glyph, gregorio_note *const note)
{
@@ -1004,10 +1031,10 @@ static __inline void start_h_episemus(height_computation *const h,
h->start_glyph = glyph;
h->start_note = note;
h->active = true;
- h->height = compute_h_episemus_height(glyph, note, h->vpos);
+ h->height = compute_h_episema_height(glyph, note, h->vpos);
}
-static __inline void set_h_episemus_height(const height_computation *const h,
+static __inline void set_h_episema_height(const height_computation *const h,
gregorio_note *const end)
{
gregorio_note *last_note = NULL;
@@ -1046,11 +1073,11 @@ static __inline void set_h_episemus_height(const height_computation *const h,
}
}
-static __inline bool is_connected_left(const grehepisemus_size size) {
+static __inline bool is_connected_left(const grehepisema_size size) {
return size == H_NORMAL || size == H_SMALL_LEFT;
}
-static __inline bool is_connected_right(const grehepisemus_size size) {
+static __inline bool is_connected_right(const grehepisema_size size) {
return size == H_NORMAL || size == H_SMALL_RIGHT;
}
@@ -1073,13 +1100,13 @@ static __inline bool has_space_to_left(const gregorio_note *const note) {
}
}
-static __inline void end_h_episemus(height_computation *const h,
+static __inline void end_h_episema(height_computation *const h,
gregorio_note *const end)
{
signed char proposed_height;
if (h->active) {
- /* don't let the episemus clash with the note before or after */
+ /* don't let the episema clash with the note before or after */
if (is_connected_left(h->get_size(h->start_note))
&& h->start_note->previous
&& h->start_note->previous->type == GRE_NOTE
@@ -1090,19 +1117,29 @@ static __inline void end_h_episemus(height_computation *const h,
h->height = proposed_height;
}
}
- /* end->previous checks that it's within the same glyph */
- if (end && end->type == GRE_NOTE && end->previous
- && end->previous->type == GRE_NOTE
- && is_connected_left(h->get_size(end))
- && !has_space_to_left(end) && h->last_connected_note
- && is_connected_right(h->get_size(h->last_connected_note))) {
- proposed_height = end->u.note.pitch + h->vpos;
- if (h->is_better_height(proposed_height, h->height)) {
- h->height = proposed_height;
+ if (end && end->type == GRE_NOTE) {
+ gregorio_note *note;
+ /* this loop checks that it's within the same glyph */
+ for (note = end->previous; note; note = note->previous) {
+ if (note == h->start_note) {
+ if (is_connected_left(h->get_size(end))
+ && h->last_connected_note
+ && h->last_connected_note->next
+ && h->last_connected_note->next->type == GRE_NOTE
+ && !has_space_to_left(h->last_connected_note->next)
+ && is_connected_right(h->get_size(
+ h->last_connected_note))) {
+ proposed_height = end->u.note.pitch + h->vpos;
+ if (h->is_better_height(proposed_height, h->height)) {
+ h->height = proposed_height;
+ }
+ }
+ break;
+ }
}
}
- set_h_episemus_height(h, end);
+ set_h_episema_height(h, end);
h->active = false;
h->height = 0;
@@ -1114,13 +1151,13 @@ static __inline void end_h_episemus(height_computation *const h,
}
}
-static __inline void compute_h_episemus(height_computation *const h,
+static __inline void compute_h_episema(height_computation *const h,
const gregorio_element *const element,
const gregorio_glyph *const glyph, gregorio_note *const note,
- const int i)
+ const int i, const gtex_type type)
{
signed char next_height;
- grehepisemus_size size;
+ grehepisema_size size;
if (h->is_applicable(note)) {
if (h->is_shown(note)) {
@@ -1130,24 +1167,48 @@ static __inline void compute_h_episemus(height_computation *const h,
if (h->connected && is_connected_left(size)
&& (i != 1 || is_connectable_interglyph_ambitus(
note, h->last_connected_note))) {
- next_height = compute_h_episemus_height(glyph, note,
+ next_height = compute_h_episema_height(glyph, note,
h->vpos);
if (h->is_better_height(next_height, h->height)) {
h->height = next_height;
}
}
else {
- end_h_episemus(h, note);
- start_h_episemus(h, element, glyph, note);
+ end_h_episema(h, note);
+ start_h_episema(h, element, glyph, note);
}
} else {
- start_h_episemus(h, element, glyph, note);
+ start_h_episema(h, element, glyph, note);
}
h->connected = h->is_connected(note) && is_connected_right(size);
h->last_connected_note = note;
} else {
- end_h_episemus(h, note);
+ end_h_episema(h, note);
+ }
+ } else if (!h->is_shown(note)) {
+ /* special handling for porrectus shapes because of their shape:
+ * the lower note of the porrectus stroke is normally not applicable,
+ * but we have to end the episema on the upper note if the episema
+ * on the lower note is not shown. */
+ switch(type) {
+ case T_PORRECTUS:
+ case T_PORRECTUS_FLEXUS:
+ if (i == 2) {
+ end_h_episema(h, note);
+ }
+ break;
+
+ case T_TORCULUS_RESUPINUS:
+ case T_TORCULUS_RESUPINUS_FLEXUS:
+ if (i == 3) {
+ end_h_episema(h, note);
+ }
+ break;
+
+ default:
+ /* do nothing */
+ break;
}
}
}
@@ -1159,30 +1220,30 @@ static __inline void compute_note_positioning(height_computation *const above,
{
gregorio_vposition default_vpos = advise_positioning(glyph, note, i, type);
- if (note->h_episemus_above == HEPISEMUS_AUTO
- && note->h_episemus_below == HEPISEMUS_AUTO) {
+ if (note->h_episema_above == HEPISEMA_AUTO
+ && note->h_episema_below == HEPISEMA_AUTO) {
if (default_vpos == VPOS_BELOW) {
- note->h_episemus_above = HEPISEMUS_NONE;
+ note->h_episema_above = HEPISEMA_NONE;
}
else { /* default_vpos == VPOS_ABOVE */
- note->h_episemus_below = HEPISEMUS_NONE;
+ note->h_episema_below = HEPISEMA_NONE;
}
}
- compute_h_episemus(above, element, glyph, note, i);
- compute_h_episemus(below, element, glyph, note, i);
+ compute_h_episema(above, element, glyph, note, i, type);
+ compute_h_episema(below, element, glyph, note, i, type);
}
void gregoriotex_compute_positioning(const gregorio_element *element)
{
height_computation above = {
/*.vpos =*/ VPOS_ABOVE,
- /*.is_applicable =*/ &is_h_episemus_above_applicable,
- /*.is_shown =*/ &gtex_is_h_episemus_above_shown,
- /*.is_connected =*/ &is_h_episemus_above_connected,
- /*.get_size =*/ &get_h_episemus_above_size,
- /*.is_better_height =*/ &is_h_episemus_above_better_height,
- /*.position =*/ &gregorio_position_h_episemus_above,
+ /*.is_applicable =*/ &is_h_episema_above_applicable,
+ /*.is_shown =*/ &gtex_is_h_episema_above_shown,
+ /*.is_connected =*/ &is_h_episema_above_connected,
+ /*.get_size =*/ &get_h_episema_above_size,
+ /*.is_better_height =*/ &is_h_episema_above_better_height,
+ /*.position =*/ &gregorio_position_h_episema_above,
/*.active =*/ false,
/*.height =*/ 0,
@@ -1194,12 +1255,12 @@ void gregoriotex_compute_positioning(const gregorio_element *element)
};
height_computation below = {
/*.vpos =*/ VPOS_BELOW,
- /*.is_applicable =*/ &is_h_episemus_below_applicable,
- /*.is_shown =*/ &gtex_is_h_episemus_below_shown,
- /*.is_connected =*/ &is_h_episemus_below_connected,
- /*.get_size =*/ &get_h_episemus_below_size,
- /*.is_better_height =*/ &is_h_episemus_below_better_height,
- /*.position =*/ &gregorio_position_h_episemus_below,
+ /*.is_applicable =*/ &is_h_episema_below_applicable,
+ /*.is_shown =*/ &gtex_is_h_episema_below_shown,
+ /*.is_connected =*/ &is_h_episema_below_connected,
+ /*.get_size =*/ &get_h_episema_below_size,
+ /*.is_better_height =*/ &is_h_episema_below_better_height,
+ /*.position =*/ &gregorio_position_h_episema_below,
/*.active =*/ false,
/*.height =*/ 0,
@@ -1233,11 +1294,11 @@ void gregoriotex_compute_positioning(const gregorio_element *element)
}
}
} else if (!is_bridgeable_space(element)) {
- end_h_episemus(&above, NULL);
- end_h_episemus(&below, NULL);
+ end_h_episema(&above, NULL);
+ end_h_episema(&below, NULL);
}
}
- end_h_episemus(&above, NULL);
- end_h_episemus(&below, NULL);
+ end_h_episema(&above, NULL);
+ end_h_episema(&below, NULL);
}
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gregoriotex/gregoriotex-write.c b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c
index 15ac27980b3..8105faaecb7 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gregoriotex/gregoriotex-write.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file contains functions for writing GregorioTeX from Gregorio structures.
+ *
* Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -1212,7 +1215,7 @@ OFFSET_CASE(BarDivisioFinalis);
static void gregoriotex_write_bar(FILE *f, gregorio_bar type,
gregorio_sign signs, bool is_inside_bar)
{
- /* the type number of function vepisemusorrare */
+ /* the type number of function vepisemaorrare */
const char *offset_case = BarStandard;
if (is_inside_bar) {
fprintf(f, "\\GreIn");
@@ -1261,15 +1264,15 @@ static void gregoriotex_write_bar(FILE *f, gregorio_bar type,
break;
}
switch (signs) {
- case _V_EPISEMUS:
- fprintf(f, "{\\GreBarVEpisemus{\\GreOCase%s}}%%\n", offset_case);
+ case _V_EPISEMA:
+ fprintf(f, "{\\GreBarVEpisema{\\GreOCase%s}}%%\n", offset_case);
break;
- case _BAR_H_EPISEMUS:
+ case _BAR_H_EPISEMA:
fprintf(f, "{\\GreBarBrace{\\GreOCase%s}}%%\n", offset_case);
break;
- case _V_EPISEMUS_BAR_H_EPISEMUS:
+ case _V_EPISEMA_BAR_H_EPISEMA:
fprintf(f, "{\\GreBarBrace{\\GreOCase%s}"
- "\\GreBarVEpisemus{\\GreOCase%s}}%%\n",
+ "\\GreBarVEpisema{\\GreOCase%s}}%%\n",
offset_case, offset_case);
break;
default:
@@ -1453,7 +1456,7 @@ static void gregoriotex_write_punctum_mora(FILE *f, gregorio_glyph *glyph,
current_note->u.note.pitch == 1)
&& is_on_a_line(current_note->u.note.pitch)
&& (current_note->previous->signs == _PUNCTUM_MORA
- || current_note->previous->signs == _V_EPISEMUS_PUNCTUM_MORA
+ || current_note->previous->signs == _V_EPISEMA_PUNCTUM_MORA
|| current_note->previous->choral_sign)) {
special_punctum = 1;
}
@@ -1498,8 +1501,8 @@ static void gregoriotex_write_punctum_mora(FILE *f, gregorio_glyph *glyph,
tmpnote = current_note->next;
while (tmpnote) {
if (tmpnote->signs == _PUNCTUM_MORA || tmpnote->signs == _AUCTUM_DUPLEX
- || tmpnote->signs == _V_EPISEMUS_PUNCTUM_MORA
- || tmpnote->signs == _V_EPISEMUS_AUCTUM_DUPLEX
+ || tmpnote->signs == _V_EPISEMA_PUNCTUM_MORA
+ || tmpnote->signs == _V_EPISEMA_AUCTUM_DUPLEX
|| tmpnote->choral_sign) {
no_space = 1;
break;
@@ -1591,12 +1594,12 @@ static __inline int get_punctum_inclinatum_space_case(
return -1;
}
-static __inline void write_single_hepisemus(FILE *const f, int hepisemus_case,
+static __inline void write_single_hepisema(FILE *const f, int hepisema_case,
const gregorio_note *const note, bool connect, char height,
- const grehepisemus_size size, const int i,
+ const grehepisema_size size, const int i,
const gregorio_glyph *const glyph,
- const int porrectus_long_episemus_index,
- bool (*const is_episemus_shown)(const gregorio_note *))
+ const int porrectus_long_episema_index,
+ bool (*const is_episema_shown)(const gregorio_note *))
{
char ambitus = 0;
char size_arg;
@@ -1619,21 +1622,21 @@ static __inline void write_single_hepisemus(FILE *const f, int hepisemus_case,
break;
}
- if (i == porrectus_long_episemus_index && note->next
- && is_episemus_shown(note->next)) {
+ if (i == porrectus_long_episema_index && note->next
+ && is_episema_shown(note->next)) {
ambitus = compute_ambitus(note);
}
- if (i - 1 != porrectus_long_episemus_index || !note->previous
- || !is_episemus_shown(note->previous)) {
+ if (i - 1 != porrectus_long_episema_index || !note->previous
+ || !is_episema_shown(note->previous)) {
if (connect) {
if (!note->next && (!glyph->next
|| glyph->next->type != GRE_SPACE
|| glyph->next->u.misc.unpitched.info.space
!= SP_ZERO_WIDTH)) {
/* not followed by a zero-width space */
- fprintf(f, "\\GreHEpisemusBridge{%d}{%d}{-1}%%\n",
- pitch_value(height), hepisemus_case);
+ fprintf(f, "\\GreHEpisemaBridge{%d}{%d}{-1}%%\n",
+ pitch_value(height), hepisema_case);
} else if (note->next
&& (note->next->u.note.shape == S_PUNCTUM_INCLINATUM
|| note->next->u.note.shape
@@ -1641,27 +1644,27 @@ static __inline void write_single_hepisemus(FILE *const f, int hepisemus_case,
|| note->next->u.note.shape
== S_PUNCTUM_INCLINATUM_AUCTUS)) {
/* is a punctum inclinatum of some sort */
- fprintf(f, "\\GreHEpisemusBridge{%d}{%d}{%d}%%\n",
- pitch_value(height), hepisemus_case,
+ fprintf(f, "\\GreHEpisemaBridge{%d}{%d}{%d}%%\n",
+ pitch_value(height), hepisema_case,
get_punctum_inclinatum_space_case(note->next));
}
}
- fprintf(f, "\\GreHEpisemus{%d}{\\GreOCase%s}{%d}{%d}{%c}{%d}%%\n",
+ fprintf(f, "\\GreHEpisema{%d}{\\GreOCase%s}{%d}{%d}{%c}{%d}%%\n",
pitch_value(height), note->gtex_offset_case, ambitus,
- hepisemus_case, size_arg, pitch_value(height));
+ hepisema_case, size_arg, pitch_value(height));
}
}
}
/**
- * @brief A function that writes the good \c \\hepisemus in GregorioTeX.
+ * @brief A function that writes the good \c \\hepisema in GregorioTeX.
* @param i The position of the note in the glyph.
*/
-static void gregoriotex_write_hepisemus(FILE *const f,
+static void gregoriotex_write_hepisema(FILE *const f,
const gregorio_note *const note, const int i, const gtex_type type,
const gregorio_glyph *const glyph)
{
- int porrectus_long_episemus_index = -1;
+ int porrectus_long_episema_index = -1;
if (!note) {
return;
@@ -1670,23 +1673,23 @@ static void gregoriotex_write_hepisemus(FILE *const f,
switch (type) {
case T_PORRECTUS:
case T_PORRECTUS_FLEXUS:
- porrectus_long_episemus_index = 1;
+ porrectus_long_episema_index = 1;
break;
case T_TORCULUS_RESUPINUS:
case T_TORCULUS_RESUPINUS_FLEXUS:
- porrectus_long_episemus_index = 2;
+ porrectus_long_episema_index = 2;
break;
default:
/* do nothing */
break;
}
- write_single_hepisemus(f, 1, note, note->h_episemus_below_connect,
- note->h_episemus_below, note->h_episemus_below_size, i, glyph,
- porrectus_long_episemus_index, &gtex_is_h_episemus_below_shown);
- write_single_hepisemus(f, 0, note, note->h_episemus_above_connect,
- note->h_episemus_above, note->h_episemus_above_size, i, glyph,
- porrectus_long_episemus_index, &gtex_is_h_episemus_above_shown);
+ write_single_hepisema(f, 1, note, note->h_episema_below_connect,
+ note->h_episema_below, note->h_episema_below_size, i, glyph,
+ porrectus_long_episema_index, &gtex_is_h_episema_below_shown);
+ write_single_hepisema(f, 0, note, note->h_episema_above_connect,
+ note->h_episema_above, note->h_episema_above_size, i, glyph,
+ porrectus_long_episema_index, &gtex_is_h_episema_above_shown);
}
/* a macro to write an additional line */
@@ -1707,14 +1710,14 @@ static void gregoriotex_write_additional_line(FILE *f,
case T_PORRECTUS:
case T_PORRECTUS_FLEXUS:
if (i == 1) {
- i = HEPISEMUS_FIRST_TWO;
+ i = HEPISEMA_FIRST_TWO;
}
if (i == 2) {
if (current_note->previous->u.note.pitch >= PITCH_BELOW_STAFF
&& current_note->previous->u.note.pitch
<= PITCH_ABOVE_STAFF) {
- i = HEPISEMUS_FIRST_TWO;
- /* HEPISEMUS_FIRST_TWO works only for first note */
+ i = HEPISEMA_FIRST_TWO;
+ /* HEPISEMA_FIRST_TWO works only for first note */
current_note = current_note->previous;
} else {
return;
@@ -1731,14 +1734,14 @@ static void gregoriotex_write_additional_line(FILE *f,
case T_TORCULUS_RESUPINUS:
case T_TORCULUS_RESUPINUS_FLEXUS:
if (i == 2) {
- i = HEPISEMUS_FIRST_TWO;
+ i = HEPISEMA_FIRST_TWO;
}
if (i == 3) {
if (current_note->previous->u.note.pitch >= PITCH_BELOW_STAFF
&& current_note->previous->u.note.pitch
<= PITCH_ABOVE_STAFF) {
- i = HEPISEMUS_FIRST_TWO;
- /* HEPISEMUS_FIRST_TWO works only for first note */
+ i = HEPISEMA_FIRST_TWO;
+ /* HEPISEMA_FIRST_TWO works only for first note */
current_note = current_note->previous;
} else {
return;
@@ -1756,7 +1759,7 @@ static void gregoriotex_write_additional_line(FILE *f,
break;
}
- if (i == HEPISEMUS_FIRST_TWO) {
+ if (i == HEPISEMA_FIRST_TWO) {
/* here we must compare the first note of the big bar with the second
* one, but it may be tricky sometimes, because of the previous patch */
if (current_note->previous &&
@@ -1775,15 +1778,15 @@ static void gregoriotex_write_additional_line(FILE *f,
/*
*
- * a function that writes the good value of \vepisemus in GregorioTeX. i is the
+ * a function that writes the good value of \vepisema in GregorioTeX. i is the
* position of the note in the glyph
*
*/
-static void gregoriotex_write_vepisemus(FILE *f, gregorio_note *note)
+static void gregoriotex_write_vepisema(FILE *f, gregorio_note *note)
{
- fprintf(f, "\\GreVEpisemus{%d}{\\GreOCase%s}%%\n",
- pitch_value(note->v_episemus_height), note->gtex_offset_case);
+ fprintf(f, "\\GreVEpisema{%d}{\\GreOCase%s}%%\n",
+ pitch_value(note->v_episema_height), note->gtex_offset_case);
}
/*
@@ -2033,7 +2036,7 @@ static void gregoriotex_write_choral_sign(FILE *f, gregorio_glyph *glyph,
bool low_sign = choral_sign_here_is_low(glyph, current_note, &kind_of_pes);
/* the low choral signs must be typeset after the punctum, whereas the high
- * must be typeset before the h episemus */
+ * must be typeset before the h episema */
if ((low_sign && !low) || (!low_sign && low)) {
return;
}
@@ -2050,7 +2053,7 @@ static void gregoriotex_write_choral_sign(FILE *f, gregorio_glyph *glyph,
if (current_note->previous
&& (current_note->previous->signs == _PUNCTUM_MORA
|| current_note->previous->signs ==
- _V_EPISEMUS_PUNCTUM_MORA)) {
+ _V_EPISEMA_PUNCTUM_MORA)) {
write_low_choral_sign(f, current_note, 1);
return;
}
@@ -2095,12 +2098,12 @@ static void compute_height_extrema(const gregorio_glyph *const glyph,
char height;
/* get the minima/maxima pitches */
for (; note; note = note->next) {
- if (note->h_episemus_above) {
- height = note->h_episemus_above;
+ if (note->h_episema_above) {
+ height = note->h_episema_above;
} else {
- if (note->v_episemus_height && note->v_episemus_height
+ if (note->v_episema_height && note->v_episema_height
> note->u.note.pitch) {
- height = note->v_episemus_height;
+ height = note->v_episema_height;
} else {
height = note->u.note.pitch;
}
@@ -2114,11 +2117,11 @@ static void compute_height_extrema(const gregorio_glyph *const glyph,
*top_height = height;
}
- if (note->h_episemus_below) {
- height = note->h_episemus_below;
- } else if (note->v_episemus_height && note->v_episemus_height
+ if (note->h_episema_below) {
+ height = note->h_episema_below;
+ } else if (note->v_episema_height && note->v_episema_height
< note->u.note.pitch) {
- height = note->v_episemus_height;
+ height = note->v_episema_height;
} else {
height = note->u.note.pitch;
}
@@ -2147,7 +2150,7 @@ static void gregoriotex_write_signs(FILE *f, gtex_type type,
int i;
gregorio_note *current_note;
/* a dumb char */
- char block_hepisemus = 0;
+ char block_hepisema = 0;
signed char high_pitch = UNDETERMINED_HEIGHT;
signed char low_pitch = UNDETERMINED_HEIGHT;
bool found = false;
@@ -2175,7 +2178,7 @@ static void gregoriotex_write_signs(FILE *f, gtex_type type,
}
fprintf(f, "}{");
/* now a first loop for the choral signs, because high signs must be taken
- * into account before any hepisemus */
+ * into account before any hepisema */
for (current_note = note, i = 1; current_note;
current_note = current_note->next, ++i) {
if (current_note->choral_sign) {
@@ -2186,15 +2189,15 @@ static void gregoriotex_write_signs(FILE *f, gtex_type type,
break;
}
}
- /* a loop for rare signs, vertical episemus, and horizontal episemus */
+ /* a loop for rare signs, vertical episema, and horizontal episema */
for (current_note = note, i = 1; current_note;
current_note = current_note->next, ++i) {
- /* we continue with the hepisemus */
- if (current_note->h_episemus_above || current_note->h_episemus_below) {
+ /* we continue with the hepisema */
+ if (current_note->h_episema_above || current_note->h_episema_below) {
found = _found(f, found);
- gregoriotex_write_hepisemus(f, current_note, i, type, glyph);
+ gregoriotex_write_hepisema(f, current_note, i, type, glyph);
}
- /* write_rare also writes the vepisemus */
+ /* write_rare also writes the vepisema */
if (current_note->special_sign) {
found = _found(f, found);
gregoriotex_write_rare(f, current_note, current_note->special_sign);
@@ -2203,10 +2206,10 @@ static void gregoriotex_write_signs(FILE *f, gtex_type type,
found = _found(f, found);
}
switch (current_note->signs) {
- case _V_EPISEMUS:
- case _V_EPISEMUS_PUNCTUM_MORA:
- case _V_EPISEMUS_AUCTUM_DUPLEX:
- gregoriotex_write_vepisemus(f, current_note);
+ case _V_EPISEMA:
+ case _V_EPISEMA_PUNCTUM_MORA:
+ case _V_EPISEMA_AUCTUM_DUPLEX:
+ gregoriotex_write_vepisema(f, current_note);
break;
default:
/* do nothing */
@@ -2214,11 +2217,11 @@ static void gregoriotex_write_signs(FILE *f, gtex_type type,
}
/* why is this if there?... */
if (!current_note->special_sign) {
- if (block_hepisemus == 2) {
- block_hepisemus = 0;
+ if (block_hepisema == 2) {
+ block_hepisema = 0;
}
- if (block_hepisemus == 1) {
- block_hepisemus = 2;
+ if (block_hepisema == 1) {
+ block_hepisema = 2;
}
}
if (type == T_ONE_NOTE) {
@@ -2230,11 +2233,11 @@ static void gregoriotex_write_signs(FILE *f, gtex_type type,
current_note = current_note->next, ++i) {
switch (current_note->signs) {
case _PUNCTUM_MORA:
- case _V_EPISEMUS_PUNCTUM_MORA:
+ case _V_EPISEMA_PUNCTUM_MORA:
gregoriotex_write_punctum_mora(f, glyph, current_note);
break;
case _AUCTUM_DUPLEX:
- case _V_EPISEMUS_AUCTUM_DUPLEX:
+ case _V_EPISEMA_AUCTUM_DUPLEX:
gregoriotex_write_auctum_duplex(f, current_note);
break;
default:
@@ -2574,17 +2577,20 @@ static void write_fixed_text_styles(FILE *f, gregorio_character *syllable_text,
static void gregoriotex_write_text(FILE *f, gregorio_character *text,
bool *first_syllable)
{
+ bool skip_initial = first_syllable && *first_syllable;
if (text == NULL) {
fprintf(f, "{}{}{}{}{}");
+ if (skip_initial) {
+ fprintf(f, "\\GreForceHyphen{}");
+ }
return;
}
fprintf(f, "{");
- gregorio_write_text(first_syllable && *first_syllable, text, f,
+ gregorio_write_text(skip_initial, text, f,
(&gtex_write_verb), (&gtex_print_char), (&gtex_write_begin),
(&gtex_write_end), (&gtex_write_special_char));
fprintf(f, "}{");
- gregorio_write_first_letter_alignment_text(
- first_syllable && *first_syllable, text, f,
+ gregorio_write_first_letter_alignment_text(skip_initial, text, f,
(&gtex_write_verb), (&gtex_print_char), (&gtex_write_begin),
(&gtex_write_end), (&gtex_write_special_char));
if (first_syllable) {
@@ -2593,6 +2599,29 @@ static void gregoriotex_write_text(FILE *f, gregorio_character *text,
gregoriotex_ignore_style = gregoriotex_next_ignore_style;
gregoriotex_next_ignore_style = ST_NO_STYLE;
fprintf(f, "}");
+ if (skip_initial) {
+ /* Check to see if we need to force a hyphen (empty first syllable) */
+ for (; text; text = text->next_character) {
+ if (text->is_character) {
+ break;
+ } else if (text->cos.s.type == ST_T_BEGIN) {
+ if (text->cos.s.style == ST_VERBATIM ||
+ text->cos.s.style == ST_SPECIAL_CHAR) {
+ break;
+ } else if (text->cos.s.style == ST_INITIAL) {
+ for (; text; text = text->next_character) {
+ if (!text->is_character && text->cos.s.type == ST_T_END
+ && text->cos.s.style == ST_INITIAL) {
+ break;
+ }
+ }
+ }
+ }
+ }
+ if (!text) {
+ fprintf(f, "\\GreForceHyphen{}");
+ }
+ }
}
/*
@@ -2647,7 +2676,7 @@ static void handle_final_bar(FILE *f, const char *type, gregorio_syllable *sylla
case GRE_CUSTOS:
assert(element->u.misc.pitched.force_pitch);
- fprintf(f, "\\GreManualCustos{%d}%%\n",
+ fprintf(f, "\\GreFinalCustos{%d}%%\n",
pitch_value(element->u.misc.pitched.pitch));
break;
@@ -3001,9 +3030,8 @@ static void gregoriotex_write_syllable(FILE *f, gregorio_syllable *syllable,
* We don't print custos before a bar at the end of a line
*/
/* we also print an unbreakable larger space before the custo */
- fprintf(f, "\\GreEndOfElement{1}{1}%%\n\\Gre%sCustos{%d}"
+ fprintf(f, "\\GreEndOfElement{1}{1}%%\n\\GreCustos{%d}"
"\\GreNextCustos{%d}%%\n",
- element->u.misc.pitched.force_pitch? "Manual" : "",
pitch_value(element->u.misc.pitched.pitch),
pitch_value(gregorio_determine_next_pitch(syllable,
element, NULL)));
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gregoriotex/gregoriotex.h b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex.h
index eb2ee832dbc..16cf41e8610 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/gregoriotex/gregoriotex.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex.h
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header prototypes GregorioTeX writing data structures and entry points.
+ *
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -97,11 +100,11 @@ typedef enum gtex_glyph_liquescentia {
} gtex_glyph_liquescentia;
typedef enum gtex_sign_type {
- ST_H_EPISEMUS = 0,
- ST_V_EPISEMUS = 1
+ ST_H_EPISEMA = 0,
+ ST_V_EPISEMA = 1
} gtex_sign_type;
-#define HEPISEMUS_FIRST_TWO 12
+#define HEPISEMA_FIRST_TWO 12
static __inline bool choral_sign_here_is_low(const gregorio_glyph *const glyph,
const gregorio_note *const note, bool *const kind_of_pes)
@@ -152,8 +155,8 @@ static __inline bool is_between_lines(const char pitch)
return pitch % 2 == 1;
}
-bool gtex_is_h_episemus_above_shown(const gregorio_note *const note);
-bool gtex_is_h_episemus_below_shown(const gregorio_note *const note);
+bool gtex_is_h_episema_above_shown(const gregorio_note *const note);
+bool gtex_is_h_episema_below_shown(const gregorio_note *const note);
const char *gregoriotex_determine_glyph_name(const gregorio_glyph *const glyph,
const gregorio_element *const element, gtex_alignment *const type,
gtex_type *const gtype);
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/messages.c b/Build/source/texk/gregorio/gregorio-src/src/messages.c
index f5dc0c53d1a..b67b5e0578f 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/messages.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/messages.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file contains functions for logging messages, warnings, and errors.
+ *
* Copyright (C) 2009-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/messages.h b/Build/source/texk/gregorio/gregorio-src/src/messages.h
index fc25c143767..19ad015847e 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/messages.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/messages.h
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header prototypes the message logging functions.
+ *
* Copyright (C) 2009-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/plugins.h b/Build/source/texk/gregorio/gregorio-src/src/plugins.h
index 377d3067241..e206269cc75 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/plugins.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/plugins.h
@@ -1,5 +1,6 @@
/*
- * Gregorio format support headers.
+ * 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-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/sha1.c b/Build/source/texk/gregorio/gregorio-src/src/sha1.c
index 64ab6bad55f..64ab6bad55f 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/sha1.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/sha1.c
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/sha1.h b/Build/source/texk/gregorio/gregorio-src/src/sha1.h
index aa8ec20ed85..aa8ec20ed85 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/sha1.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/sha1.h
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/struct.c b/Build/source/texk/gregorio/gregorio-src/src/struct.c
index 88f415bbf6b..2130da6d45b 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/struct.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/struct.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the Gregorio data structures.
+ *
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -24,7 +27,7 @@
*
* It starts by simple add/delete functions for almost all
* structs, and ends with more complex functions for manipulating
- * horizontal episemus, keys, etc.
+ * horizontal episema, keys, etc.
*
* The first functions are not commented, but they always act like
* this : we give them a pointer to the pointer to the current element
@@ -45,18 +48,13 @@
#include "struct.h"
#include "unicode.h"
#include "messages.h"
+#include "support.h"
#include "characters.h"
static gregorio_note *create_and_link_note(gregorio_note **current_note,
const gregorio_scanner_location *const loc)
{
- gregorio_note *note = calloc(1, sizeof(gregorio_note));
- if (!note) {
- gregorio_message(_("error in memory allocation"),
- "create_and_link_note", VERBOSITY_FATAL, 0);
- return NULL;
- }
-
+ gregorio_note *note = gregorio_calloc(1, sizeof(gregorio_note));
note->previous = *current_note;
note->next = NULL;
if (*current_note) {
@@ -70,34 +68,34 @@ static gregorio_note *create_and_link_note(gregorio_note **current_note,
return note;
}
-void gregorio_position_h_episemus_above(gregorio_note *note, signed char height,
+void gregorio_position_h_episema_above(gregorio_note *note, signed char height,
bool connect)
{
assert(note && (note->type == GRE_NOTE || note->type == GRE_BAR));
- note->h_episemus_above = height;
- note->h_episemus_above_connect = connect;
+ note->h_episema_above = height;
+ note->h_episema_above_connect = connect;
}
-static void set_h_episemus_above(gregorio_note *note, signed char height,
- grehepisemus_size size, bool connect)
+static void set_h_episema_above(gregorio_note *note, signed char height,
+ grehepisema_size size, bool connect)
{
- gregorio_position_h_episemus_above(note, height, connect);
- note->h_episemus_above_size = size;
+ gregorio_position_h_episema_above(note, height, connect);
+ note->h_episema_above_size = size;
}
-void gregorio_position_h_episemus_below(gregorio_note *note, signed char height,
+void gregorio_position_h_episema_below(gregorio_note *note, signed char height,
bool connect)
{
assert(note && (note->type == GRE_NOTE || note->type == GRE_BAR));
- note->h_episemus_below = height;
- note->h_episemus_below_connect = connect;
+ note->h_episema_below = height;
+ note->h_episema_below_connect = connect;
}
-static void set_h_episemus_below(gregorio_note *note, signed char height,
- grehepisemus_size size, bool connect)
+static void set_h_episema_below(gregorio_note *note, signed char height,
+ grehepisema_size size, bool connect)
{
- gregorio_position_h_episemus_below(note, height, connect);
- note->h_episemus_below_size = size;
+ gregorio_position_h_episema_below(note, height, connect);
+ note->h_episema_below_size = size;
}
void gregorio_add_note(gregorio_note **current_note, signed char pitch,
@@ -114,12 +112,12 @@ void gregorio_add_note(gregorio_note **current_note, signed char pitch,
element->special_sign = _NO_SIGN;
element->u.note.liquescentia = liquescentia;
if (prototype) {
- set_h_episemus_above(element, prototype->h_episemus_above,
- prototype->h_episemus_above_size,
- prototype->h_episemus_above_connect);
- set_h_episemus_below(element, prototype->h_episemus_below,
- prototype->h_episemus_below_size,
- prototype->h_episemus_below_connect);
+ set_h_episema_above(element, prototype->h_episema_above,
+ prototype->h_episema_above_size,
+ prototype->h_episema_above_connect);
+ set_h_episema_below(element, prototype->h_episema_below,
+ prototype->h_episema_below_size,
+ prototype->h_episema_below_connect);
}
element->texverb = NULL;
element->choral_sign = NULL;
@@ -236,7 +234,7 @@ void gregorio_add_texverb_to_note(gregorio_note **current_note, char *str)
if (*current_note) {
if ((*current_note)->texverb) {
len = strlen((*current_note)->texverb) + strlen(str) + 1;
- res = malloc(len * sizeof(char));
+ res = gregorio_malloc(len * sizeof(char));
strcpy(res, (*current_note)->texverb);
strcat(res, str);
free((*current_note)->texverb);
@@ -414,112 +412,112 @@ void gregorio_add_liquescentia(gregorio_note *note, gregorio_liquescentia liq)
}
}
-static void apply_auto_h_episemus(gregorio_note *const note,
- const grehepisemus_size size, const bool disable_bridge)
+static void apply_auto_h_episema(gregorio_note *const note,
+ const grehepisema_size size, const bool disable_bridge)
{
- if (note->h_episemus_above == HEPISEMUS_NONE
- && note->h_episemus_below == HEPISEMUS_NONE) {
+ if (note->h_episema_above == HEPISEMA_NONE
+ && note->h_episema_below == HEPISEMA_NONE) {
/* if both are unset, set both to auto */
- set_h_episemus_above(note, HEPISEMUS_AUTO, size, !disable_bridge);
- set_h_episemus_below(note, HEPISEMUS_AUTO, size, !disable_bridge);
- } else if (note->h_episemus_above == HEPISEMUS_AUTO
- && note->h_episemus_below == HEPISEMUS_AUTO) {
+ set_h_episema_above(note, HEPISEMA_AUTO, size, !disable_bridge);
+ set_h_episema_below(note, HEPISEMA_AUTO, size, !disable_bridge);
+ } else if (note->h_episema_above == HEPISEMA_AUTO
+ && note->h_episema_below == HEPISEMA_AUTO) {
/* if both are auto, then force both */
- /* the upper episemus keeps its settings */
- note->h_episemus_above = HEPISEMUS_FORCED;
+ /* the upper episema keeps its settings */
+ note->h_episema_above = HEPISEMA_FORCED;
- set_h_episemus_below(note, HEPISEMUS_FORCED, size, !disable_bridge);
+ set_h_episema_below(note, HEPISEMA_FORCED, size, !disable_bridge);
} else {
/* force whichever is not already forced */
- if (note->h_episemus_above != HEPISEMUS_FORCED) {
- set_h_episemus_above(note, HEPISEMUS_FORCED, size, !disable_bridge);
+ if (note->h_episema_above != HEPISEMA_FORCED) {
+ set_h_episema_above(note, HEPISEMA_FORCED, size, !disable_bridge);
}
- if (note->h_episemus_below != HEPISEMUS_FORCED) {
- set_h_episemus_below(note, HEPISEMUS_FORCED, size, !disable_bridge);
+ if (note->h_episema_below != HEPISEMA_FORCED) {
+ set_h_episema_below(note, HEPISEMA_FORCED, size, !disable_bridge);
}
}
}
/**********************************
*
- * Activate_isolated_h_episemus is used when we see an "isolated"
- * horizontal episemus: when we type ab__ lex see a then b then _ then _, so
+ * Activate_isolated_h_episema is used when we see an "isolated"
+ * horizontal episema: when we type ab__ lex see a then b then _ then _, so
* we must put the _ on the a (kind of backward process), and say the
- * the episemus on the b is a multi episemus. Here n is the length of
- * the isolated episemus we found (can be up to 4).
+ * the episema on the b is a multi episema. Here n is the length of
+ * the isolated episema we found (can be up to 4).
*
*********************************/
-static void gregorio_activate_isolated_h_episemus(gregorio_note *note,
- const grehepisemus_size size, const bool disable_bridge, int n)
+static void gregorio_activate_isolated_h_episema(gregorio_note *note,
+ const grehepisema_size size, const bool disable_bridge, int n)
{
if (!note) {
- gregorio_message(ngt_("isolated horizontal episemus at the beginning "
+ gregorio_message(ngt_("isolated horizontal episema at the beginning "
"of a note sequence, ignored",
- "isolated horizontal episemus at the beginning of a note "
- "sequence, ignored", n), "activate_h_isolated_episemus",
+ "isolated horizontal episema at the beginning of a note "
+ "sequence, ignored", n), "activate_h_isolated_episema",
VERBOSITY_WARNING, 0);
return;
}
if (note->type != GRE_NOTE) {
- gregorio_message(ngt_("isolated horizontal episemus after something "
+ gregorio_message(ngt_("isolated horizontal episema after something "
"that is not a note, ignored",
- "isolated horizontal episemus after something that is not "
- "a note, ignored", n), "activate_h_isolated_episemus",
+ "isolated horizontal episema after something that is not "
+ "a note, ignored", n), "activate_h_isolated_episema",
VERBOSITY_WARNING, 0);
return;
}
for (; n > 0; --n) {
note = note->previous;
if (!note || note->type != GRE_NOTE) {
- gregorio_message(_("found more horizontal episemus than notes "
- "able to be under"), "activate_h_isolated_episemus",
+ gregorio_message(_("found more horizontal episema than notes "
+ "able to be under"), "activate_h_isolated_episema",
VERBOSITY_WARNING, 0);
return;
}
}
- apply_auto_h_episemus(note, size, disable_bridge);
+ apply_auto_h_episema(note, size, disable_bridge);
}
-void gregorio_add_h_episemus(gregorio_note *note,
- grehepisemus_size size, gregorio_vposition vposition,
- bool disable_bridge, unsigned int *nbof_isolated_episemus)
+void gregorio_add_h_episema(gregorio_note *note,
+ grehepisema_size size, gregorio_vposition vposition,
+ bool disable_bridge, unsigned int *nbof_isolated_episema)
{
if (!note || (note->type != GRE_NOTE && note->type != GRE_BAR)) {
- gregorio_message(_("trying to add a horizontal episemus on something "
- "that is not a note"), "add_h_episemus",
+ gregorio_message(_("trying to add a horizontal episema on something "
+ "that is not a note"), "add_h_episema",
VERBOSITY_ERROR, 0);
return;
}
- if (!nbof_isolated_episemus) {
- gregorio_message(_("NULL argument nbof_isolated_episemus"),
- "add_h_episemus", VERBOSITY_FATAL, 0);
+ if (!nbof_isolated_episema) {
+ gregorio_message(_("NULL argument nbof_isolated_episema"),
+ "add_h_episema", VERBOSITY_FATAL, 0);
return;
}
- if (vposition && *nbof_isolated_episemus) {
- gregorio_message(_("trying to add a forced horizontal episemus on a "
+ if (vposition && *nbof_isolated_episema) {
+ gregorio_message(_("trying to add a forced horizontal episema on a "
"note which already has an automatic horizontal "
- "episemus"), "add_h_episemus", VERBOSITY_ERROR, 0);
+ "episema"), "add_h_episema", VERBOSITY_ERROR, 0);
return;
}
- if (vposition || !*nbof_isolated_episemus) {
+ if (vposition || !*nbof_isolated_episema) {
switch (vposition) {
case VPOS_ABOVE:
- set_h_episemus_above(note, HEPISEMUS_FORCED, size, !disable_bridge);
+ set_h_episema_above(note, HEPISEMA_FORCED, size, !disable_bridge);
break;
case VPOS_BELOW:
- set_h_episemus_below(note, HEPISEMUS_FORCED, size, !disable_bridge);
+ set_h_episema_below(note, HEPISEMA_FORCED, size, !disable_bridge);
break;
default: /* VPOS_AUTO */
- apply_auto_h_episemus(note, size, disable_bridge);
- *nbof_isolated_episemus = 1;
+ apply_auto_h_episema(note, size, disable_bridge);
+ *nbof_isolated_episema = 1;
break;
}
} else {
- gregorio_activate_isolated_h_episemus(note, size, disable_bridge,
- (*nbof_isolated_episemus)++);
+ gregorio_activate_isolated_h_episema(note, size, disable_bridge,
+ (*nbof_isolated_episema)++);
}
}
@@ -536,14 +534,14 @@ void gregorio_add_sign(gregorio_note *note, gregorio_sign sign,
case _NO_SIGN:
note->signs = _PUNCTUM_MORA;
break;
- case _V_EPISEMUS:
- note->signs = _V_EPISEMUS_PUNCTUM_MORA;
+ case _V_EPISEMA:
+ note->signs = _V_EPISEMA_PUNCTUM_MORA;
break;
case _PUNCTUM_MORA:
note->signs = _AUCTUM_DUPLEX;
break;
- case _V_EPISEMUS_PUNCTUM_MORA:
- note->signs = _V_EPISEMUS_AUCTUM_DUPLEX;
+ case _V_EPISEMA_PUNCTUM_MORA:
+ note->signs = _V_EPISEMA_AUCTUM_DUPLEX;
break;
default:
break;
@@ -552,23 +550,23 @@ void gregorio_add_sign(gregorio_note *note, gregorio_sign sign,
note->mora_vposition = vposition;
break;
- case _V_EPISEMUS:
+ case _V_EPISEMA:
switch (note->signs) {
case _NO_SIGN:
- note->signs = _V_EPISEMUS;
+ note->signs = _V_EPISEMA;
break;
case _PUNCTUM_MORA:
- note->signs = _V_EPISEMUS_PUNCTUM_MORA;
+ note->signs = _V_EPISEMA_PUNCTUM_MORA;
break;
case _AUCTUM_DUPLEX:
- note->signs = _V_EPISEMUS_AUCTUM_DUPLEX;
+ note->signs = _V_EPISEMA_AUCTUM_DUPLEX;
break;
default:
break;
}
if (note->type == GRE_NOTE && vposition) {
- note->v_episemus_height = note->u.note.pitch + vposition;
+ note->v_episema_height = note->u.note.pitch + vposition;
}
break;
@@ -626,13 +624,7 @@ static void gregorio_free_notes(gregorio_note **note)
static gregorio_glyph *create_and_link_glyph(gregorio_glyph **current_glyph)
{
- gregorio_glyph *glyph = calloc(1, sizeof(gregorio_glyph));
- if (!glyph) {
- gregorio_message(_("error in memory allocation"),
- "create_and_link_glyph", VERBOSITY_FATAL, 0);
- return NULL;
- }
-
+ gregorio_glyph *glyph = gregorio_calloc(1, sizeof(gregorio_glyph));
glyph->previous = *current_glyph;
glyph->next = NULL;
if (*current_glyph) {
@@ -747,13 +739,7 @@ static void gregorio_free_glyphs(gregorio_glyph **glyph)
static gregorio_element *create_and_link_element(gregorio_element
**current_element)
{
- gregorio_element *element = calloc(1, sizeof(gregorio_element));
- if (!element) {
- gregorio_message(_("error in memory allocation"),
- "create_and_link_element", VERBOSITY_FATAL, 0);
- return NULL;
- }
-
+ gregorio_element *element = gregorio_calloc(1, sizeof(gregorio_element));
element->previous = *current_element;
element->next = NULL;
if (*current_element) {
@@ -832,12 +818,7 @@ void gregorio_add_character(gregorio_character **current_character,
grewchar wcharacter)
{
gregorio_character *element =
- (gregorio_character *) calloc(1, sizeof(gregorio_character));
- if (!element) {
- gregorio_message(_("error in memory allocation"),
- "gregorio_add_character", VERBOSITY_FATAL, 0);
- return;
- }
+ (gregorio_character *) gregorio_calloc(1, sizeof(gregorio_character));
element->is_character = 1;
element->cos.character = wcharacter;
element->next_character = NULL;
@@ -883,12 +864,7 @@ void gregorio_begin_style(gregorio_character **current_character,
grestyle_style style)
{
gregorio_character *element =
- (gregorio_character *) calloc(1, sizeof(gregorio_character));
- if (!element) {
- gregorio_message(_("error in memory allocation"),
- "add_note", VERBOSITY_FATAL, 0);
- return;
- }
+ (gregorio_character *) gregorio_calloc(1, sizeof(gregorio_character));
element->is_character = 0;
element->cos.s.type = ST_T_BEGIN;
element->cos.s.style = style;
@@ -904,12 +880,7 @@ void gregorio_end_style(gregorio_character **current_character,
grestyle_style style)
{
gregorio_character *element =
- (gregorio_character *) calloc(1, sizeof(gregorio_character));
- if (!element) {
- gregorio_message(_("error in memory allocation"),
- "add_note", VERBOSITY_FATAL, 0);
- return;
- }
+ (gregorio_character *) gregorio_calloc(1, sizeof(gregorio_character));
element->is_character = 0;
element->cos.s.type = ST_T_END;
element->cos.s.style = style;
@@ -938,12 +909,7 @@ void gregorio_add_syllable(gregorio_syllable **current_syllable,
0);
return;
}
- next = calloc(1, sizeof(gregorio_syllable));
- if (!next) {
- gregorio_message(_("error in memory allocation"), "add_syllable",
- VERBOSITY_FATAL, 0);
- return;
- }
+ next = gregorio_calloc(1, sizeof(gregorio_syllable));
next->type = GRE_SYLLABLE;
next->special_sign = _NO_SIGN;
next->position = position;
@@ -961,8 +927,8 @@ void gregorio_add_syllable(gregorio_syllable **current_syllable,
}
next->next_syllable = NULL;
next->previous_syllable = *current_syllable;
- tab = (gregorio_element **) malloc(number_of_voices *
- sizeof(gregorio_element *));
+ tab = (gregorio_element **) gregorio_malloc(number_of_voices *
+ sizeof(gregorio_element *));
if (elements) {
for (i = 0; i < number_of_voices; i++) {
tab[i] = elements[i];
@@ -1034,7 +1000,7 @@ static void gregorio_source_info_init(source_info *si)
gregorio_score *gregorio_new_score(void)
{
int annotation_num;
- gregorio_score *new_score = calloc(1, sizeof(gregorio_score));
+ gregorio_score *new_score = gregorio_calloc(1, sizeof(gregorio_score));
new_score->first_syllable = NULL;
new_score->number_of_voices = 1;
new_score->name = NULL;
@@ -1222,7 +1188,7 @@ void gregorio_set_score_user_notes(gregorio_score *score, char *user_notes)
void gregorio_add_voice_info(gregorio_voice_info **current_voice_info)
{
- gregorio_voice_info *next = calloc(1, sizeof(gregorio_voice_info));
+ gregorio_voice_info *next = gregorio_calloc(1, sizeof(gregorio_voice_info));
next->initial_key = NO_KEY;
next->flatted_key = false;
next->style = NULL;
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/struct.h b/Build/source/texk/gregorio/gregorio-src/src/struct.h
index 04bd5e390bd..cf9ddbe998d 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/struct.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/struct.h
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header defines the Gregorio data structures and functions.
+ *
* Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -148,17 +151,17 @@ typedef enum gregorio_bar {
} gregorio_bar;
/* definition of the signs. You can notice that the values are made so
- * that if you wan to add a vertical episemus to a note, you juste
- * make note->signs+=_V_EPISEMUS, so please don't change the value as
+ * that if you wan to add a vertical episema to a note, you juste
+ * make note->signs+=_V_EPISEMA, so please don't change the value as
* this trick is used. */
typedef enum gregorio_sign {
_NO_SIGN = 0x00,
_PUNCTUM_MORA = 0x01,
_AUCTUM_DUPLEX = 0x02,
- _V_EPISEMUS = 0x10,
- _V_EPISEMUS_PUNCTUM_MORA = 0x11,
- _V_EPISEMUS_AUCTUM_DUPLEX = 0x12,
+ _V_EPISEMA = 0x10,
+ _V_EPISEMA_PUNCTUM_MORA = 0x11,
+ _V_EPISEMA_AUCTUM_DUPLEX = 0x12,
/* more rare signs, for now they can't be used with the others */
_ACCENTUS = 0x03,
_ACCENTUS_REVERSUS = 0x04,
@@ -166,8 +169,8 @@ typedef enum gregorio_sign {
_SEMI_CIRCULUS = 0x06,
_SEMI_CIRCULUS_REVERSUS = 0x07,
/* signs of a bar */
- _BAR_H_EPISEMUS = 0x08,
- _V_EPISEMUS_BAR_H_EPISEMUS = 0x18
+ _BAR_H_EPISEMA = 0x08,
+ _V_EPISEMA_BAR_H_EPISEMA = 0x18
} gregorio_sign;
/* the different spaces */
@@ -202,12 +205,12 @@ typedef enum gregorio_liquescentia {
L_AUCTA_INITIO_DEBILIS = 0x18
} gregorio_liquescentia;
-typedef enum grehepisemus_size {
+typedef enum grehepisema_size {
H_NORMAL = 0,
H_SMALL_LEFT,
H_SMALL_CENTRE,
H_SMALL_RIGHT
-} grehepisemus_size;
+} grehepisema_size;
/* values are chosen so BELOW/ABOVE can be added to a pitch */
typedef enum gregorio_vposition {
@@ -426,22 +429,22 @@ typedef struct gregorio_note {
/* special_sign is the sign we sometimes encounter on punctum cavum, like
* accentus, semi-circulus, etc. */
ENUM_BITFIELD(gregorio_sign) special_sign:8;
- /* h_episemus_type is the type of horizontal episemus, possible values
- * are H_ALONE for an isolated horizontal episemus, H_MULTI_BEGINNING
- * if the note is the first note of an episemus on several notes,
- * H_MULTI_MIDDLE if it is inside an episemus on several notes. I let
+ /* h_episema_type is the type of horizontal episema, possible values
+ * are H_ALONE for an isolated horizontal episema, H_MULTI_BEGINNING
+ * if the note is the first note of an episema on several notes,
+ * H_MULTI_MIDDLE if it is inside an episema on several notes. I let
* you guess what could be the use of H_MULTI_END. Other values are
* temporary values used in determination, they must not appear in the
* final structure. */
const char *gtex_offset_case;
- signed char v_episemus_height;
- signed char h_episemus_above;
- signed char h_episemus_below;
- ENUM_BITFIELD(grehepisemus_size) h_episemus_above_size:2;
- ENUM_BITFIELD(grehepisemus_size) h_episemus_below_size:2;
- bool h_episemus_above_connect:1;
- bool h_episemus_below_connect:1;
+ signed char v_episema_height;
+ signed char h_episema_above;
+ signed char h_episema_below;
+ ENUM_BITFIELD(grehepisema_size) h_episema_above_size:2;
+ ENUM_BITFIELD(grehepisema_size) h_episema_below_size:2;
+ bool h_episema_above_connect:1;
+ bool h_episema_below_connect:1;
bool is_lower_note:1;
bool is_upper_note:1;
ENUM_BITFIELD(gregorio_vposition) mora_vposition:2;
@@ -743,9 +746,9 @@ static __inline bool is_initio_debilis(char liquescentia)
return liquescentia >= L_INITIO_DEBILIS;
}
-#define HEPISEMUS_NONE 0
-#define HEPISEMUS_AUTO -1
-#define HEPISEMUS_FORCED -2
+#define HEPISEMA_NONE 0
+#define HEPISEMA_AUTO -1
+#define HEPISEMA_FORCED -2
/* The first pitch MUST be an odd number */
#define LOWEST_PITCH 3
@@ -772,13 +775,13 @@ void gregorio_add_syllable(gregorio_syllable **current_syllable,
bool first_word);
void gregorio_add_special_sign(gregorio_note *current_note, gregorio_sign sign);
void gregorio_change_shape(gregorio_note *note, gregorio_shape shape);
-void gregorio_position_h_episemus_above(gregorio_note *note, signed char height,
+void gregorio_position_h_episema_above(gregorio_note *note, signed char height,
bool connect);
-void gregorio_position_h_episemus_below(gregorio_note *note, signed char height,
+void gregorio_position_h_episema_below(gregorio_note *note, signed char height,
bool connect);
-void gregorio_add_h_episemus(gregorio_note *note, grehepisemus_size size,
+void gregorio_add_h_episema(gregorio_note *note, grehepisema_size size,
gregorio_vposition vposition, bool disable_bridge,
- unsigned int *nbof_isolated_episemus);
+ unsigned int *nbof_isolated_episema);
void gregorio_add_sign(gregorio_note *note, gregorio_sign sign,
gregorio_vposition vposition);
void gregorio_add_liquescentia(gregorio_note *note,
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/support.c b/Build/source/texk/gregorio/gregorio-src/src/support.c
index 91851f38eac..1862c9445a5 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/support.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/support.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file contains miscellaneous support functions.
+ *
* Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -21,7 +24,9 @@
#include <stdio.h>
#include <stdarg.h>
#include <stdlib.h>
+#include <string.h>
#include "support.h"
+#include "messages.h"
/* Our version of snprintf; this is NOT semantically the same as C99's
* snprintf; rather, it's a "lowest common denominator" implementation
@@ -42,3 +47,47 @@ void gregorio_snprintf(char *s, size_t size, const char *format, ...)
#endif
va_end(args);
}
+
+void *gregorio_malloc(size_t size)
+{
+ void *result = malloc(size);
+ if (!result) {
+ gregorio_message(_("error in memory allocation"),
+ "gregorio_malloc", VERBOSITY_FATAL, 0);
+ exit(1);
+ }
+ return result;
+}
+
+void *gregorio_calloc(size_t nmemb, size_t size)
+{
+ void *result = calloc(nmemb, size);
+ if (!result) {
+ gregorio_message(_("error in memory allocation"),
+ "gregorio_calloc", VERBOSITY_FATAL, 0);
+ exit(1);
+ }
+ return result;
+}
+
+void *gregorio_realloc(void *ptr, size_t size)
+{
+ void *result = realloc(ptr, size);
+ if (!result) {
+ gregorio_message(_("error in memory allocation"),
+ "gregorio_realloc", VERBOSITY_FATAL, 0);
+ exit(1);
+ }
+ return result;
+}
+
+char *gregorio_strdup(const char *s)
+{
+ char *result = strdup(s);
+ if (!result) {
+ gregorio_message(_("error in memory allocation"),
+ "gregorio_strdup", VERBOSITY_FATAL, 0);
+ exit(1);
+ }
+ return result;
+}
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/support.h b/Build/source/texk/gregorio/gregorio-src/src/support.h
index 323b5ac4bc3..f6ec460121a 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/support.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/support.h
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header prototypes the miscellaneous support functions.
+ *
* Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -24,5 +27,9 @@
void gregorio_snprintf(char *s, size_t size, const char *format, ...)
__attribute__ ((__format__ (__printf__, 3, 4)));
+void *gregorio_malloc(size_t size);
+void *gregorio_calloc(size_t nmemb, size_t size);
+void *gregorio_realloc(void *ptr, size_t size);
+char *gregorio_strdup(const char *s);
#endif
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/unicode.c b/Build/source/texk/gregorio/gregorio-src/src/unicode.c
index f36bac8d543..9b15a6d92e4 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/unicode.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/unicode.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file contains functions providing UTF-8 support.
+ *
* Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -24,6 +27,7 @@
#include "struct.h"
#include "unicode.h"
#include "messages.h"
+#include "support.h"
/*
*
@@ -109,7 +113,7 @@ grewchar *gregorio_build_grewchar_string_from_buf(const char *const buf)
return NULL;
}
len = strlen(buf); /* to get the length of the syllable in ASCII */
- gwstring = (grewchar *) malloc((len + 1) * sizeof(grewchar));
+ gwstring = (grewchar *) gregorio_malloc((len + 1) * sizeof(grewchar));
gregorio_mbstowcs(gwstring, buf, len); /* converting into wchar_t */
return gwstring;
}
@@ -147,7 +151,7 @@ unsigned char gregorio_wcsbufcmp(grewchar *wstr, const char *buf)
return 1;
}
len = strlen(buf); /* to get the length of the syllable in ASCII */
- gwbuf = (grewchar *) malloc((len + 1) * sizeof(grewchar));
+ gwbuf = (grewchar *) gregorio_malloc((len + 1) * sizeof(grewchar));
gregorio_mbstowcs(gwbuf, buf, len); /* converting into wchar_t */
/* we add the corresponding characters in the list of gregorio_characters */
while (gwbuf[i] && wstr[i]) {
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/unicode.h b/Build/source/texk/gregorio/gregorio-src/src/unicode.h
index b55f1fde730..62942edcb1e 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/unicode.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/unicode.h
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header prototypes the UTF-8 support functions.
+ *
* Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/utf8strings.h b/Build/source/texk/gregorio/gregorio-src/src/utf8strings.h
index 902ce1e8f55..8d7dd732933 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/utf8strings.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/utf8strings.h
@@ -1,4 +1,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 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/utf8strings.h.in b/Build/source/texk/gregorio/gregorio-src/src/utf8strings.h.in
index 030889bcd46..548462844ba 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/utf8strings.h.in
+++ b/Build/source/texk/gregorio/gregorio-src/src/utf8strings.h.in
@@ -1,4 +1,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 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules-l.c b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c
index 594657c409b..78f76e8a7b6 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules-l.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c
@@ -529,6 +529,9 @@ char *gregorio_vowel_rulefile_text;
#line 1 "vowel/vowel-rules.l"
#line 2 "vowel/vowel-rules.l"
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the vowel rule lexer.
+ *
* Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -553,6 +556,7 @@ char *gregorio_vowel_rulefile_text;
#include <string.h>
#include "struct.h"
#include "messages.h"
+#include "support.h"
#include "vowel.h"
@@ -564,7 +568,7 @@ char *gregorio_vowel_rulefile_text;
static __inline void save_lval(void)
{
gregorio_vowel_rulefile_lval =
- malloc((gregorio_vowel_rulefile_leng + 1) * sizeof(char));
+ gregorio_malloc((gregorio_vowel_rulefile_leng + 1) * sizeof(char));
strncpy(gregorio_vowel_rulefile_lval, gregorio_vowel_rulefile_text,
gregorio_vowel_rulefile_leng);
gregorio_vowel_rulefile_lval[gregorio_vowel_rulefile_leng] = '\0';
@@ -579,7 +583,7 @@ static __inline void invalid(void)
-#line 583 "vowel/vowel-rules-l.c"
+#line 587 "vowel/vowel-rules-l.c"
#define INITIAL 0
#define chars 1
@@ -793,10 +797,10 @@ YY_DECL
}
{
-#line 71 "vowel/vowel-rules.l"
+#line 75 "vowel/vowel-rules.l"
-#line 800 "vowel/vowel-rules-l.c"
+#line 804 "vowel/vowel-rules-l.c"
while ( 1 ) /* loops until end-of-file is reached */
{
@@ -855,92 +859,92 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 73 "vowel/vowel-rules.l"
+#line 77 "vowel/vowel-rules.l"
{ BEGIN(lang); return LANGUAGE; }
YY_BREAK
case 2:
YY_RULE_SETUP
-#line 74 "vowel/vowel-rules.l"
+#line 78 "vowel/vowel-rules.l"
{ BEGIN(chars); return VOWEL; }
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 75 "vowel/vowel-rules.l"
+#line 79 "vowel/vowel-rules.l"
{ BEGIN(chars); return PREFIX; }
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 76 "vowel/vowel-rules.l"
+#line 80 "vowel/vowel-rules.l"
{ BEGIN(chars); return SUFFIX; }
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 77 "vowel/vowel-rules.l"
+#line 81 "vowel/vowel-rules.l"
{ BEGIN(chars); return SECONDARY; }
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 78 "vowel/vowel-rules.l"
+#line 82 "vowel/vowel-rules.l"
{ BEGIN(lang); return ALIAS; }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 79 "vowel/vowel-rules.l"
+#line 83 "vowel/vowel-rules.l"
{ BEGIN(INITIAL); return SEMICOLON; }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 80 "vowel/vowel-rules.l"
+#line 84 "vowel/vowel-rules.l"
{ return TO; }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 81 "vowel/vowel-rules.l"
+#line 85 "vowel/vowel-rules.l"
{ BEGIN(langname); }
YY_BREAK
case 10:
/* rule 10 can match eol */
YY_RULE_SETUP
-#line 82 "vowel/vowel-rules.l"
+#line 86 "vowel/vowel-rules.l"
{ save_lval(); return NAME; }
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 83 "vowel/vowel-rules.l"
+#line 87 "vowel/vowel-rules.l"
{ BEGIN(lang); }
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 84 "vowel/vowel-rules.l"
+#line 88 "vowel/vowel-rules.l"
{ save_lval(); return CHARACTERS; }
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 85 "vowel/vowel-rules.l"
+#line 89 "vowel/vowel-rules.l"
{ }
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 86 "vowel/vowel-rules.l"
+#line 90 "vowel/vowel-rules.l"
{ }
YY_BREAK
case 15:
/* rule 15 can match eol */
YY_RULE_SETUP
-#line 87 "vowel/vowel-rules.l"
+#line 91 "vowel/vowel-rules.l"
{ }
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 88 "vowel/vowel-rules.l"
+#line 92 "vowel/vowel-rules.l"
{ invalid(); return INVALID; }
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 90 "vowel/vowel-rules.l"
+#line 94 "vowel/vowel-rules.l"
ECHO;
YY_BREAK
-#line 944 "vowel/vowel-rules-l.c"
+#line 948 "vowel/vowel-rules-l.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(chars):
case YY_STATE_EOF(lang):
@@ -1909,7 +1913,7 @@ void gregorio_vowel_rulefile_free (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 90 "vowel/vowel-rules.l"
+#line 94 "vowel/vowel-rules.l"
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules-l.h b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h
index f954c765b0f..fba97f32dbd 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules-l.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h
@@ -317,7 +317,7 @@ extern int gregorio_vowel_rulefile_lex (void);
#undef YY_DECL
#endif
-#line 90 "vowel/vowel-rules.l"
+#line 94 "vowel/vowel-rules.l"
#line 324 "vowel/vowel-rules-l.h"
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules-y.c b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.c
index c024316fb94..3675fadf4c0 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules-y.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.c
@@ -73,6 +73,9 @@
#line 1 "vowel/vowel-rules.y" /* yacc.c:339 */
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the vowel rule parser.
+ *
* Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This program is free software: you can redistribute it and/or modify it
@@ -177,7 +180,7 @@ static __inline void add(const rulefile_parse_status *const status,
#define _ADD(TABLE, CHARS) add(status, gregorio_##TABLE##_table_add, CHARS)
-#line 181 "vowel/vowel-rules-y.c" /* yacc.c:339 */
+#line 184 "vowel/vowel-rules-y.c" /* yacc.c:339 */
# ifndef YY_NULLPTR
# if defined __cplusplus && 201103L <= __cplusplus
@@ -254,7 +257,7 @@ int gregorio_vowel_rulefile_parse (const char *const filename, char **language,
/* Copy the second part of user declarations. */
-#line 258 "vowel/vowel-rules-y.c" /* yacc.c:358 */
+#line 261 "vowel/vowel-rules-y.c" /* yacc.c:358 */
#ifdef short
# undef short
@@ -552,8 +555,8 @@ static const yytype_uint8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_uint8 yyrline[] =
{
- 0, 118, 118, 120, 124, 125, 126, 127, 128, 129,
- 132, 134, 137, 139, 142, 144, 147, 149
+ 0, 121, 121, 123, 127, 128, 129, 130, 131, 132,
+ 135, 137, 140, 142, 145, 147, 150, 152
};
#endif
@@ -1340,43 +1343,43 @@ yyreduce:
switch (yyn)
{
case 4:
-#line 124 "vowel/vowel-rules.y" /* yacc.c:1646 */
+#line 127 "vowel/vowel-rules.y" /* yacc.c:1646 */
{ _MATCH((yyvsp[-1])); }
-#line 1346 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 1349 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
break;
case 5:
-#line 125 "vowel/vowel-rules.y" /* yacc.c:1646 */
+#line 128 "vowel/vowel-rules.y" /* yacc.c:1646 */
{ _ALIAS((yyvsp[-3]), (yyvsp[-1])); }
-#line 1352 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 1355 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
break;
case 11:
-#line 134 "vowel/vowel-rules.y" /* yacc.c:1646 */
+#line 137 "vowel/vowel-rules.y" /* yacc.c:1646 */
{ _ADD(vowel, (yyvsp[0])); }
-#line 1358 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 1361 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
break;
case 13:
-#line 139 "vowel/vowel-rules.y" /* yacc.c:1646 */
+#line 142 "vowel/vowel-rules.y" /* yacc.c:1646 */
{ _ADD(prefix, (yyvsp[0])); }
-#line 1364 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 1367 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
break;
case 15:
-#line 144 "vowel/vowel-rules.y" /* yacc.c:1646 */
+#line 147 "vowel/vowel-rules.y" /* yacc.c:1646 */
{ _ADD(suffix, (yyvsp[0])); }
-#line 1370 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 1373 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
break;
case 17:
-#line 149 "vowel/vowel-rules.y" /* yacc.c:1646 */
+#line 152 "vowel/vowel-rules.y" /* yacc.c:1646 */
{ _ADD(secondary, (yyvsp[0])); }
-#line 1376 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 1379 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
break;
-#line 1380 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 1383 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules-y.h b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.h
index df47b6e2d5a..df47b6e2d5a 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules-y.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.h
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules.h b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.h
index bad87c1a400..bf99696e538 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.h
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header shares definitions between the vowel parser and lexer.
+ *
* Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules.l b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.l
index 2b0a318a951..72a04b2e0a6 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules.l
+++ b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.l
@@ -1,5 +1,8 @@
%{
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the vowel rule lexer.
+ *
* Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -24,6 +27,7 @@
#include <string.h>
#include "struct.h"
#include "messages.h"
+#include "support.h"
#include "vowel.h"
@@ -35,7 +39,7 @@
static __inline void save_lval(void)
{
gregorio_vowel_rulefile_lval =
- malloc((gregorio_vowel_rulefile_leng + 1) * sizeof(char));
+ gregorio_malloc((gregorio_vowel_rulefile_leng + 1) * sizeof(char));
strncpy(gregorio_vowel_rulefile_lval, gregorio_vowel_rulefile_text,
gregorio_vowel_rulefile_leng);
gregorio_vowel_rulefile_lval[gregorio_vowel_rulefile_leng] = '\0';
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules.y b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.y
index 3c5bc82ee24..236fa2293c7 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel-rules.y
+++ b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.y
@@ -1,5 +1,8 @@
%{
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the vowel rule parser.
+ *
* Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This program is free software: you can redistribute it and/or modify it
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel.c b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.c
index b58148ab17e..b4843cf2a3c 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.c
@@ -1,4 +1,7 @@
/*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements vowel rule handling (aside from parsing).
+ *
* Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
@@ -30,6 +33,7 @@
#include "vowel.h"
#include "unicode.h"
#include "messages.h"
+#include "support.h"
typedef struct character_set {
grewchar *table;
@@ -42,21 +46,15 @@ typedef struct character_set {
static character_set *character_set_new(const bool alloc_next)
{
- character_set *set = (character_set *)calloc(1, sizeof(character_set));
+ character_set *set =
+ (character_set *)gregorio_calloc(1, sizeof(character_set));
set->mask = 0x0f;
set->bins = 16;
set->size = 0;
- set->table = (grewchar *)calloc(set->bins, sizeof(grewchar));
- if (!set->table) {
- gregorio_message(_("unable to allocate memory"),
- "character_set_new", VERBOSITY_FATAL, 0);
- }
+ set->table = (grewchar *)gregorio_calloc(set->bins, sizeof(grewchar));
if (alloc_next) {
- set->next = (character_set **)calloc(set->bins, sizeof(character_set *));
- if (!set->next) {
- gregorio_message(_("unable to allocate memory"),
- "character_set_new", VERBOSITY_FATAL, 0);
- }
+ set->next = (character_set **)gregorio_calloc(set->bins,
+ sizeof(character_set *));
}
return set;
}
@@ -144,9 +142,9 @@ static __inline void character_set_grow(character_set *const set) {
set->bins <<= 1;
set->mask = (set->mask << 1) | 0x01;
- set->table = calloc(set->bins, sizeof(grewchar));
+ set->table = gregorio_calloc(set->bins, sizeof(grewchar));
if (old_next) {
- set->table = calloc(set->bins, sizeof(character_set *));
+ set->table = gregorio_calloc(set->bins, sizeof(character_set *));
}
for (i = 0; i < old_bins; ++i) {
if (old_table[i]) {
@@ -208,19 +206,12 @@ extern FILE *gregorio_vowel_rulefile_in;
static void prefix_buffer_grow(size_t required_size)
{
- grewchar *newbuffer;
-
while (required_size > prefix_buffer_size) {
prefix_buffer_size <<= 1;
prefix_buffer_mask = (prefix_buffer_mask << 1) | 0x01;
}
- newbuffer = realloc(prefix_buffer, prefix_buffer_size * sizeof(grewchar));
- if (newbuffer) {
- prefix_buffer = newbuffer;
- } else {
- gregorio_message(_("unable to allocate memory"), "prefix_buffer_grow",
- VERBOSITY_FATAL, 0);
- }
+ prefix_buffer = gregorio_realloc(prefix_buffer,
+ prefix_buffer_size * sizeof(grewchar));
}
void gregorio_vowel_tables_init(void)
@@ -238,12 +229,8 @@ void gregorio_vowel_tables_init(void)
prefix_buffer_size = 16;
prefix_buffer_mask = 0x0f;
- prefix_buffer = (grewchar *)malloc(
+ prefix_buffer = (grewchar *)gregorio_malloc(
prefix_buffer_size * sizeof(grewchar));
- if (!prefix_buffer) {
- gregorio_message(_("unable to allocate memory"),
- "gregorio_vowel_tables_init", VERBOSITY_FATAL, 0);
- }
}
}
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel.h b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.h
index 61e96bb0bb7..bd261c218e8 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/src/vowel/vowel.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.h
@@ -1,4 +1,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 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/windows/gregorio-resources.rc b/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
index 62d27168245..0b70f9577ce 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/windows/gregorio-resources.rc
+++ b/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
@@ -1,7 +1,7 @@
IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
1 VERSIONINFO
-FILEVERSION 1,0,0,0
-PRODUCTVERSION 1,0,0,0
+FILEVERSION 4,0,0,30
+PRODUCTVERSION 4,0,0,30
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -9,12 +9,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Gregorio project"
VALUE "FileDescription", "Gregorio"
- VALUE "FileVersion", "4.0.0-rc1"
+ VALUE "FileVersion", "4.0.0"
VALUE "InternalName", "gregorio"
VALUE "LegalCopyright", "See COPYING in the installation directory."
VALUE "OriginalFilename", "gregorio.exe"
VALUE "ProductName", "Gregorio"
- VALUE "ProductVersion", "4.0.0-rc1"
+ VALUE "ProductVersion", "4.0.0"
END
END
diff --git a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/windows/gregorio.ico b/Build/source/texk/gregorio/gregorio-src/windows/gregorio.ico
index 5b1e78fdb1a..5b1e78fdb1a 100644
--- a/Build/source/texk/gregorio/gregorio-4.0.0-rc1/windows/gregorio.ico
+++ b/Build/source/texk/gregorio/gregorio-src/windows/gregorio.ico
Binary files differ
diff --git a/Build/source/texk/gregorio/version.ac b/Build/source/texk/gregorio/version.ac
index 486065e3173..742176fc972 100644
--- a/Build/source/texk/gregorio/version.ac
+++ b/Build/source/texk/gregorio/version.ac
@@ -8,4 +8,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current gregorio version
-m4_define([gregorio_version], [4.0.0-rc1])
+m4_define([gregorio_version], [4.0.0])