Skip to content

Commit

Permalink
Added basic-mode functionality and made default
Browse files Browse the repository at this point in the history
Added examples of pdf export using eps and html export using png
Refactored directory structure
  • Loading branch information
mjago committed Jul 6, 2011
1 parent e670587 commit c1f9627
Show file tree
Hide file tree
Showing 117 changed files with 2,604 additions and 72 deletions.
12 changes: 8 additions & 4 deletions dev/ob-lilypond.org
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,14 @@ file to org-babel-tangle
**** DONE Reduced scope of (save-excursion) to avoid this - doesn't help
**** DONE Perhaps need unwind-protection - causes issues
**** TODO Modify error marking to use absolute block size counting for location
**** TODO Research when an extra option was added to THE FRONT of org-babel-tangle option list
May need a note in docs or a test of version.
*** DONE Research when an extra option was added to THE FRONT of org-babel-tangle option list
May need a note in docs or a test of version?
Put note in README

*** DONE Add examples using org-babel for programmatic note generation
*** WAITING Get feedback from Shelagh regarding direction and current
*** DONE Add :noweb "yes" and :comments "yes" as lilypond defaults
*** TODO Modify Readme to include paths to examples
*** DONE Modify Readme to include paths to examples
*** TODO Add usage information [1/3]
- [ ] Font-lock fontify in blocks by default
- [ ] Practical effects of default ob-lilypond header parameters
Expand All @@ -255,12 +256,15 @@ generated header.
- [ ] Check Misty - Errol Garner is out of copywright, if not swap with
"Empathy"

*** TODO Devise a "mode" for generating liypond partials as embedded png images
*** DONE Devise a "mode" for generating liypond partials as embedded png images
This is now the default mode
*** TODO Check out lyqi-mode
*** TODO Arrangement mode [3/4]
- [X] add var
- [X] add toggle
- [ ] add instruction
- [X] modify header assignment
- [ ] modify execute command
*** TODO Update readme and readme links to suit new mode
*** TODO ly-versions or ly-settings?

1,857 changes: 1,857 additions & 0 deletions examples/arrange-mode/Modal-Cycle-2/modal-cycle-2.html

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modal-Cycle-2/modal-cycle-2.org::*Version][Version:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modal-Cycle-2/modal-cycle-2.org::*Version][Version:1]]

\version "2.12.3"

% Version:1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modal-Cycle-2/modal-cycle-2.org::*Arpeggios][Arpeggios:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modal-Cycle-2/modal-cycle-2.org::*Arpeggios][Arpeggios:1]]

Arps = {
\relative g { c16 d16 e16 f16 g16 a16 b16 c16 r2 } | r1 |
Expand Down Expand Up @@ -281,7 +281,7 @@ Arps = {

% Arpeggios:1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modal-Cycle-2/modal-cycle-2.org::*Triads][Triads:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modal-Cycle-2/modal-cycle-2.org::*Triads][Triads:1]]

Triads = {
\relative g {
Expand Down Expand Up @@ -811,7 +811,7 @@ Triads = {

% Triads:1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modal-Cycle-2/modal-cycle-2.org::*Drums%2520(four%2520bars)][Drums-\(four-bars\):1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modal-Cycle-2/modal-cycle-2.org::*Drums%2520(four%2520bars)][Drums-\(four-bars\):1]]

DrumsFourBars = {
\drummode {
Expand All @@ -833,7 +833,7 @@ DrumsFourBars = {

% Drums-\(four-bars\):1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modal-Cycle-2/modal-cycle-2.org::*Drums%2520(four%2520bars)][Drums-\(four-bars\):2]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modal-Cycle-2/modal-cycle-2.org::*Drums%2520(four%2520bars)][Drums-\(four-bars\):2]]

Drums = {
\DrumsSixteenBars \DrumsSixteenBars \DrumsSixteenBars
Expand All @@ -848,7 +848,7 @@ Drums = {

% Drums-\(four-bars\):2 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modal-Cycle-2/modal-cycle-2.org::*Bass][Bass:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modal-Cycle-2/modal-cycle-2.org::*Bass][Bass:1]]

Bass = {
\relative g, {
Expand Down Expand Up @@ -1377,13 +1377,13 @@ Bass = {

% Bass:1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modal-Cycle-2/modal-cycle-2.org::*Number%2520of%2520bars%2520to%2520compile%2520(showLastLength)][Number-of-bars-to-compile-\(showLastLength\):1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modal-Cycle-2/modal-cycle-2.org::*Number%2520of%2520bars%2520to%2520compile%2520(showLastLength)][Number-of-bars-to-compile-\(showLastLength\):1]]

% showLastLength = R1*9

% Number-of-bars-to-compile-\(showLastLength\):1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modal-Cycle-2/modal-cycle-2.org::*Score][Score:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modal-Cycle-2/modal-cycle-2.org::*Score][Score:1]]

\score {

Expand Down Expand Up @@ -1426,7 +1426,7 @@ Bass = {

% Score:1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modal-Cycle-2/modal-cycle-2.org::*Paper][Paper:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modal-Cycle-2/modal-cycle-2.org::*Paper][Paper:1]]

\paper {
#(define dump-extents #t)
Expand All @@ -1440,7 +1440,7 @@ Bass = {

% Paper:1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modal-Cycle-2/modal-cycle-2.org::*Header][Header:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modal-Cycle-2/modal-cycle-2.org::*Header][Header:1]]

