Index: resources/style/guideItem.html =================================================================== --- resources/style/guideItem.html (revision 6530) +++ resources/style/guideItem.html (working copy) @@ -2,9 +2,19 @@ ${title} - + + + - ${content} + +

+ ${toc} +

+

+ ${content} +

- \ No newline at end of file + Index: resources/style/layout.html =================================================================== --- resources/style/layout.html (revision 6530) +++ resources/style/layout.html (working copy) @@ -2,6 +2,8 @@ ${title} ${version} - Reference Documentation + +

Index: resources/style/referenceItem.html =================================================================== --- resources/style/referenceItem.html (revision 6530) +++ resources/style/referenceItem.html (working copy) @@ -3,6 +3,8 @@ Grails Reference + + ${content} Index: resources/style/menu.html =================================================================== --- resources/style/menu.html (revision 6530) +++ resources/style/menu.html (working copy) @@ -3,6 +3,8 @@ menu + +

Index: resources/style/index.html =================================================================== --- resources/style/index.html (revision 6530) +++ resources/style/index.html (working copy) @@ -1,6 +1,8 @@ Grails Framework Reference Documentation + + @@ -12,4 +14,4 @@ This document is designed to be viewed using the frames feature. If you see this message, you are using a non-frame-capable web client. - \ No newline at end of file + Index: resources/css/main.css =================================================================== --- resources/css/main.css (revision 6530) +++ resources/css/main.css (working copy) @@ -74,6 +74,9 @@ border-top:1px solid #eeeeee; text-align:center; } +#toc { + margin-bottom: 1em; +} .tocItem { padding-bottom: 4px; } Index: Generate.groovy =================================================================== --- Generate.groovy (revision 6530) +++ Generate.groovy (working copy) @@ -49,24 +49,35 @@ engine = new DocEngine(context) templateEngine = new groovy.text.SimpleTemplateEngine() context.setRenderEngine(engine) +context.setParameters(new HashMap()) // required by some macros + +/* Guide documentation */ + book = [:] for(f in files) { def chapter = f.name[0..-6] book[chapter] = f } - -toc = new StringBuffer() -soloToc = new StringBuffer() + +chaptersOnlyToc = new StringBuffer() +fullToc = new StringBuffer() fullContents = new StringBuffer() +chapterTitle = null +chapterHeader = null +chapterToc = new StringBuffer() chapterContents = new StringBuffer() -chapterTitle = null -void writeChapter(String title, StringBuffer content) { - new File("output/guide/${title}.html").withWriter { - template.make(title:title, content:content.toString()).writeTo(it) +void writeChapter() { + new File("output/guide/${chapterTitle}.html").withWriter { + template.make(title:chapterTitle, + header:chapterHeader, + toc:chapterToc.toString(), + content:chapterContents.toString(), + path:"..").writeTo(it) } - content.delete(0,content.size()) // clear buffer + chapterToc.delete(0,chapterToc.size()) // clear buffer + chapterContents.delete(0,chapterContents.size()) // clear buffer } ant.mkdir(dir:"output/guide") @@ -84,35 +95,48 @@ } def margin = level*10 + // level 0=h1, (1..n)=h2 + def hLevel = level==0 ? 1 : 2 + def header = "${title}" + + // links to anchor, not page + def tocEntry = "

" + if(level == 0) { if (chapterTitle) // initially null, to collect sections - writeChapter(chapterTitle, chapterContents) + writeChapter() chapterTitle = title // after previous used to write prev chapter + chapterHeader = header - soloToc << "

${chapterTitle}

" + // links to page, not anchor + chaptersOnlyToc << "

${chapterTitle}

" + } + else { + chapterToc << tocEntry + chapterContents << header } - // level 0=h1, (1..n)=h2 - def hLevel = level==0 ? 1 : 2 - def header = "${title}" + fullToc << tocEntry context.set(SOURCE_FILE, entry.value) context.set(CONTEXT_PATH, "..") def body = engine.render(entry.value.text, context) - toc << "

