db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1150712 - in /db/derby/docs/branches/10.8: ./ build.xml lib/dita2htmlImpl.xsl lib/fo2html.xsl lib/index.html lib/map2htmtoc.xsl
Date Mon, 25 Jul 2011 14:11:13 GMT
Author: chaase3
Date: Mon Jul 25 14:11:13 2011
New Revision: 1150712

URL: http://svn.apache.org/viewvc?rev=1150712&view=rev
Log:
DERBY-4408  missing DOCTYPE and META tags in toc.html and index.html pages

Merged DERBY-4408-4.diff to 10.8 docs branch from trunk revision 1150706.

Modified:
    db/derby/docs/branches/10.8/   (props changed)
    db/derby/docs/branches/10.8/build.xml
    db/derby/docs/branches/10.8/lib/dita2htmlImpl.xsl
    db/derby/docs/branches/10.8/lib/fo2html.xsl
    db/derby/docs/branches/10.8/lib/index.html
    db/derby/docs/branches/10.8/lib/map2htmtoc.xsl

Propchange: db/derby/docs/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 25 14:11:13 2011
@@ -1 +1 @@
-/db/derby/docs/trunk:1089207,1090436,1095463,1097832
+/db/derby/docs/trunk:1089207,1090436,1095463,1097832,1129834,1129857,1133549,1146887,1147279,1148776,1150706

Modified: db/derby/docs/branches/10.8/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/build.xml?rev=1150712&r1=1150711&r2=1150712&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/build.xml (original)
+++ db/derby/docs/branches/10.8/build.xml Mon Jul 25 14:11:13 2011
@@ -56,7 +56,7 @@ limitations under the License.
     <copy file="${dita.lib.dir}/dita2fo-subroutines.xsl" todir="${dita.dir}/xsl/xslfo"/>
     <copy file="${dita.lib.dir}/index.html" todir="${dita.dir}/resource"/>
     <copy file="${dita.lib.dir}/dita2htmlImpl.xsl" todir="${dita.dir}/xsl/xslhtml" overwrite="true"/>
-    <copy file="${dita.lib.dir}/map2htmtoc.xsl" todir="${dita.dir}/xsl"/>
+    <copy file="${dita.lib.dir}/map2htmtoc.xsl" todir="${dita.dir}/xsl" overwrite="true"/>
     <mkdir dir="${dita.temp.dir}"/>
     <copy todir="${dita.output.dir}/images">
       <fileset dir="${dita.src.dir}/images"/>
@@ -148,19 +148,6 @@ limitations under the License.
       <property name="output.dir" value="${basedir}${file.separator}out${file.separator}${manual.name}temp"/>
       <property name="args.xhtml.toc" value="toc"/>
     </ant>
-    <!-- DERBY-4999: Must specify encoding when filter-moving files,
-         otherwise files may be garbled if the default encoding isn't
-         the same as the encoding actually used in the file. Assume
-         all files are UTF-8. -->
-    <move encoding="UTF-8" todir="${basedir}/out/${manual.name}">
-      <fileset dir="${basedir}/out/${manual.name}temp">
-        <include name="**/*.html"/>
-        <exclude name="**/*.gif"/>
-      </fileset>
-      <filterchain>
-        <concatfilter prepend="${basedir}/lib/apache-license-html.html"/>
-      </filterchain>
-    </move>
     <!-- move any remaining files over -->
     <move todir="${basedir}/out/${manual.name}">
       <fileset dir="${basedir}/out/${manual.name}temp"/>

Modified: db/derby/docs/branches/10.8/lib/dita2htmlImpl.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/lib/dita2htmlImpl.xsl?rev=1150712&r1=1150711&r2=1150712&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/lib/dita2htmlImpl.xsl (original)
+++ db/derby/docs/branches/10.8/lib/dita2htmlImpl.xsl Mon Jul 25 14:11:13 2011
@@ -3705,6 +3705,24 @@
 <!-- ========== DEFAULT PAGE LAYOUT ========== -->
 
 <xsl:template name="chapter-setup">
+<xsl:value-of select="$newline"/>
+<xsl:comment>
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+</xsl:comment>
+<xsl:value-of select="$newline"/>
 <html>
   <xsl:call-template name="setTopicLanguage"/>
   <xsl:value-of select="$newline"/>

Modified: db/derby/docs/branches/10.8/lib/fo2html.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/lib/fo2html.xsl?rev=1150712&r1=1150711&r2=1150712&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/lib/fo2html.xsl (original)
+++ db/derby/docs/branches/10.8/lib/fo2html.xsl Mon Jul 25 14:11:13 2011
@@ -34,6 +34,25 @@
 <!-- =============================================================== -->
 
 <xsl:template match="fo:root">
+<xsl:comment>
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+</xsl:comment>
+<!-- terminate with a newline -->
+<xsl:text>
+</xsl:text>
   <html>
     <head>
       <title>

