(text): dump \inputencoding{} for text.

diff --git a/ChangeLog b/ChangeLog
index 7619a19332c936933268823ee25d45a733ca3f1e..40b9e3b3171ace319a1eff6292bde25b395596dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
+2004-04-12  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * scm/output-tex.scm (text): dump \inputencoding{} for text.
+
 2004-04-11  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scripts/lilypond.py (global_latex_preamble): remove latin1 from
+       \usepackage{inputenc}
+
        * lily/paper-book.cc (classic_output): don't advance Offset for
        TeX output.
 

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index a5f6142583eecc68830abbabcf73626eb56e2b6a..740d21aa7f0e2350a7e4516bb3048242651f6acc 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,6 +1,6 @@
 #(ly:set-option 'old-relative)
 \version "2.2.0"
-
+\encoding "latin1"
 \header {
     composer = "ARTHUR GRAY"
     title = "LES NÉRÉIDES"

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 0bfed3774550fc0a9597204ebb65b0a1fb0835f9..6c080460d5f71bae4c2c9dd5b4575db745335320 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -315,7 +315,9 @@
 
 (define (text font s)
   (let*
-      ((mapping #f))
+      ((mapping #f)
+       (input-enc-name (assoc-get 'input-name (ly:font-encoding-alist font) ))
+       )
 
     ;; TODO: we'd better do this for PS only
     ;; LaTeX gets in the way, and we need to remap
@@ -323,7 +325,10 @@
     
     ;; (assoc-get  'char-mapping (ly:font-encoding-alist font))))
 
-    (string-append "\\hbox{\\" (font-command font) "{}"
+    (string-append "\\hbox{\\" (font-command font)
+                  (if (string? input-enc-name)
+                      (string-append "\\inputencoding{" input-enc-name "}")
+                      "{}")
                   (output-tex-string
                    (if (vector? mapping)
                        (reencode-string mapping s)

diff --git a/scripts/lilypond.py b/scripts/lilypond.py
index fc9566ed4aa1b42db33e9d2e02f0ee009c3a6c5a..b8ebb636ccf60d7b4669c2bb5c1c01edfaa8007d 100644 (file)
--- a/scripts/lilypond.py
+++ b/scripts/lilypond.py
@@ -401,7 +401,7 @@ def global_latex_preamble (extra):
 
        # FIXME, must (only) from lilypond-bin
        s += r'''
-\usepackage[latin1]{inputenc}
+\usepackage{inputenc}
 \pagestyle{empty}
 %%PREVIEW%%'''
        

diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 5869d13626ca171f4d92ce0ab9877315de31ab6a..a64e8e01efb210a42106a4d9dcc8704fdaec04b8 100644 (file)
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -56,6 +56,7 @@
         \documentclass[a4paper]{article}
         %% safe-mode
         \nofiles
+        \usepackage{inputenc}
         \pagestyle{empty}
         \lilypondifundefined{lilypondclassic}
         {