From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sat, 6 Nov 2004 22:06:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.4.2~3^2~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d9fd01f2dc9ffb43038028859703f0788d1e384e;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 41394d7903..84be8c8dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,13 @@
 
 2004-11-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* elisp/lilypond-indent.el (LilyPond-indent-level): 2 is now standard.
+
+	* tex/lilyponddefs.tex: If inputencodingUse latin1 inputencoding if 
+
+	* scm/framework-tex.scm (font-load-command): Use T1 if no
+	font-encoding set.
+
 	* scm/lily.scm (postscript->pdf): Remove .pdf file if it
 	exists before converting.
 
diff --git a/elisp/lilypond-indent.el b/elisp/lilypond-indent.el
index 635aa62472..fd9ce60dab 100644
--- a/elisp/lilypond-indent.el
+++ b/elisp/lilypond-indent.el
@@ -14,7 +14,7 @@
 ;;;    * currently, in bracket matching one may need a non-bracket
 ;;;      chararacter between the bracket characters, like ( ( ) )
 
-(defcustom LilyPond-indent-level 4
+(defcustom LilyPond-indent-level 2
   "*Indentation of lilypond statements with respect to containing block."
   :group 'LilyPond
   :type 'integer)
diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index 0565ed5472..f0e3321a2c 100644
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -60,7 +60,8 @@
      "\n"
      "\\def\\" (tex-font-command font) "{%\n"
      ;; UGH.  Should be handled via alist.
-     (if (equal? "Extended-TeX-Font-Encoding---Latin" font-encoding)
+     (if (or (equal? "Extended-TeX-Font-Encoding---Latin" font-encoding)
+	     (not font-encoding))
 	 "  \\lilypondfontencoding{T1}"
 	 "  ")
      "\\lilypond" (tex-font-command font)
diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex
index 06d99b8200..72f0e00659 100644
--- a/tex/lilyponddefs.tex
+++ b/tex/lilyponddefs.tex
@@ -195,7 +195,12 @@
        %% As a safety guard, don't produce auxiliary files.
        \nofiles
 
-       \usepackage[\lilypondpaperinputencoding]{inputenc}
+       %% FIXME: workaround non-existant TeX.def.
+       \ifx\lilypondpaperinputencoding=TeX
+         \usepackage[\lilypondpaperinputencoding]{inputenc}
+       \else
+         \usepackage[latin1]{inputenc}
+       \fi
        \pagestyle{empty}
 
        \lilypondifundefined{lilypondclassic}