1 --- a/xhtml11.conf Mon Oct 19 17:03:44 2009 +1300
2 +++ b/xhtml11.conf Thu Oct 22 16:14:41 2009 +1300
3 @@ -113,9 +113,9 @@
4
5 [footnoteref-inlinemacro]
6 # footnoteref:[<id>], create reference to footnote.
7 -{2%}<span class="footnoteref"><br /><a href="#{1}">[{1}]</a><br /></span>
8 +{2%}<span class="footnoteref"><br /><a href="#_footnote_{1}">[{1}]</a><br /></span>
9 # footnoteref:[<id>,<text>], create footnote with ID.
10 -{2#}<span class="footnote" id="{1}"><br />[{2}]<br /></span>
11 +{2#}<span class="footnote" id="_footnote_{1}"><br />[{2}]<br /></span>
12
13 [callout-inlinemacro]
14 # Callout.
15 @@ -484,26 +484,26 @@
16 include1::{stylesheet}[]
17 </style>
18 endif::linkcss[]
19 -ifdef::toc[]
20 +ifndef::disable-javascript[]
21 ifdef::linkcss[]
22 <script type="text/javascript">
23 # Escape as CDATA to pass validators.
24 /*<![CDATA[*/
25 -window.onload = function()\{generateToc({toclevels=2})\}
26 +window.onload = function()\{asciidoc.footnotes();{toc? asciidoc.toc({toclevels});}\}
27 /*]]>*/
28 </script>
29 -<script type="text/javascript" src="{scriptsdir=.}/toc.js"></script>
30 +<script type="text/javascript" src="{scriptsdir=.}/asciidoc-xhtml11.js"></script>
31 endif::linkcss[]
32 ifndef::linkcss[]
33 <script type="text/javascript">
34 # Escape as CDATA to pass validators.
35 /*<![CDATA[*/
36 -window.onload = function()\{generateToc({toclevels=2})\}
37 -include1::{scriptsdir=./javascripts}/toc.js[]
38 +window.onload = function()\{asciidoc.footnotes();{toc? asciidoc.toc({toclevels});}\}
39 +include1::{scriptsdir=./javascripts}/asciidoc-xhtml11.js[]
40 /*]]>*/
41 </script>
42 endif::linkcss[]
43 -endif::toc[]
44 +endif::disable-javascript[]
45 ifdef::asciimath[]
46 ifdef::linkcss[]
47 <script type="text/javascript" src="{scriptsdir=.}/ASCIIMathML.js"></script>
48 @@ -569,8 +569,11 @@
49 </div>
50 </div>
51 endif::doctype-manpage[]
52 +<div id="content">
53
54 [footer]
55 +</div>
56 +{disable-javascript%<div id="footnotes"><hr /></div>}
57 <div id="footer">
58 <div id="footer-text">
59 Version {revnumber}<br />