forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r209038 - in /forrest/branches/locationmap_branch/main/webapp: linkmap.xmap menu.xmap resources.xmap resources/stylesheets/html2document.xsl tabs.xmap
Date Mon, 04 Jul 2005 09:16:24 GMT
Author: rgardler
Date: Mon Jul  4 02:16:21 2005
New Revision: 209038

URL: http://svn.apache.org/viewcvs?rev=209038&view=rev
Log:
workaround for misleading error messages when loationmap contains no reference to a file (thanks
to Tim Williams, fix for FOR-554)

Modified:
    forrest/branches/locationmap_branch/main/webapp/linkmap.xmap
    forrest/branches/locationmap_branch/main/webapp/menu.xmap
    forrest/branches/locationmap_branch/main/webapp/resources.xmap
    forrest/branches/locationmap_branch/main/webapp/resources/stylesheets/html2document.xsl
    forrest/branches/locationmap_branch/main/webapp/tabs.xmap

Modified: forrest/branches/locationmap_branch/main/webapp/linkmap.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/linkmap.xmap?rev=209038&r1=209037&r2=209038&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/linkmap.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/linkmap.xmap Mon Jul  4 02:16:21 2005
@@ -51,12 +51,15 @@
       <!-- site.xml with @href's appended to be context-relative. -->
       <map:match pattern="abs-linkmap">
 			  <map:select type="exists">
-				  <map:when test="{project:content.xdocs}site.xml">
-				    <map:generate src="{project:content.xdocs}site.xml"/>
-			    </map:when>
-				  <map:otherwise>
-				    <map:generate src="{lm:site.xml}"/>
-		      </map:otherwise>
+          <map:when test="{project:content.xdocs}site.xml">
+            <map:generate src="{project:content.xdocs}site.xml"/>
+          </map:when>
+          <map:when test="{lm:site.xml}">
+            <map:generate src="{lm:site.xml}"/>
+          </map:when>
+          <map:otherwise>
+            <map:generate src="{project:content.xdocs}site.xml"/>
+          </map:otherwise>
         </map:select>
         <map:transform type="xinclude"/>
         <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />

Modified: forrest/branches/locationmap_branch/main/webapp/menu.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/menu.xmap?rev=209038&r1=209037&r2=209038&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/menu.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/menu.xmap Mon Jul  4 02:16:21 2005
@@ -65,8 +65,11 @@
 				  <map:when test="{project:content.xdocs}site.xml">
 				    <map:generate src="{project:content.xdocs}site.xml"/>
 			    </map:when>
+          <map:when test="{lm:site.xml}">
+            <map:generate src="{lm:site.xml}"/>
+          </map:when>
 				  <map:otherwise>
-					  <map:generate src="{lm:site.xml}"/>
+            <map:generate src="{project:content.xdocs}site.xml"/>
 				  </map:otherwise>
         </map:select>
         <map:transform type="xinclude"/>
@@ -78,12 +81,15 @@
 
       <map:match pattern="**menulinks-*">
         <map:select type="exists">
-				  <map:when test="{project:content.xdocs}site.xml">
-				    <map:generate src="{project:content.xdocs}site.xml"/>
-			  	</map:when>
-					<map:otherwise>
-						<map:generate src="{lm:site.xml}"/>
-					</map:otherwise>
+          <map:when test="{project:content.xdocs}site.xml">
+            <map:generate src="{project:content.xdocs}site.xml"/>
+          </map:when>
+          <map:when test="{lm:site.xml}">
+            <map:generate src="{lm:site.xml}"/>
+          </map:when>
+          <map:otherwise>
+            <map:generate src="{project:content.xdocs}site.xml"/>
+          </map:otherwise>
         </map:select>
         <map:transform type="xinclude"/>
         <map:transform src="{forrest:stylesheets}/absolutize-linkmap.xsl" />

Modified: forrest/branches/locationmap_branch/main/webapp/resources.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/resources.xmap?rev=209038&r1=209037&r2=209038&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/resources.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/resources.xmap Mon Jul  4 02:16:21 2005
@@ -306,7 +306,7 @@
 						</map:when>
 						<map:otherwise>         
 							<map:read src="{lm:{1}my-images/{2}.{3}}"/>
-            		</map:otherwise>
+            </map:otherwise>
             </map:select>
          </map:match>
 
@@ -316,8 +316,12 @@
 			          <map:generate src="{project:content.xdocs}/{1}{2}.svg"/>
 			          <map:serialize type="xml"/> 
         			</map:when>
+              <map:when test="{lm:/{1}{2}.svg}">
+                <map:generate src="{lm:/{1}{2}.svg}"/>
+                <map:serialize type="xml"/> 
+              </map:when>
         			<map:otherwise>
-			          <map:generate src="{lm:/{1}{2}.svg}"/>
+                <map:generate src="{project:content.xdocs}/{1}{2}.svg"/>
 			          <map:serialize type="xml"/> 
         			</map:otherwise>
         		</map:select>

Modified: forrest/branches/locationmap_branch/main/webapp/resources/stylesheets/html2document.xsl
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/resources/stylesheets/html2document.xsl?rev=209038&r1=209037&r2=209038&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/resources/stylesheets/html2document.xsl
(original)
+++ forrest/branches/locationmap_branch/main/webapp/resources/stylesheets/html2document.xsl
Mon Jul  4 02:16:21 2005
@@ -56,11 +56,9 @@
     </xsl:template>
         
     <xsl:template match="meta">
-      <xsl:text disable-output-escaping = "yes"><![CDATA[ <!-- ]]></xsl:text>
         <xsl:copy>
             <xsl:apply-templates select="node()|@*"/>
         </xsl:copy>
-      <xsl:text disable-output-escaping = "yes"><![CDATA[ --> ]]></xsl:text>

     </xsl:template>  
     
     <!--infer structure from sibling headings-->

Modified: forrest/branches/locationmap_branch/main/webapp/tabs.xmap
URL: http://svn.apache.org/viewcvs/forrest/branches/locationmap_branch/main/webapp/tabs.xmap?rev=209038&r1=209037&r2=209038&view=diff
==============================================================================
--- forrest/branches/locationmap_branch/main/webapp/tabs.xmap (original)
+++ forrest/branches/locationmap_branch/main/webapp/tabs.xmap Mon Jul  4 02:16:21 2005
@@ -73,8 +73,11 @@
 				 <map:when test="{project:content.xdocs}tabs.xml">
 				  <map:generate src="{project:content.xdocs}tabs.xml"/>
 			  </map:when>
+        <map:when test="{lm:tabs.xml}">
+          <map:generate src="{lm:tabs.xml}"/>
+        </map:when>
 				<map:otherwise>
-					<map:generate src="{lm:tabs.xml}"/>
+          <map:generate src="{project:content.xdocs}tabs.xml"/>
 				</map:otherwise>
 		 	</map:select>
         <map:transform type="xinclude"/>



Mime
View raw message