summaryrefslogtreecommitdiff
path: root/Build/source/texk/gregorio/gregorio-src/contrib
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-04-06 05:08:53 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-04-06 05:08:53 +0000
commit5fedb5d6169efecebd0dfbb1da555805573d14e5 (patch)
tree1f2654660ca658b3d06ee656be81e9735684bf5d /Build/source/texk/gregorio/gregorio-src/contrib
parent3c806bd4ccf248e9411683a41ef534d1a909bc99 (diff)
gregorio 5.0.0-rc1
git-svn-id: svn://tug.org/texlive/trunk@43706 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/gregorio/gregorio-src/contrib')
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml51
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am4
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/README.md40
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command39
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py156
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim8
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gprocess2
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/gregorio-scribus.lua95
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat13
-rw-r--r--Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command13
12 files changed, 276 insertions, 149 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 a3855195bcf..b3886206472 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml
@@ -2,6 +2,8 @@
<!--
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-2017 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
@@ -20,8 +22,7 @@
See the different comments in the file to change the default configuration.
-->
<editorsettings description="gregorio" icon="gregorio.png">
- <!-- change the path to gregorio-scribus.lua here. -->
- <executable command='texlua /usr/share/scribus/editorconfig/gregorio-scribus.lua "%file" "%dir"'/>
+ <executable command="texlua"/>
<imagefile extension=".pdf"/>
<highlighter>
<rule name="gabc header" regex="[a-zA-Z]+:" color="blue" minimal="true"/>
@@ -33,7 +34,8 @@
(c3) Pó(eh/hi)pu(h)lus(h) Si(hi)on,(hgh.)
</empty-frame-text>
<!-- you can change the basic headers there -->
- <preamble>\documentclass[a4paper,$scribus_grefontsize$]{extarticle}
+ <preamble>data_from_scribus = [==========[% Generated from Scribus
+\documentclass[a4paper,$scribus_grefontsize$]{extarticle}
\usepackage[left=0cm,top=0cm,right=0cm,bottom=0cm,nohead,nofoot]{geometry}
\usepackage{color}
\title{Scribus-Latex-gregorio-File}
@@ -44,8 +46,49 @@ $scribus_additionalgreheaders$
\setlength{\textwidth}{$scribus_realwidth$ pt}
\begin{document}
$scribus_greconf$
+%%% BEGIN GABC %%%
</preamble>
- <postamble></postamble>
+ <postamble>]==========]
+require"lfs"
+
+local latexmkbin = "latexmk"
+local lualatexbin = "lualatex"
+
+local function basename(name)
+ return name and string.match(name,"^.+[/\\](.-)$") or name
+end
+
+local f = basename(arg[0])
+
+local texfile = io.open(f .. ".tex", "w")
+local gabcfile = io.open(f .. "-score.gabc", "w")
+local in_tex = true
+local l
+for l in string.gmatch(data_from_scribus, "[^\r\n]+") do
+ if l == "%%% BEGIN GABC %%%" then
+ in_tex = false
+ elseif in_tex then
+ texfile:write(l .. '\n')
+ else
+ gabcfile:write(l .. '\n')
+ end
+end
+
+local format = string.format
+
+texfile:write("\n\\gregorioscore[f]{" .. f .. "-score}\n\\end{document}\n")
+texfile:close()
+gabcfile:close()
+
+print("calling "..latexmkbin.."\n")
+os.exec({
+ latexmkbin,
+ '-g',
+ '-pdf',
+ '-pdflatex=' .. lualatexbin .. ' --interaction=nonstopmode --shell-escape',
+ f
+})
+</postamble>
<tab type="settings">
<title>
<i18n>
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am b/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am
index b25741fea45..c4c226cee14 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-2016 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
#
# This file is part of Gregorio.
#
@@ -17,4 +17,4 @@
SUBDIRS = TeXShop
-EXTRA_DIST = gprocess gabc.xml gabc.lang gabc.vim 900_gregorio.xml gregorio-scribus.lua gregorio.png gabc-syntax.plist README.md system-setup.command system-setup.bat config-texworks.command
+EXTRA_DIST = gprocess gabc.xml gabc.lang gabc.vim 900_gregorio.xml gregorio.png gabc-syntax.plist README.md system-setup.command system-setup.bat config-texworks.command checkSyllabation.py
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/README.md b/Build/source/texk/gregorio/gregorio-src/contrib/README.md
index c4e43da23f9..4372f39c6b0 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/README.md
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/README.md
@@ -20,20 +20,52 @@ under Windows).
* click `Add` in the `Render Frames`
* select the file `900_gregorio.xml`
-After that you can insert a render frame using Gregorio, and simply
+After that you can insert a render frame using Gregorio, and simply
typing gabc (`right-click->edit sources`).
For more details see [the website](http://home.gna.org/gregorio/scribus).
+## Syllabation checker
+
+The scripts in this folder allow to check the syllabation of a gabc score against syllabation rules that you must provide.
+
+#### Dependencies
+
+The main script, `checkSyllabation.py` is in Python3, so you obviously need it. It uses the [pyphen](http://pyphen.org/) package. You will also need the hyphenation of the text language in the `libhyphen` format in order to run it.
+
+If you want liturgical Latin hyphenation rules, you can pick those from the [hyphen-la](https://github.com/gregorio-project/hyphen-la) project. They are available in `libhyphen` format on the [webpage](http://gregorio-project.github.io/hyphen-la/).
+
+#### Running the scripts
+
+Once you have the hyphenation rules in the `libhyphen` format, you can check one score by running
+
+```
+checkSyllabation.py -p path/to/file.dic my_file.gabc
+```
+
+where `path/to/file.dic` is the path to the hyphenation rules file (default is `hyph_la_liturgical.dic` in the current directory). You can also analyze all gabc scores of a directory (with subdirectories) by replacing `my_file.gabc` by the name of the directory. By default, the script analyzes the current directory. The script outputs the report to `stdout` on Unix systems, and to `check-syllabation.log` on Windows systems.
+
+You can see more options by running
+
+```
+checkSyllabation.py --help
+```
+
+#### Hyphenation problems
+
+If you encounter problems of hyphenation, meaning you disagree with the proposed hyphenation, please contact the author of the hyphenation rules you are using ([here](https://github.com/gregorio-project/hyphen-la/issues) for `hyphen-la` for example).
+
+If you encounter problems because the script got confused by a gabc construct you are using or has bugs not directly related to hyphenation, please report it on the [gregorio tracker](https://github.com/gregorio-project/gregorio/issues).
+
## Kde editors (Kate, Kedit)
-You can use `gabc.xml` for syntax highlighting in kate (and Kedit, etc.). To
+You can use `gabc.xml` for syntax highlighting in kate (and Kedit, etc.). To
install it, copy the file in `/usr/share/apps/katepart/syntax`. This path
may vary according to your distribution.
## Gnome editors (Gedit)
-You can use `gabc.lang` for syntax highlighting in GtkSourceView (Gedit, etc.). To
+You can use `gabc.lang` for syntax highlighting in GtkSourceView (Gedit, etc.). To
install it, copy the file in `/usr/share/gtksourceview-3.0/language-specs`. This path
may vary according to your distribution.
@@ -45,7 +77,7 @@ To use gregorio in [Emacs](https://www.gnu.org/software/emacs/), see [this scrip
To get gabc syntax highlighting in [Vim](http://www.vim.org/):
- * copy `gabc.vim` in `/usr/share/vim/vimcurrent/syntax`
+ * copy `gabc.vim` in `/usr/share/vim/vimcurrent/syntax`
* add the line `au BufNewFile,BufRead *.gabc setf gabc`
somewhere near lines of the same type (near line 100 for example) in
`/usr/share/vim/vimcurrent/filetype.vim`. This will autodetect the filetypes.
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 7c96f2e89ec..9ca1bdb5f9d 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-2016 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
#
# This file is part of Gregorio.
#
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command
index f8751f86769..758b3d010c7 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command
@@ -30,44 +30,5 @@ else
exit 1
fi
-#Add 'gabc' to the list of file extensions which TeXShop knows
-TeXShopDir=`osascript -e 'POSIX path of (path to app "TeXShop")'`
-
-echo "Adding gabc to list of valid extensions in TeXShop"
-defaults write "$TeXShopDir/Contents/Info.plist" CFBundleDocumentTypes -array-add '<dict>
-<key>CFBundleTypeExtensions</key>
-<array>
-<string>gabc</string>
-</array>
-<key>CFBundleTypeName</key>
-<string>gabc</string>
-<key>CFBundleTypeOSTypes</key>
-<array>
-<string>GABC</string>
-</array>
-<key>CFBundleTypeRole</key>
-<string>Editor</string>
-<key>LSItemContentTypes</key>
-<array>
-<string>com.unknown.gabc</string>
-</array>
-<key>LSTypeIsPackage</key>
-<false/>
-<key>NSDocumentClass</key>
-<string>TSDocument</string>
-<key>NSPersistentStoreTypeKey</key>
-<string>Binary</string>
-</dict>'
-
-echo "Adding Gregorio file extensions to appropriate preference lists"
-#enable syntax coloring and the Typeset button for gabc files
-defaults write TeXShop OtherTeXExtensions -array-add "gabc"
-defaults write TeXShop OtherTeXExtensions -array-add "gtex"
-
-#Add gtex and gaux to the list of aux files deleted with Trash Aux Files
-defaults write TeXShop OtherTrashExtensions -array-add "gtex"
-defaults write TeXShop OtherTrashExtensions -array-add "gaux"
-defaults write TeXShop OtherTrashExtensions -array-add "glog"
-
echo "Configuration complete"
exit 0
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py b/Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py
new file mode 100644
index 00000000000..338ebf534a5
--- /dev/null
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py
@@ -0,0 +1,156 @@
+#! /usr/bin/env python3
+
+"""
+ A script to check the syllabation of a gabc file
+
+ See checkSyllabation.py -h for help
+
+ Copyright (C) 2016-2017 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
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+ Depends on pyphen: http://pyphen.org/
+ You also need the hyph_la_liturgical.dic file. To get it, get the
+ hyphen-la project on https://github.com/gregorio-project/hyphen-la
+ and run "make" in the "patterns" directory.
+
+"""
+
+import sys
+import re
+import argparse
+import pyphen
+import os
+import glob
+
+DEFAULT_OUTFILE = False
+if os.name == 'nt':
+ DEFAULT_OUTFILE = 'check-syllabation.log'
+
+def get_parser():
+ "Return command line parser"
+ parser = argparse.ArgumentParser(
+ description='A script to check the syllabation of gabc files')
+ parser.add_argument('-p', '--pat-path',
+ help='hyphenation pattern file',
+ action='store', default="hyph_la_liturgical.dic")
+ parser.add_argument('-o', '--outfile',
+ help='The file that will contain the report',
+ action='store', default=DEFAULT_OUTFILE)
+ parser.add_argument('-v', '--verbose',
+ help='Report also files without error',
+ action='store_true', default=False)
+ parser.add_argument('path',
+ help='Path to a gabc file or a directory containing gabc files',
+ action='store', default=".")
+ return parser
+
+def deacc(accstr):
+ return accstr.replace('á', 'a').replace('é', 'e').replace('í', 'i').replace('ó', 'o').replace('ú', 'u').replace('ý', 'y').replace('́', '').replace('ǽ', 'æ')
+
+def checkwords(words_list, hyphenator):
+ errors = []
+ for word in words_list:
+ initialword = deacc(word.lower())
+ if initialword.find('-') == -1:
+ # no need for noise
+ continue
+ correctword = hyphenator.inserted(initialword.replace('-',''))
+ if correctword != initialword:
+ errors.append( (initialword,correctword) )
+ return errors
+
+def get_words_list(gabc_content):
+ gabc_content = gabc_content.split('%%\n', 1)[1] # no headers
+ gabc_content = re.sub(r'%.*\n', '', gabc_content)
+ gabc_content = gabc_content.replace('\n', ' ').replace('\r', ' ').replace('{','')
+ gabc_content = gabc_content.replace('}','').replace('<sp>\'ae</sp>', 'ǽ')
+ gabc_content = gabc_content.replace('<sp>oe</sp>', 'œ').replace('<sp>\'oe</sp>', 'œ')
+ gabc_content = gabc_content.replace('<sp>ae</sp>', 'æ').replace('<sp>\'æ</sp>', 'ǽ')
+ gabc_content = gabc_content.replace('<sp>\'œ</sp>', 'œ')
+ gabc_content = re.sub(r'\([^\)]*\)', '-', gabc_content)
+ gabc_content = re.sub(r'<\/?[ibuec]>', '', gabc_content)
+ gabc_content = re.sub(r'<\/?sc>', '', gabc_content)
+ gabc_content = re.sub(r'<\/?eu>', '', gabc_content)
+ gabc_content = re.sub(r'<v>[^<]*<\/v>', '', gabc_content)
+ gabc_content = re.sub(r'<v>[^>]*<\/v>', '', gabc_content)
+ gabc_content = re.sub(r'<sp>[^>]*<\/sp>', '', gabc_content)
+ gabc_content = re.sub(r'<alt>[^>]*<\/alt>', '', gabc_content)
+ gabc_content = re.sub(r'\[[^\]]*\]', '', gabc_content)
+ gabc_content = re.sub(r'-+', '-', gabc_content)
+ gabc_content = re.sub(r'-?(\s+|$)', ' ', gabc_content)
+ gabc_content = re.sub(r'[^a-záéíóæúýœǽ\u0301 -]', '', gabc_content, flags=re.IGNORECASE)
+ gabc_content = re.sub(r'(^|\s+)-', ' ', gabc_content)
+ return gabc_content.split()
+
+def get_file_list(path):
+ if os.path.isfile(path):
+ return [path]
+ elif os.path.isdir(path):
+ files = glob.glob(os.path.join(path, '**/*.gabc'), recursive=True)
+ files = sorted(files)
+ return files
+ else:
+ print('Error! Cannot find '+path, file=sys.stderr)
+ sys.exit(1)
+
+def check_file(filepath, hyphenator, outfd, report_no_error=False):
+ words_list = []
+ with open(filepath, 'r', encoding='utf8') as inputf:
+ words_list = get_words_list(inputf.read())
+ errors = checkwords(words_list, hyphenator)
+ nb_errors = len(errors)
+ if nb_errors > 0 or report_no_error :
+ outfd.write('analyzing '+filepath+':\n')
+ if nb_errors == 0:
+ outfd.write(' no error!\n')
+ else:
+ for t in errors:
+ outfd.write(' '+t[0]+' should be '+t[1]+'\n')
+ outfd.write('\n')
+ return nb_errors
+
+def main():
+ "Main function"
+ parser = get_parser()
+ if len(sys.argv) == 1:
+ parser.print_help()
+ sys.exit(1)
+ args = parser.parse_args()
+ hyphenator = pyphen.Pyphen(filename=args.pat_path,left=1,right=1)
+ outfd = sys.stdout
+ if args.outfile != False:
+ outfd = open(args.outfile, 'w', encoding='utf8')
+ file_list = get_file_list(args.path)
+ nb_errors = 0
+ for f in file_list:
+ nb_errors += check_file(f, hyphenator, outfd, args.verbose)
+ if len(file_list) > 1 and nb_errors > 0:
+ outfd.write('Total errors: '+str(nb_errors)+'\n')
+ elif nb_errors == 0 and not args.verbose:
+ outfd.write('No error!\n')
+ if outfd is not sys.stdout:
+ outfd.close()
+ if nb_errors == 0:
+ sys.exit(0)
+ else:
+ sys.exit(2)
+
+if __name__ == "__main__":
+ main()
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang
index 08258507fc0..dd2c0cf216f 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 Elie Roux <elie.roux@telecom-bretagne.fr>
+ Copyright (C) 2008-2017 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 1c2c8101417..d00b413b5cb 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
@@ -15,7 +15,7 @@ syn match gabcBasicNote "[A-NP][01]\?" contained
syn match gabcAlteration "[\<\>~xy#vVwWqQR\-Ss\.+]" contained
syn match gabcAlteration "_[0-5]*" contained
syn match gabcAlteration "[oO'\.][01]\?" contained
-syn match gabcAlteration "r[0-5]\?" contained
+syn match gabcAlteration "r[0-8]\?" contained
syn match gabcClef "[cf]b\?[1-5]" contained
syn match gabcTextMarkup "</\?e>" contained
syn match gabcTextMarkup "</\?b>" contained
@@ -37,6 +37,9 @@ 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 gabcBracket "\[\[" contained
+syn match gabcBracket "\]\]" contained
syn region gabcComment start="%" end="$" keepend extend
syn region gabcAlt matchgroup=gabcTextMarkup start="<alt>" end="</alt>"
@@ -48,7 +51,7 @@ syn region gabcVerbatim matchgroup=gabcTextMarkup start="<v>" end="</v>"
syn region gabcNabc matchgroup=gabcNabcCut start="|" end="[|)]" keepend
syn cluster gabcFusible contains=gabcBasicNote,gabcAlteration,gabcBar,gabcSpace,
\gabcComment,gabcCommand,gabcNoteError,gabcFuse,
- \gabcTextOrNoteMarkup,gabcClef,gabcNabc
+ \gabcTextOrNoteMarkup,gabcClef,gabcNabc,gabcBracket
syn region gabcFuseGroup matchGroup=gabcFuseGroup start="@\[" end="\]"
\ contains=@gabcFusible,gabcFuseEnd contained keepend
syn region gabcNotes matchgroup=gabcNote start="(" end=")"
@@ -79,6 +82,7 @@ hi def link gabcCommand Type
hi def link gabcBar Special
hi def link gabcSpace Special
hi def link gabcNabcCut Delimiter
+hi def link gabcBracket Delimiter
hi def link gabcFuse Constant
hi def link gabcFuseGroup Constant
hi def link gabcFuseEnd Constant
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/gprocess b/Build/source/texk/gregorio/gregorio-src/contrib/gprocess
index 9136c66bc4b..a8f24092f1f 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 Richard Chonak <chonak@yahoo.com>
+# Copyright (C) 2008-2017 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/gregorio-scribus.lua b/Build/source/texk/gregorio/gregorio-src/contrib/gregorio-scribus.lua
deleted file mode 100644
index 540a40e40e1..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/contrib/gregorio-scribus.lua
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env texlua
---[[
-Gregorio/Scribus script.
-Copyright (C) 2010 Elie Roux <elie.roux@telecom-bretagne.eu>
-
-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
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-You must run this program with texlua, if possible under TeXLive 2010 (or later).
-This program allows gregorio to be integrated in Scribus.
---]]
-
-require"lfs"
-
-local gregoriobin = 'gregorio-4_2_0' -- FILENAME_VERSION
-local lualatexbin = "lualatex"
-
-local function basename(name)
- return name and string.match(name,"^.+[/\\](.-)$") or name
-end
-
-local f = arg[1]
-local dir = arg[2]
-local current = ""
-
--- first we need to rebuild the arguments that are lost in pieces
-for i, a in ipairs(arg) do
- if a:sub(1,1) == '"' then
- if a:sub(-1,-1) == '"' then
- current = a:sub(2, -2)
- if not f then
- f = current
- else
- dir = current
- end
- else
- current = a:sub(2, -1)
- end
- elseif a:sub(-1,-1) == '"' then
- current = current..' '..a:sub(1, -2)
- if not f then
- f = current
- else
- dir = current
- end
- current = ""
- else
- current = current..' '..a
- end
-end
-
-if dir then
- lfs.chdir(dir)
-end
-
-local pathbase = basename(f)
-
-local fd = io.open(f, "r")
-local texfile = io.open(f..".tex", "w")
-local gabcfile = io.open(f.."-score.gabc", "w")
-for l in fd:lines() do
- if string.match(l, "^\\") then
- texfile:write(l..'\n')
- elseif l=="\n" then
- else
- gabcfile:write(l..'\n')
- end
-end
-
-local format = string.format
-
-texfile:write(format("\n\\gregorioscore{%s-score.gtex}\n\\end{document}\n", pathbase))
-texfile:close()
-gabcfile:close()
-
-print(format("calling 'gregorio %s-score.gabc'\n", f))
-os.remove(format("%s-score.gtex", f))
-os.spawn(format("%s %s-score.gabc", gregoriobin, pathbase))
-if not lfs.isfile(format("%s-score.gtex", pathbase)) then
- print("error: gregorio did not work as expected\n")
- exit(1)
-end
-
-print(format("calling 'lualatex --interaction nonstopmode %s.tex'\n", pathbase))
-os.spawn(format("%s --interaction=nonstopmode %s.tex", lualatexbin, pathbase))
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
index f6d160cf1d2..effa1f772cb 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
@@ -96,6 +96,7 @@ gregoriotex-nabc.tex ^
gregoriotex-signs.tex ^
gregoriotex-spaces.tex ^
gregoriotex-syllable.tex ^
+gregoriotex-common.tex ^
gregoriotex-symbols.tex
for %%G in (%files%) do (
@@ -171,12 +172,24 @@ for %%G in (%files%) do (
:: Font Files
set files=greciliae.ttf ^
+greciliae-hollow.ttf ^
+greciliae-hole.ttf ^
greciliae-op.ttf ^
+greciliae-op-hollow.ttf ^
+greciliae-op-hole.ttf ^
greextra.ttf ^
gregorio.ttf ^
+gregorio-hollow.ttf ^
+gregorio-hole.ttf ^
gregorio-op.ttf ^
+gregorio-op-hollow.ttf ^
+gregorio-op-hole.ttf ^
granapadano.ttf ^
+granapadano-hollow.ttf ^
+granapadano-hole.ttf ^
granapadano-op.ttf ^
+granapadano-op-hollow.ttf ^
+granapadano-op-hole.ttf ^
gregall.ttf
for %%G in (%files%) do (
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 3af3263d72f..a26c8c31ba8 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
@@ -130,6 +130,7 @@ gregoriotex-spaces.tex
gregoriotex-syllable.tex
gregoriotex-symbols.lua
gregoriotex-symbols.tex
+gregoriotex-common.tex
gregoriotex.lua"
for f in $files
@@ -158,12 +159,24 @@ done
# Font Files
files="greciliae.ttf
+greciliae-hollow.ttf
+greciliae-hole.ttf
greciliae-op.ttf
+greciliae-op-hollow.ttf
+greciliae-op-hole.ttf
greextra.ttf
gregorio.ttf
+gregorio-hollow.ttf
+gregorio-hole.ttf
gregorio-op.ttf
+gregorio-op-hollow.ttf
+gregorio-op-hole.ttf
granapadano.ttf
+granapadano-hollow.ttf
+granapadano-hole.ttf
granapadano-op.ttf
+granapadano-op-hollow.ttf
+granapadano-op-hole.ttf
gregall.ttf"
for f in $files