diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2019-03-11 02:46:28 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2019-03-11 02:46:28 +0000 |
commit | 190843e0851a6cffe6200e6f82cc225edee5e614 (patch) | |
tree | 63f27aa5fec3ed83dbc0e2f69ba362c36632dc1f /Build/source/texk/gregorio/gregorio-src/contrib | |
parent | bc959f8f9b7a7ef699a545b87849888db1cff00a (diff) |
gregorio-5.2.0
git-svn-id: svn://tug.org/texlive/trunk@50335 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/gregorio/gregorio-src/contrib')
10 files changed, 76 insertions, 92 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 ca392d0c794..edd28c2682d 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-2018 The Gregorio Project (see CONTRIBUTORS.md) + Copyright (C) 2015-2019 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 @@ -22,73 +22,42 @@ See the different comments in the file to change the default configuration. --> <editorsettings description="gregorio" icon="gregorio.png"> - <executable command="texlua"/> + <executable command="lualatex --shell-escape --interaction nonstopmode" /> <imagefile extension=".pdf"/> <highlighter> <rule name="gabc header" regex="[a-zA-Z]+:" color="blue" minimal="true"/> <rule name="gabc delimiter" regex="%%" color="green" minimal="true"/> <rule name="gabc notes" regex="\([^)]*\)" color="red" minimal="true"/> </highlighter> - <empty-frame-text>name: myscore; -%% -(c3) Pó(eh/hi)pu(h)lus(h) Si(hi)on,(hgh.) + <empty-frame-text> + name: myscore; + %% + (c3) Pó(eh/hi)pu(h)lus(h) Si(hi)on,(hgh.) </empty-frame-text> - <!-- you can change the basic headers there --> - <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} -$scribus_additionalgreheaders$ -\usepackage{gregoriotex} -\author{Scribus} -\pagestyle{empty} -\setlength{\textwidth}{$scribus_realwidth$ pt} -\begin{document} -$scribus_greconf$ -%%% BEGIN GABC %%% -</preamble> - <postamble>]==========] -require"lfs" + <!-- 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} + \usepackage[autocompile]{gregoriotex} + \usepackage{filecontents} + \title{Scribus-Latex-File} + $scribus_additionalgreheaders$ + \author{Scribus} + \pagestyle{empty} + \setlength{\textwidth}{$scribus_realwidth$ pt} -local latexmkbin = "latexmk" -local lualatexbin = "lualatex" + \begin{filecontents}{scribus_file-score.gabc} + </preamble> + <postamble> + \end{filecontents} -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> + \begin{document} + $scribus_greconf$ + \gregorioscore{scribus_file-score} + \end{document} + </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 0b5dec22ed7..5cabdb95d3b 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-2018 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2019 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 ce57b1329db..ff4d5272046 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-2018 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2019 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 065871932ee..58f1df2e959 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 @@ -21,23 +21,38 @@ if [ ! -d "$ENGINEDIR" ]; then exit 1 fi SOURCE="/Users/Shared/Gregorio/contrib/TeXShop/LuaLaTeX+se.engine" -if [ -e "$SOURCE" ]; then - echo "Copying LuaLaTeX+se.engine into TeXShop configuration" - cp "$SOURCE" "$ENGINEDIR" -else - echo "Cannot find LuaLaTeX+se.engine" - echo "Please try running the Gregorio intaller again" - exit 1 +if [ ! -e "$SOURCE" ]; then + SOURCE="$PWD/LuaLaTeX+se.engine" + if [ ! -e "$SOURCE" ]; then + DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" + SOURCE="$DIR/LuaLaTeX+se.engine" + else + echo "Cannot find LuaLaTeX+se.engine" + echo "Please try running the Gregorio intaller again" + exit 1 + fi fi +echo "Copying LuaLaTeX+se.engine into TeXShop configuration" +cp "$SOURCE" "$ENGINEDIR" + SOURCE="/Users/Shared/Gregorio/contrib/TeXShop/LuaTeX+se.engine" -if [ -e "$SOURCE" ]; then - echo "Copying LuaTeX+se.engine into TeXShop configuration" - cp "$SOURCE" "$ENGINEDIR" -else - echo "Cannot find LuaTeX+se.engine" - echo "Please try running the Gregorio intaller again" - exit 1 +if [ ! -e "$SOURCE" ]; then + SOURCE="$PWD/LuaTeX+se.engine" + if [ ! -e "$SOURCE" ]; then + DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" + SOURCE="$DIR/LuaTeX+se.engine" + else + echo "Cannot find LuaTeX+se.engine" + echo "Please try running the Gregorio intaller again" + exit 1 + fi fi +echo "Copying LuaTeX+se.engine into TeXShop configuration" +cp "$SOURCE" "$ENGINEDIR" + +#double check the execution bits +chmod +x "$ENGINEDIR/LuaLaTeX+se.engine" +chmod +x "$ENGINEDIR/LuaTeX+se.engine" 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 index 269fb8774e8..8fcd6431af4 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-2018 Elie Roux + Copyright (C) 2016-2019 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 7d6c3791ce6..eda2860a718 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-2018 Elie Roux <elie.roux@telecom-bretagne.fr> + Copyright (C) 2008-2019 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 e2a01e0c266..3d15f41c055 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim +++ b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim @@ -11,11 +11,11 @@ syn match gabcAttributeName /^[^:]*:/ syn match gabcAttributeEnd ";" syn match gabcNoteError "." contained syn match gabcBasicNote "[a-np]" contained -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-8]\?" contained +syn match gabcBasicNote "[A-NP][012]\?" contained +syn match gabcNoteShape "[\<\>~xy#vVwWqQR\-Ss\.+]" 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 "</\?e>" contained syn match gabcTextMarkup "</\?b>" contained @@ -32,7 +32,7 @@ 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 gabcSpace "[! ]" contained syn match gabcSpace "/0\?" contained syn match gabcSpace "z[-+0]\?" contained @@ -51,7 +51,7 @@ syn region gabcSpecial matchgroup=gabcTextMarkup start="<sp>" end="</sp>" syn region gabcVerbatim matchgroup=gabcTextMarkup start="<v>" end="</v>" \ contained syn region gabcNabc matchgroup=gabcNabcCut start="|" end="[|)]" keepend -syn cluster gabcFusible contains=gabcBasicNote,gabcAlteration,gabcBar,gabcSpace, +syn cluster gabcFusible contains=gabcBasicNote,gabcNoteShape,gabcBar,gabcSpace, \gabcComment,gabcCommand,gabcNoteError,gabcFuse, \gabcTextOrNoteMarkup,gabcClef,gabcNabc,gabcBracket syn region gabcFuseGroup matchGroup=gabcFuseGroup start="@\[" end="\]" @@ -79,7 +79,7 @@ hi def link gabcVerbatim Constant hi def link gabcAlt Constant hi def link gabcClef Statement hi def link gabcBasicNote Statement -hi def link gabcAlteration PreProc +hi def link gabcNoteShape PreProc hi def link gabcCommand Type hi def link gabcBar Special hi def link gabcSpace Special diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/gprocess b/Build/source/texk/gregorio/gregorio-src/contrib/gprocess index 271714295a3..205acd7540e 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-2018 Richard Chonak <chonak@yahoo.com> +# Copyright (C) 2008-2019 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.bat b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat index 88095de511d..283553adfb4 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat +++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat @@ -105,7 +105,7 @@ for %%G in (%files%) do ( set loc=%%H
set loc=!loc:/=\!
echo !loc! >> %output%
- for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" !loc!') do set ver=%%I
+ for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" "!loc!"') do set ver=%%I
set ver=!ver:*{=!
set ver=!ver:*{=!
set trash=}!ver:*}=!
@@ -126,7 +126,7 @@ for %%G in (%files%) do ( set loc=%%H
set loc=!loc:/=\!
echo !loc! >> %output%
- for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" !loc!') do set ver=%%I
+ for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" "!loc!"') do set ver=%%I
set ver=!ver:*N =!
echo !ver! >> %output% 2>&1
set ver=
@@ -142,7 +142,7 @@ for %%G in (%files%) do ( set loc=%%H
set loc=!loc:/=\!
echo !loc! >> %output%
- for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" !loc!') do set ver=%%I
+ for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" "!loc!"') do set ver=%%I
set ver=!ver:*'=!
set trash='!ver:*'=!
call set ver=%%ver:!trash!=%%
@@ -161,7 +161,7 @@ for %%G in (%files%) do ( set loc=%%H
set loc=!loc:/=\!
echo !loc! >> %output%
- for /f "delims=" %%I in ('findstr /r "PARSE_VERSION_DATE_LTX" !loc!') do set ver=%%I
+ for /f "delims=" %%I in ('findstr /r "PARSE_VERSION_DATE_LTX" "!loc!"') do set ver=%%I
set ver=!ver:*v=!
set trash=G!ver:*G=!
call set ver=%%ver:!trash!=%%
@@ -240,7 +240,7 @@ echo Please save the file to a convenient location and email it to echo gregorio-users@googlegroups.com as part of your bug report.
echo.
echo You can also create an issue at
-echo http://github.org/gregorio-project/gregorio/issues
+echo http://github.com/gregorio-project/gregorio/issues
echo and copy-paste the content of this file into the description.
echo.
pause
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 3617d53802a..13fe833be6a 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command +++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command @@ -225,7 +225,7 @@ echo "ran this script. Please email it to gregorio-users@googlegroups.com as" echo "part of your bug report." echo "" echo "You can also create an issue at " -echo "http://github.org/gregorio-project/gregorio/issues" +echo "http://github.com/gregorio-project/gregorio/issues" echo "and copy-paste the content of this file into the description." echo "" exit 0 |