Merge branch 'develop'

CHANGELOG.md

@@ -2,6 +2,12 @@
 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][CTAN]
+### Fixed
+- Project names with quotes in them no longer cause GregorioTeX to not be able to find the executable.  See [#1416](https://github.com/gregorio-project/gregorio/issues/1416).
+- Eliminated implicit casting from float to integer in string formatting (something no longer allowed in Lua 5.3)
+
+
 ## [5.2.0] - 2019-03-10
 ### Fixed
 - `latin` is now supported as a valid language name.  This brings Latin into line with other languages where both titlecased and lowercased version of the language name (e.g. `English` and `english`) are both allowed.

contrib/system-setup.bat

@@ -198,7 +198,7 @@ for %%G in (%files%) do (
 		set loc=%%H
 		set loc=!loc:/=\!
 		echo !loc! >> %output%
-		otfinfo --font-version !loc! >> %output% 2>&1
+		otfinfo --font-version "!loc!" >> %output% 2>&1
 	)
 )
 

doc/Command_Index_User.tex

@@ -938,9 +938,9 @@ \subsubsection{Text Alignment}
   & \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.
+\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 Latin, English, Church Slavonic and Hungarian.  Polish, Czech, and Slovak are supported as aliases for Church Slavonic.  Furthermore 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.
 
-You can also define your own languages in \texttt{gregorio-vowels.dat}.  If you do define a language, please consider sharing your work by submitting it to the project (see CONTRIBUTING.md for instructions).
+You can also define your own languages in \texttt{gregorio-vowels.dat} (see \nameref{customvowels} for details).  If you do define a language, please consider sharing your work by submitting it to the project (see CONTRIBUTING.md for instructions).
 
 Finally, in cases where you want some sort of exceptional alignment, you can force Gregorio to consider a particular part of the syllable to be the ``vowel'' by enclosing it in curly braces (``\{'' and ``\}'') in your gabc file.  Curly braces only affect alignment when using vowel centering.  Syllable centering will always use the entire syllable, and firstletter centering will always use the first character of the syllable --- regardless of curly braces in the gabc file.
 
@@ -1366,7 +1366,7 @@ \subsubsection{Ancient Notation}
 Macro to set the font to be used for the ancient notation.
 
 \begin{argtable}
-  \#1 & string & the name of the font\\
+  \#1 & string & the name of the font, either \texttt{gregall}, \texttt{grelaon}, or \texttt{gresgmodern}\\
   \#2 & integer & point size at which the font should be loaded\\
 \end{argtable}
 

doc/Gabc.tex

@@ -388,6 +388,8 @@ \subsubsection{Vowel Detection}\label{voweldetection}
 
 If you are using a language for which built-in language rules do not exist and the fallbacks are insufficient, then you may wish to provide your own set of vowel detection rules.  This can be done with a special file:\verb=gregorio-vowels.dat=.  See \nameref{customvowels} for information about how to create and use this file.
 
+Languages which are currently supported are Latin, English, Church Slavonic and Hungarian.  Polish, Czech, and Slovak are supported as aliases for Church Slavonic.  All of these languages can be specified by name (in which case both titlecase and lowercase names are recognized) and by using their ISO 639 (-1 two-letter, -2/T three-letter, or -2/B three-letter) standard abbreviations.
+
 
 \subsection{Notation --- Note Syntax}\label{notesyntax}
 
@@ -1101,6 +1103,8 @@ \subsection{Vowel file}\label{customvowels}
 enclosed in square brackets, and a semicolon.  The language specified
 applies until the next language statement.
 
+When choosing the name for your language, it is preferable that you use the ISO 639-1 standard (two-letter) code.  All other names should be listed as aliases (see above).  If you plan to submit your vowel detection rules for inclusion in the Gregorio source, then this will be required.
+
 \item[vowel]
 
 The \texttt{vowel} keyword indicates that the characters which follow,
@@ -1138,9 +1142,11 @@ \subsection{Vowel file}\label{customvowels}
 By way of example, here is a vowel file that works for English:
 
 \begin{lstlisting}[autogobble]
-alias [english] to [English];
+alias [english] to [en];
+alias [English] to [en];
+alias [eng] to [en];
 
-language [English];
+language [en];
 
 vowel aàáAÀÁ;
 vowel eèéëEÈÉË;

tex/gregoriotex.lua

@@ -147,13 +147,13 @@ local function gregorio_exe()
 
     -- first look for one with the exact version
     real_gregorio_exe = 'gregorio-5_2_0' -- FILENAME_VERSION
-    local cmd = string.format("%s -o %%s %s", real_gregorio_exe,
+    local cmd = string.format([[%s -o "%%s" "%s"]], real_gregorio_exe,
         test_snippet_filename)
     exe_version = get_prog_output(cmd, '*line')
     if not exe_version then
       -- look for suffix-less executable
       real_gregorio_exe = 'gregorio'
-      cmd = string.format("%s -o %%s %s", real_gregorio_exe,
+      cmd = string.format([[%s -o "%%s" "%s"]], real_gregorio_exe,
           test_snippet_filename)
       exe_version = get_prog_output(cmd, '*line')
     end
@@ -547,7 +547,7 @@ local function post_linebreak(h, groupcode, glyphes)
         h, line = remove(h, line)
       else
         linenum = linenum + 1
-        debugmessage('linesglues', 'line %d: %s factor %d%%', linenum, glue_sign_name[line.glue_sign], line.glue_set*100)
+        debugmessage('linesglues', 'line %d: %s factor %.0f%%', linenum, glue_sign_name[line.glue_sign], line.glue_set*100)
         centerstartnode = nil
         line_id = nil
         line_top = nil
@@ -932,7 +932,7 @@ local function direct_gabc(gabc, header, allow_deprecated)
   gabc = gabc:match('^()%s*$') and '' or gabc:match('^%s*(.*%S)')
   f:write('name:direct-gabc;\n'..(header or '')..'\n%%\n'..gabc:gsub('\\par ', '\n'))
   f:close()
-  local cmd = string.format('%s -W %s-o %%s -l %s %s', gregorio_exe(),
+  local cmd = string.format([[%s -W %s-o "%%s" -l "%s" "%s"]], gregorio_exe(),
       deprecated, snippet_logname, snippet_filename)
   local content = get_prog_output(cmd, '*a')
   if content == nil then