(edit): -e option: inline editing.

diff --git a/ChangeLog b/ChangeLog
index c0339516c6caa1a56d2a40642db4224de5853e96..8aa4b64b3edd0c1209456d8f888b75abcd8d11b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-11-13  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * buildscripts/new-chords.py (edit): -e option: inline editing.
+
+       * input/regression/a*.ly (texidoc): syntax updates.
+
+       * Documentation/user/lilypond-book.itely (Integrating La@TeX{} and
+       music): elucidations. 
+
 2002-11-11 Juergen Reuter  <reuter@ipd.uka.de>
 
        * lily/include/lily-proto.hh, ly/engraver-init.ly,

diff --git a/buildscripts/new-chords.py b/buildscripts/new-chords.py
index a2aa3c076852194d3b557dea373ad0d3c8d85a65..eb9656a8d1dc129066ab426cdca6c9ecee486794 100644 (file)
--- a/buildscripts/new-chords.py
+++ b/buildscripts/new-chords.py
@@ -3,6 +3,9 @@
 import re
 import string
 import sys
+import getopt
+import os
+
 
 def sub_chord (m):
        str = m.group(1)
@@ -129,5 +132,22 @@ def sub_chords (str):
        str= re.sub (r'@ACCENT@', '>', str)
        return str
 
+(opts, files)= getopt.getopt( sys.argv[1:], 'e',['edit'])
+edit = 0
+for (o,a) in opts:
+       if o == '-e' or o == '--edit':
+               edit = 1
 
-print sub_chords (open (sys.argv[1]).read())  + marker_str 
+for a in files:
+       str = open (a).read()
+       if re.search (str, marker_str):
+               continue
+       
+       str = sub_chords (str)  + marker_str
+
+       if edit:
+               open (a + '.NEW', 'w').write (str)
+               os.rename (a, a + '~')
+               os.rename (a + '.NEW', a)
+       else:
+               print str

diff --git a/input/regression/abe.ly b/input/regression/abe.ly
index 30bb881b98dc8ac28ae2f0d3e23b77a017041edf..dbd888c1e4ebf43fb3abbe797f85390f5fa07f48 100644 (file)
--- a/input/regression/abe.ly
+++ b/input/regression/abe.ly
@@ -19,3 +19,4 @@ texidoc="Automatic beamer behaves nicely."
     }
   }
 }
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly
index 55896b3cff80a8686b4c91183de407b04cf79b7e..23b3687d8bba94b6e133a1d17c6cfdc77e3b2703 100644 (file)
--- a/input/regression/accidental-cautionary.ly
+++ b/input/regression/accidental-cautionary.ly
@@ -15,3 +15,4 @@ smaller accidentals (default) or parentheses.
     \property Staff.Accidental \override #'style = #'parentheses
     cis''?4
     }}
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly
index 4451276f9136280008b1ff7fd2c4a397f35aaf92..e096c1e56d7ad78e459ffc014045faf42a0824cf 100644 (file)
--- a/input/regression/accidental-double.ly
+++ b/input/regression/accidental-double.ly
@@ -14,3 +14,4 @@
 }
 
 
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly
index d55a9ca93bba3fe9f82cf52b9369b31bb69c2d12..9c7dc6faf9c36d8b61b0c4880460611d47c31313 100644 (file)
--- a/input/regression/accidental-ledger.ly
+++ b/input/regression/accidental-ledger.ly
@@ -10,3 +10,4 @@
 }
         \paper { linewidth = -1. }
 }
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly
index 3ed18f9309b97b066c7729234875d84a43b28b7a..041442e2b76e8f5f39c55334a025b62eb2b67a50 100644 (file)
--- a/input/regression/accidental-octave.ly
+++ b/input/regression/accidental-octave.ly
@@ -81,3 +81,4 @@ mus = \notes {
     indent=0.0
   }
 }
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly
index 80f8b6e003e5c164d2bc669c9332ad3507dbd3dc..19919746b949db97eede23ca7e6c9479e5057570 100644 (file)
--- a/input/regression/accidental-placement.ly
+++ b/input/regression/accidental-placement.ly
@@ -11,18 +11,19 @@ flats in a sixth shoudl be staggered.  "
     cis4
     c4
  \transpose c c' {    
-  <bis4 es gis>
-  <es! as!>
-  <gis! cis!>
-  <g! des'>
-  <ges! es'!>
+  <<bis es gis>>4
+  <<es! as!>>
+  <<gis! cis!>>
+  <<g! des'>>
+  <<ges! es'!>>
 }    
-    <cis4 d es fis gis ases bes ces d dis >
-    <bes'! fis!>     
-    <bes! cis!>
-    <c! es ges beses>
-    <bes! c d f >    
-    <bes,! c d f >
+    <<cis d es fis gis ases bes ces d dis >>4
+    <<bes'! fis!>>     
+    <<bes! cis!>>
+    <<c! es ges beses>>
+    <<bes! c d f >>    
+    <<bes,! c d f >>
 }
 \paper { linewidth = -1. }
      }
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly
index 4ce483a997acb85d877d5017fed068779cd952dd..afb8da3b89d87412ebc4a51c7189649bfe61d93d 100644 (file)
--- a/input/regression/accidental-single-double.ly
+++ b/input/regression/accidental-single-double.ly
@@ -28,3 +28,4 @@ gis ges gis g |
        }
        >
 }
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly
index e4361d1f1e3ad4d2404955577b64bcd39f1b94c8..609582595a95e9dce26a8297c554dc2d4cac11d4 100644 (file)
--- a/input/regression/accidental-unbroken-tie-spacing.ly
+++ b/input/regression/accidental-unbroken-tie-spacing.ly
@@ -10,8 +10,8 @@ rechts = \notes \relative c' {
   \clef treble
   \time 3/4
   \context Voice {
-    c8 h2  <g8 h des f> ~ |
-    <g8 h des f>
+    c8 h2  <<g h des f>>8 ~ |
+    <<g h des f>>8
   }
 }
 
