[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-reports doc/technotes/00002.txt src/adapte...
|
From: |
Jason Cater |
|
Subject: |
gnue-reports doc/technotes/00002.txt src/adapte... |
|
Date: |
Wed, 26 Nov 2003 17:11:50 -0500 |
CVSROOT: /cvsroot/gnue
Module name: gnue-reports
Branch:
Changes by: Jason Cater <address@hidden> 03/11/26 17:11:50
Modified files:
doc/technotes : 00002.txt
src/adapters/filters/Universal/Base/Helpers: Color.py
src/adapters/filters/Universal/Base/styles: Parser.py
StyleHandler.py
src/adapters/filters/Universal/etc: standard-styles.grs
src/adapters/filters/Universal/postscript/psutils:
FontMetrics.py
Added files:
src/adapters/filters/Universal/Base/styles/Objects: StyleSet.py
Log message:
misc fixes related to styles
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/doc/technotes/00002.txt.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/Base/Helpers/Color.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/Base/styles/Parser.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/Base/styles/StyleHandler.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/Base/styles/Objects/StyleSet.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/etc/standard-styles.grs.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/postscript/psutils/FontMetrics.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
Patches:
Index: gnue-reports/doc/technotes/00002.txt
diff -c gnue-reports/doc/technotes/00002.txt:1.4
gnue-reports/doc/technotes/00002.txt:1.5
*** gnue-reports/doc/technotes/00002.txt:1.4 Wed Nov 26 16:27:55 2003
--- gnue-reports/doc/technotes/00002.txt Wed Nov 26 17:11:49 2003
***************
*** 16,22 ****
font-family: <font>|serif|sans-serif|cursive|monospace[,[...]]
font-style: normal|oblique|italics
font-weight: normal|bold|100-900|light
! font-scale: 100% # Horizontal scale... 80% would create tall, narrow text
text-size: 11pt
text-underline: none|single|double
--- 16,23 ----
font-family: <font>|serif|sans-serif|cursive|monospace[,[...]]
font-style: normal|oblique|italics
font-weight: normal|bold|100-900|light
! font-horiz-scale: 100% # Horizontal scale of text
! font-vert-scale: 100% # Vertical scale of text
text-size: 11pt
text-underline: none|single|double
***************
*** 30,36 ****
text-strikeout-size: 1pt
text-case: normal|lower|upper|smallcaps
text-color: color
! text-leading: auto # Standard space between lines (defaults to font-size+3)
text-tracking: auto|tight|loose|% # Space between letters
text-indent: .5in
text-justification: left|right|center|justified
--- 31,37 ----
text-strikeout-size: 1pt
text-case: normal|lower|upper|smallcaps
text-color: color
! text-leading: auto # Standard space between lines (defaults to font-size +
3)
text-tracking: auto|tight|loose|% # Space between letters
text-indent: .5in
text-justification: left|right|center|justified
***************
*** 42,59 ****
background-color: color
! margin-*: measurement
! padding-*: measurement
! border-*color: color
! border-*size: measurement
! border-*: none | dotted | dashed | solid | double | groove | ridge | inset |
outset
custom:?;?;?"
! *left-
! *right-
! *top-
! *bottom-
! *vert-
! *horiz-
--- 43,60 ----
background-color: color
! margin*: measurement
! padding*: measurement
! border*-color: color
! border*-size: measurement
! border*: none | dotted | dashed | solid | double | groove | ridge | inset |
outset
custom:?;?;?"
! *-left
! *-right
! *-top
! *-bottom
! *-vert
! *-horiz
Index: gnue-reports/src/adapters/filters/Universal/Base/Helpers/Color.py
diff -c gnue-reports/src/adapters/filters/Universal/Base/Helpers/Color.py:1.2
gnue-reports/src/adapters/filters/Universal/Base/Helpers/Color.py:1.3
*** gnue-reports/src/adapters/filters/Universal/Base/Helpers/Color.py:1.2
Tue Apr 15 18:32:49 2003
--- gnue-reports/src/adapters/filters/Universal/Base/Helpers/Color.py Wed Nov
26 17:11:49 2003
***************
*** 27,37 ****
# NOTES:
#
! __all__ = ['Color']
from types import *
!
############################################################
--- 27,38 ----
# NOTES:
#
! __all__ = ['Color','ColorError']
from types import *
! class ColorError (StandardError):
! pass
############################################################
***************
*** 72,78 ****
self.__blue = 255 - min(255,((yellow/255) * (255 - black) + black))
else:
! raise "Unable to parse color: '%s'" % value
value = self.toHex()
--- 73,79 ----
self.__blue = 255 - min(255,((yellow/255) * (255 - black) + black))
else:
! raise ColorError, "Unable to parse color: '%s'" % value
value = self.toHex()
***************
*** 83,90 ****
self.__green = 0
self.__blue = 0
! elif type(value) != StringType:
! raise "Unable to parse color: '%s'" % value
# Named colors
elif colorNames.has_key(value.replace(' ','').lower()):
--- 84,91 ----
self.__green = 0
self.__blue = 0
! elif type(value) not in (StringType,UnicodeType):
! raise ColorError, "Unable to parse color: '%s'" % value
# Named colors
elif colorNames.has_key(value.replace(' ','').lower()):
***************
*** 102,108 ****
self.__red = self.__green = self.__blue =
round(255.0*int(value[:-1])/100)
else:
! raise "Unable to parse color: '%s'" % value
self.__value = value
--- 103,109 ----
self.__red = self.__green = self.__blue =
round(255.0*int(value[:-1])/100)
else:
! raise ColorError, "Unable to parse color: '%s'" % value
self.__value = value
Index: gnue-reports/src/adapters/filters/Universal/Base/styles/Parser.py
diff -c gnue-reports/src/adapters/filters/Universal/Base/styles/Parser.py:1.4
gnue-reports/src/adapters/filters/Universal/Base/styles/Parser.py:1.5
*** gnue-reports/src/adapters/filters/Universal/Base/styles/Parser.py:1.4
Tue May 13 14:58:25 2003
--- gnue-reports/src/adapters/filters/Universal/Base/styles/Parser.py Wed Nov
26 17:11:50 2003
***************
*** 34,40 ****
from gnue.common.formatting import GTypecast
from gnue.common.definitions import GParser
from gnue.reports.adapters.filters.Universal.Base.ParserTypes import *
! from Objects import Styles, TextStyle
import copy, types
--- 34,40 ----
from gnue.common.formatting import GTypecast
from gnue.common.definitions import GParser
from gnue.reports.adapters.filters.Universal.Base.ParserTypes import *
! from Objects import Styles, TextStyle, StyleSet, Color
import copy, types
***************
*** 83,88 ****
--- 83,113 ----
'Attributes': { },
'ParentTags': None },
+ 'styleset': {
+ 'BaseClass': StyleSet.StyleSet,
+ 'Required': 1,
+ 'SingleInstance': 1,
+ 'Attributes': {
+ "name": {
+ 'Required': 1,
+ 'Typecast': GTypecast.name },
+ },
+ 'ParentTags': ('styles',) },
+
+ 'color': {
+ 'BaseClass': Color.Color,
+ 'Required': 1,
+ 'SingleInstance': 1,
+ 'Attributes': {
+ "name": {
+ 'Required': 1,
+ 'Typecast': GTypecast.name },
+ "value": {
+ 'Required': 1,
+ 'Typecast': color },
+ },
+ 'ParentTags': ('styleset',) },
+
'textstyle': {
'BaseClass': TextStyle.TextStyle,
***************
*** 93,130 ****
"objects": {
'Required': 1,
'Typecast': GTypecast.names },
! "font_family": {
'Typecast': GTypecast.text },
! "font_style": {
'Typecast': GTypecast.text },
! "font_weight": {
'Typecast': GTypecast.text },
! "font_scale": {
'Typecast': percentage },
! "text_size": {
'Typecast': textmeasurement },
! "text_underline": {
! 'ValueSet': _lineSet,
'Typecast': GTypecast.text },
! "text_underline_color": {
'Typecast': color },
! "text_underline_size": {
'Typecast': textmeasurement },
! "text_overline": {
! 'ValueSet': _lineSet,
'Typecast': GTypecast.text },
! "text_overline_color": {
'Typecast': color },
! "text_overline_size": {
'Typecast': textmeasurement },
! "text_strikeout": {
! 'ValueSet': _lineSet,
'Typecast': GTypecast.text },
! "text_strikeout_color": {
'Typecast': color },
! "text_strikeout_size": {
'Typecast': textmeasurement },
! "text_case": {
'ValueSet': {
'none': {},
'upper': {},
--- 118,157 ----
"objects": {
'Required': 1,
'Typecast': GTypecast.names },
! "font-family": {
'Typecast': GTypecast.text },
! "font-style": {
'Typecast': GTypecast.text },
! "font-weight": {
'Typecast': GTypecast.text },
! "font-horiz-scale": {
! 'Typecast': percentage },
! "font-vert-scale": {
'Typecast': percentage },
! "text-size": {
'Typecast': textmeasurement },
! "text-underline": {
! 'ValueSet': _lineSet(),
'Typecast': GTypecast.text },
! "text-underline-color": {
'Typecast': color },
! "text-underline-size": {
'Typecast': textmeasurement },
! "text-overline": {
! 'ValueSet': _lineSet(),
'Typecast': GTypecast.text },
! "text-overline-color": {
'Typecast': color },
! "text-overline-size": {
'Typecast': textmeasurement },
! "text-strikeout": {
! 'ValueSet': _lineSet(),
'Typecast': GTypecast.text },
! "text-strikeout-color": {
'Typecast': color },
! "text-strikeout-size": {
'Typecast': textmeasurement },
! "text-case": {
'ValueSet': {
'none': {},
'upper': {},
***************
*** 132,238 ****
'capitalize': {},
'smallcaps': {} },
'Typecast': GTypecast.text },
! "text_color": {
'Typecast': color },
! "text_leading": {
'Typecast': GTypecast.text },
! "text_tracking": {
'Typecast': GTypecast.text },
! "text_indent": {
'Typecast': GTypecast.text },
! "text_justification": {
'ValueSet': {
'left': {},
'right': {},
'center': {},
'justified': {} },
'Typecast': GTypecast.text },
! "word_spacing": {
'Typecast': textmeasurement },
! "line_spacing": {
'Typecast': textmeasurement },
! "background_color": {
'Typecast': color },
! "background_fill": {
'Typecast': GTypecast.text },
"margin": {
'Typecast': textmeasurement },
! "margin_left": {
'Typecast': textmeasurement },
! "margin_right": {
'Typecast': textmeasurement },
! "margin_top": {
'Typecast': textmeasurement },
! "margin_bottom": {
'Typecast': textmeasurement },
"padding": {
'Typecast': textmeasurement },
! "padding_left": {
'Typecast': textmeasurement },
! "padding_right": {
'Typecast': textmeasurement },
! "padding_top": {
'Typecast': textmeasurement },
! "padding_botton": {
'Typecast': textmeasurement },
"border": {
! 'ValueSet': _lineSet,
'Typecast': GTypecast.text },
! "border_left": {
! 'ValueSet': _lineSet,
'Typecast': GTypecast.text },
! "border_right": {
! 'ValueSet': _lineSet,
'Typecast': GTypecast.text },
! "border_top": {
! 'ValueSet': _lineSet,
'Typecast': GTypecast.text },
! "border_bottom": {
! 'ValueSet': _lineSet,
'Typecast': GTypecast.text },
! "border_horiz": {
! 'ValueSet': _lineSet,
'Typecast': GTypecast.text },
! "border_vert": {
! 'ValueSet': _lineSet,
'Typecast': GTypecast.text },
! "border_color": {
'Typecast': color },
! "border_left_color": {
'Typecast': color },
! "border_right_color": {
'Typecast': color },
! "border_top_color": {
'Typecast': color },
! "border_bottom_color": {
'Typecast': color },
! "border_horiz_color": {
'Typecast': color },
! "border_vert_color": {
'Typecast': color },
! "border_size": {
'Typecast': textmeasurement },
! "border_left_size": {
'Typecast': textmeasurement },
! "border_right_size": {
'Typecast': textmeasurement },
! "border_top_size": {
'Typecast': textmeasurement },
! "border_bottom_size": {
'Typecast': textmeasurement },
! "border_horiz_size": {
'Typecast': textmeasurement },
! "border_vert_size": {
'Typecast': textmeasurement }, },
! 'ParentTags': ('reportstyles',) },
}
--- 159,265 ----
'capitalize': {},
'smallcaps': {} },
'Typecast': GTypecast.text },
! "text-color": {
'Typecast': color },
! "text-leading": {
'Typecast': GTypecast.text },
! "text-tracking": {
'Typecast': GTypecast.text },
! "text-indent": {
'Typecast': GTypecast.text },
! "text-justification": {
'ValueSet': {
'left': {},
'right': {},
'center': {},
'justified': {} },
'Typecast': GTypecast.text },
! "word-spacing": {
'Typecast': textmeasurement },
! "line-spacing": {
'Typecast': textmeasurement },
! "background-color": {
'Typecast': color },
! "background-fill": {
'Typecast': GTypecast.text },
"margin": {
'Typecast': textmeasurement },
! "margin-left": {
'Typecast': textmeasurement },
! "margin-right": {
'Typecast': textmeasurement },
! "margin-top": {
'Typecast': textmeasurement },
! "margin-bottom": {
'Typecast': textmeasurement },
"padding": {
'Typecast': textmeasurement },
! "padding-left": {
'Typecast': textmeasurement },
! "padding-right": {
'Typecast': textmeasurement },
! "padding-top": {
'Typecast': textmeasurement },
! "padding-botton": {
'Typecast': textmeasurement },
"border": {
! 'ValueSet': _lineSet(),
'Typecast': GTypecast.text },
! "border-left": {
! 'ValueSet': _lineSet(),
'Typecast': GTypecast.text },
! "border-right": {
! 'ValueSet': _lineSet(),
'Typecast': GTypecast.text },
! "border-top": {
! 'ValueSet': _lineSet(),
'Typecast': GTypecast.text },
! "border-bottom": {
! 'ValueSet': _lineSet(),
'Typecast': GTypecast.text },
! "border-horiz": {
! 'ValueSet': _lineSet(),
'Typecast': GTypecast.text },
! "border-vert": {
! 'ValueSet': _lineSet(),
'Typecast': GTypecast.text },
! "border-color": {
'Typecast': color },
! "border-left-color": {
'Typecast': color },
! "border-right-color": {
'Typecast': color },
! "border-top-color": {
'Typecast': color },
! "border-bottom-color": {
'Typecast': color },
! "border-horiz-color": {
'Typecast': color },
! "border-vert-color": {
'Typecast': color },
! "border-size": {
'Typecast': textmeasurement },
! "border-left-size": {
'Typecast': textmeasurement },
! "border-right-size": {
'Typecast': textmeasurement },
! "border-top-size": {
'Typecast': textmeasurement },
! "border-bottom-size": {
'Typecast': textmeasurement },
! "border-horiz-size": {
'Typecast': textmeasurement },
! "border-vert-size": {
'Typecast': textmeasurement }, },
! 'ParentTags': ('styleset',) },
}
***************
*** 259,265 ****
! _lineSet = {
'none': {},
'dotted': {},
'dashed': {},
--- 286,293 ----
! def _lineSet():
! return {
'none': {},
'dotted': {},
'dashed': {},
***************
*** 269,275 ****
'ridge': {},
'inset': {},
'outset': {},
! }
_marginDef = {
'Typecast': textmeasurement },
--- 297,303 ----
'ridge': {},
'inset': {},
'outset': {},
! }
_marginDef = {
'Typecast': textmeasurement },
Index: gnue-reports/src/adapters/filters/Universal/Base/styles/StyleHandler.py
diff -c
gnue-reports/src/adapters/filters/Universal/Base/styles/StyleHandler.py:1.5
gnue-reports/src/adapters/filters/Universal/Base/styles/StyleHandler.py:1.6
*** gnue-reports/src/adapters/filters/Universal/Base/styles/StyleHandler.py:1.5
Wed Nov 26 16:27:56 2003
--- gnue-reports/src/adapters/filters/Universal/Base/styles/StyleHandler.py
Wed Nov 26 17:11:50 2003
***************
*** 50,53 ****
import gnue.common.apps
s = StyleHandler()
!
s.addDefinition('/home/jason/cvs/gnue/reports/src/adapters/filters/Universal/etc/standard-styles.grs')
--- 50,53 ----
import gnue.common.apps
s = StyleHandler()
! s.addDefinition('../../etc/standard-styles.grs')
Index: gnue-reports/src/adapters/filters/Universal/etc/standard-styles.grs
diff -c gnue-reports/src/adapters/filters/Universal/etc/standard-styles.grs:1.7
gnue-reports/src/adapters/filters/Universal/etc/standard-styles.grs:1.8
*** gnue-reports/src/adapters/filters/Universal/etc/standard-styles.grs:1.7
Wed Nov 26 16:27:56 2003
--- gnue-reports/src/adapters/filters/Universal/etc/standard-styles.grs Wed Nov
26 17:11:50 2003
***************
*** 9,15 ****
font-family="Helvetica,Arial,SanSerif"
font-style="normal"
font-weight="normal"
! font-scale="1"
text-underline="none"
text-underline-color="black"
text-underline-size="auto"
--- 9,16 ----
font-family="Helvetica,Arial,SanSerif"
font-style="normal"
font-weight="normal"
! font-horiz-scale="1"
! font-vert-scale="1"
text-underline="none"
text-underline-color="black"
text-underline-size="auto"
Index:
gnue-reports/src/adapters/filters/Universal/postscript/psutils/FontMetrics.py
diff -c
gnue-reports/src/adapters/filters/Universal/postscript/psutils/FontMetrics.py:1.6
gnue-reports/src/adapters/filters/Universal/postscript/psutils/FontMetrics.py:1.7
***
gnue-reports/src/adapters/filters/Universal/postscript/psutils/FontMetrics.py:1.6
Tue Apr 22 09:42:48 2003
---
gnue-reports/src/adapters/filters/Universal/postscript/psutils/FontMetrics.py
Wed Nov 26 17:11:50 2003
***************
*** 111,115 ****
--- 111,118 ----
if __name__ == '__main__':
+
+ import gnue.common.apps
+
helvetica = FontMetrics('/usr/share/ted/afm/Helvetica.afm')