Better handling of CONC lines.

svn: r652
This commit is contained in:
Don Allingham 2001-12-22 17:06:26 +00:00
parent ebae09cda8
commit 2f42e62ad6
2 changed files with 1117 additions and 1031 deletions

View File

@ -850,12 +850,12 @@ class GedcomWriter:
while ll > 0: while ll > 0:
brkpt = 70 brkpt = 70
if ll > brkpt: if ll > brkpt:
while (ll > brkpt and \ while (ll > brkpt and line[brkpt] in string.whitespace):
(line[brkpt] in string.whitespace or line[brkpt+1] in string.whitespace)):
brkpt = brkpt+1 brkpt = brkpt+1
if ll == brkpt: if ll == brkpt:
self.g.write("%s %s\n" % (prefix,line)) self.g.write("%s %s\n" % (prefix,line))
line = '' line = ''
break
else: else:
self.g.write("%s %s\n" % (prefix,line[0:brkpt+1])) self.g.write("%s %s\n" % (prefix,line[0:brkpt+1]))
line = line[brkpt+1:] line = line[brkpt+1:]
@ -884,6 +884,7 @@ class GedcomWriter:
if ll == brkpt: if ll == brkpt:
self.g.write("%s %s\n" % (prefix,line)) self.g.write("%s %s\n" % (prefix,line))
line = '' line = ''
break
else: else:
self.g.write("%s %s\n" % (prefix,line[0:brkpt+1])) self.g.write("%s %s\n" % (prefix,line[0:brkpt+1]))
line = line[brkpt+1:] line = line[brkpt+1:]
@ -999,7 +1000,6 @@ class GedcomWriter:
if ref_text != "": if ref_text != "":
self.write_long_text("TEXT",level+2,ref_text) self.write_long_text("TEXT",level+2,ref_text)
pfx = "%d DATE" % (level+2) pfx = "%d DATE" % (level+2)
print pfx,ref.getDate()
self.print_date(pfx,ref.getDate()) self.print_date(pfx,ref.getDate())
if ref.getComments() != "": if ref.getComments() != "":
self.write_long_text("NOTE",level+1,ref.getComments()) self.write_long_text("NOTE",level+1,ref.getComments())

File diff suppressed because it is too large Load Diff