From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Fri, 9 May 2008 17:00:26 +0000 (+0200)
Subject: Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev... 
X-Git-Tag: release/2.11.58-1~32^2~137
X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=9d9e2e5637e06d98245c3395b58207ec173e7e7d

Merge branch 'master' of ssh://kainhofer@git.sv.gnu.org/srv/git/lilypond into dev/texi2html

Conflicts:

	buildscripts/html-gettext.py
	buildscripts/www_post.py
	input/lsr/editorial-and-educational-use-intro.itely
	make/doclang-rules.make
	python/langdefs.py
	stepmake/stepmake/texinfo-rules.make
---

9d9e2e5637e06d98245c3395b58207ec173e7e7d
diff --cc buildscripts/html-gettext.py
index 7b381349b5,7d32879a41..02a4c947c0
--- a/buildscripts/html-gettext.py
+++ b/buildscripts/html-gettext.py
@@@ -40,61 -38,61 +38,61 @@@ whitespaces = re.compile (r'\s+'
  
  
  def _ (s):
- 	if not s:
- 		return ''
- 	s = whitespaces.sub (' ', s)
- 	for c in html_codes:
- 		s = s.replace (c[1], c[0])
- 	for u in html2texi.values():
- 		s = u[0].sub (u[1], s)
- 	s = my_gettext (s)
- 	for u in texi2html.values():
- 		s = u[0].sub (u[1], s)
- 	for c in html_codes:
- 		s = s.replace (c[0], c[1])
- 	return s
+     if not s:
+         return ''
+     s = whitespaces.sub (' ', s)
+     for c in html_codes:
+         s = s.replace (c[1], c[0])
+     for u in html2texi.values():
+         s = u[0].sub (u[1], s)
+     s = my_gettext (s)
+     for u in texi2html.values():
+         s = u[0].sub (u[1], s)
+     for c in html_codes:
+         s = s.replace (c[0], c[1])
+     return s
  
  def link_gettext (m):
- 	return '<link rel="' + m.group(1) + '" ' + m.group(2) + ' title="' + _(m.group(3)) + '">'
+     return '<link rel="' + m.group(1) + '" ' + m.group(2) + ' title="' + _(m.group(3)) + '">'
  
  def title_gettext (m):
- 	return '<title>' + _(m.group(1)) + ' - ' + m.group(2) + '</title>'
+     return '<title>' + _(m.group(1)) + ' - ' + m.group(2) + '</title>'
  
  def a_href_gettext (m):
- 	s = ''
- 	if m.group(0)[-1] == ':':
- 		s = double_punct_char_separator + ':'
- 	t = ''
- 	if m.lastindex == 7:
- 		t = m.group(7)
- 	return '<a ' + (m.group(1) or '') + m.group(2) + (m.group(3) or '') + _(m.group(4)) + m.group(5) + _(m.group(6)) + t + '</a>' + s
+     s = ''
+     if m.group(0)[-1] == ':':
+         s = double_punct_char_separator + ':'
+     t = ''
+     if m.lastindex == 7:
+         t = m.group(7)
+     return '<a ' + (m.group(1) or '') + m.group(2) + (m.group(3) or '') + _(m.group(4)) + m.group(5) + _(m.group(6)) + t + '</a>' + s
  
  def h_gettext (m):
- 	if m.group (3):
- 		s = _(m.group(3))
- 	else:
- 		s= ''
- 	return '<h' + m.group(1) + m.group(2) + '>' + s +\
- 	       m.group(4) + _(m.group(5)) + '</h' + m.group(1) + '>'
+     if m.group (3):
+         s = _(m.group(3))
+     else:
+         s= ''
+     return '<h' + m.group(1) + m.group(2) + '>' + s +\
+            m.group(4) + _(m.group(5)) + '</h' + m.group(1) + '>'
  
  def crossmanual_ref_gettext (m):
- 	return '<a href="' + m.group(1) + '">' + _(m.group(2)) + '</a>'
+     return '<a href="' + m.group(1) + '">' + _(m.group(2)) + '</a>'
  
- for filename in args[3:]:
- 	f = open (filename, 'r')
- 	page = f.read ()
- 	f.close()
- 	page = re.sub (r'<link rel="(up|prev|next)" (.*?) title="([^"]*?)">', link_gettext, page)
- 	page = re.sub (r'<title>([^<]*?) - ([^<]*?)</title>', title_gettext, page)
- 	# ugh
- 	page = re.sub (r'(?ms)<a ((?:rel="\w+")? ?(?:accesskey="[^"]+?")? ?(?:name=".*?")? ?)(href=".+?">)(<code>)?(Appendix )?([A-Z\d.]+ |)(.+?)(?(3)</code>)</a>:?', a_href_gettext, page)
- 	page = re.sub (r'<h(\d)( class="\w+"|)>\s*(Appendix |)([A-Z\d.]+ |)?([^<]*[^< ])\s*</h\1>', h_gettext, page)
- 	page = re.sub (r'<a href="(\.\./(?:music-glossary|lilypond-program/)?(?:.+?))">(.+?)</a>', crossmanual_ref_gettext, page)
- 	# this is necessary for entries not translated by a_href_gettext
- 	page = re.sub (r'<a href="(.+?)">(.+?)</a>', crossmanual_ref_gettext, page)
- 	for w in ('Next:', 'Previous:', 'Up:'):
- 		page = re.sub (w, _(w), page)
- 	page = langdefs.LANGDICT[lang].html_filter (page)
- 	f = open (os.path.join (outdir, filename), 'w')
- 	f.write (page)
- 	f.close ()
+ for filename in files:
+     f = open (filename, 'r')
+     page = f.read ()
+     f.close()
+     page = re.sub (r'<link rel="(up|prev|next)" (.*?) title="([^"]*?)">', link_gettext, page)
+     page = re.sub (r'<title>([^<]*?) - ([^<]*?)</title>', title_gettext, page)
+     # ugh
+     page = re.sub (r'(?ms)<a ((?:rel="\w+")? ?(?:accesskey="[^"]+?")? ?(?:name=".*?")? ?)(href=".+?">)(<code>)?(Appendix )?([A-Z\d.]+ |)(.+?)(?(3)</code>)</a>:?', a_href_gettext, page)
 -    page = re.sub (r'<h(\d)( class="\w+"|)>(Appendix |)([A-Z\d.]+ |)?([^<]+)</h\1>', h_gettext, page)
++    page = re.sub (r'<h(\d)( class="\w+"|)>\s*(Appendix |)([A-Z\d.]+ |)?([^<]+)\s*</h\1>', h_gettext, page)
+     page = re.sub (r'<a href="(\.\./(?:music-glossary|lilypond-program/)?(?:.+?))">(.+?)</a>', crossmanual_ref_gettext, page)
+     # this is necessary for entries not translated by a_href_gettext
+     page = re.sub (r'<a href="(.+?)">(.+?)</a>', crossmanual_ref_gettext, page)
+     for w in ('Next:', 'Previous:', 'Up:'):
+         page = re.sub (w, _(w), page)
+     page = langdefs.LANGDICT[lang].html_filter (page)
+     f = open (os.path.join (outdir, filename), 'w')
+     f.write (page)
+     f.close ()
diff --cc buildscripts/www_post.py
index 84e2ac70ec,b2d7ca510c..b05e5e2011
--- a/buildscripts/www_post.py
+++ b/buildscripts/www_post.py
@@@ -49,8 -48,8 +48,8 @@@ sys.stderr.write ("Mirrorring...\n"
  dirs, symlinks, files = mirrortree.walk_tree (
      tree_roots = doc_dirs,
      process_dirs = outdir,
-     exclude_dirs = '(^|/)(' + '|'.join ([l.code for l in langdefs.LANGUAGES]) + r'|po|out|.*?[.]t2d|\w*?-root)(/|$)',
+     exclude_dirs = '(^|/)(' + r'|po|out|out-test|.*?[.]t2d|\w*?-root)(/|$)|Documentation/(' + '|'.join ([l.code for l in langdefs.LANGUAGES]) + ')',
 -    find_files = r'.*?\.(?:midi|html|pdf|png|txt|ly|signature)$|VERSION',
 +    find_files = r'.*?\.(?:midi|html|pdf|png|txt|ly|signature|css)$|VERSION',
      exclude_files = r'lily-[0-9a-f]+.*\.(pdf|txt)')
  
  # actual mirrorring stuff
diff --cc make/doclang-rules.make
index 36a53f956a,10fa6ef382..33101c46b9
--- a/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@@ -1,16 -1,14 +1,17 @@@
 -$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.itexi
++<<<<<<< HEAD:make/doclang-rules.make
 +$(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 $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG) $<
+ 	$(PYTHON) $(buildscript-dir)/texi-gettext.py $(ISOLANG) $<
  
 -$(outdir)/%.pdf: $(outdir)/%.pdftexi
 +$(outdir)/%.pdf: $(outdir)/%.pdftexi $(outdir)/version.itexi
  	cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi
  
  $(outdir)/version.%: $(top-src-dir)/VERSION
@@@ -18,9 -16,10 +19,13 @@@
  	echo $(TOPLEVEL_VERSION)>> $@
  	echo '@end macro'>> $@
  
 +$(outdir)/%.png: $(top-build-dir)/Documentation/user/$(outdir)/%.png
 +	ln -f $< $@
 +
+ # This makes sure lilypond-doc gettext domain has been compiled
+ # before lilypond-book runs
+ %.tely: doc-po
+ 
  $(OUT_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
  
  $(DEEP_HTML_FILES) $(PDF_FILES): $(ITELY_FILES) $(ITEXI_FILES)
diff --cc stepmake/stepmake/texinfo-rules.make
index 3c602e6018,c6e29cde73..649956f6fb
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@@ -26,19 -26,11 +26,14 @@@ endi
  $(outdir)/%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir.dep $(outdir)/version.itexi
  	$(MAKEINFO) -I$(outdir) --output=$@ $<
  
- $(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.itexi
- 	mkdir -p $(dir $@)
- 	$(TEXI2HTML) --I=$(outdir) --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) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
 +	$(TEXI2HTML) --I=$(outdir) -D bigpage --output=$@ $(TEXI2HTML_INIT) $< 
 +	cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
 +
  
  $(outdir)/%.html: $(outdir)/%.texi $(outdir)/version.itexi
 -	$(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
 +	$(TEXI2HTML) --I=$(outdir) --output=$@ $(TEXI2HTML_INIT) $<
 +	cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
  
  $(outdir)/%.html.omf: %.texi
  	$(call GENERATE_OMF,html)
@@@ -49,6 -41,10 +44,11 @@@ $(outdir)/%.pdf.omf: %.tex
  $(outdir)/%.ps.gz.omf: %.texi
  	$(call GENERATE_OMF,ps.gz)
  
+ $(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.itexi
+ 	mkdir -p $(dir $@)
 -	$(MAKEINFO) -I $(outdir) --output=$(dir $@) --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
++	$(TEXI2HTML) --I=$(outdir) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
++	cp $(top-src-dir)/Documentation/lilypond.css $(dir $@)
+ 
  $(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/version.itexi
  	cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) --batch $(TEXINFO_PAPERSIZE_OPTION) $(<F)