Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/docgen/AsciiDoc.py (reformat_para): Add optional argument

Browse Source 
for the first line indent; (start_paragraph): remove leader
handling; (end_paragraph): Handle all formatting, including leader
and first line indent.


svn: r5429
This commit is contained in:
Alex Roitman
2005-11-24 03:25:45 +00:00
parent bf7c2849ae
commit 499da39245
2 changed files with 59 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -9,6 +9,10 @@
tmargin and bmargin (when reading older style files). tmargin and bmargin (when reading older style files).
* src/docgen/PSDrawDoc.py (encode): Add tolerant encoder; * src/docgen/PSDrawDoc.py (encode): Add tolerant encoder;
(patch_text): Remove unused method. (patch_text): Remove unused method.
* src/docgen/AsciiDoc.py (reformat_para): Add optional argument
for the first line indent; (start_paragraph): remove leader
handling; (end_paragraph): Handle all formatting, including leader
and first line indent.
2005-11-22 Don Allingham <don@gramps-project.org> 2005-11-22 Don Allingham <don@gramps-project.org>
* src/docgen/AbiWord2Doc.py: fix spacing for top and bottom margin * src/docgen/AbiWord2Doc.py: fix spacing for top and bottom margin

91
gramps2/src/docgen/AsciiDoc.py
View File

