[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] navidoc/navidoc modules/imagemap.py mp/__init__...
|
From: |
Asko Soukka |
|
Subject: |
[Gzz-commits] navidoc/navidoc modules/imagemap.py mp/__init__... |
|
Date: |
Wed, 21 May 2003 05:32:56 -0400 |
CVSROOT: /cvsroot/navidoc
Module name: navidoc
Changes by: Asko Soukka <address@hidden> 03/05/21 05:32:56
Modified files:
navidoc/modules: imagemap.py
navidoc/mp : __init__.py uml.mp
Log message:
some fixes
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/modules/imagemap.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.mp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: navidoc/navidoc/modules/imagemap.py
diff -u navidoc/navidoc/modules/imagemap.py:1.5
navidoc/navidoc/modules/imagemap.py:1.6
--- navidoc/navidoc/modules/imagemap.py:1.5 Fri Apr 25 13:41:30 2003
+++ navidoc/navidoc/modules/imagemap.py Wed May 21 05:32:56 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: imagemap.py,v 1.5 2003/04/25 17:41:30 humppake Exp $
+#$Id: imagemap.py,v 1.6 2003/05/21 09:32:56 humppake Exp $
#
# Written by Asko Soukka
@@ -120,7 +120,12 @@
htmlfile.close()
insert = html.find('<a id="'+diagram+'_implicit">')
- if insert == -1:
+
+ """If explicit diagram found, will not insert implicit on."""
+ explicit = html.find('<a id="'+diagram+'">')
+ if explicit == -1: explicit = html.find('_uml="'+diagram)
+
+ if insert == -1 and explicit == -1:
"""
Implicit imagemaps are embedded after the first header or after
the <body> tag.
@@ -134,17 +139,18 @@
insert_left = insert
else: insert_left = html.find('/>', html.find('<img', insert))+2
- if insert != -1:
+ if insert != -1 and explicit == -1:
context = filepath.replace("/","_")
if context.endswith(".gen.html"): context = context[0:len(context)-9]
if context.endswith(".html"): context = context[0:len(context)-5]
+ context = context+'_implicit'
+ create_uml(diagram, context, scale=0.5)
out = open(filepath, "w")
out.write(html[0:insert]);
out.close()
out = open(filepath, "w")
out.write(html[0:insert]);
- create_uml(diagram, context, scale=0.5)
dbg("Mapping diagram %s within %s" % (diagram, filepath))
imgmap = get_imagemap(diagram, context, scale=0.5,
id_postfix="_implicit")
dbg("Diagram %s imagemap: %s" % (diagram, "\n"+str(imgmap)))
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.23 navidoc/navidoc/mp/__init__.py:1.24
--- navidoc/navidoc/mp/__init__.py:1.23 Tue May 20 09:00:52 2003
+++ navidoc/navidoc/mp/__init__.py Wed May 21 05:32:56 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: __init__.py,v 1.23 2003/05/20 13:00:52 humppake Exp $
+# $Id: __init__.py,v 1.24 2003/05/21 09:32:56 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -75,13 +75,20 @@
key = 'title'
def __init__(self, var, s, list = []):
dbg("mp: %s %s" % (s,list))
+ """Grep longer title after variable name."""
if var == None and s.find(' ')!=-1:
self.var = s.split(' ')[0]
s = s[len(self.var)+1:]
if s[0] == '"' and s[-1]=='"':
s = s[1:len(s)-1]
else: self.var = var or s
- self.name = s
+
+ """Title could be used as name if contains no spaces"""
+ if len(s.split(' ')) > 0:
+ self.name = self.var
+ else: self.name = s
+ self.title = s
+
self.do_contents(list)
if self.link != None:
self.link.bbox = ('bboxmeasuredpic(%s)' % (self.var))
@@ -89,7 +96,7 @@
def setup_code(self):
s = """
picture %%.pict;
- %%.pict = diagramTitle("%name%");
+ %%.pict = diagramTitle("""+'"'+self.title+'"'+""");
picmeasurements(%%);
"""
return self.repl(s)
@@ -125,14 +132,15 @@
try:
refers_file = open(refers[id], 'r')
title = re.compile('<title>([^<]*)</title>')
- title = title.findall(refers_file.read())
+ title = title.findall(refers_file.read())[0]
refers_file.close()
except IOError:
raise MetapostException("Referenced file %s defined in %s was
not found." % (refers[id], filepath))
- strip = re.compile('[a-zA-ZåäöÅÄÖ ]*')
- if len(title) > 0: title = strip.findall(title[0])[0]
- else: title = refers[id].split("/")[-1].split(".")[0]
+# Could just a <title> be good enough for the title :P
+# strip = re.compile('[a-zA-ZåäöÅÄÖ+ ]*')
+# if len(title) > 0: title = "".join(strip.findall(title[0]))
+ if len(title) == 0: title = refers[id].split("/")[-1].split(".")[0]
if config.link_base_directory == None:
target = relative_path(config.working_directory, refers[id])
Index: navidoc/navidoc/mp/uml.mp
diff -u navidoc/navidoc/mp/uml.mp:1.3 navidoc/navidoc/mp/uml.mp:1.4
--- navidoc/navidoc/mp/uml.mp:1.3 Tue Apr 1 08:54:09 2003
+++ navidoc/navidoc/mp/uml.mp Wed May 21 05:32:56 2003
@@ -19,7 +19,7 @@
% MA 02111-1307 USA
%
-% $Id: uml.mp,v 1.3 2003/04/01 13:54:09 humppake Exp $
+% $Id: uml.mp,v 1.4 2003/05/21 09:32:56 humppake Exp $
%
% Written by Tuomas Lukka
@@ -473,7 +473,9 @@
j = .15 * abs(hor);
np := jitterpath(np, round(10+uniformdeviate(10)), .25 * j);
np := jitterpath(np, round(40+uniformdeviate(30)), .05 * j);
- draw np withpen pencircle scaled 8pt xscaled .4 rotated -37;;
+
+ draw np withpen pencircle scaled 8pt xscaled .4 rotated -37;
+
enddef;
%%%%%%%%%%%%%%%%%%%
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] navidoc/navidoc modules/imagemap.py mp/__init__...,
Asko Soukka <=