- backport zipping and typemap stuff (and some minor style changes related to

the tex creation, but not the main tex styles)
- add .cvsignores

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

diff --git a/docs/manual/style/chm/chm.de.xsl b/docs/manual/style/chm/chm.de.xsl
index 4b139ba144b661b97b9487ed183e6678f31c251c..511ba20b17553095a44018b55bd9779434c0884e 100644 (file)
--- a/docs/manual/style/chm/chm.de.xsl
+++ b/docs/manual/style/chm/chm.de.xsl
@@ -16,6 +16,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'windows-1252'" />
 <xsl:variable name="is-chm" select="true()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="../xsl/common.xsl"/>

diff --git a/docs/manual/style/chm/chm.en.xsl b/docs/manual/style/chm/chm.en.xsl
index bb63fdba9a75a0c9a8ecb062243b54a5a59c5873..bb903ac9c3a2d2e65b67a4ccac4631d8c45ab89f 100644 (file)
--- a/docs/manual/style/chm/chm.en.xsl
+++ b/docs/manual/style/chm/chm.en.xsl
@@ -16,6 +16,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'windows-1252'" />
 <xsl:variable name="is-chm" select="true()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="../xsl/common.xsl"/>

diff --git a/docs/manual/style/chm/chm.ja.xsl b/docs/manual/style/chm/chm.ja.xsl
index f3db56ea6e32d2cea49e4a2f021f5808111bfcb8..3f8b6f52e0ac0aabcca7ae0b2d3db384597340d8 100644 (file)
--- a/docs/manual/style/chm/chm.ja.xsl
+++ b/docs/manual/style/chm/chm.ja.xsl
@@ -16,6 +16,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'SHIFT_JIS'" />
 <xsl:variable name="is-chm" select="true()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="../xsl/common.xsl"/>

diff --git a/docs/manual/style/chm/chm.ko.xsl b/docs/manual/style/chm/chm.ko.xsl
index 0e0114a2e0a6ad1f2e1da563865415c211e77500..ea8b926dd77fb2520933260f3d6abc38b35e1a46 100644 (file)
--- a/docs/manual/style/chm/chm.ko.xsl
+++ b/docs/manual/style/chm/chm.ko.xsl
@@ -17,6 +17,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'EUC-KR'" />
 <xsl:variable name="is-chm" select="true()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="../xsl/common.xsl"/>

diff --git a/docs/manual/style/chm/chm.zh-cn.xsl b/docs/manual/style/chm/chm.zh-cn.xsl
index 295ad47cb21235d819a8363c5f9186229fc07a86..720243f5002d0fe550f7c131fb6ab27d275d04dd 100644 (file)
--- a/docs/manual/style/chm/chm.zh-cn.xsl
+++ b/docs/manual/style/chm/chm.zh-cn.xsl
@@ -16,6 +16,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'gb2312'" />
 <xsl:variable name="is-chm" select="true()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="../xsl/common.xsl"/>

