Small fix from Don Blaheta.

[lilypond.git] / Documentation / user / introduction.itely

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index c226d05e636a27ea981bfebae6cb4911c7363f50..8f03e9461d0400ad275503c138bda663409f9053 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -1,4 +1,4 @@
-@c -*- coding: latin-1; mode: texinfo; -*-
+@c -*- coding: utf-8; mode: texinfo; -*-

 @c This file is part of lilypond.tely
 
 @node Introduction
 @c This file is part of lilypond.tely
 
 @node Introduction


@@ -58,23 +58,23 @@ computer edition.
 @item @tab
 @ifnotinfo
 @iftex
 @item @tab
 @ifnotinfo
 @iftex

-@image{henle-flat-bw,4cm}
+@image{henle-flat-gray,,8cm}

 @end iftex
 @ifnottex
 @end iftex
 @ifnottex

-@image{henle-flat-bw,,,png}
+@image{henle-flat-gray,,,png}

 @end ifnottex
 
 @tab
 @iftex
 @end ifnottex
 
 @tab
 @iftex

-@image{baer-flat-bw,4cm}
+@image{baer-flat-gray,,8.4cm}

 @end iftex
 @ifnottex
 @end iftex
 @ifnottex

-@image{baer-flat-bw,,,png}
+@image{baer-flat-gray,,,png}

 @end ifnottex
 
 @tab
 @iftex
 @end ifnottex
 
 @tab
 @iftex

-@image{lily-flat-bw,4cm}
+@image{lily-flat-bw,,8cm}

 @end iftex
 @ifnottex
 @image{lily-flat-bw,,,png}
 @end iftex
 @ifnottex
 @image{lily-flat-bw,,,png}


@@ -109,7 +109,60 @@ exact mathematical spacing, and once with corrections.  Can you
 spot which fragment is which?
 
 @cindex optical spacing
 spot which fragment is which?
 
 @cindex optical spacing

-@lilypondfile[quote,noindent]{spacing-optical.ly}
+@c file spacing-optical.
+@c need to include it here,  because we want two images.
+@lilypond
+\paper {
+  raggedright = ##t
+  indent = #0.0
+}
+
+music = {
+   c'4 e''4 e'4 b'4 |
+   \stemDown
+   b'8[ e'' a' e'']
+   \stemNeutral
+   e'8[ e'8 e'8 e'8]  
+}
+
+\score
+{
+  \music
+  \layout {
+    \context {
+      \Staff
+      \override NoteSpacing #'stem-spacing-correction = #0.6
+    }
+  }
+}
+@end lilypond
+
+@lilypond
+\paper {
+  raggedright = ##t
+  indent = #0.0
+}
+
+music = {
+   c'4 e''4 e'4 b'4 |
+   \stemDown
+   b'8[ e'' a' e'']
+   \stemNeutral
+   e'8[ e'8 e'8 e'8]  
+}
+\score
+{
+  \music
+  \layout {
+    \context {
+      \Staff
+      \override NoteSpacing #'stem-spacing-correction = #0.0
+      \override NoteSpacing #'same-direction-correction = #0.0
+      \override StaffSpacing #'stem-spacing-correction = #0.0
+    }
+  }
+}
+@end lilypond

 
 @cindex regular rhythms
 @cindex regular spacing
 
 @cindex regular rhythms
 @cindex regular spacing


@@ -259,9 +312,6 @@ appearance of objects.  In the following example, the rule which note
 head objects are used to produce their symbol is changed during the music
 fragment.
 
 head objects are used to produce their symbol is changed during the music
 fragment.
 

