correct version, header and main are back

1 year ago · 71e38fc768
parent 25a7a537bd
commit 71e38fc768
4 changed files with 9 additions and 7 deletions
--- a/g2e.awk
+++ b/g2e.awk
@ -116,7 +116,7 @@ ARGIND==2 && FNR==1{
 		if(id~meta["cover"]){
 			properties = "properties=\"cover-image\""
 		}
-		content = content "    <item id=\"" id "\" href=\"" dest "\" media-type=\"" mediatype "\" " properties "/>\n"
+		content = content "    <item id=\"" id "\" href=\"" dest "\" " properties " media-type=\"" mediatype "\"/>\n"
 	}
 	$0 = line

@ -137,7 +137,7 @@ function finishfile(){
 	# finish writing the previous content file
 	if(is_list){ append("</ul>"); is_list = 0 }
 	if(is_pre){ append("</pre>"); is_pre = 0 }
-	out = out "  </body>\n</html>"
+	out = out "    </main>\n  </body>\n</html>"
 	print out > nameout
 }
 function append(line){
--- a/templates/content-header.opf
+++ b/templates/content-header.opf
@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package version="2.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId">
+<package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId">

  <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
    <dc:title>{title}</dc:title>
--- a/templates/header.xhtml
+++ b/templates/header.xhtml
@ -1,10 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<?xml version="1.0" encoding="utf-8"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" lang="en-US" xml:lang="en-US">
  <head>
    <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
    <title>{title}</title>
    <link rel="stylesheet" href="../style.css" type="text/css" />
  </head>
  <body>
+    <header>
 	<h1 class="header">{title}</h1>
+    </header>
+    <main>
--- a/templates/style.css
+++ b/templates/style.css
@ -15,7 +15,7 @@ pre{
 blockquote{
 font-style: italic;
 }
-h1.header{
+header h1{
 font-size:3em;
 }
 h1,h2,h3{