From 891b87fa82e1ee238f2b5dec183bfcfd3c3a9a83 Mon Sep 17 00:00:00 2001
From: Shamus Hammons <jlhamm@acm.org>
Date: Thu, 12 Jan 2017 10:28:35 -0600
Subject: [PATCH] Fix for "munge" to allow content at chapter level.

---
 master-doc.txt |   8 +++-----
 munge          | Bin 16392 -> 16384 bytes
 munge.cpp      |  30 +++++++++++++++++++++---------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/master-doc.txt b/master-doc.txt
index 92f8e48..b8fa400 100644
--- a/master-doc.txt
+++ b/master-doc.txt
@@ -6955,12 +6955,12 @@ part: subchapter
 </ul>
 
 
-
 ---
 title: Ardour's Interface
 part: part
 ---
 
+
 ---
 title: Global view
 part: chapter
@@ -7008,6 +7008,7 @@ part: chapter
 
 <p class="fixme">Add content</p>
 
+
 ---
 title: Status Bar
 part: chapter
@@ -7015,6 +7016,7 @@ part: chapter
 
 <p class="fixme">Add content</p>
 
+
 ---
 title: Transport bar and times
 part: chapter
@@ -7049,14 +7051,11 @@ part: chapter
   <li>the Mode Selector, allowing to switch between Editor and Mixer views, or edit the Preferences.</li>
 </ul>
 
-
-
 ---
 title: The Transport Bar
 part: subchapter
 ---
 
-
 <p>
   The <dfn>Transport Bar</dfn> groups all the actions regarding the control of playback and recording.
 </p>
@@ -7136,7 +7135,6 @@ part: subchapter
   </li>
 </ul>
 
-
 ---
 title: Times
 part: subchapter
diff --git a/munge b/munge
index 3a9d3f504f0c42b9fdb801d392ae4d28d9c49eb6..8b2261d723b4f9fd1e1fb7bcc63f5b74fd4eb5ed 100755
GIT binary patch
delta 3773
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
S(cP7mq?Y!=`#8N?x$NKasR;i7

delta 3734
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

diff --git a/munge.cpp b/munge.cpp
index e8c095d..493cdbd 100644
--- a/munge.cpp
+++ b/munge.cpp
@@ -60,7 +60,7 @@ int main(int argc, char * argv[])
 
 	char buffer[1024000], keyword[1024], token[1024];
 	char title[1024], shortTitle[1024], inclFile[1024], style[1024];
-	int level = 0;
+	int level = 0, lastLevel = -1;
 	int lineCount = 0, startLine, sectionLineCount;
 	int part = 0, chapter = 0, subchapter = 0;
 	bool first = true;
@@ -104,6 +104,7 @@ int main(int argc, char * argv[])
 					}
 					else if (strcmp(keyword, "part") == 0)
 					{
+						lastLevel = level;
 						int len = strlen(token);
 
 						if (len == 4)
@@ -148,6 +149,17 @@ int main(int argc, char * argv[])
 
 					startLine = lineCount;
 
+					// Cleanup our chapter content
+					if (lastLevel == 1)
+					{
+						if (newFile != NULL)
+						{
+							fprintf(newFile, "\n{%% children %%}\n\n");
+							fclose(newFile);
+							newFile = NULL;
+						}
+					}
+
 					if (level == 0)
 					{
 						// Parts & chapters don't have any content...
@@ -186,16 +198,16 @@ int main(int argc, char * argv[])
 
 						// Make the file expected at this level...
 						sprintf(temp, "%s.html", level2File);
-						FILE * tfp = fopen(temp, "w");
-						fprintf(tfp, "---\n");
-						fprintf(tfp, "title: %s\n", title);
+						newFile = fopen(temp, "w");
+						fprintf(newFile, "---\n");
+						fprintf(newFile, "title: %s\n", title);
 
 						if (strlen(shortTitle) > 0)
-							fprintf(tfp, "menu_title: %s\n", shortTitle);
+							fprintf(newFile, "menu_title: %s\n", shortTitle);
 
-						fprintf(tfp, "---\n");
-						fprintf(tfp, "\n{%% children %%}\n\n");
-						fclose(tfp);
+						fprintf(newFile, "---\n\n");
+//						fprintf(tfp, "\n{%% children %%}\n\n");
+//						fclose(tfp);
 					}
 					else if (level == 2)
 					{
@@ -250,7 +262,7 @@ int main(int argc, char * argv[])
 		}
 		else
 		{
-			if ((level == 2) && (newFile != NULL))
+			if (((level == 1) || (level == 2)) && (newFile != NULL))
 				fprintf(newFile, "%s\n", buffer);
 		}
 	}
-- 
2.37.2