diff --git a/.gregorio-version b/.gregorio-version
index d1e1eda10..a4948dcb4 100644
--- a/.gregorio-version
+++ b/.gregorio-version
@@ -1,4 +1,4 @@
-4.0.0-rc2
+4.0.0
 
 *** Do not modify this file. ***
 Use VersionManager.py to change the version.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68ea40e8d..242e0c45f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,61 +3,18 @@ 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][unreleased]
-### Fixed
-- Spacing was too large when alteration begins a syllable, see [#663](https://github.com/gregorio-project/gregorio/issues/663).
-
 ### Changed
-- `alterationspace` is now a fixed dimension, see [UPGRADE.md](UPGRADE.md) for details.
-
-## [4.0.0-rc2] - 2015-11-05
-### Fixed
-- The spacing of manual in-line custos (`(f+)` in gabc) is now consistent with the spacing of automatic in-line custos (`(z0)` in gabc).  See [#642](https://github.com/gregorio-project/gregorio/issues/642).
-- Signs on the climacus praepunctis deminutus `(ghgf~)` neume are now positioned correctly.  See [#650](https://github.com/gregorio-project/gregorio/issues/650)
-- When using first letter lyric centering and big initials, the initial is no longer incorrectly included in the first syllable.  See [#648](https://github.com/gregorio-project/gregorio/issues/648).  This is a fix for a bug in a new 4.0.0 feature, so this changelog entry should be removed when the change log is merged for the 4.0.0 release.
-- Mac installer has been made SIP compliant (i.e. it now works on El Capitan).
-- Mac installer can now detect installations of TeXLive done with MacPorts or the command-line tool provided by TUG.
-- Windows executable has file version information attached correctly so that the installer can properly recognize and replace the binary during an upgrade process.
+- Initial handling has been simplified.  The initial style should now be specified from TeX by using the `\gresetinitiallines` command, rather than from a gabc header.  Big initials and normal initials are now governed by a single `initial` style, meant to be changed between scores as appropriate.  See [UPGRADE.md](UPGRADE.md) and GregorioRef for details (for the change request, see [#632](https://github.com/gregorio-project/gregorio/issues/632)).  Deprecations for this change are listed in the Deprecation section, below.
 
 ### Added
-- The ability to force a hyphen after an empty first syllable, enabled by default since this was the behavior prior to 4.0.  Version 4.0 has an improved spacing algorithm which will eliminate the hyphen if the notes for the first syllable are too close to the second.  To switch to this behavior, use `\gresetemptyfirstsyllablehyphen{auto}`.  See [UPGRADE.md](UPGRADE.md) and GregorioRef for details (for the change request, see [#653](https://github.com/gregorio-project/gregorio/issues/653)).
-- Shell scripts for configuring TeXShop and TeXworks on a Mac.
-
-### Removed
-- The TeXShop script for compiling gabc files.  Supplanted by the new autocompile feature of the package.
-- Spaces associated with chironomic signs (which were removed in 4.0.0-beta)
+- Salicus flexus glyphs (See [#631](https://github.com/gregorio-project/gregorio/issues/631)).
 
 ### Deprecated
-- The meaningless `gabc-version` header in gabc (see [#664](https://github.com/gregorio-project/gregorio/issues/664)).
+- `initial-style` gabc header, supplanted by the `\gresetinitiallines` TeX command.
+- `biginitial` style, consolidated into the `initial` style.
 
 
-## [4.0.0-rc1] - 2015-10-08
-### Fixed
-- Deactivating the end of line shifts now prevents lyrics from stretching under the custos at the end of the line.
-- All of the keywords for `\grescaledim` now work as described in the documentation.
-
-### Changed
-- `\grecreatedim` and `\grechangedim` now take keywords for their third argument (`scalable` and `fixed`) instead of integers (`1` and `0`) to make the more in keeping with the overall user command conventions.
-- `\grescaledim` now accepts `scalable` as a keyword to turn on scalable (in keeping with the above change)
-- Alterations are partially ignored when aligning lines on the notes (i.e. `\gresetbolshifts{enabled}`).  They are not allowed to get any closer to the clef than `beforealterationspace` and the lyrics are not allowed to get any closer to the left-hand margin than `minimalspaceatlinebeginning`, but other than that GregorioTeX will shift them left as much as possible to make the notes align `spaceafterlineclef` away from the clef.  Note that for the default values of these distances, only the natural is small enough to acheive true alignment.
-- `gregoriotex.sty` and `gregoriosyms.sty` now check to make sure that they are not both loaded.  If `gregoriotex` detects that `gregoriosyms` is loaded, then an error is raised.  If `gregoriosyms` detects that `gregoriotex` is loaded, then the loading of `gregoriosyms` is silently aborted and compilation proceeds.
-- Liquescence on a bistropha or tristropha will only appear on the note(s) marked by `<` in gabc, rather than on all notes in the figure.  This means that a figure like `(gsss<)` will only have a liquescent "tail" on the final note.  If you would like all notes to be liquescent for some reason, you can use a figure like `(gs<gs<gs<)` instead.
-
-### Added
-- New distance, `initialraise`, which will lift (or lower, if negative) the initial.
-- The first word of the score is now passed to a macro that allow it to be styled from TeX.  The first word is passed to `\GreFirstWord#1` and is styled by changing the `firstword` style.
-- A new type of lyric centering, enabled with `\gresetlyriccentering{firstletter}`, which aligns the neume with the first letter of each syllable.
-- `\greornamentation` allows access to the two ornamentation glyphs.  The ability to access these two glyphs via `{\gregoriosymbolfont \char 75}` was broken by the new interface to the glyphs in greextra.
-- The missing liquescent salicus glyphs.
-
-## [4.0.0-beta2] - 2015-08-26
-### Fixed
-- Corrected the rendering of explicit automatic and manual custos at the end of lines when the clef change that follows it is pushed to the next line (see [#569](https://github.com/gregorio-project/gregorio/issues/569)).
-- Distinguished between `eolshift` and `bolshift` giving each their own flag and user commmand for turning them on and off.  `\seteolshift{enable}` allows the lyric text to stretch under the custos at the end of the line.  `\setbolshift{enable}` aligns the beginning of each line on the notes instead of the text.  Both are on by default, but can be turned off with `\seteolshift{disable}` and `\setbolshift{disable}`.
-
-### Added
-- `\greillumination`: allows user to specify arbitrary content (usually an image) to be used as the initial.
-
-## [4.0.0-beta] - 2015-08-01
+## [4.0.0] - 2015-12-08
 ### Fixed
 - Handling of the first syllable in gabc is now more consistent with the all other syllables.  This centers the syllable correctly when using latin syllable centering (see [#42](https://github.com/gregorio-project/gregorio/issues/42)) and makes the use of styles less surprising in the first syllable (see [#135](https://github.com/gregorio-project/gregorio/issues/135)).
 - Handling of manually-placed custos is improved.  In particular, a manual custos at the end of the score should no longer be lost when the bar happens to be at the end of the line.
@@ -68,6 +25,14 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 - Gregorio will now try harder to select an appropriate pitch for an automatic custos (`z0`) on a clef change (see [#446](https://github.com/gregorio-project/gregorio/issues/446)).  If results are not satisfactory, use a manual custos (`+`) to select a pitch manually.
 - The centering of styled text under notes is now correct (See [#509](https://github.com/gregorio-project/gregorio/issues/509)).
 - Space for above lines text is now correctly added as needed, even at the beginning of a score (see [#533](https://github.com/gregorio-project/gregorio/issues/533)).
+- Corrected the rendering of explicit automatic and manual custos at the end of lines when the clef change that follows it is pushed to the next line (see [#569](https://github.com/gregorio-project/gregorio/issues/569)).
+- Distinguished between `eolshift` and `bolshift` giving each their own flag and user commmand for turning them on and off.  `\seteolshift{enable}` allows the lyric text to stretch under the custos at the end of the line.  `\setbolshift{enable}` aligns the beginning of each line on the notes instead of the text.  Both are on by default, but can be turned off with `\seteolshift{disable}` and `\setbolshift{disable}`.
+- The spacing of manual in-line custos (`(f+)` in gabc) is now consistent with the spacing of automatic in-line custos (`(z0)` in gabc).  See [#642](https://github.com/gregorio-project/gregorio/issues/642).
+- Signs on the climacus praepunctis deminutus `(ghgf~)` neume are now positioned correctly.  See [#650](https://github.com/gregorio-project/gregorio/issues/650)
+- Mac installer has been made SIP compliant (i.e. it now works on El Capitan).
+- Mac installer can now detect installations of TeXLive done with MacPorts or the command-line tool provided by TUG.
+- Windows executable has file version information attached correctly so that the installer can properly recognize and replace the binary during an upgrade process.
+- Spacing was too large when alteration begins a syllable, see [#663](https://github.com/gregorio-project/gregorio/issues/663).
 
 ### Changed
 - A new, more systematic naming scheme has been created for GregorioTeX macros.  The naming scheme should reduce the chances of naming conflicts with other packages and make it easier to identify what a particular macro is for and how to use it.  Most user functions have been renamed in order to bring them into line with this scheme.  Please see GregorioRef for a complete list of the new function names.  In general, old names will still work, but they will raise a deprecation warning and will be dropped from GregorioTeX in a future relase.
@@ -105,9 +70,14 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/).
 - Style for score elements can now be changed via the `\grechangestyle` command.  This replaces the mixed system of styling commands which could be redefined for some elements and specialized commands for applying styles to others.  See GregorioRef for details.
 - Annotations with more than two lines are now supported (originally requested [on the user list](http://www.mail-archive.com/gregorio-users%40gna.org/msg00164.html) when two line annoations were made possible).  To build the annotation box use `\greannoataion`.  See GregorioRef for details.
 - The `annotation` header field in `gabc` now places its value(s) above the inital if no annotation is explicitly given by the user via `\greannotation` (see [#44](https://github.com/gregorio-project/gregorio/issues/44)).
-- `\grescaledim` now takes two arguments to bring it into line with the systemized naming scheme.  The second argument should be `yes`, `true`, or `on` if you want the distance to scale when the staff size changes.  Anything else will make the distance independent of the staff size.
+- `\grescaledim` now takes two arguments to bring it into line with the systemized naming scheme.  The second argument should be `scalable` if you want the distance to scale when the staff size changes, `fixed` if you don't.
 - Gregorio is now able to make individual lines of a score taller, when the position of the note require extra space, without affecting the rest of the lines.  This is the new default behavior.  See [UPGRADE.md](UPGRADE.md) and GregorioRef for details (for the change request, see [#59](https://github.com/gregorio-project/gregorio/issues/59)).
 - Braces are now rendered using MetaPost by default.  This allows the line weight to remain more consistent when braces are stretched.  The old behavior (which uses the score font instead) can be restored using `\gresetbracerendering{font}`.  See [UPGRADE.md](UPGRADE.md) and GregorioRef for details (for the change request, see [#535](https://github.com/gregorio-project/gregorio/issues/535)).
+- `\grecreatedim` and `\grechangedim` now take keywords for their third argument (`scalable` and `fixed`) instead of integers (`1` and `0`) to make the more in keeping with the overall user command conventions.
+- Alterations are partially ignored when aligning lines on the notes (i.e. `\gresetbolshifts{enabled}`).  They are not allowed to get any closer to the clef than `beforealterationspace` and the lyrics are not allowed to get any closer to the left-hand margin than `minimalspaceatlinebeginning`, but other than that GregorioTeX will shift them left as much as possible to make the notes align `spaceafterlineclef` away from the clef.  Note that for the default values of these distances, only the natural is small enough to acheive true alignment.
+- `gregoriotex.sty` and `gregoriosyms.sty` now check to make sure that they are not both loaded.  If `gregoriotex` detects that `gregoriosyms` is loaded, then an error is raised.  If `gregoriosyms` detects that `gregoriotex` is loaded, then the loading of `gregoriosyms` is silently aborted and compilation proceeds.
+- Liquescence on a bistropha or tristropha will only appear on the note(s) marked by `<` in gabc, rather than on all notes in the figure.  This means that a figure like `(gsss<)` will only have a liquescent "tail" on the final note.  If you would like all notes to be liquescent for some reason, you can use a figure like `(gs<gs<gs<)` instead.
+- `alterationspace` is now a fixed dimension, see [UPGRADE.md](UPGRADE.md) for details.
 
 ### Added
 - With thanks to Jakub Jelínek, St. Gallen style adiastematic notation is now handled through [nabc syntax](http://gregoriochant.org/dokuwiki/doku.php/language) (see GregorioNabcRef.pdf for details and [the new example](examples/FactusEst.gabc)). Only one line above the notes is currently handled. This is a preview, backward incompatible change are possible in future releases.
@@ -124,7 +94,7 @@ See GregorioRef.pdf for full details.
 - Added `--with-kpathsea` option to configure script, to check input and output file against `openout_any` and `openin_any` settings of texmf.cnf (TeXLive only). Necessary to be included in `shell_escape_commands` in TeXLive.
 - Support for `lualatex -recorder`.  Autocompiled gabc and gtex files will now be properly recorded so that programs like `latexmk -recorder` can detect the need to rebuild the PDF when a gabc file changes.
 - A vertical episema may now be forced to appear above or below a note.  In gabc, use `'0` for the vertical episema to appear below and `'1` for the vertical episema to appear above (see [#385](https://github.com/gregorio-project/gregorio/issues/385)).
-- The first syllable and first letter of the first syllable that is *not* interpreted as the initial of the score are now passed to macros that allow them to be styled from TeX.  The first syllable is passed to `\GreFirstSyllable#1` and the first letter of the first syllable is passed to `\GreFirstSyllableInitial#1`.
+- The first word, first syllable, and first letter of the first syllable that is *not* interpreted as the initial of the score can now be styled from TeX.  Use `\grechangestyle` to modify the `firstsyllableinitial`, `firstsyllable`, and `firstword` as desired.
 - The final line of a score may now be forced to be fully justified (rather than ragged) using `\gresetlastline{justified}` before including the score (see [#43](https://github.com/gregorio-project/gregorio/issues/43)).  Use `\gresetlastline{ragged}` to switch back to a ragged last line.
 - `\gresethyphen{force}` forces GregorioTeX to put a hyphen between each syllable in a polysyllabic word.  `\gresethyphen{auto}` restores behavior to normal.
 - Support for custom vowel centering rules.  Put a file called `gregorio-vowels.dat` into your project directory or into a directory accessible from TEXMF and add the header `language: name;` to your gabc file.  The `gregorio-vowels.dat` file describes how vowels are to be located in the *name* language.  See GregorioRef for details.
@@ -133,6 +103,13 @@ See GregorioRef.pdf for full details.
 - The ability to add LilyPond-like point-and-click textedit links into the PDF file to aid with debugging scores.  This must be explicitly enabled and **should be turned off** when producing files for distribution as it embeds path information into the output.  To enable this, you must pass the `-p` option to gregorio when compiling gabc files and add `\gresetpointandclick{on}` before including the score.  It may be toggled back off with `\gresetpointandclick{off}`.  See GregorioRef for details (for the change request, see [#528](https://github.com/gregorio-project/gregorio/issues/528)).
 - New score fonts with glyphs unique to Dominican chant.  These fonts replace the epiphonus and the augmented liquescents with corresponding figures from Dominican liturgical books.  To use the new fonts, pass the `[op]` option to the `\gresetgregoriofont` command (i.e., `\gresetgregoriofont[op]{greciliae}`).  See GregorioRef for details (for the change request, see [#1](https://github.com/gregorio-project/gregorio/issues/1)).
 - Support for "punctum cavum inclinatum" and "punctum cavum inclinatum auctus" figures.  The gabc for these are `(Gr)` and `(Gr<)`, where `G` is the capitalized pitch letter.
+- `\greillumination`: allows user to specify arbitrary content (usually an image) to be used as the initial.
+- New distance, `initialraise`, which will lift (or lower, if negative) the initial.
+- A new type of lyric centering, enabled with `\gresetlyriccentering{firstletter}`, which aligns the neume with the first letter of each syllable.
+- `\greornamentation` allows access to the two ornamentation glyphs.  The ability to access these two glyphs via `{\gregoriosymbolfont \char 75}` was broken by the new interface to the glyphs in greextra.
+- The missing liquescent salicus glyphs.
+- The ability to force a hyphen after an empty first syllable, enabled by default since this was the behavior prior to 4.0.  Version 4.0 has an improved spacing algorithm which will eliminate the hyphen if the notes for the first syllable are too close to the second.  To switch to this behavior, use `\gresetemptyfirstsyllablehyphen{auto}`.  See [UPGRADE.md](UPGRADE.md) and GregorioRef for details (for the change request, see [#653](https://github.com/gregorio-project/gregorio/issues/653)).
+- Shell scripts for configuring TeXShop and TeXworks on a Mac.
 
 ### Deprecated
 - `\GreSetStaffLinesFormat`, supplanted by `\grechangeformat{normalstafflines}...`
@@ -142,9 +119,7 @@ See GregorioRef.pdf for full details.
 - `\greabovelinestextstyle`, if you were redefining this command, use `\grechangeformat{abovelinestext}...` instead
 - `\grelowchoralsignstyle`, if you were redefining this command, use `\grechangeformat{lowchoralsign}...` instead
 - `\grehighchoralsignstyle`, if you were redefining this command, use `\grechangeformat{highchoralsign}...` instead
-- `centering-scheme` gabc header, supplanted by `\grelyriccentering` in TeX.  See GregorioRef for syntax.
 - `\setaboveinitialseparation`, supplanted by `\grechangedim{annotationseparation}...`
-- `gregoriotex-font` gabc header, supplanted by `\gresetgregoriofont` in TeX.  See GregorioRef for syntax.
 - `\scorereference`, supplanted by `\grescorereference`
 - `\GreScoreReference`, supplanted by `\grescorereference`
 - `\commentary`, supplanted by `\grecommentary`
@@ -190,7 +165,9 @@ See GregorioRef.pdf for full details.
 - `\setspaceafterinitial`, supplanted by `\grechangedim{afterinitialshift}...`
 - `\setspacebeforeinitial`, supplanted by `\grechangedim{beforeinitialshift}...`
 - `\setinitialspacing`, supplanted by `\grechangedim{beforeinitialshift}...`, `\grechangedim{manualinitialwidth}...`, and `\grechangedime{afterinitialshift}...`
-
+- `centering-scheme` gabc header, supplanted by `\grelyriccentering` in TeX.  See GregorioRef for syntax.
+- `gregoriotex-font` gabc header, supplanted by `\gresetgregoriofont` in TeX.  See GregorioRef for syntax.
+- The meaningless `gabc-version` header in gabc (see [#664](https://github.com/gregorio-project/gregorio/issues/664)).
 
 ### Removed
 - GregorioXML and OpusTeX output
@@ -208,7 +185,10 @@ See GregorioRef.pdf for full details.
 - `\GreSetAboveInitialSeparation`, supplanted by `\grechangedim{annotationseparation}...`
 - `\gresetstafflinefactor`, supplanted by `\grechangestafflinethickness`
 - `greg-book` and `greg-lily-book` engines, supplanted by improved capabilities of `\gregorioscore` for compiling gabc files at time of document compilation.
+- The TeXShop script for compiling gabc files.  Supplanted by the new autocompile feature of the package.
 
+### Known Bugs
+- When beginning of line clefs are invisible and bol shifts are enabled, lyric text will stick out into the margin.  Further the notes on the first and subsequent lines do not align properly.  See [#683](https://github.com/gregorio-project/gregorio/issues/683).
 
 
 ## [3.0.3] - 2015-07-01
@@ -273,10 +253,10 @@ See GregorioRef.pdf for full details.
 - Clivis and pes quadratum alignment now follows Solesmes' conventions more closely (see [#10](https://github.com/gregorio-project/gregorio/issues/10)).
 
 ### Fixed
-- Reducing horizontal episemus width.
+- Reducing horizontal episema width.
 - Reducing flat stem length.
 - `mode` and `anotation-line` now do their job.
-- Low episemus (`_0`) under consecutive notes are now aligned correctly.
+- Low episema (`_0`) under consecutive notes are now aligned correctly.
 - Quilisma was melting too much with next note when in a second interval.
 - Fixed custo blocking possibility.
 - Fixing glyphs disapearing when importing into Illustrator.
@@ -308,7 +288,7 @@ See GregorioRef.pdf for full details.
 - adding requested features: Dominican bars, choral signs, text above staff lines
 - enabling comments in gabc files
 - adding ability to write verbatim TeX at {note, glyph, element} level
-- introducing horizontal episemus bridges
+- introducing horizontal episema bridges
 - default output is now utf8 directly; the `-O`  option allows old-style TeX output, i.e. `\char XXXX`
 - new static build system for packaged distributions
 
diff --git a/UPGRADE.md b/UPGRADE.md
index b227cc95f..9a6430a42 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -2,6 +2,20 @@
 
 This file contains instructions to upgrade to a new release of Gregorio.
 
+## 4.1
+
+### Initial handling
+
+Initial handling has been simplified.  This deprecates the `initial-style` gabc header and the `biginitial` style.
+
+Rather than using the `initial-style` gabc header, set the number of lines the initial should use in Tex with the `\gresetinitiallines` command.  It currently accepts 0 (for no initial), 1 (for a one-line initial), or 2 (for a two-line initial).
+
+As for the `biginitial` style, the intent is that the `initial` style be changed within the TeX document whenever the initial style should change, regardless of how many lines the initial requires.  For example, before including a score that has a two-line initial, you would probably want to redefine the `initial` style to use a larger font.  Then, before including a score which requires a one-line initial, you would then redefine the `initial` style back to what it was before.
+
+In order to allow a smoother transition to the new behavior, GregorioTeX will behave differently depending on whether or not deprecated usage is allowed (controlled by the `[allowdeprecated]` package option).  If deprecated usage is allowed, GregorioTeX will use the deprecated `biginitial` style for big initials.  If not, GregorioTeX will use the `initial` style for big initials.
+
+Since the `biginitial` style will disappear with Gregorio 5.0, please consider disabling deprecated usage (set `[allowdeprecated=false]` when using the `gregoriotex` package) and use the `initial` style as just described.
+
 ## 4.0
 
 ### Font changes
diff --git a/configure.ac b/configure.ac
index 391ccf871..ce816caba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,8 +16,8 @@ dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([gregorio],[4.0.0-rc2],[gregorio-devel@gna.org])
-FILENAME_VERSION="4_0_0-rc2"
+AC_INIT([gregorio],[4.0.0],[gregorio-devel@gna.org])
+FILENAME_VERSION="4_0_0"
 AC_SUBST(FILENAME_VERSION)
 MK=""
 AC_SUBST(MK)
diff --git a/doc/Command_Index_User.tex b/doc/Command_Index_User.tex
index 629e7aaee..fbe62c49e 100644
--- a/doc/Command_Index_User.tex
+++ b/doc/Command_Index_User.tex
@@ -165,20 +165,17 @@ \subsubsection{Including scores}
   \gregorioscore[a]{TecumPrincipium} % gabc auto compiled.
 \end{latexcode}
 
-\macroname{\textbackslash gabcsnippet}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
-Converts the gabc notation specified in \texttt{\#2} to Gregorio\TeX\ and
-includes it directly in the document.  The optional argument \texttt{[\#1]}
-may be used to specify a gabc \texttt{initial-style}, which defaults to
-\texttt{1}.
+\macroname{\textbackslash gabcsnippet}{\{\#1\}}{gregoriotex-main.tex}
+Converts the gabc notation specified in \texttt{\#1} to Gregorio\TeX\ and
+includes it directly in the document.
 
 \begin{argtable}
-  \#1 & number & Optional.  The gabc \texttt{initial-style} value to use.\\
-  \#2 & string & The gabc to insert into the document.\\
+  \#1 & string & The gabc to insert into the document.\\
 \end{argtable}
 
 \medskip For example:\par\medskip
 \begin{latexcode}
-  \gabcsnippet[0]{(c3) Al(eg~)le(gv.fhg)lu(efe___)ia(e.) (::)}
+  \gabcsnippet{(c3) Al(eg~)le(gv.fhg)lu(efe___)ia(e.) (::)}
 \end{latexcode}
 
 
@@ -512,7 +509,7 @@ \subsubsection{Glyph Alteration}
 For example:
 
 \medskip \begin{latexcode}
-  \gresimpledefbarglyph{A}{0.3em}
+  \gresimpledefbarredsymbol{A}{0.3em}
 \end{latexcode}
 
 Will define \texttt{\textbackslash Abar} to be a A with a bar shifted right
@@ -611,8 +608,7 @@ \subsubsection{Styling}
 \begin{tabular}{lp{7cm plus .5cm}r}
   Element Name & Description & Default\\
   \hline
-  \stylename{initial} & Normal Initials & 40 pt font\\
-  \stylename{biginitial} & Big (2-Line) Initials & 80 pt font\\
+  \stylename{initial} & Score initial (the first letter of the score, when offset from the rest of the text) & 40 pt font\\
   \stylename{translation} & Translation text (appears below lyrics) & {\it italics}\\
   \stylename{abovelinestext} & Above line text (\texttt{<alt></alt>} in gabc, appears above the staff) & normal\\
   \stylename{normalstafflines} & Full length staff lines & none\\
@@ -698,6 +694,12 @@ \subsubsection{Text Elements}
 
 \textbf{Nota Bene:} Usually the argument of this command should be an \verb=\includegraphics= command, but you may use what ever you want as the illuminated initial.
 
+\macroname{\textbackslash gresetinitiallines}{\#1}{gregoriotex-syllable.tex}
+Sets the number of lines the score initial requires.
+
+\begin{argtable}
+  \#1 & number & The number of lines required by the initial.  If \texttt{0}, the score will have no separated initial.\\
+\end{argtable}
 
 \subsubsection{Text Alignment}
 Gregorio\TeX\ allows you to manipulate the global alignment behavior of some text elements using the following commands.
diff --git a/doc/Command_Index_gregorio.tex b/doc/Command_Index_gregorio.tex
index a3dc678a1..a71f9ae7b 100644
--- a/doc/Command_Index_gregorio.tex
+++ b/doc/Command_Index_gregorio.tex
@@ -54,13 +54,6 @@ \section{Gregorio Controls}
   \#3 & integer & Set horizontal episema (0), horizontal episema under a note (1), line at top of staff (2), line at bottom of staff (3), choral sign (4).\\
 \end{argtable}
 
-\macroname{\textbackslash GreAdjustSecondLine}{}{gregoriotex.tex}
-%didn't actually find this one in gregoriotex-write.c, classified it here based on it’s related function GreAdjustThirdLine
-Macro to call before first syllable, but after \verb=\GreSetInitialClef=.
-
-\macroname{\textbackslash GreAdjustThirdLine}{}{gregoriotex-main.tex}
-Macro to call during the second line.
-
 \macroname{\textbackslash GreAugmentumDuplex}{\#1\#2\#3}{gregoriotex-signs.tex}
 Macro for typesetting an augmentum duplex (a pair of punctum mora)
 
@@ -114,9 +107,6 @@ \section{Gregorio Controls}
   & \texttt{1} & Call came from translation centering.
 \end{argtable}
 
-\macroname{\textbackslash GreBeginNotes}{}{gregoriotex.tex}
-Macro to draw the staff lines.  Comes after the initial but before the clef.
-
 \macroname{\textbackslash GreBold}{\#1}{gregoriotex.sty and gregoriotex.tex}
 Makes argument bold.  Accesses \LaTeX\ \verb=\textbf= (\textit{gregoriotex.sty}) or Plain \TeX\ \verb=\bf= (\textit{gregoriotex.tex}) as appropriate.  Corresponds to ``<b></b>'' tags in gabc.
 
@@ -532,9 +522,6 @@ \section{Gregorio Controls}
   \#1 & integer & Height number of the custos.\\
 \end{argtable}
 
-\macroname{\textbackslash GreNoInitial}{}{gregoriotex-main.tex}
-Macro called when no initial is being set.
-
 \macroname{\textbackslash GreOverBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
 Macro to typeset a round brace above the lines.
 
@@ -625,6 +612,16 @@ \section{Gregorio Controls}
   \#2 & string  & Type of glyph the semicirculus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
 \end{argtable}
 
+\macroname{\textbackslash GreScoreOpening}{\#1\#2\#3\#4}{gregoriotex-syllable.tex}
+Opens the score.
+
+\begin{argtable}
+  \#1 & \TeX\ code & Macros rendering the things after the initial but before the notes.\\
+  \#2 & \TeX\ code & Macros rendering the things after starting notes but before the syllable.\\
+  \#3 & \TeX\ control sequence & Control sequence for the syllable.\\
+  \#4 & \TeX\ code & Macros rendering the first syllable; should emit the initial and populate \verb=\gre@opening@syllabletext=.\\
+\end{argtable}
+
 \macroname{\textbackslash GreScoreReference}{\#1}{gregoriotex-main.tex}
 Currently does nothing.
 
@@ -636,8 +633,17 @@ \section{Gregorio Controls}
   \#2 & string  & Type of glyph the semicirculus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
 \end{argtable}
 
-\macroname{\textbackslash GreSetBigInitial}{}{gregoriotex-main.tex}
-Macro which indicates that a 2-line initial is desired.
+\macroname{\textbackslash GreSetFirstSyllableText}{\#1\#2\#3\#4\#5\#6}{gregoriotex-syllable.tex}
+Sets the first syllable text.
+
+\begin{argtable}
+  \#1 & \TeX\ code & Initial.\\
+  \#2 & \TeX\ code & First letter after the initial.\\
+  \#3 & \TeX\ code & Everything else in the syllable.\\
+  \#4 & \TeX\ code & Three syllable parts when there is a separated initial.\\
+  \#5 & \TeX\ code & Three syllable parts where there is no separated initial.\\
+  \#6 & \TeX\ code & Extra macros to run if there is an initial.\\
+\end{argtable}
 
 \macroname{\textbackslash GreSetFixedNextTextFormat}{\#1}{gregoriotex-syllable.tex}
 Same as \verb=\GreSetFixedTextFormat= except for next syllable.
@@ -669,9 +675,6 @@ \section{Gregorio Controls}
   & \texttt{5} & underline
 \end{argtable}
 
-\macroname{\textbackslash GreSetInitial}{\#1}{gregoriotex-main.tex}
-Macro to set the initial in the score.
-
 \begin{argtable}
   \#1 & character & The initial letter of the score.\\
 \end{argtable}
@@ -705,6 +708,9 @@ \section{Gregorio Controls}
   \#3 & string & the end letters, they don't count for alignment\\
 \end{argtable}
 
+\macroname{\textbackslash GreSetNoFirstSyllableText}{}{gregoriotex-syllable.tex}
+Macro that indicates there is no next in the first syllable.
+
 \macroname{\textbackslash GreSetTextAboveLines}{\#1}{gregoriotex-main.tex}
 Macro to place argument above the lines and empty
 \verb=\gre@currenttextabovelines= when done.
diff --git a/doc/Command_Index_internal.tex b/doc/Command_Index_internal.tex
index 79edd33db..c4eec3102 100644
--- a/doc/Command_Index_internal.tex
+++ b/doc/Command_Index_internal.tex
@@ -259,15 +259,6 @@ \section{Gregorio\TeX{} Controls}
   \#1 & string & Snippet of gabc code.\\
 \end{argtable}
 
-\macroname{\textbackslash gre@gabcsnippet@option}{[\#1]\#2}{gregoriotex-main.tex}
-Macro that handles \verb=\gabcsnippet= calls when they have an optional
-argument.
-
-\begin{argtable}
-  \#1 & int & Value of initial style to be passed to gregorio \\
-  \#2 & string & Snippet of gabc code.\\
-\end{argtable}
-
 \macroname{\textbackslash gre@writemode}{\#1}{gregoriotex-main.tex}
 Macro that writes its argument with \verb=\greannotation=. The
 argument typically is given to this macro by \verb=\GreMode= in the
@@ -369,6 +360,27 @@ \section{Gregorio\TeX{} Controls}
   \#1 & integer & height of the custos character to be placed\\
 \end{argtable}
 
+\macroname{\textbackslash gre@beginnotes}{}{gregoriotex-main.tex}
+Macro to draw the staff lines.  Comes after the initial but before the clef.
+
+\macroname{\textbackslash gre@noinitial}{}{gregoriotex-main.tex}
+Macro called when no initial is being set.
+
+\macroname{\textbackslash gre@setbiginitial}{}{gregoriotex-main.tex}
+Macro which indicates that a 2-line initial is desired.
+
+\macroname{\textbackslash gre@setinitial}{\#1}{gregoriotex-main.tex}
+Macro to set the initial in the score.
+
+\macroname{\textbackslash gre@adjustsecondline}{}{gregoriotex.tex}
+Macro to call before first syllable, but after \verb=\GreSetInitialClef=.
+
+\macroname{\textbackslash gre@adjustthirdline}{}{gregoriotex-main.tex}
+Macro to call during the second line.
+
+\macroname{\textbackslash gre@adjustlineifnecessary}{}{gregoriotex-main.tex}
+Macro that calls \verb=\gre@adjustthirdline= if indicated by \verb=\ifgre@thirdlineadjustmentnecessary=.
+
 \macroname{\textbackslash gre@addspaceabove}{}{gregoriotex-main.tex}
 Macro to increase the space above the lines to account for above lines text.
 
@@ -458,6 +470,24 @@ \section{Gregorio\TeX{} Controls}
   & \texttt{0} & otherwise\\
 \end{argtable}
 
+\macroname{\textbackslash gre@setfirstsyllabletext}{\#1\#2\#3\#4\#5\#6}{gregoriotex-syllable.tex}
+Internal macro to set the first syllable text after all parts are known.
+
+\begin{argtable}
+  \#1 & \TeX\ code & First part of the syllable (before the vowel)\\
+  \#2 & \TeX\ code & Middle part of the syllable (the vowel)\\
+  \#3 & \TeX\ code & Last part of the syllable (after the vowel)\\
+  \#4 & \TeX\ code & First letter of the syllable\\
+  \#5 & \TeX\ code & Everything after the first letter of the syllable\\
+  \#6 & \TeX\ code & Macros to run after the text is emitted\\
+\end{argtable}
+
+\macroname{\textbackslash gre@opening@syllabletext}{}{gregoriotex-syllable.tex}
+Macro that stores the computed \TeX\ code for rendering the text of the first syllable.
+
+\macroname{\textbackslash gre@opening@initialstyle}{}{gregoriotex-syllable.tex}
+Macro used by \verb=GreSetInitialStyle= to store the initial style
+
 \macroname{\textbackslash gre@exhyphencharsave}{}{gregoriotex-main.tex}
 Macro for saving the ex hyphen character so that it can be restored at the end of the score.
 
@@ -518,6 +548,7 @@ \section{Gregorio\TeX{} Controls}
   & \texttt{1} & stay at the end of the glyph; doesn’t make much sense to use this\\
   & \texttt{2} & go back the width of \#1; this starts the episema at the glyph from the end that starts at \#1’s width from the end\\
   & \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1; this starts the episema at the glyph from the start that starts just after \#1’s width from the start\\
+  & \texttt{4} & go back to the beginning of the previous glyph and then forward the width of \#1, then back the width of \#2; this ends the episema at the end of \#1\\
   \#3 & integer &the ambitus for a two note episema at the diagonal stroke of a porrectus, porrectus flexus, orculus resupinus, or torculus resupinus flexus\\
   \#4 & \texttt{0} & an horizontal episema\\
   & \texttt{1} & an horizontal episema under a note\\
@@ -941,9 +972,6 @@ \subsection{Fonts}
 \macroname{\textbackslash gre@font@nabc}{}{gregoriotex-nabc.tex}
 The font for ancient notation.
 
-\macroname{\textbackslash gre@font@biginitial}{}{gregoriotex.tex}
-The font for the default big initial format in Plain \TeX.
-
 \macroname{\textbackslash gre@font@initial}{}{gregoriotex.tex}
 The font for the default initial format in Plain \TeX.
 
@@ -1208,6 +1236,9 @@ \subsection{Flags}
 \macroname{\textbackslash ifgre@showhyphenafterthissyllable}{}{gregoriotex-syllable.tex}
 Boolean used by \verb=\GreSyllable= to decide if a hyphen should be shown after the syllable.
 
+\macroname{\textbackslash ifgre@thirdlineadjustmentnecessary}{}{gregoriotex-syllable.tex}
+Boolean which indicates that a third-line adjustment to staff line width is necessary.
+
 \macroname{\textbackslash ifgre@scale@stafflinefactor}{}{gregoriotex-spaces.tex}
 Boolean indicating whether the stafflinefactor should scale with changes of \texttt{grefactor}, or not.
 
diff --git a/doc/GregorioRef.tex b/doc/GregorioRef.tex
index 0fe245003..52454021b 100644
--- a/doc/GregorioRef.tex
+++ b/doc/GregorioRef.tex
@@ -133,7 +133,7 @@
 
     \vspace{1cm}
 
-    \large Version \textbf{4.0.0-rc2}, 5 November 2015 %% PARSE_VERSION_DATE
+    \large Version \textbf{4.0.0}, 8 December 2015 %% PARSE_VERSION_DATE
 
     \vspace{1.5cm}
   \end{center}
diff --git a/fonts/squarize.py b/fonts/squarize.py
index fba8f9164..2ef3eba23 100644
--- a/fonts/squarize.py
+++ b/fonts/squarize.py
@@ -79,7 +79,7 @@
     5: 'Five',
 }
 
-GREGORIO_VERSION = '4.0.0-rc2'
+GREGORIO_VERSION = '4.0.0'
 
 # The unicode character at which we start our numbering:
 # U+E000 is the start of the BMP Private Use Area
@@ -173,6 +173,7 @@ def main():
     scandicus(font_width)
     ancus(font_width)
     salicus(font_width)
+    salicus_flexus(font_width)
     torculus(font_width)
     torculus_liquescens(font_width)
     porrectus(font_width)
@@ -394,6 +395,7 @@ def get_width(widths, glyphName):
 S_VIRGA_STRATA                     = 'VirgaStrata'
 S_SALICUS                          = 'Salicus'
 S_SALICUS_LONGQUEUE                = 'SalicusLongqueue'
+S_SALICUS_FLEXUS                   = 'SalicusFlexus'
 S_TORCULUS_LIQUESCENS              = 'TorculusLiquescens'
 S_TORCULUS_LIQUESCENS_QUILISMA     = 'TorculusLiquescensQuilisma'
 S_FLEXUS_ORISCUS_SCAPUS            = 'FlexusOriscusScapus'
@@ -833,6 +835,11 @@ def write_salicus(widths, i, j, last_glyph, shape, lique=L_NOTHING):
     glyph_name = '%s%s%s%s' % (shape, AMBITUS[i], AMBITUS[j], lique)
     if copy_existing_glyph(glyph_name):
         return
+    length = draw_salicus(widths, i, j, last_glyph)
+    set_width(length)
+    end_glyph(glyph_name)
+
+def draw_salicus(widths, i, j, last_glyph):
     not_deminutus = last_glyph != 'rdeminutus'
     if j == 1 and not_deminutus:
         if last_glyph == 'rvsbase':
@@ -878,6 +885,10 @@ def write_salicus(widths, i, j, last_glyph, shape, lique=L_NOTHING):
             last_glyph = 'Virga'
         elif last_glyph == 'rvlbase':
             last_glyph = 'VirgaLongqueue'
+        elif last_glyph == 'PunctumLineBLBR':
+            last_glyph = 'PunctumLineBR'
+        elif last_glyph == 'PunctumLineBL':
+            last_glyph = 'Punctum'
     if not_deminutus:
         paste_and_move(last_glyph, length, (i+j)*BASE_HEIGHT)
         length = length + get_width(widths, last_glyph)
@@ -885,6 +896,58 @@ def write_salicus(widths, i, j, last_glyph, shape, lique=L_NOTHING):
         length = length+get_width(widths, 'line2')
         paste_and_move(last_glyph, (length-get_width(widths, last_glyph)),
                        (i+j)*BASE_HEIGHT)
+    return length
+
+def salicus_flexus(widths):
+    "Creates the salicus flexus."
+    message("salicus")
+    for i in range(1, MAX_INTERVAL+1):
+        for j in range(1, MAX_INTERVAL+1):
+            for k in range(1, MAX_INTERVAL+1):
+                write_salicus_flexus(widths, i, j, k, "PunctumLineTL")
+    for i in range(1, MAX_INTERVAL+1):
+        for j in range(1, MAX_INTERVAL+1):
+            for k in range(1, MAX_INTERVAL+1):
+                write_salicus_flexus(widths, i, j, k, "deminutus", L_DEMINUTUS)
+    for i in range(1, MAX_INTERVAL+1):
+        for j in range(1, MAX_INTERVAL+1):
+            for k in range(1, MAX_INTERVAL+1):
+                write_salicus_flexus(widths, i, j, k, "auctusa1", L_ASCENDENS)
+    for i in range(1, MAX_INTERVAL+1):
+        for j in range(1, MAX_INTERVAL+1):
+            for k in range(1, MAX_INTERVAL+1):
+                write_salicus_flexus(widths, i, j, k, "auctusd1", L_DESCENDENS)
+
+def write_salicus_flexus(widths, i, j, k, last_glyph, lique=L_NOTHING):
+    "Writes the salicus glyphs."
+    new_glyph()
+    glyph_name = '%s%s%s%s%s' % (S_SALICUS_FLEXUS, AMBITUS[i], AMBITUS[j],
+            AMBITUS[k], lique)
+    if copy_existing_glyph(glyph_name):
+        return
+    is_deminutus = last_glyph == 'deminutus'
+    if k == 1 and not is_deminutus:
+        penult_glyph = 'PunctumLineBL'
+    else:
+        penult_glyph = 'PunctumLineBLBR'
+    length = draw_salicus(widths, i, j, penult_glyph)
+    if k == 1 and not is_deminutus:
+        length = length-0.01
+        if last_glyph == 'PunctumLineTL':
+            last_glyph = 'Punctum'
+        elif last_glyph == 'auctusa1':
+            last_glyph = 'PunctumAscendens'
+        elif last_glyph == 'auctusd1':
+            last_glyph = 'PunctumDescendens'
+    if k != 1:
+        length = length - get_width(widths, 'line2')
+        write_line(k, length, (1+i+j-k)*BASE_HEIGHT)
+    if is_deminutus:
+        length = length - get_width(widths, last_glyph)
+        if k != 1:
+            length = length + get_width(widths, 'line2')
+    paste_and_move(last_glyph, length, (i+j-k)*BASE_HEIGHT)
+    length = length + get_width(widths, last_glyph)
     set_width(length)
     end_glyph(glyph_name)
 
diff --git a/macosx/Gregorio.pkgproj b/macosx/Gregorio.pkgproj
index 9e0b3eec1..1cf7d364f 100755
--- a/macosx/Gregorio.pkgproj
+++ b/macosx/Gregorio.pkgproj
@@ -564,7 +564,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>4.0.0-rc2</string><!--GREGORIO_VERSION-->
+				<string>4.0.0</string><!--GREGORIO_VERSION-->
 			</dict>
 			<key>UUID</key>
 			<string>74692645-8112-42EB-8FFC-2CBE2CEDE9FB</string>
diff --git a/src/Makefile.am b/src/Makefile.am
index e2424dcbe..1bc3209ac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ gregorio_LDADD = $(KPSE_LIBS)
 
 bin_PROGRAMS = gregorio
 gregorio_SOURCES = gregorio-utils.c characters.c characters.h \
-					messages.c messages.h struct.c struct.h \
+					messages.c messages.h struct.c struct.h enum_generator.h \
 					unicode.c unicode.h sha1.c sha1.h support.c support.h \
 					config.h bool.h plugins.h utf8strings.h dump/dump.c \
 					gregoriotex/gregoriotex-write.c \
diff --git a/src/bool.h b/src/bool.h
index e32bade4d..d40d0b441 100644
--- a/src/bool.h
+++ b/src/bool.h
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header provides a minimum of C11-like bool functionality.
+ *
  * Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
  * 
  * This file is part of Gregorio.
diff --git a/src/characters.c b/src/characters.c
index 23b6e9bc5..2f2bb9f04 100644
--- a/src/characters.c
+++ b/src/characters.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX.
+ * This file contains functions that deal with lyrics and styles.
+ *
  * Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -42,6 +45,7 @@
 #include "unicode.h"
 #include "characters.h"
 #include "messages.h"
+#include "support.h"
 #include "utf8strings.h"
 #include "vowel/vowel.h"
 
@@ -84,11 +88,7 @@ static bool read_vowel_rules(char *const lang) {
     char buf[PATH_MAX];
     size_t capacity = 16, size = 0;
     
-    if (!(filenames = malloc(capacity * sizeof(char *)))) {
-        gregorio_messagef("read_patterns", VERBOSITY_FATAL, 0,
-                _("unable to allocate memory"));
-        return false;
-    }
+    filenames = gregorio_malloc(capacity * sizeof(char *));
 
     file = popen("kpsewhich " VOWEL_FILE, "r");
     if (!file) {
@@ -100,15 +100,11 @@ static bool read_vowel_rules(char *const lang) {
     while (!feof(file) && !ferror(file) && fgets(buf, PATH_MAX, file)) {
         rtrim(buf);
         if (strlen(buf) > 0) {
-            filenames[size++] = strdup(buf);
+            filenames[size++] = gregorio_strdup(buf);
             if (size >= capacity) {
                 capacity <<= 1;
-                if (!(filenames = realloc(filenames,
-                                capacity * sizeof(char *)))) {
-                    gregorio_messagef("read_patterns", VERBOSITY_FATAL, 0,
-                            _("unable to allocate memory"));
-                    return false;
-                }
+                filenames = gregorio_realloc(filenames,
+                                capacity * sizeof(char *));
             }
         } else {
             gregorio_messagef("read_patterns", VERBOSITY_WARNING, 0,
@@ -216,7 +212,7 @@ static void determine_center(gregorio_character *character, int *start,
     if (count == 0) {
         return;
     }
-    subject = (grewchar *)malloc((count + 1) * sizeof(grewchar));
+    subject = (grewchar *)gregorio_malloc((count + 1) * sizeof(grewchar));
     for (count = 0, ch = character; ch; ch = ch->next_character) {
         if (ch->is_character) {
             subject[count ++] = ch->cos.character;
@@ -238,7 +234,7 @@ static bool go_to_end_initial(gregorio_character **param_character)
     if (!current_character) {
         return false;
     }
-    gregorio_go_to_first_character(&current_character);
+    gregorio_go_to_first_character_c(&current_character);
     /* skip past any initial */
     if (!current_character->is_character
             && current_character->cos.s.type == ST_T_BEGIN
@@ -268,7 +264,7 @@ static void style_push(det_style **current_style, unsigned char style)
     if (!current_style) {
         return;
     }
-    element = (det_style *) malloc(sizeof(det_style));
+    element = (det_style *) gregorio_malloc(sizeof(det_style));
     element->style = style;
     element->previous_style = NULL;
     element->next_style = (*current_style);
@@ -330,14 +326,14 @@ static void free_styles(det_style **first_style)
  * special-character. It places current_character to the character next to the
  * end of the verbatim or special_char charachters.
  */
-static __inline void verb_or_sp(gregorio_character **ptr_character,
+static __inline void verb_or_sp(const gregorio_character **ptr_character,
         const grestyle_style style, FILE *const f,
         void (*const function) (FILE *, grewchar *))
 {
     int i, j;
     grewchar *text;
-    gregorio_character *current_character;
-    gregorio_character *begin_character;
+    const gregorio_character *current_character;
+    const gregorio_character *begin_character;
 
     i = 0;
     j = 0;
@@ -359,7 +355,7 @@ static __inline void verb_or_sp(gregorio_character **ptr_character,
         ptr_character = &current_character;
         return;
     }
-    text = (grewchar *) malloc((i + 1) * sizeof(grewchar));
+    text = (grewchar *) gregorio_malloc((i + 1) * sizeof(grewchar));
     current_character = begin_character;
     while (j < i) {
         if (current_character->is_character) {
@@ -392,9 +388,9 @@ static __inline void verb_or_sp(gregorio_character **ptr_character,
  * complex styles. It would be a bit stupid to do such a thing, but users are
  * usually very creative when it comes to inventing twisted things...
  */
-void gregorio_write_text(const bool skip_initial,
-        gregorio_character *current_character,
-        FILE *const f, void (*const printverb) (FILE *, grewchar *),
+void gregorio_write_text(const gregorio_write_text_phase phase,
+        const gregorio_character *current_character, FILE *const f,
+        void (*const printverb) (FILE *, grewchar *),
         void (*const printchar) (FILE *, grewchar),
         void (*const begin) (FILE *, grestyle_style),
         void (*const end) (FILE *, grestyle_style),
@@ -417,7 +413,7 @@ void gregorio_write_text(const bool skip_initial,
                             printspchar);
                     break;
                 case ST_INITIAL:
-                    if (skip_initial) {
+                    if (phase == WTP_FIRST_SYLLABLE) {
                         while (current_character) {
                             if (!current_character->is_character
                                     && current_character->cos.s.type == ST_T_END
@@ -445,9 +441,10 @@ void gregorio_write_text(const bool skip_initial,
     }
 }
 
-void gregorio_write_first_letter_alignment_text(const bool skip_initial,
-        gregorio_character *current_character,
-        FILE *const f, void (*const printverb) (FILE *, grewchar *),
+void gregorio_write_first_letter_alignment_text(
+        const gregorio_write_text_phase phase,
+        const gregorio_character *current_character, FILE *const f,
+        void (*const printverb) (FILE *, grewchar *),
         void (*const printchar) (FILE *, grewchar),
         void (*const begin) (FILE *, grestyle_style),
         void (*const end) (FILE *, grestyle_style),
@@ -456,7 +453,7 @@ void gregorio_write_first_letter_alignment_text(const bool skip_initial,
     /* stack of styles to close and reopen */
     det_style *first_style = NULL;
     det_style *last_style = NULL;
-    bool first_letter_open = true;
+    int first_letter_open = (phase == WTP_FIRST_SYLLABLE)? 2 : 1;
 
     if (!current_character) {
         return;
@@ -465,7 +462,9 @@ void gregorio_write_first_letter_alignment_text(const bool skip_initial,
     /* go to the first character */
     gregorio_go_to_first_character(&current_character);
 
-    begin(f, ST_SYLLABLE_INITIAL);
+    if (phase != WTP_FIRST_SYLLABLE) {
+        begin(f, ST_SYLLABLE_INITIAL);
+    }
 
     /* loop until there are no characters left */
     for (; current_character;
@@ -474,7 +473,7 @@ void gregorio_write_first_letter_alignment_text(const bool skip_initial,
         /* found a real character */
         if (current_character->is_character) {
             printchar(f, current_character->cos.character);
-            close_first_letter = first_letter_open;
+            close_first_letter = first_letter_open != 0;
         } else switch (current_character->cos.s.type) {
         case ST_T_NOTHING:
             assert(false);
@@ -484,29 +483,23 @@ void gregorio_write_first_letter_alignment_text(const bool skip_initial,
             switch (current_character->cos.s.style) {
             case ST_CENTER:
             case ST_FORCED_CENTER:
-                /* ignore */
-                break;
             case ST_INITIAL:
-                if (skip_initial) {
-                    while (current_character) {
-                        if (!current_character->is_character
-                                && current_character->cos.s.type == ST_T_END
-                                && current_character->cos.s.style ==
-                                ST_INITIAL) {
-                            break;
-                        }
-                        current_character = current_character->next_character;
-                    }
-                } /* else ignore */
+            case ST_FIRST_SYLLABLE_INITIAL:
+                /* ignore */
                 break;
             case ST_VERBATIM:
                 verb_or_sp(&current_character, ST_VERBATIM, f, printverb);
-                close_first_letter = first_letter_open;
+                close_first_letter = first_letter_open != 0;
                 break;
             case ST_SPECIAL_CHAR:
                 verb_or_sp(&current_character, ST_SPECIAL_CHAR, f, printspchar);
-                close_first_letter = first_letter_open;
+                close_first_letter = first_letter_open != 0;
                 break;
+            case ST_FIRST_WORD:
+            case ST_FIRST_SYLLABLE:
+                if (phase == WTP_FIRST_SYLLABLE) {
+                    break;
+                } /* else fall through */
             default:
                 /* push the style onto the stack */
                 style_push(&first_style, current_character->cos.s.style);
@@ -518,12 +511,18 @@ void gregorio_write_first_letter_alignment_text(const bool skip_initial,
             case ST_CENTER:
             case ST_FORCED_CENTER:
             case ST_INITIAL:
+            case ST_FIRST_SYLLABLE_INITIAL:
                 /* ignore */
                 break;
             case ST_VERBATIM:
             case ST_SPECIAL_CHAR:
                 assert(false);
                 break;
+            case ST_FIRST_WORD:
+            case ST_FIRST_SYLLABLE:
+                if (phase == WTP_FIRST_SYLLABLE) {
+                    break;
+                } /* else fall through */
             default:
                 /* pop the style from the stack */
                 assert(first_style->style == current_character->cos.s.style);
@@ -533,12 +532,10 @@ void gregorio_write_first_letter_alignment_text(const bool skip_initial,
             break;
         }
 
-        if (!current_character->next_character && first_letter_open) {
-            close_first_letter = first_letter_open;
-        }
-
-        if (close_first_letter) {
-            first_letter_open = false;
+        while (close_first_letter || (!current_character->next_character
+                && first_letter_open > 0)) {
+            close_first_letter = false;
+            --first_letter_open;
 
             /* close all the styles in the stack */
             if (first_style) {
@@ -571,12 +568,18 @@ void gregorio_write_first_letter_alignment_text(const bool skip_initial,
         }
     }
 
+    if (phase == WTP_FIRST_SYLLABLE) {
+        while ((--first_letter_open) >= 0) {
+            end(f, ST_SYLLABLE_INITIAL);
+        }
+    }
+
     free_styles(&first_style);
 }
 
 /* the default behaviour is to write only the initial, that is to say things
  * between the styles ST_INITIAL */
-void gregorio_write_initial(gregorio_character *current_character,
+void gregorio_write_initial(const gregorio_character *current_character,
         FILE *const f, void (*const printverb) (FILE *, grewchar *),
         void (*const printchar) (FILE *, grewchar),
         void (*const begin) (FILE *, grestyle_style),
@@ -708,7 +711,7 @@ static void insert_style_before(unsigned char type,
         unsigned char style, gregorio_character *current_character)
 {
     gregorio_character *element =
-            (gregorio_character *) malloc(sizeof(gregorio_character));
+            (gregorio_character *) gregorio_malloc(sizeof(gregorio_character));
     element->is_character = 0;
     element->cos.s.type = type;
     element->cos.s.style = style;
@@ -732,7 +735,7 @@ static void insert_style_after(unsigned char type, unsigned char style,
         gregorio_character **current_character)
 {
     gregorio_character *element =
-            (gregorio_character *) malloc(sizeof(gregorio_character));
+            (gregorio_character *) gregorio_malloc(sizeof(gregorio_character));
     element->is_character = 0;
     element->cos.s.type = type;
     element->cos.s.style = style;
@@ -750,7 +753,7 @@ static void insert_char_after(grewchar c,
         gregorio_character **current_character)
 {
     gregorio_character *element =
-            (gregorio_character *) malloc(sizeof(gregorio_character));
+            (gregorio_character *) gregorio_malloc(sizeof(gregorio_character));
     element->is_character = 1;
     element->cos.character = c;
     element->next_character = (*current_character)->next_character;
@@ -971,7 +974,7 @@ static __inline bool _suppress_char_and_end_c(
  * in the middle of a verbatim block.
  */
 
-void gregorio_rebuild_characters(gregorio_character **param_character,
+void gregorio_rebuild_characters(gregorio_character **const param_character,
         gregorio_center_determination center_is_determined, bool skip_initial)
 {
     /* the current_character */
@@ -987,9 +990,9 @@ void gregorio_rebuild_characters(gregorio_character **param_character,
         if (!current_character->next_character) {
             /* nothing else to rebuild, but the initial needs to be ST_CENTER */
             insert_style_after(ST_T_END, ST_CENTER, &current_character);
-            gregorio_go_to_first_character(&current_character);
+            gregorio_go_to_first_character_c(&current_character);
             insert_style_before(ST_T_BEGIN, ST_CENTER, current_character);
-            gregorio_go_to_first_character(&current_character);
+            gregorio_go_to_first_character_c(&current_character);
             (*param_character) = current_character;
             return;
         }
@@ -997,7 +1000,7 @@ void gregorio_rebuild_characters(gregorio_character **param_character,
             /* move to the character after the initial */
             current_character = current_character->next_character;
         } else {
-            gregorio_go_to_first_character(&current_character);
+            gregorio_go_to_first_character_c(&current_character);
         }
     }
     /* first we see if there is already a center determined */
@@ -1178,12 +1181,12 @@ void gregorio_rebuild_characters(gregorio_character **param_character,
         if (skip_initial && go_to_end_initial(&current_character)) {
             current_character = current_character->next_character;
         } else {
-            gregorio_go_to_first_character(&current_character);
+            gregorio_go_to_first_character_c(&current_character);
         }
         insert_style_before(ST_T_BEGIN, ST_CENTER, current_character);
     }
     /* well.. you're quite brave if you reach this comment. */
-    gregorio_go_to_first_character(&current_character);
+    gregorio_go_to_first_character_c(&current_character);
     (*param_character) = current_character;
     free_styles(&first_style);
 }
@@ -1212,7 +1215,7 @@ void gregorio_rebuild_first_syllable(gregorio_character **param_character,
     gregorio_character *first_character;
     gregorio_character *start_of_special;
     /* so, here we start: we go to the first_character */
-    gregorio_go_to_first_character(&current_character);
+    gregorio_go_to_first_character_c(&current_character);
     /* first we look at the styles, to see if there is a FORCED_CENTER
      * somewhere and we also remove the CENTER styles if the syllable starts at
      * CENTER */
@@ -1240,7 +1243,7 @@ void gregorio_rebuild_first_syllable(gregorio_character **param_character,
         current_character = current_character->next_character;
     }
     current_character = *param_character;
-    gregorio_go_to_first_character(&current_character);
+    gregorio_go_to_first_character_c(&current_character);
     first_character = current_character;
     /* now we are going to place the two INITIAL styles (begin and end) */
     while (current_character) {
@@ -1316,7 +1319,7 @@ void gregorio_rebuild_first_syllable(gregorio_character **param_character,
             current_character = current_character->next_character;
         }
     } else {
-        gregorio_go_to_first_character(&current_character);
+        gregorio_go_to_first_character_c(&current_character);
     }
     if (current_character) {
         bool marked_syllable_initial = false;
@@ -1363,7 +1366,7 @@ void gregorio_rebuild_first_syllable(gregorio_character **param_character,
     }
 
     current_character = *param_character;
-    gregorio_go_to_first_character(&current_character);
+    gregorio_go_to_first_character_c(&current_character);
     (*param_character) = current_character;
 }
 
@@ -1398,6 +1401,6 @@ void gregorio_set_first_word(gregorio_character **const character)
     /* else there are no more characters here */
     
     if (*character) {
-        gregorio_go_to_first_character(character);
+        gregorio_go_to_first_character_c(character);
     }
 }
diff --git a/src/characters.h b/src/characters.h
index 94bec9c2d..06486dadc 100644
--- a/src/characters.h
+++ b/src/characters.h
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header prototypes the lyric handling data structures and entry points.
+ *
  * Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -54,23 +57,28 @@ typedef struct det_style {
 
 gregorio_character *gregorio_first_text(gregorio_score *score);
 
-void gregorio_write_text(bool skip_initial,
-        gregorio_character *current_character,
-        FILE *f, void (*printverb) (FILE *, grewchar *),
+typedef enum gregorio_write_text_phase {
+    WTP_NORMAL,
+    WTP_FIRST_SYLLABLE
+} gregorio_write_text_phase;
+
+void gregorio_write_text(gregorio_write_text_phase phase,
+        const gregorio_character *current_character, FILE *f,
+        void (*printverb) (FILE *, grewchar *),
         void (*printchar) (FILE *, grewchar),
         void (*begin) (FILE *, grestyle_style),
         void (*end) (FILE *, grestyle_style),
         void (*printspchar) (FILE *, grewchar *));
 
-void gregorio_write_first_letter_alignment_text(bool skip_initial,
-        gregorio_character *current_character,
-        FILE *f, void (*printverb) (FILE *, grewchar *),
+void gregorio_write_first_letter_alignment_text(gregorio_write_text_phase phase,
+        const gregorio_character *current_character, FILE *f,
+        void (*printverb) (FILE *, grewchar *),
         void (*printchar) (FILE *, grewchar),
         void (*begin) (FILE *, grestyle_style),
         void (*end) (FILE *, grestyle_style),
         void (*printspchar) (FILE *, grewchar *));
 
-void gregorio_write_initial(gregorio_character *current_character,
+void gregorio_write_initial(const gregorio_character *current_character,
         FILE *f, void (*printverb) (FILE *, grewchar *),
         void (*printchar) (FILE *, grewchar),
         void (*begin) (FILE *, grestyle_style),
diff --git a/src/config.h b/src/config.h
index 04f8734cb..9519115cb 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header wraps the generated config_.h to provide version macros.
+ *
  * Gregorio configuration headers.
  *
  * Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
diff --git a/src/dump/dump.c b/src/dump/dump.c
index a92a9d32c..db3b4a994 100644
--- a/src/dump/dump.c
+++ b/src/dump/dump.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX.
+ * This file provides functions to dump out Gregorio structures.
+ *
  * Copyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -27,78 +30,15 @@
 #include "plugins.h"
 #include "support.h"
 
-static const char *unknown(int value) {
-    static char buf[20];
-    gregorio_snprintf(buf, 20, "?%d", value);
-    return buf;
-}
-
-static const char *dump_translation_type_to_string(gregorio_tr_centering
-                                            translation_type)
-{
-    switch (translation_type) {
-    case TR_NORMAL:
-        return "TR_NORMAL";
-    case TR_WITH_CENTER_BEGINNING:
-        return "TR_WITH_CENTER_BEGINNING";
-    case TR_WITH_CENTER_END:
-        return "TR_WITH_CENTER_END";
-    }
-    return unknown(translation_type);
-}
-
-static const char *dump_nlba_to_string(gregorio_nlba no_linebreak_area)
-{
-    switch (no_linebreak_area) {
-    case NLBA_NORMAL:
-        return "NLBA_NORMAL";
-    case NLBA_BEGINNING:
-        return "NLBA_BEGINNING";
-    case NLBA_END:
-        return "NLBA_END";
-    }
-    return unknown(no_linebreak_area);
-}
-
 static const char *dump_style_to_string(grestyle_style style)
 {
-    switch (style) {
-    case ST_NO_STYLE:
-        return "     ST_NO_STYLE";
-    case ST_ITALIC:
-        return "       ST_ITALIC";
-    case ST_CENTER:
-        return "       ST_CENTER";
-    case ST_FORCED_CENTER:
-        return " ST_FORCED_CENTER";
-    case ST_INITIAL:
-        return "      ST_INITIAL";
-    case ST_BOLD:
-        return "         ST_BOLD";
-    case ST_TT:
-        return "           ST_TT";
-    case ST_UNDERLINED:
-        return "   ST_UNDERLINED";
-    case ST_COLORED:
-        return "      ST_COLORED";
-    case ST_SMALL_CAPS:
-        return "   ST_SMALL_CAPS";
-    case ST_SPECIAL_CHAR:
-        return " ST_SPECIAL_CHAR";
-    case ST_VERBATIM:
-        return "     ST_VERBATIM";
-    case ST_FIRST_WORD:
-        return "   ST_FIRST_WORD";
-    case ST_FIRST_SYLLABLE:
-        return "ST_FIRST_SYLLABLE";
-    case ST_FIRST_SYLLABLE_INITIAL:
-        return "ST_FIRST_SYLLABLE_INITIAL";
-    default:
-        return unknown(style);
-    }
+    static char buf[50];
+
+    gregorio_snprintf(buf, sizeof buf, "%16s", grestyle_style_to_string(style));
+    return buf;
 }
 
-static void dump_write_characters(FILE *const f,
+void dump_write_characters(FILE *const f,
         const gregorio_character * current_character)
 {
     while (current_character) {
@@ -144,372 +84,10 @@ static const char *dump_key_to_char(const int key)
     return "no key defined";
 }
 
-static const char *dump_syllable_position(gregorio_word_position pos)
-{
-    switch (pos) {
-    case WORD_BEGINNING:
-        return "WORD_BEGINNING";
-    case WORD_MIDDLE:
-        return "WORD_MIDDLE";
-    case WORD_END:
-        return "WORD_END";
-    case WORD_ONE_SYLLABLE:
-        return "WORD_ONE_SYLLABLE";
-    }
-    return "unknown";
-}
-
-static const char *dump_type(gregorio_type type)
-{
-    switch (type) {
-    case GRE_NOTE:
-        return "GRE_NOTE";
-    case GRE_GLYPH:
-        return "GRE_GLYPH";
-    case GRE_ELEMENT:
-        return "GRE_ELEMENT";
-    case GRE_FLAT:
-        return "GRE_FLAT";
-    case GRE_SHARP:
-        return "GRE_SHARP";
-    case GRE_NATURAL:
-        return "GRE_NATURAL";
-    case GRE_C_KEY_CHANGE:
-        return "GRE_C_KEY_CHANGE";
-    case GRE_F_KEY_CHANGE:
-        return "GRE_F_KEY_CHANGE";
-    case GRE_END_OF_LINE:
-        return "GRE_END_OF_LINE";
-    case GRE_END_OF_PAR:
-        return "GRE_END_OF_PAR";
-    case GRE_CUSTOS:
-        return "GRE_CUSTOS";
-    case GRE_SPACE:
-        return "GRE_SPACE";
-    case GRE_BAR:
-        return "GRE_BAR";
-    case GRE_SYLLABLE:
-        return "GRE_SYLLABLE";
-    case GRE_TEXVERB_GLYPH:
-        return "GRE_TEXVERB_GLYPH";
-    case GRE_TEXVERB_ELEMENT:
-        return "GRE_TEXVERB_ELEMENT";
-    case GRE_NLBA:
-        return "GRE_NLBA";
-    case GRE_ALT:
-        return "GRE_ALT";
-    case GRE_MANUAL_CUSTOS:
-        return "GRE_MANUAL_CUSTOS";
-    default:
-        return "unknown";
-    }
-}
-
-static const char *dump_bar_type(gregorio_bar element_type)
-{
-    switch (element_type) {
-    case B_NO_BAR:
-        return "B_NO_BAR";
-    case B_VIRGULA:
-        return "B_VIRGULA";
-    case B_DIVISIO_MINIMA:
-        return "B_DIVISIO_MINIMA";
-    case B_DIVISIO_MINOR:
-        return "B_DIVISIO_MINOR";
-    case B_DIVISIO_MAIOR:
-        return "B_DIVISIO_MAIOR";
-    case B_DIVISIO_FINALIS:
-        return "B_DIVISIO_FINALIS";
-    case B_DIVISIO_MINOR_D1:
-        return "B_DIVISIO_MINOR_D1";
-    case B_DIVISIO_MINOR_D2:
-        return "B_DIVISIO_MINOR_D2";
-    case B_DIVISIO_MINOR_D3:
-        return "B_DIVISIO_MINOR_D3";
-    case B_DIVISIO_MINOR_D4:
-        return "B_DIVISIO_MINOR_D4";
-    case B_DIVISIO_MINOR_D5:
-        return "B_DIVISIO_MINOR_D5";
-    case B_DIVISIO_MINOR_D6:
-        return "B_DIVISIO_MINOR_D6";
-    }
-    return "unknown";
-}
-
-static const char *dump_space_type(gregorio_space element_type)
-{
-    switch (element_type) {
-    case SP_DEFAULT:
-        return "SP_DEFAULT";
-    case SP_NO_SPACE:
-        return "SP_NO_SPACE";
-    case SP_ZERO_WIDTH:
-        return "SP_ZERO_WIDTH";
-    case SP_NEUMATIC_CUT:
-        return "SP_NEUMATIC_CUT";
-    case SP_LARGER_SPACE:
-        return "SP_LARGER_SPACE";
-    case SP_GLYPH_SPACE:
-        return "SP_GLYPH_SPACE";
-    case SP_GLYPH_SPACE_NB:
-        return "SP_GLYPH_SPACE_NB";
-    case SP_LARGER_SPACE_NB:
-        return "SP_LARGER_SPACE_NB";
-    case SP_NEUMATIC_CUT_NB:
-        return "SP_NEUMATIC_CUT_NB";
-    }
-    return "unknown";
-}
-
-static const char *dump_liquescentia(gregorio_liquescentia liquescentia)
-{
-    switch (liquescentia) {
-    case L_NO_LIQUESCENTIA:
-        return "L_NO_LIQUESCENTIA";
-    case L_DEMINUTUS:
-        return "L_DEMINUTUS";
-    case L_AUCTUS_ASCENDENS:
-        return "L_AUCTUS_ASCENDENS";
-    case L_AUCTUS_DESCENDENS:
-        return "L_AUCTUS_DESCENDENS";
-    case L_AUCTA:
-        return "L_AUCTA";
-    case L_INITIO_DEBILIS:
-        return "L_INITIO_DEBILIS";
-    case L_DEMINUTUS_INITIO_DEBILIS:
-        return "L_DEMINUTUS_INITIO_DEBILIS";
-    case L_AUCTUS_ASCENDENS_INITIO_DEBILIS:
-        return "L_AUCTUS_ASCENDENS_INITIO_DEBILIS";
-    case L_AUCTUS_DESCENDENS_INITIO_DEBILIS:
-        return "L_AUCTUS_DESCENDENS_INITIO_DEBILIS";
-    case L_AUCTA_INITIO_DEBILIS:
-        return "L_AUCTA_INITIO_DEBILIS";
-    }
-    return "unknown";
-}
-
-static const char *dump_glyph_type(gregorio_glyph_type glyph_type)
-{
-    switch (glyph_type) {
-    case G_PUNCTUM_INCLINATUM:
-        return "G_PUNCTUM_INCLINATUM";
-    case G_2_PUNCTA_INCLINATA_DESCENDENS:
-        return "G_2_PUNCTA_INCLINATA_DESCENDENS";
-    case G_3_PUNCTA_INCLINATA_DESCENDENS:
-        return "G_3_PUNCTA_INCLINATA_DESCENDENS";
-    case G_4_PUNCTA_INCLINATA_DESCENDENS:
-        return "G_4_PUNCTA_INCLINATA_DESCENDENS";
-    case G_5_PUNCTA_INCLINATA_DESCENDENS:
-        return "G_5_PUNCTA_INCLINATA_DESCENDENS";
-    case G_2_PUNCTA_INCLINATA_ASCENDENS:
-        return "G_2_PUNCTA_INCLINATA_ASCENDENS";
-    case G_3_PUNCTA_INCLINATA_ASCENDENS:
-        return "G_3_PUNCTA_INCLINATA_ASCENDENS";
-    case G_4_PUNCTA_INCLINATA_ASCENDENS:
-        return "G_4_PUNCTA_INCLINATA_ASCENDENS";
-    case G_5_PUNCTA_INCLINATA_ASCENDENS:
-        return "G_5_PUNCTA_INCLINATA_ASCENDENS";
-    case G_TRIGONUS:
-        return "G_TRIGONUS";
-    case G_PUNCTA_INCLINATA:
-        return "G_PUNCTA_INCLINATA";
-    case G_UNDETERMINED:
-        return "G_UNDETERMINED";
-    case G_VIRGA:
-        return "G_VIRGA";
-    case G_VIRGA_REVERSA:
-        return "G_VIRGA_REVERSA";
-    case G_STROPHA:
-        return "G_STROPHA";
-    case G_STROPHA_AUCTA:
-        return "G_STROPHA_AUCTA";
-    case G_PUNCTUM:
-        return "G_PUNCTUM";
-    case G_PODATUS:
-        return "G_PODATUS";
-    case G_PES_QUADRATUM:
-        return "G_PES_QUADRATUM";
-    case G_FLEXA:
-        return "G_FLEXA";
-    case G_TORCULUS:
-        return "G_TORCULUS";
-    case G_TORCULUS_RESUPINUS:
-        return "G_TORCULUS_RESUPINUS";
-    case G_TORCULUS_RESUPINUS_FLEXUS:
-        return "G_TORCULUS_RESUPINUS_FLEXUS";
-    case G_PORRECTUS:
-        return "G_PORRECTUS";
-    case G_PORRECTUS_FLEXUS:
-        return "G_PORRECTUS_FLEXUS";
-    case G_BIVIRGA:
-        return "G_BIVIRGA";
-    case G_TRIVIRGA:
-        return "G_TRIVIRGA";
-    case G_DISTROPHA:
-        return "G_DISTROPHA";
-    case G_DISTROPHA_AUCTA:
-        return "G_DISTROPHA_AUCTA";
-    case G_TRISTROPHA:
-        return "G_TRISTROPHA";
-    case G_ANCUS:
-        return "G_ANCUS";
-    case G_TRISTROPHA_AUCTA:
-        return "G_TRISTROPHA_AUCTA";
-    case G_PES_QUADRATUM_FIRST_PART:
-        return "G_PES_QUADRATUM_FIRST_PART";
-    case G_SCANDICUS:
-        return "G_SCANDICUS";
-    case G_SALICUS:
-        return "G_SALICUS";
-    case G_VIRGA_STRATA:
-        return "G_VIRGA_STRATA";
-    case G_TORCULUS_LIQUESCENS:
-        return "G_TORCULUS_LIQUESCENS";
-    default:
-        return "unknown";
-    }
-}
-
-static const char *dump_shape(gregorio_shape shape)
-{
-    switch (shape) {
-    case S_UNDETERMINED:
-        return "S_UNDETERMINED";
-    case S_PUNCTUM:
-        return "S_PUNCTUM";
-    case S_PUNCTUM_END_OF_GLYPH:
-        return "S_PUNCTUM_END_OF_GLYPH";
-    case S_PUNCTUM_INCLINATUM:
-        return "S_PUNCTUM_INCLINATUM";
-    case S_PUNCTUM_INCLINATUM_DEMINUTUS:
-        return "S_PUNCTUM_INCLINATUM_DEMINUTUS";
-    case S_PUNCTUM_INCLINATUM_AUCTUS:
-        return "S_PUNCTUM_INCLINATUM_AUCTUS";
-    case S_VIRGA:
-        return "S_VIRGA";
-    case S_VIRGA_REVERSA:
-        return "S_VIRGA_REVERSA";
-    case S_BIVIRGA:
-        return "S_BIVIRGA";
-    case S_TRIVIRGA:
-        return "S_TRIVIRGA";
-    case S_ORISCUS:
-        return "S_ORISCUS";
-    case S_ORISCUS_AUCTUS:
-        return "S_ORISCUS_AUCTUS";
-    case S_ORISCUS_DEMINUTUS:
-        return "S_ORISCUS_DEMINUTUS";
-    case S_ORISCUS_SCAPUS:
-        return "S_ORISCUS_SCAPUS";
-    case S_QUILISMA:
-        return "S_QUILISMA";
-    case S_STROPHA:
-        return "S_STROPHA";
-    case S_STROPHA_AUCTA:
-        return "S_STROPHA_AUCTA";
-    case S_DISTROPHA:
-        return "S_DISTROPHA";
-    case S_DISTROPHA_AUCTA:
-        return "S_DISTROPHA_AUCTA";
-    case S_TRISTROPHA:
-        return "S_TRISTROPHA";
-    case S_TRISTROPHA_AUCTA:
-        return "S_TRISTROPHA_AUCTA";
-    case S_QUADRATUM:
-        return "S_QUADRATUM";
-    case S_PUNCTUM_CAVUM:
-        return "S_PUNCTUM_CAVUM";
-    case S_LINEA_PUNCTUM:
-        return "S_LINEA_PUNCTUM";
-    case S_LINEA_PUNCTUM_CAVUM:
-        return "S_LINEA_PUNCTUM_CAVUM";
-    case S_LINEA:
-        return "S_LINEA";
-    case S_PUNCTUM_CAVUM_INCLINATUM:
-        return "S_PUNCTUM_CAVUM_INCLINATUM";
-    case S_PUNCTUM_CAVUM_INCLINATUM_AUCTUS:
-        return "S_PUNCTUM_CAVUM_INCLINATUM_AUCTUS";
-    default:
-        return "unknown";
-    }
-}
-
-static const char *dump_signs(gregorio_sign signs)
-{
-    switch (signs) {
-    case _NO_SIGN:
-        return "_NO_SIGN";
-    case _PUNCTUM_MORA:
-        return "_PUNCTUM_MORA";
-    case _AUCTUM_DUPLEX:
-        return "_AUCTUM_DUPLEX";
-    case _V_EPISEMA:
-        return "_V_EPISEMA";
-    case _V_EPISEMA_PUNCTUM_MORA:
-        return "_V_EPISEMA_PUNCTUM_MORA";
-    case _V_EPISEMA_AUCTUM_DUPLEX:
-        return "_V_EPISEMA_AUCTUM_DUPLEX";
-    default:
-        return "unknown";
-    }
-}
-
-/* a function dumping special signs */
-static const char *dump_special_sign(gregorio_sign special_sign)
-{
-    switch (special_sign) {
-    case _ACCENTUS:
-        return "_ACCENTUS";
-    case _ACCENTUS_REVERSUS:
-        return "_ACCENTUS_REVERSUS";
-    case _CIRCULUS:
-        return "_CIRCULUS";
-    case _SEMI_CIRCULUS:
-        return "_SEMI_CIRCULUS";
-    case _SEMI_CIRCULUS_REVERSUS:
-        return "_SEMI_CIRCULUS_REVERSUS";
-    case _V_EPISEMA:
-        return "_V_EPISEMA";
-    case _V_EPISEMA_BAR_H_EPISEMA:
-        return "_V_EPISEMA_BAR_H_EPISEMA";
-    case _BAR_H_EPISEMA:
-        return "_BAR_H_EPISEMA";
-    default:
-        return "unknown";
-    }
-}
-
-static const char *dump_h_episema_size(grehepisema_size size)
-{
-    switch (size) {
-    case H_NORMAL:
-        return "H_NORMAL";
-    case H_SMALL_LEFT:
-        return "H_SMALL_LEFT";
-    case H_SMALL_CENTRE:
-        return "H_SMALL_CENTRE";
-    case H_SMALL_RIGHT:
-        return "H_SMALL_RIGHT";
-    }
-    return "unknown";
-}
-
 static const char *dump_bool(bool value) {
     return value? "true" : "false";
 }
 
-static const char *dump_vposition(gregorio_vposition vpos) {
-    switch (vpos) {
-    case VPOS_AUTO:
-        return "VPOS_AUTO";
-    case VPOS_ABOVE:
-        return "VPOS_ABOVE";
-    case VPOS_BELOW:
-        return "VPOS_BELOW";
-    }
-    return "unknown";
-}
-
 static const char *dump_pitch(const char height) {
     static char buf[20];
     if (height >= LOWEST_PITCH && height <= HIGHEST_PITCH) {
@@ -564,6 +142,9 @@ void dump_write_score(FILE *f, gregorio_score *score)
     if (score->arranger) {
         fprintf(f, "   arranger                  %s\n", score->arranger);
     }
+    if (score->language) {
+        fprintf(f, "   language                  %s\n", score->language);
+    }
     if (score->si.author) {
         fprintf(f, "   author                    %s\n", score->si.author);
     }
@@ -591,16 +172,9 @@ void dump_write_score(FILE *f, gregorio_score *score)
         fprintf(f, "   transcription_date        %s\n",
                 score->si.transcription_date);
     }
-    if (score->gregoriotex_font) {
-        fprintf(f, "   gregoriotex_font          %s\n",
-                score->gregoriotex_font);
-    }
     if (score->mode) {
         fprintf(f, "   mode                      %d\n", score->mode);
     }
-    if (score->initial_style) {
-        fprintf(f, "   initial_style             %d\n", score->initial_style);
-    }
     if (score->nabc_lines) {
         fprintf (f, "   nabc_lines                %d\n", (int)score->nabc_lines);
     }
@@ -646,20 +220,20 @@ void dump_write_score(FILE *f, gregorio_score *score)
         gregorio_element *element;
         if (syllable->type) {
             fprintf(f, "   type                      %d (%s)\n",
-                    syllable->type, dump_type(syllable->type));
+                    syllable->type, gregorio_type_to_string(syllable->type));
         }
         if (syllable->position) {
             fprintf(f, "   position                  %d (%s)\n",
                     syllable->position,
-                    dump_syllable_position(syllable->position));
+                    gregorio_word_position_to_string(syllable->position));
         }
         if (syllable->special_sign) {
             fprintf(f, "   special sign                       %s\n",
-                    dump_special_sign(syllable->special_sign));
+                    gregorio_sign_to_string(syllable->special_sign));
         }
         if (syllable->no_linebreak_area != NLBA_NORMAL) {
             fprintf(f, "   no line break area        %s\n",
-                    dump_nlba_to_string(syllable->no_linebreak_area));
+                    gregorio_nlba_to_string(syllable->no_linebreak_area));
         }
         if (syllable->text) {
             if (syllable->translation) {
@@ -671,7 +245,7 @@ void dump_write_score(FILE *f, gregorio_score *score)
              && syllable->translation_type != TR_WITH_CENTER_END)
             || syllable->translation_type == TR_WITH_CENTER_END) {
             fprintf(f, "\n  Translation type             %s",
-                    dump_translation_type_to_string
+                    gregorio_tr_centering_to_string
                     (syllable->translation_type));
             if (syllable->translation_type == TR_WITH_CENTER_END) {
                 fprintf(f, "\n");
@@ -689,7 +263,7 @@ void dump_write_score(FILE *f, gregorio_score *score)
             fprintf(f, "---------------------------------------------------------------------\n");
             if (element->type) {
                 fprintf(f, "     type                    %d (%s)\n",
-                        element->type, dump_type(element->type));
+                        element->type, gregorio_type_to_string(element->type));
             }
             switch (element->type) {
             case GRE_CUSTOS:
@@ -705,8 +279,8 @@ void dump_write_score(FILE *f, gregorio_score *score)
                 if (element->u.misc.unpitched.info.space) {
                     fprintf(f, "     space                   %d (%s)\n",
                             element->u.misc.unpitched.info.space,
-                            dump_space_type(element->u.misc.unpitched.info.
-                                space));
+                            gregorio_space_to_string(element->u.misc.unpitched.
+                                                     info.space));
                 }
                 break;
             case GRE_TEXVERB_ELEMENT:
@@ -716,7 +290,7 @@ void dump_write_score(FILE *f, gregorio_score *score)
             case GRE_NLBA:
                 fprintf(f, "     nlba                    %d (%s)\n",
                         element->u.misc.unpitched.info.nlba,
-                        dump_nlba_to_string(element->u.misc.unpitched.info.
+                        gregorio_nlba_to_string(element->u.misc.unpitched.info.
                             nlba));
                 break;
             case GRE_ALT:
@@ -727,12 +301,13 @@ void dump_write_score(FILE *f, gregorio_score *score)
                 if (element->u.misc.unpitched.info.bar) {
                     fprintf(f, "     bar                     %d (%s)\n",
                             element->u.misc.unpitched.info.bar,
-                            dump_bar_type(element->u.misc.unpitched.info.bar));
+                            gregorio_bar_to_string(element->u.misc.unpitched.
+                                                   info.bar));
                     if (element->u.misc.unpitched.special_sign) {
                         fprintf(f, "     special sign            %d (%s)\n",
                                 element->u.misc.unpitched.special_sign,
-                                dump_special_sign(element->u.misc.unpitched.
-                                                  special_sign));
+                                gregorio_sign_to_string(element->
+                                        u.misc.unpitched.special_sign));
                     }
                 }
                 break;
@@ -760,7 +335,8 @@ void dump_write_score(FILE *f, gregorio_score *score)
                 if (element->u.misc.unpitched.info.sub_type) {
                     fprintf(f, "     sub_type                %d (%s)\n",
                             element->u.misc.unpitched.info.sub_type,
-                            dump_type(element->u.misc.unpitched.info.sub_type));
+                            gregorio_type_to_string(element->u.misc.unpitched.
+                                                    info.sub_type));
                 }
                 break;
             case GRE_ELEMENT:
@@ -770,7 +346,8 @@ void dump_write_score(FILE *f, gregorio_score *score)
                     fprintf(f, "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n");
                     if (glyph->type) {
                         fprintf(f, "       type                  %d (%s)\n",
-                                glyph->type, dump_type(glyph->type));
+                                glyph->type, gregorio_type_to_string(glyph->
+                                                                     type));
                     }
                     switch (glyph->type) {
                     case GRE_TEXVERB_GLYPH:
@@ -781,20 +358,20 @@ void dump_write_score(FILE *f, gregorio_score *score)
                     case GRE_SPACE:
                         fprintf(f, "       space                 %d (%s)\n",
                                 glyph->u.misc.unpitched.info.space,
-                                dump_space_type(glyph->u.misc.unpitched.info.
-                                                space));
+                                gregorio_space_to_string(glyph->u.misc.
+                                                         unpitched.info.space));
                         break;
 
                     case GRE_BAR:
                         fprintf(f, "       glyph_type            %d (%s)\n",
                                 glyph->u.misc.unpitched.info.bar,
-                                dump_bar_type(glyph->u.misc.unpitched.info.
-                                              bar));
+                                gregorio_bar_to_string(glyph->u.misc.unpitched.
+                                                       info.bar));
                         if (glyph->u.misc.unpitched.special_sign) {
                             fprintf(f, "       special sign          %d (%s)\n",
                                     glyph->u.misc.unpitched.special_sign,
-                                    dump_special_sign(glyph->u.misc.unpitched.
-                                                      special_sign));
+                                    gregorio_sign_to_string(glyph->
+                                            u.misc.unpitched.special_sign));
                         }
                         break;
 
@@ -808,12 +385,13 @@ void dump_write_score(FILE *f, gregorio_score *score)
                     case GRE_GLYPH:
                         fprintf(f, "       glyph_type            %d (%s)\n",
                                 glyph->u.notes.glyph_type,
-                                dump_glyph_type(glyph->u.notes.glyph_type));
+                                gregorio_glyph_type_to_string(glyph->u.notes.
+                                                              glyph_type));
                         if (glyph->u.notes.liquescentia) {
                             fprintf(f, "       liquescentia          %d (%s)\n",
                                     glyph->u.notes.liquescentia,
-                                    dump_liquescentia(glyph->u.notes.
-                                                      liquescentia));
+                                    gregorio_liquescentia_to_string(
+                                            glyph->u.notes.liquescentia));
                         }
                         break;
 
@@ -827,7 +405,8 @@ void dump_write_score(FILE *f, gregorio_score *score)
                             fprintf(f, "-  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  \n");
                             if (note->type) {
                                 fprintf(f, "         type                   %d (%s)\n",
-                                        note->type, dump_type(note->type));
+                                        note->type,
+                                        gregorio_type_to_string(note->type));
                             }
                             switch (note->type) {
                             case GRE_NOTE:
@@ -838,13 +417,14 @@ void dump_write_score(FILE *f, gregorio_score *score)
                                 if (note->u.note.shape) {
                                     fprintf(f, "         shape                  %d (%s)\n",
                                             note->u.note.shape,
-                                            dump_shape(note->u.note.shape));
+                                            gregorio_shape_to_string(
+                                                    note->u.note.shape));
                                 }
                                 if (note->u.note.liquescentia) {
                                     fprintf(f, "         liquescentia           %d (%s)\n",
                                             note->u.note.liquescentia,
-                                            dump_liquescentia(note->u.note.
-                                                              liquescentia));
+                                            gregorio_liquescentia_to_string(
+                                                    note->u.note.liquescentia));
                                 }
                                 break;
 
@@ -862,7 +442,8 @@ void dump_write_score(FILE *f, gregorio_score *score)
                             }
                             if (note->signs) {
                                 fprintf(f, "         signs                  %d (%s)\n",
-                                        note->signs, dump_signs(note->signs));
+                                        note->signs,
+                                        gregorio_sign_to_string(note->signs));
                             }
                             if (note->signs & _V_EPISEMA && note->v_episema_height) {
                                 if (note->v_episema_height < note->u.note.pitch) {
@@ -876,18 +457,21 @@ void dump_write_score(FILE *f, gregorio_score *score)
                                         || note->signs == _V_EPISEMA_PUNCTUM_MORA)
                                     && note->mora_vposition) {
                                 fprintf(f, "         mora vposition         %s\n",
-                                        dump_vposition(note->mora_vposition));
+                                        gregorio_vposition_to_string(note->
+                                                mora_vposition));
                             }
                             if (note->special_sign) {
                                 fprintf(f, "         special sign           %d (%s)\n",
                                         note->special_sign,
-                                        dump_special_sign(note->special_sign));
+                                        gregorio_sign_to_string(
+                                                note->special_sign));
                             }
                             if (note->h_episema_above == HEPISEMA_AUTO
                                     && note->h_episema_below == HEPISEMA_AUTO) {
                                 fprintf(f, "         auto hepisema size     %d (%s)\n",
                                         note->h_episema_above_size,
-                                        dump_h_episema_size(note->h_episema_above_size));
+                                        grehepisema_size_to_string(note->
+                                                h_episema_above_size));
                                 fprintf(f, "         auto hepisema bridge   %s\n",
                                         dump_bool(note->h_episema_above_connect));
                             }
@@ -895,14 +479,16 @@ void dump_write_score(FILE *f, gregorio_score *score)
                                 if (note->h_episema_above == HEPISEMA_FORCED) {
                                     fprintf(f, "         above hepisema size    %d (%s)\n",
                                             note->h_episema_above_size,
-                                            dump_h_episema_size(note->h_episema_above_size));
+                                            grehepisema_size_to_string(note->
+                                                    h_episema_above_size));
                                     fprintf(f, "         above hepisema bridge  %s\n",
                                             dump_bool(note->h_episema_above_connect));
                                 }
                                 if (note->h_episema_below == HEPISEMA_FORCED) {
                                     fprintf(f, "         below hepisema size    %d (%s)\n",
                                             note->h_episema_below_size,
-                                            dump_h_episema_size(note->h_episema_below_size));
+                                            grehepisema_size_to_string(note->
+                                                    h_episema_below_size));
                                     fprintf(f, "         below hepisema bridge  %s\n",
                                             dump_bool(note->h_episema_below_connect));
                                 }
diff --git a/src/enum_generator.h b/src/enum_generator.h
new file mode 100644
index 000000000..e6c6ae104
--- /dev/null
+++ b/src/enum_generator.h
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
+ *
+ * This file is part of Gregorio.
+ *
+ * Gregorio 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.
+ *
+ * Gregorio 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 Gregorio.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* These macros are used for generating enum code.  This is based on the
+ * technique described in http://stackoverflow.com/a/202511
+ *
+ * Two of these macros are meant for use outside this set of macros:
+ *
+ * - ENUM declares the enum itself and a prototype for the function that
+ *   returns the string value of the enum's numeric value.  This is meant to be
+ *   used from a header file.
+ * - ENUM_TO_STRING defines the function whose prototype was declared by ENUM.
+ *   This is meant to be used from a code file.
+ *
+ * These two macros both take the following two arguments:
+ *
+ * - TYPE is the name to use for the enum.
+ * - DEF is the name of a macro that generates the bodies of the enum and the
+ *   to-string function.  DEF should take four arguments, in the following
+ *   order (with suggested names):
+ *   - A is a macro that generates an enum value with a specifiec numeric
+ *     value.  It takes two arguments, the name and the numeric value.
+ *   - E is a macro that generates an enum value that has no specific numeric
+ *     value.  It takes one argument, the name.
+ *   - X is a macro that generates the last enum value when it has a specific
+ *     numeric value.  It takes the same two arguments as A.
+ *   - L is a macro that generates the last enum value when it has no specific
+ *     numeric value.  It takes the same argument as E.
+ *
+ *  Note: If we were supporting C11, we could take empty macro arguments and
+ *  would be able to get away with only two arguments to DEF.
+ */
+
+#ifndef ENUM_GENERATOR_H
+#define ENUM_GENERATOR_H
+
+/* for enum values */
+#define ENUM_VALUE(NAME,VALUE) NAME = VALUE,
+#define ENUM_ENTRY(NAME) NAME,
+#define ENUM_LAST_VALUE(NAME,VALUE) NAME = VALUE
+#define ENUM_LAST_ENTRY(NAME) NAME
+
+/* for enum case */
+#define ENUM_VALUE_CASE(NAME,VALUE) case NAME: return #NAME;
+#define ENUM_ENTRY_CASE(NAME) case NAME: return #NAME;
+
+/* enum declaration */
+#define ENUM(TYPE,DEF) \
+    typedef enum TYPE { \
+        DEF(ENUM_VALUE, ENUM_ENTRY, ENUM_LAST_VALUE, ENUM_LAST_ENTRY) \
+    } TYPE; \
+    const char *TYPE##_to_string(TYPE value)
+
+/* enum *_to_string function defintiion */
+#define ENUM_TO_STRING(TYPE,DEF) \
+    const char *TYPE##_to_string(TYPE value) \
+    { \
+        switch(value) { \
+            DEF(ENUM_VALUE_CASE, ENUM_ENTRY_CASE, ENUM_VALUE_CASE, ENUM_ENTRY_CASE) \
+            default: return gregorio_unknown(value); \
+        } \
+    }
+
+#endif
diff --git a/src/gabc/gabc-elements-determination.c b/src/gabc/gabc-elements-determination.c
index eefdc86e4..3991760f8 100644
--- a/src/gabc/gabc-elements-determination.c
+++ b/src/gabc/gabc-elements-determination.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX.
+ * This file provides functions for determining elements from notes.
+ *
  * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
diff --git a/src/gabc/gabc-glyphs-determination.c b/src/gabc/gabc-glyphs-determination.c
index 016d03b09..f31790d38 100644
--- a/src/gabc/gabc-glyphs-determination.c
+++ b/src/gabc/gabc-glyphs-determination.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file provides functions for determining glyphs from notes.
+ *
  * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -339,6 +342,14 @@ static char gregorio_add_note_to_a_glyph(gregorio_glyph_type current_glyph_type,
         case G_VIRGA_STRATA:
             if (current_pitch > last_pitch) {
                 next_glyph_type = G_SALICUS;
+            } else {
+                next_glyph_type = G_PUNCTUM;
+                *end_of_glyph = DET_END_OF_PREVIOUS;
+            }
+            break;
+        case G_SALICUS:
+            if (current_pitch < last_pitch) {
+                next_glyph_type = G_SALICUS_FLEXUS;
                 *end_of_glyph = DET_END_OF_CURRENT;
             } else {
                 next_glyph_type = G_PUNCTUM;
diff --git a/src/gabc/gabc-notes-determination.l b/src/gabc/gabc-notes-determination.l
index 80c2310f2..f48875aea 100644
--- a/src/gabc/gabc-notes-determination.l
+++ b/src/gabc/gabc-notes-determination.l
@@ -1,5 +1,8 @@
 %{
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the note parser.
+ *
  * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -211,7 +214,7 @@ static __inline void add_alteration(const gregorio_type type) {
                     "\\GreVarBraceSavePos{%d}{%d}{1}"
                     "\\GreOverBrace{\\GreVarBraceLength{%d}}{0pt}{0pt}{%d}",
                     overbrace_var, char_for_brace, overbrace_var, char_for_brace);
-            gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+            gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
         }
     }
 <INITIAL>\[ub:[01]\{\] {
@@ -226,7 +229,7 @@ static __inline void add_alteration(const gregorio_type type) {
                     "\\GreVarBraceSavePos{%d}{%d}{1}"
                     "\\GreUnderBrace{\\GreVarBraceLength{%d}}{0pt}{0pt}{%d}",
                     underbrace_var, char_for_brace, underbrace_var, char_for_brace);
-            gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+            gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
         }
     }
 <INITIAL>\[ocb:[01]\{\] {
@@ -242,7 +245,7 @@ static __inline void add_alteration(const gregorio_type type) {
                     "\\GreVarBraceSavePos{%d}{%d}{1}"
                     "\\GreOverCurlyBrace{\\GreVarBraceLength{%d}}{0pt}{0pt}{%d}{0}",
                     overbrace_var, char_for_brace, overbrace_var, char_for_brace);
-            gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+            gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
         }
     }
 <INITIAL>\[ocba:[01]\{\] {
@@ -258,7 +261,7 @@ static __inline void add_alteration(const gregorio_type type) {
                     "\\GreVarBraceSavePos{%d}{%d}{1}"
                     "\\GreOverCurlyBrace{\\GreVarBraceLength{%d}}{0pt}{0pt}{%d}{1}",
                     overbrace_var, char_for_brace, overbrace_var, char_for_brace);
-            gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+            gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
         }
     }
 <INITIAL>\[ob:[01]\}\] {
@@ -277,7 +280,7 @@ static __inline void add_alteration(const gregorio_type type) {
                     "\\GreVarBraceSavePos{%d}{%d}{2}", overbrace_var,
                     char_for_brace);
             overbrace_var = 0;
-            gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+            gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
         }
     }
 <INITIAL>\[ub:[01]\}\] {
@@ -291,7 +294,7 @@ static __inline void add_alteration(const gregorio_type type) {
                     "\\GreVarBraceSavePos{%d}{%d}{2}", underbrace_var,
                     char_for_brace);
             underbrace_var = 0;
-            gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+            gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
         }
     }
 <INITIAL>\[ocb:[01]\}\] {
@@ -310,7 +313,7 @@ static __inline void add_alteration(const gregorio_type type) {
                     "\\GreVarBraceSavePos{%d}{%d}{2}", overbrace_var,
                     char_for_brace);
             overbrace_var = 0;
-            gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+            gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
         }
     }
 <INITIAL>\[ocba:[01]\}\] {
@@ -329,33 +332,33 @@ static __inline void add_alteration(const gregorio_type type) {
                     "\\GreVarBraceSavePos{%d}{%d}{2}", overbrace_var,
                     char_for_brace);
             overbrace_var = 0;
-            gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+            gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
         }
     }
 <INITIAL>\[nm[1-9]\] {
         if (notesmacros[gabc_notes_determination_text[3]-'0']) {
             gregorio_add_texverb_to_note(&current_note,
-            strdup(notesmacros[gabc_notes_determination_text[3]-'0']));
+            gregorio_strdup(notesmacros[gabc_notes_determination_text[3]-'0']));
         } else error();
     }
 <INITIAL>\[gm[1-9]\] {
         if (notesmacros[gabc_notes_determination_text[3]-'0']) {
             gregorio_add_texverb_as_note(&current_note,
-            strdup(notesmacros[gabc_notes_determination_text[3]-'0']),
+            gregorio_strdup(notesmacros[gabc_notes_determination_text[3]-'0']),
             GRE_TEXVERB_GLYPH, &notes_lloc);
         } else error();
     }
 <INITIAL>\[em[1-9]\] {
         if (notesmacros[gabc_notes_determination_text[3]-'0']) {
             gregorio_add_texverb_as_note(&current_note,
-            strdup(notesmacros[gabc_notes_determination_text[3]-'0']),
+            gregorio_strdup(notesmacros[gabc_notes_determination_text[3]-'0']),
             GRE_TEXVERB_ELEMENT, &notes_lloc);
         } else error();
     }
 <INITIAL>\[altm[1-9]\] {
         if (notesmacros[gabc_notes_determination_text[5]-'0']) {
             gregorio_add_texverb_as_note(&current_note,
-            strdup(notesmacros[gabc_notes_determination_text[5]-'0']),
+            gregorio_strdup(notesmacros[gabc_notes_determination_text[5]-'0']),
             GRE_TEXVERB_ELEMENT, &notes_lloc);
         } else error();
     }
@@ -381,63 +384,65 @@ static __inline void add_alteration(const gregorio_type type) {
         gregorio_snprintf(tempstr, sizeof tempstr,
                 "\\GreOverBrace{%s}{0pt}{0pt}{%d}",
                 gabc_notes_determination_text, char_for_brace);
-        gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+        gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
     }
 <underbrace>[^\]]+ {
         gregorio_snprintf(tempstr, sizeof tempstr,
                 "\\GreUnderBrace{%s}{0pt}{0pt}{%d}",
                 gabc_notes_determination_text, char_for_brace);
-        gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+        gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
     }
 <overcurlybrace>[^\]]+ {
         gregorio_snprintf(tempstr, sizeof tempstr,
                 "\\GreOverCurlyBrace{%s}{0pt}{0pt}{%d}{0}",
                 gabc_notes_determination_text, char_for_brace);
-        gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+        gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
     }
 <overcurlyaccentusbrace>[^\]]+ {
         gregorio_snprintf(tempstr, sizeof tempstr,
                 "\\GreOverCurlyBrace{%s}{0pt}{0pt}{%d}{1}",
                 gabc_notes_determination_text, char_for_brace);
-        gregorio_add_texverb_to_note(&current_note, strdup(tempstr));
+        gregorio_add_texverb_to_note(&current_note, gregorio_strdup(tempstr));
     }
 <choralsign>[^\]]+ {
         gregorio_add_cs_to_note(&current_note,
-                strdup(gabc_notes_determination_text), false);
+                gregorio_strdup(gabc_notes_determination_text), false);
     }
 <choralnabc>[^\]]+ {
         gregorio_add_cs_to_note(&current_note,
-                strdup(gabc_notes_determination_text), true);
+                gregorio_strdup(gabc_notes_determination_text), true);
     }
 <texverbnote>[^\]]+ {
         gregorio_add_texverb_to_note(&current_note,
-                strdup(gabc_notes_determination_text));
+                gregorio_strdup(gabc_notes_determination_text));
     }
 <texverbglyph>[^\]]+ {
         gregorio_add_texverb_as_note(&current_note,
-                strdup(gabc_notes_determination_text), GRE_TEXVERB_GLYPH,
-                &notes_lloc);
+                gregorio_strdup(gabc_notes_determination_text),
+                GRE_TEXVERB_GLYPH, &notes_lloc);
     }
 <texverbelement>[^\]]+ {
         gregorio_add_texverb_as_note(&current_note,
-                strdup(gabc_notes_determination_text), GRE_TEXVERB_ELEMENT,
-                &notes_lloc);
+                gregorio_strdup(gabc_notes_determination_text),
+                GRE_TEXVERB_ELEMENT, &notes_lloc);
     }
 <alt>[^\]]+ {
         gregorio_add_texverb_as_note(&current_note,
-                strdup(gabc_notes_determination_text), GRE_ALT, &notes_lloc);
+                gregorio_strdup(gabc_notes_determination_text), GRE_ALT,
+                &notes_lloc);
     }
 <texverbnote,texverbglyph,texverbelement,choralsign,choralnabc,alt,overcurlyaccentusbrace,overcurlybrace,overbrace,underbrace>\] {
         BEGIN(INITIAL);
     }
 \{  {
-        gregorio_add_texverb_as_note(&current_note, strdup("\\hbox to 0pt{"),
-                GRE_TEXVERB_ELEMENT, &notes_lloc);
+        gregorio_add_texverb_as_note(&current_note,
+                gregorio_strdup("\\hbox to 0pt{"), GRE_TEXVERB_ELEMENT,
+                &notes_lloc);
     }
 \}  {
         gregorio_add_texverb_as_note(&current_note,
-                strdup("\\hss%\n}%\n\\GreNoBreak\\relax "), GRE_TEXVERB_ELEMENT,
-                &notes_lloc);
+                gregorio_strdup("\\hss%\n}%\n\\GreNoBreak\\relax "),
+                GRE_TEXVERB_ELEMENT, &notes_lloc);
     }
 [a-m]\+ {
         gregorio_add_manual_custos_as_note(&current_note,
diff --git a/src/gabc/gabc-score-determination.h b/src/gabc/gabc-score-determination.h
index 0eb917943..3098ec177 100644
--- a/src/gabc/gabc-score-determination.h
+++ b/src/gabc/gabc-score-determination.h
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header shares definitions between the score parser and lexer.
+ *
  * Gregorio score determination in gabc input.
  * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
diff --git a/src/gabc/gabc-score-determination.l b/src/gabc/gabc-score-determination.l
index 4d2a07992..36cbe385e 100644
--- a/src/gabc/gabc-score-determination.l
+++ b/src/gabc/gabc-score-determination.l
@@ -1,5 +1,8 @@
 %{
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the score lexer.
+ *
  * Gregorio score determination in gabc input.
  * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
@@ -25,12 +28,15 @@
 #include <string.h>
 #include "struct.h"
 #include "messages.h"
+#include "bool.h"
+#include "support.h"
 
 #include "gabc.h"
 #include "gabc-score-determination.h"
 #include "gabc-score-determination-y.h"
 
 static unsigned char style_stack = 0;
+static bool eof_found = false;
 
 #define YY_NO_INPUT
 
@@ -120,7 +126,8 @@ semicolon. */
         return COLON;
     }
 <attribute>[^;\n\r]*(;[^;\n\r]+)*([\n\r]+[^;]*(;[^;]+)*)? {
-        gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+        gabc_score_determination_lval.text =
+                gregorio_strdup(gabc_score_determination_text);
         return ATTRIBUTE;
     }
 <attribute>;(;|[\n\r]+) {
@@ -231,7 +238,8 @@ semicolon. */
                 gabc_score_determination_text[0]);
     }
 <score>[^\{\}\(\[\]<%]+ {
-        gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+        gabc_score_determination_lval.text =
+                gregorio_strdup(gabc_score_determination_text);
         return CHARACTERS;
     }
 <score,style><i> {
@@ -325,7 +333,8 @@ semicolon. */
         return SP_END;
     }
 <style>[^<\{\}]* {
-        gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+        gabc_score_determination_lval.text =
+                gregorio_strdup(gabc_score_determination_text);
         return CHARACTERS;
     }
 <score>\% {
@@ -350,11 +359,13 @@ semicolon. */
         return VERB_END;
     }
 <verb>[^<]* {
-        gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+        gabc_score_determination_lval.text =
+                gregorio_strdup(gabc_score_determination_text);
         return CHARACTERS;
     }
 <verb,style,score,alt>< {
-        gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+        gabc_score_determination_lval.text =
+                gregorio_strdup(gabc_score_determination_text);
         return CHARACTERS;
     }
 <score,style>\{ {
@@ -368,7 +379,8 @@ semicolon. */
         return ALT_BEGIN;
     }
 <alt>[^<]* {
-        gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+        gabc_score_determination_lval.text =
+                gregorio_strdup(gabc_score_determination_text);
         return CHARACTERS;
     }
 <alt><\/alt> {
@@ -395,7 +407,8 @@ semicolon. */
         return OPENING_BRACKET;
     }
 <notes>[^&|\)]* {
-        gabc_score_determination_lval.text = strdup(gabc_score_determination_text);
+        gabc_score_determination_lval.text =
+                gregorio_strdup(gabc_score_determination_text);
         return NOTES;
     }
 <notes>& {
@@ -412,5 +425,13 @@ semicolon. */
         BEGIN(score);
         return CLOSING_BRACKET_WITH_SPACE;
     }
+<<EOF>> {
+        if (!eof_found) {
+            eof_found = true;
+            return END_OF_FILE;
+        } else {
+            yyterminate();
+        }
+    }
 %%
 
diff --git a/src/gabc/gabc-score-determination.y b/src/gabc/gabc-score-determination.y
index 17f80fddc..fca249d51 100644
--- a/src/gabc/gabc-score-determination.y
+++ b/src/gabc/gabc-score-determination.y
@@ -1,5 +1,8 @@
 %{
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the score parser.
+ *
  * Gregorio score determination in gabc input.
  * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
@@ -35,6 +38,7 @@
 #include "unicode.h"
 #include "messages.h"
 #include "characters.h"
+#include "support.h"
 #include "sha1.h"
 #include "plugins.h"
 #include "gabc.h"
@@ -335,7 +339,7 @@ static void end_definitions(void)
     }
     /* voice is now voice-1, so that it can be the index of elements */
     voice = 0;
-    elements = (gregorio_element **) malloc(number_of_voices *
+    elements = (gregorio_element **) gregorio_malloc(number_of_voices *
             sizeof(gregorio_element *));
     for (i = 0; i < number_of_voices; i++) {
         elements[i] = NULL;
@@ -414,24 +418,23 @@ static void gregorio_set_translation_center_beginning(
 
 static void rebuild_characters(void)
 {
-    bool has_initial = score->initial_style != NO_INITIAL;
-
     /* we rebuild the first syllable text if it is the first syllable, or if
      * it is the second when the first has no text.
      * it is a patch for cases like (c4) Al(ab)le(ab) */
-    if ((!score->first_syllable && has_initial && current_character)
+    if ((!score->first_syllable && current_character)
             || (current_syllable && !current_syllable->previous_syllable
             && !current_syllable->text && current_character)) {
-        gregorio_rebuild_first_syllable(&current_character, has_initial);
+        /* leave the first syllable text untouched at this time */
+        gregorio_go_to_first_character_c(&current_character);
 
         started_first_word = true;
-    }
-
-    gregorio_rebuild_characters(&current_character, center_is_determined,
-            has_initial);
+    } else {
+        gregorio_rebuild_characters(&current_character, center_is_determined,
+                false);
 
-    if (started_first_word) {
-        gregorio_set_first_word(&current_character);
+        if (started_first_word) {
+            gregorio_set_first_word(&current_character);
+        }
     }
 }
 
@@ -630,10 +633,10 @@ static void gabc_y_add_notes(char *notes, YYLTYPE loc) {
                     "happen!"), "gabc_y_add_notes", VERBOSITY_FATAL, 0);
         }
         if (!current_element->nabc) {
-            current_element->nabc = (char **) calloc (nabc_lines,
+            current_element->nabc = (char **) gregorio_calloc (nabc_lines,
                     sizeof (char *));
         }
-        current_element->nabc[nabc_state-1] = strdup(notes);
+        current_element->nabc[nabc_state-1] = gregorio_strdup(notes);
         current_element->nabc_lines = nabc_state;
     }
 }
@@ -660,7 +663,7 @@ static void gabc_y_add_notes(char *notes, YYLTYPE loc) {
 %token GABC_COPYRIGHT SCORE_COPYRIGHT OCCASION METER COMMENTARY ARRANGER
 %token GABC_VERSION USER_NOTES DEF_MACRO ALT_BEGIN ALT_END CENTERING_SCHEME
 %token TRANSLATION_CENTER_END BNLBA ENLBA EUOUAE_B EUOUAE_E NABC_CUT NABC_LINES
-%token LANGUAGE
+%token LANGUAGE END_OF_FILE
 
 %%
 
@@ -719,8 +722,8 @@ centering_scheme_definition:
 language_definition:
     LANGUAGE attribute {
         check_multiple("language", got_language);
+        gregorio_set_score_language(score, $2.text);
         gregorio_set_centering_language($2.text);
-        free($2.text);
         got_language = true;
     }
     ;
@@ -751,7 +754,7 @@ gregoriotex_font_definition:
 
 office_part_definition:
     OFFICE_PART attribute {
-        check_multiple("office part", score->office_part != NULL);
+        check_multiple("office-part", score->office_part != NULL);
         gregorio_set_score_office_part (score, $2.text);
     }
     ;
@@ -818,6 +821,10 @@ nabc_lines_definition:
 initial_style_definition:
     INITIAL_STYLE attribute {
         if ($2.text) {
+            /* DEPRECATED by 4.1 */
+            gregorio_message("\"initial-style\" header is deprecated. Please "
+            "use \\gresetinitiallines in TeX instead.",
+            "gabc_score_determination_parse", VERBOSITY_DEPRECATION, 0);
             score->initial_style=atoi($2.text);
             free($2.text);
         }
@@ -1004,7 +1011,7 @@ note:
         voice=0;
         nabc_state=0;
     }
-    | NOTES CLOSING_BRACKET_WITH_SPACE {
+    | NOTES closing_bracket_with_space {
         if (voice<number_of_voices) {
             gabc_y_add_notes($1.text, @1);
             free($1.text);
@@ -1058,7 +1065,7 @@ note:
         voice=0;
         nabc_state=0;
     }
-    | CLOSING_BRACKET_WITH_SPACE {
+    | closing_bracket_with_space {
         elements[voice]=NULL;
         voice=0;
         nabc_state=0;
@@ -1066,6 +1073,12 @@ note:
     }
     ;
 
+closing_bracket_with_space:
+    CLOSING_BRACKET_WITH_SPACE
+    | CLOSING_BRACKET_WITH_SPACE END_OF_FILE
+    | CLOSING_BRACKET END_OF_FILE
+    ;
+
 style_beginning:
     I_BEGINNING {
         gregorio_gabc_add_style(ST_ITALIC);
diff --git a/src/gabc/gabc-write.c b/src/gabc/gabc-write.c
index 4215b3a81..acc349a22 100644
--- a/src/gabc/gabc-write.c
+++ b/src/gabc/gabc-write.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file provides functions for writing gabc from Gregorio structures.
+ *
  * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -37,6 +40,13 @@ static __inline char pitch_letter(const char height) {
     return height + 'a' - LOWEST_PITCH;
 }
 
+static __inline void unsupported(const char *fn, const char *type,
+        const char *value)
+{
+    gregorio_messagef(fn, VERBOSITY_ERROR, 0, _("unsupported %s %s"), type,
+            value);
+}
+
 /*
  * Output one attribute, allowing for multi-line values 
  */
@@ -104,7 +114,16 @@ static void gabc_write_begin(FILE *f, grestyle_style style)
     case ST_UNDERLINED:
         fprintf(f, "<ul>");
         break;
+    case ST_INITIAL:
+    case ST_CENTER:
+    case ST_FIRST_WORD:
+    case ST_FIRST_SYLLABLE:
+    case ST_FIRST_SYLLABLE_INITIAL:
+        /* nothing should be emitted for these */
+        break;
     default:
+        unsupported("gabc_write_begin", "style",
+                grestyle_style_to_string(style));
         break;
     }
 }
@@ -139,7 +158,16 @@ static void gabc_write_end(FILE *f, grestyle_style style)
     case ST_UNDERLINED:
         fprintf(f, "</ul>");
         break;
+    case ST_INITIAL:
+    case ST_CENTER:
+    case ST_FIRST_WORD:
+    case ST_FIRST_SYLLABLE:
+    case ST_FIRST_SYLLABLE_INITIAL:
+        /* nothing should be emitted for these */
+        break;
     default:
+        unsupported("gabc_write_end", "style",
+                grestyle_style_to_string(style));
         break;
     }
 }
@@ -235,7 +263,7 @@ static void gabc_write_key_change(FILE *f, char step, int line,
  * 
  */
 
-static void gabc_write_space(FILE *f, char type)
+static void gabc_write_space(FILE *f, gregorio_space type)
 {
     switch (type) {
     case SP_LARGER_SPACE:
@@ -258,8 +286,8 @@ static void gabc_write_space(FILE *f, char type)
         /* fprintf (f, "/"); */
         break;
     default:
-        gregorio_message(_("space type is unknown"), "gabc_write_space",
-                VERBOSITY_ERROR, 0);
+        unsupported("gabc_write_space", "space type",
+                gregorio_space_to_string(type));
         break;
     }
 }
@@ -270,7 +298,7 @@ static void gabc_write_space(FILE *f, char type)
  * 
  */
 
-static void gabc_write_bar(FILE *f, char type)
+static void gabc_write_bar(FILE *f, gregorio_bar type)
 {
     switch (type) {
     case B_VIRGULA:
@@ -307,15 +335,15 @@ static void gabc_write_bar(FILE *f, char type)
         fprintf(f, ";6");
         break;
     default:
-        gregorio_message(_("unknown bar type, nothing will be done"),
-                "gabc_bar_to_str", VERBOSITY_ERROR, 0);
+        unsupported("gabc_write_bar", "bar type",
+                gregorio_bar_to_string(type));
         break;
     }
 }
 
 /* writing the signs of a bar */
 
-static void gabc_write_bar_signs(FILE *f, char type)
+static void gabc_write_bar_signs(FILE *f, gregorio_sign type)
 {
     switch (type) {
     case _V_EPISEMA:
@@ -327,7 +355,12 @@ static void gabc_write_bar_signs(FILE *f, char type)
     case _BAR_H_EPISEMA:
         fprintf(f, "_");
         break;
+    case _NO_SIGN:
+        /* if there's no sign, don't emit anything */
+        break;
     default:
+        unsupported("gabc_write_bar_signs", "bar signs",
+                gregorio_sign_to_string(type));
         break;
     }
 }
@@ -352,6 +385,10 @@ static void gabc_hepisema(FILE *f, const char *prefix, bool connect,
     case H_NORMAL:
         /* nothing to print */
         break;
+    default:
+        unsupported("gabc_hepisema", "hepisema size",
+                grehepisema_size_to_string(size));
+        break;
     }
 }
 
@@ -376,6 +413,8 @@ static const char *mora_vposition(gregorio_note *note)
     case VPOS_BELOW:
         return "0";
     default:
+        unsupported("mora_vposition", "vposition",
+                gregorio_vposition_to_string(note->mora_vposition));
         return "";
     }
 }
@@ -500,6 +539,8 @@ static void gabc_write_gregorio_note(FILE *f, gregorio_note *note,
         fprintf(f, "%cq", pitch_letter(note->u.note.pitch));
         break;
     default:
+        unsupported("gabc_write_gregorio_note", "shape",
+                gregorio_shape_to_string(shape));
         fprintf(f, "%c", pitch_letter(note->u.note.pitch));
         break;
     }
@@ -519,7 +560,12 @@ static void gabc_write_gregorio_note(FILE *f, gregorio_note *note,
     case _V_EPISEMA_AUCTUM_DUPLEX:
         fprintf(f, "'%s..", vepisema_position(note));
         break;
+    case _NO_SIGN:
+        /* if there's no sign, don't emit anything */
+        break;
     default:
+        unsupported("gabc_write_gregorio_note", "shape signs",
+                gregorio_sign_to_string(note->signs));
         break;
     }
     switch (note->special_sign) {
@@ -538,7 +584,12 @@ static void gabc_write_gregorio_note(FILE *f, gregorio_note *note,
     case _SEMI_CIRCULUS_REVERSUS:
         fprintf(f, "r5");
         break;
+    case _NO_SIGN:
+        /* if there's no sign, don't emit anything */
+        break;
     default:
+        unsupported("gabc_write_gregorio_note", "special sign",
+                gregorio_sign_to_string(note->special_sign));
         break;
     }
     if (note->h_episema_above == HEPISEMA_AUTO
@@ -618,9 +669,8 @@ static void gabc_write_gregorio_glyph(FILE *f, gregorio_glyph *glyph)
         gabc_write_end_liquescentia(f, glyph->u.notes.liquescentia);
         break;
     default:
-
-        gregorio_message(_("call with an argument which type is unknown"),
-                "gabc_write_gregorio_glyph", VERBOSITY_ERROR, 0);
+        unsupported("gabc_write_gregorio_glyph", "glyph type",
+                gregorio_type_to_string(glyph->type));
         break;
     }
 }
@@ -688,8 +738,8 @@ static void gabc_write_gregorio_element(FILE *f, gregorio_element *element)
         }
         break;
     default:
-        gregorio_message(_("call with an argument which type is unknown"),
-                "gabc_write_gregorio_element", VERBOSITY_ERROR, 0);
+        unsupported("gabc_write_gregorio_element", "element type",
+                gregorio_type_to_string(element->type));
         break;
     }
 }
@@ -736,19 +786,15 @@ static void gabc_write_gregorio_syllable(FILE *f, gregorio_syllable *syllable,
     if (syllable->text) {
         /* we call the magic function (defined in struct_utils.c), that will
          * write our text. */
-        gregorio_write_text(false, syllable->text, f,
-                            (&gabc_write_verb),
-                            (&gabc_print_char),
-                            (&gabc_write_begin),
-                            (&gabc_write_end), (&gabc_write_special_char));
+        gregorio_write_text(WTP_NORMAL, syllable->text, f, &gabc_write_verb,
+                &gabc_print_char, &gabc_write_begin, &gabc_write_end,
+                &gabc_write_special_char);
     }
     if (syllable->translation) {
         fprintf(f, "[");
-        gregorio_write_text(false, syllable->translation, f,
-                            (&gabc_write_verb),
-                            (&gabc_print_char),
-                            (&gabc_write_begin),
-                            (&gabc_write_end), (&gabc_write_special_char));
+        gregorio_write_text(WTP_NORMAL, syllable->translation, f,
+                &gabc_write_verb, &gabc_print_char, &gabc_write_begin,
+                &gabc_write_end, &gabc_write_special_char);
         fprintf(f, "]");
     }
     fprintf(f, "(");
@@ -806,9 +852,7 @@ void gabc_write_score(FILE *f, gregorio_score *score)
     gabc_write_str_attribute(f, "meter", score->meter);
     gabc_write_str_attribute(f, "commentary", score->commentary);
     gabc_write_str_attribute(f, "arranger", score->arranger);
-    /* We always create gabc of the current version; this is not derived
-     * from the input. */
-    fprintf(f, "gabc-version: %s;\n", GABC_CURRENT_VERSION);
+    gabc_write_str_attribute(f, "language", score->language);
     /* And since the gabc is generated by this program, note this. */
     fprintf(f, "generated-by: %s %s;\n", "gregorio", GREGORIO_VERSION);
     gabc_write_str_attribute(f, "author", score->si.author);
@@ -822,7 +866,6 @@ void gabc_write_score(FILE *f, gregorio_score *score)
     gabc_write_str_attribute(f, "transcriber", score->si.transcriber);
     gabc_write_str_attribute(f, "transcription-date",
                              score->si.transcription_date);
-    gabc_write_str_attribute(f, "gregoriotex-font", score->gregoriotex_font);
     if (score->mode) {
         fprintf(f, "mode: %d;\n", score->mode);
     }
@@ -832,9 +875,6 @@ void gabc_write_score(FILE *f, gregorio_score *score)
                     score->annotation[annotation_num]);
         }
     }
-    if (score->initial_style != NORMAL_INITIAL) {
-        fprintf(f, "initial-style: %d;\n", score->initial_style);
-    }
     gabc_write_str_attribute(f, "user-notes", score->user_notes);
     if (score->number_of_voices == 0) {
         gregorio_message(_("gregorio_score seems to be empty"),
diff --git a/src/gabc/gabc.h b/src/gabc/gabc.h
index 69aa7c642..73c7f64f6 100644
--- a/src/gabc/gabc.h
+++ b/src/gabc/gabc.h
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header prototypes gabc-format handling data structures and entry points.
+ *
  * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
diff --git a/src/gregorio-utils.c b/src/gregorio-utils.c
index c2a4b8b57..486dfd22e 100644
--- a/src/gregorio-utils.c
+++ b/src/gregorio-utils.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the command line interface of Gregorio.
+ *
  * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -66,19 +69,18 @@ typedef enum gregorio_file_format {
 #define realpath(path,resolved_path) _fullpath(resolved_path, path, PATH_MAX)
 #endif
 
+/* define_path attempts to canonicalize the pathname of a given string */
 static char *define_path(char *current_directory, char *string)
 {
     int length;
     char *file_name;
-    char temp_name[PATH_MAX];
+    char *temp_name;
     char *base_name;
 #ifdef _WIN32
     char *last_backslash;
 #endif
 
-    file_name = malloc(PATH_MAX * sizeof(char));
-
-    strcpy(temp_name, string);
+    temp_name = gregorio_strdup(string);
     base_name = strrchr(temp_name, '/');
 #ifdef _WIN32
     last_backslash = strrchr(temp_name, '\\');
@@ -93,27 +95,27 @@ static char *define_path(char *current_directory, char *string)
         base_name++;
 
         /* try to resolve it */
-        if (!realpath(temp_name, file_name)) {
+        file_name = realpath(temp_name, NULL);
+        if (!file_name) {
             fprintf(stderr, "the directory %s for %s does not exist\n",
-                    file_name, base_name);
-            exit(-1);
+                    temp_name, base_name);
+            exit(1);
         }
     } else {
         /* no path was supplied */
         base_name = string;
+        file_name = gregorio_malloc(
+                strlen(current_directory) + strlen(base_name) + 2);
         strcpy(file_name, current_directory);
     }
 
-    /* make sure we're not bigger than PATH_MAX */
-    length = strlen(file_name);
-    if (length + strlen(base_name) + 1 >= PATH_MAX) {
-        fprintf(stderr, "filename too long: %s/%s\n", file_name, base_name);
-        exit(-1);
-    }
     /* build the file name */
+    length = strlen(file_name);
+    file_name = gregorio_realloc(file_name, length + strlen(base_name) + 2);
     file_name[length] = '/';
     strcpy(file_name + length + 1, base_name);
 
+    free(temp_name);
     return file_name;
 }
 
@@ -128,7 +130,7 @@ static char *get_base_filename(char *fbasename)
         return NULL;
     }
     l = strlen(fbasename) - strlen(p);
-    ret = (char *) malloc((l + 1) * sizeof(char));
+    ret = (char *) gregorio_malloc((l + 1) * sizeof(char));
     gregorio_snprintf(ret, l + 1, "%s", fbasename);
     ret[l] = '\0';
     return ret;
@@ -139,7 +141,7 @@ static char *get_output_filename(char *fbasename, const char *extension)
 {
     char *output_filename = NULL;
     output_filename =
-        (char *) malloc(sizeof(char) *
+        (char *) gregorio_malloc(sizeof(char) *
                         (strlen(extension) + strlen(fbasename) + 2));
     output_filename = strcpy(output_filename, fbasename);
     output_filename = strcat(output_filename, ".");
@@ -202,12 +204,12 @@ static void check_input_clobber(char *input_file_name, char *output_file_name)
     char *current_directory;
     int file_cmp;
     if (input_file_name && output_file_name) {
-        current_directory = malloc(PATH_MAX * sizeof(char));
+        current_directory = gregorio_malloc(PATH_MAX * sizeof(char));
         current_directory = getcwd(current_directory, PATH_MAX);
         if (current_directory == NULL) {
             fprintf(stderr, _("can't determine current directory"));
             free(current_directory);
-            exit(-1);
+            exit(1);
         }
         absolute_input_file_name = define_path(current_directory, input_file_name);
         absolute_output_file_name = define_path(current_directory, output_file_name);
@@ -219,7 +221,7 @@ static void check_input_clobber(char *input_file_name, char *output_file_name)
         free(absolute_input_file_name);
         free(absolute_output_file_name);
         if (file_cmp == 0) {
-            exit(-1);
+            exit(1);
         }
     }
 }
@@ -228,15 +230,16 @@ static char *encode_point_and_click_filename(char *input_file_name)
 {
     /* percent-encoding favors capital hex digits */
     static const char *const hex = "0123456789ABCDEF";
-    char filename[PATH_MAX], *result = NULL, *r = NULL, *p;
+    char *filename, *result = NULL, *r = NULL, *p;
 
-    if (!realpath(input_file_name, filename)) {
+    filename = realpath(input_file_name, NULL);
+    if (!filename) {
         fprintf(stderr, "error: unable to resolve %s\n", input_file_name);
-        exit(-1);
+        exit(1);
     }
 
     /* 2 extra characters for a possible leading slash and final NUL */
-    r = result = malloc((strlen(filename) * 4 + 2) * sizeof(char));
+    r = result = gregorio_malloc((strlen(filename) * 4 + 2) * sizeof(char));
 
 #ifdef _WIN32
     *(r++) = '/';
@@ -461,7 +464,7 @@ int main(int argc, char **argv)
         if (!input_file) { /* input not undefined (could be stdin) */
             fprintf(stderr, "error: no input file specified\n");
             print_usage(argv[0]);
-            exit(-1);
+            exit(1);
         }
     } else {
         input_file_name = argv[optind];
@@ -493,7 +496,7 @@ int main(int argc, char **argv)
         if (!kpse_in_name_ok(input_file_name)) {
             fprintf(stderr, "Error: kpse doesn't allow to read from file  %s\n",
                     input_file_name);
-            exit(-1);
+            exit(1);
         }
     #endif
 
@@ -519,7 +522,7 @@ int main(int argc, char **argv)
                     break;
                 default:
                     fprintf(stderr, "error: unsupported format");
-                    exit(-1);
+                    exit(1);
                 }
             }
         }
@@ -536,7 +539,7 @@ int main(int argc, char **argv)
             if (!kpse_out_name_ok(output_file_name)) {
                 fprintf(stderr, "Error: kpse doesn't allow to write in file  %s\n",
                         output_file_name);
-                exit(-1);
+                exit(1);
             }
         #endif
         output_file = fopen(output_file_name, "wb");
@@ -558,7 +561,7 @@ int main(int argc, char **argv)
         if (!input_file) {
             fprintf(stderr, "error: can't open file %s for reading\n",
                     input_file_name);
-            exit(-1);
+            exit(1);
         }
         gregorio_set_file_name(gregorio_basename(input_file_name));
         if (point_and_click) {
@@ -575,7 +578,7 @@ int main(int argc, char **argv)
         if (!error_file) {
             fprintf(stderr, "error: can't open file %s for writing\n",
                     error_file_name);
-            exit(-1);
+            exit(1);
         }
         gregorio_set_error_out(error_file);
     }
@@ -594,7 +597,7 @@ int main(int argc, char **argv)
         fprintf(stderr, "error : invalid input format\n");
         fclose(input_file);
         fclose(output_file);
-        exit(-1);
+        exit(1);
         break;
     }
 
@@ -602,7 +605,7 @@ int main(int argc, char **argv)
     if (score == NULL) {
         fclose(output_file);
         fprintf(stderr, "error in file parsing\n");
-        exit(-1);
+        exit(1);
     }
 
     gregorio_fix_initial_keys(score, DEFAULT_KEY);
@@ -621,7 +624,7 @@ int main(int argc, char **argv)
         fprintf(stderr, "error : invalid output format\n");
         gregorio_free_score(score);
         fclose(output_file);
-        exit(-1);
+        exit(1);
         break;
     }
     fclose(output_file);
@@ -633,6 +636,9 @@ int main(int argc, char **argv)
     gabc_score_determination_lex_destroy();
     gabc_notes_determination_lex_destroy();
     gregorio_vowel_rulefile_lex_destroy();
+    if (error_file_name) {
+        fclose(error_file);
+    }
 
     exit(gregorio_get_return_value());
 }
diff --git a/src/gregoriotex/gregoriotex-position.c b/src/gregoriotex/gregoriotex-position.c
index 8f60faa6f..fac9ded4a 100644
--- a/src/gregoriotex/gregoriotex-position.c
+++ b/src/gregoriotex/gregoriotex-position.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file contains the logic for positioning signs on neumes.
+ *
  * Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -738,6 +741,27 @@ static gregorio_vposition advise_positioning(const gregorio_glyph *const glyph,
             break;
         }
         break;
+    case T_SALICUS_FLEXUS:
+        done = true;
+        v_episema = VPOS_BELOW;
+        switch (i) {
+        case 3:
+            note->gtex_offset_case = note_before_last_note_case(glyph, note);
+            h_episema = VPOS_ABOVE;
+            break;
+        case 4:
+            note->gtex_offset_case = last_note_case(glyph, FinalPunctum, note,
+                    false);
+            h_episema = VPOS_BELOW;
+            break;
+        default:
+            done = false;
+            break;
+        }
+        if (done) {
+            break;
+        }
+        /* else fallthrough to the next case! */
     case T_SALICUS:
     case T_SALICUS_LONGQUEUE:
         v_episema = VPOS_BELOW;
@@ -1114,15 +1138,25 @@ static __inline void end_h_episema(height_computation *const h,
                 h->height = proposed_height;
             }
         }
-        /* end->previous checks that it's within the same glyph */
-        if (end && end->type == GRE_NOTE && end->previous
-                && end->previous->type == GRE_NOTE
-                && is_connected_left(h->get_size(end))
-                && !has_space_to_left(end) && h->last_connected_note
-                && is_connected_right(h->get_size(h->last_connected_note))) {
-            proposed_height = end->u.note.pitch + h->vpos;
-            if (h->is_better_height(proposed_height, h->height)) {
-                h->height = proposed_height;
+        if (end && end->type == GRE_NOTE) {
+            gregorio_note *note;
+            /* this loop checks that it's within the same glyph */
+            for (note = end->previous; note; note = note->previous) {
+                if (note == h->start_note) {
+                    if (is_connected_left(h->get_size(end))
+                            && h->last_connected_note
+                            && h->last_connected_note->next
+                            && h->last_connected_note->next->type == GRE_NOTE
+                            && !has_space_to_left(h->last_connected_note->next)
+                            && is_connected_right(h->get_size(
+                                    h->last_connected_note))) {
+                        proposed_height = end->u.note.pitch + h->vpos;
+                        if (h->is_better_height(proposed_height, h->height)) {
+                            h->height = proposed_height;
+                        }
+                    }
+                    break;
+                }
             }
         }
 
diff --git a/src/gregoriotex/gregoriotex-write.c b/src/gregoriotex/gregoriotex-write.c
index 9249c4a4d..65a620844 100644
--- a/src/gregoriotex/gregoriotex-write.c
+++ b/src/gregoriotex/gregoriotex-write.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file contains functions for writing GregorioTeX from Gregorio structures.
+ *
  * Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -704,6 +707,12 @@ const char *gregoriotex_determine_glyph_name(const gregorio_glyph *const glyph,
         }
         ltype = LG_NO_INITIO;
         break;
+    case G_SALICUS_FLEXUS:
+        *type = AT_ONE_NOTE;
+        *gtype = T_SALICUS_FLEXUS;
+        shape = "SalicusFlexus";
+        ltype = LG_NO_INITIO;
+        break;
     case G_ONE_NOTE:
     case G_PUNCTUM_INCLINATUM:
     case G_TRIGONUS:
@@ -1126,7 +1135,7 @@ static grestyle_style gregoriotex_fix_style(gregorio_character *first_character)
         current_char = current_char->next_character;
     }
     /* if we reached here, this means that we there is only one style applied
-     * to all the syllables */
+     * to all the characters */
     return possible_fixed_style;
 }
 
@@ -1143,10 +1152,9 @@ static void gregoriotex_write_translation(FILE *f,
     if (translation == NULL) {
         return;
     }
-    gregorio_write_text(false, translation, f,
-            (&gtex_write_verb),
-            (&gtex_print_char),
-            (&gtex_write_begin), (&gtex_write_end), (&gtex_write_special_char));
+    gregorio_write_text(WTP_NORMAL, translation, f, &gtex_write_verb,
+            &gtex_print_char, &gtex_write_begin, &gtex_write_end,
+            &gtex_write_special_char);
 }
 
 /* a function to compute the height of the flat of a key
@@ -2571,54 +2579,23 @@ static void write_fixed_text_styles(FILE *f, gregorio_character *syllable_text,
     }
 }
 
-static void gregoriotex_write_text(FILE *f, gregorio_character *text,
-        bool *first_syllable)
+static void write_text(FILE *const f, const gregorio_character *const text)
 {
-    bool skip_initial = first_syllable && *first_syllable;
     if (text == NULL) {
         fprintf(f, "{}{}{}{}{}");
-        if (skip_initial) {
-            fprintf(f, "\\GreForceHyphen{}");
-        }
         return;
     }
     fprintf(f, "{");
-    gregorio_write_text(skip_initial, text, f,
-            (&gtex_write_verb), (&gtex_print_char), (&gtex_write_begin),
-            (&gtex_write_end), (&gtex_write_special_char));
+    gregorio_write_text(WTP_NORMAL, text, f, &gtex_write_verb,
+            &gtex_print_char, &gtex_write_begin, &gtex_write_end,
+            &gtex_write_special_char);
     fprintf(f, "}{");
-    gregorio_write_first_letter_alignment_text(skip_initial, text, f,
-            (&gtex_write_verb), (&gtex_print_char), (&gtex_write_begin),
-            (&gtex_write_end), (&gtex_write_special_char));
-    if (first_syllable) {
-        *first_syllable = false;
-    }
+    gregorio_write_first_letter_alignment_text(WTP_NORMAL, text,
+            f, &gtex_write_verb, &gtex_print_char, &gtex_write_begin,
+            &gtex_write_end, &gtex_write_special_char);
     gregoriotex_ignore_style = gregoriotex_next_ignore_style;
     gregoriotex_next_ignore_style = ST_NO_STYLE;
     fprintf(f, "}");
-    if (skip_initial) {
-        /* Check to see if we need to force a hyphen (empty first syllable) */
-        for (; text; text = text->next_character) {
-            if (text->is_character) {
-                break;
-            } else if (text->cos.s.type == ST_T_BEGIN) {
-                if (text->cos.s.style == ST_VERBATIM ||
-                        text->cos.s.style == ST_SPECIAL_CHAR) {
-                    break;
-                } else if (text->cos.s.style == ST_INITIAL) {
-                    for (; text; text = text->next_character) {
-                        if (!text->is_character && text->cos.s.type == ST_T_END
-                                && text->cos.s.style == ST_INITIAL) {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        if (!text) {
-            fprintf(f, "\\GreForceHyphen{}");
-        }
-    }
 }
 
 /*
@@ -2746,6 +2723,92 @@ static __inline void write_syllable_point_and_click(FILE *const f,
     }
 }
 
+static void write_syllable_text(FILE *f, const char *const syllable_type, 
+        const gregorio_character *text)
+{
+    if (syllable_type != NULL) {
+        fprintf(f, "%s{\\GreSetThisSyllable", syllable_type);
+        write_text(f, text);
+        fprintf(f, "}");
+    }
+}
+
+static void write_first_syllable_text(FILE *f, const char *const syllable_type, 
+        const gregorio_character *const text)
+{
+    if (syllable_type == NULL || text == NULL) {
+        fprintf(f, "}{}{\\GreSetNoFirstSyllableText}");
+    } else {
+        gregorio_character *text_with_initial = gregorio_clone_characters(text),
+                *text_without_initial = gregorio_clone_characters(text);
+        const gregorio_character *t;
+
+        /* find out if there is a forced center -> has_forced_center */
+        gregorio_center_determination center = CENTER_NOT_DETERMINED;
+        for (t = text; t; t = t->next_character) {
+            if (!t->is_character && t->cos.s.style == ST_FORCED_CENTER) {
+                center = CENTER_FULLY_DETERMINED;
+                break;
+            }
+        }
+
+        gregorio_rebuild_first_syllable(&text_with_initial, false);
+        gregorio_rebuild_characters(&text_with_initial, center, false);
+        gregorio_set_first_word(&text_with_initial);
+
+        gregorio_rebuild_first_syllable(&text_without_initial, true);
+        gregorio_rebuild_characters(&text_without_initial, center, true);
+        gregorio_set_first_word(&text_without_initial);
+
+        fprintf(f, "}{%s}{\\GreSetFirstSyllableText", syllable_type);
+
+        fprintf(f, "{");
+        gregorio_write_first_letter_alignment_text(WTP_FIRST_SYLLABLE,
+                text_with_initial, f, &gtex_write_verb, &gtex_print_char,
+                &gtex_write_begin, &gtex_write_end, &gtex_write_special_char);
+        fprintf(f, "}{{");
+        gregorio_write_text(WTP_FIRST_SYLLABLE, text_without_initial, f,
+                &gtex_write_verb, &gtex_print_char, &gtex_write_begin,
+                &gtex_write_end, &gtex_write_special_char);
+        fprintf(f, "}}{{");
+        gregorio_write_text(WTP_NORMAL, text_with_initial, f, &gtex_write_verb,
+                &gtex_print_char, &gtex_write_begin, &gtex_write_end,
+                &gtex_write_special_char);
+        gregoriotex_ignore_style = gregoriotex_next_ignore_style;
+        gregoriotex_next_ignore_style = ST_NO_STYLE;
+        fprintf(f, "}}");
+
+        /* Check to see if we need to force a hyphen (empty first syllable) */
+        for (t = text_without_initial; t; t = t->next_character) {
+            if (t->is_character) {
+                break;
+            } else if (t->cos.s.type == ST_T_BEGIN) {
+                if (t->cos.s.style == ST_VERBATIM ||
+                        t->cos.s.style == ST_SPECIAL_CHAR) {
+                    break;
+                } else if (t->cos.s.style == ST_INITIAL) {
+                    for (; t; t = t->next_character) {
+                        if (!t->is_character && t->cos.s.type == ST_T_END
+                                && t->cos.s.style == ST_INITIAL) {
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        if (t) {
+            fprintf(f, "{}");
+        } else {
+            fprintf(f, "{\\GreForceHyphen}");
+        }
+
+        fprintf(f, "}");
+
+        gregorio_free_characters(text_with_initial);
+        gregorio_free_characters(text_without_initial);
+    }
+}
+
 /*
  * Arguments are relatively obvious. The most obscure is certainly first_of_disc
  * which is 0 all the time, except in the case of a "clef change syllable". In
@@ -2759,12 +2822,15 @@ static __inline void write_syllable_point_and_click(FILE *const f,
  *   1 in case of the first argument of a \GreDiscretionary
  *   2 if we are in the second argument (necessary in order to avoid infinite loops)
  */
-static void gregoriotex_write_syllable(FILE *f, gregorio_syllable *syllable,
-        bool * first_syllable, unsigned char *line_number,
-        unsigned char first_of_disc, gregoriotex_status *const status)
+static void write_syllable(FILE *f, gregorio_syllable *syllable,
+        unsigned char first_of_disc, gregoriotex_status *const status,
+        void (*const write_this_syllable_text)
+        (FILE *, const char *, const gregorio_character *))
 {
     gregorio_element *clef_change_element = NULL, *element;
+    const char *syllable_type = NULL;
     if (!syllable) {
+        write_this_syllable_text(f, NULL, NULL);
         return;
     }
     /* Very first: before anything, if the syllable is the beginning of a
@@ -2789,10 +2855,7 @@ static void gregoriotex_write_syllable(FILE *f, gregorio_syllable *syllable,
             } else {
                 fprintf(f, "%%\n%%\n\\GreNewParLine %%\n%%\n%%\n");
             }
-            if (*line_number == 1) {
-                fprintf(f, "\\GreAdjustThirdLine %%\n");
-                *line_number = 0;
-            }
+            write_this_syllable_text(f, NULL, syllable->text);
             return;
         }
         /*
@@ -2809,12 +2872,11 @@ static void gregoriotex_write_syllable(FILE *f, gregorio_syllable *syllable,
                  */
                 gregoriotex_print_change_line_clef(f, clef_change_element);
                 fprintf(f, "\\GreDiscretionary{0}{%%\n");
-                gregoriotex_write_syllable(f, syllable, first_syllable,
-                        line_number, 1, status);
+                write_syllable(f, syllable, 1, status, write_syllable_text);
                 fprintf(f, "}{%%\n");
-                gregoriotex_write_syllable(f, syllable, first_syllable,
-                        line_number, 2, status);
+                write_syllable(f, syllable, 2, status, write_syllable_text);
                 fprintf(f, "}%%\n");
+                write_this_syllable_text(f, NULL, syllable->text);
                 return;
             }
         }
@@ -2825,27 +2887,28 @@ static void gregoriotex_write_syllable(FILE *f, gregorio_syllable *syllable,
                     && (syllable->elements)[0]->u.misc.unpitched.info.bar ==
                     B_DIVISIO_FINALIS) {
                 handle_final_bar(f, "DivisioFinalis", syllable);
+                write_this_syllable_text(f, NULL, syllable->text);
                 return;
             }
             if (!syllable->next_syllable && !syllable->text
                     && (syllable->elements)[0]->u.misc.unpitched.info.bar ==
                     B_DIVISIO_MAIOR) {
                 handle_final_bar(f, "DivisioMaior", syllable);
+                write_this_syllable_text(f, NULL, syllable->text);
                 return;
             } else {
-                fprintf(f, "\\GreBarSyllable");
+                syllable_type = "\\GreBarSyllable";
             }
         } else {
-            fprintf(f, "\\GreSyllable");
+            syllable_type = "\\GreSyllable";
         }
     } else {
         write_fixed_text_styles(f, syllable->text,
                 syllable->next_syllable? syllable->next_syllable->text : NULL);
-        fprintf(f, "\\GreSyllable");
+        syllable_type = "\\GreSyllable";
     }
-    fprintf(f, "{\\GreSetThisSyllable");
-    gregoriotex_write_text(f, syllable->text, first_syllable);
-    fprintf(f, "}{}{\\Gre%s}", syllable->first_word ? "FirstWord" : "Unstyled");
+    write_this_syllable_text(f, syllable_type, syllable->text);
+    fprintf(f, "{}{\\Gre%s}", syllable->first_word ? "FirstWord" : "Unstyled");
     if (syllable->position == WORD_END
             || syllable->position == WORD_ONE_SYLLABLE || !syllable->text
             || !syllable->next_syllable
@@ -2857,7 +2920,7 @@ static void gregoriotex_write_syllable(FILE *f, gregorio_syllable *syllable,
     }
     if (syllable->next_syllable) {
         fprintf(f, "{\\GreSetNextSyllable");
-        gregoriotex_write_text(f, syllable->next_syllable->text, NULL);
+        write_text(f, syllable->next_syllable->text);
         fprintf(f, "}{");
         write_syllable_point_and_click(f, syllable, status);
         fprintf(f, "}{%d}{",
@@ -3050,10 +3113,6 @@ static void gregoriotex_write_syllable(FILE *f, gregorio_syllable *syllable,
             } else {
                 fprintf(f, "%%\n%%\n\\GreNewParLine %%\n%%\n%%\n");
             }
-            if (*line_number == 1) {
-                fprintf(f, "\\GreAdjustThirdLine %%\n");
-                *line_number = 0;
-            }
             break;
 
         default:
@@ -3169,17 +3228,10 @@ static void initialize_score(gregoriotex_status *const status,
 void gregoriotex_write_score(FILE *const f, gregorio_score *const score,
         const char *const point_and_click_filename)
 {
-    gregorio_character *first_text;
-    /* true if it is the first syllable and false if not.
-     * It is for the initial. */
-    bool first_syllable = false;
     char clef_letter;
     int clef_line;
     char clef_flat = NO_KEY_FLAT;
     gregorio_syllable *current_syllable;
-    /* the current line (as far as we know), it is always 0, it can be 1 in the
-     * case of the first line of a score with a two lines initial */
-    unsigned char line = 0;
     int annotation_num;
     gregoriotex_status status;
 
@@ -3263,26 +3315,12 @@ void gregoriotex_write_score(FILE *const f, gregorio_score *const score,
     if (score->mode != 0) {
         fprintf(f, "\\GreMode{%d}%%\n", score->mode);
     }
-    /* first we draw the initial (first letter) and the initial key */
-    if (score->initial_style == NO_INITIAL) {
-        fprintf(f, "\\GreNoInitial %%\n");
-    } else {
-        if (score->initial_style == BIG_INITIAL) {
-            fprintf(f, "\\GreSetBigInitial %%\n");
-            line = 1;
-        }
-        first_text = gregorio_first_text(score);
-        if (first_text) {
-            fprintf(f, "\\GreSetInitial{");
-            gregorio_write_initial(first_text, f,
-                    (&gtex_write_verb),
-                    (&gtex_print_char),
-                    (&gtex_write_begin),
-                    (&gtex_write_end), (&gtex_write_special_char));
-            fprintf(f, "}%%\n");
-            first_syllable = true;
-        }
+
+    if (score->initial_style != INITIAL_NOT_SPECIFIED) {
+        fprintf(f, "\\GreSetInitialStyle{%d}%%\n", score->initial_style);
     }
+
+    fprintf(f, "\\GreScoreOpening{%%\n"); /* GreScoreOpening#1 */
     if (score->si.manuscript_reference) {
         fprintf(f, "\\GreScoreReference{%s}%%\n",
                 score->si.manuscript_reference);
@@ -3290,7 +3328,7 @@ void gregoriotex_write_score(FILE *const f, gregorio_score *const score,
     if (score->first_voice_info) {
         gregoriotex_write_voice_info(f, score->first_voice_info);
     }
-    fprintf(f, "\\GreBeginNotes %%\n");
+    fprintf(f, "}{%%\n"); /* GreScoreOpening#2 */
     if (score->first_voice_info) {
         gregorio_det_step_and_line_from_key(score->
                 first_voice_info->initial_key, &clef_letter, &clef_line);
@@ -3307,9 +3345,14 @@ void gregoriotex_write_score(FILE *const f, gregorio_score *const score,
     fprintf(f, "\\GreSetInitialClef{%c}{%d}{%d}%%\n", clef_letter, clef_line,
             clef_flat);
     current_syllable = score->first_syllable;
+    if (current_syllable) {
+        write_syllable(f, current_syllable, 0, &status,
+                write_first_syllable_text);
+        current_syllable = current_syllable->next_syllable;
+    }
     while (current_syllable) {
-        gregoriotex_write_syllable(f, current_syllable, &first_syllable, &line,
-                0, &status);
+        write_syllable(f, current_syllable, 0, &status,
+                write_syllable_text);
         current_syllable = current_syllable->next_syllable;
     }
     fprintf(f, "\\GreEndScore %%\n\\endinput %%\n");
diff --git a/src/gregoriotex/gregoriotex.h b/src/gregoriotex/gregoriotex.h
index 7e06febd0..d5b8165d5 100644
--- a/src/gregoriotex/gregoriotex.h
+++ b/src/gregoriotex/gregoriotex.h
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header prototypes GregorioTeX writing data structures and entry points.
+ *
  * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -55,6 +58,7 @@ typedef enum gtex_type {
     T_SALICUS,
     T_SALICUS_LONGQUEUE,
     /* four note neumes */
+    T_SALICUS_FLEXUS,
     T_PORRECTUS_FLEXUS,
     T_TORCULUS_RESUPINUS,
     T_TORCULUS_LIQUESCENS,
diff --git a/src/messages.c b/src/messages.c
index f5dc0c53d..b67b5e057 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file contains functions for logging messages, warnings, and errors.
+ *
  * Copyright (C) 2009-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
diff --git a/src/messages.h b/src/messages.h
index fc25c1437..19ad01584 100644
--- a/src/messages.h
+++ b/src/messages.h
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header prototypes the message logging functions.
+ *
  * Copyright (C) 2009-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
diff --git a/src/plugins.h b/src/plugins.h
index 377d30672..3363d491b 100644
--- a/src/plugins.h
+++ b/src/plugins.h
@@ -1,5 +1,6 @@
 /*
- * Gregorio format support headers.
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header prototypes the "main" entry points for reading and writing data.
  *
  * Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md)
  * 
@@ -24,6 +25,9 @@
 
 void dump_write_score(FILE *f, gregorio_score *score);
 
+void dump_write_characters(FILE *const f,
+        const gregorio_character *current_character);
+
 gregorio_score *gabc_read_score(FILE *f_in);
 
 void gabc_write_score(FILE *f, gregorio_score *score);
diff --git a/src/struct.c b/src/struct.c
index cedb81ae2..bee8f912e 100644
--- a/src/struct.c
+++ b/src/struct.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the Gregorio data structures.
+ *
  * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -45,18 +48,14 @@
 #include "struct.h"
 #include "unicode.h"
 #include "messages.h"
+#include "support.h"
 #include "characters.h"
+#include "support.h"
 
 static gregorio_note *create_and_link_note(gregorio_note **current_note,
         const gregorio_scanner_location *const loc)
 {
-    gregorio_note *note = calloc(1, sizeof(gregorio_note));
-    if (!note) {
-        gregorio_message(_("error in memory allocation"),
-                         "create_and_link_note", VERBOSITY_FATAL, 0);
-        return NULL;
-    }
-
+    gregorio_note *note = gregorio_calloc(1, sizeof(gregorio_note));
     note->previous = *current_note;
     note->next = NULL;
     if (*current_note) {
@@ -236,7 +235,7 @@ void gregorio_add_texverb_to_note(gregorio_note **current_note, char *str)
     if (*current_note) {
         if ((*current_note)->texverb) {
             len = strlen((*current_note)->texverb) + strlen(str) + 1;
-            res = malloc(len * sizeof(char));
+            res = gregorio_malloc(len * sizeof(char));
             strcpy(res, (*current_note)->texverb);
             strcat(res, str);
             free((*current_note)->texverb);
@@ -626,13 +625,7 @@ static void gregorio_free_notes(gregorio_note **note)
 
 static gregorio_glyph *create_and_link_glyph(gregorio_glyph **current_glyph)
 {
-    gregorio_glyph *glyph = calloc(1, sizeof(gregorio_glyph));
-    if (!glyph) {
-        gregorio_message(_("error in memory allocation"),
-                         "create_and_link_glyph", VERBOSITY_FATAL, 0);
-        return NULL;
-    }
-
+    gregorio_glyph *glyph = gregorio_calloc(1, sizeof(gregorio_glyph));
     glyph->previous = *current_glyph;
     glyph->next = NULL;
     if (*current_glyph) {
@@ -747,13 +740,7 @@ static void gregorio_free_glyphs(gregorio_glyph **glyph)
 static gregorio_element *create_and_link_element(gregorio_element
                                                  **current_element)
 {
-    gregorio_element *element = calloc(1, sizeof(gregorio_element));
-    if (!element) {
-        gregorio_message(_("error in memory allocation"),
-                         "create_and_link_element", VERBOSITY_FATAL, 0);
-        return NULL;
-    }
-
+    gregorio_element *element = gregorio_calloc(1, sizeof(gregorio_element));
     element->previous = *current_element;
     element->next = NULL;
     if (*current_element) {
@@ -832,12 +819,7 @@ void gregorio_add_character(gregorio_character **current_character,
         grewchar wcharacter)
 {
     gregorio_character *element =
-        (gregorio_character *) calloc(1, sizeof(gregorio_character));
-    if (!element) {
-        gregorio_message(_("error in memory allocation"),
-                         "gregorio_add_character", VERBOSITY_FATAL, 0);
-        return;
-    }
+        (gregorio_character *) gregorio_calloc(1, sizeof(gregorio_character));
     element->is_character = 1;
     element->cos.character = wcharacter;
     element->next_character = NULL;
@@ -853,7 +835,7 @@ static void gregorio_free_one_character(gregorio_character *current_character)
     free(current_character);
 }
 
-static void gregorio_free_characters(gregorio_character *current_character)
+void gregorio_free_characters(gregorio_character *current_character)
 {
     gregorio_character *next_character;
     if (!current_character) {
@@ -866,9 +848,9 @@ static void gregorio_free_characters(gregorio_character *current_character)
     }
 }
 
-void gregorio_go_to_first_character(gregorio_character **character)
+void gregorio_go_to_first_character(const gregorio_character **character)
 {
-    gregorio_character *tmp;
+    const gregorio_character *tmp;
     if (!character || !*character) {
         return;
     }
@@ -883,12 +865,7 @@ void gregorio_begin_style(gregorio_character **current_character,
         grestyle_style style)
 {
     gregorio_character *element =
-        (gregorio_character *) calloc(1, sizeof(gregorio_character));
-    if (!element) {
-        gregorio_message(_("error in memory allocation"),
-                         "add_note", VERBOSITY_FATAL, 0);
-        return;
-    }
+        (gregorio_character *) gregorio_calloc(1, sizeof(gregorio_character));
     element->is_character = 0;
     element->cos.s.type = ST_T_BEGIN;
     element->cos.s.style = style;
@@ -904,12 +881,7 @@ void gregorio_end_style(gregorio_character **current_character,
         grestyle_style style)
 {
     gregorio_character *element =
-        (gregorio_character *) calloc(1, sizeof(gregorio_character));
-    if (!element) {
-        gregorio_message(_("error in memory allocation"),
-                         "add_note", VERBOSITY_FATAL, 0);
-        return;
-    }
+        (gregorio_character *) gregorio_calloc(1, sizeof(gregorio_character));
     element->is_character = 0;
     element->cos.s.type = ST_T_END;
     element->cos.s.style = style;
@@ -921,6 +893,35 @@ void gregorio_end_style(gregorio_character **current_character,
     *current_character = element;
 }
 
+gregorio_character *gregorio_clone_characters(
+        const gregorio_character *source)
+{
+    gregorio_character *target = NULL, *current = NULL;
+
+    for (; source; source = source->next_character) {
+        gregorio_character *character =
+                (gregorio_character *) calloc(1, sizeof(gregorio_character));
+        if (!character) {
+            gregorio_message(_("error in memory allocation"),
+                             "gregorio_clone_characters", VERBOSITY_FATAL, 0);
+            return NULL;
+        }
+
+        *character = *source;
+        character->next_character = NULL;
+
+        if (current) {
+            character->previous_character = current;
+            current = current->next_character = character;
+        } else {
+            character->previous_character = NULL;
+            target = current = character;
+        }
+    }
+
+    return target;
+}
+
 void gregorio_add_syllable(gregorio_syllable **current_syllable,
         int number_of_voices, gregorio_element *elements[],
         gregorio_character *first_character,
@@ -938,12 +939,7 @@ void gregorio_add_syllable(gregorio_syllable **current_syllable,
                 0);
         return;
     }
-    next = calloc(1, sizeof(gregorio_syllable));
-    if (!next) {
-        gregorio_message(_("error in memory allocation"), "add_syllable",
-                VERBOSITY_FATAL, 0);
-        return;
-    }
+    next = gregorio_calloc(1, sizeof(gregorio_syllable));
     next->type = GRE_SYLLABLE;
     next->special_sign = _NO_SIGN;
     next->position = position;
@@ -961,8 +957,8 @@ void gregorio_add_syllable(gregorio_syllable **current_syllable,
     }
     next->next_syllable = NULL;
     next->previous_syllable = *current_syllable;
-    tab = (gregorio_element **) malloc(number_of_voices *
-                                       sizeof(gregorio_element *));
+    tab = (gregorio_element **) gregorio_malloc(number_of_voices *
+            sizeof(gregorio_element *));
     if (elements) {
         for (i = 0; i < number_of_voices; i++) {
             tab[i] = elements[i];
@@ -1034,18 +1030,19 @@ static void gregorio_source_info_init(source_info *si)
 gregorio_score *gregorio_new_score(void)
 {
     int annotation_num;
-    gregorio_score *new_score = calloc(1, sizeof(gregorio_score));
+    gregorio_score *new_score = gregorio_calloc(1, sizeof(gregorio_score));
     new_score->first_syllable = NULL;
     new_score->number_of_voices = 1;
     new_score->name = NULL;
     new_score->gabc_copyright = NULL;
     new_score->score_copyright = NULL;
-    new_score->initial_style = NORMAL_INITIAL;
+    new_score->initial_style = INITIAL_NOT_SPECIFIED;
     new_score->office_part = NULL;
     new_score->occasion = NULL;
     new_score->meter = NULL;
     new_score->commentary = NULL;
     new_score->arranger = NULL;
+    new_score->language = NULL;
     gregorio_source_info_init(&new_score->si);
     new_score->first_voice_info = NULL;
     new_score->mode = 0;
@@ -1085,6 +1082,7 @@ static void gregorio_free_score_infos(gregorio_score *score)
     free(score->meter);
     free(score->commentary);
     free(score->arranger);
+    free(score->language);
     free(score->user_notes);
     free(score->gregoriotex_font);
     for (annotation_num = 0; annotation_num < MAX_ANNOTATIONS; ++annotation_num) {
@@ -1198,6 +1196,17 @@ void gregorio_set_score_arranger(gregorio_score *score, char *arranger)
     score->arranger = arranger;
 }
 
+void gregorio_set_score_language(gregorio_score *score, char *language)
+{
+    if (!score) {
+        gregorio_message(_("function called with NULL argument"),
+                "gregorio_set_score_language", VERBOSITY_WARNING, 0);
+        return;
+    }
+    free(score->language);
+    score->language = language;
+}
+
 void gregorio_set_score_number_of_voices(gregorio_score *score,
         int number_of_voices)
 {
@@ -1222,7 +1231,7 @@ void gregorio_set_score_user_notes(gregorio_score *score, char *user_notes)
 
 void gregorio_add_voice_info(gregorio_voice_info **current_voice_info)
 {
-    gregorio_voice_info *next = calloc(1, sizeof(gregorio_voice_info));
+    gregorio_voice_info *next = gregorio_calloc(1, sizeof(gregorio_voice_info));
     next->initial_key = NO_KEY;
     next->flatted_key = false;
     next->style = NULL;
@@ -1702,3 +1711,26 @@ bool gregorio_is_only_special(gregorio_element *element)
     }
     return 1;
 }
+
+const char *gregorio_unknown(int value) {
+    static char buf[20];
+    gregorio_snprintf(buf, sizeof buf, "?%d", value);
+    return buf;
+}
+
+ENUM_TO_STRING(gregorio_type, GREGORIO_TYPE)
+ENUM_TO_STRING(gregorio_shape, GREGORIO_SHAPE)
+ENUM_TO_STRING(gregorio_bar, GREGORIO_BAR)
+ENUM_TO_STRING(gregorio_sign, GREGORIO_SIGN)
+ENUM_TO_STRING(gregorio_space, GREGORIO_SPACE)
+ENUM_TO_STRING(gregorio_liquescentia, GREGORIO_LIQUESCENTIA)
+ENUM_TO_STRING(grehepisema_size, GREHEPISEMA_SIZE)
+ENUM_TO_STRING(gregorio_vposition, GREGORIO_VPOSITION)
+ENUM_TO_STRING(gregorio_glyph_type, GREGORIO_GLYPH_TYPE)
+ENUM_TO_STRING(grestyle_style, GRESTYLE_STYLE)
+ENUM_TO_STRING(grestyle_type, GRESTYLE_TYPE)
+ENUM_TO_STRING(gregorio_tr_centering, GREGORIO_TR_CENTERING)
+ENUM_TO_STRING(gregorio_nlba, GREGORIO_NLBA)
+ENUM_TO_STRING(gregorio_euouae, GREGORIO_EUOUAE)
+ENUM_TO_STRING(gregorio_word_position, GREGORIO_WORD_POSITION)
+ENUM_TO_STRING(gregorio_lyric_centering, GREGORIO_LYRIC_CENTERING)
diff --git a/src/struct.h b/src/struct.h
index d8b214bd1..d30dccf76 100644
--- a/src/struct.h
+++ b/src/struct.h
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header defines the Gregorio data structures and functions.
+ *
  * Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -29,6 +32,7 @@
 #ifndef STRUCT_H
 #define STRUCT_H
 
+#include "enum_generator.h"
 #include "bool.h"
 #include "sha1.h"
 
@@ -59,213 +63,214 @@ typedef struct gregorio_scanner_location {
 
 /* all the different types of things a gregorio_* can be */
 
-typedef enum gregorio_type {
-    GRE_NOTE = 1,
-    GRE_GLYPH,
-    GRE_ELEMENT,
-    GRE_FLAT,
-    GRE_SHARP,
-    GRE_NATURAL,
-    GRE_C_KEY_CHANGE,
-    GRE_C_KEY_CHANGE_FLATED,
-    GRE_SYLLABLE,
-    GRE_F_KEY_CHANGE,
-    GRE_F_KEY_CHANGE_FLATED,
-    GRE_END_OF_LINE,
-    GRE_SPACE,
-    GRE_BAR,
-    GRE_END_OF_PAR,
-    GRE_CUSTOS,
+#define GREGORIO_TYPE(A,E,X,L) \
+    A(GRE_NOTE, 1) \
+    E(GRE_GLYPH) \
+    E(GRE_ELEMENT) \
+    E(GRE_FLAT) \
+    E(GRE_SHARP) \
+    E(GRE_NATURAL) \
+    E(GRE_C_KEY_CHANGE) \
+    E(GRE_C_KEY_CHANGE_FLATED) \
+    E(GRE_SYLLABLE) \
+    E(GRE_F_KEY_CHANGE) \
+    E(GRE_F_KEY_CHANGE_FLATED) \
+    E(GRE_END_OF_LINE) \
+    E(GRE_SPACE) \
+    E(GRE_BAR) \
+    E(GRE_END_OF_PAR) \
+    E(GRE_CUSTOS) \
     /* I don't really know how I could use the a TEXVERB_NOTE in gregoriotex,
-     * as we don't write note by note... */
-    /* GRE_TEXVERB_NOTE, */
-    GRE_TEXVERB_GLYPH,
-    GRE_TEXVERB_ELEMENT,
+     * as we don't write note by note... */ \
+    /* GRE_TEXVERB_NOTE, */ \
+    E(GRE_TEXVERB_GLYPH) \
+    E(GRE_TEXVERB_ELEMENT) \
     /* above lines text, quite the same as GRE_TEXVERB_ELEMENT, but counted
-     * differently for the spaces above the lines */
-    GRE_ALT,
-    GRE_NLBA,
-    GRE_MANUAL_CUSTOS
-} gregorio_type;
+     * differently for the spaces above the lines */ \
+    E(GRE_ALT) \
+    E(GRE_NLBA) \
+    L(GRE_MANUAL_CUSTOS)
+ENUM(gregorio_type, GREGORIO_TYPE);
 
 /* the different shapes, only for notes */
 
-typedef enum gregorio_shape {
-    S_UNDETERMINED = 0,
-    S_PUNCTUM,
-    S_PUNCTUM_END_OF_GLYPH,
-    S_PUNCTUM_INCLINATUM,
-    S_PUNCTUM_INCLINATUM_DEMINUTUS,
-    S_PUNCTUM_INCLINATUM_AUCTUS,
-    S_VIRGA,
-    S_VIRGA_REVERSA,
-    S_BIVIRGA,
-    S_TRIVIRGA,
-    S_ORISCUS,
-    S_ORISCUS_AUCTUS,
-    S_ORISCUS_DEMINUTUS,
-    S_ORISCUS_SCAPUS,
-    S_QUILISMA,
-    S_STROPHA,
-    S_STROPHA_AUCTA,
-    S_DISTROPHA,
-    S_DISTROPHA_AUCTA,
-    S_TRISTROPHA,
-    S_TRISTROPHA_AUCTA,
-    S_PUNCTUM_CAVUM,
-    S_LINEA_PUNCTUM,
-    S_LINEA_PUNCTUM_CAVUM,
-    S_PUNCTUM_CAVUM_INCLINATUM,
-    S_PUNCTUM_CAVUM_INCLINATUM_AUCTUS,
-    /* special shapes that must not appear in the final form of the score :
+#define GREGORIO_SHAPE(A,E,X,L) \
+    A(S_UNDETERMINED, 0) \
+    E(S_PUNCTUM) \
+    E(S_PUNCTUM_END_OF_GLYPH) \
+    E(S_PUNCTUM_INCLINATUM) \
+    E(S_PUNCTUM_INCLINATUM_DEMINUTUS) \
+    E(S_PUNCTUM_INCLINATUM_AUCTUS) \
+    E(S_VIRGA) \
+    E(S_VIRGA_REVERSA) \
+    E(S_BIVIRGA) \
+    E(S_TRIVIRGA) \
+    E(S_ORISCUS) \
+    E(S_ORISCUS_AUCTUS) \
+    E(S_ORISCUS_DEMINUTUS) \
+    E(S_ORISCUS_SCAPUS) \
+    E(S_QUILISMA) \
+    E(S_STROPHA) \
+    E(S_STROPHA_AUCTA) \
+    E(S_DISTROPHA) \
+    E(S_DISTROPHA_AUCTA) \
+    E(S_TRISTROPHA) \
+    E(S_TRISTROPHA_AUCTA) \
+    E(S_PUNCTUM_CAVUM) \
+    E(S_LINEA_PUNCTUM) \
+    E(S_LINEA_PUNCTUM_CAVUM) \
+    E(S_PUNCTUM_CAVUM_INCLINATUM) \
+    E(S_PUNCTUM_CAVUM_INCLINATUM_AUCTUS) \
+    /* special shapes that must not appear in the final form of the score : 
      * quadratum is the shape of the first note of a punctum quadratum
      * and quilisma quadratum is the shape of the first note of a pes
-     * quislisma quadratum */
-    S_QUADRATUM,
-    /* those shapes are for now used only in gregoriotex */
-    S_QUILISMA_QUADRATUM,
-    S_PUNCTUM_AUCTUS_ASCENDENS,
-    S_PUNCTUM_AUCTUS_DESCENDENS,
-    S_PUNCTUM_DEMINUTUS,
-    S_LINEA
-} gregorio_shape;
+     * quislisma quadratum */ \
+    E(S_QUADRATUM) \
+    /* those shapes are for now used only in gregoriotex */ \
+    E(S_QUILISMA_QUADRATUM) \
+    E(S_PUNCTUM_AUCTUS_ASCENDENS) \
+    E(S_PUNCTUM_AUCTUS_DESCENDENS) \
+    E(S_PUNCTUM_DEMINUTUS) \
+    L(S_LINEA)
+ENUM(gregorio_shape, GREGORIO_SHAPE);
 
 /* the different kind of bars */
 
-typedef enum gregorio_bar {
-    B_NO_BAR = 0,
-    B_VIRGULA,
-    B_DIVISIO_MINIMA,
-    B_DIVISIO_MINOR,
-    B_DIVISIO_MAIOR,
-    B_DIVISIO_FINALIS,
-    B_DIVISIO_MINOR_D1,
-    B_DIVISIO_MINOR_D2,
-    B_DIVISIO_MINOR_D3,
-    B_DIVISIO_MINOR_D4,
-    B_DIVISIO_MINOR_D5,
-    B_DIVISIO_MINOR_D6
-} gregorio_bar;
+#define GREGORIO_BAR(A,E,X,L) \
+    A(B_NO_BAR, 0) \
+    E(B_VIRGULA) \
+    E(B_DIVISIO_MINIMA) \
+    E(B_DIVISIO_MINOR) \
+    E(B_DIVISIO_MAIOR) \
+    E(B_DIVISIO_FINALIS) \
+    E(B_DIVISIO_MINOR_D1) \
+    E(B_DIVISIO_MINOR_D2) \
+    E(B_DIVISIO_MINOR_D3) \
+    E(B_DIVISIO_MINOR_D4) \
+    E(B_DIVISIO_MINOR_D5) \
+    L(B_DIVISIO_MINOR_D6)
+ENUM(gregorio_bar, GREGORIO_BAR);
 
 /* definition of the signs. You can notice that the values are made so
  * that if you wan to add a vertical episema to a note, you juste
  * make note->signs+=_V_EPISEMA, so please don't change the value as
  * this trick is used. */
 
-typedef enum gregorio_sign {
-    _NO_SIGN = 0x00,
-    _PUNCTUM_MORA = 0x01,
-    _AUCTUM_DUPLEX = 0x02,
-    _V_EPISEMA = 0x10,
-    _V_EPISEMA_PUNCTUM_MORA = 0x11,
-    _V_EPISEMA_AUCTUM_DUPLEX = 0x12,
-    /* more rare signs, for now they can't be used with the others */
-    _ACCENTUS = 0x03,
-    _ACCENTUS_REVERSUS = 0x04,
-    _CIRCULUS = 0x05,
-    _SEMI_CIRCULUS = 0x06,
-    _SEMI_CIRCULUS_REVERSUS = 0x07,
-    /* signs of a bar */
-    _BAR_H_EPISEMA = 0x08,
-    _V_EPISEMA_BAR_H_EPISEMA = 0x18
-} gregorio_sign;
+#define GREGORIO_SIGN(A,E,X,L) \
+    A(_NO_SIGN, 0x00) \
+    A(_PUNCTUM_MORA, 0x01) \
+    A(_AUCTUM_DUPLEX, 0x02) \
+    A(_V_EPISEMA, 0x10) \
+    A(_V_EPISEMA_PUNCTUM_MORA, 0x11) \
+    A(_V_EPISEMA_AUCTUM_DUPLEX, 0x12) \
+    /* more rare signs, for now they can't be used with the others */ \
+    A(_ACCENTUS, 0x03) \
+    A(_ACCENTUS_REVERSUS, 0x04) \
+    A(_CIRCULUS, 0x05) \
+    A(_SEMI_CIRCULUS, 0x06) \
+    A(_SEMI_CIRCULUS_REVERSUS, 0x07) \
+    /* signs of a bar */ \
+    A(_BAR_H_EPISEMA, 0x08) \
+    X(_V_EPISEMA_BAR_H_EPISEMA, 0x18)
+ENUM(gregorio_sign, GREGORIO_SIGN);
 
 /* the different spaces */
 
-typedef enum gregorio_space {
-    SP_DEFAULT = 1,
-    SP_NO_SPACE,
-    SP_ZERO_WIDTH,
-    SP_NEUMATIC_CUT,
-    SP_LARGER_SPACE,
-    SP_GLYPH_SPACE,
-    SP_NEUMATIC_CUT_NB,
-    SP_LARGER_SPACE_NB,
-    SP_GLYPH_SPACE_NB
-} gregorio_space;
+#define GREGORIO_SPACE(A,E,X,L) \
+    A(SP_DEFAULT, 1) \
+    E(SP_NO_SPACE) \
+    E(SP_ZERO_WIDTH) \
+    E(SP_NEUMATIC_CUT) \
+    E(SP_LARGER_SPACE) \
+    E(SP_GLYPH_SPACE) \
+    E(SP_NEUMATIC_CUT_NB) \
+    E(SP_LARGER_SPACE_NB) \
+    L(SP_GLYPH_SPACE_NB)
+ENUM(gregorio_space, GREGORIO_SPACE);
 
 /* the different liquescences, like for the signs, have special
  * values: to say that something is initio_debilis, just do
  * glyph->liquescentia+=L_INITIO_DEBILIS. So don't change the value,
  * the trick is much used */
 
-typedef enum gregorio_liquescentia {
-    L_NO_LIQUESCENTIA = 0,
-    L_DEMINUTUS = 0x01,
-    L_AUCTUS_ASCENDENS = 0x02,
-    L_AUCTUS_DESCENDENS = 0x04,
-    L_AUCTA = 0x08,
-    L_INITIO_DEBILIS = 0x10,
-    L_DEMINUTUS_INITIO_DEBILIS = 0x11,
-    L_AUCTUS_ASCENDENS_INITIO_DEBILIS = 0x12,
-    L_AUCTUS_DESCENDENS_INITIO_DEBILIS = 0x14,
-    L_AUCTA_INITIO_DEBILIS = 0x18
-} gregorio_liquescentia;
-
-typedef enum grehepisema_size {
-    H_NORMAL = 0,
-    H_SMALL_LEFT,
-    H_SMALL_CENTRE,
-    H_SMALL_RIGHT
-} grehepisema_size;
+#define GREGORIO_LIQUESCENTIA(A,E,X,L) \
+    A(L_NO_LIQUESCENTIA, 0) \
+    A(L_DEMINUTUS, 0x01) \
+    A(L_AUCTUS_ASCENDENS, 0x02) \
+    A(L_AUCTUS_DESCENDENS, 0x04) \
+    A(L_AUCTA, 0x08) \
+    A(L_INITIO_DEBILIS, 0x10) \
+    A(L_DEMINUTUS_INITIO_DEBILIS, 0x11) \
+    A(L_AUCTUS_ASCENDENS_INITIO_DEBILIS, 0x12) \
+    A(L_AUCTUS_DESCENDENS_INITIO_DEBILIS, 0x14) \
+    X(L_AUCTA_INITIO_DEBILIS, 0x18)
+ENUM(gregorio_liquescentia, GREGORIO_LIQUESCENTIA);
+
+#define GREHEPISEMA_SIZE(A,E,X,L) \
+    A(H_NORMAL, 0) \
+    E(H_SMALL_LEFT) \
+    E(H_SMALL_CENTRE) \
+    L(H_SMALL_RIGHT)
+ENUM(grehepisema_size, GREHEPISEMA_SIZE);
 
 /* values are chosen so BELOW/ABOVE can be added to a pitch */
-typedef enum gregorio_vposition {
-    VPOS_AUTO = 0,
-    VPOS_BELOW = -1,
-    VPOS_ABOVE = 1
-} gregorio_vposition;
+#define GREGORIO_VPOSITION(A,E,X,L) \
+    A(VPOS_AUTO, 0) \
+    A(VPOS_BELOW, -1) \
+    X(VPOS_ABOVE, 1)
+ENUM(gregorio_vposition, GREGORIO_VPOSITION);
 
 /* The different types of glyph */
 
-typedef enum gregorio_glyph_type {
-    G_PUNCTUM_INCLINATUM = 1,
-    G_2_PUNCTA_INCLINATA_DESCENDENS,
-    G_3_PUNCTA_INCLINATA_DESCENDENS,
-    G_4_PUNCTA_INCLINATA_DESCENDENS,
-    G_5_PUNCTA_INCLINATA_DESCENDENS,
-    G_2_PUNCTA_INCLINATA_ASCENDENS,
-    G_3_PUNCTA_INCLINATA_ASCENDENS,
-    G_4_PUNCTA_INCLINATA_ASCENDENS,
-    G_5_PUNCTA_INCLINATA_ASCENDENS,
-    G_TRIGONUS,
-    G_PUNCTA_INCLINATA,
-    /* !!! DO NOT CHANGE THE ENUM ORDERING BEFORE THIS LINE !!! */
-    G_UNDETERMINED,
-    G_VIRGA,
-    G_STROPHA,
-    G_STROPHA_AUCTA,
-    G_PUNCTUM,
-    G_PODATUS,
-    G_PES_QUADRATUM,
-    G_FLEXA,
-    G_TORCULUS,
-    G_TORCULUS_RESUPINUS,
-    G_TORCULUS_RESUPINUS_FLEXUS,
-    G_PORRECTUS,
-    G_PORRECTUS_FLEXUS,
-    G_BIVIRGA,
-    G_TRIVIRGA,
-    G_DISTROPHA,
-    G_DISTROPHA_AUCTA,
-    G_TRISTROPHA,
-    G_TRISTROPHA_AUCTA,
-    G_PES_QUADRATUM_FIRST_PART,
-    G_SCANDICUS,
-    G_PES_QUILISMA_QUADRATUM_FIRST_PART,
-    G_ANCUS,
-    G_ONE_NOTE,
-    G_PUNCTA_ASCENDENS,
-    G_PUNCTA_DESCENDENS,
-    G_VIRGA_REVERSA,
-    G_SALICUS,
-    G_VIRGA_STRATA,
-    G_TORCULUS_LIQUESCENS,
-    /* additional glyph types, necessary for determination */
-    G_PORRECTUS_NO_BAR,
-    G_PORRECTUS_FLEXUS_NO_BAR,
-    G_PES_QUILISMA
-} gregorio_glyph_type;
+#define GREGORIO_GLYPH_TYPE(A,E,X,L) \
+    A(G_PUNCTUM_INCLINATUM, 1) \
+    E(G_2_PUNCTA_INCLINATA_DESCENDENS) \
+    E(G_3_PUNCTA_INCLINATA_DESCENDENS) \
+    E(G_4_PUNCTA_INCLINATA_DESCENDENS) \
+    E(G_5_PUNCTA_INCLINATA_DESCENDENS) \
+    E(G_2_PUNCTA_INCLINATA_ASCENDENS) \
+    E(G_3_PUNCTA_INCLINATA_ASCENDENS) \
+    E(G_4_PUNCTA_INCLINATA_ASCENDENS) \
+    E(G_5_PUNCTA_INCLINATA_ASCENDENS) \
+    E(G_TRIGONUS) \
+    E(G_PUNCTA_INCLINATA) \
+    /* !!! DO NOT CHANGE THE ENUM ORDERING BEFORE THIS LINE !!! */ \
+    E(G_UNDETERMINED) \
+    E(G_VIRGA) \
+    E(G_STROPHA) \
+    E(G_STROPHA_AUCTA) \
+    E(G_PUNCTUM) \
+    E(G_PODATUS) \
+    E(G_PES_QUADRATUM) \
+    E(G_FLEXA) \
+    E(G_TORCULUS) \
+    E(G_TORCULUS_RESUPINUS) \
+    E(G_TORCULUS_RESUPINUS_FLEXUS) \
+    E(G_PORRECTUS) \
+    E(G_PORRECTUS_FLEXUS) \
+    E(G_BIVIRGA) \
+    E(G_TRIVIRGA) \
+    E(G_DISTROPHA) \
+    E(G_DISTROPHA_AUCTA) \
+    E(G_TRISTROPHA) \
+    E(G_TRISTROPHA_AUCTA) \
+    E(G_PES_QUADRATUM_FIRST_PART) \
+    E(G_SCANDICUS) \
+    E(G_PES_QUILISMA_QUADRATUM_FIRST_PART) \
+    E(G_ANCUS) \
+    E(G_ONE_NOTE) \
+    E(G_PUNCTA_ASCENDENS) \
+    E(G_PUNCTA_DESCENDENS) \
+    E(G_VIRGA_REVERSA) \
+    E(G_SALICUS) \
+    E(G_SALICUS_FLEXUS) \
+    E(G_VIRGA_STRATA) \
+    E(G_TORCULUS_LIQUESCENS) \
+    /* additional glyph types, necessary for determination */ \
+    E(G_PORRECTUS_NO_BAR) \
+    E(G_PORRECTUS_FLEXUS_NO_BAR) \
+    L(G_PES_QUILISMA)
+ENUM(gregorio_glyph_type, GREGORIO_GLYPH_TYPE);
 
 /*
  * 
@@ -274,77 +279,77 @@ typedef enum gregorio_glyph_type {
  * 
  */
 
-typedef enum grestyle_style {
-    ST_NO_STYLE = 0,
-    ST_ITALIC,
-    ST_CENTER,
+#define GRESTYLE_STYLE(A,E,X,L) \
+    A(ST_NO_STYLE, 0) \
+    E(ST_ITALIC) \
+    E(ST_CENTER) \
     /* when the user types a {}, basically the same behaviour, except for
-     * the initial */
-    ST_FORCED_CENTER,
-    ST_BOLD,
-    ST_TT,
-    ST_SMALL_CAPS,
-    ST_SPECIAL_CHAR,
-    ST_VERBATIM,
-    ST_INITIAL, /* a style used to determine the initial */
-    ST_UNDERLINED,
-    ST_COLORED,
-    ST_FIRST_WORD,
-    ST_FIRST_SYLLABLE,
-    ST_FIRST_SYLLABLE_INITIAL,
-    ST_SYLLABLE_INITIAL
-} grestyle_style;
+     * the initial */ \
+    E(ST_FORCED_CENTER) \
+    E(ST_BOLD) \
+    E(ST_TT) \
+    E(ST_SMALL_CAPS) \
+    E(ST_SPECIAL_CHAR) \
+    E(ST_VERBATIM) \
+    E(ST_INITIAL) /* a style used to determine the initial */ \
+    E(ST_UNDERLINED) \
+    E(ST_COLORED) \
+    E(ST_FIRST_WORD) \
+    E(ST_FIRST_SYLLABLE) \
+    E(ST_FIRST_SYLLABLE_INITIAL) \
+    L(ST_SYLLABLE_INITIAL)
+ENUM(grestyle_style, GRESTYLE_STYLE);
 
 /*
  * Then the different types of styles. See the next comments for further
  * readings. 
  */
 
-typedef enum grestyle_type {
-    ST_T_NOTHING = 0,
-    ST_T_BEGIN,
-    ST_T_END
-} grestyle_type;
+#define GRESTYLE_TYPE(A,E,X,L) \
+    A(ST_T_NOTHING, 0) \
+    E(ST_T_BEGIN) \
+    L(ST_T_END)
+ENUM(grestyle_type, GRESTYLE_TYPE);
 
 /*
  * The different types of translation centerings 
  */
 
-typedef enum gregorio_tr_centering {
-    TR_NORMAL = 0,
-    TR_WITH_CENTER_BEGINNING,
-    TR_WITH_CENTER_END
-} gregorio_tr_centering;
+#define GREGORIO_TR_CENTERING(A,E,X,L) \
+    A(TR_NORMAL, 0) \
+    E(TR_WITH_CENTER_BEGINNING) \
+    L(TR_WITH_CENTER_END)
+ENUM(gregorio_tr_centering, GREGORIO_TR_CENTERING);
 
 /*
  * Nothing, beginning or end of area without linebreak 
  */
 
-typedef enum gregorio_nlba {
-    NLBA_NORMAL = 0,
-    NLBA_BEGINNING,
-    NLBA_END
-} gregorio_nlba;
-
-typedef enum gregorio_euouae {
-    EUOUAE_NORMAL = 0,
-    EUOUAE_BEGINNING,
-    EUOUAE_END
-} gregorio_euouae;
-
-typedef enum gregorio_word_position {
-    WORD_BEGINNING = 1,
-    WORD_MIDDLE,
-    WORD_END,
-    WORD_ONE_SYLLABLE
-} gregorio_word_position;
+#define GREGORIO_NLBA(A,E,X,L) \
+    A(NLBA_NORMAL, 0) \
+    E(NLBA_BEGINNING) \
+    L(NLBA_END)
+ENUM(gregorio_nlba, GREGORIO_NLBA);
+
+#define GREGORIO_EUOUAE(A,E,X,L) \
+    A(EUOUAE_NORMAL, 0) \
+    E(EUOUAE_BEGINNING) \
+    L(EUOUAE_END)
+ENUM(gregorio_euouae, GREGORIO_EUOUAE);
+
+#define GREGORIO_WORD_POSITION(A,E,X,L) \
+    A(WORD_BEGINNING, 1) \
+    E(WORD_MIDDLE) \
+    E(WORD_END) \
+    L(WORD_ONE_SYLLABLE)
+ENUM(gregorio_word_position, GREGORIO_WORD_POSITION);
 
 /* the centering schemes for gabc: */
-typedef enum gregorio_lyric_centering {
-    SCHEME_DEFAULT = 0,
-    SCHEME_VOWEL,
-    SCHEME_SYLLABLE
-} gregorio_lyric_centering;
+#define GREGORIO_LYRIC_CENTERING(A,E,X,L) \
+    A(SCHEME_DEFAULT, 0) \
+    E(SCHEME_VOWEL) \
+    L(SCHEME_SYLLABLE)
+ENUM(gregorio_lyric_centering, GREGORIO_LYRIC_CENTERING);
 
 typedef struct gregorio_extra_info {
     /* the sub-type of GRE_END_OF_LINE */
@@ -657,6 +662,7 @@ typedef struct gregorio_score {
     char *meter;
     char *commentary;
     char *arranger;
+    char *language;
     struct source_info si;
     /* the mode of a song is between 1 and 8 */
     char mode;
@@ -664,7 +670,7 @@ typedef struct gregorio_score {
     char *annotation[MAX_ANNOTATIONS];
     /* field giving informations on the initial (no initial, normal initial 
      * or two lines initial) */
-    char initial_style;
+    signed char initial_style;
     /* the font to use in gregoriotex */
     char *gregoriotex_font;
     size_t nabc_lines;
@@ -712,11 +718,8 @@ typedef struct gregorio_voice_info {
 
 #define MONOPHONY 0
 
-/* the different initial styles */
-
-#define NO_INITIAL 0
-#define NORMAL_INITIAL 1
-#define BIG_INITIAL 2
+/* the different initial styles - DEPRECATED by 4.1 */
+#define INITIAL_NOT_SPECIFIED -1
 
 #define NO_ALTERATION USELESS_VALUE
 #define FLAT GRE_FLAT
@@ -788,7 +791,8 @@ void gregorio_free_voice_infos(gregorio_voice_info *voice_info);
 void gregorio_free_one_note(gregorio_note **note);
 void gregorio_free_one_glyph(gregorio_glyph **glyph);
 void gregorio_free_score(gregorio_score *score);
-void gregorio_go_to_first_character(gregorio_character **character);
+void gregorio_free_characters(gregorio_character *current_character);
+void gregorio_go_to_first_character(const gregorio_character **character);
 void gregorio_add_pitched_element_as_glyph(gregorio_glyph **current_glyph,
         gregorio_type type, signed char pitch, bool flatted_key,
         bool force_pitch, char *texverb);
@@ -833,6 +837,7 @@ void gregorio_set_score_occasion(gregorio_score *score, char *occasion);
 void gregorio_set_score_meter(gregorio_score *score, char *meter);
 void gregorio_set_score_commentary(gregorio_score *score, char *commentary);
 void gregorio_set_score_arranger(gregorio_score *score, char *arranger);
+void gregorio_set_score_language(gregorio_score *score, char *language);
 void gregorio_set_score_gabc_version(gregorio_score *score, char *gabc_version);
 void gregorio_set_score_number_of_voices(gregorio_score *score,
         int number_of_voices);
@@ -864,7 +869,14 @@ void gregorio_begin_style(gregorio_character **current_character,
         grestyle_style style);
 void gregorio_end_style(gregorio_character **current_character,
         grestyle_style style);
+gregorio_character *gregorio_clone_characters(const gregorio_character *source);
 signed char gregorio_determine_next_pitch(gregorio_syllable *syllable,
         gregorio_element *element, gregorio_glyph *glyph);
+const char *gregorio_unknown(int value);
+
+static __inline void gregorio_go_to_first_character_c(gregorio_character **character)
+{
+    gregorio_go_to_first_character((const gregorio_character **)character);
+}
 
 #endif
diff --git a/src/support.c b/src/support.c
index 91851f38e..1862c9445 100644
--- a/src/support.c
+++ b/src/support.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file contains miscellaneous support functions.
+ *
  * Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
  * 
  * This file is part of Gregorio.
@@ -21,7 +24,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <string.h>
 #include "support.h"
+#include "messages.h"
 
 /* Our version of snprintf; this is NOT semantically the same as C99's
  * snprintf; rather, it's a "lowest common denominator" implementation
@@ -42,3 +47,47 @@ void gregorio_snprintf(char *s, size_t size, const char *format, ...)
 #endif
     va_end(args);
 }
+
+void *gregorio_malloc(size_t size)
+{
+    void *result = malloc(size);
+    if (!result) {
+        gregorio_message(_("error in memory allocation"),
+                "gregorio_malloc", VERBOSITY_FATAL, 0);
+        exit(1);
+    }
+    return result;
+}
+
+void *gregorio_calloc(size_t nmemb, size_t size)
+{
+    void *result = calloc(nmemb, size);
+    if (!result) {
+        gregorio_message(_("error in memory allocation"),
+                "gregorio_calloc", VERBOSITY_FATAL, 0);
+        exit(1);
+    }
+    return result;
+}
+
+void *gregorio_realloc(void *ptr, size_t size)
+{
+    void *result = realloc(ptr, size);
+    if (!result) {
+        gregorio_message(_("error in memory allocation"),
+                "gregorio_realloc", VERBOSITY_FATAL, 0);
+        exit(1);
+    }
+    return result;
+}
+
+char *gregorio_strdup(const char *s)
+{
+    char *result = strdup(s);
+    if (!result) {
+        gregorio_message(_("error in memory allocation"),
+                "gregorio_strdup", VERBOSITY_FATAL, 0);
+        exit(1);
+    }
+    return result;
+}
diff --git a/src/support.h b/src/support.h
index 323b5ac4b..f6ec46012 100644
--- a/src/support.h
+++ b/src/support.h
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header prototypes the miscellaneous support functions.
+ *
  * Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
  * 
  * This file is part of Gregorio.
@@ -24,5 +27,9 @@
 
 void gregorio_snprintf(char *s, size_t size, const char *format, ...)
         __attribute__ ((__format__ (__printf__, 3, 4)));
+void *gregorio_malloc(size_t size);
+void *gregorio_calloc(size_t nmemb, size_t size);
+void *gregorio_realloc(void *ptr, size_t size);
+char *gregorio_strdup(const char *s);
 
 #endif
diff --git a/src/unicode.c b/src/unicode.c
index f36bac8d5..afb7ab71a 100644
--- a/src/unicode.c
+++ b/src/unicode.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file contains functions providing UTF-8 support.
+ *
  * Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -24,6 +27,7 @@
 #include "struct.h"
 #include "unicode.h"
 #include "messages.h"
+#include "support.h"
 
 /*
  * 
@@ -109,7 +113,7 @@ grewchar *gregorio_build_grewchar_string_from_buf(const char *const buf)
         return NULL;
     }
     len = strlen(buf); /* to get the length of the syllable in ASCII */
-    gwstring = (grewchar *) malloc((len + 1) * sizeof(grewchar));
+    gwstring = (grewchar *) gregorio_malloc((len + 1) * sizeof(grewchar));
     gregorio_mbstowcs(gwstring, buf, len); /* converting into wchar_t */
     return gwstring;
 }
@@ -131,7 +135,7 @@ gregorio_character *gregorio_build_char_list_from_buf(const char *const buf)
         i++;
     }
     free(gwstring);
-    gregorio_go_to_first_character(&current_character);
+    gregorio_go_to_first_character_c(&current_character);
     return current_character;
 }
 
@@ -147,7 +151,7 @@ unsigned char gregorio_wcsbufcmp(grewchar *wstr, const char *buf)
         return 1;
     }
     len = strlen(buf); /* to get the length of the syllable in ASCII */
-    gwbuf = (grewchar *) malloc((len + 1) * sizeof(grewchar));
+    gwbuf = (grewchar *) gregorio_malloc((len + 1) * sizeof(grewchar));
     gregorio_mbstowcs(gwbuf, buf, len); /* converting into wchar_t */
     /* we add the corresponding characters in the list of gregorio_characters */
     while (gwbuf[i] && wstr[i]) {
diff --git a/src/unicode.h b/src/unicode.h
index b55f1fde7..62942edcb 100644
--- a/src/unicode.h
+++ b/src/unicode.h
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header prototypes the UTF-8 support functions.
+ *
  * Copyright (C) 2008-2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
diff --git a/src/utf8strings.h.in b/src/utf8strings.h.in
index 030889bcd..548462844 100644
--- a/src/utf8strings.h.in
+++ b/src/utf8strings.h.in
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header file contains UTF-8 encoded strings used by Gregorio
+ *
  * Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
diff --git a/src/vowel/vowel-rules.h b/src/vowel/vowel-rules.h
index bad87c1a4..bf99696e5 100644
--- a/src/vowel/vowel-rules.h
+++ b/src/vowel/vowel-rules.h
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header shares definitions between the vowel parser and lexer.
+ *
  * Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
diff --git a/src/vowel/vowel-rules.l b/src/vowel/vowel-rules.l
index 2b0a318a9..72a04b2e0 100644
--- a/src/vowel/vowel-rules.l
+++ b/src/vowel/vowel-rules.l
@@ -1,5 +1,8 @@
 %{
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the vowel rule lexer.
+ *
  * Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -24,6 +27,7 @@
 #include <string.h>
 #include "struct.h"
 #include "messages.h"
+#include "support.h"
 
 #include "vowel.h"
 
@@ -35,7 +39,7 @@
 static __inline void save_lval(void)
 {
     gregorio_vowel_rulefile_lval =
-            malloc((gregorio_vowel_rulefile_leng + 1) * sizeof(char));
+            gregorio_malloc((gregorio_vowel_rulefile_leng + 1) * sizeof(char));
     strncpy(gregorio_vowel_rulefile_lval, gregorio_vowel_rulefile_text,
             gregorio_vowel_rulefile_leng);
     gregorio_vowel_rulefile_lval[gregorio_vowel_rulefile_leng] = '\0';
diff --git a/src/vowel/vowel-rules.y b/src/vowel/vowel-rules.y
index 3c5bc82ee..236fa2293 100644
--- a/src/vowel/vowel-rules.y
+++ b/src/vowel/vowel-rules.y
@@ -1,5 +1,8 @@
 %{
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements the vowel rule parser.
+ *
  * Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This program is free software: you can redistribute it and/or modify it
diff --git a/src/vowel/vowel.c b/src/vowel/vowel.c
index b58148ab1..b4843cf2a 100644
--- a/src/vowel/vowel.c
+++ b/src/vowel/vowel.c
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This file implements vowel rule handling (aside from parsing).
+ *
  * Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
@@ -30,6 +33,7 @@
 #include "vowel.h"
 #include "unicode.h"
 #include "messages.h"
+#include "support.h"
 
 typedef struct character_set {
     grewchar *table;
@@ -42,21 +46,15 @@ typedef struct character_set {
 
 static character_set *character_set_new(const bool alloc_next)
 {
-    character_set *set = (character_set *)calloc(1, sizeof(character_set));
+    character_set *set =
+        (character_set *)gregorio_calloc(1, sizeof(character_set));
     set->mask = 0x0f;
     set->bins = 16;
     set->size = 0;
-    set->table = (grewchar *)calloc(set->bins, sizeof(grewchar));
-    if (!set->table) {
-        gregorio_message(_("unable to allocate memory"),
-                "character_set_new", VERBOSITY_FATAL, 0);
-    }
+    set->table = (grewchar *)gregorio_calloc(set->bins, sizeof(grewchar));
     if (alloc_next) {
-        set->next = (character_set **)calloc(set->bins, sizeof(character_set *));
-        if (!set->next) {
-            gregorio_message(_("unable to allocate memory"),
-                    "character_set_new", VERBOSITY_FATAL, 0);
-        }
+        set->next = (character_set **)gregorio_calloc(set->bins,
+                sizeof(character_set *));
     }
     return set;
 }
@@ -144,9 +142,9 @@ static __inline void character_set_grow(character_set *const set) {
 
     set->bins <<= 1;
     set->mask = (set->mask << 1) | 0x01;
-    set->table = calloc(set->bins, sizeof(grewchar));
+    set->table = gregorio_calloc(set->bins, sizeof(grewchar));
     if (old_next) {
-        set->table = calloc(set->bins, sizeof(character_set *));
+        set->table = gregorio_calloc(set->bins, sizeof(character_set *));
     }
     for (i = 0; i < old_bins; ++i) {
         if (old_table[i]) {
@@ -208,19 +206,12 @@ extern FILE *gregorio_vowel_rulefile_in;
 
 static void prefix_buffer_grow(size_t required_size)
 {
-    grewchar *newbuffer;
-
     while (required_size > prefix_buffer_size) {
         prefix_buffer_size <<= 1;
         prefix_buffer_mask = (prefix_buffer_mask << 1) | 0x01;
     }
-    newbuffer = realloc(prefix_buffer, prefix_buffer_size * sizeof(grewchar));
-    if (newbuffer) {
-        prefix_buffer = newbuffer;
-    } else {
-        gregorio_message(_("unable to allocate memory"), "prefix_buffer_grow",
-                VERBOSITY_FATAL, 0);
-    }
+    prefix_buffer = gregorio_realloc(prefix_buffer,
+            prefix_buffer_size * sizeof(grewchar));
 }
 
 void gregorio_vowel_tables_init(void)
@@ -238,12 +229,8 @@ void gregorio_vowel_tables_init(void)
 
         prefix_buffer_size = 16;
         prefix_buffer_mask = 0x0f;
-        prefix_buffer = (grewchar *)malloc(
+        prefix_buffer = (grewchar *)gregorio_malloc(
                 prefix_buffer_size * sizeof(grewchar));
-        if (!prefix_buffer) {
-            gregorio_message(_("unable to allocate memory"),
-                    "gregorio_vowel_tables_init", VERBOSITY_FATAL, 0);
-        }
     }
 }
 
diff --git a/src/vowel/vowel.h b/src/vowel/vowel.h
index 61e96bb0b..bd261c218 100644
--- a/src/vowel/vowel.h
+++ b/src/vowel/vowel.h
@@ -1,4 +1,7 @@
 /*
+ * Gregorio is a program that translates gabc files to GregorioTeX
+ * This header prototypes the vowel handling data structures and entry points.
+ *
  * Copyright (C) 2015 The Gregorio Project (see CONTRIBUTORS.md)
  *
  * This file is part of Gregorio.
diff --git a/tex/gregoriosyms.sty b/tex/gregoriosyms.sty
index f5b528190..dc32ce270 100644
--- a/tex/gregoriosyms.sty
+++ b/tex/gregoriosyms.sty
@@ -19,7 +19,7 @@
 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{gregoriosyms}
-    [2015/11/05 v4.0.0-rc2 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
+    [2015/12/08 v4.0.0 GregorioTeX symbols only.]% PARSE_VERSION_DATE_LTX
 
 % If gregoriotex has been loaded, then we need to abort the loading process of this package here in order to avoid some conflicts.
 \ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi%
@@ -38,7 +38,7 @@
 
 % The version of gregorio. All gregoriotex*.tex files must have the same.
 % All gtex files must also have the same version.
-\xdef\gre@gregorioversion{4.0.0-rc2}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregorioversion{4.0.0}% GREGORIO_VERSION - VersionManager.py
 
 \providecommand{\gre@declarefileversion}[2]{\relax}
 
diff --git a/tex/gregoriotex-chars.tex b/tex/gregoriotex-chars.tex
index 78ef8d29a..7231c0d75 100644
--- a/tex/gregoriotex-chars.tex
+++ b/tex/gregoriotex-chars.tex
@@ -17,7 +17,7 @@
 % You should have received a copy of the GNU General Public License
 % along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
 
-\gre@declarefileversion{gregoriotex-chars.tex}{4.0.0-rc2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-chars.tex}{4.0.0}% GREGORIO_VERSION
 
 \def\gre@char@fuse@punctum@one{\GreFuseTwo{\GreCPLeadingPunctumOne}{\GreCPPunctum}}%
 \def\gre@char@fuse@quilisma@one{\GreFuseTwo{\GreCPLeadingQuilismaOne}{\GreCPPunctum}}%
diff --git a/tex/gregoriotex-main.tex b/tex/gregoriotex-main.tex
index ded37b8cf..a8e9b6c68 100644
--- a/tex/gregoriotex-main.tex
+++ b/tex/gregoriotex-main.tex
@@ -106,7 +106,7 @@
 
 % The version of gregorio. All gregoriotex*.tex files must have the same.
 % All gtex files must also have the same version.
-\xdef\gre@gregorioversion{4.0.0-rc2}% GREGORIO_VERSION - VersionManager.py
+\xdef\gre@gregorioversion{4.0.0}% GREGORIO_VERSION - VersionManager.py
 
 % first some macros to allow checks for version:
 % Tests that all gregoriotex files are of the same version.
@@ -217,6 +217,7 @@
 \def\GreNewParLine{%
   \gre@debugmsg{lineheight}{GreNewParLine}%
   \gre@newlinecommon{1}%
+  \relax%
 }%
 
 % the macro we call each time we force a changing of line, it automatically sets \gre@knownline, and adjusts left spaces
@@ -229,9 +230,9 @@
       \ifcase\gre@knownline %
       % 0: should not happend...
       \or % 1
-        \GreAdjustSecondLine %
+        \gre@adjustsecondline %
       \or %2
-        \GreAdjustThirdLine %
+        \gre@adjustthirdline %
       \fi %
     \fi %
     \global\advance\gre@knownline by 1\relax %
@@ -255,7 +256,7 @@
     \fi %
     \gre@penalty{-10001}%
   \fi %
-  \relax %
+  \gre@adjustlineifnecessary\relax %
 }%
 
 \def\gre@mark@translation{\directlua{gregoriotex.mark_translation()}}%
@@ -290,31 +291,41 @@
 \newcount\gre@knownline%
 
 % macro to call before the call of \initial
-\def\GreSetBigInitial{%
+\def\gre@setbiginitial{%
+  \gre@debugmsg{general}{setting BIG initial}%
   \global\gre@biginitial=1\relax %
   \relax %
 }%
 
 % macro to cancel before the call of \initial
 \def\gre@normalinitial{%
+  \gre@debugmsg{general}{setting normal initial}%
   \global\gre@biginitial=0\relax %
   \relax %
 }%
 
 % macro to call before the first syllable, but after setinitialclef
-\def\GreAdjustSecondLine{%
+\def\gre@adjustsecondline{%
   \gre@dimen@additionalleftspace=\gre@dimen@initialwidth\relax%
   \gre@updateleftbox %
   \relax %
 }%
 
 % macro to call during the second line
-\def\GreAdjustThirdLine{%
+\def\gre@adjustthirdline{%
   \gre@dimen@additionalleftspace= 0 pt\relax%
   \gre@updateleftbox %
   \relax %
 }%
 
+\newif\ifgre@thirdlineadjustmentnecessary %
+\def\gre@adjustlineifnecessary{%
+  \ifgre@thirdlineadjustmentnecessary %
+    \gre@adjustthirdline %
+    \gre@thirdlineadjustmentnecessaryfalse %
+  \fi %
+}%
+
 \def\gre@updateleftbox{%
   \gre@updatelinewidth %
   \gre@updatelinesclef %
@@ -335,7 +346,7 @@
   \setbox\gre@box@initial=\hbox{#1}%
 }%
 
-\def\GreSetInitial#1{%
+\def\gre@setinitial#1{%
   % see comments on this function to see what it does
   \gre@debugmsg{annotation}{Time to calculate the true raise.}%
   \gre@calculate@annotationtrueraise %
@@ -383,6 +394,9 @@
       \greinitialformat{\global\gre@dimen@temp@four = \gre@dimen@beforeinitialshift}%  DEPRECATED
     \fi%  DEPRECATED
   \else %
+    \ifgre@allowdeprecated%%% DEPRECATED for removal in 5.0
+      \gre@warning{biginitial style is deprecated, but the old\MessageBreak behavior will be used since deprecated usage is\MessageBreak currently enabled. This behavior will disappear\MessageBreak in 5.0, so consider disabling deprecated usage\MessageBreak and switching to the initial style instead. (See\MessageBreak UPGRADE.md for more information)}%%% DEPRECATED for removal in 5.0
+    \fi%%% DEPRECATED for removal in 5.0
     \advance\gre@dimen@temp@five by -\gre@dimen@additionalbottomspace\relax%
     \advance\gre@dimen@temp@five by -\gre@dimen@spacebeneathtext\relax%
     \advance\gre@dimen@temp@five by -\gre@dimen@spacelinestext\relax%
@@ -394,7 +408,11 @@
     \ifx\gre@empty@biginitialformat\grebiginitialformat% DEPRECATED
       \ifvoid\gre@box@initial% keep this line
         \gre@debugmsg{initial}{fill big initial box}% keep this line
-        \setbox\gre@box@initial=\hbox{\gre@style@biginitial#1\endgre@style@biginitial}% keep this line
+        \ifgre@allowdeprecated%%% DEPRECATED for removal in 5.0
+          \setbox\gre@box@initial=\hbox{\gre@style@biginitial#1\endgre@style@biginitial}% DEPRECATED for removal in 5.0
+        \else%%% DEPRECATED for removal in 5.0
+          \setbox\gre@box@initial=\hbox{\gre@style@initial#1\endgre@style@initial}% keep this line
+        \fi%%% DEPRECATED for removal in 5.0
       \fi% keep this line
     \else%  DEPRECATED
       \gre@deprecated{\protect\grebiginitialformat}{\protect\grechangestyle{biginitial}}%  DEPRECATED
@@ -405,9 +423,15 @@
       \global\gre@dimen@initialwidth=\wd\gre@box@initial %
     \else%
       \ifx\gre@empty@biginitialformat\grebiginitialformat% DEPRECATED
-        \gre@style@biginitial% keep this line
-        \global\gre@dimen@initialwidth=\gre@dimen@manualinitialwidth\relax% keep this line
-        \endgre@style@biginitial% keep this line
+        \ifgre@allowdeprecated%%% DEPRECATED for removal in 5.0
+          \gre@style@biginitial%%% DEPRECATED for removal in 5.0
+          \global\gre@dimen@initialwidth=\gre@dimen@manualinitialwidth\relax%%% DEPRECATED for removal in 5.0
+          \endgre@style@biginitial%%% DEPRECATED for removal in 5.0
+        \else%%% DEPRECATED for removal in 5.0
+          \gre@style@initial% keep this line
+          \global\gre@dimen@initialwidth=\gre@dimen@manualinitialwidth\relax% keep this line
+          \endgre@style@initial% keep this line
+        \fi%%% DEPRECATED for removal in 5.0
       \else%  DEPRECATED
         \gre@deprecated{\protect\grebiginitialformat}{\protect\grechangestyle{biginitial}}%  DEPRECATED
         \grebiginitialformat{\global\gre@dimen@initialwidth=\gre@dimen@manualinitialwidth}%  DEPRECATED
@@ -419,9 +443,15 @@
     \fi%
     \setbox\gre@box@initial=\hbox{\vtop to 0pt{\hbox to \gre@dimen@initialwidth {\hss\raise \gre@dimen@temp@five\box\gre@box@initial\hss}\vss}}%
     \ifx\gre@empty@biginitialformat\grebiginitialformat% DEPRECATED
-      \gre@style@biginitial% keep this line
-      \global\gre@dimen@temp@four = \gre@dimen@beforeinitialshift\relax% keep this line
-      \endgre@style@biginitial% keep this line
+      \ifgre@allowdeprecated%%% DEPRECATED for removal in 5.0
+        \gre@style@biginitial%%% DEPRECATED for removal in 5.0
+        \global\gre@dimen@temp@four = \gre@dimen@beforeinitialshift\relax%%% DEPRECATED for removal in 5.0
+        \endgre@style@biginitial%%% DEPRECATED for removal in 5.0
+      \else%%% DEPRECATED for removal in 5.0
+        \gre@style@initial% keep this line
+        \global\gre@dimen@temp@four = \gre@dimen@beforeinitialshift\relax% keep this line
+        \endgre@style@initial% keep this line
+      \fi%%% DEPRECATED for removal in 5.0
     \else%  DEPRECATED
       \gre@deprecated{\protect\grebiginitialformat}{\protect\grechangestyle{biginitial}}%  DEPRECATED
       \grebiginitialformat{\global\gre@dimen@temp@four = \gre@dimen@beforeinitialshift}%  DEPRECATED
@@ -442,9 +472,15 @@
     \fi%  DEPRECATED
   \else%
     \ifx\gre@empty@biginitialformat\grebiginitialformat% DEPRECATED
-      \gre@style@biginitial% keep this line
-      \global\gre@dimen@temp@four = \gre@dimen@afterinitialshift\relax% keep this line
-      \endgre@style@biginitial% keep this line
+      \ifgre@allowdeprecated%%% DEPRECATED for removal in 5.0
+        \gre@style@biginitial%%% DEPRECATED for removal in 5.0
+        \global\gre@dimen@temp@four = \gre@dimen@afterinitialshift\relax%%% DEPRECATED for removal in 5.0
+        \endgre@style@biginitial%%% DEPRECATED for removal in 5.0
+      \else%%% DEPRECATED for removal in 5.0
+        \gre@style@initial% keep this line
+        \global\gre@dimen@temp@four = \gre@dimen@afterinitialshift\relax% keep this line
+        \endgre@style@initial% keep this line
+      \fi%%% DEPRECATED for removal in 5.0
     \else%  DEPRECATED
       \gre@deprecated{\protect\grebiginitialformat}{\protect\grechangestyle{biginitial}}%  DEPRECATED
       \grebiginitialformat{\global\gre@dimen@temp@four = \gre@dimen@afterinitialshift}%  DEPRECATED
@@ -472,7 +508,7 @@
   \relax %
 }%
 
-\def\GreNoInitial{%
+\def\gre@noinitial{%
   \setbox\gre@box@initial=\box\voidb@x%
   \global\gre@dimen@initialwidth=0pt\relax%
   \relax %
@@ -604,7 +640,7 @@
 
 %% macro that draws the lines : starts by the first and then draws the lines of every line.
 %% has to be called before drawing the key, after drawing the initial
-\def\GreBeginNotes{%
+\def\gre@beginnotes{%
   \gre@drawfirstlines %
   %%localeleftbox is a primitive of Omega, it draws the same box at the beginning of new lines (here after the first)
   \gre@localleftbox{%
@@ -1032,6 +1068,7 @@
   \global\setluatexattribute\gre@attr@glyph@id{0}%
   \xdef\gre@gabcname{#6}%
   \global\let\gre@save@englishcentering\gre@lyriccentering\relax % DEPRECATED
+  \global\let\gre@opening@initialstyle\gre@initiallines\relax % DEPRECATED by 4.1
   \ifgre@justifylastline%
     \xdef\gre@save@parfillskip{\the\parfillskip}
     \parfillskip=0pt plus 0pt minus 0pt\relax%
@@ -1500,6 +1537,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \def\grechangestyle#1#2{%
+  \IfStrEq{#1}{biginitial}{\gre@deprecated{biginitial style}{initial style}}{}%%% DEPRECATED for removal in 5.0
   \@ifnextchar[{\gre@changestyle{#1}{#2}}{\gre@changestyle{#1}{#2}[\relax]}%
 }%
 
@@ -1664,7 +1702,8 @@
 
 % Macros for compiling short snippets of GABC directly expressed in TeX
 
-\long\def\gre@gabcsnippet@option[#1]#2{%
+\long\def\gre@gabcsnippet@option[#1]#2{%%% DEPRECATED by 4.1
+  \gre@deprecated{\protect\gabcsnippet  with initial-style argument}{\protect\gresetinitiallines}%
   \directlua{gregoriotex.direct_gabc("\luatexluaescapestring{\unexpanded\expandafter{#2}}", "initial-style: #1;")}%
 }%
 
@@ -1672,6 +1711,7 @@
   \directlua{gregoriotex.direct_gabc("\luatexluaescapestring{\unexpanded\expandafter{#1}}")}%
 }%
 
+%%% \gre@gabcsnipper@option is DEPRECATED by 4.1
 \def\gabcsnippet{\@ifnextchar[{\gre@gabcsnippet@option}{\gre@gabcsnippet}}%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/tex/gregoriotex-signs.lua b/tex/gregoriotex-signs.lua
index 195764db2..c1f28607f 100644
--- a/tex/gregoriotex-signs.lua
+++ b/tex/gregoriotex-signs.lua
@@ -405,14 +405,14 @@ local offset_cases = {
   -- least two
   {
     case = 'SalicusOriscusWide',
-    v = [[\gre@vepisemaorrareaux{\GreCPPesQuassusLongqueueThreeNothing}{\GreCPSalicusOriscus}{2}{0}{#2}{#3}{#4}]],
-    h = [[\gre@hepisorlineaux{\GreCPPesQuassusLongqueueThreeNothing}{\gre@char@he@salicus@oriscus{#4}}{2}{#3}]],
+    v = [[\gre@vepisemaorrareaux{\GreCPVirgaStrataThreeNothing}{\GreCPSalicusOriscus}{3}{0}{#2}{#3}{#4}]],
+    h = [[\gre@hepisorlineaux{\GreCPVirgaStrataThreeNothing}{\gre@char@he@salicus@oriscus{#4}}{4}{#3}]],
   },
   -- "oriscus" as the middle note of a salicus with a second ambitus of one
   {
     case = 'SalicusOriscusOne',
-    v = [[\gre@vepisemaorrareaux{\GreCPPesQuassusLongqueueOneNothing}{\GreCPSalicusOriscus}{2}{0}{#2}{#3}{#4}]],
-    h = [[\gre@hepisorlineaux{\GreCPPesQuassusLongqueueOneNothing}{\gre@char@he@salicus@oriscus{#4}}{2}{#3}]],
+    v = [[\gre@vepisemaorrareaux{\GreCPVirgaStrataOneNothing}{\GreCPOriscus}{3}{0}{#2}{#3}{#4}]],
+    h = [[\gre@hepisorlineaux{\GreCPVirgaStrataOneNothing}{\gre@char@he@salicus@oriscus{#4}}{4}{#3}]],
   },
 }
 
diff --git a/tex/gregoriotex-signs.tex b/tex/gregoriotex-signs.tex
index bdd1c3f35..cc8844720 100644
--- a/tex/gregoriotex-signs.tex
+++ b/tex/gregoriotex-signs.tex
@@ -22,7 +22,7 @@
 
 \def\grebarbracewidth{.58879}%
 
-\gre@declarefileversion{gregoriotex-signs.tex}{4.0.0-rc2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-signs.tex}{4.0.0}% GREGORIO_VERSION
 
 \def\gre@usestylecommon{%
   \ifgre@usestylefont\else %
@@ -215,7 +215,7 @@
   % if the initial is big, then we adjust the second line
   \ifnum\gre@biginitial=0\relax %
   \else %
-    \GreAdjustSecondLine %
+    \gre@adjustsecondline %
   \fi %
   \relax%
 }%
@@ -1034,6 +1034,9 @@
 %    3 : go back to the beginning of the previous glyph and then forward the
 %        width of #1; this starts the episema at the glyph from the start that
 %        starts just after #1's width from the start
+%    4 : go back to the beginning of the previous glyph and then forward the
+%        width of #1, then back the width of #2; this ends the episema at the
+%        end of #1
 % #4 argument is the same as in hepisorline
 \def\gre@hepisorlineaux#1#2#3#4{%
   \ifcase#3%
@@ -1052,6 +1055,13 @@
     \gre@dimen@temp@three=\gre@dimen@lastglyphwidth\relax%
     \setbox\gre@box@temp@sign=\hbox{\gre@font@music #1}%
     \advance\gre@dimen@temp@three by -\wd\gre@box@temp@sign %
+  \or
+    % case 4
+    \gre@dimen@temp@three=\gre@dimen@lastglyphwidth\relax%
+    \setbox\gre@box@temp@sign=\hbox{\gre@font@music #1}%
+    \advance\gre@dimen@temp@three by -\wd\gre@box@temp@sign %
+    \setbox\gre@box@temp@sign=\hbox{\gre@font@music #2}%
+    \advance\gre@dimen@temp@three by \wd\gre@box@temp@sign %
   \fi%
   \kern-\gre@dimen@temp@three %
   % then we draw the sign, and go back to the beginning of the sign
diff --git a/tex/gregoriotex-spaces.tex b/tex/gregoriotex-spaces.tex
index 602a6e8a0..f23bb59bf 100644
--- a/tex/gregoriotex-spaces.tex
+++ b/tex/gregoriotex-spaces.tex
@@ -19,7 +19,7 @@
 
 % this file contains definitions of spaces
 
-\gre@declarefileversion{gregoriotex-spaces.tex}{4.0.0-rc2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-spaces.tex}{4.0.0}% GREGORIO_VERSION
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% macros for tuning penalties
diff --git a/tex/gregoriotex-syllable.tex b/tex/gregoriotex-syllable.tex
index 4cd0dc066..55bd3403b 100644
--- a/tex/gregoriotex-syllable.tex
+++ b/tex/gregoriotex-syllable.tex
@@ -19,7 +19,7 @@
 
 % this file contains definitions of the glyphs and the syllables
 
-\gre@declarefileversion{gregoriotex-syllable.tex}{4.0.0-rc2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-syllable.tex}{4.0.0}% GREGORIO_VERSION
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% macros for the typesetting of the different glyphs
@@ -896,3 +896,74 @@
   \fi\fi %
   \relax%
 }
+
+%% internal macro to set the first syllable text after all parts are known
+%% #1 - First part of the syllable (before the vowel)
+%% #2 - Middle part of the syllable (the vowel)
+%% #3 - Last part of the syllable (after the vowel)
+%% #4 - First letter of the syllable
+%% #5 - Everything after the first letter of the syllable
+%% #6 - Macros to run after the text is emitted
+\def\gre@setfirstsyllabletext#1#2#3#4#5#6{%
+  \def\gre@opening@syllabletext{%
+    \GreSetThisSyllable{#1}{#2}{#3}%
+    {\GreFirstWord{\GreFirstSyllable{\GreFirstSyllableInitial{#4}}}}%
+    {\GreFirstWord{\GreFirstSyllable{#5}}}%
+    #6\relax %
+  }%
+}%
+
+\def\gresetinitiallines#1{\def\gre@initiallines{#1}}%
+\gresetinitiallines{1}% default to one-line initials
+
+\def\GreSetInitialStyle#1{%%% DEPRECATED by 4.1
+  \gre@deprecated{initial-style gabc header}{\protect\gresetinitiallines}%%% DEPRECATED by 4.1
+  \def\gre@opening@initialstyle{#1}%%% DEPRECATED by 4.1
+}%%% DEPRECATED by 4.1
+
+%% sets the first syllable text
+%% #1 - Initial
+%% #2 - First letter after the initial
+%% #3 - everything else in the syllable
+%% #4 - Three syllable parts when there is a separated initial
+%% #5 - Three syllable parts where there is no separated initial
+%% #6 - Extra macros to run if there is an initial
+\def\GreSetFirstSyllableText#1#2#3#4#5#6{%
+  %%% DEPRECATED by 4.1: When \gre@opening@initialstyle is removed, use \gre@initiallines directly in the following line
+  \ifcase\gre@opening@initialstyle\relax % no initial
+    \gre@noinitial %
+    \gre@setfirstsyllabletext#5{#1}{#2#3}{}%
+  \or % regular intiial
+    \gre@setinitial{#1}%
+    \gre@setfirstsyllabletext#4{#2}{#3}{#6}%
+  \or % big initial
+    \gre@setbiginitial\gre@setinitial{#1}%
+    \gre@setfirstsyllabletext#4{#2}{#3}{#6}%
+  \fi %
+}%
+
+\def\GreSetNoFirstSyllableText{%
+  \gre@noinitial %
+  \def\gre@opening@syllabletext{}%
+}%
+
+%% opens a score
+%% #1 - macros rendering the things after the initial but before the notes
+%% #2 - macros rendering the things after starting notes but before the syllable
+%% #3 - control sequence for the syllable
+%% #4 - macros rendering the first syllable; should emit the initial and
+%%      populate \gre@opening@syllabletext (even if that should be empty)
+\def\GreScoreOpening#1#2#3#4{%
+  #4\relax % should emit the initial
+  \ifnum\gre@biginitial=1\relax %
+    \gre@debugmsg{general}{making adjustment NECESSARY}%
+    \gre@thirdlineadjustmentnecessarytrue %
+  \else %
+    \gre@debugmsg{general}{making adjustment unnecessary}%
+    \gre@thirdlineadjustmentnecessaryfalse %
+  \fi %
+  #1\relax % score reference, voice info, etc.
+  \gre@beginnotes\relax %
+  #2\relax % initial clef, etc.
+  #3{\gre@opening@syllabletext}%
+}%
diff --git a/tex/gregoriotex-symbols.tex b/tex/gregoriotex-symbols.tex
index 5ec1f7007..df8192484 100644
--- a/tex/gregoriotex-symbols.tex
+++ b/tex/gregoriotex-symbols.tex
@@ -22,7 +22,7 @@
 \ifcsname gregoriotex@symbols@loaded\endcsname\endinput\fi%
 \def\gregoriotex@symbols@loaded{}%
 
-\gre@declarefileversion{gregoriotex-symbols.tex}{4.0.0-rc2}% GREGORIO_VERSION
+\gre@declarefileversion{gregoriotex-symbols.tex}{4.0.0}% GREGORIO_VERSION
 
 \RequireLuaModule{gregoriotex}%
 
diff --git a/tex/gregoriotex.lua b/tex/gregoriotex.lua
index e2ec40538..47ca2b384 100644
--- a/tex/gregoriotex.lua
+++ b/tex/gregoriotex.lua
@@ -24,13 +24,13 @@ local hpack, traverse, traverse_id, has_attribute, count, remove, insert_after,
 gregoriotex = gregoriotex or {}
 local gregoriotex = gregoriotex
 
-local internalversion = '4.0.0-rc2' -- GREGORIO_VERSION (comment used by VersionManager.py)
+local internalversion = '4.0.0' -- GREGORIO_VERSION (comment used by VersionManager.py)
 
 local err, warn, info, log = luatexbase.provides_module({
     name               = "gregoriotex",
-    version            = '4.0.0-rc2', -- GREGORIO_VERSION
+    version            = '4.0.0', -- GREGORIO_VERSION
     greinternalversion = internalversion,
-    date               = "2015/11/05", -- GREGORIO_DATE_LTX
+    date               = "2015/12/08", -- GREGORIO_DATE_LTX
     description        = "GregorioTeX module.",
     author             = "The Gregorio Project (see CONTRIBUTORS.md)",
     copyright          = "2008-2015 - The Gregorio Project",
diff --git a/tex/gregoriotex.sty b/tex/gregoriotex.sty
index 77d9b512e..9817c2697 100644
--- a/tex/gregoriotex.sty
+++ b/tex/gregoriotex.sty
@@ -19,7 +19,7 @@
 
 \NeedsTeXFormat{LaTeX2e}%
 \ProvidesPackage{gregoriotex}%
-    [2015/11/05 v4.0.0-rc2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+    [2015/12/08 v4.0.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
 
 % If gregoriosyms has been loaded then there are going to be some conflicts in the definitions made in that package and this one.  In order to provide for a more informative error message, we check for that conflict right away
 \ifcsname gregoriotex@symbols@loaded\endcsname\gre@error{Loading gregoriotex after\MessageBreak gregoriosyms is not supported.  Please remove the\MessageBreak loading of gregoriosyms (its contents are loaded\MessageBreak by gregoriotex)}\fi%
@@ -146,9 +146,9 @@
   {\begingroup\fontsize{40}{40}\selectfont}%
   {\endgroup}%
 
-\newenvironment{gre@style@biginitial}%
-  {\begingroup\fontsize{80}{80}\selectfont}%
-  {\endgroup}%
+\newenvironment{gre@style@biginitial}%%% DEPRECATED for removal in 5.0
+  {\begingroup\fontsize{80}{80}\selectfont}%%% DEPRECATED for removal in 5.0
+  {\endgroup}%%% DEPRECATED for removal in 5.0
 
 \newenvironment{gre@style@translation}%
   {\begingroup\begin{itshape}}%
diff --git a/tex/gregoriotex.tex b/tex/gregoriotex.tex
index 7a1e23321..7ced79aa1 100644
--- a/tex/gregoriotex.tex
+++ b/tex/gregoriotex.tex
@@ -21,7 +21,7 @@
 
 
 % This file needs to be marked with the version number.  For now I've done this with the following comment, but we should check to see if PlainTeX has something similar to the version declaration of LaTeX and use that if it does.
-% 		[2015/11/05 v4.0.0-rc2 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
+% 		[2015/12/08 v4.0.0 GregorioTeX system.]% PARSE_VERSION_DATE_LTX
 
 
 \edef\greoldcatcode{\the\catcode`@}
@@ -157,7 +157,7 @@
 %% Formatting environments
 %%%%%%%%%%%%%%%%%%%%
 
-\font\gre@font@biginitial=pncr at 80pt\relax%
+\font\gre@font@biginitial=pncr at 80pt\relax%%% DEPRECATED for removal in 5.0
 \font\gre@font@initial=pncr at 40pt\relax%
 
 \def\gre@style@initial{%
@@ -167,12 +167,12 @@
 }%
 \def\endgre@style@initial{\endgroup}%
 
-\def\gre@style@biginitial{%
-  \begingroup%
-  \gre@font@biginitial%
-  \relax %
-}%
-\def\endgre@style@biginitial{\endgroup}%
+\def\gre@style@biginitial{%%% DEPRECATED for removal in 5.0
+  \begingroup%%% DEPRECATED for removal in 5.0
+  \gre@font@biginitial%%% DEPRECATED for removal in 5.0
+  \relax %%% DEPRECATED for removal in 5.0
+}%%% DEPRECATED for removal in 5.0
+\def\endgre@style@biginitial{\endgroup}%%% DEPRECATED for removal in 5.0
 
 \def\gre@style@translation{%
   \begingroup%
diff --git a/windows/gregorio-resources.rc b/windows/gregorio-resources.rc
index eeb49bb57..0b70f9577 100644
--- a/windows/gregorio-resources.rc
+++ b/windows/gregorio-resources.rc
@@ -1,7 +1,7 @@
 IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
 1 VERSIONINFO
-FILEVERSION     4,0,0,22
-PRODUCTVERSION  4,0,0,22
+FILEVERSION     4,0,0,30
+PRODUCTVERSION  4,0,0,30
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -9,12 +9,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "Gregorio project"
       VALUE "FileDescription", "Gregorio"
-      VALUE "FileVersion", "4.0.0-rc2"
+      VALUE "FileVersion", "4.0.0"
       VALUE "InternalName", "gregorio"
       VALUE "LegalCopyright", "See COPYING in the installation directory."
       VALUE "OriginalFilename", "gregorio.exe"
       VALUE "ProductName", "Gregorio"
-      VALUE "ProductVersion", "4.0.0-rc2"
+      VALUE "ProductVersion", "4.0.0"
     END
   END
 
diff --git a/windows/gregorio.iss b/windows/gregorio.iss
index 021f007bd..fbbb0bbb2 100644
--- a/windows/gregorio.iss
+++ b/windows/gregorio.iss
@@ -1,6 +1,6 @@
 [Setup]
 AppName=gregorio
-AppVersion=4.0.0-rc2
+AppVersion=4.0.0
 DefaultDirName={pf}\gregorio
 DefaultGroupName=gregorio
 SetupIconFile=gregorio.ico
@@ -53,9 +53,9 @@ Source: "../README.md"; DestDir: "{app}";
 Source: "../CONTRIBUTORS.md"; DestDir: "{app}";
 Source: "../UPGRADE.md"; DestDir: "{app}";
 ; PARSE_VERSION_FILE_NEXTLINE
-Source: "../doc/GregorioRef-4_0_0-rc2.pdf"; DestDir: "{app}";
+Source: "../doc/GregorioRef-4_0_0.pdf"; DestDir: "{app}";
 ; PARSE_VERSION_FILE_NEXTLINE
-Source: "../doc/GregorioNabcRef-4_0_0-rc2.pdf"; DestDir: "{app}";
+Source: "../doc/GregorioNabcRef-4_0_0.pdf"; DestDir: "{app}";
 Source: "../COPYING.md"; DestDir: "{app}";
 Source: "../contrib/900_gregorio.xml"; DestDir: "{app}\contrib";
 Source: "../contrib/system-setup.bat"; DestDir: "{app}";