]> git.donarmstrong.com Git - lilypond.git/commitdiff
projects / lilypond.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a398cb2 d82f6f8)
Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev...
authorReinhold Kainhofer <reinhold@kainhofer.com>
Fri, 30 May 2008 15:28:13 +0000 (17:28 +0200)
committerReinhold Kainhofer <reinhold@kainhofer.com>
Fri, 30 May 2008 15:28:13 +0000 (17:28 +0200)
Conflicts:

buildscripts/add_html_footer.py
input/lsr/ancient-notation-intro.itely
input/lsr/chords-intro.itely
input/lsr/contexts-and-engravers-intro.itely
input/lsr/expressive-marks-intro.itely
input/lsr/midi-intro.itely
input/lsr/paper-and-layout-intro.itely
input/lsr/percussion-intro.itely
input/lsr/pitches-intro.itely
input/lsr/repeats-intro.itely
input/lsr/rhythms-intro.itely
input/lsr/simultaneous-notes-intro.itely
input/lsr/spacing-intro.itely
input/lsr/staff-notation-intro.itely
input/lsr/text-intro.itely
input/lsr/titles-intro.itely
input/lsr/tweaks-and-overrides-intro.itely
input/lsr/vocal-music-intro.itely

1  2 
Documentation/user/music-glossary.tely patch | diff1 | diff2 | blob | history
buildscripts/add_html_footer.py patch | diff1 | diff2 | blob | history
input/lsr/lilypond-snippets.tely patch | diff1 | diff2 | blob | history
make/doclang-rules.make patch | diff1 | diff2 | blob | history
scm/documentation-generate.scm patch | diff1 | diff2 | blob | history

diff --cc buildscripts/add_html_footer.py
index 5a459784825f1d1bf0955a07b05f75df67a52677,34ada97aac97d2cb7a5cfc8af0c0c481aab23aec..83a52dc7264c1ede68ade59653e18b9009a14386
--- 1/buildscripts/add_html_footer.py
--- 2/buildscripts/add_html_footer.py
+++ b/buildscripts/add_html_footer.py
@@@ -113,22 -110,19 +114,22 @@@ def hack_urls (s, prefix)
      if not os.path.islink (source_path):
          return s
      source_val = os.readlink (source_path)
-     return source_link_re.sub (lambda m: source_links_replace (m, source_val), s)
+     return re.sub ('href="source/(.*?)"', lambda m: source_links_replace (m, source_val), s)
  
 +body_tag_re = re.compile ('(?i)<body([^>]*)>')
 +html_tag_re = re.compile ('(?i)<html>')
 +doctype_re = re.compile ('(?i)<!DOCTYPE')
 +doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">\n'
 +
  def add_header (s):
 -    """Add header (<BODY> and doctype)"""
 -    if re.search (header_tag, s) == None:
 -        body = '<BODY BGCOLOR=WHITE TEXT=BLACK>'
 -        s = re.sub ('(?i)<body>', body, s)
 -        if re.search ('(?i)<BODY', s):
 -            s = re.sub ('(?i)<body[^>]*>', body + header, s, 1)
 -        elif re.search ('(?i)<html', s):
 -            s = re.sub ('(?i)<html>', '<HTML>' + header, s, 1)
 -        else:
 -            s = header + s
 +    """Add header (<body> and doctype)"""
 +    if header_tag_re.search (s) == None:
 +        body = '<body bgcolor="white" text="black" \\1>'
 +        (s, n) = body_tag_re.subn (body + header, s, 1)
 +        if not n:
 +            (s, n) = html_tag_re.subn ('<html>' + header, s, 1)
 +            if not n:
 +                s = header + s
  
          s = header_tag + '\n' + s
  
diff --cc input/lsr/lilypond-snippets.tely
Simple merge
diff --cc make/doclang-rules.make
index 0b8f359f9c86d541776aa849f57eca49797db2e4,10fa6ef382ecc95622f0ab6abe94f313070089c4..52e46843914817360ab988da8c239faa904bea30
--- 1/make/doclang-rules.make
--- 2/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@@ -1,12 -1,9 +1,11 @@@
- <<<<<<< HEAD:make/doclang-rules.make
 -$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.itexi
 +$(outdir)/%/index.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.itexi
        mkdir -p $(dir $@)
 -      $(MAKEINFO) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
 +      $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
 +      cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
  
 -$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.itexi
 -      $(MAKEINFO) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
 +$(outdir)/%-big-page.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.itexi
 +      $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
 +      cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
  
  $(outdir)/%.pdftexi: $(outdir)/%.texi doc-po $(outdir)/version.itexi
        $(PYTHON) $(buildscript-dir)/texi-gettext.py $(ISOLANG) $<
diff --cc scm/documentation-generate.scm
Simple merge
Debian packaging of lilypond