texi example
Could somebody send me a small example of a .itely file with Lilypond output included? I can't figure out how to create an example template without it complaining about nodes and/or sectioning commands. :( This is my latest attempt. What am I missing? @top foo @node foo Texi text @lilypond[verbatim,fragment,raggedright] a4 b c d @end lilypond ___ lilypond-devel mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/lilypond-devel
9.4: Integrating HTML and music
Quote: A special feature not (yet) available in other output formats, is the tag, for example, trip.ly This runs trip.ly through lilypond (see also Invoking lilypond), and substitutes a preview image in the output. The image links to a separate HTML file, so clicking it will take the viewer to a menu, with links to images, midi and printouts. Is this feature implemented yet? If not, will it be done before 2.4? If not, I'll happily @ignore this bit, and we can add it back in when the feature. But I don't think we should leave this teaser in the manual if the feature isn't there. :) Cheers, - Graham ___ lilypond-devel mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: make all fails: strange macros.texi
> After make distclean, make all fails here (ChangeLog/1.2721): > Documentation/user/out/macros.texi is very strange. Some stuffs are > duplicated. Does someone has an idea? Is this lilypond-book? Yes. My latest fixes for LaTeX cause problems for texinfo (which I hoped that it doesn't happen). Werner ___ lilypond-devel mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: 'mail all' fails
> File "../../scripts/lilypond-book.py", line 888, in > find_toplevel_snippets > RuntimeError: maximum recursion limit exceeded Uh, oh, this is my fault; will try to find a fix. In case someone is good at Python (I'm not) please have a look too. It will take probably a day or two for me. Werner ___ lilypond-devel mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: music functions and markups
Han-Wen Nienhuys <[EMAIL PROTECTED]> writes:
> [EMAIL PROTECTED] writes:
>> Hello
>>
>> I would like to define a music function taking a markup as an
>> argument.
>
> Check out parser.yy and lexer.yy, you would have to add
>
> %token MUSIC_FUNCTION_MARKUP
>
> in the appropriate places.
I still have to check that make web is OK (broken at the moment), but what
do you think of the following (I don't feel confortable when hacking
parser.yy):
Index: ChangeLog
===
RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v
retrieving revision 1.2721
diff -u -r1.2721 ChangeLog
--- ChangeLog 16 Oct 2004 07:37:45 - 1.2721
+++ ChangeLog 16 Oct 2004 09:40:40 -
@@ -1,3 +1,9 @@
+2004-10-16 Nicolas Sceaux <[EMAIL PROTECTED]>
+
+ * lily/parser.yy: add a `embedded_scm_or_full_markup' token,
+ used in Generic_prefix_music_scm, in order to allow the use of
+ \markup expressions with music functions
+
2004-10-16 Werner Lemberg <[EMAIL PROTECTED]>
* scm/framework-tex.scm (font-load-command, define-fonts): Protect
Index: lily/parser.yy
===
RCS file: /cvsroot/lilypond/lilypond/lily/parser.yy,v
retrieving revision 1.433
diff -u -r1.433 parser.yy
--- lily/parser.yy 10 Oct 2004 19:37:58 - 1.433
+++ lily/parser.yy 16 Oct 2004 09:40:50 -
@@ -426,6 +426,7 @@
%type markup markup_line markup_list markup_list_body full_markup
%type mode_changing_head
%type mode_changing_head_with_context
+%type embedded_scm_or_full_markup
%type score_block score_body
@@ -986,7 +987,7 @@
}
| MUSIC_FUNCTION_SCM {
THIS->push_spot ();
- } embedded_scm {
+ } embedded_scm_or_full_markup {
$$ = scm_list_3 ($1, make_input (THIS->pop_spot ()), $3);
}
| MUSIC_FUNCTION_MUSIC {
@@ -997,13 +998,13 @@
}
| MUSIC_FUNCTION_SCM_MUSIC {
THIS->push_spot ();
- } embedded_scm Music {
+ } embedded_scm_or_full_markup Music {
$$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3, $4->self_scm ());
scm_gc_unprotect_object ($4->self_scm ());
}
| MUSIC_FUNCTION_SCM_SCM {
THIS->push_spot ();
- } embedded_scm embedded_scm {
+ } embedded_scm_or_full_markup embedded_scm_or_full_markup {
$$ = scm_list_4 ($1, make_input (THIS->pop_spot ()), $3, $4);
}
| MUSIC_FUNCTION_MUSIC_MUSIC {
@@ -1015,7 +1016,7 @@
}
| MUSIC_FUNCTION_SCM_MUSIC_MUSIC {
THIS->push_spot ();
- } embedded_scm Music Music {
+ } embedded_scm_or_full_markup Music Music {
$$ = scm_list_5 ($1, make_input (THIS->pop_spot ()),
$3, $4->self_scm (), $5->self_scm ());
scm_gc_unprotect_object ($5->self_scm ());
@@ -1023,6 +1024,14 @@
}
;
+embedded_scm_or_full_markup:
+ full_markup {
+ $$ = $1;
+ }
+ | embedded_scm {
+ $$ = $1;
+ };
+
Generic_prefix_music:
Generic_prefix_music_scm {
SCM func = scm_car ($1);
a simple test file:
\version "2.3.22"
\layout { raggedright = ##t }
fnMarkup = #(def-music-function (location markp) (markup?)
#{ s1^$markp #})
fnMarkupMusic = #(def-music-function (location markp music) (markup? ly:music?)
#{ << s1^$markp \\ $music >> #})
fnMarkupMusicMusic = #(def-music-function (location markp music1 music2) (markup?
ly:music? ly:music?)
#{ $music2 << s1^$markp \\ $music1 >> #})
{
\fnMarkup \markup { function on a markup }
\break
\fnMarkupMusic
\markup { function on a markup and a music expression }
{ c''4 d'' e'' f'' }
\break
\fnMarkupMusicMusic
\markup { function on a markup and two music expressions }
{ c''4 d'' e'' f'' }
{ c'4 d' e' f' }
}
nicolas
___
lilypond-devel mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
make all fails: strange macros.texi
Hello,
After make distclean, make all fails here (ChangeLog/1.2721):
Documentation/user/out/macros.texi is very strange. Some stuffs are
duplicated.
Does someone has an idea? Is this lilypond-book?
I'm using texinfo 4.7 on Debian testing.
nicolas:~/cvs/lilypond/Documentation/user> diff -u macros.itexi out/macros.texi
--- macros.itexi2004-10-15 19:25:09.0 +0200
+++ out/macros.texi 2004-10-16 11:43:46.0 +0200
@@ -12,11 +12,11 @@
@ifhtml
@c ugh: @ref assumes that external refs are split documents too
@html
-\NAME\@c
+\NAME\\NAME\@c
@end html
@end ifhtml
@ifnothtml
[EMAIL PROTECTED]
[EMAIL PROTECTED]
@end ifnothtml
@end macro
@@ -46,7 +46,7 @@
@macro arrow{}
@iftex
[EMAIL PROTECTED] $\\Rightarrow$ @end [EMAIL PROTECTED]
[EMAIL PROTECTED] $\\Rightarrow$ @end [EMAIL PROTECTED] $\\Rightarrow$ @end [EMAIL
PROTECTED]
@end iftex
@ifhtml
@html
@@ -63,28 +63,28 @@
@c dup?
@ifhtml
- @c * HTML *
+ @c * HTML *
[EMAIL PROTECTED] [EMAIL PROTECTED]
[EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED]
@c makeinfo-4.7 encodes html names, which means that nodes that
@c contain nonalphanum characters will be broken links on the website.
[EMAIL PROTECTED] @uref{../lilypond-internals/\NAME\.html,[EMAIL PROTECTED]
[EMAIL PROTECTED] @uref{../lilypond-internals/\NAME\.html,[EMAIL PROTECTED]
@uref{../lilypond-internals/\NAME\.html,[EMAIL PROTECTED]
@c @inforef{} adds ``See'' to the sentence, which is annoying, but
@c better than a broken link.
[EMAIL PROTECTED],,[EMAIL PROTECTED]
[EMAIL PROTECTED],,[EMAIL PROTECTED],,[EMAIL PROTECTED]
@c should we do this?
@cindex @code{\NAME\}
@end macro
@macro hyphenatedinternalsref{NAME,NODENAME}
- @c @uref{../lilypond-internals/\NODENAME\.html,[EMAIL PROTECTED]
- @inforef{\NODENAME\,,[EMAIL PROTECTED]
- @c should we do this?
+ @c @uref{../lilypond-internals/\NODENAME\.html,\NAME\} @c
@uref{../lilypond-internals/\NODENAME\.html,[EMAIL PROTECTED]
+ @inforef{\NODENAME\,,lilypond-internals} @inforef{\NODENAME\,,[EMAIL PROTECTED]
+ @c should we do this?
@cindex @code{\NAME\}
@end macro
@macro inputfileref{DIR,NAME}
- @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/[EMAIL
PROTECTED]
+ @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
@uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/[EMAIL
PROTECTED]
@end macro
@end ifhtml
@@ -92,25 +92,25 @@
@c dup?
@ifdocbook
- @c * DOCBOOK-XML *
+ @c * DOCBOOK-XML *
@macro internalsref{NAME}
- @c makeinfo-4.7 encodes html names
- @c @uref{../lilypond-internals/\NAME\.html,[EMAIL PROTECTED]
- @inforef{\NAME\,,[EMAIL PROTECTED]
- @c should we do this?
+ @c makeinfo-4.7 encodes html names
+ @c @uref{../lilypond-internals/\NAME\.html,\NAME\} @c
@uref{../lilypond-internals/\NAME\.html,[EMAIL PROTECTED]
+ @inforef{\NAME\,,lilypond-internals} @inforef{\NAME\,,[EMAIL PROTECTED]
+ @c should we do this?
@cindex @code{\NAME\}
@end macro
@macro hyphenatedinternalsref{NAME,NODENAME}
- @c @uref{../lilypond-internals/\NODENAME\.html,[EMAIL PROTECTED]
- @inforef{\NODENAME\,,[EMAIL PROTECTED]
- @c should we do this?
+ @c @uref{../lilypond-internals/\NODENAME\.html,\NAME\} @c
@uref{../lilypond-internals/\NODENAME\.html,[EMAIL PROTECTED]
+ @inforef{\NODENAME\,,lilypond-internals} @inforef{\NODENAME\,,[EMAIL PROTECTED]
+ @c should we do this?
@cindex @code{\NAME\}
@end macro
@macro inputfileref{DIR,NAME}
- @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/[EMAIL
PROTECTED]
+ @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
@uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/[EMAIL
PROTECTED]
@end macro
@end ifdocbook
@@ -119,13 +119,13 @@
@c INFO
@macro internalsref{NAME}
[EMAIL PROTECTED],,lilypond/[EMAIL PROTECTED]
[EMAIL PROTECTED] [EMAIL PROTECTED]
[EMAIL PROTECTED],,lilypond/[EMAIL PROTECTED],,lilypond/[EMAIL PROTECTED]
[EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED]
@end macro
@macro hyphenatedinternalsref{NAME,NODENAME}
@c FIXME: suspicious info file name?
[EMAIL PROTECTED],,[EMAIL PROTECTED]
[EMAIL PROTECTED],,[EMAIL PROTECTED],,[EMAIL PROTECTED]
@c should we do this?
@cindex @code{\NAME\}
@end macro
@@ -136,7 +136,7 @@
@macro usermanref{NAME}
[EMAIL PROTECTED],,,lilypond/[EMAIL PROTECTED]
[EMAIL PROTECTED],,,lilypond/[EMAIL PROTECTED],,,lilypond/[EMAIL PROTECTED]
@end macro
@end ifinfo
@@ -144,19 +144,19 @@
@iftex
@c TEX
[EMAIL PROTECTED] [EMAIL PROTECTED]
[EMAIL PROTECTED] @code{\NAME\} @c
[EMAIL PROTECTED]@c
[EMAIL PROTECTED] [EMAIL PROTECTED] [EMAIL PROTECTED]
[EMAIL PROTECTED] @code{\NAME\} @cindex @code{\NAME\} @c
[EMAIL PROTECTED]@[EMAIL PROTECTED]
@end macro
[EMAIL PROTECTED] inputfileref{DIR,[EMAIL PROTECTED]
[EMAIL PROTECTED]/[EMAIL PROTECTED]
[EMAIL PROTECTED] inputfileref{DIR,[EMAIL PROTECTED] inputfileref{
'mail all' fails
When compiling CVS ChangeLog 1.2721 it bailed out like this: All snippets are up to date... Compiling ./out/preface.texi... Processing include: introduction.itely Reading introduction.itely... Dissecting...Traceback (most recent call last): File "../../scripts/lilypond-book.py", line 1260, in ? File "../../scripts/lilypond-book.py", line 1255, in main File "../../scripts/lilypond-book.py", line 1180, in do_file File "../../scripts/lilypond-book.py", line 1177, in process_include File "../../scripts/lilypond-book.py", line 1141, in do_file File "../../scripts/lilypond-book.py", line 888, in find_toplevel_snippets RuntimeError: maximum recursion limit exceeded make[2]: *** [out/lilypond.nexi] Error 1 make[2]: Leaving directory `/usr/src/lilypond/Documentation/user' make[1]: *** [all] Error 2 make[1]: Leaving directory `/usr/src/lilypond/Documentation' make: *** [all] Error 2 [EMAIL PROTECTED] lilypond]# -David ___ lilypond-devel mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/lilypond-devel
fix to lilypond-book
I've changed the representation of `snippet_res' in lilypond-book.ly
to something which is easier to understand IMHO. While doing the
conversion I've fixed LaTeX's `lilypond_block' regexp to survive
`%\end{lilypond}'. Please have a look at the regexps for HTML: I
think there is something fishy -- I've seen [EMAIL PROTECTED]' which looks like a
remnant from texinfo...
At the same time I've also fixed `find_toplevel_snippets' to not
swallow `foo ' in
foo \lilypond{...} bar
Due to limited time I've only checked whether this properly works with
LaTeX. Please test the other backends.
Note that I've not fixed yet the width of lilypond TeX output; this
will come soon. Nested braces in \lilypond{...} won't work either
currently.
IMHO the current approach of not scanning the input data multiple
times for the various regexps is a bad idea. First, it makes the
regexps much more complicated than necessary (e.g. for LaTeX, each
regexp has to handle comments), and it fails if comment lines are at
unexpected places. I strongly suggest to do at least three passes:
first, remove verbatim blocks, then all comments, and finally the
rest.
Werner
___
lilypond-devel mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/lilypond-devel
