diff options
Diffstat (limited to 'Build/source/texk/gregorio/gregorio-src/contrib')
9 files changed, 237 insertions, 104 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 72d9c438f28..a3855195bcf 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml +++ b/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml @@ -1,6 +1,5 @@ <?xml version="1.0"?> <!-- - XML file for using gregorio inside scribus. Copyright (C) 2009 Pierre Couderc <pierre@couderc.eu>. @@ -22,21 +21,19 @@ --> <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"'/> - <imagefile extension=".pdf"/> - <highlighter> + <executable command='texlua /usr/share/scribus/editorconfig/gregorio-scribus.lua "%file" "%dir"'/> + <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; + </highlighter> + <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> -\documentclass[a4paper,$scribus_grefontsize$]{extarticle} + <preamble>\documentclass[a4paper,$scribus_grefontsize$]{extarticle} \usepackage[left=0cm,top=0cm,right=0cm,bottom=0cm,nohead,nofoot]{geometry} \usepackage{color} \title{Scribus-Latex-gregorio-File} @@ -48,48 +45,55 @@ $scribus_additionalgreheaders$ \begin{document} $scribus_greconf$ </preamble> -<postamble> -</postamble> - <tab type="settings"> - <title><i18n> - <en>Headers</en> - <fr>En-tête</fr> - </i18n></title> - <list name="grefontsize" default="11pt"> - <title><i18n> - <en>Fontsize:</en> - <de>Schriftgröße:</de> - <fr>Taille police :</fr> - <pl>Stopień pisma:</pl> - <ru>Кегль шрифт:</ru> - </i18n></title> - <option value="8pt">8pt</option> - <option value="9pt">9pt</option> - <option value="10pt">10pt</option> - <option value="11pt">11pt</option> - <option value="12pt">12pt</option> - <option value="14pt">14pt</option> - <option value="17pt">17pt</option> - <option value="20pt">20pt</option> - </list> - <text name="additionalgreheaders" type="long" default="\usepackage[utf8]{luainputenc} -\usepackage[T1]{fontenc} -\usepackage{times}"><i18n> - <en>Additional LaTeX Headers:</en> - <de>Zusätzliche LaTeX Header:</de> - <fr>En-tête LaTeX additionnel :</fr> - </i18n></text> - </tab> - <tab type="settings"> - <title><i18n> - <en>Gregorio Options</en> - <fr>Conf. gregorio</fr> - </i18n></title> - <comment><i18n> - <en>Input here your additional gregorio-specific TeX commands. -</en><fr>Ajoutez ici vos commandes additionelles pour GregorioTeX. -</fr> - </i18n></comment> + <postamble></postamble> + <tab type="settings"> + <title> + <i18n> + <en>Headers</en> + <fr>En-tête</fr> + </i18n> + </title> + <list name="grefontsize" default="11pt"> + <title> + <i18n> + <en>Fontsize:</en> + <de>Schriftgröße:</de> + <fr>Taille police :</fr> + <pl>Stopień pisma:</pl> + <ru>Кегль шрифт:</ru> + </i18n> + </title> + <option value="8pt">8pt</option> + <option value="9pt">9pt</option> + <option value="10pt">10pt</option> + <option value="11pt">11pt</option> + <option value="12pt">12pt</option> + <option value="14pt">14pt</option> + <option value="17pt">17pt</option> + <option value="20pt">20pt</option> + </list> + <text name="additionalgreheaders" type="long" default="\usepackage{fontspec} +\usepackage{libertine}"> + <i18n> + <en>Additional LaTeX Headers:</en> + <de>Zusätzliche LaTeX Header:</de> + <fr>En-tête LaTeX additionnel :</fr> + </i18n> + </text> + </tab> + <tab type="settings"> + <title> + <i18n> + <en>Gregorio Options</en> + <fr>Conf. gregorio</fr> + </i18n> + </title> + <comment> + <i18n> + <en>Input here your additional gregorio-specific TeX commands.</en> + <fr>Ajoutez ici vos commandes additionelles pour GregorioTeX.</fr> + </i18n> + </comment> <text name="greconf" type="long" default="\grechangestaffsize{17}"></text> - </tab> + </tab> </editorsettings> diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am b/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am index fbccca9ca49..b25741fea45 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-2015 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2016 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 ea3b5da6edd..7c96f2e89ec 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-2015 The Gregorio Project (see CONTRIBUTORS.md) +# Copyright (C) 2006-2016 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 2d7dd523527..f8751f86769 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 @@ -62,10 +62,12 @@ defaults write "$TeXShopDir/Contents/Info.plist" CFBundleDocumentTypes -array-ad 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/config-texworks.command b/Build/source/texk/gregorio/gregorio-src/contrib/config-texworks.command index 26f9ef6825d..2101b5ea75d 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/config-texworks.command +++ b/Build/source/texk/gregorio/gregorio-src/contrib/config-texworks.command @@ -82,7 +82,7 @@ while read line; do cleanup=true else if $cleanup; then - echo "cleanup-patterns: \$jobname.gaux *-*_*_*.gtex" >> "$CONFIG" + echo "cleanup-patterns: \$jobname.gaux \$jobname.glog *-*_*_*.gtex" >> "$CONFIG" cleanup=false fi fi diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim index cb8b08b7f40..1c2c8101417 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim +++ b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim @@ -10,7 +10,8 @@ endif syn match gabcAttributeName /^[^:]*:/ syn match gabcAttributeEnd ";" syn match gabcNoteError "." contained -syn match gabcBasicNote "[a-npA-NP]" 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 @@ -37,7 +38,7 @@ syn match gabcSpace "Z[-+]\?" contained syn match gabcSpace "/\[[^\]]*\]" contained extend syn match gabcCommand "@\@<!\[[^\]]*\]" contained extend -syn region gabcComment start="%" end="$" contained keepend extend +syn region gabcComment start="%" end="$" keepend extend syn region gabcAlt matchgroup=gabcTextMarkup start="<alt>" end="</alt>" \ contained syn region gabcSpecial matchgroup=gabcTextMarkup start="<sp>" end="</sp>" @@ -45,13 +46,13 @@ 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 gabcFusable contains=gabcBasicNote,gabcAlteration,gabcBar,gabcSpace, +syn cluster gabcFusible contains=gabcBasicNote,gabcAlteration,gabcBar,gabcSpace, \gabcComment,gabcCommand,gabcNoteError,gabcFuse, \gabcTextOrNoteMarkup,gabcClef,gabcNabc syn region gabcFuseGroup matchGroup=gabcFuseGroup start="@\[" end="\]" - \ contains=@gabcFusable,gabcFuseEnd contained keepend + \ contains=@gabcFusible,gabcFuseEnd contained keepend syn region gabcNotes matchgroup=gabcNote start="(" end=")" - \ contains=@gabcFusable,gabcFuseGroup contained keepend + \ contains=@gabcFusible,gabcFuseGroup contained keepend syn region gabcTranslation matchgroup=gabcTextMarkup start="\[" end="\]" \ contained extend syn region gabcText start="^\(%%\)\@=" end="\%$" diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/gregorio-scribus.lua b/Build/source/texk/gregorio/gregorio-src/contrib/gregorio-scribus.lua index 0bc11aa7b1c..540a40e40e1 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/gregorio-scribus.lua +++ b/Build/source/texk/gregorio/gregorio-src/contrib/gregorio-scribus.lua @@ -22,7 +22,7 @@ This program allows gregorio to be integrated in Scribus. require"lfs" -local gregoriobin = 'gregorio' +local gregoriobin = 'gregorio-4_2_0' -- FILENAME_VERSION local lualatexbin = "lualatex" local function basename(name) 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 0d10be99261..f6d160cf1d2 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat +++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat @@ -1,5 +1,5 @@ @echo off
-SETLOCAL ENABLEEXTENSIONS
+SETLOCAL ENABLEEXTENSIONS EnableDelayedExpansion
set output="%TEMP%\system-setup.log"
@@ -79,49 +79,134 @@ echo. >> %output% echo. >> %output%
echo ### Gregorio Setup >> %output%
-echo #### Version >> %output%
-echo. >> %output%
-gregorio -V >> %output% 2>&1
-echo. >> %output%
-echo #### Location >> %output%
-echo. >> %output%
-@for %%e in (%PATHEXT%) do @for %%i in (gregorio%%e) do @if NOT "%%~$PATH:i"=="" echo %%~$PATH:i >> %output% 2>&1
-echo. >> %output%
+echo #### Locations and Versions >> %output%
+for /f "delims=" %%G in ('where /f gregorio*') do (
+ echo %%G >> %output%
+ for /f "delims=" %%H in ('%%G -V') do echo %%H >> %output% 2>&1
+ echo. >> %output%
+)
echo #### GregorioTeX Locations >> %output%
echo. >> %output%
-set files=gregorio-vowels.dat ^
-gregoriosyms.sty ^
+:: Files using GREGORIO_VERSION in {}
+set files=gregoriosyms.sty ^
gregoriotex-chars.tex ^
gregoriotex-main.tex ^
-gregoriotex-ictus.tex ^
-gregoriotex-nabc.lua ^
gregoriotex-nabc.tex ^
-gregoriotex-signs.lua ^
gregoriotex-signs.tex ^
gregoriotex-spaces.tex ^
gregoriotex-syllable.tex ^
-gregoriotex-symbols.lua ^
-gregoriotex-symbols.tex ^
-gregoriotex.lua ^
-gregoriotex.sty ^
-gregoriotex.tex ^
-gsp-default.tex ^
-greciliae.ttf ^
+gregoriotex-symbols.tex
+
+for %%G in (%files%) do (
+ echo ##### %%G >> %output%
+ for /f "delims=" %%H in ('kpsewhich -all %%G') do (
+ set loc=%%H
+ set loc=!loc:/=\!
+ echo !loc! >> %output%
+ for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" !loc!') do set ver=%%I
+ set ver=!ver:*{=!
+ set ver=!ver:*{=!
+ set trash=}!ver:*}=!
+ call set ver=%%ver:!trash!=%%
+ echo !ver! >> %output% 2>&1
+ set ver=
+ )
+)
+
+:: Files using GREGORIO_VERSION in spaces
+set files=gregoriotex-nabc.lua ^
+gregoriotex-signs.lua ^
+gregoriotex-symbols.lua
+
+for %%G in (%files%) do (
+ echo ##### %%G >> %output%
+ for /f "delims=" %%H in ('kpsewhich -all %%G') do (
+ set loc=%%H
+ set loc=!loc:/=\!
+ echo !loc! >> %output%
+ 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=
+ )
+)
+
+:: Files using GREGORIO_VERSION in ''
+set files=gregoriotex.lua
+
+for %%G in (%files%) do (
+ echo ##### %%G >> %output%
+ for /f "delims=" %%H in ('kpsewhich -all %%G') do (
+ set loc=%%H
+ set loc=!loc:/=\!
+ echo !loc! >> %output%
+ 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!=%%
+ echo !ver! >> %output% 2>&1
+ set ver=
+ )
+)
+
+:: Files using PARSE_VERSION_DATE_LTX
+set files=gregoriotex.sty ^
+gregoriotex.tex
+
+for %%G in (%files%) do (
+ echo ##### %%G >> %output%
+ for /f "delims=" %%H in ('kpsewhich -all %%G') 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
+ set ver=!ver:*v=!
+ set trash=G!ver:*G=!
+ call set ver=%%ver:!trash!=%%
+ echo !ver! >> %output% 2>&1
+ set ver=
+ )
+)
+
+:: Font Files
+set files=greciliae.ttf ^
greciliae-op.ttf ^
greextra.ttf ^
gregorio.ttf ^
gregorio-op.ttf ^
-gresym.ttf ^
granapadano.ttf ^
granapadano-op.ttf ^
-gregall.ttf ^
+gregall.ttf
+
+for %%G in (%files%) do (
+ echo ##### %%G >> %output%
+ for /f "delims=" %%H in ('kpsewhich -all %%G') do (
+ set loc=%%H
+ set loc=!loc:/=\!
+ echo !loc! >> %output%
+ otfinfo --font-version !loc! >> %output% 2>&1
+ )
+)
+
+:: Unversioned and Obsolete Files
+set files=gregorio-vowels.dat ^
+gsp-default.tex ^
+gregoriotex-ictus.tex ^
+gresym.ttf ^
+parmesan.ttf ^
+parmesan-op.ttf ^
gregsmodern.ttf
for %%G in (%files%) do (
echo ##### %%G >> %output%
- kpsewhich -all %%G >> %output% 2>&1
+ for /f "delims=" %%H in ('kpsewhich -all %%G') do (
+ set loc=%%H
+ set loc=!loc:/=\!
+ echo !loc! >> %output%
+ )
)
+
echo. >> %output%
echo #### kpsewhich --all -engine luatex -progname lualatex gregoriotex.sty >> %output%
kpsewhich --all -engine luatex -progname lualatex gregoriotex.sty >> %output% 2>&1
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 65f313de668..3af3263d72f 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command +++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command @@ -107,22 +107,21 @@ echo "" >> $OUTPUT echo "" >> $OUTPUT echo "### Gregorio Setup" >> $OUTPUT -echo "#### Version" >> $OUTPUT -echo "" >> $OUTPUT -gregorio -V >> $OUTPUT 2>&1 -echo "" >> $OUTPUT -echo "#### Location" >> $OUTPUT -echo "" >> $OUTPUT -which -a gregorio >> $OUTPUT 2>&1 +echo "#### Locations and Versions" >> $OUTPUT echo "" >> $OUTPUT +progs=`compgen -cbka -A function 'gregorio'` +for prog in $progs; do + which -a $prog >> $OUTPUT 2>&1 + $prog -V >> $OUTPUT 2>&1 + echo "" >> $OUTPUT +done echo "#### GregorioTeX Locations" >> $OUTPUT echo "" >> $OUTPUT -files="gregorio-vowels.dat -gregoriosyms.sty +# Files using GREGORIO_VERSION +files="gregoriosyms.sty gregoriotex-chars.tex gregoriotex-main.tex -gregoriotex-ictus.tex gregoriotex-nabc.lua gregoriotex-nabc.tex gregoriotex-signs.lua @@ -131,19 +130,59 @@ gregoriotex-spaces.tex gregoriotex-syllable.tex gregoriotex-symbols.lua gregoriotex-symbols.tex -gregoriotex.lua -gregoriotex.sty -gregoriotex.tex -gsp-default.tex -greciliae.ttf +gregoriotex.lua" + +for f in $files +do + echo "##### $f" >> $OUTPUT + locations=`kpsewhich -all $f` + for loc in $locations; do + echo $loc >> $OUTPUT 2>&1 + grep -m 1 'GREGORIO_VERSION' $loc | grep -o '[0-9]*\.[0-9]*\.[0-9]*-*[betarc]*[0-9]*' >> $OUTPUT 2>&1 + done +done + +# Files using PARSE_VERSION_DATE_LTX +files="gregoriotex.sty +gregoriotex.tex" + +for f in $files +do + echo "##### $f" >> $OUTPUT + locations=`kpsewhich -all $f` + for loc in $locations; do + echo $loc >> $OUTPUT 2>&1 + grep -m 1 'PARSE_VERSION_DATE_LTX' $loc | grep -o '[0-9]*\.[0-9]*\.[0-9]*-*[betarc]*[0-9]*' >> $OUTPUT 2>&1 + done +done + +# Font Files +files="greciliae.ttf greciliae-op.ttf greextra.ttf gregorio.ttf gregorio-op.ttf -gresym.ttf granapadano.ttf granapadano-op.ttf -gregall.ttf +gregall.ttf" + +for f in $files +do + echo "##### $f" >> $OUTPUT + locations=`kpsewhich -all $f` + for loc in $locations; do + echo $loc >> $OUTPUT 2>&1 + otfinfo --font-version $loc >> $OUTPUT 2>&1 + done +done + +# Unversioned and Obsolete Files +files="gregorio-vowels.dat +gsp-default.tex +gregoriotex-ictus.tex +gresym.ttf +parmesan.ttf +parmesan-op.ttf gregsmodern.ttf" for f in $files @@ -152,11 +191,13 @@ do kpsewhich -all $f >> $OUTPUT 2>&1 done + echo "" >> $OUTPUT -echo "#### kpsewhich --all -engine luatex -progname lualatex gregoriotex.sty" >> $OUTPUT +echo "### LuaTeX Double Checks" >> $OUTPUT +echo "#### kpsewhich --all -engine luatex -progname lualatex gregoriotex.sty" >> $OUTPUT kpsewhich --all -engine luatex -progname lualatex gregoriotex.sty >> $OUTPUT 2>&1 echo "" >> $OUTPUT -echo "#### kpsewhich --all -engine luatex gregoriotex.tex" >> $OUTPUT +echo "#### kpsewhich --all -engine luatex gregoriotex.tex" >> $OUTPUT kpsewhich --all -engine luatex gregoriotex.tex >> $OUTPUT 2>&1 echo "" >> $OUTPUT echo "" >> $OUTPUT |