Merge branch 'upstream' into debian/sid

1 files changed, 54 insertions, 4 deletions

diff --git a/lib/sisu/v0/manifest.rb b/lib/sisu/v0/manifest.rb
index 4861097e..6bdfdae4 100644
--- a/lib/sisu/v0/manifest.rb
+++ b/lib/sisu/v0/manifest.rb
@@ -182,14 +182,64 @@ module SiSU_Manifest
           id,file='HTML, full length document',@md.fn[:doc]
           summarize(id,file,img)
         end
-        if FileTest.file?("#@base_path/#{@md.fn[:pdf_p]}")==true
+        #if FileTest.file?("#@base_path/#{@md.fn[:pdf_p]}")==true
+        #  img='<img border="0" height="18" width="15" src="../_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> '
+        #  id,file="full length document (PDF portrait&nbsp;/ vertical - recommended for printing), size #{@md.papersize_array[0]}",@md.fn[:pdf_p]
+        #  summarize(id,file,img)
+        #end
+        #if FileTest.file?("#@base_path/#{@md.fn[:pdf_l]}")==true
+        #  img='<img border="0" height="15" width="18" src="../_sisu/image_sys/b_pdf.png" alt="PDF landscape" /> '
+        #  id,file="full length document (PDF landscape&nbsp;/ horizontal - recommended for screen viewing), size #{@md.papersize_array[0]}",@md.fn[:pdf_l]
+        #  summarize(id,file,img)
+        #end
+        if FileTest.file?("#@base_path/#{@md.fn[:pdf_p_letter]}")==true
           img='<img border="0" height="18" width="15" src="../_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> '
-          id,file='PDF document portrait/vertical (recommended for printing)',@md.fn[:pdf_p]
+          id,file="PDF, U.S. letter size, portrait/vertical document (recommended for printing)",@md.fn[:pdf_p_letter]
           summarize(id,file,img)
         end
-        if FileTest.file?("#@base_path/#{@md.fn[:pdf_l]}")==true
+        if FileTest.file?("#@base_path/#{@md.fn[:pdf_l_letter]}")==true
           img='<img border="0" height="15" width="18" src="../_sisu/image_sys/b_pdf.png" alt="PDF landscape" /> '
-          id,file='PDF document landscape/horizontal (recommended for screen viewing)',@md.fn[:pdf_l]
+          id,file="PDF, U.S. letter size, landscape/horizontal document (recommended for screen viewing)",@md.fn[:pdf_l_letter]
+          summarize(id,file,img)
+        end
+        if FileTest.file?("#@base_path/#{@md.fn[:pdf_p_a4]}")==true
+          img='<img border="0" height="18" width="15" src="../_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> '
+          id,file="PDF, A4 size, portrait/vertical document (recommended for printing)",@md.fn[:pdf_p_a4]
+          summarize(id,file,img)
+        end
+        if FileTest.file?("#@base_path/#{@md.fn[:pdf_l_a4]}")==true
+          img='<img border="0" height="15" width="18" src="../_sisu/image_sys/b_pdf.png" alt="PDF landscape" /> '
+          id,file="PDF, A4 size, landscape/horizontal document (recommended for screen viewing)",@md.fn[:pdf_l_a4]
+          summarize(id,file,img)
+        end
+        if FileTest.file?("#@base_path/#{@md.fn[:pdf_p_a5]}")==true
+          img='<img border="0" height="18" width="15" src="../_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> '
+          id,file="PDF, A5 (book) size, portrait/vertical document (recommended for printing)",@md.fn[:pdf_p_a5]
+          summarize(id,file,img)
+        end
+        if FileTest.file?("#@base_path/#{@md.fn[:pdf_l_a5]}")==true
+          img='<img border="0" height="15" width="18" src="../_sisu/image_sys/b_pdf.png" alt="PDF landscape" /> '
+          id,file="PDF, A5 (book) size, landscape/horizontal document (recommended for screen viewing)",@md.fn[:pdf_l_a5]
+          summarize(id,file,img)
+        end
+        if FileTest.file?("#@base_path/#{@md.fn[:pdf_p_b5]}")==true
+          img='<img border="0" height="18" width="15" src="../_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> '
+          id,file="PDF, B5 (book) size, portrait/vertical document (recommended for printing)",@md.fn[:pdf_p_b5]
+          summarize(id,file,img)
+        end
+        if FileTest.file?("#@base_path/#{@md.fn[:pdf_l_b5]}")==true
+          img='<img border="0" height="15" width="18" src="../_sisu/image_sys/b_pdf.png" alt="PDF landscape" /> '
+          id,file="PDF, B5 (book) size, landscape/horizontal document (recommended for screen viewing)",@md.fn[:pdf_l_b5]
+          summarize(id,file,img)
+        end
+        if FileTest.file?("#@base_path/#{@md.fn[:pdf_p_legal]}")==true
+          img='<img border="0" height="18" width="15" src="../_sisu/image_sys/b_pdf.png" alt="PDF portrait" /> '
+          id,file="PDF, U.S. legal size, portrait/vertical document (recommended for printing)",@md.fn[:pdf_p_legal]
+          summarize(id,file,img)
+        end
+        if FileTest.file?("#@base_path/#{@md.fn[:pdf_l_legal]}")==true
+          img='<img border="0" height="15" width="18" src="../_sisu/image_sys/b_pdf.png" alt="PDF landscape" /> '
+          id,file="PDF, U.S. legal size, landscape/horizontal document (recommended for screen viewing)",@md.fn[:pdf_l_legal]
           summarize(id,file,img)
         end
         if FileTest.file?("#@base_path/#{@md.fn[:odf]}")==true