diff --git a/src/libprs500/lrf/html/convert_from.py b/src/libprs500/lrf/html/convert_from.py index 74d1240c37..60baed193c 100644 --- a/src/libprs500/lrf/html/convert_from.py +++ b/src/libprs500/lrf/html/convert_from.py @@ -415,7 +415,7 @@ class HTMLConverter(object): if not self.top.parent: if not previous: - self.top = self.book.pages()[0].contents[0] + self.top = self.book.pages()[0].contents[0] else: found = False for page in self.book.pages(): @@ -427,6 +427,7 @@ class HTMLConverter(object): break if not self.top.parent: raise ConversionError, 'Could not parse ' + self.file_name + diff --git a/src/libprs500/lrf/pylrs/pylrs.py b/src/libprs500/lrf/pylrs/pylrs.py index d456406c53..09e06d1b4b 100644 --- a/src/libprs500/lrf/pylrs/pylrs.py +++ b/src/libprs500/lrf/pylrs/pylrs.py @@ -632,8 +632,8 @@ class TableOfContents(object): def addTocEntry(self, tocLabel, textBlock): - if not isinstance(textBlock, (TextBlock, ImageBlock)): - raise LrsError, "TOC destination must be a TextBlock or ImageBlock"+\ + if not isinstance(textBlock, (TextBlock, ImageBlock, RuledLine)): + raise LrsError, "TOC destination must be a TextBlock, ImageBlock or RuledLine"+\ " not a " + str(type(textBlock)) if textBlock.parent is None or not isinstance(textBlock.parent, Page): @@ -1968,7 +1968,7 @@ class JumpButton(LrsObject, LrsContainer): -class RuledLine(LrsContainer, LrsAttributes): +class RuledLine(LrsContainer, LrsAttributes, LrsObject): """ A line. Default is 500 pixels long, 2 pixels wide. """ defaults = dict( @@ -1978,6 +1978,7 @@ class RuledLine(LrsContainer, LrsAttributes): def __init__(self, **settings): LrsContainer.__init__(self, []) LrsAttributes.__init__(self, self.defaults, **settings) + LrsObject.__init__(self) def toLrfContainer(self, lrfWriter, container):