2004-10-24 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ * tex/GNUmakefile (TEX_FILES): add texinfo.cnf
+
+ * stepmake/stepmake/texinfo-vars.make (MAKEINFO): add
+ --enable-encoding
+
+ * Documentation/user/lilypond.tely: add -*- coding: latin-1 -*- everywhere.
+
+ * Documentation/user/changing-defaults.itely (Text encoding):
+ change to latin1.
+
+ * Documentation/user/lilypond.tely: add language and encoding.
+
+ * scm/define-grobs.scm (all-grob-descriptions): add
+ line-interface.
+
+ * configure.in (PKG_CONFIG_PATH): bump makeinfo version to 4.7
+
+ * input/test/ossia.ly: font sizes for ossia.
+
* scripts/convert-ly.py (conv): \context Foo = NOTENAME
-> \context Foo = "NOTENAME".
@unnumbered New features in 2.4 since 2.2
@itemize @bullet
-@item @code{\bookpaper} and @code{\paper} have been renamed to
-@code{\paper} and @code{\layout} respectively, to better match their
-function.
@item Parts that use @code{\quote} can now be transposed.
@}
@end example
-@item A new block, @code{\bookpaper} has been introduced to
-hold settings for paper size and output scaling. Further options
-include @code{raggedbottom} (if set, systems are not vertically filled
-to reach the bottom of the page), and @code{raggedlastbottom}.
-
+@item
+The @code{\paper} block has been renamed to @code{\layout}. A new
+@code{\paper} block has been introduced to hold settings for paper
+size and output scaling. Further options include @code{raggedbottom}
+(if set, systems are not vertically filled to reach the bottom of the
+page), and @code{raggedlastbottom}.
@item Support for fret diagrams has been contributed by Carl
@item A music list at toplevel is interpreted as implicit @code{\score}
a @code{\score} block at toplevel is interpreted as an implicit
-@code{\book} and @code{\notes} mode is the default lexer mode. The
+@code{\book} and @code{\notemode} mode is the default lexer mode. The
result is that
@example
\header @{ title = "The Title" @}
\book @{
\score @{
- \notes @{ a b c @}
+ \notemode @{ a b c @}
@}
@}
@end example
results can be obtained.
@item Mode changing commands,
-such as @code{\chords} and @code{\figures} must now be directly
+such as @code{\chordmode} and @code{\figuremode} must now be directly
followed by delimiters. The following example demonstrates the new
behavior,
@verbatim
- \figures \context Figures { .. } % wrong
- \context Figures \figures { .. } % right
+ \figuremode \context Figures { .. } % wrong
+ \context Figures \figuremode { .. } % right
@end verbatim
@item The starting pitch for @code{relative} music is optional for music lists.
The default value is middle C.
-@c update-me? formal definition of newaddlyrics, once it works
@item Combining lyrics with music can be done with @code{\addlyrics}
@example
\clef bass
d2 d c4 bes a2 \break
@}
- \newlyrics @{
+ \addlyrics @{
My first Li -- ly song,
@}
- \newlyrics @{
+ \addlyrics @{
Not much can go wrong!
@}
@end example
-Syntactically, @code{\addlyrics} acts like an infix operator.
+Syntactically, @code{\addlyrics} is an infix operator. It is a
+shortcut for a combination of @code{\new Lyrics}, @code{\lyricmode}
+and @code{\lyricsto}.
@item The parser is encapsulated in a Scheme function
@code{ly:parse-file}, so the following fragment processes two files
@item
Titling and page breaks are handled by LilyPond. Page breaks may be
inserted manually with
+
@example
\pageBreak
@end example
@item
-The @code{lilypond} program does not generate La@TeX{} titles or page
-layout. If you need La@TeX{} titles, you can use the
-@code{lilypond-book} program.
+Invoking @code{lilypond} runs the actual binary, which not use
+La@TeX{} for titling or page layout. If you need La@TeX{} code in
+titles, you can use the @code{lilypond-book} program. The former
+@code{lilypond} script has been retained as @code{lilypond-latex}.
@item There is now less of a noticeable ``hook'' at the end of a long slur.
@end itemize
+
+
+@c ****************************************************************
+
@unnumbered New features in 2.2 since 2.0
@itemize @bullet
-@c -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
@node Changing defaults
@chapter Changing defaults
@verbatim
\header {
title = "Grazing cow"
- instrument = "Baßtuba"
+ instrument = "Baßtuba"
}
@end verbatim
Rather, you should say
@verbatim
- instrument = \markup { Baßtuba }
+ instrument = \markup { Baßtuba }
@end verbatim
@noindent
-@c -*-texinfo-*-
-
+@c -*- coding: latin-1; mode: texinfo; -*-
@c TODO: add tablature.
-@c -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
@node Converting from other formats
@chapter Converting from other formats
-@c Note: -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
@node Example templates
@chapter Example templates
-@c -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
@c This file is part of lilypond.tely
@node Introduction
-@c -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
@node Running LilyPond
@chapter Running LilyPond
-@c -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
+
@ignore
-\input texinfo @c -*-texinfo-*-
+\input texinfo @c -*- coding: latin-1; mode: texinfo; -*-
@setfilename lilypond.info
@settitle GNU LilyPond
@iftex
@end ifhtml
+@documentlanguage en
+@documentencoding ISO-8859-1
+
@syncodeindex fn cp
@syncodeindex ky cp
@syncodeindex pg cp
-@c -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
@tex
\input feta20.tex
-\input texinfo @c -*-texinfo-*-
+\input texinfo @c -*- coding: latin-1; mode: texinfo; -*-
+
@settitle Music Glossary
@setfilename music-glosssary.info
-@c Note: -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
@c This file is part of lilypond.tely
@node Notation manual details
-@c Note: -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
@c This file is part of lilypond.tely
@c A menu is needed before every deeper *section nesting of @node's; run
-@comment @c -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
@node Preface
@unnumbered Preface
-@c -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
@node Interfaces for programmers
@chapter Interfaces for programmers
-@c -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
@node Sound
@chapter Sound
@cindex Sound
-@c -*-texinfo-*-
+@c -*- coding: latin-1; mode: texinfo; -*-
@c This file is part of lilypond.tely
@c TODO:
Heikki Junes
Hendrik Maryns
Kristof Bastiaensen
+Mats Bengtsson
Michael Welsh Duggan
Pedro Kroger
Peter Lutek
STEPMAKE_PROGS(MFTRACE, mftrace, OPTIONAL, 1.0.27)
# new makeinfo for multi-page website docs
-STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.6)
+STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.7)
AC_SUBST(MAKEINFO_VERSION)
\layout { raggedright = ##t }
\relative {
+ \override Score.Mark #'padding = #3
+
c4 \bar "|" \mark \markup { \simple #"|" }
c \bar "|:" \mark \markup { \simple #"|:" }
c \bar "||" \mark \markup { \simple #"||" }
\override Score.RehearsalMark #'print-function =
#(make-stencil-boxer 0.15 0.3 0.3 Text_interface::print)
- c8
+ b8
\revert Stem #'print-function
c4. c4 \mark "F" c1
{ c1 c1 }
\new Staff \with {
\remove "Time_signature_engraver"
+ fontSize = #-2
+ \override StaffSymbol #'staff-space = #(magstep -2)
} {
c,4^"ossia" es f fis g1
}
c1 \break c c }
%% solution 2
- \new Staff { R1*2 c,4^"ossia" es f fis g1 R1 * 3 }
+ \new Staff \with {
+ fontSize = #-2
+ \override StaffSymbol #'staff-space = #(magstep -2)
+
+ } { R1*2 c,4^"ossia" es f fis g1 R1 * 3 }
>>
(Y-extent-callback . #f)
(after-line-breaking-callback . ,Line_spanner::after_line_breaking)
(print-function . ,Line_spanner::print)
- (meta . ((interfaces . (line-spanner-interface spanner-interface))))
+ (meta . ((interfaces . (line-interface line-spanner-interface spanner-interface))))
))
(Hairpin
;; prepend GNU for dir, must be unique
"\n* GNU " name ": (" file-name "). " name "."
"\n@end direntry"
+ "@documentlanguage en\n"
+ "@documentencoding ISO-8859-1\n"
+
))
TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
-MAKEINFO = LANG= $(MAKEINFO_PROGRAM)
+MAKEINFO = LANG= $(MAKEINFO_PROGRAM) --enable-encoding
+
# info stuff
INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))
depth = ..
-TEX_FILES = $(wildcard *.tex)
-EXTRA_DIST_FILES = $(TEX_FILES)
+TEX_FILES = $(wildcard *.tex) texinfo.cnf
+EXTRA_DIST_FILES = $(TEX_FILES)
STEPMAKE_TEMPLATES=install
INSTALLATION_DIR=$(local_lilypond_datadir)/tex/
--- /dev/null
+@c We map some latin-1 characters to corresponding texinfo macros.
+
+@tex
+\global\catcode`^^a0\active % ` '
+\gdef^^a0{\tie}
+\global\catcode`^^a1\active % ¡
+\gdef^^a1{\exclamdown}
+%\global\catcode`^^a2\active % ¢
+%\gdef^^a2{}
+\global\catcode`^^a3\active % £
+\gdef^^a3{\pounds}
+%\global\catcode`^^a4\active % ¤
+%\gdef^^a4{}
+%\global\catcode`^^a5\active % ¥
+%\gdef^^a5{}
+%\global\catcode`^^a6\active % ¦
+%\gdef^^a6{}
+%\global\catcode`^^a7\active % §
+%\gdef^^a7{}
+\global\catcode`^^a8\active % ¨
+\gdef^^a8{\"{ }}
+\global\catcode`^^a9\active % ©
+\gdef^^a9{\copyright}
+\global\catcode`^^aa\active % ª
+\gdef^^aa{\ordf}
+%\global\catcode`^^ab\active % «
+%\gdef^^ab{}
+%\global\catcode`^^ac\active % ¬
+%\gdef^^ac{}
+%\global\catcode`^^ad\active %
+%\gdef^^ad{}
+\global\catcode`^^ae\active % ®
+\gdef^^ae{\registeredsymbol}
+\global\catcode`^^af\active % ¯
+\gdef^^af{\={ }}
+\global\catcode`^^b0\active % °
+\gdef^^b0{\ringaccent{ }}
+%\global\catcode`^^b1\active % ±
+%\gdef^^b1{}
+%\global\catcode`^^b2\active % ²
+%\gdef^^b2{}
+%\global\catcode`^^b3\active % ³
+%\gdef^^b3{}
+\global\catcode`^^b4\active % ´
+\gdef^^b4{\'{ }}
+%\global\catcode`^^b5\active % µ
+%\gdef^^b5{}
+%\global\catcode`^^b6\active % ¶
+%\gdef^^b6{}
+%\global\catcode`^^b7\active % ·
+%\gdef^^b7{}
+\global\catcode`^^b8\active % ¸
+\gdef^^b8{\,{ }}
+%\global\catcode`^^b9\active % ¹
+%\gdef^^b9{}
+\global\catcode`^^ba\active % º
+\gdef^^ba{\ordm}
+%\global\catcode`^^bb\active % »
+%\gdef^^bb{}
+%\global\catcode`^^bc\active % ¼
+%\gdef^^bc{}
+%\global\catcode`^^bd\active % ½
+%\gdef^^bd{}
+%\global\catcode`^^be\active % ¾
+%\gdef^^be{}
+\global\catcode`^^bf\active % ¿
+\gdef^^bf{\exclamdown}
+\global\catcode`^^c0\active % À
+\gdef^^c0{\`A}
+\global\catcode`^^c1\active % Á
+\gdef^^c1{\'A}
+\global\catcode`^^c2\active % Â
+\gdef^^c2{\^A}
+\global\catcode`^^c3\active % Ã
+\gdef^^c3{\~A}
+\global\catcode`^^c4\active % Ä
+\gdef^^c4{\"A}
+\global\catcode`^^c5\active % Å
+\gdef^^c5{\AA}
+\global\catcode`^^c6\active % Æ
+\gdef^^c6{\AE}
+\global\catcode`^^c7\active % Ç
+\gdef^^c7{\,{C}}
+\global\catcode`^^c8\active % È
+\gdef^^c8{\`E}
+\global\catcode`^^c9\active % É
+\gdef^^c9{\'E}
+\global\catcode`^^ca\active % Ê
+\gdef^^ca{\^E}
+\global\catcode`^^cb\active % Ë
+\gdef^^cb{\"E}
+\global\catcode`^^cc\active % Ì
+\gdef^^cc{\`I}
+\global\catcode`^^cd\active % Í
+\gdef^^cd{\'I}
+\global\catcode`^^ce\active % Î
+\gdef^^ce{\^I}
+\global\catcode`^^cf\active % Ï
+\gdef^^cf{\"I}
+%\global\catcode`^^d0\active % Ð
+%\gdef^^d0{}
+\global\catcode`^^d1\active % Ñ
+\gdef^^d1{\~N}
+\global\catcode`^^d2\active % Ò
+\gdef^^d2{\`O}
+\global\catcode`^^d3\active % Ó
+\gdef^^d3{\'O}
+\global\catcode`^^d4\active % Ô
+\gdef^^d4{\^O}
+\global\catcode`^^d5\active % Õ
+\gdef^^d5{\~O}
+\global\catcode`^^d6\active % Ö
+\gdef^^d6{\"O}
+%\global\catcode`^^d7\active % ×
+%\gdef^^d7{}
+\global\catcode`^^d8\active % Ø
+\gdef^^d8{\O}
+\global\catcode`^^d9\active % Ù
+\gdef^^d9{\`U}
+\global\catcode`^^da\active % Ú
+\gdef^^da{\'U}
+\global\catcode`^^db\active % Û
+\gdef^^db{\^U}
+\global\catcode`^^dc\active % Ü
+\gdef^^dc{\"U}
+\global\catcode`^^dd\active % Ý
+\gdef^^dd{\'Y}
+%\global\catcode`^^de\active % Þ
+%\gdef^^de{}
+\global\catcode`^^df\active % ß
+\gdef^^df{\ss}
+\global\catcode`^^e0\active % à
+\gdef^^e0{\`a}
+\global\catcode`^^e1\active % á
+\gdef^^e1{\'a}
+\global\catcode`^^e2\active % â
+\gdef^^e2{\^a}
+\global\catcode`^^e3\active % ã
+\gdef^^e3{\~a}
+\global\catcode`^^e4\active % ä
+\gdef^^e4{\"a}
+\global\catcode`^^e5\active % å
+\gdef^^e5{\aa}
+\global\catcode`^^e6\active % æ
+\gdef^^e6{\ae}
+\global\catcode`^^e7\active % ç
+\gdef^^e7{\,{c}}
+\global\catcode`^^e8\active % è
+\gdef^^e8{\`e}
+\global\catcode`^^e9\active % é
+\gdef^^e9{\'e}
+\global\catcode`^^ea\active % ê
+\gdef^^ea{\^e}
+\global\catcode`^^eb\active % ë
+\gdef^^eb{\"e}
+\global\catcode`^^ec\active % ì
+\gdef^^ec{\`{\dotless{i}}}
+\global\catcode`^^ed\active % í
+\gdef^^ed{\'{\dotless{i}}}
+\global\catcode`^^ee\active % î
+\gdef^^ee{\^{\dotless{i}}}
+\global\catcode`^^ef\active % ï
+\gdef^^ef{\"{\dotless{i}}}
+%\global\catcode`^^f0\active % ð
+%\gdef^^f0{}
+\global\catcode`^^f1\active % ñ
+\gdef^^f1{\~n}
+\global\catcode`^^f2\active % ò
+\gdef^^f2{\`o}
+\global\catcode`^^f3\active % ó
+\gdef^^f3{\'o}
+\global\catcode`^^f4\active % ô
+\gdef^^f4{\^o}
+\global\catcode`^^f5\active % õ
+\gdef^^f5{\~o}
+\global\catcode`^^f6\active % ö
+\gdef^^f6{\"o}
+%\global\catcode`^^f7\active % ÷
+%\gdef^^f7{}
+\global\catcode`^^f8\active % ø
+\gdef^^f8{\o}
+\global\catcode`^^f9\active % ù
+\gdef^^f9{\`u}
+\global\catcode`^^fa\active % ú
+\gdef^^fa{\'u}
+\global\catcode`^^fb\active % û
+\gdef^^fb{\^u}
+\global\catcode`^^fc\active % ü
+\gdef^^fc{\"u}
+\global\catcode`^^fd\active % ý
+\gdef^^fd{\'y}
+%\global\catcode`^^fe\active % þ
+%\gdef^^fe{}
+\global\catcode`^^ff\active % ÿ
+\gdef^^ff{\"y}
+@end tex