doc: version number in cover.html + updates in coq.inria.fr style

author: Pierre Letouzey <pierre.letouzey@inria.fr> 2014-11-07 18:39:55 +0100
committer: Pierre Letouzey <pierre.letouzey@inria.fr> 2014-11-07 19:04:53 +0100
commit: 044a44f1a877764b13418b8865adff76cf0c6f93 (patch)
tree: bd496fab794f9272e6433f9974ff8bc29b151939
parent: c32728e7bf0ba0449b60ea49df7f92fb6b70923d (diff)
4 files changed, 68 insertions, 91 deletions
diff --git a/Makefile.doc b/Makefile.doc
index 59382b9de..7b8ade09e 100644
--- a/Makefile.doc
+++ b/Makefile.doc
@@ -116,7 +116,7 @@ doc/refman/Reference-Manual.html: doc/refman/styles.hva doc/refman/headers.hva d
 	(cd doc/refman; BIBINPUTS=.: $(HEVEA) $(HEVEAOPTS) ./styles.hva ./Reference-Manual.tex)
 
 doc/refman/cover.html: doc/common/styles/html/$(HTMLSTYLE)/cover.html
-	$(INSTALLLIB) $< doc/refman
+	sed -e "s/COQVERSION/$(VERSION)/g" $< > $@
 
 doc/refman/styles.hva: doc/common/styles/html/$(HTMLSTYLE)/styles.hva
 	$(INSTALLLIB) $< doc/refman
diff --git a/doc/common/styles/html/coqremote/cover.html b/doc/common/styles/html/coqremote/cover.html
index 8f3ca8fc6..790806311 100644
--- a/doc/common/styles/html/coqremote/cover.html
+++ b/doc/common/styles/html/coqremote/cover.html
@@ -1,50 +1,43 @@
-<HTML>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 
-<HEAD>
-<TITLE>Cover Page</TITLE>
+<head>
 
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Reference Manual | The Coq Proof Assistant</title>
-
-<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
-<style type="text/css" media="all">@import "http://coq.inria.fr/modules/node/node.css";</style>
-
-<style type="text/css" media="all">@import "http://coq.inria.fr/modules/system/defaults.css";</style>
-
-<style type="text/css" media="all">@import "http://coq.inria.fr/modules/system/system.css";</style>
-<style type="text/css" media="all">@import "http://coq.inria.fr/modules/user/user.css";</style>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+<style type="text/css" media="all">@import "/modules/node/node.css";</style>
+<style type="text/css" media="all">@import "/modules/system/defaults.css";</style>
+<style type="text/css" media="all">@import "/modules/system/system.css";</style>
+<style type="text/css" media="all">@import "/modules/user/user.css";</style>
+<style type="text/css" media="all">@import "/sites/all/themes/coq/style.css";</style>
+<style type="text/css" media="all">@import "/sites/all/themes/coq/coqdoc.css";</style>
 
-<style type="text/css" media="all">@import "http://coq.inria.fr/sites/all/themes/coq/style.css";</style>
-<style type="text/css" media="all">@import "http://coq.inria.fr/sites/all/themes/coq/coqdoc.css";</style>
+<title>Reference Manual | The Coq Proof Assistant</title>
 
-</HEAD>
+</head>
 
-<BODY>
+<body>
 
 <div id="container">
+
 <div id="headertop">
 <div id="nav">
-
   <ul class="links-menu">
-    <li><a href="http://coq.inria.fr/" class="active">Home</a></li>
-
-    <li><a href="http://coq.inria.fr/about-coq" title="More about coq">About Coq</a></li>    
-    <li><a href="http://coq.inria.fr/download">Get Coq</a></li>
-    <li><a href="http://coq.inria.fr/documentation">Documentation</a></li>
-    <li><a href="http://coq.inria.fr/community">Community</a></li>
+    <li><a href="/" class="active">Home</a></li>
+    <li><a href="/about-coq" title="More about coq">About Coq</a></li>
+    <li><a href="/download">Get Coq</a></li>
+    <li><a href="/documentation">Documentation</a></li>
+    <li><a href="/community">Community</a></li>
   </ul>
 </div>
 </div>
 
 <div id="header">
-
 <div id="logoWrapper">
-
-<div id="logo"><a href="http://coq.inria.fr/" title="Home"><img src="http://coq.inria.fr/files/barron_logo.png" alt="Home" /></a>
-</div>
-<div id="siteName"><a href="http://coq.inria.fr/" title="Home">The Coq Proof Assistant</a>
-</div>
-
+  <div id="logo"><a href="/" title="Home"><img src="/files/barron_logo.png" alt="Home" /></a>
+  </div>
+  <div id="siteName"><a href="/" title="Home">The Coq Proof Assistant</a>
+  </div>
 </div>
 </div>
 
