From 2492bb9a9c41c8855973a555bfd8a4c42fcf0425 Mon Sep 17 00:00:00 2001
From: "Br. Samuel Springuel" <rpspringuel@gmail.com>
Date: Thu, 23 May 2019 16:26:03 -0400
Subject: [PATCH] Correct ligature issues when styling is applied to syllable

Corrected interaction issues between text styles and ligatures.  The LaTeX commands like `\textit` insert italics correction, preventing ligatures being formed between their arguments if two occur sequentially.  On the other hand the switches like `\itshape` do not.  Since gregorio breaks up syllables around the vowel and then applies the formating commands to each part, this behavior showed up.  We switch to using the switches to avoid this (except for underlining, for which a switch does not exist).  See [#1444](https://github.com/gregorio-project/gregorio/issues/1444).
A fix for color is still in the works.
---
 CHANGELOG.md        | 2 ++
 tex/gregoriotex.sty | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5fabb98d9..dd0943cd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file.
 As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). It follows [some conventions](http://keepachangelog.com/).
 
 ## [Unreleased][CTAN]
+### Fixed
+- Corrected interaction issues between text styles and ligatures.  The LaTeX commands like `\textit` insert italics correction, preventing ligatures being formed between their arguments if two occur sequentially.  On the other hand the switches like `\itshape` do not.  Since gregorio breaks up syllables around the vowel and then applies the formating commands to each part, this behavior showed up.  We switch to using the switches to avoid this (except for underlining, for which a switch does not exist).  We also fix this for color tags by loading `luacolor` which changes how the `\color` tag is implemented to allow ligatures to span groups.  See [#1444](https://github.com/gregorio-project/gregorio/issues/1444).
 
 
 ## [5.2.1] - 2019-04-06
diff --git a/tex/gregoriotex.sty b/tex/gregoriotex.sty
index 6bdd7c98f..815a4e8b3 100644
--- a/tex/gregoriotex.sty
+++ b/tex/gregoriotex.sty
@@ -102,22 +102,22 @@
 %%%%%%%%%
 
 \def\GreItalic#1{%
-  \textit{#1}%
+  {\itshape #1}%
   \relax %
 }
 
 \def\GreSmallCaps#1{%
-  \textsc{#1}%
+  {\scshape #1}%
   \relax %
 }
 
 \def\GreBold#1{%
-  \textbf{#1}%
+  {\bfseries #1}%
   \relax %
 }
 
 \def\GreTypewriter#1{%
-  \texttt{#1}%
+  {\ttfamily #1}%
   \relax %
 }