\header {
title = \markup \center-column {"Modal Cycle"}
Expand Down
File renamed without changes.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Modal Cycle
* Modal Cycle 2
** Processing
*** DONE Keys Data
#+tblname: keys-table
Expand Down Expand Up @@ -94,7 +94,9 @@ one_bar =

#+end_src

** Version
** TODO Version
SCHEDULED: <2011-07-08 Fri>

#+begin_src lilypond

\version "2.12.3"
Expand Down Expand Up @@ -455,7 +457,10 @@ Bass = {
}

#+end_src


#+results:


** Number of bars to compile (showLastLength)
#+begin_src lilypond

Expand Down
Binary file not shown.
Binary file not shown.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
* Modal Cycle 2
* Modal Cycle

** Processing
*** DONE Keys Data
Expand Down Expand Up @@ -83,10 +83,6 @@ end

#+end_src

#+results: gen_arpeggio
: \relative c { c16 d16 e16 f16 g16 a16 b16 c16 r2 } | r1 |
: \relative c'' { c16 b16 a16 g16 f16 e16 d16 c16 r2 } | r1 |

*** DONE Generate Bass Line

#+source: generate_bassline(key="c",root="c")
Expand Down Expand Up @@ -439,8 +435,6 @@ Bass = {

#+end_src

#+results:

** Score
#+begin_src lilypond

Expand Down
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modes-in-Key-of-C/modes-in-key-of-c.org::*Version][Version:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modes-in-Key-of-C/modes-in-key-of-c.org::*Version][Version:1]]

\version "2.12.3"

% Version:1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modes-in-Key-of-C/modes-in-key-of-c.org::*Arpeggios][Arpeggios:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modes-in-Key-of-C/modes-in-key-of-c.org::*Arpeggios][Arpeggios:1]]

Carp = {
c'16 d'16 e'16 f'16 g'16 a'16 b'16 c''16 r2
Expand Down Expand Up @@ -44,7 +44,7 @@ Farp = {

% Arpeggios:1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modes-in-Key-of-C/modes-in-key-of-c.org::*Triads][Triads:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modes-in-Key-of-C/modes-in-key-of-c.org::*Triads][Triads:1]]

Ctriads = {
< c' f'a'c'> 4< c' f'a'c'> 4< c' f'a'c'> 4< c' f'a'c'> 4
Expand Down Expand Up @@ -83,7 +83,7 @@ Ftriads = {

% Triads:1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modes-in-Key-of-C/modes-in-key-of-c.org::*Drums%2520(four%2520bars)][Drums-\(four-bars\):1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modes-in-Key-of-C/modes-in-key-of-c.org::*Drums%2520(four%2520bars)][Drums-\(four-bars\):1]]

DrumsFourBars = {
\drummode {
Expand All @@ -100,13 +100,13 @@ DrumsFourBars = {

% Drums-\(four-bars\):1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modes-in-Key-of-C/modes-in-key-of-c.org::*Number%2520of%2520bars%2520to%2520compile%2520(showLastLength)][Number-of-bars-to-compile-\(showLastLength\):1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modes-in-Key-of-C/modes-in-key-of-c.org::*Number%2520of%2520bars%2520to%2520compile%2520(showLastLength)][Number-of-bars-to-compile-\(showLastLength\):1]]

% showLastLength = R1*8

% Number-of-bars-to-compile-\(showLastLength\):1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modes-in-Key-of-C/modes-in-key-of-c.org::*Score][Score:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modes-in-Key-of-C/modes-in-key-of-c.org::*Score][Score:1]]

\score {

Expand Down Expand Up @@ -216,7 +216,7 @@ DrumsFourBars = {

% Score:1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modes-in-Key-of-C/modes-in-key-of-c.org::*Paper][Paper:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modes-in-Key-of-C/modes-in-key-of-c.org::*Paper][Paper:1]]

\paper {
#(define dump-extents #t)
Expand All @@ -230,7 +230,7 @@ DrumsFourBars = {

% Paper:1 ends here

% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/song/Modes-in-Key-of-C/modes-in-key-of-c.org::*Header][Header:1]]
% [[file:~/.emacs.d/martyn/martyn/ob-lilypond/examples/arrange-mode/Modes-in-Key-of-C/modes-in-key-of-c.org::*Header][Header:1]]

\header {
title = \markup \center-column {"Modes in the Key of C"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ Farp = {

#+end_src

#+results:

*** Triads

#+begin_src lilypond
Expand Down
Binary file not shown.
Binary file not shown.
Binary file added examples/basic-mode/html-example/aeolian-1.eps
Binary file not shown.
1 change: 1 addition & 0 deletions examples/basic-mode/html-example/aeolian-systems.count
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1
2 changes: 2 additions & 0 deletions examples/basic-mode/html-example/aeolian-systems.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
\includegraphics{aeolian-1}%
% eof
2 changes: 2 additions & 0 deletions examples/basic-mode/html-example/aeolian-systems.texi
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@image{aeolian-1}
@c eof
Binary file added examples/basic-mode/html-example/aeolian.eps
Binary file not shown.
Binary file added examples/basic-mode/html-example/aeolian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added examples/basic-mode/html-example/dorian-1.eps
Binary file not shown.
1 change: 1 addition & 0 deletions examples/basic-mode/html-example/dorian-systems.count
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1
2 changes: 2 additions & 0 deletions examples/basic-mode/html-example/dorian-systems.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
\includegraphics{dorian-1}%
% eof
2 changes: 2 additions & 0 deletions examples/basic-mode/html-example/dorian-systems.texi
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@image{dorian-1}
@c eof
Binary file added examples/basic-mode/html-example/dorian.eps
Binary file not shown.
Binary file added examples/basic-mode/html-example/dorian.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit c1f9627

Please sign in to comment.