Modified: db/derby/docs/branches/10.8/lib/index.html
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/lib/index.html?rev=1150712&r1=1150711&r2=1150712&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/lib/index.html (original)
+++ db/derby/docs/branches/10.8/lib/index.html Mon Jul 25 14:11:13 2011
@@ -1,7 +1,25 @@
-<!-- (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved. -->
- 
-<html lang="en">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" 
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+<html lang="en" xml:lang="en-us">
   <head>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
     <title>Web Sample</title>
   </head>
   <frameset title="Web Sample" cols="40%,*">

Modified: db/derby/docs/branches/10.8/lib/map2htmtoc.xsl
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.8/lib/map2htmtoc.xsl?rev=1150712&r1=1150711&r2=1150712&view=diff
==============================================================================
--- db/derby/docs/branches/10.8/lib/map2htmtoc.xsl (original)
+++ db/derby/docs/branches/10.8/lib/map2htmtoc.xsl Mon Jul 25 14:11:13 2011
@@ -24,8 +24,14 @@
 <!-- Include error message template -->
 <xsl:include href="common/output-message.xsl"/>
 
-<xsl:output method="html" indent="no"/>
-
+<!-- XHTML output with XML syntax -->
+<xsl:output method="xml"
+            encoding="utf-8"
+            indent="no"
+            doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+            doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
+/>
+
 <!-- Set the prefix for error message numbers -->
 <xsl:variable name="msgprefix">IDXS</xsl:variable>
 
@@ -45,10 +51,29 @@
      Setup the HTML wrapper for the table of contents
      ********************************************************************************* -->
 <xsl:template match="/">
+<xsl:value-of select="$newline"/>
+<xsl:comment>
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+</xsl:comment>
+<xsl:value-of select="$newline"/>
   <html>
     <xsl:call-template name="setTocLanguage"/>
     <xsl:value-of select="$newline"/>
   <head><xsl:value-of select="$newline"/>
+      <xsl:call-template name="generateCharset"/>   <!-- Set the character set to
UTF-8 -->
     <xsl:if test="string-length($contenttarget)>0 and
 	        $contenttarget!='NONE'">
       <base target="{$contenttarget}"/>
@@ -87,16 +112,16 @@
 <xsl:template match="/*[contains(@class, ' map/map ')]">
   <xsl:param name="pathFromMaplist"/>
   <xsl:if test=".//*[contains(@class, ' map/topicref ')][not(@toc='no')]">
-    <UL><xsl:value-of select="$newline"/>
+    <ul><xsl:value-of select="$newline"/>
 
       <xsl:apply-templates select="*[contains(@class, ' map/topicref ')]">
         <xsl:with-param name="pathFromMaplist" select="$pathFromMaplist"/>
       </xsl:apply-templates>
-    </UL><xsl:value-of select="$newline"/>
+    </ul><xsl:value-of select="$newline"/>
   </xsl:if>
 </xsl:template>
 <!-- *********************************************************************************
-     Output each topic as an <LI> with an A-link. Each item takes 2 values:
+     Output each topic as an <li> with an A-link. Each item takes 2 values:
      - A title. If a navtitle is specified on <topicref>, use that.
        Otherwise try to open the file and retrieve the title. First look for a navigation
title in the topic,
        followed by the main topic title. Last, try to use <linktext> specified in the
map.
@@ -106,11 +131,11 @@
      - Ignore if TOC=no.
 
      If this topicref has any child topicref's that will be part of the navigation,
-     output a <UL> around them and process the contents.
+     output a <ul> around them and process the contents.
      ********************************************************************************* -->
 <xsl:template match="*[contains(@class, ' map/topicref ')][not(@toc='no')]">
   <xsl:param name="pathFromMaplist"/>
-  <LI>
+  <li>
       <xsl:choose>
         <!-- If there is a reference to a DITA or HTML file, and it is not external: -->
         <xsl:when test="@href and not(@href='')">
@@ -142,13 +167,13 @@
 
        <!-- If there are any children that should be in the TOC, process them -->
        <xsl:if test="descendant::*[contains(@class, ' map/topicref ')][not(contains(@toc,'no'))]">
-         <xsl:value-of select="$newline"/><UL><xsl:value-of select="$newline"/>
+         <xsl:value-of select="$newline"/><ul><xsl:value-of select="$newline"/>
            <xsl:apply-templates select="*[contains(@class, ' map/topicref ')]">
              <xsl:with-param name="pathFromMaplist" select="$pathFromMaplist"/>
            </xsl:apply-templates>
-         </UL><xsl:value-of select="$newline"/>
+         </ul><xsl:value-of select="$newline"/>
        </xsl:if>
-  </LI><xsl:value-of select="$newline"/>
+  </li><xsl:value-of select="$newline"/>
 </xsl:template>
 
 <!-- If toc=no, but a child has toc=yes, that child should bubble up to the top -->
@@ -291,4 +316,8 @@
   </xsl:choose>
 </xsl:template>
 
+  <xsl:template name="generateCharset">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/><xsl:value-of
select="$newline"/>
+  </xsl:template>
+
 </xsl:stylesheet>



Mime
View raw message