[Gzz-commits] navidoc ./README ./docutils.conf ./docutils.him...

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/04/10 07:28:00

Modified files:
        .              : README docutils.conf docutils.himalia 
                         rst2any.py 
        navidoc/transforms: __init__.py 
        navidoc/writers: __init__.py 
Added files:
        navidoc/languages: .cvsignore __init__.py fi.py 
Removed files:
        navidoc/transforms: universal.py 

Log message:
        allowing docutils language modules outside docutils

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/README.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/docutils.conf.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/docutils.himalia.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/rst2any.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/languages/.cvsignore?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/languages/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/languages/fi.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/transforms/__init__.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/writers/__init__.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: navidoc/README
diff -u navidoc/README:1.1 navidoc/README:1.2
--- navidoc/README:1.1  Mon Apr  7 11:58:22 2003
+++ navidoc/README      Thu Apr 10 07:28:00 2003
@@ -38,12 +38,15 @@
 | Metapost      | tetex-bin      |
 +---------------+----------------+
 
-Navidoc dependency module ``navidoc-depends`` holds jython and
-jython patched CVS snapshot version of Docutils.
-
-.. I.e. docutils.core:
-   Revision: $Revision: 1.1 $
-   Date: $Date: 2003/04/07 15:58:22 $
+Current development snapshot of Docutils in ``navidoc-depends``
+is fetched 2003-04-10.
+                                                                               
 
+There still appears a Jython warning message, which has been so far
+harmless, though annoying::
+                                                                               
 
+   docutils/nodes.py:1281: SyntaxWarning: unqualified exec is not
+   allowed in function 'GenericNodeVisitor' because it contains a
+   function with free variables
 
 Getting the bleeding-edge version from CVS
 ------------------------------------------
Index: navidoc/docutils.conf
diff -u navidoc/docutils.conf:1.6 navidoc/docutils.conf:1.7
--- navidoc/docutils.conf:1.6   Thu Apr 10 05:20:43 2003
+++ navidoc/docutils.conf       Thu Apr 10 07:28:00 2003
@@ -1,11 +1,11 @@
-#$Id: docutils.conf,v 1.6 2003/04/10 09:20:43 humppake Exp $
+#$Id: docutils.conf,v 1.7 2003/04/10 11:28:00 humppake Exp $
 
 [options]
 
 # These entries affect all processing:
 output-encoding: iso-8859-1
 source-link: 1
-language: en
+language_code: en
 datestamp: %c
 generator: 1
 
Index: navidoc/docutils.himalia
diff -u navidoc/docutils.himalia:1.2 navidoc/docutils.himalia:1.3
--- navidoc/docutils.himalia:1.2        Thu Apr 10 05:20:43 2003
+++ navidoc/docutils.himalia    Thu Apr 10 07:28:00 2003
@@ -1,11 +1,11 @@
-#$Id: docutils.himalia,v 1.2 2003/04/10 09:20:43 humppake Exp $
+#$Id: docutils.himalia,v 1.3 2003/04/10 11:28:00 humppake Exp $
 
 [options]
 
 # These entries affect all processing:
 output-encoding: iso-8859-1
 source-link: 1
-language: en
+language_code: en
 datestamp: %c
 generator: 1
 
Index: navidoc/navidoc/transforms/__init__.py
diff -u navidoc/navidoc/transforms/__init__.py:1.1 
navidoc/navidoc/transforms/__init__.py:1.2
--- navidoc/navidoc/transforms/__init__.py:1.1  Tue Mar 18 09:32:53 2003
+++ navidoc/navidoc/transforms/__init__.py      Thu Apr 10 07:28:00 2003
@@ -1 +1,72 @@
+# 
+# Copyright (c) 2003 by Benja Fallenstein
 #
