---

yaml
---
r: 14674
b: refs/heads/try
c: fc9b55d
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: fbd8a76e8a6a4320198c66023e5ec29b3f69cd38
+refs/heads/try: fc9b55d65f4854e22321095ae07d1ba9d39fe86d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustdoc/markdown_pass.rs

@@ -82,14 +82,41 @@ fn write_markdown(
     doc: doc::doc,
     writer_factory: writer_factory
 ) {
-    let ctxt = {
-        w: writer_factory(doc::cratepage(doc.cratedoc()))
-    };
+    for page in doc.pages {
+        let ctxt = {
+            w: writer_factory(page)
+        };
+        write_page(ctxt, page);
+    }
+}
 
-    write_crate(ctxt, doc.cratedoc());
+fn write_page(ctxt: ctxt, page: doc::page) {
+    alt page {
+      doc::cratepage(doc) {
+        write_crate(ctxt, doc);
+      }
+      doc::itempage(doc) {
+        write_item(ctxt, doc);
+      }
+    }
     ctxt.w.write_done();
 }
 
+#[test]
+fn should_request_new_writer_for_each_page() {
+    // This port will send us a (page, str) pair for every writer
+    // that was created
+    let (writer_factory, po) = markdown_writer::future_writer_factory();
+    let (srv, doc) = test::create_doc_srv("mod a { }");
+    // Split the document up into pages
+    let doc = page_pass::mk_pass(config::doc_per_mod).f(srv, doc);
+    write_markdown(doc, writer_factory);
+    // We expect two pages to have been written
+    iter::repeat(2u) {||
+        comm::recv(po);
+    }
+}
+
 enum hlvl {
     h1 = 1,
     h2 = 2,
@@ -218,17 +245,21 @@ fn write_mod_contents(
     }
 
     for itemtag in doc.items {
-        alt itemtag {
-          doc::modtag(moddoc) { write_mod(ctxt, moddoc) }
-          doc::nmodtag(nmoddoc) { write_nmod(ctxt, nmoddoc) }
-          doc::fntag(fndoc) { write_fn(ctxt, fndoc) }
-          doc::consttag(constdoc) { write_const(ctxt, constdoc) }
-          doc::enumtag(enumdoc) { write_enum(ctxt, enumdoc) }
-          doc::restag(resdoc) { write_res(ctxt, resdoc) }
-          doc::ifacetag(ifacedoc) { write_iface(ctxt, ifacedoc) }
-          doc::impltag(impldoc) { write_impl(ctxt, impldoc) }
-          doc::tytag(tydoc) { write_type(ctxt, tydoc) }
-        }
+        write_item(ctxt, itemtag);
+    }
+}
+
+fn write_item(ctxt: ctxt, doc: doc::itemtag) {
+    alt doc {
+      doc::modtag(moddoc) { write_mod(ctxt, moddoc) }
+      doc::nmodtag(nmoddoc) { write_nmod(ctxt, nmoddoc) }
+      doc::fntag(fndoc) { write_fn(ctxt, fndoc) }
+      doc::consttag(constdoc) { write_const(ctxt, constdoc) }
+      doc::enumtag(enumdoc) { write_enum(ctxt, enumdoc) }
+      doc::restag(resdoc) { write_res(ctxt, resdoc) }
+      doc::ifacetag(ifacedoc) { write_iface(ctxt, ifacedoc) }
+      doc::impltag(impldoc) { write_impl(ctxt, impldoc) }
+      doc::tytag(tydoc) { write_type(ctxt, tydoc) }
     }
 }
 

branches/try/src/rustdoc/rustdoc.rs

@@ -152,6 +152,7 @@ fn run(config: config::config) {
             sort_item_name_pass::mk_pass(),
             sort_item_type_pass::mk_pass(),
             markdown_index_pass::mk_pass(),
+            page_pass::mk_pass(config.output_style),
             markdown_pass::mk_pass(
                 markdown_writer::make_writer_factory(config)
             )