Remove the files which are copied to ISPPHelp from ISHelp by synch-isfiles.bat from Git. Compile.bat will still work on first run on clean checkout because it calls synch-isfiles.bat.

ISPPHelp/.gitignore

@@ -1 +1,2 @@
+isetup.dtd
 ispp_generated.xml

ISPPHelp/Staging/.gitignore

@@ -1,3 +1,7 @@
+contents.css
+contents.js
+styles.css
+topic.js
 contents.htm
 contentsindex.js
 hh_generated_contents.hhc

ISPPHelp/Staging/contents.css

@@ -1,125 +0,0 @@
-/*
-  Inno Setup
-  Copyright (C) 1997-2024 Jordan Russell
-  Portions by Martijn Laan
-  For conditions of distribution and use, see LICENSE.TXT.
-
-  Style sheet used by contents.htm
-*/
-
-BODY {
-	font-family: "Segoe UI", Tahoma, sans-serif;
-	font-size: 75%;   /* 9pt (12px/16px) */
-	margin: 0;
-	color: WindowText;
-	background-color: Window;
-}
-INPUT {
-	font: inherit;
-}
-
-
-#tabbar {
-	background-color: ButtonFace;
-	color: WindowText;
-	padding-top: 6px;
-	cursor: default;
-	-moz-user-select: none;
-}
-#tabbar TD {
-	padding: 0;
-	font-weight: bold;
-}
-#tabbar TD.selectedtab {
-	background-color: Window;
-	padding: 2px 6px 3px 6px;
-	border-bottom: none;
-}
-#tabbar TD.unselectedtab {
-	padding: 3px 7px 2px 7px;
-	cursor: pointer;
-}
-#tabbar A {
-	background-color: transparent;
-	color: WindowText;
-	text-decoration: none;
-	outline: none;
-}
-#tabbar TD.selectedtab A {
-	cursor: default;
-}
-#tabbar TD.unselectedtab:hover A {
-	color: #0078D4;
-}
-
-
-#tabbody-contents A {
-	/* Using inline-block because otherwise, second line of wrapped text
-	   doesn't line up with first, and on IE6, the focus rect doesn't extend
-	   all the way to the edges of Highlight area */
-	display: inline-block;
-	padding: 1px 2px;
-}
-#tabbody-contents A:link,
-#tabbody-contents A:visited,
-#tabbody-contents A:active {
-	color: WindowText;
-	background-color: transparent;
-	text-decoration: none;
-}
-#tabbody-contents A:hover {
-	color: #0078D4;
-	background-color: transparent;
-}
-#tabbody-contents A.selectedlink:link,
-#tabbody-contents A.selectedlink:visited {
-	color: WindowText;
-	background-color: ButtonFace;
-}
-/* It would be cleaner to use :focus, but IE<8 doesn't support it */
-#tabbody-contents A.focusedlink:link,
-#tabbody-contents A.focusedlink:visited {
-	color: HighlightText;
-	background-color: Highlight;
-	outline-color: WindowText;   /* needed for focus rect to appear on Firefox (3.5) */
-}
-#tabbody-contents TABLE {
-	border-collapse: collapse;
-}
-#tabbody-contents TD {
-	padding: 0 0 1px 0;
-}
-#tabbody-contents IMG {
-	width: 16px;
-	height: 16px;
-	border-style: none;
-	padding-right: 2px;
-}
-
-
-#tabbody-index {
-	padding: 4px 2px;
-	white-space: nowrap;
-	-moz-user-select: none;
-}
-#tabbody-index A {
-	display: inline-block;
-	min-width: 100%;
-	overflow: visible;
-}
-#tabbody-index A:link,
-#tabbody-index A:visited,
-#tabbody-index A:active {
-	color: WindowText;
-	background-color: transparent;
-	text-decoration: none;
-}
-#tabbody-index A:hover {
-	color: #0078D4;
-	background-color: transparent;
-}
-#tabbody-index A:focus {
-	color: HighlightText;
-	background-color: Highlight;
-	outline-color: WindowText;   /* needed for focus rect to appear on Firefox (3.5) */
-}

