* Documentation/user/macros.itexi: Add xml macros.

* Documentation/user/GNUmakefile (extra-local-help): Add xml rules.

* stepmake/stepmake/texinfo-vars.make (GENERATE_OMF): Fix location.

diff --git a/ChangeLog b/ChangeLog
index c388998457412b29bde2c87aee762a6ca2e19794..044cf2d302c0ce35b72a51dc007624deea23b20a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-03  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * Documentation/user/macros.itexi: Add xml macros.
+
+       * Documentation/user/GNUmakefile (extra-local-help): Add xml rules.
+
+       * stepmake/stepmake/texinfo-vars.make (GENERATE_OMF): Fix location.
+
 2004-10-03  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/break-substitution.cc (substitute_mutable_property_alist):

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 4954461582c82620dd6fa541c4012c4df5757a1d..675608ff48417de375a2244f8cff799eb8432ec5 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -35,6 +35,8 @@ ps: $(PS_FILES)
 
 info: $(INFO_FILES)
 
+xml: $(outdir)/lilypond/lilypond.xml $(outdir)/lilypond-internals/lilypond-internals.xml
+
 # There are two modes for info: with and without images.
 ifeq ($(out),www)
 
@@ -83,6 +85,7 @@ extra-local-help:
   dvi         update dvi documents\n\
   info        update info pages\n\
   ps          update PostScript documents\n\
+  xml        update Docbook xml documentation\n\
 "
 
 # Generic rule using % twice not possible?
@@ -105,6 +108,15 @@ $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-interna
        $(MAKEINFO) --output=$(outdir)/lilypond-internals --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
        $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
 
+$(outdir)/lilypond/lilypond.xml: $(outdir)/lilypond.texi 
+       mkdir -p $(dir $@)
+       $(MAKEINFO) -I$(outdir) --output=$@ --docbook $<
+       perl -i~ -pe 's!../lilypond-internals!lilypond-internals/!g' $(outdir)/lilypond.xml
+
+$(outdir)/lilypond-internals/lilypond-internals.xml: $(outdir)/lilypond-internals.texi
+       mkdir -p $(dir $@)
+       $(MAKEINFO) --output=$(outdir)/lilypond-internals --docbook $<
+
 ifeq ($(SPLITTING_MAKEINFO),yes)
 
 $(outdir)/lilypond.dvi: $(OUT_EPS_IMAGES) $(OUT_PNG_IMAGES)

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index e89d5ad8ee25edc62df5f7a194f8ea378e85fbc9..fc67ae86c647de16de3c7096675aeed539681f98 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -61,7 +61,6 @@
 
 
 @c dup?
-
 @ifhtml
 
  @c ***** HTML *****
@@ -87,6 +86,32 @@
 
 @end ifhtml
 
+@c dup?
+@ifdocbook
+
+ @c ***** DOCBOOK-XML *****
+
+ @macro internalsref{NAME}
+ @c makeinfo-4.7 encodes html names
+ @c @uref{../lilypond-internals/\NAME\.html,\NAME\}@c
+ @inforef{\NAME\,,lilypond-internals}@c
+ @c should we do this? 
+ @cindex @code{\NAME\}
+ @end macro
+
+ @macro hyphenatedinternalsref{NAME,NODENAME}
+ @c @uref{../lilypond-internals/\NODENAME\.html,\NAME\}@c
+ @inforef{\NODENAME\,,lilypond-internals}@c
+ @c should we do this? 
+ @cindex @code{\NAME\}
+ @end macro
+
+ @macro inputfileref{DIR,NAME}
+ @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+ @end macro
+
+@end ifdocbook
+
 @ifinfo
 
 @c **** INFO ****

diff --git a/ly/book-paper-defaults.ly b/ly/book-paper-defaults.ly
index 56b3c0d113d490fd6e9dbfebc6dd77eccbc9fd03..a7ceafd33d5c3db47675afe9de73544e550f26fd 100644 (file)
--- a/ly/book-paper-defaults.ly
+++ b/ly/book-paper-defaults.ly
@@ -60,6 +60,8 @@
     %
     raggedlastbottom= ##t
 
+    %% ugh.  Should use /etc/papersize and set explicitely for
+    %% documentation.
     papersize = "a4"
 
     #(define font-defaults

diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 04a538505641fe1b6543aa5c8c92c0891d1bae13..9836825376e69844c8bfc4af973a562f27dd00bd 100644 (file)
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -7,7 +7,7 @@ TEXINFO_SOURCES = $(TEXI_FILES)
 
 OUTTXT_FILES += $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.txt))
 
-GENERATE_OMF = $(PYTHON) $(depth)/buildscripts/texi2omf.py --format $(1) --location $(local_package_docdir)/$(current-relative-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
+GENERATE_OMF = $(PYTHON) $(depth)/buildscripts/texi2omf.py --format $(1) --location $(package_docdir)/html/$(current-relative-dir)/out-www/$(notdir $(basename $@))  --version $(TOPLEVEL_VERSION) $< > $@
 
 TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)