Răsfoiți Sursa

Replace topic popup attribute which didnt do anything with a new unlisted attribute to prevent the two 'notes' topics from appearing in the introduction listing.

Martijn Laan 4 luni în urmă
părinte
comite
6d61ebd5db
3 a modificat fișierele cu 7 adăugiri și 7 ștergeri
  1. 1 1
      ISHelp/ispp.dtd
  2. 4 4
      ISHelp/ispp.xml
  3. 2 2
      ISHelp/ispp.xsl

+ 1 - 1
ISHelp/ispp.dtd

@@ -3,7 +3,7 @@
 <!ELEMENT topic     (title|subtopicstitle|keywords|syntax|description|(topic|section)*)+>
 <!ELEMENT topic     (title|subtopicstitle|keywords|syntax|description|(topic|section)*)+>
 <!ATTLIST topic
 <!ATTLIST topic
   id      ID        #IMPLIED
   id      ID        #IMPLIED
-  popup   (yes|no)  "no"
+  unlisted (yes|no) "no"
   usetitle (yes|no) "yes">
   usetitle (yes|no) "yes">
 
 
 <!ELEMENT title     (#PCDATA)*>
 <!ELEMENT title     (#PCDATA)*>

+ 4 - 4
ISHelp/ispp.xml

@@ -24,8 +24,8 @@
  <!ENTITY endsub  '<tt><link href="sub">endsub</link></tt>'>
  <!ENTITY endsub  '<tt><link href="sub">endsub</link></tt>'>
  <!ENTITY for     '<tt><link href="for">for</link></tt>'>
  <!ENTITY for     '<tt><link href="for">for</link></tt>'>
  <!ENTITY expr    '<tt>expr</tt>'> <!-- not a directive -->
  <!ENTITY expr    '<tt>expr</tt>'> <!-- not a directive -->
- <!ENTITY curtrans '<link href="current-translation" popup="yes">current preprocessor output</link>'>
- <!ENTITY translation '<link href="translation" popup="yes">preprocessor output</link>'>
+ <!ENTITY curtrans '<link href="current-translation">current preprocessor output</link>'>
+ <!ENTITY translation '<link href="translation">preprocessor output</link>'>
  <!ENTITY builtins '<link href="builtinsiss">ISPPBuiltins.iss</link>'>
  <!ENTITY builtins '<link href="builtinsiss">ISPPBuiltins.iss</link>'>
  <!ENTITY dash "&#8211;">
  <!ENTITY dash "&#8211;">
 ]>
 ]>
@@ -2114,13 +2114,13 @@ The first group of options (<tt>option</tt>) controls the general options, while
 				<p>Example: <tt>iscc /$c- /Pu+ "/DLicenseFile=Trial License.txt" /Ic:\inc;d:\inc /Jdefines.iss "c:\isetup\samples\my script.iss"</tt></p>
 				<p>Example: <tt>iscc /$c- /Pu+ "/DLicenseFile=Trial License.txt" /Ic:\inc;d:\inc /Jdefines.iss "c:\isetup\samples\my script.iss"</tt></p>
 			</description>
 			</description>
 		</topic>
 		</topic>
-		<topic id="translation" popup="yes">
+		<topic id="translation" unlisted="yes">
 			<title>Preprocessor output</title>
 			<title>Preprocessor output</title>
 			<description header="no">
 			<description header="no">
 				<p>Preprocessor output refers to the preprocessed version of the script.</p>
 				<p>Preprocessor output refers to the preprocessed version of the script.</p>
 			</description>
 			</description>
 		</topic>
 		</topic>
-		<topic id="current-translation" popup="yes">
+		<topic id="current-translation" unlisted="yes">
 			<title>Current preprocessor output</title>
 			<title>Current preprocessor output</title>
 			<description header="no">
 			<description header="no">
 				<p>Current preprocessor output refers to the &translation; up to the line which ISPP is currently processing.</p>
 				<p>Current preprocessor output refers to the &translation; up to the line which ISPP is currently processing.</p>

+ 2 - 2
ISHelp/ispp.xsl

@@ -9,7 +9,7 @@
 
 
   <xsl:comment>
   <xsl:comment>
     Inno Setup Preprocessor Reference
     Inno Setup Preprocessor Reference
-    Copyright (C) 1997-2024 Jordan Russell
+    Copyright (C) 1997-2025 Jordan Russell
     Portions Copyright (C) 2000-2024 Martijn Laan
     Portions Copyright (C) 2000-2024 Martijn Laan
     For conditions of distribution and use, see LICENSE.TXT.
     For conditions of distribution and use, see LICENSE.TXT.
     Portions Copyright (C) 2001-2004 Alex Yackimoff
     Portions Copyright (C) 2001-2004 Alex Yackimoff
@@ -52,7 +52,7 @@
           </xsl:when>
           </xsl:when>
           <xsl:otherwise>
           <xsl:otherwise>
             <xsl:for-each select="topic">
             <xsl:for-each select="topic">
-              <xsl:if test="title">
+              <xsl:if test="title and not(@unlisted='yes')">
                 <li><link topic="{translate(@id,$ucletters,$lcletters)}"><xsl:value-of select="title"/></link></li>
                 <li><link topic="{translate(@id,$ucletters,$lcletters)}"><xsl:value-of select="title"/></link></li>
               </xsl:if>
               </xsl:if>
             </xsl:for-each>
             </xsl:for-each>