Add official channel ordering/location for 6.1/7.1 surround.

svn path=/trunk/vorbis/; revision=16781

Author: Monty

doc/04-codec.tex

@@ -606,10 +606,12 @@ \subsubsection{output channel order}
 
 Vorbis I specifies only a channel mapping type 0.  In mapping type 0,
 channel mapping is implicitly defined as follows for standard audio
-applications:
+applications. As of revision 16781 (20100113), the specification adds
+defined channel locations for 6.1 and 7.1 surround.  Ordering/location
+for greater-than-eight channels remains 'left to the implementation'.
 
 \begin{description} %[style=nextline]
- \item[three channels]
+ \item[one channel]
 	the stream is monophonic
 
 \item[two channels]
@@ -625,13 +627,22 @@ \subsubsection{output channel order}
 
 \item[five channels]
 	the stream is five-channel surround.  channel order: front left,
-front center, front right, rear left, rear right
+center, front right, surround rear left, surround rear right
 
 \item[six channels]
-	the stream is 5.1 surround.  channel order: front left, front
-center, front right, rear left, rear right, LFE
+	the stream is 5.1 surround.  channel order: front left, center, 
+front right, surround rear left, surround rear right, LFE
 
-\item[greater than six channels]
+\item[seven channels]
+        the stream is 6.1 surround.  channel order: front left, center, 
+front right, surround left, surround right, surround (center) rear, LFE
+
+\item[eight channels]
+        the stream is 7.1 surround.  channel order: front left, center, 
+front right, surround left, surround right, surround rear left, surround rear right, 
+LFE
+
+\item[greater than eight channels]
 	channel use and order is defined by the application
 
 \end{description}

doc/Vorbis_I_spec.css

@@ -34,6 +34,9 @@ td center { margin-top:0em; margin-bottom:0em; }
 .Canvas { position:relative; }
 img.math{vertical-align:middle;}
 li p.indent { text-indent: 0em }
+li p:first-child{ margin-top:0em; }
+li p:last-child, li div:last-child { margin-bottom:0.5em; }
+li p~ul:last-child, li p~ol:last-child{ margin-bottom:0.5em; }
 .enumerate1 {list-style-type:decimal;}
 .enumerate2 {list-style-type:lower-alpha;}
 .enumerate3 {list-style-type:lower-roman;}
@@ -67,6 +70,8 @@ span.footnote-mark sup.textsuperscript, span.footnote-mark a sup.textsuperscript
 div.tabular, div.center div.tabular {text-align: center; margin-top:0.5em; margin-bottom:0.5em; }
 table.tabular td p{margin-top:0em;}
 table.tabular {margin-left: auto; margin-right: auto;}
+td p:first-child{ margin-top:0em; }
+td p:last-child{ margin-bottom:0em; }
 div.td00{ margin-left:0pt; margin-right:0pt; }
 div.td01{ margin-left:0pt; margin-right:5pt; }
 div.td10{ margin-left:5pt; margin-right:0pt; }
@@ -84,8 +89,9 @@ span.TEX span.E{ position:relative;top:0.5ex;left:-0.0417em;}
 a span.TEX span.E {text-decoration: none; }
 span.LATEX span.A{ position:relative; top:-0.5ex; left:-0.4em; font-size:85%;}
 span.LATEX span.TEX{ position:relative; left: -0.4em; }
-div.float img, div.float .caption {text-align:center;}
-div.figure img, div.figure .caption {text-align:center;}
+div.float, div.figure {margin-left: auto; margin-right: auto;}
+div.float img {text-align:center;}
+div.figure img {text-align:center;}
 .marginpar {width:20%; float:right; text-align:left; margin-left:auto; margin-top:0.5em; font-size:85%; text-decoration:underline;}
 .marginpar p{margin-top:0.4em; margin-bottom:0.4em;}
 table.equation {width:100%;}
@@ -102,12 +108,13 @@ table.pmatrix {width:100%;}
 span.pmatrix img{vertical-align:middle;}
 div.pmatrix {text-align:center;}
 table.pmatrix {width:100%;}
+span.bar-css {text-decoration:overline;}
 img.cdots{vertical-align:middle;}
 .partToc a, .partToc, .likepartToc a, .likepartToc {line-height: 200%; font-weight:bold; font-size:110%;}
 .chapterToc a, .chapterToc, .likechapterToc a, .likechapterToc, .appendixToc a, .appendixToc {line-height: 200%; font-weight:bold;}
 .index-item, .index-subitem, .index-subsubitem {display:block}
-.caption td.id{font-weight: bold; white-space: nowrap; }
-table.caption {text-align:center;}
+div.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:left;}
+div.caption span.id{font-weight: bold; white-space: nowrap; }
 h1.partHead{text-align: center}
 p.bibitem { text-indent: -2em; margin-left: 2em; margin-top:0.6em; margin-bottom:0.6em; }
 p.bibitem-p { text-indent: 0em; margin-left: 2em; margin-top:0.6em; margin-bottom:0.6em; }