diff --git a/docs/manual/style/common.dtd b/docs/manual/style/common.dtd
index f8f1d1b8088eeacc05a87ae5b8cb43d6ebbec19f..34bcfecb909339e5f7fdef8c93f3d6cb466ba4d6 100644 (file)
--- a/docs/manual/style/common.dtd
+++ b/docs/manual/style/common.dtd
@@ -96,7 +96,7 @@
 <!ELEMENT note (#PCDATA | title | %inlinetags; | %blocktags;)*>
 <!ATTLIST note type CDATA #IMPLIED>
 
-<!ELEMENT table (tr)+>
+<!ELEMENT table (columnspec | tr)+>
 <!ATTLIST table summary     CDATA  #IMPLIED
                 width       CDATA  #IMPLIED
                 bgcolor     CDATA  #IMPLIED
@@ -105,6 +105,11 @@
                 border      CDATA  #IMPLIED
                 style       CDATA  #IMPLIED>
 
+<!ELEMENT columnspec (column)+>
+
+<!ELEMENT column EMPTY>
+<!ATTLIST column width CDATA #IMPLIED>
+
 <!ELEMENT tr (th | td)+>
 <!ATTLIST tr valign CDATA #IMPLIED >
 

diff --git a/docs/manual/style/manual.de.xsl b/docs/manual/style/manual.de.xsl
index 3f17c8abe4e4996ed138f7c9b0522631658f77e9..23388103645e957178dc310a6237ebaa434e636d 100644 (file)
--- a/docs/manual/style/manual.de.xsl
+++ b/docs/manual/style/manual.de.xsl
@@ -16,6 +16,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'ISO-8859-1'" />
 <xsl:variable name="is-chm" select="false()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="xsl/common.xsl"/>

diff --git a/docs/manual/style/manual.en.xsl b/docs/manual/style/manual.en.xsl
index f23a809513e8978c724481f02f851d38792ee006..25a933ecb9ba062ffbca81851592980002e6b501 100644 (file)
--- a/docs/manual/style/manual.en.xsl
+++ b/docs/manual/style/manual.en.xsl
@@ -16,6 +16,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'ISO-8859-1'" />
 <xsl:variable name="is-chm" select="false()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="xsl/common.xsl"/>

diff --git a/docs/manual/style/manual.ja.xsl b/docs/manual/style/manual.ja.xsl
index e347b6010e6e4719dd0c7e38d9c451c20c03c8b5..11eb7620a7ddc2b44542cc6c1b8532a67d2e8c90 100644 (file)
--- a/docs/manual/style/manual.ja.xsl
+++ b/docs/manual/style/manual.ja.xsl
@@ -16,6 +16,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'iso-2022-jp'" />
 <xsl:variable name="is-chm" select="false()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="xsl/common.xsl"/>

diff --git a/docs/manual/style/manual.ko.xsl b/docs/manual/style/manual.ko.xsl
index a34e300c9208a106039583f83eb049177c4a854c..86f68fe16f865abe7d6f13f3af68034caf732252 100644 (file)
--- a/docs/manual/style/manual.ko.xsl
+++ b/docs/manual/style/manual.ko.xsl
@@ -17,6 +17,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'EUC-KR'" />
 <xsl:variable name="is-chm" select="false()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="xsl/common.xsl"/>

diff --git a/docs/manual/style/manual.pt-br.xsl b/docs/manual/style/manual.pt-br.xsl
index 58948f2d3470b82ad3719bd5752deb53d85ab5ff..ce4abb2fbdcc1ceb42538a01666d93de80eb419d 100644 (file)
--- a/docs/manual/style/manual.pt-br.xsl
+++ b/docs/manual/style/manual.pt-br.xsl
@@ -16,6 +16,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'ISO-8859-1'" />
 <xsl:variable name="is-chm" select="false()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="xsl/common.xsl"/>

diff --git a/docs/manual/style/manual.ru.xsl b/docs/manual/style/manual.ru.xsl
index 3d742293d22e857c8452c7fa4bc608af23d411e0..03daa2607ed6e1cdc9463df2b54b70c353a05858 100644 (file)
--- a/docs/manual/style/manual.ru.xsl
+++ b/docs/manual/style/manual.ru.xsl
@@ -16,6 +16,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'KOI8-R'" />
 <xsl:variable name="is-chm" select="false()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="xsl/common.xsl"/>

diff --git a/docs/manual/style/manual.sv.xsl b/docs/manual/style/manual.sv.xsl
index c2c641243abce36c39507454267fc581bb81afa9..6815f5643d9608c5bbe0a74e49c06f3534b0ab29 100644 (file)
--- a/docs/manual/style/manual.sv.xsl
+++ b/docs/manual/style/manual.sv.xsl
@@ -16,6 +16,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'ISO-8859-1'" />
 <xsl:variable name="is-chm" select="false()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="xsl/common.xsl"/>

diff --git a/docs/manual/style/manual.zh-cn.xsl b/docs/manual/style/manual.zh-cn.xsl
index 6f82272b0f296eaf5972ad5b0476d21f146cb8b4..01b61c75684dc780dd4b93b77ea9040a2d64d18d 100644 (file)
--- a/docs/manual/style/manual.zh-cn.xsl
+++ b/docs/manual/style/manual.zh-cn.xsl
@@ -16,6 +16,7 @@
 <!-- some meta information have to be passed to the transformation -->
 <xsl:variable name="output-encoding" select="'gb2312'" />
 <xsl:variable name="is-chm" select="false()" />
+<xsl:variable name="is-zip" select="false()" />
 
 <!-- Now get the real guts of the stylesheet -->
 <xsl:include href="xsl/common.xsl"/>

diff --git a/docs/manual/style/xsl/common.xsl b/docs/manual/style/xsl/common.xsl
index f36f185bb1c43edd4095a039882fce51d27709fc..6fccc4cce16694bc4798ee565445a65963094945 100644 (file)
--- a/docs/manual/style/xsl/common.xsl
+++ b/docs/manual/style/xsl/common.xsl
@@ -67,6 +67,7 @@
 
 <!-- Injected variables:                                                  -->
 <!--   $is-chm          - (boolean) target is for CHM generation or not   -->
+<!--   $is-zip          - (boolean) target is for ZIP generation or not   -->
 <!--   $messages        - (node-set) localized common text snippets       -->
 <!--   $output-encoding - (string) MIME charset name of the output        -->
 <!--                      encoding                                        -->
@@ -104,7 +105,7 @@
 <!-- when referencing to a directory, we may need to complete the path -->
 <!-- with the index file (for offline applications like *.chm files)   -->
 <xsl:variable name="index-file">
-    <xsl:if test="$is-chm">index.html</xsl:if>
+    <xsl:if test="$is-chm or $is-zip">index.html</xsl:if>
 </xsl:variable>
 
 <!-- it may be desired to open external targets in a new window -->
@@ -121,7 +122,7 @@
 <head>
     <!-- the meta element is necessary for offline handling like CHM -->
     <xsl:choose>
-    <xsl:when test="$is-chm">
+    <xsl:when test="$is-chm or $is-zip">
         <meta http-equiv="Content-Type"
                  content="text/html; charset={$output-encoding}" />
     </xsl:when>
@@ -163,6 +164,15 @@
         <link type="text/css" rel="stylesheet" media="all"
               href="{$path}/style/css/manual-chm.css" />
     </xsl:when>
+    <!-- zip packages do also -->
+    <xsl:when test="$is-zip">
+        <link title="Main stylesheet"  type="text/css" media="all"
+                rel="stylesheet"
+               href="{$path}/style/css/manual-zip.css" />&lf;
+        <link title="No Sidebar - Default font size" type="text/css" media="all"
+               rel="alternate stylesheet"
+               href="{$path}/style/css/manual-zip-100pc.css"/>
+    </xsl:when>
     <xsl:otherwise>
         <link title="Main stylesheet"  type="text/css" media="all"
                 rel="stylesheet"
@@ -178,7 +188,7 @@
            href="{$path}/style/css/manual-print.css"/>
 
     <!-- chm files do not need a favicon -->
-    <xsl:if test="not($is-chm)">&lf;
+    <xsl:if test="not($is-chm or $is-zip)">&lf;
         <link rel="shortcut icon" href="{$path}/images/favicon.ico" />
     </xsl:if>
 </head>
@@ -307,7 +317,7 @@
 <xsl:param name="position" select="'top'" />
 <xsl:variable name="metafile" select="document(/*/@metafile)/metafile" />
 
-<xsl:if test="not($is-chm)">
+<xsl:if test="not($is-chm or $is-zip)">
 <div class="{$position}lang">&lf;
     <p>
         <span>
@@ -1026,4 +1036,14 @@
 </xsl:template>
 <!-- /helper.uri.fix -->
 
+
+<!-- ==================================================================== -->
+<!-- Ignore table hints used for latex                                    -->
+<!-- ==================================================================== -->
+<xsl:template match="columnspec">
+</xsl:template>
+
+<xsl:template match="column">
+</xsl:template>
+
 </xsl:stylesheet>