library-web r384 - in trunk: . data src

[fpeters svn gnome org]

Author: fpeters
Date: Sat Mar  1 13:48:33 2008
New Revision: 384
URL: http://svn.gnome.org/viewvc/library-web?rev=384&view=rev

Log:
* data/overlay.xml.in, src/lgo.py: more support for release notes,
putting them into misc/ instead of users/, added fix for English
translations and for id="index" on wrong element.



Modified:
   trunk/ChangeLog
   trunk/data/overlay.xml.in
   trunk/src/lgo.py

Modified: trunk/data/overlay.xml.in
==============================================================================
--- trunk/data/overlay.xml.in	(original)
+++ trunk/data/overlay.xml.in	Sat Mar  1 13:48:33 2008
@@ -630,7 +630,7 @@
       </_abstract>
     </document>
 
-    <document doc_module="release-notes" channel="users">
+    <document doc_module="release-notes" channel="misc" old-channel="users">
       <keywords>
         <keyword>no-main-index</keyword>
       </keywords>
@@ -641,7 +641,8 @@
   <quirks doc_module="evolution" channel="users">
     <quirk fixed-in="2.11.90">missing-id-on-top-book-element</quirk>
   </quirks>
-  <quirks doc_module="release-notes" channel="users">
+  <quirks doc_module="release-notes" channel="misc">
+    <quirk fixed-in="2.22.0">replace-index-by-intro</quirk>
     <quirk>flat-rendering</quirk>
     <quirk>languages-in-sidebar</quirk>
   </quirks>

Modified: trunk/src/lgo.py
==============================================================================
--- trunk/src/lgo.py	(original)
+++ trunk/src/lgo.py	Sat Mar  1 13:48:33 2008
@@ -448,7 +448,7 @@
     def install_version_symlinks(self, doc):
         '''Create stable and devel symlinks'''
 
-        if self.channel == 'about':
+        if self.channel not in ('users', 'devel', 'admin'):
             return
 
         if not self.one_dot_version in doc.versions:
@@ -742,7 +742,8 @@
         try:
             doc_linguas = re.findall(r'DOC_LINGUAS\s+=[\t ](.*)',
                     self.makefile_am)[0].split()
-            doc_linguas.append('en')
+            if not 'en' in doc_linguas:
+                doc_linguas.append('en')
         except IndexError:
             doc_linguas = ['en']
 
@@ -785,7 +786,7 @@
             always_rebuild = False
 
         for lang in doc.languages:
-            if lang == 'en':
+            if lang == 'en' and not os.path.exists(os.path.join(ext_dirname, self.dirname, 'en')):
                 lang_dirname = os.path.join(ext_dirname, self.dirname, 'C')
             else:
                 lang_dirname = os.path.join(ext_dirname, self.dirname, lang)
@@ -822,6 +823,17 @@
                 open(xml_file + '.fixed', 'w').write(t.replace('\n<book ', '\n<book id="index" '))
                 xml_file = xml_file + '.fixed'
 
+            if 'replace-index-by-intro' in quirks:
+                # Release notes had <sect1 id="index"><title>Introduction...
+                # instead of <sect1 id="intro"><title>Introduction... and that
+                # prevented a correct id="index" on top <article>
+                print 'XXX:, fixing stuff'
+                t = open(xml_file).read()
+                open(xml_file + '.fixed', 'w').write(
+                        t.replace('\n<article ', '\n<article id="index" '
+                            ).replace('<sect1 id="index"', '<sect1 id="intro"'))
+                xml_file = xml_file + '.fixed'
+
             if not skip_html_files:
                 # format docbook into html files
                 cmd = ['xsltproc', '--output', web_output_dir + '/',
@@ -1729,7 +1741,7 @@
             home = ET.SubElement(indexes, 'home')
             home.set('lang', lang)
 
-        for channel in ('users', 'devel', 'admin'):
+        for channel in ('users', 'devel', 'admin', 'misc'):
             docs = [x for x in self.documents if x.channel == channel]
 
             if not docs: