From dba74005fde4b6aa018041e159a0bb770b8fb2ac Mon Sep 17 00:00:00 2001 From: Reinhold Kainhofer Date: Sun, 16 Nov 2008 19:59:46 +0100 Subject: [PATCH] Docs: Rework the way collated-files.html is generated. -) List the files to be collated in a makefile variable COLLATED_FILES (will default to $(sort $(TEXINFO_SOURCES) $(LY_FILES) $(OUT_LY_FILES) ) if unset) -) Get rid of AAA-intro-regression.ly hack and instead include a .tely file. --- ...egression.ly => AAA-intro-regression.tely} | 21 +++---------------- ...tro-regression.ly => 0-Introduction.itexi} | 21 ++----------------- input/regression/musicxml/GNUmakefile | 12 ++--------- make/lysdoc-rules.make | 2 +- make/lysdoc-vars.make | 4 ++++ make/musicxml-vars.make | 2 +- 6 files changed, 13 insertions(+), 49 deletions(-) rename input/regression/{AAA-intro-regression.ly => AAA-intro-regression.tely} (54%) rename input/regression/musicxml/{AAA-intro-regression.ly => 0-Introduction.itexi} (82%) diff --git a/input/regression/AAA-intro-regression.ly b/input/regression/AAA-intro-regression.tely similarity index 54% rename from input/regression/AAA-intro-regression.ly rename to input/regression/AAA-intro-regression.tely index 1ebe40a5f5..0353678e9e 100644 --- a/input/regression/AAA-intro-regression.ly +++ b/input/regression/AAA-intro-regression.tely @@ -1,16 +1,7 @@ -\version "2.11.51" -%% +.ly: Be the first .ly file for lys-to-tely.py. -%% Better to make lys-to-tely.py include "introduction.texi" or -%% other .texi documents too? - - -\header{ -texidoc = - -#(string-append "@unnumbered Introduction +@unnumbered Introduction This document presents proofs for -LilyPond " (lilypond-version) ". When the +LilyPond @lilypondversion). When the text corresponds with the shown notation, we consider LilyPond Officially BugFree (tm). This document is intended for finding bugs and for documenting bugfixes. @@ -20,12 +11,6 @@ or figure for each example to see the corresponding input file. TODO: order of tests (file names!), test only one feature per test. Smaller and neater tests. -") - -} -% -% make sure the .png is generated. -% -\lyrics { "(left blank intentionally)" } +@unnumbered Regression test cases diff --git a/input/regression/musicxml/AAA-intro-regression.ly b/input/regression/musicxml/0-Introduction.itexi similarity index 82% rename from input/regression/musicxml/AAA-intro-regression.ly rename to input/regression/musicxml/0-Introduction.itexi index 5e4914fc97..f8567aa077 100644 --- a/input/regression/musicxml/AAA-intro-regression.ly +++ b/input/regression/musicxml/0-Introduction.itexi @@ -1,16 +1,7 @@ -\version "2.10.0" -%% +.ly: Be the first .ly file for lys-to-tely.py. -%% Better to make lys-to-tely.py include "introduction.texi" or -%% other .texi documents too? - - -\header{ -texidoc = - -#(string-append "@unnumbered MusicXML regression and coverage test +@unnumberedsec Introduction This document presents proofs for the musicxml2ly script provided with -LilyPond " (lilypond-version) ". The files don't have a description yet, so +LilyPond @lilypondversion. The files don't have a description yet, so there is no official indication when the output is wrong. These snippets are provided as unit test files in MusicXML, converted to a .ly file by musicxml2ly and then processed by lilypond as usual. @@ -47,11 +38,3 @@ The files are categorized by their first two digits with the following meaning: @item 20 ... Compressed MusicXML files @item 99 ... Compatibility modes with broken MusicXML exporters (i.e. ignore beams for Sibelius 5) @end itemize -") - -} - -% -% make sure the .png is generated. -% -\lyrics { "(left blank intentionally)" } \ No newline at end of file diff --git a/input/regression/musicxml/GNUmakefile b/input/regression/musicxml/GNUmakefile index 9d1411b78e..24ccf2bc32 100644 --- a/input/regression/musicxml/GNUmakefile +++ b/input/regression/musicxml/GNUmakefile @@ -6,21 +6,13 @@ LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc musicxml TITLE=Lilypond musicxml2ly Regression Tests -ILY_FILES = $(call src-wildcard,*.ily) -EXTRA_OUT_LY_FILES = ${ILY_FILES:%.ily=$(outdir)/%.ly} -EXTRA_DIST_FILES += $(ILY_FILES) +OUT_ITEXI_FILES = ${ITEXI_FILES:%.itexi=$(outdir)/%.itexi} -ITEXI_FILES = $(call src-wildcard,*.itexi) -EXTRA_OUT_LY_FILES = ${ITEXI_FILES:%.itexi=$(outdir)/%.itexi} -EXTRA_DIST_FILES += $(ITEXI_FILES) +COLLATED_FILES = $(sort $(OUT_LY_FILES) $(OUT_ITEXI_FILES) ) include $(depth)/make/stepmake.make TITLE=Lilypond musicxml2ly Regression Tests -.SUFFIXES: .ily -$(outdir)/%.ly: %.ily - ln -f $< $@ - $(outdir)/%.itexi: %.itexi ln -f $< $@ diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make index ab16b1ec29..6dfa8e6f0b 100644 --- a/make/lysdoc-rules.make +++ b/make/lysdoc-rules.make @@ -1,3 +1,3 @@ -$(outdir)/collated-files.tely: $(LY_FILES) $(OUT_LY_FILES) +$(outdir)/collated-files.tely: $(COLLATED_FILES) $(PYTHON) $(LYS_TO_TELY) --name=$(outdir)/collated-files.tely --title="$(TITLE)" $^ diff --git a/make/lysdoc-vars.make b/make/lysdoc-vars.make index 96d44b12f3..a2874b271b 100644 --- a/make/lysdoc-vars.make +++ b/make/lysdoc-vars.make @@ -1,2 +1,6 @@ TITLE=LYs Doc + +ifeq ($(COLLATED_FILES),) +COLLATED_FILES = $(sort $(TEXINFO_SOURCES) $(LY_FILES) $(OUT_LY_FILES) ) +endif diff --git a/make/musicxml-vars.make b/make/musicxml-vars.make index 55cb25b75b..9ee895afa2 100644 --- a/make/musicxml-vars.make +++ b/make/musicxml-vars.make @@ -2,7 +2,7 @@ MUSICXML_FILES = $(call src-wildcard,*.xml) MUSICMXL_FILES = $(call src-wildcard,*.mxl) # Allow .mxl for compressed files -OUT_LY_FILES = $(sort ${MUSICXML_FILES:%.xml=$(outdir)/%.ly} ${MUSICMXL_FILES:%.mxl=$(outdir)/%.ly} ${EXTRA_OUT_LY_FILES}) +OUT_LY_FILES = $(sort ${MUSICXML_FILES:%.xml=$(outdir)/%.ly} ${MUSICMXL_FILES:%.mxl=$(outdir)/%.ly}) OUT_FILES = $(OUT_LY_FILES) EXTRA_DIST_FILES += $(MUSICXML_FILES) $(MUSICMXL_FILES) -- 2.39.5