From: Daniel Gruno <humbedooh@apache.org>
Date: Tue, 24 Apr 2012 17:36:13 +0000 (+0000)
Subject: Committing style changes to 2.2 as well
X-Git-Tag: 2.2.23~185
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59c9ab45732b605c04d87ba9595ae7c98af4b183;p=thirdparty%2Fapache%2Fhttpd.git

Committing style changes to 2.2 as well

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1329881 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/style/common.dtd b/docs/manual/style/common.dtd
index 8bc6de73c64..cbe71245bf8 100644
--- a/docs/manual/style/common.dtd
+++ b/docs/manual/style/common.dtd
@@ -44,8 +44,8 @@
 <!ENTITY % inlinetags "em | strong | code | a | br | directive | module |
 program | img | cite | q | dfn | var | transnote | glossary | phonetic">
 
-<!ENTITY % blocktags "p | example | note | table | ul | ol | dl | pre
-| blockquote">
+<!ENTITY % blocktags "p | example | note | table | ul | ol | dl | pre | 
+highlight | blockquote">
 
 <!ENTITY % Block "(%blocktags;)*">
 <!ENTITY % Inline "(#PCDATA | %inlinetags;)*">
@@ -164,6 +164,10 @@ program | img | cite | q | dfn | var | transnote | glossary | phonetic">
 <!ELEMENT dd %BlockOrInline;>
 
 <!ELEMENT pre %Inline;>
+<!ATTLIST pre class CDATA #IMPLIED>
+
+<!ELEMENT highlight %Inline;>
+<!ATTLIST highlight language CDATA #IMPLIED>
 
 <!ELEMENT img EMPTY>
 <!ATTLIST img
diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index f75e7588f24..97251dcbf80 100644
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -161,13 +161,15 @@
         <link title="No Sidebar - Default font size" type="text/css" media="all"
                rel="alternate stylesheet"
                href="{$path}/style/css/manual-loose-100pc.css"/>
+        
     </xsl:otherwise>
     </xsl:choose>&lf;
 
     <link type="text/css" media="print"
            rel="stylesheet"
            href="{$path}/style/css/manual-print.css"/>
-
+    <link href="{$path}/style/css/prettify.css" type="text/css" rel="stylesheet" />&lf;
+    <script type="text/javascript" src="{$path}/style/scripts/prettify.js">&lf; </script> &lf;
     <!-- chm files do not need a favicon -->
     <xsl:if test="not($is-chm or $is-zip)">&lf;
         <link rel="shortcut icon" href="{$path}/images/favicon.ico" />
@@ -307,10 +309,14 @@
 
         <xsl:text>.</xsl:text>
     </p>&lf;
-
     <xsl:call-template name="super-menu"/>
 
 </div> <!-- /footer -->
+<script type="text/javascript">
+    if (prettyPrint) {
+        prettyPrint();
+    }
+</script>
 </xsl:template>
 <!-- /bottom -->
 
@@ -468,6 +474,17 @@
 <!-- /section/section/section/section -->
 
 
+<!-- ==================================================================== -->
+<!-- Process source code highlighting                                     -->
+<!-- ==================================================================== -->
+<xsl:template match="highlight">
+<pre class="prettyprint lang-{@language}">
+    <!-- highlight body -->
+    <xsl:apply-templates />
+</pre>&lf; <!-- /.highlight -->
+</xsl:template>
+<!-- /higlight -->
+
 <!-- ==================================================================== -->
 <!-- (sub)section titles                                                  -->
 <!-- ==================================================================== -->