Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / python / auxiliar / postprocess_html.py
diff --git a/python/auxiliar/postprocess_html.py b/python/auxiliar/postprocess_html.py

index ab1c68520faf5bd7fbbbfadaa3dc857abb87e7a1..9c0d90dc2fd031046252c59c4bda207a9420783b 100644 (file)
--- a/python/auxiliar/postprocess_html.py
+++ b/python/auxiliar/postprocess_html.py
@@ -54,11 +54,11 @@ web_footer = '''
  
  footer_name_version = _doc ('This page is for %(package_name)s-%(package_version)s (%(branch_str)s).')
  # ugh, must not have "_doc" in strings because it is naively replaced with "_" in hacked gettext process
-footer_report_links = _doc ('Your <a href="%(suggest_Docs_url)s">suggestions for the documentation</a> are welcome, please report errors to our <a href="%(mail_address_url)s">bug list</a>.')
+footer_report_links = _doc ('We welcome your aid; please <a href="%(help_us_url)s">help us</a> by reporting errors to our <a href="%(mail_address_url)s">bug list</a>.')
  
  
  mail_address = 'http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs'
-suggest_Docs_url = 'http://lilypond.org/web/devel/participating/documentation-adding'
+help_us_url = 'http://lilypond.org/help-us.html'
  
  header_tag = '<!-- header_tag -->'
  header_tag_re = re.compile (header_tag)
@@ -102,7 +102,7 @@ def source_links_replace (m, source_val):
      return 'href="' + os.path.join (source_val, m.group (1)) + '"'
  
  # More hardcoding, yay!
-splitted_docs_re = re.compile('(Documentation/out-www/(automated-engraving|essay|notation|changes|extending|music-glossary|usage|web|learning|snippets))/')
+splitted_docs_re = re.compile('(Documentation/out-www/(automated-engraving|essay|notation|changes|extending|music-glossary|usage|web|learning|snippets|contributor))/')
  lily_snippets_re = re.compile ('(href|src)="([0-9a-f]{2}/lily-.*?)"')
  pictures_re = re.compile ('src="(pictures/.*?)"')
  
@@ -151,9 +151,7 @@ doctype_re = re.compile ('(?i)<!DOCTYPE')
  doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">\n'
  css_re = re.compile ('(?i)<link rel="stylesheet" type="text/css" ([^>]*)href="[^">]*?lilypond.*\.css"([^>]*)>')
  end_head_tag_re = re.compile ('(?i)</head>')
-css_link = """    <link rel="stylesheet" type="text/css" title="Patrick McCarty's design" href="%(rel)sDocumentation/lilypond-mccarty.css">
-    <link rel="alternate stylesheet" type="text/css" href="%(rel)sDocumentation/lilypond.css" title="Andrew Hawryluk's design">
-    <link rel="alternate stylesheet" type="text/css" href="%(rel)sDocumentation/lilypond-blue.css" title="Kurt Kroon's blue design">
+css_link = """    <link rel="stylesheet" type="text/css" title="Default design" href="%(rel)sDocumentation/lilypond-manuals.css">
      <!--[if lte IE 7]>
      <link href="%(rel)sDocumentation/lilypond-ie-fixes.css" rel="stylesheet" type="text/css">
      <![endif]-->