Fixed p tags on either side of divs holding audio links

turnermm · Aug 26, 2018 · f448f19 · f448f19
1 parent a6a3c22
commit f448f19
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/renderer.php b/renderer.php
@@ -121,18 +121,18 @@ function _media ($src, $title=NULL, $align=NULL, $width=NULL,
 				$out .= $this->set_image($src,$width,$height,$align);           
 			}
             else if(strpos($mtype[1],'audio') !== false)       {	             
-				if($this->audio_link)  $out .= '<div style="text-align:center">' ;
+				if($this->audio_link)  $out .= '</p><div style="text-align:center">' ;
                $out .= $this->set_audio($src,$mtype,$title) ;   
                 if($this->audio_link) {  // set audio footnote
                  list($title,$rest) = explode('(', $title);
                      $mpfile = str_replace('Audio/',"",$src);                            
                          $display_name = $title;
                          $title = $mpfile;                     
-                     $out .=  $this->_formatLink( array('class'=>'media mediafile mf_mp3','title'=>$title,'name'=>$title, 'display'=>$display_name) )  ."\n</div>";             
+                     $out .=  $this->_formatLink( array('class'=>'media mediafile mf_mp3','title'=>$title,'name'=>$title, 'display'=>$display_name) )  ."\n</div><p>";             
 			    }
 			}
          else if(strpos($mtype[1],'video') !== false)       {	
-                     if($this->video_link)  $out .= '<div style="text-align:center">' ;$out .= '<div style="text-align:center">' ;         
+                     if($this->video_link)  $out .= '<div style="text-align:center">' ;//$out .= '<div style="text-align:center">' ;         
                 $out .= $this->set_video($src,$mtype,$title) ;   
                     if($this->video_link) {
                           list($title,$rest) = explode('(', $title);

diff --git a/scripts/epub_utils.php b/scripts/epub_utils.php
@@ -59,8 +59,9 @@ function epub_opf_header($user_title) {
 			flush();
 
         $ncx=<<<NCX
-<!DOCTYPE ncx PUBLIC '-//NISO//DTD ncx 2005-1//EN' 'http://www.daisy.org/z3986/2005/ncx-2005-1.dtd'>
-<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1" xml:lang="en">
+ <?xml version="1.0" encoding="utf-8" ?>      
+<!DOCTYPE ncx PUBLIC "-//NISO//DTD ncx 2005-1//EN"
+ "http://www.daisy.org/z3986/2005/ncx-2005-1.dtd"><ncx version="2005-1" xml:lang="en" xmlns="http://www.daisy.org/z3986/2005/ncx/"> 
   <head>    
      <meta content="$url" name="dtb:uid"/>
     <meta content="1" name="dtb:depth"/>