document.glyph in glyph-0.3.0

- old
+ new
@@ -1,66 +1,99 @@
-document[
-	head[
+book[
+	@head[
 		style[default.css]
 		?[eq[$[document.output]|pdf]|style[pagination.css]]
-		?[eq[$[highlighters.current]|coderay]|style[coderay.css]]
-		?[eq[$[highlighters.current]|ultraviolet]|style[ultraviolet/blackboard.css]]
+		?[eq[$[filters.highlighter]|coderay]|style[coderay.css]]
+		?[eq[$[filters.highlighter]|ultraviolet]|style[ultraviolet/lazy.css]]
 	]
-	body[
-		titlepage[
-			?[eq[$[document.output]|pdf]|img[glyph.svg|20%|20%]]
-			?[eq[$[document.output]|html]|img[glyph.png|20%|20%]]
-			title[]
-			subtitle[]
-			v\.%[Glyph::VERSION]
-			author[]
-			pubdate[]
-		]
-		frontmatter[
-			toc[]
-			introduction[header[Introduction]
-				textile[@[introduction.glyph]]
-				section[header[License]
-					textile[@[license.glyph]]
-				]
+	@pre-title[
+		?[eq[$[document.output]|pdf]|image[@width[20%]@height[20%]glyph.svg]]
+		?[eq[$[document.output]|html]|image[@width[20%]@height[20%]glyph.png]]
+	]
+	@frontmatter[
+		toc[3]
+		introduction[
+			@title[Introduction]
+			textile[include[introduction]]
+			section[
+				@title[License]
+				textile[include[license]]
 			]
-			acknowledgement[header[Acknowledgement]
-				textile[@[acknowledgement.glyph]]
-			]
 		]
-		bodymatter[
-			chapter[
-				header[Getting Started]
-				textile[@[getting_started.glyph]]
-			]
-			chapter[
-				header[Authoring Documents]
-				textile[@[authoring.glyph]]
-			]
-			chapter[
-				header[Extending Glyph|extending]
-				textile[@[extending.glyph]]
-			]
-			chapter[
-				header[Troubleshooting]
-				textile[@[troubleshooting.glyph]]
-			]
+		acknowledgement[
+			@title[Acknowledgement]
+			textile[include[acknowledgement]]
 		]
-		backmatter[
-			appendix[
-				header[Command Reference|cmd_ref]
-				textile[@[ref_commands.glyph]]
-			]
-			appendix[
-				header[Macro Reference|macro_ref]
-				textile[@[ref_macros.glyph]]
-			]
-			appendix[
-				header[Configuration Reference|cfg_ref]
-				textile[@[ref_config.glyph]]
-			]
-			appendix[header[Changelog]
-				@[changelog.glyph]
-			]
+	]
+	@bodymatter[
+		chapter[
+			@title[Getting Started]
+			include[getting_started/create_project]
+			include[getting_started/structure]
+			include[getting_started/configuration]
+		]
+		chapter[
+			@title[Authoring Documents]
+			include[text_editing/glyph_files]
+			include[text_editing/macro_intro]
+			include[text_editing/sections]
+			include[text_editing/links]
+			include[text_editing/images]
+			include[text_editing/code]
+			include[text_editing/raw_html]
+			include[text_editing/stylesheets]
+			include[text_editing/inclusions]
+			include[text_editing/evaluation]
+			include[text_editing/conditionals]
+		]
+		chapter[
+			@title[Generating Output Files]
+			include[compiling/compiling]
+			include[compiling/lite_mode]
+			include[compiling/programmatic_usage]
+		]
+		chapter[
+			@title[Extending Glyph]
+			@id[extending]
+			include[extending/internals]
+			include[extending/macro_def]
+			include[extending/params_attrs]
+			include[extending/bookmarks_headers]
+			include[extending/placeholders]
+			include[extending/validators]
+			include[extending/interpreting]
+			include[extending/further_reading]
+		]
+		chapter[
+			@title[Troubleshooting]
+			include[troubleshooting/errors_intro]
+			include[troubleshooting/errors_generic]
+			include[troubleshooting/errors_parser]
+			include[troubleshooting/errors_command]
+			include[troubleshooting/errors_macro]
+		]
+	]
+	@backmatter[
+		appendix[
+			@title[Command Reference]
+			@id[cmd_ref]
+			include[ref_commands]
+		]
+		appendix[
+			@title[Macro Reference]
+			@id[macro_ref]
+			include[macros/macros_core]
+			include[macros/macros_block]
+			include[macros/macros_inline]
+			include[macros/macros_filters]
+			include[macros/macros_structure]
+		]
+		appendix[
+			@title[Configuration Reference]
+			@id[cfg_ref]
+			include[ref_config]
+		]
+		appendix[@title[Changelog]
+		include[changelog]
 		]
 	]
 ]