ISPPHelp/Staging/contents.js

@@ -1,286 +0,0 @@
-/*
-  Inno Setup
-  Copyright (C) 1997-2024 Jordan Russell
-  Portions by Martijn Laan
-  For conditions of distribution and use, see LICENSE.TXT.
-
-  JavaScript code used by contents.htm
-*/
-
-function get_absolute_top(obj)
-{
-	var y = obj.offsetTop;
-	while ((obj = obj.offsetParent)) {
-		y += obj.offsetTop;
-	}
-	return y;
-}
-
-function get_viewport_element()
-{
-	// On IE 6 in Standards mode & Firefox 1.5, properties like
-	// scrollTop and clientHeight are set on document.documentElement.
-	// On IE 5, they're on document.body; the ones on documentElement
-	// are zero.
-
-	if (document.documentElement.clientHeight) {
-		return document.documentElement;
-	} else {
-		return document.body;
-	}
-}
-
-function is_element_displayed(element)
-{
-	do {
-		if (element.style.display == "none") return false;
-	} while (element != document.body && (element = element.parentNode));
-
-	return true;
-}
-
-function ensure_elements_visible(elementTop, elementBottom)
-{
-	if (!is_element_displayed(elementTop) || !is_element_displayed(elementBottom)) {
-		return;
-	}
-
-	var yTop = get_absolute_top(elementTop);
-	var yBottom = get_absolute_top(elementBottom) + elementBottom.offsetHeight;
-
-	// Subtract 1 from yTop so that if elementTop contains a link with text that starts at
-	// exactly yTop, the link's focus rectangle won't get chopped off on Firefox (3.x),
-	// where focus rectangles are inflated by 1px (unlike IE).
-	// (Adding 1 to yBottom isn't necessary since our TDs have 1px of bottom padding.)
-	if (yTop > 0) yTop--;
-
-	// Make yTop and yBottom relative to the top of the visible client area
-	var viewportScrollTop = get_viewport_element().scrollTop;
-	yTop -= viewportScrollTop;
-	yBottom -= viewportScrollTop;
-
-	var clientHeight = get_viewport_element().clientHeight;
-
-	if (yTop < 0) {
-		// Scroll up to make the top of elementTop visible
-		window.scrollBy(0, yTop);
-	} else if (yBottom > clientHeight) {
-		// How far do we have to scroll down for elementBottom to be entirely visible?
-		var delta = yBottom - clientHeight;
-		// Don't allow any part of elementTop to be scrolled off the top
-		if (delta > yTop) delta = yTop;
-		if (delta > 0) window.scrollBy(0, delta);
-	}
-}
-
-function toggle_node(id)
-{
-	var objContent = document.getElementById("nodecontent_" + id);
-	var expanding = (objContent.style.display == "none");
-	objContent.style.display = expanding ? "" : "none";
-
-	document.getElementById("nodeimg_" + id).src =
-		expanding ? "images/contentsheadopen.png" : "images/contentsheadclosed.png";
-
-	if (expanding) {
-		// Scroll expanded items into view. This is similar to calling scrollIntoView() but
-		// doesn't do any scrolling if the items are already fully visible.
-
-		var objCaption = document.getElementById("nodecaption_" + id);
-		ensure_elements_visible(objCaption, objContent);
-	}
-}
-
-function init_contents(toggleNode)
-{
-	var i;
-	if (toggleNode == 0) {
-		for (i = 1; document.getElementById("nodecontent_" + i) != null; i++) {
-			toggle_node(i);
-		}
-	} else {
-		toggle_node(toggleNode);
-	}
-
-	var elements = document.getElementById("tabbody-contents").getElementsByTagName("a");
-	for (i = 0; i < elements.length; i++) {
-		elements[i].onfocus = node_focused;
-		elements[i].onblur = node_blurred;
-	}
-}
-
-var curSelectedNode = null;
-var curFocusedNode = null;
-
-function update_selected_node_class()
-{
-	if (curSelectedNode) {
-		var newClass = (curFocusedNode == curSelectedNode) ? "focusedlink" : "selectedlink";
-		if (curSelectedNode.className != newClass) {
-			curSelectedNode.className = newClass;
-		}
-	}
-}
-
-function set_selected_node(newSel)
-{
-	if (curSelectedNode == newSel) return;
-
-	if (curSelectedNode) {
-		curSelectedNode.className = "";
-	}
-	curSelectedNode = newSel;
-	if (curSelectedNode) {
-		update_selected_node_class();
-
-		// Expand parent nodes (may scroll)
-		var p = curSelectedNode;
-		while ((p = p.parentNode) && p.id != "tabbody-contents") {
-			if (p.id && p.id.indexOf("nodecontent_") == 0 && p.style.display == "none") {
-				toggle_node(p.id.substring(12));
-			}
-		}
-
-		// Then scroll the node's parent TR into view
-		p = curSelectedNode.parentNode.parentNode;
-		ensure_elements_visible(p, p);
-	}
-}
-
-function node_focused(evt)
-{
-	curFocusedNode = evt ? evt.target : event.srcElement;
-	if (curFocusedNode == curSelectedNode) {
-		update_selected_node_class();
-	} else {
-		set_selected_node(curFocusedNode);
-	}
-}
-
-function node_blurred(evt)
-{
-	curFocusedNode = null;
-	update_selected_node_class();
-}
-
-var topic_name_regexp = /(?:^|[/\\])topic_([a-z0-9_\-]+)\.htm$/;
-
-function topic_name_from_path(path)
-{
-	var matches = path.match(topic_name_regexp);
-	return matches ? matches[1] : "";
-}
-
-function sync_contents()
-{
-	var bodyFrame = window.parent.frames["bodyframe"];
-	if (!bodyFrame) return;
-
-	var bodyTopic = topic_name_from_path(bodyFrame.window.location.pathname);
-	if (bodyTopic == "") return;
-
-	// If the currently selected node already points to bodyTopic, just return.
-	// This check is needed to keep the selection from jumping to "[Run] section"
-	// when "[UninstallRun] section" is clicked (both have the same target topic).
-	if (curSelectedNode && topic_name_from_path(curSelectedNode.getAttribute("href")) == bodyTopic) {
-		return;
-	}
-
-	var elements = document.getElementById("tabbody-contents").getElementsByTagName("a");
-	var i;
-	for (i = 0; i < elements.length; i++) {
-		if (topic_name_from_path(elements[i].getAttribute("href")) == bodyTopic) {
-			if (curSelectedNode != elements[i]) {
-				// If we're changing the selection while a node is currently
-				// focused -- which can happen if Back is pressed after
-				// clicking/selecting a node -- we need to move the focus.
-				// Otherwise, the focus rectangle would stay where it is,
-				// while the highlight moved to a different node.
-
-				if (curFocusedNode) elements[i].focus();
-				set_selected_node(elements[i]);
-			}
-			break;
-		}
-	}
-}
-
-function select_tab(newTab)
-{
-	var tabs = ["contents", "index"];
-
-	var i;
-	for (i = 0; i < tabs.length; i++) {
-		if (tabs[i] != newTab) {
-			document.getElementById("tab-" + tabs[i]).className = "unselectedtab";
-			document.getElementById("tabbody-" + tabs[i]).style.display = "none";
-		}
-	}
-
-	document.getElementById("tab-" + newTab).className = "selectedtab";
-	document.getElementById("tabbody-" + newTab).style.display = "";
-
-	if (newTab == "index") init_index_tab();
-}
-
-var indexTabInited = false;
-
-function init_index_tab()
-{
-	if (indexTabInited) return;
-	indexTabInited = true;
-
-	var script = document.createElement("script");
-	script.src = "contentsindex.js";
-	script.type = "text/javascript";
-	document.getElementsByTagName("head")[0].appendChild(script);
-
-	// contentsindex.js calls init_index_tab_elements()
-}
-
-function init_index_tab_elements()
-{
-	var html = "ERROR!";
-
-	if (contentsIndexData) {
-		var len = contentsIndexData.length;
-		var htmlArray = new Array(len);
-		var i, matches;
-		var re = /^([^#:]+)(#[^:]+)?:(.+)$/
-
-		for (i = 0; i < len; i++) {
-			matches = contentsIndexData[i].match(re);
-			if (!matches) break;
-			htmlArray[i] = '<a href="topic_' + matches[1] + ".htm" +
-				((matches[2] !== undefined) ? matches[2] : "") +
-				'" target="bodyframe">' + matches[3] + "</a><br />";
-		}
-
-		// Note: On IE6, joining an array is ~5x faster than using "html +=" to build a long string
-		if (i == len) {   // were all processed?
-			html = htmlArray.join("");
-		}
-	}
-
-	var indexBody = document.getElementById("tabbody-index");
-	indexBody.onclick = index_tab_element_clicked;
-	indexBody.innerHTML = html;
-}
-
-function index_tab_element_clicked(evt)
-{
-	// If an index link is clicked and only the hash changes on bodyframe
-	// (i.e. still same page), bodyframe doesn't receive any notification.
-	// So we must manually tell it to update the highlight.
-
-	var element = evt ? evt.target : event.srcElement;
-	if (element.tagName.toLowerCase() == "a") {
-		var href = element.getAttribute("href");
-		if (href != null && href != "" && element.getAttribute("target") == "bodyframe") {
-			var bodyFrame = window.parent.frames["bodyframe"];
-			if (bodyFrame) {
-				bodyFrame.set_href_and_highlight_anchor(href);
-			}
-		}
-	}
-}

ISPPHelp/Staging/images/.gitignore

@@ -0,0 +1,4 @@
+contentsheadclosed.png
+contentsheadopen.png
+contentstopic.png
+extlink.png

ISPPHelp/Staging/topic.js

@@ -1,172 +0,0 @@
-/*
-  Inno Setup
-  Copyright (C) 1997-2020 Jordan Russell
-  Portions by Martijn Laan
-  For conditions of distribution and use, see LICENSE.TXT.
-
-  JavaScript code used by topic_*.htm
-*/
-
-window.onload = topic_loaded;
-
-var redirectBox = null;
-var topicRedirectURL;
-var curHighlightedAnchor = null;
-var lastHash = "";
-
-function is_href_local_anchor(path)
-{
-	// Returns true if an A element's HREF points to an anchor on the current page.
-
-	if (path.charAt(0) == "#") {
-		return true;
-	}
-
-	// On IE (6), # HREFs are prepended with a full path when read via DOM.
-	// Check if 'path' includes a hash, and if the part before the hash
-	// matches the current window.location.
-
-	var re = /^([^#]+)(#.*)?$/;
-	var pathMatches = path.match(re);
-	if (pathMatches && pathMatches[2] !== undefined && pathMatches[2] != "") {
-		var curLocationMatches = window.location.href.match(re);
-		if (curLocationMatches && curLocationMatches[1] == pathMatches[1]) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
-function get_viewport_element()
-{
-	// On IE 6 in Standards mode & Firefox 1.5, properties like
-	// scrollTop and clientHeight are set on document.documentElement.
-	// On IE 5, they're on document.body; the ones on documentElement
-	// are zero.
-
-	if (document.documentElement.clientHeight) {
-		return document.documentElement;
-	} else {
-		return document.body;
-	}
-}
-
-function create_redirect_box()
-{
-	redirectBox = document.createElement("div");
-	redirectBox.id = "redirectbox";
-	redirectBox.innerHTML = "Loading contents...";
-	redirectBox.style.visibility = "hidden";
-	document.body.appendChild(redirectBox);
-
-	var viewport = get_viewport_element();
-	redirectBox.style.left = Math.max(0, Math.floor(viewport.scrollLeft + (viewport.clientWidth - redirectBox.offsetWidth) / 2)) + "px";
-	redirectBox.style.top = Math.max(0, Math.floor(viewport.scrollTop + (viewport.clientHeight - redirectBox.offsetHeight) / 2)) + "px";
-	redirectBox.style.visibility = "";
-}
-
-function topic_loaded()
-{
-	document.body.onclick = topic_element_clicked;
-	update_anchor_highlight();
-
-	var matches;
-
-	if (window == window.top &&
-	    (window.location.protocol == "http:" || window.location.protocol == "https:") &&
-	    (window.location.hostname == "jrsoftware.org" || window.location.hostname == "www.jrsoftware.org") &&
-	    (matches = window.location.pathname.match(/^(\/.+\/)topic_([a-z0-9_\-]+)\.htm$/)) &&
-	    window.location.hash != "#noredir") {
-
-		topicRedirectURL = matches[1] + "index.php?topic=" + matches[2];
-
-		if ((matches = window.location.hash.match(/^#([a-zA-Z0-9_\-.]+)$/))) {
-			topicRedirectURL += "&anchor=" + matches[1];
-		}
-
-		create_redirect_box();
-		window.setTimeout(topic_redirect, 1500);
-	}
-
-	// HTML Help: If an Index entry is clicked and only the hash changes,
-	// we don't receive any notification by default.
-	if (window.location.protocol == "mk:") {
-		if ("onhashchange" in window) {
-			// IE 8+ supports the onhashchange event.
-			window.onhashchange = update_anchor_highlight;
-		} else {
-			// On older IE versions, we have to poll.
-			window.setInterval(update_anchor_highlight, 300);
-		}
-	}
-}
-
-function topic_redirect()
-{
-	document.body.removeChild(redirectBox);
-	redirectBox = null;
-
-	window.location.href = topicRedirectURL;
-}
-
-function set_anchor_highlight(newAnchor)
-{
-	if (curHighlightedAnchor != newAnchor) {
-		if (curHighlightedAnchor) curHighlightedAnchor.className = "";
-		curHighlightedAnchor = newAnchor;
-		if (curHighlightedAnchor) curHighlightedAnchor.className = "highlighted";
-	}
-}
-
-function update_anchor_highlight()
-{
-	var anchorName = "";
-	var hash = window.location.hash;
-	if (hash === lastHash) {
-		// This function can be called from setInterval,
-		// so exit quickly if the hash hasn't changed.
-		return;
-	}
-	lastHash = hash;
-	if (hash.charAt(0) == "#") {
-		anchorName = hash.substr(1);
-	}
-
-	var newAnchor = null;
-	if (anchorName != "") {
-		var anchors = document.getElementsByTagName("a");
-		var i;
-		for (i = 0; i < anchors.length; i++) {
-			if (anchors[i].getAttribute("name") === anchorName) {
-				newAnchor = anchors[i];
-				break;
-			}
-		}
-	}
-	set_anchor_highlight(newAnchor);
-}
-
-function set_href_and_highlight_anchor(href)
-{
-	// At the moment an onclick event is fired, window.location.hash hasn't
-	// been updated yet. This function synchronously updates window.location,
-	// then moves the highlight to the new hash's anchor.
-
-	// Clear current highlight first, so user doesn't see it scrolling.
-	lastHash = "";
-	set_anchor_highlight(null);
-	window.location.href = href;
-	update_anchor_highlight();
-}
-
-function topic_element_clicked(evt)
-{
-	var element = evt ? evt.target : event.srcElement;
-	if (element.tagName.toLowerCase() == "a") {
-		var href = element.getAttribute("href");
-		if (href != null && is_href_local_anchor(href)) {
-			set_href_and_highlight_anchor(href);
-		}
-	}
-}

ISPPHelp/isetup.dtd

@@ -1,92 +0,0 @@
-<!--
-  Inno Setup
-  Copyright (C) 1997-2006 Jordan Russell
-  Portions by Martijn Laan
-  For conditions of distribution and use, see LICENSE.TXT.
-
-  Document Type Definition for isetup.xml
--->
-
-<!ENTITY nbsp "&#160;"> 
-<!ENTITY copy "&#169;"> 
-
-<!ENTITY % _inlineExceptLink "b | br | i | tt | u">
-<!ENTITY % _inline "%_inlineExceptLink; | link | extlink | a | anchorlink">
-<!ENTITY % _block "p | heading | pre | precode | example | examples | indent | ul | ol | dl | paramlist | flaglist | table">
-
-<!ENTITY % Inline "(#PCDATA | %_inline;)*">
-<!ENTITY % InlineExceptLink "(#PCDATA | %_inlineExceptLink;)*">
-<!ENTITY % Block "(%_block;)*">
-<!ENTITY % InlineOrBlock "(#PCDATA | %_inline; | %_block;)*">
-
-<!ELEMENT ishelp (contents?, (topic | setuptopic)*)>
-<!ATTLIST ishelp version CDATA #REQUIRED>
-
-<!ELEMENT contents ((contentstopic | contentsheading)*)>
-<!ELEMENT contentstopic EMPTY>
-<!ATTLIST contentstopic title CDATA #REQUIRED topic CDATA #REQUIRED>
-<!ELEMENT contentsheading ((contentstopic | contentsheading)*)>
-<!ATTLIST contentsheading title CDATA #REQUIRED>
-
-<!ELEMENT topic (keyword*, body)>
-<!ATTLIST topic name CDATA #REQUIRED title CDATA #REQUIRED>
-<!ELEMENT keyword EMPTY>
-<!ATTLIST keyword value CDATA #REQUIRED anchor CDATA #IMPLIED>
-
-<!ELEMENT setuptopic (keyword*, setupformat?, setupvalid?, setupdefault?, body)>
-<!ATTLIST setuptopic directive CDATA #REQUIRED title CDATA #IMPLIED>
-<!ELEMENT setupformat %Inline;>
-<!ELEMENT setupvalid %Inline;>
-<!ELEMENT setupdefault %Inline;> 
-
-<!ELEMENT body %Block;>
-
-<!-- Inline elements -->
-
-<!ELEMENT b %Inline;>
-<!ELEMENT br EMPTY>
-<!ELEMENT i %Inline;>
-<!ELEMENT tt %Inline;>
-<!ELEMENT u %Inline;>
-<!ELEMENT link %InlineExceptLink;>
-<!ATTLIST link topic CDATA #REQUIRED anchor CDATA #IMPLIED>
-<!ELEMENT extlink %InlineExceptLink;>
-<!ATTLIST extlink href CDATA #REQUIRED>
-<!ELEMENT a %InlineExceptLink;>
-<!ATTLIST a name CDATA #REQUIRED>
-<!ELEMENT anchorlink %InlineExceptLink;>
-<!ATTLIST anchorlink name CDATA #REQUIRED>
-
-<!-- Simple block elements -->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p margin (yes|no) "yes">
-<!ELEMENT heading %Inline;>
-<!ELEMENT pre %Inline;>
-<!ELEMENT precode %Inline;>
-<!ELEMENT example %InlineOrBlock;>
-<!ELEMENT examples %InlineOrBlock;>
-<!ELEMENT indent %Block;>
-
-<!-- Fancier block elements -->
-
-<!ELEMENT ul (li|ul)*>
-<!ATTLIST ul appearance (normal|compact) "normal">
-<!ELEMENT ol (li*)>
-<!ELEMENT li %InlineOrBlock;>
-
-<!ELEMENT dl (dt, dd)*>
-<!ELEMENT dt %Inline;>
-<!ELEMENT dd %Block;>
-
-<!ELEMENT paramlist (param*)>
-<!ELEMENT param %Block;>
-<!ATTLIST param name CDATA #REQUIRED required (yes|no) "no">
-
-<!ELEMENT flaglist (flag*)>
-<!ELEMENT flag %Block;>
-<!ATTLIST flag name CDATA #REQUIRED>
-
-<!ELEMENT table (tr*)>
-<!ELEMENT tr (td+)>
-<!ELEMENT td %InlineOrBlock;>