summaryrefslogtreecommitdiff
path: root/Build/source/texk/gregorio/gregorio-src/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/gregorio/gregorio-src/contrib')
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml25
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim10
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gprocess2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command1
8 files changed, 24 insertions, 22 deletions
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml b/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml
index edd28c2682d..a5876053f1d 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml
@@ -3,7 +3,7 @@
XML file for using gregorio inside scribus.
Copyright (C) 2009 Pierre Couderc <pierre@couderc.eu>.
Copyright (C) 2010 Elie Roux <elie.roux@telecom-bretagne.eu>
- Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
+ Copyright (C) 2015-2021 The Gregorio Project (see CONTRIBUTORS.md)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -36,22 +36,19 @@
</empty-frame-text>
<!-- you can change the basic headers here -->
<preamble>
- \documentclass[$scribus_grefontsize$]{extarticle}
- \usepackage[paperwidth=$scribus_realwidth$ pt,
- paperheight=$scribus_realheight$ pt,
- left=0cm,top=0cm,right=0cm,bottom=0cm,nohead,nofoot]{geometry}
+ \documentclass[$scribus_grefontsize$]{extarticle}
+ \usepackage[paperwidth=$scribus_realwidth$ pt, paperheight=$scribus_realheight$ pt, left=0cm,top=0cm,right=0cm,bottom=0cm,nohead,nofoot]{geometry}
\usepackage[autocompile]{gregoriotex}
- \usepackage{filecontents}
- \title{Scribus-Latex-File}
- $scribus_additionalgreheaders$
- \author{Scribus}
- \pagestyle{empty}
- \setlength{\textwidth}{$scribus_realwidth$ pt}
+ \title{Scribus-Latex-File}
+ $scribus_additionalgreheaders$
+ \author{Scribus}
+ \pagestyle{empty}
+ \setlength{\textwidth}{$scribus_realwidth$ pt}
- \begin{filecontents}{scribus_file-score.gabc}
- </preamble>
+ \begin{filecontents*}[overwrite]{scribus_file-score.gabc}
+</preamble> <!-- this line's indentation is purposefully off because of the way that scribus interprets the preamble section -->
<postamble>
- \end{filecontents}
+ \end{filecontents*}
\begin{document}
$scribus_greconf$
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am b/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am
index 5cabdb95d3b..3c7791bc0a6 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
#
# This file is part of Gregorio.
#
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am
index ff4d5272046..c2f56efeca6 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2021 The Gregorio Project (see CONTRIBUTORS.md)
#
# This file is part of Gregorio.
#
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py b/Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py
index 8fcd6431af4..1ed216c9a44 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py
@@ -5,7 +5,7 @@
See checkSyllabation.py -h for help
- Copyright (C) 2016-2019 Elie Roux
+ Copyright (C) 2016-2021 Elie Roux
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang
index eda2860a718..03f84cb18c0 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang
@@ -2,7 +2,7 @@
<!--
Author: Elie Roux <elie.roux@telecom-bretagne.fr>
- Copyright (C) 2008-2019 Elie Roux <elie.roux@telecom-bretagne.fr>
+ Copyright (C) 2008-2021 Elie Roux <elie.roux@telecom-bretagne.fr>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
index 3d15f41c055..717c09d9704 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
@@ -12,11 +12,13 @@ syn match gabcAttributeEnd ";"
syn match gabcNoteError "." contained
syn match gabcBasicNote "[a-np]" contained
syn match gabcBasicNote "[A-NP][012]\?" contained
-syn match gabcNoteShape "[\<\>~xy#vVwWqQR\-Ss\.+]" contained
+syn match gabcNoteShape "[\<\>~vVwWqQR\-Ss\.+]" contained
+syn match gabcNoteShape "[xy#]?\?" contained
syn match gabcNoteShape "_[0-5]*" contained
syn match gabcNoteShape "[oO'\.][01]\?" contained
syn match gabcNoteShape "r[0-8]\?" contained
syn match gabcClef "[cf]b\?[1-5]" contained
+syn match gabcTextMarkup "$." contained
syn match gabcTextMarkup "</\?e>" contained
syn match gabcTextMarkup "</\?b>" contained
syn match gabcTextMarkup "</\?i>" contained
@@ -32,13 +34,15 @@ syn match gabcFuseEnd "\]" contained
syn match gabcBar ":?\?" contained
syn match gabcBar ";[1-8]\?" contained
syn match gabcBar ",[0-8]\?" contained
-syn match gabcBar "[`^]0\?" contained
+syn match gabcBar "[,`]?\?0\?" contained
+syn match gabcBar "[,`]0?" contained
+syn match gabcBar "\^0\?" contained
syn match gabcSpace "[! ]" contained
syn match gabcSpace "/0\?" contained
syn match gabcSpace "z[-+0]\?" contained
syn match gabcSpace "Z[-+]\?" contained
syn match gabcSpace "/\[[^\]]*\]" contained extend
-syn match gabcCommand "@\@<!\[[^\]]*\]" contained extend
+syn match gabcCommand "@\@<!\[\($.\|[^\]]\)*\]" contained extend
syn match gabcCommand "[{}]" contained extend
syn match gabcBracket "\[\[" contained
syn match gabcBracket "\]\]" contained
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/gprocess b/Build/source/texk/gregorio/gregorio-src/contrib/gprocess
index 205acd7540e..54e0f8c47f7 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/gprocess
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/gprocess
@@ -14,7 +14,7 @@
# --
#
# v0.1
-# Copyright (C) 2008-2019 Richard Chonak <chonak@yahoo.com>
+# Copyright (C) 2008-2021 Richard Chonak <chonak@yahoo.com>
#
# This program is free software: you can redistribute it and/or modify
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
index 13fe833be6a..8b6a18f6e95 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
@@ -131,6 +131,7 @@ gregoriotex-syllable.tex
gregoriotex-symbols.lua
gregoriotex-symbols.tex
gregoriotex-common.tex
+gregoriotex-gsp-default.tex
gregoriotex.lua"
for f in $files