+# This file is part of Navidoc.
+# 
+# Navidoc is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# Navidoc is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General
+# Public License along with Navidoc; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA  02111-1307  USA
+# 
+
+#
+# Written by Benja Fallenstein
+#
+
+__docformat__ = 'reStructuredText'
+
+import docutils.transforms.universal, docutils.nodes
+
+# Replacing existing: Avoiding "unknown target" warnings with latex writer
+# ***ugly***
+class FinalCheckVisitor(docutils.transforms.universal.FinalCheckVisitor):
+    def visit_citation_reference(self, node):
+        if node.resolved or not node.hasattr('refname'):
+            return
+        refname = node['refname']
+        id = self.document.nameids.get(refname)
+        if id is None:
+            # Instead of complaining when a reference is not included
+            # (i.e., there's no '.. [gzz] bla' for a '[gzz]_'),
+            # we insert the missing node, empty.
+
+            # Note: I don't really know what I'm doing here,
+            # just poking around and guessing which variables
+            # contain which things...
+
+            id = refname
+            xnode = docutils.nodes.reference(refid=refname)
+            #node += xnode
+            self.document.ids[id] = xnode
+            self.document.nameids[refname] = refname
+
+        del node['refname']
+        node['refid'] = id
+        self.document.ids[id].referenced = 1
+        node.resolved = 1
+            
+        ##    msg = self.document.reporter.error(
+        ##          'Unknown target name: "%s".' % (node['refname']),
+        ##          base_node=node)
+        ##    msgid = self.document.set_id(msg)
+        ##    prb = nodes.problematic(
+        ##          node.rawsource, node.rawsource, refid=msgid)
+        ##    prbid = self.document.set_id(prb)
+        ##    msg.add_backref(prbid)
+        ##    node.parent.replace(node, prb)
+        ##else:
+        ##    del node['refname']
+        ##    node['refid'] = id
+        ##    self.document.ids[id].referenced = 1
+        ##    node.resolved = 1
+docutils.transforms.universal.FinalCheckVisitor = FinalCheckVisitor
Index: navidoc/navidoc/writers/__init__.py
diff -u navidoc/navidoc/writers/__init__.py:1.5 
navidoc/navidoc/writers/__init__.py:1.6
--- navidoc/navidoc/writers/__init__.py:1.5     Thu Apr 10 05:59:50 2003
+++ navidoc/navidoc/writers/__init__.py Thu Apr 10 07:28:00 2003
@@ -1,5 +1,5 @@
 # 
-# Copyright (c) 2003 Asko Soukka, Benja Fallenstein
+# Copyright (c) 2003 Asko Soukka
 # 
 # This file is part of Navidoc.
 # 
@@ -19,10 +19,10 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.5 2003/04/10 09:59:50 humppake Exp $
+# $Id: __init__.py,v 1.6 2003/04/10 11:28:00 humppake Exp $
 
 #
-# Written by Asko Soukka, Benja Fallenstein
+# Written by Asko Soukka
 #
 
 __docformat__ = 'reStructuredText'
@@ -52,48 +52,3 @@
     return module.Writer
 
 docutils.writers.get_writer_class = get_writer_class
-
-# Replacing existing: Avoiding "unknown target" warnings with latex writer
-# ***ugly***
-import docutils.transforms.universal, docutils.nodes
-class FinalCheckVisitor(docutils.transforms.universal.FinalCheckVisitor):
-    def visit_citation_reference(self, node):
-        if node.resolved or not node.hasattr('refname'):
-            return
-        refname = node['refname']
-        id = self.document.nameids.get(refname)
-        if id is None:
-            # Instead of complaining when a reference is not included
-            # (i.e., there's no '.. [gzz] bla' for a '[gzz]_'),
-            # we insert the missing node, empty.
-
-            # Note: I don't really know what I'm doing here,
-            # just poking around and guessing which variables
-            # contain which things...
-
-            id = refname
-            xnode = docutils.nodes.reference(refid=refname)
-            #node += xnode
-            self.document.ids[id] = xnode
-            self.document.nameids[refname] = refname
-
-        del node['refname']
-        node['refid'] = id
-        self.document.ids[id].referenced = 1
-        node.resolved = 1
-            
-        ##    msg = self.document.reporter.error(
-        ##          'Unknown target name: "%s".' % (node['refname']),
-        ##          base_node=node)
-        ##    msgid = self.document.set_id(msg)
-        ##    prb = nodes.problematic(
-        ##          node.rawsource, node.rawsource, refid=msgid)
-        ##    prbid = self.document.set_id(prb)
-        ##    msg.add_backref(prbid)
-        ##    node.parent.replace(node, prb)
-        ##else:
-        ##    del node['refname']
-        ##    node['refid'] = id
-        ##    self.document.ids[id].referenced = 1
-        ##    node.resolved = 1
-docutils.transforms.universal.FinalCheckVisitor = FinalCheckVisitor
Index: navidoc/rst2any.py
diff -u navidoc/rst2any.py:1.20 navidoc/rst2any.py:1.21
--- navidoc/rst2any.py:1.20     Thu Apr 10 05:20:43 2003
+++ navidoc/rst2any.py  Thu Apr 10 07:28:00 2003
@@ -21,7 +21,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: rst2any.py,v 1.20 2003/04/10 09:20:43 humppake Exp $
+#$Id: rst2any.py,v 1.21 2003/04/10 11:28:00 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -36,6 +36,8 @@
 
 import navidoc.directives
 import navidoc.writers
+import navidoc.languages
+import navidoc.transforms
 import navidoc.modules
 
 from navidoc.util.path import *