From e6040546d469d396873117069227c1976c060747 Mon Sep 17 00:00:00 2001
From: jan <jan>
Date: Sun, 16 Jun 2002 10:24:34 +0000
Subject: [PATCH] * tex/lilyponddefs.tex: Uncommented feta character support.

* Documentation/user/refman.itely (Pitches): Add espanol.ly
description.

* ly/catalan.ly: Add comment about (spanish) -s suffix.
---
 ChangeLog                       | 16 ++++++++++++++--
 Documentation/user/refman.itely |  2 ++
 ly/catalan.ly                   |  2 ++
 tex/lilyponddefs.tex            |  8 ++++----
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 67448968f0..d06bab427e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2002-06-16  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* tex/lilyponddefs.tex: Uncommented feta character support.
+
+	* Documentation/user/refman.itely (Pitches): Add espanol.ly
+	description.
+
+	* ly/catalan.ly: Add comment about (spanish) -s suffix.
+
+	* ly/espanol.ly: Spanish note names by Carlos Garc'ia Su'arez
+	<cgscqmp@terra.es>.
+
 2002-06-14  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* GNUmakefile.in (short-examples):
@@ -42,7 +54,7 @@
 2002-06-13  Han-Wen  <hanwen@cs.uu.nl>
 	
 	* Document/user/refman.itely: tablature doc and code updates by
-	Jean-Baptiste Lamy <jiba@@tuxfamily.org>
+	Jean-Baptiste Lamy <jiba@tuxfamily.org>
 	
 	* input/template/piano-dynamics.ly: bugfixes.
 
@@ -207,7 +219,7 @@
 	* ly/engraver-init.ly (TabStaffContext): 
 	enable TabStaff by default.
 
-	*  Tablature support by Jean-Baptiste Lamy <jiba@@tuxfamily.org>
+	*  Tablature support by Jean-Baptiste Lamy <jiba@tuxfamily.org>
 
 2002-05-28  Jan Nieuwenhuizen  <janneke@gnu.org>
 
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index b57758e5af..bb3f7e426b 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -157,6 +157,8 @@ norsk.ly       c   d   e   f   g   a   b   h   -iss/-is    -ess/-es
 svenska.ly     c   d   e   f   g   a   b   h   -iss        -ess
 italiano.ly    do  re  mi  fa  sol la  sib si  -d          -b
 catalan.ly     do  re  mi  fa  sol la  sib si  -d/-s       -b 
+espanol.ly     do  re  mi  fa  sol la  sib si  -s          -b 
+
 @end example 
 
 @cindex @code{'}
diff --git a/ly/catalan.ly b/ly/catalan.ly
index f9ebe1da2a..7673ea2c97 100644
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -53,6 +53,8 @@
 	(si . ,(make-pitch -1 6 0 ))
 	(sid . ,(make-pitch -1 6 1 ))
 	(sidd . ,(make-pitch -1 6 2 ))
+
+	;; Now that we have espanol.ly, should these be junked? --jcn
 	(dos . ,(make-pitch -1 0 1 ))
 	(doss . ,(make-pitch -1 0 2 ))
 	(res . ,(make-pitch -1 1 1 ))
diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 1b16819e35..36ad14fbe7 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -9,11 +9,11 @@
 \def\ifundefined#1{\expandafter\ifx\csname#1\endcsname\relax}
 
 % The feta characters
-%\input feta20.tex
+\input feta20.tex
 
-%\font\fetasixteen=feta16
-%\def\fetafont{\fetasixteen}
-%\def\fetachar#1{\hbox{\fetasixteen#1}}
+\font\fetasixteen=feta16
+\def\fetafont{\fetasixteen}
+\def\fetachar#1{\hbox{\fetasixteen#1}}
 
 % If we must make titles, do so, before we're Skipped.
 \ifx\mustmakelilypondtitle\undefined\else\makelilypondtitle\fi
-- 
2.39.5