From c685c2a0ce47a9795573d8727b95e10ba8122f62 Mon Sep 17 00:00:00 2001
From: wl <wl>
Date: Thu, 30 Sep 2004 16:15:14 +0000
Subject: [PATCH] * tex/lilyponddefs.tex (\lilypondstart): Define
 \lilypondfontencoding for both texinfo and latex mode.

* scm/framework-tex.scm (font-load-command): Use
\lilypondfontencoding.
---
 ChangeLog             | 8 ++++++++
 scm/framework-tex.scm | 2 +-
 tex/lilyponddefs.tex  | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 11576fba4b..9a0b800e49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-30  Werner Lemberg  <wl@gnu.org>
+
+	* tex/lilyponddefs.tex (\lilypondstart): Define
+	\lilypondfontencoding for both texinfo and latex mode.
+
+	* scm/framework-tex.scm (font-load-command): Use
+	\lilypondfontencoding.
+
 2004-09-30  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* scm/framework-tex.scm (dump-page): take with-extents?
diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index a1358c9506..c400bbc883 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -63,7 +63,7 @@
      "\\def\\" (tex-font-command font) "{%\n"
      ;; UGH.  Should be handled via alist.
      (if (equal? "Extended-TeX-Font-Encoding---Latin" font-encoding)
-	 "  \\fontencoding{T1}\\selectfont"
+	 "  \\lilypondfontencoding{T1}"
 	 "  ")
      "\\lilypond" (tex-font-command font)
      "}\n"
diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index b5ba687c0b..ece3f1247f 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -47,12 +47,16 @@
   %% \@nodocument is defined as \relax after `\begin{document}'
   \lilypondifundefined{@nodocument}
     {%% either plain TeX or texinfo or not at the beginning of LaTeX input
-     \def\x{\endgroup}}
+     \def\x{
+       \endgroup
+       \def\lilypondfontencoding##1{}}}
     {%% FIXME: a4
      %% provide a proper LaTeX preamble (for A4 paper format)
      \def\x{
        \endgroup
        \def\lilyponddocument{}
+       \def\lilypondfontencoding##1{
+         \fontencoding{##1}\selectfont}
        \documentclass[a4paper]{article}
        %% safe-mode
        \nofiles
-- 
2.39.5