From 5bf7bd0e237771b645c6cd687307d1d4d2b785a1 Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Wed, 5 Aug 2009 11:44:35 +0200 Subject: [PATCH] Docs build: move CSS files and pictures to dedicated directories Also delete texinfo.css. --- Documentation/GNUmakefile | 36 ++---- Documentation/common-macros.itexi | 5 +- Documentation/css/GNUmakefile | 5 + Documentation/{ => css}/lilypond-blue.css | 0 Documentation/{ => css}/lilypond-ie-fixes.css | 0 Documentation/{ => css}/lilypond-mccarty.css | 0 Documentation/{ => css}/lilypond.css | 0 Documentation/de/learning/introduction.itely | 18 +-- Documentation/es/learning/introduction.itely | 16 +-- Documentation/essay/engraving.itely | 16 +-- Documentation/fr/learning/fundamental.itely | 2 +- Documentation/fr/learning/introduction.itely | 16 +-- Documentation/pictures/GNUmakefile | 43 ++++++- Documentation/{ => pictures}/baer-flat-bw.png | Bin .../{ => pictures}/baer-flat-gray.png | Bin .../{ => pictures}/context-example.eps | 0 .../{ => pictures}/henle-flat-bw.png | Bin .../{ => pictures}/henle-flat-gray.png | Bin Documentation/{ => pictures}/lily-flat-bw.png | Bin Documentation/texinfo.css | 106 ------------------ make/doc-i18n-root-rules.make | 8 +- make/doc-i18n-root-vars.make | 4 - make/lysdoc-rules.make | 3 - make/lysdoc-vars.make | 3 - stepmake/stepmake/documentation-vars.make | 3 +- stepmake/stepmake/generic-rules.make | 2 + stepmake/stepmake/generic-vars.make | 5 + stepmake/stepmake/texinfo-rules.make | 2 +- 28 files changed, 109 insertions(+), 184 deletions(-) create mode 100644 Documentation/css/GNUmakefile rename Documentation/{ => css}/lilypond-blue.css (100%) rename Documentation/{ => css}/lilypond-ie-fixes.css (100%) rename Documentation/{ => css}/lilypond-mccarty.css (100%) rename Documentation/{ => css}/lilypond.css (100%) rename Documentation/{ => pictures}/baer-flat-bw.png (100%) rename Documentation/{ => pictures}/baer-flat-gray.png (100%) rename Documentation/{ => pictures}/context-example.eps (100%) rename Documentation/{ => pictures}/henle-flat-bw.png (100%) rename Documentation/{ => pictures}/henle-flat-gray.png (100%) rename Documentation/{ => pictures}/lily-flat-bw.png (100%) delete mode 100644 Documentation/texinfo.css diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 07a93c3bcb..72aef14ca9 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -27,8 +27,6 @@ $(outdir)/snippets/index..html: TEXI2HTML_FLAGS += -D short_toc README_TOP_FILES= DEDICATION THANKS LATEX_FILES =$(call src-wildcard,*.latex) -IMAGES=$(call src-wildcard,*.png) -EPS_ILLUSTRATIONS=context-example.eps IN_ITELY_FILES = $(call src-wildcard,snippets/*-intro.itely) SNIPPET_LY_FILES = $(call src-wildcard,snippets/*.ly) @@ -38,10 +36,6 @@ SNIPPET_LY_FILES = $(call src-wildcard,snippets/*.ly) # Dependencies GENERATED_ITELY_FILES = $(IN_ITELY_FILES:snippets/%-intro.itely=$(outdir)/%.itely) -OUT_PDF_IMAGES = $(IMAGES:%.png=$(outdir)/%.pdf) -OUT_PDF_IMAGES += $(EPS_ILLUSTRATIONS:%.eps=$(outdir)/%.pdf) -OUT_PNG_IMAGES = $(OUT_PDF_IMAGES:%.pdf=%.png) - XREF_MAPS_FILES += $(XREF_MAPS_DIR)/internals.xref-map OMF_FILES += $(outdir)/internals.html.omf $(outdir)/internals.pdf.omf @@ -49,6 +43,7 @@ OMF_FILES += $(outdir)/internals.html.omf $(outdir)/internals.pdf.omf TEXINFO_MANUALS = internals\ $(TELY_FILES:%.tely=%)\ $(TEXI_FILES:%.texi=%) +OUT_TEXINFO_MANUALS = $(TEXINFO_MANUALS:%=$(outdir)/%.texi) ## CHAIN_RULE hack: keep the following line *before* including # stepmake.make, so the Internals Reference is built before the @@ -74,7 +69,6 @@ source-links = $(outdir)/source\ HTML_PAGE_NAMES= index translations devel OUT_HTML_FILES += $(HTML_PAGE_NAMES:%=$(outdir)/%.html) -OUT_CSS_FILES = $(CSS_FILES:%.css=$(outdir)/%.css) MAIN_INFO_DOC = lilypond-notation INFO_DOCS = lilypond-application lilypond-changes lilypond-contributor lilypond-internals \ @@ -131,7 +125,7 @@ local-clean: ### Web targets ifeq ($(out),www) -local-WWW-1: $(TEXINFO_MANUALS:%=$(outdir)/%.texi) $(PDF_FILES) info +local-WWW-1: $(OUT_TEXINFO_MANUALS) $(PDF_FILES) info local-WWW-2: txt-to-html $(OUT_HTML_FILES) $(DEEP_HTML_FILES) $(source-links) $(OMF_FILES) endif @@ -145,15 +139,16 @@ txt-to-html: $(foreach a, $(README_TOP_FILES), cp $(top-src-dir)/$(a) $(outdir)/$(a).txt && ) true $(PYTHON) $(step-bindir)/text2html.py $(OUT_TXT_FILES) +ifeq ($(out),www) +## Extra images dependencies +$(OUT_TEXINFO_MANUALS): $(outdir)/pictures -$(outdir)/%.css: %.css - ln -f $< $@ +$(outdir)/pictures: pictures-subdir + ln -sf ../pictures/$(outdir) $@ -## Extra images dependencies -$(outdir)/learning/index.html: $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES) -$(outdir)/notation/index.html: $(OUT_PNG_IMAGES) $(OUT_EPS_IMAGES) -$(outdir)/learning-big-page.html: $(OUT_PNG_IMAGES) -$(outdir)/notation-big-page.html: $(OUT_PNG_IMAGES) +pictures-subdir: + $(MAKE) -C pictures WWW-1 +endif # Ugh, using '%' twice not possible $(outdir)/notation/notation.xml: $(outdir)/notation.texi @@ -169,17 +164,6 @@ $(outdir)/learning.texi $(outdir)/notation.texi: $(OUT_PDF_IMAGES) $(foreach manual, $(MANUAL_SUBDIRS),\ $(eval $(outdir)/(manual).texi: $(call src-wildcard,$(manual)/*.ite??))) -$(outdir)/%.png: %.png - convert -depth 8 -geometry 50x50% $< $@ - -$(outdir)/%.png: %.eps - gs -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=$@ -sDEVICE=png16m -dEPSCrop -dNOPAUSE -f $< -c quit - -$(outdir)/%.pdf: %.png - convert -depth 8 $< $@ - -$(outdir)/%.pdf: %.eps - gs -dAutoRotatePages=/None -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $< $(outdir)/source: diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi index 599d4f3e7c..38fdd6f9ca 100644 --- a/Documentation/common-macros.itexi +++ b/Documentation/common-macros.itexi @@ -1,7 +1,6 @@ @c -*- coding: utf-8; mode: texinfo; -*- - @c Don't replace quotes with directed quotes. @set txicodequoteundirected @@ -50,7 +49,7 @@ @ifnotinfo @macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT} -@image{\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\} +@image{pictures/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\} @end macro @end ifnotinfo @@ -58,7 +57,7 @@ @ifinfo @macro sourceimage{FILENAME,WIDTH,HEIGHT,ALTTEXT} -@image{lilypond/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\} +@image{lilypond/pictures/\FILENAME\,\WIDTH\,\HEIGHT\,\ALTTEXT\} @end macro @end ifinfo diff --git a/Documentation/css/GNUmakefile b/Documentation/css/GNUmakefile new file mode 100644 index 0000000000..277b76a362 --- /dev/null +++ b/Documentation/css/GNUmakefile @@ -0,0 +1,5 @@ +depth = ../.. + +STEPMAKE_TEMPLATES=documentation + +include $(depth)/make/stepmake.make diff --git a/Documentation/lilypond-blue.css b/Documentation/css/lilypond-blue.css similarity index 100% rename from Documentation/lilypond-blue.css rename to Documentation/css/lilypond-blue.css diff --git a/Documentation/lilypond-ie-fixes.css b/Documentation/css/lilypond-ie-fixes.css similarity index 100% rename from Documentation/lilypond-ie-fixes.css rename to Documentation/css/lilypond-ie-fixes.css diff --git a/Documentation/lilypond-mccarty.css b/Documentation/css/lilypond-mccarty.css similarity index 100% rename from Documentation/lilypond-mccarty.css rename to Documentation/css/lilypond-mccarty.css diff --git a/Documentation/lilypond.css b/Documentation/css/lilypond.css similarity index 100% rename from Documentation/lilypond.css rename to Documentation/css/lilypond.css diff --git a/Documentation/de/learning/introduction.itely b/Documentation/de/learning/introduction.itely index 5d548801dc..2fab8c29d8 100644 --- a/Documentation/de/learning/introduction.itely +++ b/Documentation/de/learning/introduction.itely @@ -88,32 +88,32 @@ Computer-Ausgabe. @item @tab @ifnotinfo @iftex -@image{henle-flat-gray,,4cm} +@image{pictures/henle-flat-gray,,4cm} @end iftex @ifnottex -@image{henle-flat-gray,,,png} +@image{pictures/henle-flat-gray,,,png} @end ifnottex @tab @iftex -@image{baer-flat-gray,,4cm} +@image{pictures/baer-flat-gray,,4cm} @end iftex @ifnottex -@image{baer-flat-gray,,,png} +@image{pictures/baer-flat-gray,,,png} @end ifnottex @tab @iftex -@image{lily-flat-bw,,4cm} +@image{pictures/lily-flat-bw,,4cm} @end iftex @ifnottex -@image{lily-flat-bw,,,png} +@image{pictures/lily-flat-bw,,,png} @end ifnottex @end ifnotinfo @ifinfo -@image{henle-flat-bw,,,png} -@image{baer-flat-bw,,,,png} -@image{lily-flat-bw,,,png} +@image{pictures/henle-flat-bw,,,png} +@image{pictures/baer-flat-bw,,,,png} +@image{pictures/lily-flat-bw,,,png} @end ifinfo @item @tab diff --git a/Documentation/es/learning/introduction.itely b/Documentation/es/learning/introduction.itely index b5fedde33f..84e431092e 100644 --- a/Documentation/es/learning/introduction.itely +++ b/Documentation/es/learning/introduction.itely @@ -94,31 +94,31 @@ ordenador. @item @tab @ifnotinfo @iftex -@image{henle-flat-gray,,4cm} +@image{pictures/henle-flat-gray,,4cm} @end iftex @ifnottex -@image{henle-flat-gray,,,png} +@image{pictures/henle-flat-gray,,,png} @end ifnottex @tab @iftex -@image{baer-flat-gray,,4cm} +@image{pictures/baer-flat-gray,,4cm} @end iftex @ifnottex -@image{baer-flat-gray,,,png} +@image{pictures/baer-flat-gray,,,png} @end ifnottex @tab @iftex -@image{lily-flat-bw,,4cm} +@image{pictures/lily-flat-bw,,4cm} @end iftex @ifnottex -@image{lily-flat-bw,,,png} +@image{pictures/lily-flat-bw,,,png} @end ifnottex @end ifnotinfo @ifinfo -@image{lilypond/henle-flat-bw,,,,png} @image{lilypond/baer-flat-bw,,,,png} -@image{lilypond/lily-flat-bw,,,,png} +@image{lilypond/pictures/henle-flat-bw,,,,png} @image{lilypond/pictures/baer-flat-bw,,,,png} +@image{lilypond/pictures/lily-flat-bw,,,,png} @end ifinfo @item @tab diff --git a/Documentation/essay/engraving.itely b/Documentation/essay/engraving.itely index f169326f44..1b4831a4ee 100644 --- a/Documentation/essay/engraving.itely +++ b/Documentation/essay/engraving.itely @@ -74,31 +74,31 @@ much thicker than lines in the computer edition. @item @tab @ifnotinfo @iftex -@image{henle-flat-gray,,4cm} +@image{pictures/henle-flat-gray,,4cm} @end iftex @ifnottex -@image{henle-flat-gray,,,png} +@image{pictures/henle-flat-gray,,,png} @end ifnottex @tab @iftex -@image{baer-flat-gray,,4cm} +@image{pictures/baer-flat-gray,,4cm} @end iftex @ifnottex -@image{baer-flat-gray,,,png} +@image{pictures/baer-flat-gray,,,png} @end ifnottex @tab @iftex -@image{lily-flat-bw,,4cm} +@image{pictures/lily-flat-bw,,4cm} @end iftex @ifnottex -@image{lily-flat-bw,,,png} +@image{pitcures/lily-flat-bw,,,png} @end ifnottex @end ifnotinfo @ifinfo -@image{lilypond/henle-flat-bw,,,,png} @image{lilypond/baer-flat-bw,,,,png} -@image{lilypond/lily-flat-bw,,,,png} +@image{lilypond/pictures/henle-flat-bw,,,,png} @image{lilypond/pictures/baer-flat-bw,,,,png} +@image{lilypond/pictures/lily-flat-bw,,,,png} @end ifinfo @item @tab diff --git a/Documentation/fr/learning/fundamental.itely b/Documentation/fr/learning/fundamental.itely index b66f41462d..c4819afbb2 100644 --- a/Documentation/fr/learning/fundamental.itely +++ b/Documentation/fr/learning/fundamental.itely @@ -1590,7 +1590,7 @@ contexte @code{Staff} peut contenir plusieurs contextes contextes @code{Staff}. @quotation -@image{context-example,5cm,,} +@sourceimage{context-example,5cm,,} @end quotation Chaque contexte est chargé de faire appliquer certaines règles de gravure, diff --git a/Documentation/fr/learning/introduction.itely b/Documentation/fr/learning/introduction.itely index d68e231d49..80ab58f598 100644 --- a/Documentation/fr/learning/introduction.itely +++ b/Documentation/fr/learning/introduction.itely @@ -94,31 +94,31 @@ s'harmonise avec nos lignes de portée, lesquelles sont également plus @item @tab @ifnotinfo @iftex -@image{henle-flat-gray,,4cm} +@image{pictures/henle-flat-gray,,4cm} @end iftex @ifnottex -@image{henle-flat-gray,,,png} +@image{pictures/henle-flat-gray,,,png} @end ifnottex @tab @iftex -@image{baer-flat-gray,,4cm} +@image{pictures/baer-flat-gray,,4cm} @end iftex @ifnottex -@image{baer-flat-gray,,,png} +@image{pictures/baer-flat-gray,,,png} @end ifnottex @tab @iftex -@image{lily-flat-bw,,4cm} +@image{pictures/lily-flat-bw,,4cm} @end iftex @ifnottex -@image{lily-flat-bw,,,png} +@image{pictures/lily-flat-bw,,,png} @end ifnottex @end ifnotinfo @ifinfo -@image{lilypond/henle-flat-bw,,,png} @image{lilypond/baer-flat-bw,,,png} -@image{lilypond/lily-flat-bw,,,png} +@image{lilypond/pictures/henle-flat-bw,,,png} @image{lilypond/pictures/baer-flat-bw,,,png} +@image{lilypond/pictures/lily-flat-bw,,,png} @end ifinfo @item @tab diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile index 385043d561..a360164335 100644 --- a/Documentation/pictures/GNUmakefile +++ b/Documentation/pictures/GNUmakefile @@ -1,6 +1,47 @@ depth = ../.. -STEPMAKE_TEMPLATES=documentation + +BITMAP_IMAGES = $(call src-wildcard,*.png) $(call src-wildcard,*.jpg) +EPS_ILLUSTRATIONS = $(call src-wildcard,*.eps) +SVG_FILES = $(call src-wildcard,*.svg) + +EXTRA_DIST_FILES = $(BITMAP_IMAGES) $(EPS_ILLUSTRATIONS) $(SVG_FILES) + +OUT_PDF_IMAGES = $(EPS_ILLUSTRATIONS:%.eps=$(outdir)/%.pdf) +OUT_BITMAP_IMAGES = $(BITMAP_IMAGES:%=$(outdir)/%) +OUT_BITMAP_IMAGES += $(EPS_ILLUSTRATIONS:%.pdf=$(outdir)/%.png) + +STEPMAKE_TEMPLATES = documentation include $(depth)/make/stepmake.make +########### +### Targets + +default: + +ifeq ($(out),www) +local-WWW-1: $(OUT_BITMAP_IMAGES) $(OUT_PDF_IMAGES) +endif + +######### +### Rules + +$(outdir)/%-flat-gray.png: %-flat-gray.png + convert -depth 8 -geometry 50x50% $< $@ + +$(outdir)/%-flat-bw.png: %-flat-bw.png + convert -depth 8 -geometry 50x50% $< $@ + +$(outdir)/%.png: %.png + ln -f $< $@ + +$(outdir)/%.jpg: %.jpg + ln -f $< $@ + +$(outdir)/%.png: %.eps + gs -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=$@ -sDEVICE=png16m -dEPSCrop -dNOPAUSE -f $< -c quit + +$(outdir)/%.pdf: %.eps + gs -dAutoRotatePages=/None -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $< + diff --git a/Documentation/baer-flat-bw.png b/Documentation/pictures/baer-flat-bw.png similarity index 100% rename from Documentation/baer-flat-bw.png rename to Documentation/pictures/baer-flat-bw.png diff --git a/Documentation/baer-flat-gray.png b/Documentation/pictures/baer-flat-gray.png similarity index 100% rename from Documentation/baer-flat-gray.png rename to Documentation/pictures/baer-flat-gray.png diff --git a/Documentation/context-example.eps b/Documentation/pictures/context-example.eps similarity index 100% rename from Documentation/context-example.eps rename to Documentation/pictures/context-example.eps diff --git a/Documentation/henle-flat-bw.png b/Documentation/pictures/henle-flat-bw.png similarity index 100% rename from Documentation/henle-flat-bw.png rename to Documentation/pictures/henle-flat-bw.png diff --git a/Documentation/henle-flat-gray.png b/Documentation/pictures/henle-flat-gray.png similarity index 100% rename from Documentation/henle-flat-gray.png rename to Documentation/pictures/henle-flat-gray.png diff --git a/Documentation/lily-flat-bw.png b/Documentation/pictures/lily-flat-bw.png similarity index 100% rename from Documentation/lily-flat-bw.png rename to Documentation/pictures/lily-flat-bw.png diff --git a/Documentation/texinfo.css b/Documentation/texinfo.css deleted file mode 100644 index af84899fc6..0000000000 --- a/Documentation/texinfo.css +++ /dev/null @@ -1,106 +0,0 @@ - hr { border:0; height:1; color: #000000; background-color: #000000; } -/* hr { - border: none; - height: 1px; - color: #666666; - background-color: #666666; -} -body { - border-left: 1px solid #666666; - border-right: 1px solid #666666; - color: #332d28; - margin-right: auto; - margin-left: auto; - width: 60em; - list-style-type: square; - font-family: Arial,Helvetica,sans-serif; - padding-right: 1em; - padding-left: 1em; -} -a { - border-bottom: 1px dashed #344242; - text-decoration: none; - color: #344242; -} -a:link { - text-decoration: none; -} -a:visited { - border-bottom: 1px dashed #666666; - color: #666666; -} -a:active { - border-bottom: 1px solid #00cccc; - color: #00cccc; -} -a:hover { - border-bottom: 1px solid #1d7b85; - color: #1d7b85; -} -blockquote { - border: 1px solid #cccccc; - padding: 3px; - width: 40em; -} -.node { - border-left: 1px solid #666666; - margin: -0.5em 0px 1em; - padding: 2px 1px 0px; - font-style: italic; -} -.node a { - border: none; - text-decoration: underline; - font-style: normal; - font-weight: bold; -} -.verbatim { - font-family: "Courier New",Courier,monospace; -} -.unnumberedsubsubsec { - font-size: large; - color: #1d7b85; -} -.subsubheading { - font-size: large; - color: #3b220d; -} -.contents { - border: 1px dashed #339999; - margin: 3px 2em; - list-style-type: square; - padding-right: 1em; - width: 40em; - background-color: #fcfff9; -} -.contents a { - border-bottom: 1px dashed #423d34; - text-decoration: none; - color: #423d34; -} -.contents a:visited { - border-bottom: 1px dashed #666666; - color: #666666; -} -.contents a:active { - border-bottom: 1px solid #f0d86d; - color: #f0d86d; -} -.contents a:hover { - border-bottom: 1px solid #3b220d; - color: #3b220d; -} -.menu { - border-left: 1px dashed #339999; - margin: 3px 2em 1em; - list-style-type: square; - padding-left: 1.4em; - width: 40em; -} -.unnumbered { -} -h2 { - font-size: x-large; - color: #1d7b85; -} -*/ diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make index 1a24bc6796..6026c9e986 100644 --- a/make/doc-i18n-root-rules.make +++ b/make/doc-i18n-root-rules.make @@ -27,7 +27,13 @@ $(outdir)/%.png: $(top-build-dir)/Documentation/$(outdir)/%.png $(XREF_MAPS_DIR)/%.$(ISOLANG).xref-map: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(buildscript-dir)/extract_texi_filenames -o $(XREF_MAPS_DIR) $(XREF_MAP_FLAGS) --master-map-file=$(XREF_MAPS_DIR)/$*.xref-map $< -$(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES) +$(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES) $(outdir)/pictures + +$(outdir)/pictures: pictures-subdir + ln -sf $(top-build-dir)/Documentation/pictures/$(outdir) $@ + +pictures-subdir: + $(MAKE) -C $(top-build-dir)/Documentation/pictures WWW-1 $(TRANSLATION_LILY_IMAGES): $(MASTER_TEXI_FILES) find $(outdir) \( -name 'lily-*.png' -o -name 'lily-*.ly' \) | sed 's!$(outdir)/!!g' | xargs $(buildscript-dir)/mass-link hard $(outdir) $(top-build-dir)/Documentation/$(outdir) diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make index e838f36cba..ed68660f74 100644 --- a/make/doc-i18n-root-vars.make +++ b/make/doc-i18n-root-vars.make @@ -7,10 +7,6 @@ OUT_HTML_FILES = $(HTML_PAGE_NAMES:%=$(outdir)/%.html) LANGS = $(shell $(PYTHON) $(buildscript-dir)/langdefs.py) CSS_SOURCE_FILES = $(shell ls $(top-src-dir)/Documentation/lilypond*.css) -SOURCE_PNG_IMAGES = $(shell ls $(top-src-dir)/Documentation/*.png) -OUT_PNG_IMAGES = \ - $(SOURCE_PNG_IMAGES:$(top-src-dir)/Documentation/%.png=$(outdir)/%.png) \ - $(outdir)/context-example.png TELY_FILES := $(call src-wildcard,*.tely) MASTER_TEXI_FILES := $(TELY_FILES:%.tely=$(outdir)/%.texi) diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make index 68c4aba79e..cfaabe3355 100644 --- a/make/lysdoc-rules.make +++ b/make/lysdoc-rules.make @@ -1,5 +1,2 @@ $(outdir)/collated-files.tely: $(COLLATED_FILES) $(LYS_TO_TELY) --name=$(outdir)/collated-files.tely --title="$(TITLE)" $^ - -$(outdir)/%.css: $(top-src-dir)/Documentation/%.css - ln -f $< $@ diff --git a/make/lysdoc-vars.make b/make/lysdoc-vars.make index 116da06f41..a2874b271b 100644 --- a/make/lysdoc-vars.make +++ b/make/lysdoc-vars.make @@ -4,6 +4,3 @@ TITLE=LYs Doc ifeq ($(COLLATED_FILES),) COLLATED_FILES = $(sort $(TEXINFO_SOURCES) $(LY_FILES) $(OUT_LY_FILES) ) endif - -CSS_FILES = $(shell ls $(top-src-dir)/Documentation/lilypond*.css) -OUT_CSS_FILES = $(foreach f, $(CSS_FILES), $(outdir)/$(notdir $(f))) diff --git a/stepmake/stepmake/documentation-vars.make b/stepmake/stepmake/documentation-vars.make index 9f6b5148a1..502a0a99d6 100644 --- a/stepmake/stepmake/documentation-vars.make +++ b/stepmake/stepmake/documentation-vars.make @@ -1,5 +1,4 @@ at-dir = $(doc-dir)/ at-ext = .in -CSS_FILES := $(call src-wildcard,*.css) -EXTRA_DIST_FILES += $(CSS_FILES) +EXTRA_DIST_FILES += $(call src-wildcard, *.css) diff --git a/stepmake/stepmake/generic-rules.make b/stepmake/stepmake/generic-rules.make index 2500d80d41..0b04186db4 100644 --- a/stepmake/stepmake/generic-rules.make +++ b/stepmake/stepmake/generic-rules.make @@ -4,3 +4,5 @@ $(outdir)/%: %.m4 %.gz: % gzip -c9 $< > $@ +$(outdir)/%.css: $(CSS_DIRECTORY)/%.css + ln -f $< $@ diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make index 06fa0a9ab2..6a8729df5f 100644 --- a/stepmake/stepmake/generic-vars.make +++ b/stepmake/stepmake/generic-vars.make @@ -103,6 +103,11 @@ SOURCE_FILES += $(IN_FILES) # Preprocessed .in documentation _FILES: OUTIN_FILES = $(addprefix $(outdir)/, $(IN_FILES:%.in=%)) +# CSS source files are in a unique directory +CSS_DIRECTORY = $(top-src-dir)/Documentation/css +CSS_FILES := $(shell ls $(CSS_DIRECTORY)/*.css) +OUT_CSS_FILES = $(CSS_FILES:$(CSS_DIRECTORY)/%.css=$(outdir)/%.css) + ALL_SOURCES = $(SOURCE_FILES) ifeq (cygwin,$(findstring cygwin,$(HOST_ARCH))) diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index c07a86e6c7..a403626e07 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -38,7 +38,7 @@ $(outdir)/%.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version $(outdir)/%/index.html: $(outdir)/%.texi $(XREF_MAPS_DIR)/%.xref-map $(outdir)/version.itexi $(outdir)/%.html.omf mkdir -p $(dir $@) $(TEXI2HTML) --I=$(src-dir) --I=$(outdir) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $< - cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@) + cp $(top-src-dir)/Documentation/css/*.css $(dir $@) $(outdir)/%.html.omf: %.texi -- 2.39.5