" fullContents << header << body - chapterContents << header << body + chapterContents << body new File("output/guide/pages/${title}.html").withWriter { - template.make(title:title, content:body).writeTo(it) + template.make(title:title, header:header, + toc:"", content:body, path:"../..").writeTo(it) } } } if (chapterTitle) // write final chapter collected (if any seen) - writeChapter(chapterTitle, chapterContents) + writeChapter() +/* Resources */ + ant.mkdir(dir:"output") ant.mkdir(dir:"output/img") ant.mkdir(dir:"output/css") @@ -129,6 +153,10 @@ fileset(dir:"resources/style/ref") } + + +/* Reference documentation */ + vars = [ title:props.title, subtitle:props.subtitle, @@ -137,7 +165,7 @@ version: props."grails.version", copyright: props.copyright, - toc:toc.toString(), + toc:fullToc.toString(), body:fullContents.toString() ] @@ -146,7 +174,7 @@ new File("output/guide/single.html").withWriter { out -> template.make(vars).writeTo(out) } - vars.toc = soloToc + vars.toc = chaptersOnlyToc vars.body = "" new File("output/guide/index.html").withWriter { out -> template.make(vars).writeTo(out) @@ -154,45 +182,42 @@ } menu = new StringBuffer() -files = new File("src/ref").listFiles().toList().sort() -reference = [:] + +void writeReferenceItem(File file, String path, String section, String name) { + context.set(SOURCE_FILE, file) + context.set(CONTEXT_PATH, path) + + def divClass = (name == "Usage") ? "menuUsageItem" : "menuItem" + menu << "

" + + def content = engine.render(file.text, context) + new File("output/ref/${section}/${name}.html").withWriter { + template.make(content:content).writeTo(it) + } +} + +files = new File("./src/ref").listFiles().toList().sort() new File("resources/style/referenceItem.html").withReader { reader -> - template = templateEngine.createTemplate(reader) - for(f in files) { - if(f.directory && !f.name.startsWith(".")) { - def section = f.name - reference."${section}" = [:] - menu << "

${f.name}

" - new File("output/ref/${f.name}").mkdirs() - def textiles = f.listFiles().findAll { it.name.endsWith(".gdoc")}.sort() - def usageFile = new File("src/ref/${f.name}.gdoc") - if(usageFile.exists()) { - def data = usageFile.text - reference."${section}".usage = data - context.set(SOURCE_FILE, usageFile.name) - context.set(CONTEXT_PATH, "../..") - def contents = engine.render(data, context) - new File("output/ref/${f.name}/Usage.html").withWriter { out -> - template.make(content:contents).writeTo(out) - } - menu << "

" - } - for(txt in textiles) { - def name = txt.name[0..-6] - menu << "

" - def data = txt.text - reference."${section}"."$name" = data - context.set(SOURCE_FILE, txt.name) - context.set(CONTEXT_PATH, "../..") - def contents = engine.render(data, context) - //println "Generating reference item: ${name}" - new File("output/ref/${f.name}/${name}.html").withWriter { out -> - template.make(content:contents).writeTo(out) - } - } - } - } - + template = templateEngine.createTemplate(reader) + for(f in files) { + if(f.directory && !f.name.startsWith(".")) { + + def section = f.name + menu << "

${section}

" + new File("output/ref/${section}").mkdirs() + + def usageFile = new File("./src/ref/${section}.gdoc") + if (usageFile.exists()) { + writeReferenceItem(usageFile, "../..", section, "Usage") + } + + def items = f.listFiles().findAll{it.name.endsWith(".gdoc")}.sort() + for(item in items) { + //println "Generating reference item: ${name}" + writeReferenceItem(item, "../..", section, item.name[0..-6]) + } + } + } } vars.menu = menu new File("./resources/style/menu.html").withReader { reader ->