@@ -26,3 +26,4 @@ Rechts = \context Staff \notes {
     linewidth = -3.3 \cm
   }
 }
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly
index 521fc435585babe4a868f6094b7ea22697ed8dd4..315207e9981e1409bace4051fc4aec9c731c94bb 100644 (file)
--- a/input/regression/accidental-voice.ly
+++ b/input/regression/accidental-voice.ly
@@ -58,3 +58,4 @@ voiceb = \notes \transpose c c' {
        \context NoteNames=namesb \apply #no-octaves \voiceb
     >
 }
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly
index 4d48f7b307022e6e6b157d7f2827024e09c4a110..94d9f3784e7e9fd980a46838108ef0fee08e3521 100644 (file)
--- a/input/regression/accidental.ly
+++ b/input/regression/accidental.ly
@@ -14,3 +14,4 @@ foo = \notes\relative c''   {   \key as \major dis4 dis dis!^"force" dis? }
    \context NoteNames \foo
   >
 }
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly
index 6369ad13b0823ccce690754c544797c0bd475377..0920b82908109b0c7352204947f2888a68714e81 100644 (file)
--- a/input/regression/accidentals.ly
+++ b/input/regression/accidentals.ly
@@ -69,3 +69,4 @@ mel = \notes { \key d \major \time 4/4
  }
 }
 
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly
index ecf776a67ec9209812435f0eeb763d62b8eea6ea..851621aa0e81b21fae2ef765d4de2e9b2166b06d 100644 (file)
--- a/input/regression/arpeggio-collision.ly
+++ b/input/regression/arpeggio-collision.ly
@@ -34,9 +34,9 @@ hairyChord = \context Staff \notes\relative c' <
 
 \score{
     \notes \transpose c c' {
-        \context Voice < fis''-\arpeggio g  d a >
-        \context Voice < fis,-\arpeggio g  d a >
-        \context Voice < fis''-\arpeggio g  d a >
+       << fis'' g  d a >>-\arpeggio
+       << fis, g  d a >>-\arpeggio
+       << fis'' g  d a >>-\arpeggio
         \hairyChord
        }
     \paper {
@@ -47,3 +47,5 @@ hairyChord = \context Staff \notes\relative c' <
        }
        }
 }
+
+%% new-chords-done %%

diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly
index 507e23c2e65df0e1d9497898988041c9f2efaab0..5be9da372c436f572ed4305f23dc578eefaac4c4 100644 (file)
--- a/input/regression/arpeggio.ly
+++ b/input/regression/arpeggio.ly
@@ -10,19 +10,19 @@ Arpeggios are supported, both cross-staff and broken single staff.
 \score{
     \context PianoStaff < 
         \context Staff=one \notes\relative c''{
-           \context Voice < fis,-\arpeggio  d a >
+           \context Voice << fis,  d a >>-\arpeggio
            \property Staff.Arpeggio \override #'arpeggio-direction = #1 
-           \context Voice < fis,-\arpeggio  d a >          
+           \context Voice << fis,  d a >>-\arpeggio        
             %%\property PianoStaff.SpanArpeggio \override #'connect = ##t
             \property PianoStaff.connectArpeggios = ##t
-            <fis,-\arpeggio a c>
+            <<fis, a c>>-\arpeggio
          }
         \context Staff=two \notes\relative c{
             \clef bass
-           \context Voice < g b d-\arpeggio   >
+           \context Voice << g b d   >>-\arpeggio
            \property Staff.Arpeggio \override #'arpeggio-direction = #-1           
-           \context Voice < g b d-\arpeggio   >            
-            <g-\arpeggio b d>
+           \context Voice << g b d   >>-\arpeggio          
+            <<g b d>>-\arpeggio
         }
     >
 }

diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly
index 57b932873c8c9f2e4218df2dbb51ddf3ece7c1e8..9f51a0299afd901364e1bafd9190cf0dda1d0ede 100644 (file)
--- a/input/regression/auto-beam-bar.ly
+++ b/input/regression/auto-beam-bar.ly
@@ -20,3 +20,4 @@ a16 g a bes c d % ees8 d c
    linewidth=-1.
 }
 }
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly
index cdc88b933549cb139e3db966ebbc6f760986b275..6e500421a3f5780f53ae939e0c5d50c31d50be75 100644 (file)
--- a/input/regression/auto-beam-triplet.ly
+++ b/input/regression/auto-beam-triplet.ly
@@ -12,3 +12,4 @@ texidoc = "Automatic beaming is also done on tuplets."
        }
        \paper{ }
 }
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly
index ffc037e1e3c5d9caf42bda31c646df9075256afd..c42ae1ad04a98b48cfab653feea08d76af71cd86 100644 (file)
--- a/input/regression/auto-beam-tuplets.ly
+++ b/input/regression/auto-beam-tuplets.ly
@@ -12,3 +12,4 @@ beams even if they're auto generated."
        [f8 f f ][f8 f f ] f f f f f f 
  }
 }}
+%% new-chords-done %%
\ No newline at end of file

diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly
index 98ee678409eda318321f840d26195355936e2bf2..dc1346bc31d770900e7686c414e8408decfae12a 100644 (file)
--- a/input/regression/auto-change.ly
+++ b/input/regression/auto-change.ly
@@ -22,3 +22,4 @@ note. When central C is reached, we don't switch (by default).
        >
        
 }
+%% new-chords-done %%
\ No newline at end of file