From: Reinhold Kainhofer Date: Mon, 7 Jun 2010 17:28:26 +0000 (+0200) Subject: Lilypond-book: regtest for .htmly as extension for html in lilypond-book X-Git-Tag: release/2.13.27-1~22 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=350751e4016e846fd5f79b8b9d20efc4da8a0e95;p=lilypond.git Lilypond-book: regtest for .htmly as extension for html in lilypond-book --- diff --git a/input/regression/lilypond-book/suffix-htmly.htmly b/input/regression/lilypond-book/suffix-htmly.htmly new file mode 100644 index 0000000000..0c7e83af75 --- /dev/null +++ b/input/regression/lilypond-book/suffix-htmly.htmly @@ -0,0 +1,8 @@ + + +Testing lilypond-book HTML mode with .htmly file suffix. + +\key c \minor c4 es g2 + + + diff --git a/make/lilypond-book-rules.make b/make/lilypond-book-rules.make index 754e88c5ef..e5a03790b4 100644 --- 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 f988ba665b..584310fdb3 100644 --- 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)