[[ User Guide ]] Use already generated distributed guide json to build user guide pdf"

livecodeali · livecodeali · commit 012fc85a8152 · 2016-02-23T21:39:02.000Z
diff --git a/builder/user-guide-template.html b/builder/user-guide-template.html
@@ -659,12 +659,10 @@
   </head>
   <body>
     <div id="content"/>
+    <script charset="UTF-8" src="@GUIDE_JSON@"></script>
     <script>
-    	var prefix = '@prefix@';
-		var ide_markdown = '@ide-guides@';
-		var repo_markdown = '@repo-guides@';
-
 		function regenerate() {
+			var prefix = '@PREFIX@';
 			// Override the markdown parser's heading generation in order to
 			// generate table of contents.
 			var renderer = new marked.Renderer();
@@ -765,13 +763,14 @@
 			{
 				return '<code class="inline">' + code + '</code>';
 			}
-		
-			var content_html = marked(prefix, { renderer: renderer });
-			guide_source = 'ide';
-			content_html += marked(ide_markdown, { renderer: renderer });
-			guide_source = 'repo';
-			content_html += marked(repo_markdown, { renderer: renderer });
 			
+			var content_html = marked(prefix, { renderer: renderer });
+
+			$.each(tUserGuideData.guides, function( index, value ) {
+				guide_source = value.location;
+				content_html += marked(value.data, { renderer: renderer });
+			});
+		
 			document.getElementById('content').innerHTML = content_html;
 
 			var toc = document.getElementById('table_of_contents');
diff --git a/builder/user_guide_builder.livecodescript b/builder/user_guide_builder.livecodescript
@@ -30,9 +30,6 @@ command guideBuilderRun pEdition, pVersion, pReleaseType, pOutputDir
       Initialize pVersion, pOutputDir
       
       BaseCreate
-      
-      AddIDEGuides
-      AddRepoGuides
             
       OutputGuide
       
@@ -61,23 +58,11 @@ private function OutputGetGuideTitle
 end OutputGetGuideTitle
 
 private command OutputGuide
-   OutputGuideMarkdown
+   OutputGuideJson
    OutputGuideHtml
    OutputGuidePdf
 end OutputGuide
 
-private command OutputGuideMarkdown
-   local tPath
-   put OutputGetGuideFilename("md") into tPath
-   builderLog "report", merge("Writing [[tPath]]")
-   
-   local tMarkdown
-   put sMarkdownText["guide"] into tMarkdown
-   put return & sMarkdownText["ide-guides"] after tMarkdown
-   put return & sMarkdownText["repo-guides"] after tMarkdown
-   FileSetUTF8Contents tPath, tMarkdown
-end OutputGuideMarkdown
-
 private function OutputEscape pMarkdown, pEscapeHtml
    -- Try to do the minimum possible escaping to be able to insert the
    -- markdown into a JavaScript string
@@ -92,16 +77,32 @@ private function OutputEscape pMarkdown, pEscapeHtml
    return pMarkdown
 end OutputEscape
 
+private command OutputGuideJson
+   local tGuideJsonPath
+   put builderGuideFolder() & slash & "distributed_guide.js" into tGuideJsonPath
+   
+   local tGuideJson
+   put FileGetUTF8Contents(tGuideJsonPath) into tGuideJson
+   
+   local tJS
+   put "var tUserGuideData =" & return & "{" & return & tab & quote & "guides" & quote & ":[" into tJS
+   put tGuideJson after tJS
+   put return & tab & "]" & return & "}" after tJS
+   
+   local tGuideJSPath
+   put OutputGetGuideFilename("js") into tGuideJSPath
+   FileSetUTF8Contents tGuideJSPath, tJS
+end OutputGuideJson
+
 private command OutputGuideHtml
    local tHtmlTemplatePath
    put builderSystemFolder() & "/user-guide-template.html" into tHtmlTemplatePath
    
    local tHtml
    put FileGetUTF8Contents(tHtmlTemplatePath) into tHtml
    
-   replace "@prefix@" with OutputEscape(sMarkdownText["guide"], false) in tHtml
-   replace "@ide-guides@" with OutputEscape(sMarkdownText["ide-guides"], true) in tHtml
-   replace "@repo-guides@" with OutputEscape(sMarkdownText["repo-guides"], true) in tHtml
+   replace "@PREFIX@" with OutputEscape(sMarkdownText["guide"], false) in tHtml
+   replace "@GUIDE_JSON@" with OutputGetGuideFilename("js") in tHtml
    
    local tOutpath
    put OutputGetGuideFilename("html") into tOutpath
@@ -164,40 +165,6 @@ private command BaseCreate
 
 end BaseCreate
 
-----------------------------------------------------------------
--- Guide Contents
-----------------------------------------------------------------
-
-private command AddGuide pWhich, pFolder, pFilename
-   local tGuidePath
-   put pFolder & slash & pFilename into tGuidePath
-
-   local tGuideContents
-   put FileGetUTF8Contents(tGuidePath) into tGuideContents
-
-   MarkdownAppend pWhich, tGuideContents
-end AddGuide
-
-private command AddGuides pWhich
-   local tFolder
-   put FileGetPath(pWhich) into tFolder
-   
-   local tGuides
-   put FolderListFiles(tFolder, "md") into tGuides
-   
-   repeat for each line tGuide in tGuides
-      AddGuide pWhich, tFolder, tGuide
-   end repeat
-end AddGuides
-
-private command AddRepoGuides
-   AddGuides "repo-guides"
-end AddRepoGuides
-
-private command AddIDEGuides
-   AddGuides "ide-guides"
-end AddIDEGuides
-
 ----------------------------------------------------------------
 -- File helpers
 ----------------------------------------------------------------
