[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] navidoc ./config.himalia ./config.py navidoc/mp...
From: |
Asko Soukka |
Subject: |
[Gzz-commits] navidoc ./config.himalia ./config.py navidoc/mp... |
Date: |
Fri, 23 May 2003 04:35:55 -0400 |
CVSROOT: /cvsroot/navidoc
Module name: navidoc
Changes by: Asko Soukka <address@hidden> 03/05/23 04:35:54
Modified files:
. : config.himalia config.py
navidoc/mp : __init__.py uml.mp
Log message:
option clip_rough_edges
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.himalia.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.29&tr2=1.30&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.mp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
Patches:
Index: navidoc/config.himalia
diff -u navidoc/config.himalia:1.17 navidoc/config.himalia:1.18
--- navidoc/config.himalia:1.17 Thu May 22 06:52:20 2003
+++ navidoc/config.himalia Fri May 23 04:35:54 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: config.himalia,v 1.17 2003/05/22 10:52:20 humppake Exp $
+# $Id: config.himalia,v 1.18 2003/05/23 08:35:54 humppake Exp $
__docformat__ = 'reStructuredText'
@@ -43,6 +43,7 @@
mp_generate = 1
mp_eps_only = 0
mp_context_menu = 1
+mp_clip_rough_edges = 1
# initializing dynamic settings
# should be kept up-to-date in code
Index: navidoc/config.py
diff -u navidoc/config.py:1.29 navidoc/config.py:1.30
--- navidoc/config.py:1.29 Thu May 22 10:17:25 2003
+++ navidoc/config.py Fri May 23 04:35:54 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: config.py,v 1.29 2003/05/22 14:17:25 humppake Exp $
+# $Id: config.py,v 1.30 2003/05/23 08:35:54 humppake Exp $
__docformat__ = 'reStructuredText'
@@ -29,28 +29,21 @@
#Environmental variable MPINPUTS should be relative to tmpdir,
#or be an absolute path.
-os.putenv("MPINPUTS", "../../../navidoc/navidoc/mp/")
+os.putenv("MPINPUTS", "../navidoc/mp/")
+
+# base_url
+base_rul = 'http://fenfire.org/'
# midfix for generated files
# don't change this, if you don't know what you are doing :)
-midfix = ''
-
-# base_url
-base_url = 'http://www.nongnu.org/navidoc/'
-papers_directory = 'papers'
+midfix = ".gen"
-# settings for metapost
-mp_directory = '../non-gnu/navidoc/diagrams'
+# global settings needed all around
+mp_directory = 'diagrams'
mp_generate = 1
mp_eps_only = 0
-mp_context_menu = 0
-
-# settings for linking javadoc
-# the search order is ascending, sudden death
-linkpackages = {} # holder of packagenames, will members will be cleaned after
every diagram
-javadoc_directories = []
-link_redirection = {}
-docxx_directories = []
+mp_context_menu = 1
+mp_clip_rough_edges = 1
# initializing dynamic settings
# should be kept up-to-date in code
@@ -60,6 +53,31 @@
output_filename = ''
link_base_directory = None # if different than working_directory
+# settings for linking javadoc
+# the search order is ascending, sudden death
+linkpackages = {} # holder of packagenames, will members will be cleaned after
every diagram
+javadoc_directories = ['../libvob/doc/javadoc',
+ '../storm/doc/javadoc',
+ '../ffdoc/alph/doc/javadoc',
+ '../fenfire/docs/javadoc',
+ '../loom/doc/javadoc',
+ '../navidoc/doc/javadoc'
+ ]
+link_redirection = {'navidoc': '../navidoc/doc',
+ 'libvob': '../libvob/doc',
+ 'storm': '../storm/doc',
+ 'alph': '../alph/doc',
+ 'fenfire': '../fenfire/docs',
+ 'loom': '../loom/doc',
+ }
+docxx_directories = ['../libvob/doc/docxx',
+ '../storm/doc/docxx',
+ '../alph/doc/docxx',
+ '../fenfire/docs/docxx',
+ '../loom/doc/docxx',
+ '../navidoc/doc/docxx',
+ ]
+
# general debug filter
dbg = navidoc.util.debug.DebugFilter()
@@ -67,10 +85,33 @@
docutils = "./docutils.conf"
# pegs will be sorted after their priority
-pegboard_priorities = {}
+pegboard_priorities = {'Current': 1,
+ 'Revising': 2,
+ 'Incomplete': 3,
+ 'Undefined': 4,
+ 'Accepted': 5,
+ 'Implemented': 6,
+ 'Rejected': 7,
+ 'Irrelevant': 8,
+ }
# authors and stakeholders to replace with nicknames
-pegboard_authors = {}
+pegboard_authors = {'Tuomas Lukka': 'tjl',
+ 'Tuomas J. Lukka': 'tjl',
+ 'Benja Fallenstein': 'benja',
+ 'Benja': 'benja',
+ 'Asko Soukka': 'humppake',
+ 'Matti Katila': 'mudyc',
+ 'Anton Feldmann': 'anton',
+ 'Tero Mäyränen': 'deetsay',
+ 'Marc Schiereck': 'dreevich',
+ 'Hermanni Hyytiälä': 'hemppah',
+ 'Antti_Juhani Kaijanaho': 'ibid',
+ 'Janne V. Kujala': 'jvk',
+ 'Janne Kujala': 'jvk',
+ 'Tuukka Hastrup': 'tuukkah',
+ 'Vesa Kaihlavirta': 'vegai',
+ }
# status for pegs without rst or with failing rst
-pegboard_undefined = ''
+pegboard_undefined = 'Undefined'
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.30 navidoc/navidoc/mp/__init__.py:1.31
--- navidoc/navidoc/mp/__init__.py:1.30 Thu May 22 10:17:25 2003
+++ navidoc/navidoc/mp/__init__.py Fri May 23 04:35:54 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: __init__.py,v 1.30 2003/05/22 14:17:25 humppake Exp $
+# $Id: __init__.py,v 1.31 2003/05/23 08:35:54 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -201,7 +201,9 @@
global rough_edges
for rough_bbox in rough_edges:
"""Print stored roughEdges now, on top of everything else."""
- gen2.write('drawRoughEdge(('+rough_bbox+'), (bbox currentpicture),
('+str(scale)+'));'+"\n")
+ if config.mp_clip_rough_edges: gen2.write('q = (bbox
currentpicture);'+"\n")
+ gen2.write('drawRoughEdge(('+rough_bbox+'), ('+str(scale)+'));'+"\n")
+ if config.mp_clip_rough_edges: gen2.write('clip currentpicture to
q;'+"\n")
gen2.write('showlinksize("bbox", "'+diagram+'", (bbox
currentpicture));'+"\n")
gen2.close()
rough_edges = []
Index: navidoc/navidoc/mp/uml.mp
diff -u navidoc/navidoc/mp/uml.mp:1.7 navidoc/navidoc/mp/uml.mp:1.8
--- navidoc/navidoc/mp/uml.mp:1.7 Wed May 21 07:39:36 2003
+++ navidoc/navidoc/mp/uml.mp Fri May 23 04:35:54 2003
@@ -19,7 +19,7 @@
% MA 02111-1307 USA
%
-% $Id: uml.mp,v 1.7 2003/05/21 11:39:36 tjl Exp $
+% $Id: uml.mp,v 1.8 2003/05/23 08:35:54 humppake Exp $
%
% Written by Tuomas Lukka
@@ -445,7 +445,7 @@
jitterpt(point length(p) of p, pta)
enddef;
-vardef drawRoughEdge(expr p, q, scale) =
+vardef drawRoughEdge(expr p, scale) =
save c, hor, ver, np, j, astart, athrough, aend, na;
pair c;
c = center(p);
@@ -474,8 +474,7 @@
np := jitterpath(np, round(10+uniformdeviate(10)), .125 / scale * j);
np := jitterpath(np, round(40+uniformdeviate(30)), .025 / scale * j);
- draw np withpen pencircle scaled (4pt/scale) xscaled .4 rotated -37;
- clip currentpicture to q;;
+ draw np withpen pencircle scaled (4pt/scale) xscaled .4 rotated -37;;
enddef;