@@ -52,9 +45,9 @@
 
 <br/><br/><br/><br/>
 <h1 style="text-align: center; font-weight:bold; font-size: 300%; line-height: 2ex">Reference Manual</h1>
-  
+
 <h2 style="text-align:center; font-size: 120%">
-  Version trunk<a name="text1"></a><a href="#note1"><SUP><span style="font-size: 80%">1</span></SUP></a>
+  Version COQVERSION<a name="text1"></a><a href="#note1"><sup><span style="font-size: 80%">1</span></sup></a>
 
 <br/><br/><br/><br/><br/><br/>
 <span style="text-align: center; font-size: 120%; ">The Coq Development Team</span>
@@ -68,7 +61,7 @@
   <li>V8.1 © INRIA 2006-2011</li>
   <li>V8.2 © INRIA 2008-2011</li>
   <li>V8.3 © INRIA 2010-2011</li>
-  <li>V8.4 © INRIA 2011</li>
+  <li>V8.4 © INRIA 2012-2014</li>
 </ul>
 
 <p style="text-indent: 0pt">This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, v1.0 or later (the latest version is presently available at <a href="http://www.opencontent.org/openpub">http://www.opencontent.org/openpub</a>). Options A and B are not elected.</p>
@@ -121,7 +114,7 @@
 <div id="footer">
 <div id="nav-footer">
   <ul class="links-menu-footer">
-    <li><a href="mailto:www-coq at lix.polytechnique.fr">webmaster</a></li>
+    <li><a href="mailto:coq-www_@_inria.fr">webmaster</a></li>
     <li><a href="http://validator.w3.org/check?uri=referer">xhtml valid</a></li>
     <li><a href="http://jigsaw.w3.org/css-validator/check/referer">CSS valid</a></li>
   </ul>
diff --git a/doc/common/styles/html/coqremote/styles.hva b/doc/common/styles/html/coqremote/styles.hva
index 82f186816..c5d37c0f4 100644
--- a/doc/common/styles/html/coqremote/styles.hva
+++ b/doc/common/styles/html/coqremote/styles.hva
@@ -1,45 +1,39 @@
 \renewcommand{\@meta}{
 \begin{rawhtml}
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-
-<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
-<style type="text/css" media="all">@import "http://coq.inria.fr/modules/node/node.css";</style>
-
-<style type="text/css" media="all">@import "http://coq.inria.fr/modules/system/defaults.css";</style>
-<style type="text/css" media="all">@import "http://coq.inria.fr/modules/system/system.css";</style>
-<style type="text/css" media="all">@import "http://coq.inria.fr/modules/user/user.css";</style>
-
-<style type="text/css" media="all">@import "http://coq.inria.fr/sites/all/themes/coq/style.css";</style>
-<style type="text/css" media="all">@import "http://coq.inria.fr/sites/all/themes/coq/coqdoc.css";</style>
-<style type="text/css" media="all">@import "http://coq.inria.fr/sites/all/themes/coq/hevea.css";</style>
+<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
+<style type="text/css" media="all">@import "/modules/node/node.css";</style>
+<style type="text/css" media="all">@import "/modules/system/defaults.css";</style>
+<style type="text/css" media="all">@import "/modules/system/system.css";</style>
+<style type="text/css" media="all">@import "/modules/user/user.css";</style>
+<style type="text/css" media="all">@import "/sites/all/themes/coq/style.css";</style>
+<style type="text/css" media="all">@import "/sites/all/themes/coq/coqdoc.css";</style>
+<style type="text/css" media="all">@import "/sites/all/themes/coq/hevea.css";</style>
 \end{rawhtml}}
 
 % for HeVeA
 
 \htmlhead{\begin{rawhtml}
 <div id="container">
+
 <div id="headertop">
 <div id="nav">
   <ul class="links-menu">
-    <li><a href="http://coq.inria.fr/" class="active">Home</a></li>
-
-    <li><a href="http://coq.inria.fr/about-coq" title="More about coq">About Coq</a></li>    
-    <li><a href="http://coq.inria.fr/download">Get Coq</a></li>
-    <li><a href="http://coq.inria.fr/documentation">Documentation</a></li>
-    <li><a href="http://coq.inria.fr/community">Community</a></li>
+    <li><a href="/" class="active">Home</a></li>
+    <li><a href="/about-coq" title="More about coq">About Coq</a></li>
+    <li><a href="/download">Get Coq</a></li>
+    <li><a href="/documentation">Documentation</a></li>
+    <li><a href="/community">Community</a></li>
   </ul>
 </div>
 </div>
 
 <div id="header">
-
 <div id="logoWrapper">
-
-<div id="logo"><a href="http://coq.inria.fr/" title="Home"><img src="http://coq.inria.fr/files/barron_logo.png" alt="Home" /></a>
-</div>
-<div id="siteName"><a href="http://coq.inria.fr/" title="Home">The Coq Proof Assistant</a>
-</div>
-
+  <div id="logo"><a href="/" title="Home"><img src="/files/barron_logo.png" alt="Home" /></a>
+  </div>
+  <div id="siteName"><a href="/" title="Home">The Coq Proof Assistant</a>
+  </div>
 </div>
 </div>
 
@@ -49,34 +43,25 @@
 
 \htmlfoot{\begin{rawhtml}
 <div id="sidebarWrapper">
-<div id="sidebar">
-
-<div class="block">
-<h2 class="title">Navigation</h2>
-<div class="content">
-
-<ul class="menu">
-
-<li class="leaf"><a href="index.html">Cover</a></li>
-<li class="leaf"><a href="toc.html">Table of contents</a></li>
-<li class="leaf">Index
-  <ul class="menu">
-  <li><a href="general-index.html">General</a></li>
-  <li><a href="command-index.html">Commands</a></li>
-  <li><a href="tactic-index.html">Tactics</a></li>
-  <li><a href="error-index.html">Errors</a></li>
-  </ul>
-</li>
-
-</ul>
-
-</div>
-</div>
-
-</div>
-</div>
-
-
+  <div id="sidebar">
+    <div class="block">
+      <h2 class="title">Navigation</h2>
+      <div class="content">
+        <ul class="menu">
+          <li class="leaf"><a href="index.html">Cover</a></li>
+          <li class="leaf"><a href="toc.html">Table of contents</a></li>
+          <li class="leaf">Index
+            <ul class="menu">
+              <li><a href="general-index.html">General</a></li>
+              <li><a href="command-index.html">Commands</a></li>
+              <li><a href="tactic-index.html">Tactics</a></li>
+              <li><a href="error-index.html">Errors</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
 </div>
 
 </div>
@@ -84,7 +69,7 @@
 <div id="footer">
 <div id="nav-footer">
   <ul class="links-menu-footer">
-    <li><a href="mailto:www-coq at lix.polytechnique.fr">webmaster</a></li>
+    <li><a href="mailto:coq-www_@_inria.fr">webmaster</a></li>
     <li><a href="http://validator.w3.org/check?uri=referer">xhtml valid</a></li>
     <li><a href="http://jigsaw.w3.org/css-validator/check/referer">CSS valid</a></li>
   </ul>
@@ -94,4 +79,3 @@
 
 </div>
 \end{rawhtml}}
-
diff --git a/doc/common/styles/html/simple/cover.html b/doc/common/styles/html/simple/cover.html
index 731ae9311..f5da36c2d 100644
--- a/doc/common/styles/html/simple/cover.html
+++ b/doc/common/styles/html/simple/cover.html
@@ -25,7 +25,7 @@
 <h1 style="font-weight:bold; font-size: 300%; line-height: 2ex">Reference Manual</h1>
 
 <h2 style="font-size: 120%">
-  Version 8.4<a name="text1"></a><a href="#note1"><sup><span style="font-size: 80%">1</span></sup></a></h2>
+  Version COQVERSION<a name="text1"></a><a href="#note1"><sup><span style="font-size: 80%">1</span></sup></a></h2>
 
 <br/><br/><br/><br/><br/><br/>
 <p><span style="text-align: center; font-size: 120%; ">The Coq Development Team</span></p>
@@ -39,7 +39,7 @@
   <li>V8.1 © INRIA 2006-2011</li>
   <li>V8.2 © INRIA 2008-2011</li>
   <li>V8.3 © INRIA 2010-2011</li>
-  <li>V8.4 © INRIA 2011</li>
+  <li>V8.4 © INRIA 2012-2014</li>
 </ul>
 
 <p style="text-indent: 0pt">This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, v1.0 or later (the latest version is presently available at <a href="http://www.opencontent.org/openpub">http://www.opencontent.org/openpub</a>). Options A and B are not elected.</p>
author	Pierre Letouzey <pierre.letouzey@inria.fr>	2014-11-07 18:39:55 +0100
committer	Pierre Letouzey <pierre.letouzey@inria.fr>	2014-11-07 19:04:53 +0100
commit	044a44f1a877764b13418b8865adff76cf0c6f93 (patch)
tree	bd496fab794f9272e6433f9974ff8bc29b151939
parent	c32728e7bf0ba0449b60ea49df7f92fb6b70923d (diff)