[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] navidoc ./README navidoc/link/docxx.py navidoc/...
From: |
Asko Soukka |
Subject: |
[Gzz-commits] navidoc ./README navidoc/link/docxx.py navidoc/... |
Date: |
Fri, 13 Jun 2003 09:30:27 -0400 |
CVSROOT: /cvsroot/navidoc
Module name: navidoc
Branch:
Changes by: Asko Soukka <address@hidden> 03/06/13 09:30:27
Modified files:
. : README
navidoc/link : docxx.py javadoc.py
navidoc/modules: imagemap.py
navidoc/mp : __init__.py
Log message:
anchor update / jlink update
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/README.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/docxx.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/javadoc.py.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/modules/imagemap.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
Patches:
Index: navidoc/README
diff -u navidoc/README:1.2 navidoc/README:1.3
--- navidoc/README:1.2 Thu Apr 10 07:28:00 2003
+++ navidoc/README Fri Jun 13 09:30:26 2003
@@ -70,6 +70,42 @@
All settings and directories are stored in ``config.py``. Wrong paths
cause at least diagrams not to compile.
+
+Available targets
+=================
+
+html
+ converts given $RST into html
+
+latex
+ converts given $RST into latex
+
+html-loop
+ loops converting given $RST into html
+
+latex-loop
+ loops converting given $RST into latex
+
+naviloop
+
+ loops converting given $RST into html, creating
+
+imagemaps
+ for diagrams and embedding diagrams into their
+ elements' target files
+
+peg
+ asks a few questions and creates directory, .cvsignore
+ and a template for a new peg
+
+The following targets are for project's whole documentation:
+
+navidoc
+ compiles reST under project/doc(s)/
+
+navilink
+ imagemaps diagrams under project/doc(s)/
+
Homepage and mailing lists
==========================
@@ -102,8 +138,7 @@
- Diagrams are compiled without text.
- Environmental variable MPINPUTS is not enough to locate
- fonts. Fonts (*.tfm) under navidoc/mp/ should be copied to
+ Fonts (*.tfm) under navidoc/mp/ should be copied to
diagrams' temporary directory.
.. Why usually MPINPUTS is enough, but no always?
@@ -111,7 +146,7 @@
- Diagrams won't comple and no ``digramname.mp.log`` -files are
generated into diagrams' temporary directory.
- Wrong Metapost version.
+ Probably wrong Metapost version.
.. MetaPost (Web2C 7.4.5) 0.641
kpathsea version 3.4.5
Index: navidoc/navidoc/link/docxx.py
diff -u navidoc/navidoc/link/docxx.py:1.6 navidoc/navidoc/link/docxx.py:1.7
--- navidoc/navidoc/link/docxx.py:1.6 Fri Jun 13 08:00:30 2003
+++ navidoc/navidoc/link/docxx.py Fri Jun 13 09:30:26 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: docxx.py,v 1.6 2003/06/13 12:00:30 humppake Exp $
+#$Id: docxx.py,v 1.7 2003/06/13 13:30:26 humppake Exp $
#
# Written by Asko Soukka
@@ -88,6 +88,10 @@
parts = self.target.split('.')
self.target = '::'.join(parts);
+ if targets.has_key(self.target):
+ self.target = targets[self.target]
+ return
+
if len(config.linkpackages['clink']) > 0:
package_parts = config.linkpackages['clink'].split('.')
clinkpackage = '::'.join(package_parts)
@@ -95,3 +99,5 @@
if targets.has_key(self.target):
self.target = targets[self.target]
+ return
+
Index: navidoc/navidoc/link/javadoc.py
diff -u navidoc/navidoc/link/javadoc.py:1.10
navidoc/navidoc/link/javadoc.py:1.11
--- navidoc/navidoc/link/javadoc.py:1.10 Fri Jun 13 08:00:30 2003
+++ navidoc/navidoc/link/javadoc.py Fri Jun 13 09:30:26 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: javadoc.py,v 1.10 2003/06/13 12:00:30 humppake Exp $
+#$Id: javadoc.py,v 1.11 2003/06/13 13:30:26 humppake Exp $
#
# Written by Asko Soukka
@@ -60,6 +60,7 @@
if not self.target or self.error:
self.error = 0
+ # Case 1: explicit package link
if len(list) > 0 and len(list[0][0][0]) > 0:
self.target = list[0][0][0]
else: self.target = toks[0]
@@ -80,15 +81,24 @@
if re.match('^[a-z]', parts[-1]):
self.target = slashify(self.target) + 'package-summary.html'
else:
- if len(config.linkpackages['jlink']) > 0:
- package_parts = config.linkpackages['jlink'].split('.')
- jlinkpackage = '/'.join(package_parts)
- self.target = slashify(jlinkpackage)+self.target
self.target = self.target + '.html'
for dir in config.javadoc_directories:
if os.path.isfile(slashify(dir)+self.target):
self.target = slashify(dir)+self.target
+ if self.target.endswith('/package-summary.html'):
+ self.target = self.target+'#package_description'
+ return
+
+ if len(config.linkpackages['jlink']) > 0:
+ package_parts = config.linkpackages['jlink'].split('.')
+ jlinkpackage = '/'.join(package_parts)
+ self.target = slashify(jlinkpackage)+self.target
+
+ for dir in config.javadoc_directories:
+ if os.path.isfile(slashify(dir)+self.target):
+ self.target = slashify(dir)+self.target
+ if self.target.endswith('/package-summary.html'):
+ self.target = self.target+'#package_description'
+ return
- if self.target.endswith('/package-summary.html'):
- self.target = self.target+'#package_description'
Index: navidoc/navidoc/modules/imagemap.py
diff -u navidoc/navidoc/modules/imagemap.py:1.9
navidoc/navidoc/modules/imagemap.py:1.10
--- navidoc/navidoc/modules/imagemap.py:1.9 Wed Jun 4 08:19:19 2003
+++ navidoc/navidoc/modules/imagemap.py Fri Jun 13 09:30:27 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: imagemap.py,v 1.9 2003/06/04 12:19:19 humppake Exp $
+#$Id: imagemap.py,v 1.10 2003/06/13 13:30:27 humppake Exp $
#
# Written by Asko Soukka
@@ -86,6 +86,7 @@
dbg_navidoc("Mapping diagram %s within %s" % (diagram, filepath))
imgmap = get_imagemap(diagram, context)
dbg("Diagram %s imagemap: %s" % (diagram, "\n"+str(imgmap)))
+ out.write("\n"+'<a id="%s"></a>' %(diagram) + "\n")
out.write(imgmap)
html = html[html.find(">", insert)+1:len(html)]
out.write(html)
@@ -120,12 +121,31 @@
html = htmlfile.read()
htmlfile.close()
- insert = html.find('<a id="'+diagram+'_implicit">')
+ id = html.find('<a id="'+diagram+'"></a>') + 1
+ insert = html.find('<map id="'+diagram+'_implicit_map"')
"""If explicit diagram found, will not insert implicit on."""
- explicit = html.find('<a id="'+diagram+'">')
+ explicit = html.find('<map id="'+diagram+'_map"')
if explicit == -1: explicit = html.find('_uml="'+diagram)
+ if not id:
+ """
+ When embedding implicit diagrams, the diagram id is located
+ right after <body> tag. This way it could be used better
+ as anchor.
+ """
+ insert_id = html.upper().find('<BODY')
+ insert_id = html.upper().find('>', insert_id)+1
+ out = open(filepath, "w")
+ out.write(html[:insert_id]);
+ out.write('<a id="'+diagram+'"></a>'+'\n')
+ out.write(html[insert_id:])
+ out.close()
+
+ htmlfile = open(filepath)
+ html = htmlfile.read()
+ htmlfile.close()
+
if insert == -1 and explicit == -1:
"""
Implicit imagemaps are embedded after the first header or after
@@ -202,8 +222,7 @@
link.target = relative_path(config.working_directory,
link.target)
link.map_corners(bbox.map_point)
- imgmap = '<a id="'+diagram+id_postfix+'"></a>' \
- +'<map id="'+diagram+id_postfix+'_map"
name="'+diagram+id_postfix+'_map">'+"\n" \
+ imgmap = "\n"+'<map id="'+diagram+id_postfix+'_map"
name="'+diagram+id_postfix+'_map">'+"\n" \
+"\n".join([link.imgmapanchor(scale=scale, diagram=diagram)
for link in links]) \
+'</map>'+"\n" \
+'<img
src="'+slashify(relative_path(config.working_directory, config.mp_directory)) \
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.38 navidoc/navidoc/mp/__init__.py:1.39
--- navidoc/navidoc/mp/__init__.py:1.38 Fri Jun 13 08:00:30 2003
+++ navidoc/navidoc/mp/__init__.py Fri Jun 13 09:30:27 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: __init__.py,v 1.38 2003/06/13 12:00:30 humppake Exp $
+# $Id: __init__.py,v 1.39 2003/06/13 13:30:27 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -156,7 +156,7 @@
refer_names[id] = random_var()
element = mptitle(refer_names[id], [title],
- [[['link'], [target+'#'+diagram]]])
+ [[['link'], [target]]])
if id == len(refers)-1:
context_menu += "\tdraw ulcorner(bbox(currentpicture))+(0,10)
-- urcorner(bbox(currentpicture))+(0,10) withpen pencircle scaled 1.5pt;\n"
context_menu += element.setup_code()
@@ -344,10 +344,13 @@
self.target = slashify(relative_path(config.working_directory,
config.mp_directory))+diagram+config.midfix+'.png'
if self.target.endswith('.png'):
target = '_plain'
- else: target = '_top'
-
- return """<area href="%s" shape="rect" coords="%s" target="%s"
title="%s" alt="%s" />""" \
- % (self.target,
+ diagram = ''
+ else:
+ target = '_top'
+ diagram = '#'+diagram
+
+ return """<area href="%s%s" shape="rect" coords="%s" target="%s"
title="%s" alt="%s" />""" \
+ % (self.target, diagram,
",".join(["%s"%(int(c*scale)) for c in self.corners]),
target,
self.title,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] navidoc ./README navidoc/link/docxx.py navidoc/...,
Asko Soukka <=