[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] gzz metacode/pegboard.py doc/pegboard/pegboard....
|
From: |
Asko Soukka |
|
Subject: |
[Gzz-commits] gzz metacode/pegboard.py doc/pegboard/pegboard.... |
|
Date: |
Wed, 06 Nov 2002 06:38:46 -0500 |
CVSROOT: /cvsroot/gzz
Module name: gzz
Changes by: Asko Soukka <address@hidden> 02/11/06 06:38:45
Modified files:
metacode : pegboard.py
doc/pegboard : pegboard.rst
doc/pegboard/1020: PEG_1020.rst
doc/pegboard/chug_shear_twirl--benja: peg.rst
Removed files:
doc/pegboard/1002: PEG_1002.html
Log message:
peg updates
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/metacode/pegboard.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/pegboard.rst.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/1020/PEG_1020.rst.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gzz/gzz/doc/pegboard/chug_shear_twirl--benja/peg.rst.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: gzz/doc/pegboard/1020/PEG_1020.rst
diff -u gzz/doc/pegboard/1020/PEG_1020.rst:1.6
gzz/doc/pegboard/1020/PEG_1020.rst:1.7
--- gzz/doc/pegboard/1020/PEG_1020.rst:1.6 Fri Oct 25 07:25:06 2002
+++ gzz/doc/pegboard/1020/PEG_1020.rst Wed Nov 6 06:38:45 2002
@@ -3,8 +3,8 @@
=============================================================
:Authors: Matti Katila
-:Date: $Date: 2002/10/25 11:25:06 $
-:Revision: $Revision: 1.6 $
+:Date: $Date: 2002/11/06 11:38:45 $
+:Revision: $Revision: 1.7 $
:Status: Incomplete
@@ -27,103 +27,109 @@
What is needed from framework to render Calendar?
- -Coordinating system:
- _______________
- |___________|_|
- ---------- |_|_|_|_|_|_|_|
- | Screen | <--- |_|_|_|_|_|_|_|
- | | |_|_|_|_|_|_|_|
- ---------- |_|_|_|_|_|_|_|
- |_|_|_________|
- -object => window
-
-
- -Text ratio, (Form/layout):
- -Text's ratio to month's calendar skeleton *must* be
- changeable from java side.
-
- -Localization:
- -Months and Weekdays.
- -Solve in java side.
+- Coordinating system::
+ _______________
+ |___________|_|
+ ---------- |_|_|_|_|_|_|_|
+ | Screen | <--- |_|_|_|_|_|_|_|
+ | | |_|_|_|_|_|_|_|
+ ---------- |_|_|_|_|_|_|_|
+ |_|_|_________|
+
+- object => window
+
+ - Text ratio, (Form/layout):
+
+ - Text's ratio to month's calendar skeleton *must* be
+ changeable from java side.
+
+- Localization:
+
+ - Months and Weekdays.
+
+ - Solve in java side.
What is needed to make Calendar look good?
- -Month (and year)
- -Weeknumbers
- -Weekdays
- -Date(s)
- -Colors
- -LineWidth
- -Text:
-
-------------------------------------------------------------------------------
-| |
-| October 2002 |
-| |
-| Monday | Tuesday | Wednesday | Thursday | Friday | Saturday | Sunday |
-+-----+--------+---------+-----------+----------+--------+----------+--------+
-|x | | | | | | | |
-| | | | | | | | |
-| | | 1 | 2 | 3 | 4 | 5 | 6 |
-| | | | | | | | |
-+-----+--------+---------+-----------+----------+--------+----------+--------+
-|x+1 | | | | | | | |
-| | | | | | | | |
-| | 7 | 8 | 9 | 10 | 11 | 12 | 13 |
-| | | | | | | | |
-+-----+--------+---------+-----------+----------+--------+----------+--------+
-|x+2 | | | | | | | |
-| | | | | | | | |
-| | etc.. | | | | | | |
+- Month (and year)
+- Weeknumbers
-|<-w->|<--d1-->|
-
- -w's ratio to d1
-
---------------------------- ---
-| /|\
-| m
-| |
-| Monday | Tuesday | \|/
-+-----+--------+---------+- ---
-|x | | | /|\
-| | | | d2
-| | empty | 1 | |
-| | | | \|/
-+-----+--------+---------+- ----
-
- -m's ratio to d2
-
- -must know how many empty days,
- -must know how many days and
- -must know how many weeks in month:
-
-
- April December
- ______________ _______________
- |_|_|_|_|_|_|_| |___________|_|
- |_|_|_|_|_|_|_| |_|_|_|_|_|_|_|
- |_|_|_|_|_|_|_| |_|_|_|_|_|_|_|
- |_|_|_|_|_|_|_| |_|_|_|_|_|_|_|
- . here is . |_|_|_|_|_|_|_|
- ....emptynes... |_|_|_________|
+- Weekdays
+
+- Date(s)
+- Colors
+
+- LineWidth
+
+- Text::
+
+
------------------------------------------------------------------------------
+ |
|
+ | October 2002
|
+ |
|
+ | Monday | Tuesday | Wednesday | Thursday | Friday | Saturday |
Sunday |
+
+-----+--------+---------+-----------+----------+--------+----------+--------+
+ |x | | | | | | |
|
+ | | | | | | | |
|
+ | | | 1 | 2 | 3 | 4 | 5 |
6 |
+ | | | | | | | |
|
+
+-----+--------+---------+-----------+----------+--------+----------+--------+
+ |x+1 | | | | | | |
|
+ | | | | | | | |
|
+ | | 7 | 8 | 9 | 10 | 11 | 12 |
13 |
+ | | | | | | | |
|
+
+-----+--------+---------+-----------+----------+--------+----------+--------+
+ |x+2 | | | | | | |
|
+ | | | | | | | |
|
+ | | etc.. | | | | | |
|
- _______________
- |___________|_| /|\
- |_|_|_|_|_|_|_| |
- |_|_|_|_|_|_|_| -height (4...6)
- |_|_|_|_|_|_|_| |
- |_|_|_|_|_|_|_| |
- |_|_|_________| \|/
+ |<-w->|<--d1-->|
+
+- w's ratio to d1::
+
+ --------------------------- ---
+ | /|\
+ | m
+ | |
+ | Monday | Tuesday | \|/
+ +-----+--------+---------+- ---
+ |x | | | /|\
+ | | | | d2
+ | | empty | 1 | |
+ | | | | \|/
+ +-----+--------+---------+- ----
+- m's ratio to d2
+
+ - must know how many empty days,
+
+ - must know how many days and
+
+ - must know how many weeks in month::
+ April December
+ ______________ _______________
+ |_|_|_|_|_|_|_| |___________|_|
+ |_|_|_|_|_|_|_| |_|_|_|_|_|_|_|
+ |_|_|_|_|_|_|_| |_|_|_|_|_|_|_|
+ |_|_|_|_|_|_|_| |_|_|_|_|_|_|_|
+ . here is . |_|_|_|_|_|_|_|
+ ....emptynes... |_|_|_________|
+
+ _______________
+ |___________|_| /|\
+ |_|_|_|_|_|_|_| |
+ |_|_|_|_|_|_|_| -height (4...6)
+ |_|_|_|_|_|_|_| |
+ |_|_|_|_|_|_|_| |
+ |_|_|_________| \|/
Why CalendarVob isn't made with CallGL?
- -Text is very problematic - can't be done.
+ - Text is very problematic - can't be done.
Index: gzz/doc/pegboard/chug_shear_twirl--benja/peg.rst
diff -u gzz/doc/pegboard/chug_shear_twirl--benja/peg.rst:1.1
gzz/doc/pegboard/chug_shear_twirl--benja/peg.rst:1.2
--- gzz/doc/pegboard/chug_shear_twirl--benja/peg.rst:1.1 Sun Nov 3
10:59:53 2002
+++ gzz/doc/pegboard/chug_shear_twirl--benja/peg.rst Wed Nov 6 06:38:45 2002
@@ -4,8 +4,8 @@
:Author: Benja Fallenstein
:Date-Created: 2002-11-03
-:Date: $Date: 2002/11/03 15:59:53 $
-:Revision: $Revision: 1.1 $
+:Date: $Date: 2002/11/06 11:38:45 $
+:Revision: $Revision: 1.2 $
:Status: Incomplete
@@ -122,7 +122,7 @@
it needs to be given two directions: which direction to shear,
and in which direction to shear it (in that order).
For example, with the cursor on ``C``, 'Shear Left Down'
-has the following effect:
+has the following effect::
Before After
@@ -134,4 +134,7 @@
| |
E C - D
|
- E
\ No newline at end of file
+ E
+
+
+
Index: gzz/doc/pegboard/pegboard.rst
diff -u gzz/doc/pegboard/pegboard.rst:1.3 gzz/doc/pegboard/pegboard.rst:1.4
--- gzz/doc/pegboard/pegboard.rst:1.3 Wed Nov 6 04:18:17 2002
+++ gzz/doc/pegboard/pegboard.rst Wed Nov 6 06:38:45 2002
@@ -97,7 +97,7 @@
A brief description of the main purpose of the PEG.
Authors
- The author (owner) of the PEG; only this person can edit the
+ The author(s) (owner[s]) of the PEG; only this person can edit the
main text of the PEG.
Stakeholders
Index: gzz/metacode/pegboard.py
diff -u gzz/metacode/pegboard.py:1.11 gzz/metacode/pegboard.py:1.12
--- gzz/metacode/pegboard.py:1.11 Tue Nov 5 13:02:22 2002
+++ gzz/metacode/pegboard.py Wed Nov 6 06:38:45 2002
@@ -39,8 +39,32 @@
replace = '<p>INSERT_PEGBOARD</p>\n'
#pegs will be sorted after their priority
-priority = {'Current': 1, 'Revising': 2, 'Accepted': 3, 'Incomplete': 4,
- 'Implemented': 5, 'Rejected': 6, 'Irrelevant': 7, 'Undefined': 8}
+priority = {'Current': 1,
+ 'Revising': 2,
+ 'Incomplete': 3,
+ 'Accepted': 4,
+ 'Implemented': 5,
+ 'Undefined': 6,
+ 'Rejected': 7,
+ 'Irrelevant': 8,
+ }
+
+#Authors and stakeholders to replace with nicknames
+authors = {'Tuomas Lukka': 'tjl',
+ 'Tuomas J. Lukka': 'tjl',
+ 'Benja Fallenstein': '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': 'aj',
+ 'Janne V. Kujala': 'jvk',
+ 'Janne Kujala': 'jvk',
+ 'Tuukka Hastrup': 'tuukkah',
+ 'Vesa Kaihlavirta': 'vegai'
+ }
#status for pegs without rst or with failing rst
undefined = 'Undefined'
@@ -90,7 +114,20 @@
return values
else:
return ''
-
+
+#returns the value of the first occurrense of field tag with
+#given field name
+def getFieldTagValue(document, fieldName):
+ if document.tagname.lower() == 'field':
+ if document.children[0].rawsource.lower() == fieldName.lower():
+ return document.children[1].rawsource
+ if hasattr(document, 'children'):
+ for child in document.children:
+ value = getFieldTagValue(child, fieldName)
+ if value:
+ return value
+ return ''
+
pegdirs = [d for d in os.listdir(pegroot+'/')
if os.path.isdir(pegroot+'/'+d) and d != 'CVS']
@@ -147,13 +184,22 @@
#from its document tree
if rstfile == peg['rst']:
peg['topic'] = getTagValue(document, 'title', always_raw=1)
- peg['topic'] = peg['topic'].replace('`', '')
+ peg['topic'] = peg['topic']
+ #mark literates in topic
+ if peg['topic'].count('``')%2 == 0:
+ for i in range(peg['topic'].count('``')/2):
+ peg['topic'] = peg['topic'].replace('``', '<tt>', 1)
+ peg['topic'] = peg['topic'].replace('``', '</tt>', 1)
+ else:
+ peg['topic'] = peg['topic'].replace('`', '')
peg['date'] = getTagValue(document, 'date')
#we may have got 'rawsource', which needs some tidying
if peg['date'].startswith('$Date'):
peg['date'] =
peg['date'][7:len(peg['date'])-11].replace('/', '-')
peg['status'] = getTagValue(document, 'status') or undefined
- peg['stakeholders'] = getTagValue(document, 'stakeholder',
all=1)
+ peg['stakeholders'] = getFieldTagValue(document, 'stakeholder')
+ if not peg['stakeholders']:
+ peg['stakeholders'] = getFieldTagValue(document,
'stakeholders')
peg['authors'] = getTagValue(document, 'author', all=1)
except:
fails += 'PEG %s: Docutil raised an exception while converting %s.
' % (pegdir, rstfile)
@@ -206,13 +252,16 @@
for author in peg['authors']:
if peg['authors'].index(author) > 0:
replace_str += ','
- replace_str += '\n\t\t' + author
+ try:
+ replace_str += '\n\t\t' + authors[author]
+ except KeyError:
+ replace_str += '\n\t\t' + author
replace_str += '\n\t</td>\n'
replace_str += '\t<td>'
- for stakeholder in peg['stakeholders']:
- if peg['stakeholders'].index(stakeholder) > 0:
- replace_str += ','
- replace_str += '\n\t\t' + stakeholder
+ stakeholders = peg['stakeholders']
+ for key, value in authors.items():
+ stakeholders = stakeholders.replace(key, value)
+ replace_str += '\n\t\t' + stakeholders
replace_str += '\n\t</td>\n'
replace_str += '\t<td>\n'
for file in peg['files']:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] gzz metacode/pegboard.py doc/pegboard/pegboard....,
Asko Soukka <=