From f79003b66b78032b428daef2790458d060986952 Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Fri, 7 Mar 2008 09:10:56 +0000
Subject: [PATCH] don't use refmiscinfo@class=date value as fallback for
 refentry "source" or "manual" metadata fields

---
 xsl/common/refentry.xsl                       | 254 +++++++++++-------
 .../refentry.manual.fallback.profile.xml      |   2 +-
 .../refentry.source.fallback.profile.xml      |   2 +-
 3 files changed, 152 insertions(+), 106 deletions(-)

diff --git a/xsl/common/refentry.xsl b/xsl/common/refentry.xsl
index 54f4e46a5..257368e48 100644
--- a/xsl/common/refentry.xsl
+++ b/xsl/common/refentry.xsl
@@ -559,25 +559,47 @@
       </xsl:choose>
       <xsl:copy-of select="$Version"/>
     </xsl:when>
-    <!-- * if no Name and no Version, report it and use fallback (if any) -->
+    <!-- * if no Name and no Version, use fallback (if any) -->
     <xsl:when test="not($prefs/@fallback = '')">
-      <xsl:call-template name="report.missing.source.name">
-        <xsl:with-param name="refname" select="$refname"/>
-      </xsl:call-template>
-      <xsl:call-template name="report.missing.version">
-        <xsl:with-param name="refname" select="$refname"/>
-      </xsl:call-template>
       <xsl:variable name="source.fallback">
         <xsl:call-template name="evaluate.info.profile">
           <xsl:with-param name="profile" select="$prefs/@fallback"/>
           <xsl:with-param name="info" select="$info"/>
         </xsl:call-template>
       </xsl:variable>
+      <!-- * At this point, we know that we don't have properly marked-up -->
+      <!-- * source metadata, so even if we do have source fallback -->
+      <!-- * content, we still report to the user that it should be -->
+      <!-- * marked up properly instead. -->
+      <xsl:if test="$refentry.meta.get.quietly = 0">
+        <xsl:call-template name="report.missing.source.name">
+          <xsl:with-param name="refname" select="$refname"/>
+        </xsl:call-template>
+        <xsl:call-template name="report.missing.version">
+          <xsl:with-param name="refname" select="$refname"/>
+        </xsl:call-template>
+      </xsl:if>
       <xsl:choose>
         <xsl:when test="not($source.fallback = '')">
           <xsl:value-of select="$source.fallback"/>
+          <xsl:if test="$refentry.meta.get.quietly = 0">
+            <xsl:call-template name="log.message">
+              <xsl:with-param name="level">Warn</xsl:with-param>
+              <xsl:with-param name="source" select="$refname"/>
+              <xsl:with-param name="context-desc">meta source</xsl:with-param>
+              <xsl:with-param name="message">
+                <xsl:text>using</xsl:text>
+                <xsl:text> "</xsl:text>
+                <xsl:value-of select="$source.fallback"/>
+                <xsl:text>" </xsl:text>
+                <xsl:text>for "source"</xsl:text>
+              </xsl:with-param>
+            </xsl:call-template>
+          </xsl:if>
         </xsl:when>
         <xsl:otherwise>
+          <!-- * we have no Name, no Version, and no fallback content, so -->
+          <!-- * insert a fixme -->
           <xsl:text>[FIXME: source]</xsl:text>
           <xsl:if test="$refentry.meta.get.quietly = 0">
             <xsl:call-template name="log.message">
@@ -593,6 +615,8 @@
       </xsl:choose>
     </xsl:when>
     <xsl:otherwise>
+      <!-- * we have no Name, no Version, and no fallback given, so -->
+      <!-- * insert a fixme -->
       <xsl:text>[FIXME: source]</xsl:text>
       <xsl:if test="$refentry.meta.get.quietly = 0">
         <xsl:call-template name="log.message">
@@ -758,40 +782,38 @@
 
 <xsl:template name="report.missing.source.name">
   <xsl:param name="refname"/>
