More formatting fixes from Chet's suggestions:

1) Indented pdf subtitles correctly.
2) Correct wording for public review drafts
3) Include footnote html files.
4) "approved by VIRTIO" not "members of OASIS"
5) "OASIS Standard" in citation section changed to depend on filename.
6) URL in citation section fixed.
7) Footnotes in HTML version are all consecutively numbered.

Signed-off-by: Rusty Russell <rusty@au1.ibm.com>

git-svn-id: https://tools.oasis-open.org/version-control/svn/virtio@156 0c8fb4dd-22a2-4bb5-bc14-6c75a5f43652

5 files changed, 20 insertions, 11 deletions

diff --git a/commands-pdf.tex b/commands-pdf.tex
index b998d4d..1646adb 100644
--- a/commands-pdf.tex
+++ b/commands-pdf.tex
@@ -64,7 +64,7 @@
 
 \newenvironment{oasistitlesection}[1]
 {
-\begin{tabular}{p{0.4in}p{5.8in}}
+\begin{tabular}{p{0in}p{5.8in}}
 \multicolumn{2}{l}{\fontspec[Color=552681]{Arial}\fontsize{10}{10}\textbf{#1:}}\\[-0.05in]
 &\setlength{\topsep}{0in}\setlength{\parsep}{0in}\setlength{\partopsep}{0in}   }
 {
diff --git a/make-setup-generated.sh b/make-setup-generated.sh
index eedc745..ba3fdd4 100755
--- a/make-setup-generated.sh
+++ b/make-setup-generated.sh
@@ -1,5 +1,11 @@
 #! /bin/sh
 
+VERSION=1.0
+if [ x"$DATESTR" = x ]; then
+    ISODATE=`git show --format=format:'%cd' --date=iso | head -n 1`
+    DATESTR=`date -d "$DATE" +'%d %B %Y'`
+fi
+
 case "$1" in
     *-wd*)
 	STAGE=wd
@@ -20,6 +26,8 @@ case "$1" in
 	STAGE=csprd
 	STAGENAME="Committee Specification Public Review Draft"
 	WORKINGDRAFT=`basename "$1" | sed 's/.*-csprd//'`
+	STAGEEXTRATITLE=" / \newline Public Review Draft $WORKINGDRAFT"
+	STAGEEXTRA=" / Public Review Draft $WORKINGDRAFT"
 	;;
     *-cs*)
 	STAGE=cs
@@ -31,14 +39,13 @@ case "$1" in
 	exit 1
 esac
 
-VERSION=1.0
-ISODATE=`git show --format=format:'%cd' --date=iso | head -n 1`
-DATESTR=`date -d "$DATE" +'%d %b %Y'`
 cat > setup-generated.tex <<EOF
 % define VIRTIO Working Draft number and date
 \newcommand{\virtiorev}{$VERSION}
 \newcommand{\virtioworkingdraftdate}{$DATESTR}
 \newcommand{\virtioworkingdraft}{$WORKINGDRAFT}
 \newcommand{\virtiodraftstage}{$STAGE}
+\newcommand{\virtiodraftstageextra}{$STAGEEXTRA}
+\newcommand{\virtiodraftstageextratitle}{$STAGEEXTRATITLE}
 \newcommand{\virtiodraftstagename}{$STAGENAME}
 EOF
diff --git a/makehtml.sh b/makehtml.sh
index bc720be..c341c4c 100755
--- a/makehtml.sh
+++ b/makehtml.sh
@@ -35,4 +35,4 @@ rm $SPECDOC.tmp*
 #uncomment if you have a broken t4ht
 #cp ./t4ht-workaround/virtio-v1.0-csd01.css $SPECDOC.css
 
-zip $SPECDOC.zip $SPECDOC.html $SPECDOC.css images/*.png
+zip $SPECDOC.zip $SPECDOC*.html $SPECDOC.css images/*.png
diff --git a/title.tex b/title.tex
index 3ff7e0e..8ae5d02 100644
--- a/title.tex
+++ b/title.tex
@@ -7,7 +7,7 @@
 \end{tabular*}
 
 \oasistitle{\virtioversion}
-\oasisstagelabel{\virtiodraftstagename}
+\oasisstagelabel{\virtiodraftstagename\virtiodraftstageextratitle}
 \vspace{0.05in}
 \oasisstagelabel{\virtioworkingdraftdate}
 
@@ -43,7 +43,7 @@ Pawel Moll (\href{mailto:pawel.moll@arm.com}{pawel.moll@arm.com}), \href{https:/
 
 
 \begin{oasistitlesection}{Additional artifacts}
-This prose specification is one component of a Work Product which also includes:
+This prose specification is one component of a Work Product that also includes:
 \begin{itemize*}
 	\item Example Driver Listing: \newline
 	\virtiourllistings
@@ -79,7 +79,8 @@ This specification replaces or supersedes:
 \end{oasistitlesection}
 
 \begin{oasistitlesection}{Status}
-This document was last revised or approved by the members of OASIS on the above date. The level of approval is also listed above. Check the "Latest version" location noted above for possible later revisions of this document.
+This document was last revised or approved by the Virtual I/O Device
+(VIRTIO) TC on the above date. The level of approval is also listed above. Check the "Latest version" location noted above for possible later revisions of this document.
 
 Technical Committee members should send comments on this specification to the Technical Committee’s email list. Others should send comments to the Technical Committee by using the "\href{http://www.oasis-open.org/committees/comments/form.php?wg_abbrev=virtio}{Send A Comment}" button on the Technical Committee’s web page at \url{http://www.oasis-open.org/committees/virtio/}.
 
@@ -91,9 +92,8 @@ For information on whether any patents have been disclosed that may be essential
 When referencing this specification the following citation format should be used:\newline
 
 \textbf{[VIRTIO-v\virtiorev]}\newline
-\textit{\virtioversion}. \virtioworkingdraftdate.\newline OASIS
-Standard.
-\url{\virtiourlbase/\virtiospecfile.html}.
+\textit{\virtioversion}. \virtioworkingdraftdate.\newline \virtiodraftstage \virtiodraftstageextra
+\virtiourlhtml
 \end{oasistitlesection}
 
 \vfill\newpage
diff --git a/virtio-html.tex b/virtio-html.tex
index f0e6581..4971b0a 100644
--- a/virtio-html.tex
+++ b/virtio-html.tex
@@ -31,6 +31,8 @@
 \usepackage{tabularx}
 \usepackage{underscore}
 \usepackage{xstring}
+\usepackage{chngcntr}
+\counterwithout{footnote}{chapter}
 
 \usepackage[utf8x]{inputenc}