]> git.donarmstrong.com Git - lilypond.git/commitdiff
projects / lilypond.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8ce8785)
Lilypond-book: regtest for .htmly as extension for html in lilypond-book
authorReinhold Kainhofer <reinhold@kainhofer.com>
Mon, 7 Jun 2010 17:28:26 +0000 (19:28 +0200)
committerReinhold Kainhofer <reinhold@kainhofer.com>
Sat, 3 Jul 2010 11:26:53 +0000 (13:26 +0200)
input/regression/lilypond-book/suffix-htmly.htmly [new file with mode: 0644] patch | blob
make/lilypond-book-rules.make patch | blob | history
make/lilypond-book-vars.make patch | blob | history

diff --git a/input/regression/lilypond-book/suffix-htmly.htmly b/input/regression/lilypond-book/suffix-htmly.htmly
new file mode 100644 (file)
index 0000000..0c7e83a
--- /dev/null
+++ b/input/regression/lilypond-book/suffix-htmly.htmly
@@ -0,0 +1,8 @@
+<html>
+<body>
+Testing lilypond-book HTML mode with .htmly file suffix.
+<lilypond fragment relative=2>
+\key c \minor c4 es g2
+</lilypond>
+</body>
+</html>
diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make
index 754e88c5ef30210e1e1f00d49fe8e1ab64ac747f..e5a03790b4ae37d9fee09a56aae7fa5303d8a122 100644 (file)
--- a/make/lilypond-book-rules.make
+++ b/make/lilypond-book-rules.make
@@ -5,6 +5,9 @@
 $(outdir)/%.html:  %.html
        $(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
 
+$(outdir)/%.html:  %.htmly
+       $(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
+
 $(outdir)/%.html:  %.xml
        $(LILYPOND_BOOK_COMMAND) -o $(outdir) $<
 
diff --git a/make/lilypond-book-vars.make b/make/lilypond-book-vars.make
index f988ba665bdf4d04c9707599f30792e6597b8a7c..584310fdb3390a70c29df19d2bd0debd9e988881 100644 (file)
--- a/make/lilypond-book-vars.make
+++ b/make/lilypond-book-vars.make
@@ -7,6 +7,7 @@ LILYPOND_BOOK_COMMAND = LILYPOND_VERSION=$(TOPLEVEL_VERSION) \
        $(LILYPOND_BOOK_FLAGS)
 
 LILYBOOK_HTML_FILES = $(call src-wildcard,*.html)
+LILYBOOK_HTMLY_FILES = $(call src-wildcard,*.htmly)
 LILYBOOK_XML_FILES = $(call src-wildcard,*.xml)
 LILYBOOK_LYTEX_FILES = $(call src-wildcard,*.lytex)
 LILYBOOK_LATEX_FILES = $(call src-wildcard,*.latex)
@@ -16,6 +17,7 @@ LILYBOOK_TELY_FILES = $(call src-wildcard,*.tely)
 LILYBOOK_DOCBOOK_FILES = $(call src-wildcard,*.lyxml)
 
 LILYBOOK_OUT_HTML_FILES = ${LILYBOOK_HTML_FILES:%.html=$(outdir)/%.html}
+LILYBOOK_OUT_HTMLY_FILES = ${LILYBOOK_HTML_FILES:%.htmly=$(outdir)/%.html}
 LILYBOOK_OUT_XML_FILES = ${LILYBOOK_XML_FILES:%.xml=$(outdir)/%.html}
 # If we have pdflatex, create the pdf, otherwise only the .tex file!
 ifeq (,$(findstring dblatex,$(MISSING_OPTIONAL)))
@@ -37,6 +39,7 @@ LILYBOOK_OUT_DOCBOOK_FILES = ${LILYBOOK_DOCBOOK_FILES:%.lyxml=$(outdir)/%.xml}
 endif
 
 LILYBOOK_OUT_FILES = $(sort $(LILYBOOK_OUT_HTML_FILES) \
+                            $(LILYBOOK_OUT_HTMLY_FILES) \
                             $(LILYBOOK_OUT_XML_FILES) \
                             $(LILYBOOK_OUT_LYTEX_FILES) \
                             $(LILYBOOK_OUT_LATEX_FILES) \
@@ -45,7 +48,7 @@ LILYBOOK_OUT_FILES = $(sort $(LILYBOOK_OUT_HTML_FILES) \
                             $(LILYBOOK_OUT_TELY_FILES) \
                             $(LILYBOOK_OUT_DOCBOOK_FILES))
 
-EXTRA_DIST_FILES += $(LILYBOOK_HTML_FILES) $(LILYBOOK_XML_FILES) \
+EXTRA_DIST_FILES += $(LILYBOOK_HTML_FILES) $(LILYBOOK_HTMLY_FILES) $(LILYBOOK_XML_FILES) \
                     $(LILYBOOK_LYTEX_FILES) $(LILYBOOK_LATEX_FILES) \
                     $(LILYBOOK_TEX_FILES) $(LILYBOOK_TEXI_FILES) \
                     $(LILYBOOK_TELY_FILES) $(LILYBOOK_DOCBOOK_FILES)
Debian packaging of lilypond