-  <xsl:if test="$refentry.meta.get.quietly = 0">
-    <xsl:call-template name="log.message">
-      <xsl:with-param name="level">Note</xsl:with-param>
-      <xsl:with-param name="source" select="$refname"/>
-      <xsl:with-param name="context-desc">meta source</xsl:with-param>
-      <xsl:with-param name="message">
-        <xsl:text>no *info/productname or alternative</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="log.message">
-      <xsl:with-param name="level">Note</xsl:with-param>
-      <xsl:with-param name="source" select="$refname"/>
-      <xsl:with-param name="context-desc">meta source</xsl:with-param>
-      <xsl:with-param name="message">
-        <xsl:text>see http://docbook.sf.net/el/productname</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="log.message">
-      <xsl:with-param name="level">Note</xsl:with-param>
-      <xsl:with-param name="source" select="$refname"/>
-      <xsl:with-param name="context-desc">meta source</xsl:with-param>
-      <xsl:with-param name="message">
-        <xsl:text>no refentry/refmeta/refmiscinfo@class=source</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="log.message">
-      <xsl:with-param name="level">Note</xsl:with-param>
-      <xsl:with-param name="source" select="$refname"/>
-      <xsl:with-param name="context-desc">meta source</xsl:with-param>
-      <xsl:with-param name="message">
-        <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
+  <xsl:call-template name="log.message">
+    <xsl:with-param name="level">Note</xsl:with-param>
+    <xsl:with-param name="source" select="$refname"/>
+    <xsl:with-param name="context-desc">meta source</xsl:with-param>
+    <xsl:with-param name="message">
+      <xsl:text>no *info/productname or alternative</xsl:text>
+    </xsl:with-param>
+  </xsl:call-template>
+  <xsl:call-template name="log.message">
+    <xsl:with-param name="level">Note</xsl:with-param>
+    <xsl:with-param name="source" select="$refname"/>
+    <xsl:with-param name="context-desc">meta source</xsl:with-param>
+    <xsl:with-param name="message">
+      <xsl:text>see http://docbook.sf.net/el/productname</xsl:text>
+    </xsl:with-param>
+  </xsl:call-template>
+  <xsl:call-template name="log.message">
+    <xsl:with-param name="level">Note</xsl:with-param>
+    <xsl:with-param name="source" select="$refname"/>
+    <xsl:with-param name="context-desc">meta source</xsl:with-param>
+    <xsl:with-param name="message">
+      <xsl:text>no refentry/refmeta/refmiscinfo@class=source</xsl:text>
+    </xsl:with-param>
+  </xsl:call-template>
+  <xsl:call-template name="log.message">
+    <xsl:with-param name="level">Note</xsl:with-param>
+    <xsl:with-param name="source" select="$refname"/>
+    <xsl:with-param name="context-desc">meta source</xsl:with-param>
+    <xsl:with-param name="message">
+      <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
+    </xsl:with-param>
+  </xsl:call-template>
 </xsl:template>
 
 <!-- ==================================================================== -->
@@ -905,40 +927,38 @@
 
 <xsl:template name="report.missing.version">
   <xsl:param name="refname"/>
