Minor fixes.

h3rald · Aug 28, 2011 · a4eb5ab · a4eb5ab
1 parent 4694cb2
commit a4eb5ab
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/book/config.yml b/book/config.yml
@@ -17,7 +17,7 @@
     :macro_reps: html5
     :layout_dir: web5
     :layouts:
-      :topic: topic
-      :index: index
+      :topic: bookpage
+      :index: bookindex
   :pdf: 
     :generator: prince
diff --git a/book/lib/layouts/bookindex.glyph b/book/lib/layouts/bookindex.glyph
@@ -2,9 +2,6 @@
 <html lang="en">
 	<head>
 		<title>Glyph - Document Authoring Framework</title>
-		<link href='http://fonts.googleapis.com/css?family=Crimson+Text:400,400italic,600,600italic,700,700italic' rel='stylesheet' type='text/css'>
-
-
 
 		<meta charset="utf-8" />
 		<meta name="author" content="Fabio Cevasco" />

diff --git a/book/lib/tasks/tasks.rake b/book/lib/tasks/tasks.rake
@@ -41,7 +41,7 @@ namespace :generate do
 		(dir/'glyph/book/images/glyph/glyph.eps').unlink 
 		(dir/'glyph/book/images/glyph/glyph.svg').unlink
 		# Create project page
-		project = Glyph.filter %{layout:project[
+		project = Glyph.filter %{layout/project[
 				@contents[#{file_load(Glyph::PROJECT/'text/introduction.glyph')}]
 			]}
 		file_write dir/"glyph.textile", project

diff --git a/book/text/extending/output_format.glyph b/book/text/extending/output_format.glyph
@@ -17,7 +17,7 @@ The first step required to add a new output format to Glyph is extending Glyph's
     :extension: '.html'
     :filter_target: 'html'
     :base: '/glyph/book/'
-    :macro_dirs: ['html', 'html5']
+    :macro_rep: html5
     :layout_dirs: ['web5']
     :layouts: 
       :topic: bookpage
@@ -63,7 +63,7 @@ namespace :generate do
     (dir/'glyph/book/images/glyph/glyph.eps').unlink 
     (dir/'glyph/book/images/glyph/glyph.svg').unlink
     # Create project page
-    project = Glyph.filter %{layout:project[
+    project = Glyph.filter %{layout/project[
         @contents[#{file_load(Glyph::PROJECT/'text/introduction.glyph')}]
       ]}
     file_write dir/"glyph.textile", project

diff --git a/book/text/text_editing/inclusions.glyph b/book/text/text_editing/inclusions.glyph
@@ -34,15 +34,14 @@ Snippets can be defined using the %>[snippet:] (aliased by @&:@) and called by u
 Glyph supports &[markups].
     =]
     p[You can use code[=&amp;[markups]=] anywhere in your document instead of having to type "\/&[markups]" every time. Additionally, later on you can change the value of the  code[markups] to change it everywhere else in the document.]
-    ] 
     tip[
 Snippets (or any other macro) can be nested within other snippets. Glyph takes care of checking if you nested snippets or macros mutually and warns you as necessary.
     ]
   ]
   §[
     @title[Fragments]
     @id[fragments]
-    txt[As an even simpler alternative to snippets, consider using _fragments_. The %>[fragment:] (aliased by @##@) can be used to mark a section of Glyph code as a fragment that can then be _embedded_ using the %>[embed] (aliased by @<=@), like this:]
+    txt[As an even simpler alternative to snippets, consider using _fragments_. The %>[fragment] (aliased by @##@) can be used to mark a section of Glyph code as a fragment that can then be _embedded_ using the %>[embed] (aliased by @<=@), like this:]
 
     highlight[=html|
 Snippets and fragments ##[good_way\|are a good way to reuse] small chunks of content, while the include and load macros <=[good_way] entire files.