@ -38,6 +38,11 @@ import PluginMgr
import Errors import Errors
import GrampsMime import GrampsMime
#------------------------------------------------------------------------
#
# Constants
#
#------------------------------------------------------------------------
LEFT,RIGHT,CENTER = 'LEFT','RIGHT','CENTER' LEFT,RIGHT,CENTER = 'LEFT','RIGHT','CENTER'
_WIDTH_IN_CHARS = 72 _WIDTH_IN_CHARS = 72
@ -48,9 +53,11 @@ _WIDTH_IN_CHARS = 72
# #
# Modified by Alex Roitman: right-pad with spaces, if right_pad==1; # Modified by Alex Roitman: right-pad with spaces, if right_pad==1;
# return empty string if no text was given # return empty string if no text was given
# Another argument: "first" is the first line indent in characters
# _relative_ to the "left" margin. It can be negative!
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
def reformat_para(para='',left=0,right=72,just=LEFT,right_pad=0): def reformat_para(para='',left=0,right=72,just=LEFT,right_pad=0,first=0):
if not para.strip(): if not para.strip():
return "\n" return "\n"
words = para.split() words = para.split()
@ -58,26 +65,37 @@ def reformat_para(para='',left=0,right=72,just=LEFT,right_pad=0):
line = '' line = ''
word = 0 word = 0
end_words = 0 end_words = 0
real_left = left+first
while not end_words: while not end_words:
if len(words[word]) > right-left: # Handle very long words if len(words[word]) > right-real_left: # Handle very long words
line = words[word] line = words[word]
word +=1 word +=1
if word >= len(words): if word >= len(words):
end_words = 1 end_words = 1
else: # Compose line of words else: # Compose line of words
while len(line)+len(words[word]) <= right-left: while len(line)+len(words[word]) <= right-real_left:
line += words[word]+' ' line += words[word]+' '
word += 1 word += 1
if word >= len(words): if word >= len(words):
end_words = 1 end_words = 1
break break
lines.append(line) lines.append(line)
real_left = left
line = '' line = ''
if just==CENTER: if just==CENTER:
if right_pad: if right_pad:
return '\n'.join([' '*left+ln.center(right-left) for ln in lines]) return '\n'.join(
[' '*(left+first) + ln.center(right-left-first)
for ln in lines[0:1] ] +
[ ' '*left + ln.center(right-left) for ln in lines[1:] ]
)
else: else:
return '\n'.join([' '*left+ln.center(right-left).rstrip() for ln in lines]) return '\n'.join(
[' '*(left+first) + ln.center(right-left-first).rstrip()
for ln in lines[0:1] ] +
[' '*left + ln.center(right-left).rstrip()
for ln in lines[1:] ]
)
elif just==RIGHT: elif just==RIGHT:
if right_pad: if right_pad:
return '\n'.join([line.rjust(right) for line in lines]) return '\n'.join([line.rjust(right) for line in lines])
@ -85,9 +103,16 @@ def reformat_para(para='',left=0,right=72,just=LEFT,right_pad=0):
return '\n'.join([line.rjust(right).rstrip() for line in lines]) return '\n'.join([line.rjust(right).rstrip() for line in lines])
else: # left justify else: # left justify
if right_pad: if right_pad:
return '\n'.join([' '*left+line.ljust(right-left) for line in lines]) return '\n'.join(
[' '*(left+first) + line.ljust(right-left-first)
for line in lines[0:1] ] +
[' '*left + line.ljust(right-left) for line in lines[1:] ]
)
else: else:
return '\n'.join([' '*left+line for line in lines]) return '\n'.join(
[' '*(left+first) + line for line in lines[0:1] ] +
[' '*left + line for line in lines[1:] ]
)
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
@ -173,26 +198,7 @@ class AsciiDoc(BaseDoc.BaseDoc):
#-------------------------------------------------------------------- #--------------------------------------------------------------------
def start_paragraph(self,style_name,leader=None): def start_paragraph(self,style_name,leader=None):
self.p = self.style_list[style_name] self.p = self.style_list[style_name]
i = int(abs(self.p.get_first_indent())*4)
self.leader = leader self.leader = leader
this_text = ''
if leader:
if i:
ln = max(i,len(leader))
t = leader + ' '*ln
this_text = t[0:ln]
else:
this_text = leader
elif i:
this_text = ' '*i
if self.in_cell:
self.cellpars[self.cellnum] = self.cellpars[self.cellnum] + this_text
else:
self.f.write(this_text)
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# #
@ -214,11 +220,13 @@ class AsciiDoc(BaseDoc.BaseDoc):
else: else:
right = self.get_usable_width() right = self.get_usable_width()
margin = 0 # Compute indents in characters. Keep first_indent relative!
regular_indent = 0
first_indent = 0
if self.p.get_left_margin(): if self.p.get_left_margin():
margin = int(4*self.p.get_left_margin()) regular_indent = int(4*self.p.get_left_margin())
if self.p.get_first_indent():
i = int(abs(self.p.get_first_indent())*4) first_indent = int(4*self.p.get_first_indent())
if self.in_cell and self.cellnum < self.ncols - 1: if self.in_cell and self.cellnum < self.ncols - 1:
right_pad = 1 right_pad = 1
@ -226,17 +234,28 @@ class AsciiDoc(BaseDoc.BaseDoc):
else: else:
right_pad = 0 right_pad = 0
the_pad = '' the_pad = ''
t = reformat_para(self.text,margin,right,fmt,right_pad)
if i and self.leader: # Depending on the leader's presence, treat the first line differently
this_text = t[i:] if self.leader:
# If we have a leader then we need to reformat the text
# as if there's no special treatment for the first line.
# Then add leader and eat up the beginning of the first line pad.
start_at = regular_indent + min(len(self.leader)+first_indent,0)
this_text = reformat_para(self.text,regular_indent,right,fmt,
right_pad)
this_text = ' '*(regular_indent+first_indent) + \
self.leader + this_text[start_at:]
else: else:
this_text = t # If no leader then reformat the text according to the first
# line indent, as specified by style.
this_text = reformat_para(self.text,regular_indent,right,fmt,
right_pad,first_indent)
this_text = this_text + '\n' + the_pad + '\n' this_text += '\n' + the_pad + '\n'
if self.in_cell: if self.in_cell:
self.cellpars[self.cellnum] = self.cellpars[self.cellnum] + this_text self.cellpars[self.cellnum] = self.cellpars[self.cellnum] + \
this_text
else: else:
self.f.write(this_text) self.f.write(this_text)