Merge pull request #79 from MRoth1910/master

update psalmtone.js

faq.html

@@ -93,12 +93,22 @@ <h2 id="psalmtone"><a href="psalmtone.html">Psalm Tone Tool</a></h2>
 <div class="question">What about the other things in the upper-left quadrant?</div>
 <div class="answer">The clef box can be used to set the position of the clef.  It will shift the chant along with the clef, so if you want to change the clef without shifting the chant, you will have to change it in the GABC box just above the preview of the chant.</div>
 <div class="question">What are the rules for the Psalm GABC box just below the clef box?</div>
-<div class="answer">This is just the GABC for each verse of the psalm.  The first line is the mediant, and the second line is the termination.  The neumes that belong over accented syllables are prefixed by an apostrophe and the dominant is marked as a punctum cavum, with an r.  You can store custom tones by using the "Create new tone" button, and they will be stored locally, and thus persist across sessions, but will only be available on your current computer.</div>
+<div class="answer">This is just the GABC for each verse of the psalm.  The first line is the mediant, and the second line is the termination.  The neumes that belong over accented syllables are prefixed by an apostrophe and the dominant is marked as a punctum cavum, with an r. (This does not affect the punctum cavum needed for extra syllables, which may or may not have an attached syllable in the first verse of the GABC.) You can store custom tones by using the "Create new tone" button, and they will be stored locally, and thus persist across sessions, but will only be available on your current computer.</div>
 <div class="question">How does the format verses part work?</div>
 <div class="answer"><p>This is where certain aspects of the textual part of the output can be adjusted.  If the name of the selected format has GABC in it, all verses will be output in GABC notation.  Otherwise, all but the first and sometimes second verse will be formatted text with no GABC.  Also, you can adjust the settings for the first verse by selecting GABC and changing the settings on the right side, and then selecting the format that you actually want to use for the subsequent verses.</p>
   <p>The parameters of the currently selected verse format show up on the right, "Begin Preparatory Syllable", etc. and it should be fairly obvious what they refer to.  The default format is to italicize the preparatory syllables and to bold the accented syllables.  The verse prefix is just text that gets put before each verse ($c will be replaced by the current verse number) and the verse suffix is simply put at the end of each verse.  The non-breaking space is used between a word and a flex or mediant to prevent a line break from occurring.</p>
   <p>The "Verses Filename" is used when dragging the 'Download Verses' link from Chrome (no other browsers support this) into an Explorer window as the name of the file.  It is also used by the "Download ZIP of all psalms in each tone" for the name of the verses files.  It is also applied to the name field in the header, but for this it will cut off everything after the last period as well as the period itself (e.g., $psalm-$tone.tex becomes $psalm-$tone).  Also, $psalm will be replaced with the psalm number (or Magnificat, etc.) and $tone will be replaced with the tone and termination, e.g., 8gstar or solemn8g.</p>
   </div>
+  <div class="question">What about the versicles?</div>
+  <div class="answer">This is just the GABC for the versicles that come after the hymn or the short responsory, depending on the hour, or at the end of a Matins nocturn. In order to make the tool work, the preparatory syllables are marked, but if you set the verse to gabc, just set the boxes "Begin Preparatory Syllable" and "End Preparatory Syllable", which will set the text in the usual type like in the Liber Usualis.
+	  <p> The solemn tone is used at some feasts at Vespers, marked in the liturgical books including the Liber Usualis. It is the case that in some places, it is customary to use it on other major feasts; it may require some manual intervention, but including this tone in the Psalm Tone Tool seems easier than copying and pasting each syllable.
+  </p>
+  </div>
+   <div class="question">Can you tell us about the psalm tone names?</div>
+   <div class="answer"> Sure. They follow the antiphonals, but some of the tones have variants. In those cases, there is a contradiction, as "6-alt" is typically more common, but "per-alt" is much less common, at least in the English and French-speaking worlds, under the influence of Solesmes, but the former name is kept to minimize confusion.
+	   <p> The tone previously named "in directum" is now "Tonus T.P." as it is used for psalms or canticles without an antiphon in Paschal Time. A tone "in dir. romanus" has been added along with the special tone used <i>ad libitum</i> for the Hours of All Souls Day.
+   </p>
+	   </div>
 <div class="question">You didn't mention the checkboxes beneath the Format verses dropdown.  What are they all about?</div>
 <div class="answer"><p>"Only format vowels" will cause only the vowels of the preparatory and accented syllables to be affected rather than the entire syllable.</p>
   <p>"Use puncta cava" will cause puncta cava to be used in the chant parts of the output.</p>

psalmtone.js

@@ -213,20 +213,31 @@ var o_g_tones =
                      mediant:"ixhi hr g ixi h 'g fr f.",
                      termination:"gr d 'f fr ed.."
                     },
+         'per.-alt':{clef:"c4",
+                 mediant:"ixhi hr ixi h 'g fr f.",
+                 termination:"ixhi gr d 'f fr ed.."
+                },
              'irregularis': {clef:"c4",
                       mediant:"f gh hr 'g fr f.",
                       terminations:{'a': "hr ixi g ixi h.",
                                     'a2':"hr 'ixi gr gr 'ixi ir h."
                                    }
                     },
-             'in directum': {clef:"c3",
-                      mediant:"e f hr i 'i fr f.",
-                      termination:"hr e f 'g fr f."
-                    },
-             'in dir. monasticus': {clef:"c3",
+         'in dir. romanus': {clef:"c3",
+                  mediant:"hr g f 'h hr h.",
+                  termination:"hr f."
+                },
+          'in dir. monasticus': {clef:"c3",
                       mediant:"hr g f 'h hr h.",
                       termination:"hr h."
                     },
+			'tonus T.P.': {clef:"c3",
+						mediant:"e f hr i 'i fr f.",
+					termination:"hr e f 'g fr f."},
+			'tonus ad Horas 2 nov ad lib.': {clef:"c4",
+						mediant:"f gh hr 'g gr f.",
+					termination:"hr 'g g."},
+
              // 'in directum (alt.)': {clef:"c4",
              //          mediant:"t[0].word.length==1?f gh hr g h.:f gh hr 'g fr f.",
              //          termination:"hr f 'g gr g."
@@ -260,8 +271,14 @@ var o_g_tones =
                    },
              'V.2':{clef:"c4",
                     mediant:"hr h h/hf,fgwhvGFEfg/gf"
-                   }
-            };
+                   },
+
+  'V. Solemnior':{clef:"c3",
+         mediant:"hr 'hi hr h_,"
+         termination: "hr f e 'f_h hr hiHGhih.ghGFE'fggf."
+        }
+ }
+			;
 var d_tones = {'1.':{clef:"c4",
                   mediant:"f gh hr 'ixi hr 'g hr h",
                   solemn:"f gh hr hg ixgi h hr 'hg gh",