-  <xsl:if test="$refentry.meta.get.quietly = 0">
-    <xsl:call-template name="log.message">
-      <xsl:with-param name="level">Note</xsl:with-param>
-      <xsl:with-param name="source" select="$refname"/>
-      <xsl:with-param name="context-desc">meta version</xsl:with-param>
-      <xsl:with-param name="message">
-        <xsl:text>no *info/productnumber or alternative</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="log.message">
-      <xsl:with-param name="level">Note</xsl:with-param>
-      <xsl:with-param name="source" select="$refname"/>
-      <xsl:with-param name="context-desc">meta version</xsl:with-param>
-      <xsl:with-param name="message">
-        <xsl:text>see http://docbook.sf.net/el/productnumber</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="log.message">
-      <xsl:with-param name="level">Note</xsl:with-param>
-      <xsl:with-param name="source" select="$refname"/>
-      <xsl:with-param name="context-desc">meta version</xsl:with-param>
-      <xsl:with-param name="message">
-        <xsl:text>no refentry/refmeta/refmiscinfo@class=version</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="log.message">
-      <xsl:with-param name="level">Note</xsl:with-param>
-      <xsl:with-param name="source" select="$refname"/>
-      <xsl:with-param name="context-desc">meta version</xsl:with-param>
-      <xsl:with-param name="message">
-        <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
+  <xsl:call-template name="log.message">
+    <xsl:with-param name="level">Note</xsl:with-param>
+    <xsl:with-param name="source" select="$refname"/>
+    <xsl:with-param name="context-desc">meta version</xsl:with-param>
+    <xsl:with-param name="message">
+      <xsl:text>no *info/productnumber or alternative</xsl:text>
+    </xsl:with-param>
+  </xsl:call-template>
+  <xsl:call-template name="log.message">
+    <xsl:with-param name="level">Note</xsl:with-param>
+    <xsl:with-param name="source" select="$refname"/>
+    <xsl:with-param name="context-desc">meta version</xsl:with-param>
+    <xsl:with-param name="message">
+      <xsl:text>see http://docbook.sf.net/el/productnumber</xsl:text>
+    </xsl:with-param>
+  </xsl:call-template>
+  <xsl:call-template name="log.message">
+    <xsl:with-param name="level">Note</xsl:with-param>
+    <xsl:with-param name="source" select="$refname"/>
+    <xsl:with-param name="context-desc">meta version</xsl:with-param>
+    <xsl:with-param name="message">
+      <xsl:text>no refentry/refmeta/refmiscinfo@class=version</xsl:text>
+    </xsl:with-param>
+  </xsl:call-template>
+  <xsl:call-template name="log.message">
+    <xsl:with-param name="level">Note</xsl:with-param>
+    <xsl:with-param name="source" select="$refname"/>
+    <xsl:with-param name="context-desc">meta version</xsl:with-param>
+    <xsl:with-param name="message">
+      <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
+    </xsl:with-param>
+  </xsl:call-template>
 </xsl:template>
 
 <!-- ==================================================================== -->
@@ -1071,32 +1091,6 @@
                 </xsl:call-template>
               </xsl:when>
               <xsl:otherwise>
-                <xsl:if test="$refentry.meta.get.quietly = 0">
-                  <xsl:call-template name="log.message">
-                    <xsl:with-param name="level">Note</xsl:with-param>
-                    <xsl:with-param name="source" select="$refname"/>
-                    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-                    <xsl:with-param name="message">
-                      <xsl:text>no titled ancestor of refentry</xsl:text>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                  <xsl:call-template name="log.message">
-                    <xsl:with-param name="level">Note</xsl:with-param>
-                    <xsl:with-param name="source" select="$refname"/>
-                    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-                    <xsl:with-param name="message">
-                      <xsl:text>no refentry/refmeta/refmiscinfo@class=manual</xsl:text>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                  <xsl:call-template name="log.message">
-                    <xsl:with-param name="level">Note</xsl:with-param>
-                    <xsl:with-param name="source" select="$refname"/>
-                    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-                    <xsl:with-param name="message">
-                      <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                </xsl:if>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:otherwise>
@@ -1108,7 +1102,7 @@
     <xsl:when test="not($Manual = '')">
       <xsl:copy-of select="$Manual"/>
     </xsl:when>
-    <!-- * if no Manual, use contents of specified Fallback (if any) -->
+    <!-- * if no Manual, use contents of specified fallback (if any) -->
     <xsl:when test="not($prefs/@fallback = '')">
       <xsl:variable name="manual.fallback">
         <xsl:call-template name="evaluate.info.profile">
@@ -1116,13 +1110,37 @@
           <xsl:with-param name="info" select="$info"/>
         </xsl:call-template>
       </xsl:variable>
+      <!-- * At this point, we know that we don't have properly marked-up -->
+      <!-- * mnual metadata, so even if we do have manul fallback -->
+      <!-- * content, we still report to the user that it should be -->
+      <!-- * marked up properly instead. -->
+      <xsl:if test="$refentry.meta.get.quietly = 0">
+        <xsl:call-template name="report.missing.manual">
+          <xsl:with-param name="refname" select="$refname"/>
+        </xsl:call-template>
+      </xsl:if>
       <xsl:choose>
         <xsl:when test="not($manual.fallback = '')">
           <xsl:value-of select="$manual.fallback"/>
