From b95221c3147d1e9c965bf5f840fccf2febaa85df Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Mon, 5 Jul 2004 22:19:51 +0000
Subject: [PATCH] * ly/book-paper-defaults.ly: set default encoding to ec.

* buildscripts/guile-gnome.sh (OPT): only compile pango if not
installed.

* tex/latin1.enc: new file, from a2ps.
---
 ChangeLog                              |  9 +++++++
 buildscripts/guile-gnome.sh            | 28 ++++++++++++----------
 input/mutopia/F.Schubert/morgenlied.ly |  2 +-
 ly/book-paper-defaults.ly              |  2 +-
 scm/encoding.scm                       |  3 ++-
 scm/font.scm                           |  2 +-
 tex/GNUmakefile                        |  8 +++++--
 tex/latin1.enc                         | 43 ++++++++++++++++++++++++++++++++++
 8 files changed, 78 insertions(+), 19 deletions(-)
 create mode 100644 tex/latin1.enc

diff --git a/ChangeLog b/ChangeLog
index 4fe6ce7241..38853c0d88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-07-06  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* ly/book-paper-defaults.ly: set default encoding to ec.
+
+	* buildscripts/guile-gnome.sh (OPT): only compile pango if not
+	installed.
+
+	* tex/latin1.enc: new file, from a2ps. 
+
 2004-07-06  Heikki Junes  <hjunes@cc.hut.fi>
 
         * stepmake/bin/add-html-footer.py: use <div> instead of <table>,
diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index b3d06eb33b..67b436e803 100644
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -42,19 +42,21 @@ cd test
 
 ## 2.  get pango CVS
 
-
-mkdir -p gnome/CVS
-cd gnome
-echo ":pserver:anonymous@anoncvs.gnome.org:/cvs/gnome" > CVS/Root
-echo "." > CVS/Repository
-cvs -z3 checkout -P pango
-cd pango
-rm -rf $OPT/pango
-./autogen.sh --help
-./configure --prefix=$OPT/pango --enable-maintainer-mode --enable-gtk-doc
-make XFT_LIBS="-L/usr/lib -lXft -L/usr/X11R6/lib -lfreetype -lz -lXrender -lX11 -lfontconfig" install
-
-cd ../..
+if [ ! -d $HOME/usr/pkg/pango ] ; then
+
+	mkdir -p gnome/CVS
+	cd gnome
+	echo ":pserver:anonymous@anoncvs.gnome.org:/cvs/gnome" > CVS/Root
+	echo "." > CVS/Repository
+	cvs -z3 checkout -P pango
+	cd pango
+	rm -rf $OPT/pango
+	./autogen.sh --help
+	./configure --prefix=$OPT/pango --enable-maintainer-mode --enable-gtk-doc
+	make XFT_LIBS="-L/usr/lib -lXft -L/usr/X11R6/lib -lfreetype -lz -lXrender -lX11 -lfontconfig" install
+
+	cd ../..
+fi 
 
 export PKG_CONFIG_PATH=$OPT/pango/lib/pkgconfig:$PKG_CONFIG_PATH
 
diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 098897324f..14df140911 100644
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -92,7 +92,7 @@ firstVerse = \lyrics {
     sie -- gend durch __ die Nacht. Schö -- ner Tag, du __ bist er -- wacht. __ Mit ge -- |
     \manuscriptBreak
     heim -- nis -- vol -- len Wor -- ten, in me -- lo -- di -- schen Ak -- kor -- den, grüß __ ich __ \manuscriptBreak |
-    dei -- ne Ro -- sen -- pracht, grüß ich __ dei -- ne Ro -- sen -- pracht. 
+    dei -- ne Ro -- sen -- pracht, grüßxx ich __ dei -- ne Ro -- sen -- pracht. 
     }
 
 secondVerse = \lyrics {
diff --git a/ly/book-paper-defaults.ly b/ly/book-paper-defaults.ly
index 381d665530..7e44505f50 100644
--- a/ly/book-paper-defaults.ly
+++ b/ly/book-paper-defaults.ly
@@ -32,7 +32,7 @@
       '((font-encoding . fetaMusic)))
 
     #(define text-font-defaults
-      '((font-encoding . latin1)
+      '((font-encoding . ec)
 	(baseline-skip . 2)
 	(word-space . 0.6)))
 
diff --git a/scm/encoding.scm b/scm/encoding.scm
index 45f10bccb5..ec0736f236 100644
--- a/scm/encoding.scm
+++ b/scm/encoding.scm
@@ -88,7 +88,8 @@ vector of symbols."
 	 ;; aliases
 	 ("T1" . "tex256.enc")
 	 ("adobe" . "8a.enc")
-	 ("latin1" . "cork.enc")
+	 ("latin1" . "latin1.enc")
+	 ("ec" . "EC.enc")
 	 
 	 ;; LilyPond.
 	 ("fetaBraces" . "feta-braces-a.enc")
diff --git a/scm/font.scm b/scm/font.scm
index 563d4f6873..6af657f205 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -267,7 +267,7 @@
    (lambda (x)
      (add-font
       node
-      `((font-encoding . latin1)
+      `((font-encoding . ec)
 	(font-series . ,(vector-ref (car x) 2))
 	(font-shape . ,(vector-ref (car x) 1))
 	(font-family . ,(vector-ref (car x) 0)))
diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 8d3554e52c..11d460595f 100644
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -1,8 +1,8 @@
 depth = ..
 
-TEX_FILES = $(wildcard *.tex) $(outdir)/music-drawing-routines.ps
+TEX_FILES = $(wildcard *.tex)  $(outdir)/latin1.enc  $(outdir)/music-drawing-routines.ps
 
-EXTRA_DIST_FILES = $(TEX_FILES)
+EXTRA_DIST_FILES = $(TEX_FILES) latin1.enc
 STEPMAKE_TEMPLATES=install
 
 INSTALLATION_DIR=$(local_lilypond_datadir)/tex/
@@ -14,4 +14,8 @@ $(outdir)/music-drawing-routines.ps: $(depth)/ps/music-drawing-routines.ps
 	rm -f $@
 	-ln $< $@
 
+$(outdir)/latin1.enc: latin1.enc
+	rm -f $@
+	-ln $< $@
+
 all: $(INSTALLATION_FILES)
diff --git a/tex/latin1.enc b/tex/latin1.enc
new file mode 100644
index 0000000000..5776d009cc
--- /dev/null
+++ b/tex/latin1.enc
@@ -0,0 +1,43 @@
+%!
+% Automatically generated by the Ogonkify package
+% Do not modify
+% -- code follows this line --
+%%BeginResource: encoding ISOLatin1Encoding
+/ISOLatin1Encoding [
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /minus /period /slash
+/zero /one /two /three /four /five /six /seven
+/eight /nine /colon /semicolon /less /equal /greater /question
+% 100
+/at /A /B /C /D /E /F /G
+/H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W
+/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
+/quoteleft /a /b /c /d /e /f /g
+/h /i /j /k /l /m /n /o
+/p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef
+% 200
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
+/space /exclamdown /cent /sterling /currency /yen /brokenbar /section
+/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron
+/degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /bullet
+/cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+% 300
+/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+/Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+/Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+/agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+/egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+/eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
+] def
+%%EndResource
-- 
2.11.4.GIT