From dba36da6908c8ad81632a1364c2cfda29f02ee75 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 14 May 2007 17:57:09 +0000
Subject: [PATCH] Fix #67

---
 src/libprs500/lrf/html/convert_from.py | 7 +++----
 src/libprs500/lrf/pylrs/pylrs.py       | 4 ++++
 src/libprs500/lrf/txt/convert_from.py  | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/libprs500/lrf/html/convert_from.py b/src/libprs500/lrf/html/convert_from.py
index b7cbdc00c8..5ed84343bc 100644
--- a/src/libprs500/lrf/html/convert_from.py
+++ b/src/libprs500/lrf/html/convert_from.py
@@ -797,8 +797,8 @@ class HTMLConverter(object):
                     pass
                 
                 def scale_image(width, height):
-                    pt = PersistentTemporaryFile(suffix='.png')
-                    im.resize((int(width), int(height)), PILImage.ANTIALIAS).save(pt, 'PNG')
+                    pt = PersistentTemporaryFile(suffix='.jpeg')
+                    im.resize((int(width), int(height)), PILImage.ANTIALIAS).save(pt, 'JPEG')
                     pt.close()
                     self.scaled_images[path] = pt
                     return pt.name
@@ -1120,8 +1120,7 @@ def parse_options(argv=None, cli=True):
         if cli:
             parser.print_help()
         raise ConversionError, 'no filename specified'
-    if options.title == None:
-        options.title = filename_to_utf8(os.path.splitext(os.path.basename(args[0]))[0])
+    
     return options, args, parser
 
 
diff --git a/src/libprs500/lrf/pylrs/pylrs.py b/src/libprs500/lrf/pylrs/pylrs.py
index 09e06d1b4b..397fd42790 100644
--- a/src/libprs500/lrf/pylrs/pylrs.py
+++ b/src/libprs500/lrf/pylrs/pylrs.py
@@ -258,6 +258,9 @@ class LrsContainer(object):
             for child in self.contents:
                 if child.has_text():
                     return True
+        for item in self.contents:
+            if isinstance(item, Plot):
+                return True
         return False
     
     def append_to(self, parent):
@@ -267,6 +270,7 @@ class LrsContainer(object):
         '''
         if self.has_text():
             parent.append(self)
+            
         
     def appendReferencedObjects(self, parent):
         for c in self.contents:
diff --git a/src/libprs500/lrf/txt/convert_from.py b/src/libprs500/lrf/txt/convert_from.py
index cdebeb09f6..e15b9d6b39 100644
--- a/src/libprs500/lrf/txt/convert_from.py
+++ b/src/libprs500/lrf/txt/convert_from.py
@@ -91,7 +91,7 @@ def convert_txt(path, options):
             block.Paragraph(buffer)            
             buffer = ''
     basename = os.path.basename(path)
-    oname = options.output    
+    oname = options.output
     if not oname:
         oname = os.path.splitext(basename)[0]+('.lrs' if options.lrs else '.lrf')
     oname = os.path.abspath(os.path.expanduser(oname))