-@c FIXME: this example has errors:
-@c    programming error: Grob `NoteHead' has no interface for property `text'
-@c    Continuing; crossing fingers

 @lilypond[quote,raggedright]
 #(define (mc-squared grob orig current)
   (let ((interfaces (ly:grob-property grob 'interfaces))
 @lilypond[quote,raggedright]
 #(define (mc-squared grob orig current)
   (let ((interfaces (ly:grob-property grob 'interfaces))


@@ -269,7 +319,7 @@ fragment.
     (if (and (memq 'note-head-interface interfaces)
              (memq pos '(-2 -3 -5)))
         (begin
     (if (and (memq 'note-head-interface interfaces)
              (memq pos '(-2 -3 -5)))
         (begin

-          (ly:grob-set-property! grob 'print-function Text_interface::print)
+          (ly:grob-set-property! grob 'stencil Text_interface::print)

           (ly:grob-set-property! grob 'font-family 'roman)
           (ly:grob-set-property!
            grob 'text
           (ly:grob-set-property! grob 'font-family 'roman)
           (ly:grob-set-property!
            grob 'text


@@ -286,15 +336,15 @@ fragment.
    \set autoBeaming = ##f
    \time 2/4
    <d f g>4
    \set autoBeaming = ##f
    \time 2/4
    <d f g>4

-   \once \override NoteHead #'print-function = #Note_head::brew_ez_stencil
+   \once \override NoteHead #'stencil = #Note_head::brew_ez_stencil

    <d f g>
    \once \override NoteHead #'style = #'cross
    <d f g>
    <d f g>
    \once \override NoteHead #'style = #'cross
    <d f g>

-   \applyoutput #mc-squared
+   \applyOutput #mc-squared

    <d f g>
    <<
       { d8[ es-( fis^^ g] fis2-) }
    <d f g>
    <<
       { d8[ es-( fis^^ g] fis2-) }

-      \repeat unfold 5 { \applyoutput #mc-squared s8 }
+      \repeat unfold 5 { \applyOutput #mc-squared s8 }

    >>
 }
 @end lilypond
    >>
 }
 @end lilypond


@@ -672,14 +722,15 @@ instrument (or vocal) groups.
 discusses topics grouped by notation construct.  This section gives
 details about complicated or unusual notation.
 
 discusses topics grouped by notation construct.  This section gives
 details about complicated or unusual notation.
 

-@item
-@emph{@ref{Global issues}}
-discusses issues which affect the whole lilypond file.
-

 @item
 @emph{@ref{Changing defaults}}
 explains how to fine tune layout.
 
 @item
 @emph{@ref{Changing defaults}}
 explains how to fine tune layout.
 

+@item
+@emph{@ref{Output formats}}
+discusses issues which affect the global output, such as selecting
+paper size or which MIDI instruments to use.
+

 @item
 @emph{@ref{LilyPond-book}} explains the details behind creating
 documents with in-line music examples, like this manual.
 @item
 @emph{@ref{LilyPond-book}} explains the details behind creating
 documents with in-line music examples, like this manual.


@@ -708,7 +759,7 @@ available in
 a big HTML page,
 @end iftex
 @ifhtml
 a big HTML page,
 @end iftex
 @ifhtml

-@uref{source/Documentation/user/out-www/lilypond.html, one big page},
+@uref{source/Documentation/user/lilypond.html, one big page},

 @end ifhtml
 which can be searched easily using the search facility of a web
 browser.
 @end ifhtml
 which can be searched easily using the search facility of a web
 browser.


@@ -772,7 +823,7 @@ Various input examples.
 @ifhtml
 @c Works, but link name is not so nice; so write-out macro
 @c @inputfileref{input/test,Various input examples}.
 @ifhtml
 @c Works, but link name is not so nice; so write-out macro
 @c @inputfileref{input/test,Various input examples}.

-@uref{source/input/test/out-www/collated-files.html,Various input examples}.
+@uref{source/input/test/collated-files.html,Various input examples}.

 @end ifhtml
 
 This collection of files shows various tips and tricks, and is
 @end ifhtml
 
 This collection of files shows various tips and tricks, and is


@@ -786,7 +837,7 @@ The regression tests.
 @ifhtml
 @c Works, but link name is not so nice; so write-out macro
 @c @inputfileref{input/regression,The regression tests}.
 @ifhtml
 @c Works, but link name is not so nice; so write-out macro
 @c @inputfileref{input/regression,The regression tests}.

-@uref{source/input/regression/out-www/collated-files.html,The regression tests}.
+@uref{source/input/regression/collated-files.html,The regression tests}.

 @end ifhtml
 
 This collection of files tests each notation and engraving feature of
 @end ifhtml
 
 This collection of files tests each notation and engraving feature of