+          <xsl:if test="$refentry.meta.get.quietly = 0">
+            <xsl:call-template name="log.message">
+              <xsl:with-param name="level">Warn</xsl:with-param>
+              <xsl:with-param name="source" select="$refname"/>
+              <xsl:with-param name="context-desc">meta manual</xsl:with-param>
+              <xsl:with-param name="message">
+                <xsl:text>using</xsl:text>
+                <xsl:text> "</xsl:text>
+                <xsl:value-of select="$manual.fallback"/>
+                <xsl:text>" </xsl:text>
+                <xsl:text>for "manual"</xsl:text>
+              </xsl:with-param>
+            </xsl:call-template>
+          </xsl:if>
         </xsl:when>
         <xsl:otherwise>
+          <!-- * we have nothing appropriate to use for manual, and no fallback -->
+          <!-- * content, so report insert a fixme -->
           <xsl:text>[FIXME: manual]</xsl:text>
-          <xsl:if test="$refentry.meta.get.quietly = 0">
             <xsl:call-template name="log.message">
               <xsl:with-param name="level">Warn</xsl:with-param>
               <xsl:with-param name="source" select="$refname"/>
@@ -1136,8 +1154,9 @@
       </xsl:choose>
     </xsl:when>
     <xsl:otherwise>
+      <!-- * we have nothing appropriate to use for manual, and no fallback -->
+      <!-- * given, so insert a fixme -->
       <xsl:text>[FIXME: manual]</xsl:text>
-      <xsl:if test="$refentry.meta.get.quietly = 0">
         <xsl:call-template name="log.message">
           <xsl:with-param name="level">Warn</xsl:with-param>
           <xsl:with-param name="source" select="$refname"/>
@@ -1151,6 +1170,33 @@
   </xsl:choose>
 </xsl:template>
 
+<xsl:template name="report.missing.manual">
+  <xsl:param name="refname"/>
+  <xsl:call-template name="log.message">
+    <xsl:with-param name="level">Note</xsl:with-param>
+    <xsl:with-param name="source" select="$refname"/>
+    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
+    <xsl:with-param name="message">
+      <xsl:text>no titled ancestor of refentry</xsl:text>
+    </xsl:with-param>
+  </xsl:call-template>
+  <xsl:call-template name="log.message">
+    <xsl:with-param name="level">Note</xsl:with-param>
+    <xsl:with-param name="source" select="$refname"/>
+    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
+    <xsl:with-param name="message">
+      <xsl:text>no refentry/refmeta/refmiscinfo@class=manual</xsl:text>
+    </xsl:with-param>
+  </xsl:call-template>
+  <xsl:call-template name="log.message">
+    <xsl:with-param name="level">Note</xsl:with-param>
+    <xsl:with-param name="source" select="$refname"/>
+    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
+    <xsl:with-param name="message">
+      <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
+    </xsl:with-param>
+  </xsl:call-template>
+</xsl:template>
 <!-- ====================================================================== -->
 <doc:template name="get.refentry.metadata.prefs" xmlns="">
   <refpurpose>Gets user preferences for refentry metadata gathering</refpurpose>
diff --git a/xsl/params/refentry.manual.fallback.profile.xml b/xsl/params/refentry.manual.fallback.profile.xml
index 07ba3bf60..636278568 100644
--- a/xsl/params/refentry.manual.fallback.profile.xml
+++ b/xsl/params/refentry.manual.fallback.profile.xml
@@ -16,7 +16,7 @@
 <refsynopsisdiv>
 <src:fragment xml:id="refentry.manual.fallback.profile.frag">
 <xsl:param name="refentry.manual.fallback.profile">
-refmeta/refmiscinfo[1]/node()</xsl:param>
+refmeta/refmiscinfo[not(@class = 'date')][1]/node()</xsl:param>
 </src:fragment>
 </refsynopsisdiv>
 
diff --git a/xsl/params/refentry.source.fallback.profile.xml b/xsl/params/refentry.source.fallback.profile.xml
index e0fe91214..1761378a9 100644
--- a/xsl/params/refentry.source.fallback.profile.xml
+++ b/xsl/params/refentry.source.fallback.profile.xml
@@ -16,7 +16,7 @@
 <refsynopsisdiv>
 <src:fragment xml:id="refentry.source.fallback.profile.frag">
 <xsl:param name="refentry.source.fallback.profile">
-refmeta/refmiscinfo[1]/node()</xsl:param>
+refmeta/refmiscinfo[not(@class = 'date')][1]/node()</xsl:param>
 </src:fragment>
 </refsynopsisdiv>
 
-- 
2.40.0