From 8cfff8f3700e0f4a93781347c7b1374629c5433f Mon Sep 17 00:00:00 2001
From: Sanel Zukan <karijes@users.sf.net>
Date: Tue, 5 Aug 2008 14:28:46 +0000
Subject: [PATCH] EdeManual will use tidy tool if available to reformat html
 pages. Added EdeManualWithToc rule that will build Table of Contents on page.

---
 build/Doc.jam | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/build/Doc.jam b/build/Doc.jam
index 0be9b30..6a785f7 100644
--- a/build/Doc.jam
+++ b/build/Doc.jam
@@ -15,7 +15,7 @@ MANUALDIR = "$(DOCDIR)/manual" ;
 # Must be relative to "docs" dir
 MANUALICONS = "images" ;
 
-# EdeManual [file] : [optinal-images] ;
+# EdeManual [file] : [optinal-images] : "make-toc" ;
 # Creates [file].html via asciidoc. If [optinal-images] are
 # given, they will be copied in $(DOCICONS).
 rule EdeManual
@@ -25,6 +25,9 @@ rule EdeManual
 		return ;
 	}
 
+	# see if we have tidy installed
+	local tidy_paths = [ Glob $(PATH) : tidy ] ;
+
 	local html_ext = ".html" ;
 	local path = $(SEARCH_SOURCE) ;
 
@@ -46,7 +49,19 @@ rule EdeManual
 		# set output to $(MANUALDIR) directory
 		MakeLocate $(target) : $(MANUALDIR) ;
 
-		AsciiDoc1 $(target) : $(source) ;
+		# a hack to create Table of Content
+		# seems that this is the only way asciidoc can do it
+		if $(3) = "make-toc" {
+			TOC_FLAG on $(target) = "-a toc" ;
+		}
+
+		if ! $(tidy_paths) {
+			AsciiDoc1 $(target) : $(source) ;
+		} else {
+			TIDY on $(target) = "tidy" ;
+			AsciiDoc2 $(target) : $(source) ;
+		}
+
 		LocalClean clean : $(target) ;
 	}
 
@@ -70,9 +85,24 @@ rule EdeManual
 	}
 }
 
+# EdeManualWithToc [file] : [optinal-images] ;
+# The same as EdeManual, but it will build Table of Contents
+rule EdeManualWithToc
+{
+	EdeManual $(1) : $(2) : "make-toc" ;
+}
+
 actions AsciiDoc1
 {
-	$(ASCIIDOC) -a icons -a iconsdir=$(MANUALICONS) -a edeversion="EDE 2.0" -o $(<) $(>)
+	$(ASCIIDOC) $(TOC_FLAG) -a icons -a iconsdir=$(MANUALICONS) -a edeversion="EDE 2.0" -o $(<) $(>)
+}
+
+# version with tidy (utility to clean HTML/XHTML code)
+actions AsciiDoc2
+{
+	$(ASCIIDOC) $(TOC_FLAG) -a icons -a iconsdir=$(MANUALICONS) -a edeversion="EDE 2.0" -o "$(<).tmp" $(>)
+	$(TIDY) -q -i "$(<).tmp" > "$(<)"
+	$(RM) "$(<).tmp"
 }
 
 NotFile doc ;