* tex/lilyponddefs.tex (\lilypondstart): Define

\lilypondfontencoding for both texinfo and latex mode.

* scm/framework-tex.scm (font-load-command): Use
\lilypondfontencoding.

diff --git a/ChangeLog b/ChangeLog
index 11576fba4b91557fc7448bc602779e8675e5bc3e..9a0b800e497d7f7d344c24f1a6017cd53f1d07bd 100644 (file)
--- 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 a1358c9506a0f0992a82bcfa97499599599cacdf..c400bbc883f33dbbb14ac6960addf028c2e51991 100644 (file)
--- 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 b5ba687c0b21ae6fa1db88fd381dd841614fcaba..ece3f1247f5c883cfdb32d53cbd38e732fa12b24 100644 (file)
--- 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