From 2a8af1c21d98c3b2c89508fcafd8cb10dcddcd4d Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Tue, 31 Aug 2021 12:41:49 -0700 Subject: [PATCH] Include chapters with no headers in the search index --- src/renderer/html_handlebars/search.rs | 7 +- tests/dummy_book/src/SUMMARY.md | 1 + tests/dummy_book/src/first/no-headers.md | 3 + tests/rendered_output.rs | 12 +- tests/searchindex_fixture.json | 734 +++++++++++++++-------- 5 files changed, 496 insertions(+), 261 deletions(-) create mode 100644 tests/dummy_book/src/first/no-headers.md diff --git a/src/renderer/html_handlebars/search.rs b/src/renderer/html_handlebars/search.rs index e9da2196..754a5bf1 100644 --- a/src/renderer/html_handlebars/search.rs +++ b/src/renderer/html_handlebars/search.rs @@ -165,7 +165,12 @@ fn render_item( } } - if !heading.is_empty() { + if !body.is_empty() || !heading.is_empty() { + if heading.is_empty() { + if let Some(chapter) = breadcrumbs.first() { + heading = chapter.clone(); + } + } // Make sure the last section is added to the index add_doc( index, diff --git a/tests/dummy_book/src/SUMMARY.md b/tests/dummy_book/src/SUMMARY.md index 7e9d3d1f..e12e1254 100644 --- a/tests/dummy_book/src/SUMMARY.md +++ b/tests/dummy_book/src/SUMMARY.md @@ -12,6 +12,7 @@ - [Recursive](first/recursive.md) - [Markdown](first/markdown.md) - [Unicode](first/unicode.md) + - [No Headers](first/no-headers.md) - [Second Chapter](second.md) - [Nested Chapter](second/nested.md) diff --git a/tests/dummy_book/src/first/no-headers.md b/tests/dummy_book/src/first/no-headers.md new file mode 100644 index 00000000..8f9a6d17 --- /dev/null +++ b/tests/dummy_book/src/first/no-headers.md @@ -0,0 +1,3 @@ +Capybara capybara capybara. + +Capybara capybara capybara. \ No newline at end of file diff --git a/tests/rendered_output.rs b/tests/rendered_output.rs index c6f998d6..63614577 100644 --- a/tests/rendered_output.rs +++ b/tests/rendered_output.rs @@ -34,6 +34,7 @@ const TOC_SECOND_LEVEL: &[&str] = &[ "1.3. Recursive", "1.4. Markdown", "1.5. Unicode", + "1.6. No Headers", "2.1. Nested Chapter", ]; @@ -631,6 +632,7 @@ mod search { let introduction = get_doc_ref("intro.html#introduction"); let some_section = get_doc_ref("first/index.html#some-section"); let summary = get_doc_ref("first/includes.html#summary"); + let no_headers = get_doc_ref("first/no-headers.html"); let conclusion = get_doc_ref("conclusion.html#conclusion"); let bodyidx = &index["index"]["index"]["body"]["root"]; @@ -644,13 +646,21 @@ mod search { assert_eq!(docs[&some_section]["body"], ""); assert_eq!( docs[&summary]["body"], - "Dummy Book Introduction First Chapter Nested Chapter Includes Recursive Markdown Unicode Second Chapter Nested Chapter Conclusion" + "Dummy Book Introduction First Chapter Nested Chapter Includes Recursive Markdown Unicode No Headers Second Chapter Nested Chapter Conclusion" ); assert_eq!( docs[&summary]["breadcrumbs"], "First Chapter » Includes » Summary" ); assert_eq!(docs[&conclusion]["body"], "I put <HTML> in here!"); + assert_eq!( + docs[&no_headers]["breadcrumbs"], + "First Chapter » No Headers" + ); + assert_eq!( + docs[&no_headers]["body"], + "Capybara capybara capybara. Capybara capybara capybara." + ); } // Setting this to `true` may cause issues with `cargo watch`, diff --git a/tests/searchindex_fixture.json b/tests/searchindex_fixture.json index 7e7e3359..32c44a1b 100644 --- a/tests/searchindex_fixture.json +++ b/tests/searchindex_fixture.json @@ -11,12 +11,14 @@ "first/nested.html#rustdoc-include-works-with-anchors-too", "first/includes.html#includes", "first/includes.html#summary", + "first/recursive.html", "first/markdown.html#markdown-tests", "first/markdown.html#tables", "first/markdown.html#footnotes", "first/markdown.html#strikethrough", "first/markdown.html#tasklisks", "first/unicode.html#unicode-stress-tests", + "first/no-headers.html", "second.html#second-chapter", "second/nested.html#testing-relative-links-for-the-print-page", "second/nested.html#some-section", @@ -36,61 +38,71 @@ "title": 1 }, "10": { - "body": 16, + "body": 17, "breadcrumbs": 4, "title": 1 }, "11": { + "body": 44, + "breadcrumbs": 3, + "title": 2 + }, + "12": { "body": 3, "breadcrumbs": 5, "title": 2 }, - "12": { + "13": { "body": 4, "breadcrumbs": 4, "title": 1 }, - "13": { + "14": { "body": 12, "breadcrumbs": 4, "title": 1 }, - "14": { + "15": { "body": 2, "breadcrumbs": 4, "title": 1 }, - "15": { + "16": { "body": 3, "breadcrumbs": 4, "title": 1 }, - "16": { + "17": { "body": 29, "breadcrumbs": 6, "title": 3 }, - "17": { + "18": { + "body": 6, + "breadcrumbs": 3, + "title": 2 + }, + "19": { "body": 20, "breadcrumbs": 4, "title": 2 }, - "18": { - "body": 18, - "breadcrumbs": 9, - "title": 5 - }, - "19": { - "body": 0, - "breadcrumbs": 5, - "title": 1 - }, "2": { "body": 2, "breadcrumbs": 4, "title": 2 }, "20": { + "body": 18, + "breadcrumbs": 9, + "title": 5 + }, + "21": { + "body": 0, + "breadcrumbs": 5, + "title": 1 + }, + "22": { "body": 3, "breadcrumbs": 2, "title": 1 @@ -145,64 +157,64 @@ "title": "Introduction" }, "10": { - "body": "Dummy Book Introduction First Chapter Nested Chapter Includes Recursive Markdown Unicode Second Chapter Nested Chapter Conclusion", + "body": "Dummy Book Introduction First Chapter Nested Chapter Includes Recursive Markdown Unicode No Headers Second Chapter Nested Chapter Conclusion", "breadcrumbs": "First Chapter » Includes » Summary", "id": "10", "title": "Summary" }, "11": { - "body": "Tests for some markdown output.", - "breadcrumbs": "First Chapter » Markdown » Markdown tests", + "body": "Around the world, around the world Around the world, around the world Around the world, around the world Around the world, around the world Around the world, around the world Around the world, around the world Around the world, around the world Around the world, around the world Around the world, around the world Around the world, around the world Around the world, around the world", + "breadcrumbs": "First Chapter » Recursive", "id": "11", - "title": "Markdown tests" + "title": "First Chapter" }, "12": { - "body": "foo bar baz bim", - "breadcrumbs": "First Chapter » Markdown » Tables", + "body": "Tests for some markdown output.", + "breadcrumbs": "First Chapter » Markdown » Markdown tests", "id": "12", - "title": "Tables" + "title": "Markdown tests" }, "13": { - "body": "Footnote example [1] , or with a word [2] . This is a footnote. A longer footnote. With multiple lines. Third line.", - "breadcrumbs": "First Chapter » Markdown » Footnotes", + "body": "foo bar baz bim", + "breadcrumbs": "First Chapter » Markdown » Tables", "id": "13", - "title": "Footnotes" + "title": "Tables" }, "14": { - "body": "strikethrough example", - "breadcrumbs": "First Chapter » Markdown » Strikethrough", + "body": "Footnote example [1] , or with a word [2] . This is a footnote. A longer footnote. With multiple lines. Third line.", + "breadcrumbs": "First Chapter » Markdown » Footnotes", "id": "14", - "title": "Strikethrough" + "title": "Footnotes" }, "15": { - "body": "Apples Broccoli Carrots", - "breadcrumbs": "First Chapter » Markdown » Tasklisks", + "body": "strikethrough example", + "breadcrumbs": "First Chapter » Markdown » Strikethrough", "id": "15", - "title": "Tasklisks" + "title": "Strikethrough" }, "16": { - "body": "Please be careful editing, this contains carefully crafted characters. Two byte character: spatiëring Combining character: spatiëring Three byte character: 书こんにちは Four byte character: 𐌀‮𐌁‮𐌂‮𐌃‮𐌄‮𐌅‮𐌆‮𐌇‮𐌈‬ Right-to-left: مرحبا Emoticons: 🔊 😍 💜 1️⃣ right-to-left mark: hello באמת!‏ Zalgo: ǫ̛̖̱̗̝͈̋͒͋̏ͥͫ̒̆ͩ̏͌̾͊͐ͪ̾̚", - "breadcrumbs": "First Chapter » Unicode » Unicode stress tests", + "body": "Apples Broccoli Carrots", + "breadcrumbs": "First Chapter » Markdown » Tasklisks", "id": "16", - "title": "Unicode stress tests" + "title": "Tasklisks" }, "17": { - "body": "This makes sure you can insert runnable Rust files. fn main() { println!(\"Hello World!\");\n#\n# // You can even hide lines! :D\n# println!(\"I am hidden! Expand the code snippet to see me\");\n}", - "breadcrumbs": "Second Chapter » Second Chapter", + "body": "Please be careful editing, this contains carefully crafted characters. Two byte character: spatiëring Combining character: spatiëring Three byte character: 书こんにちは Four byte character: 𐌀‮𐌁‮𐌂‮𐌃‮𐌄‮𐌅‮𐌆‮𐌇‮𐌈‬ Right-to-left: مرحبا Emoticons: 🔊 😍 💜 1️⃣ right-to-left mark: hello באמת!‏ Zalgo: ǫ̛̖̱̗̝͈̋͒͋̏ͥͫ̒̆ͩ̏͌̾͊͐ͪ̾̚", + "breadcrumbs": "First Chapter » Unicode » Unicode stress tests", "id": "17", - "title": "Second Chapter" + "title": "Unicode stress tests" }, "18": { - "body": "When we link to the first section , it should work on both the print page and the non-print page. A fragment link should work. Link outside . Some image HTML Link", - "breadcrumbs": "Second Chapter » Nested Chapter » Testing relative links for the print page", + "body": "Capybara capybara capybara. Capybara capybara capybara.", + "breadcrumbs": "First Chapter » No Headers", "id": "18", - "title": "Testing relative links for the print page" + "title": "First Chapter" }, "19": { - "body": "", - "breadcrumbs": "Second Chapter » Nested Chapter » Some section", + "body": "This makes sure you can insert runnable Rust files. fn main() { println!(\"Hello World!\");\n#\n# // You can even hide lines! :D\n# println!(\"I am hidden! Expand the code snippet to see me\");\n}", + "breadcrumbs": "Second Chapter » Second Chapter", "id": "19", - "title": "Some section" + "title": "Second Chapter" }, "2": { "body": "more text.", @@ -211,9 +223,21 @@ "title": "First Chapter" }, "20": { + "body": "When we link to the first section , it should work on both the print page and the non-print page. A fragment link should work. Link outside . Some image HTML Link", + "breadcrumbs": "Second Chapter » Nested Chapter » Testing relative links for the print page", + "id": "20", + "title": "Testing relative links for the print page" + }, + "21": { + "body": "", + "breadcrumbs": "Second Chapter » Nested Chapter » Some section", + "id": "21", + "title": "Some section" + }, + "22": { "body": "I put <HTML> in here!", "breadcrumbs": "Conclusion » Conclusion", - "id": "20", + "id": "22", "title": "Conclusion" }, "3": { @@ -259,7 +283,7 @@ "title": "Includes" } }, - "length": 21, + "length": 23, "save": true }, "fields": [ @@ -273,10 +297,10 @@ "1": { "df": 2, "docs": { - "13": { + "14": { "tf": 1.0 }, - "16": { + "17": { "tf": 1.0 } } @@ -284,7 +308,7 @@ "2": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -340,13 +364,37 @@ "l": { "df": 1, "docs": { - "15": { + "16": { "tf": 1.0 } } } } }, + "r": { + "df": 0, + "docs": {}, + "o": { + "df": 0, + "docs": {}, + "u": { + "df": 0, + "docs": {}, + "n": { + "d": { + "df": 1, + "docs": { + "11": { + "tf": 4.69041575982343 + } + } + }, + "df": 0, + "docs": {} + } + } + } + }, "s": { "df": 0, "docs": {}, @@ -411,7 +459,7 @@ "r": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } } @@ -419,7 +467,7 @@ "z": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } } @@ -461,7 +509,7 @@ "m": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } } @@ -491,7 +539,7 @@ "h": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -515,7 +563,7 @@ "i": { "df": 1, "docs": { - "15": { + "16": { "tf": 1.0 } } @@ -555,7 +603,7 @@ "e": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.7320508075688772 } } @@ -567,13 +615,41 @@ "a": { "df": 0, "docs": {}, + "p": { + "df": 0, + "docs": {}, + "y": { + "b": { + "a": { + "df": 0, + "docs": {}, + "r": { + "a": { + "df": 1, + "docs": { + "18": { + "tf": 2.449489742783178 + } + } + }, + "df": 0, + "docs": {} + } + }, + "df": 0, + "docs": {} + }, + "df": 0, + "docs": {} + } + }, "r": { "df": 0, "docs": {}, "e": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } }, @@ -592,7 +668,7 @@ "i": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -611,7 +687,7 @@ "t": { "df": 1, "docs": { - "15": { + "16": { "tf": 1.0 } } @@ -651,12 +727,18 @@ "df": 0, "docs": {}, "r": { - "df": 4, + "df": 6, "docs": { "10": { "tf": 2.0 }, - "17": { + "11": { + "tf": 1.0 + }, + "18": { + "tf": 1.0 + }, + "19": { "tf": 1.0 }, "2": { @@ -678,7 +760,7 @@ "t": { "df": 1, "docs": { - "16": { + "17": { "tf": 2.23606797749979 } } @@ -701,7 +783,7 @@ "e": { "df": 2, "docs": { - "17": { + "19": { "tf": 1.0 }, "4": { @@ -722,7 +804,7 @@ "n": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -768,7 +850,7 @@ "10": { "tf": 1.0 }, - "20": { + "22": { "tf": 1.0 } } @@ -788,7 +870,7 @@ "n": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -826,7 +908,7 @@ "t": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -840,7 +922,7 @@ "d": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } }, @@ -880,7 +962,7 @@ "t": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -908,7 +990,7 @@ "n": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -930,7 +1012,7 @@ "n": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -950,10 +1032,10 @@ "l": { "df": 2, "docs": { - "13": { + "14": { "tf": 1.0 }, - "14": { + "15": { "tf": 1.0 } } @@ -971,7 +1053,7 @@ "d": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -1040,7 +1122,7 @@ "0": { "tf": 1.0 }, - "17": { + "19": { "tf": 1.0 }, "4": { @@ -1062,16 +1144,22 @@ "df": 0, "docs": {}, "t": { - "df": 3, + "df": 5, "docs": { "10": { "tf": 1.0 }, + "11": { + "tf": 1.0 + }, "18": { "tf": 1.0 }, "2": { "tf": 1.0 + }, + "20": { + "tf": 1.0 } } } @@ -1081,7 +1169,7 @@ "n": { "df": 3, "docs": { - "17": { + "19": { "tf": 1.0 }, "7": { @@ -1098,7 +1186,7 @@ "o": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } }, @@ -1114,7 +1202,7 @@ "t": { "df": 1, "docs": { - "13": { + "14": { "tf": 2.0 } } @@ -1129,7 +1217,7 @@ "r": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -1155,7 +1243,7 @@ "t": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -1193,6 +1281,26 @@ "df": 0, "docs": {}, "e": { + "a": { + "d": { + "df": 0, + "docs": {}, + "e": { + "df": 0, + "docs": {}, + "r": { + "df": 1, + "docs": { + "10": { + "tf": 1.0 + } + } + } + } + }, + "df": 0, + "docs": {} + }, "df": 0, "docs": {}, "l": { @@ -1204,7 +1312,7 @@ "o": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -1228,7 +1336,7 @@ "0": { "tf": 1.0 }, - "20": { + "22": { "tf": 1.0 } } @@ -1246,7 +1354,7 @@ "n": { "df": 2, "docs": { - "17": { + "19": { "tf": 1.0 }, "7": { @@ -1261,7 +1369,7 @@ "e": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -1279,7 +1387,7 @@ "l": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -1297,7 +1405,7 @@ "g": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -1369,7 +1477,7 @@ "t": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -1486,7 +1594,7 @@ "t": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.4142135623730951 } } @@ -1502,10 +1610,10 @@ "e": { "df": 3, "docs": { - "13": { + "14": { "tf": 1.4142135623730951 }, - "17": { + "19": { "tf": 1.0 }, "6": { @@ -1516,7 +1624,7 @@ "k": { "df": 1, "docs": { - "18": { + "20": { "tf": 2.23606797749979 } } @@ -1538,7 +1646,7 @@ "r": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -1570,7 +1678,7 @@ "t": { "df": 1, "docs": { - "20": { + "22": { "tf": 1.0 } } @@ -1598,7 +1706,7 @@ "n": { "df": 3, "docs": { - "17": { + "19": { "tf": 1.0 }, "7": { @@ -1616,7 +1724,7 @@ "e": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -1641,7 +1749,7 @@ "10": { "tf": 1.0 }, - "11": { + "12": { "tf": 1.4142135623730951 } } @@ -1651,7 +1759,7 @@ }, "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -1694,7 +1802,7 @@ "l": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -1745,7 +1853,7 @@ "n": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -1770,7 +1878,7 @@ "t": { "df": 1, "docs": { - "11": { + "12": { "tf": 1.0 } } @@ -1784,7 +1892,7 @@ "d": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -1806,7 +1914,7 @@ "e": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.7320508075688772 } } @@ -1837,7 +1945,7 @@ "s": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -1919,7 +2027,7 @@ "t": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.7320508075688772 } }, @@ -1947,7 +2055,7 @@ "o": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -1959,7 +2067,7 @@ "i": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -1985,7 +2093,7 @@ "t": { "df": 1, "docs": { - "20": { + "22": { "tf": 1.0 } } @@ -2021,7 +2129,7 @@ "l": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -2107,7 +2215,7 @@ "t": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.4142135623730951 } } @@ -2133,7 +2241,7 @@ "l": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -2171,7 +2279,7 @@ }, "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -2196,7 +2304,7 @@ "10": { "tf": 1.0 }, - "17": { + "19": { "tf": 1.0 } } @@ -2217,10 +2325,10 @@ "n": { "df": 4, "docs": { - "18": { + "20": { "tf": 1.0 }, - "19": { + "21": { "tf": 1.0 }, "3": { @@ -2240,7 +2348,7 @@ "e": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -2264,7 +2372,7 @@ "t": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -2381,7 +2489,7 @@ "r": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -2394,7 +2502,7 @@ "r": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -2445,7 +2553,7 @@ "s": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -2482,7 +2590,7 @@ "h": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.4142135623730951 } } @@ -2555,7 +2663,7 @@ "e": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -2571,7 +2679,7 @@ "l": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } } @@ -2597,7 +2705,7 @@ "k": { "df": 1, "docs": { - "15": { + "16": { "tf": 1.0 } } @@ -2635,13 +2743,13 @@ }, "df": 4, "docs": { - "11": { + "12": { "tf": 1.4142135623730951 }, - "16": { + "17": { "tf": 1.0 }, - "18": { + "20": { "tf": 1.0 }, "6": { @@ -2676,7 +2784,7 @@ "d": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -2694,7 +2802,7 @@ "e": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -2708,7 +2816,7 @@ "o": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -2732,7 +2840,7 @@ "10": { "tf": 1.0 }, - "16": { + "17": { "tf": 1.0 } } @@ -2780,7 +2888,7 @@ "d": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -2790,7 +2898,7 @@ "k": { "df": 2, "docs": { - "18": { + "20": { "tf": 1.4142135623730951 }, "8": { @@ -2800,9 +2908,12 @@ }, "l": { "d": { - "df": 1, + "df": 2, "docs": { - "17": { + "11": { + "tf": 4.69041575982343 + }, + "19": { "tf": 1.0 } } @@ -2826,7 +2937,7 @@ "o": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -2844,10 +2955,10 @@ "1": { "df": 2, "docs": { - "13": { + "14": { "tf": 1.0 }, - "16": { + "17": { "tf": 1.0 } } @@ -2855,7 +2966,7 @@ "2": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -2911,13 +3022,37 @@ "l": { "df": 1, "docs": { - "15": { + "16": { "tf": 1.0 } } } } }, + "r": { + "df": 0, + "docs": {}, + "o": { + "df": 0, + "docs": {}, + "u": { + "df": 0, + "docs": {}, + "n": { + "d": { + "df": 1, + "docs": { + "11": { + "tf": 4.69041575982343 + } + } + }, + "df": 0, + "docs": {} + } + } + } + }, "s": { "df": 0, "docs": {}, @@ -2982,7 +3117,7 @@ "r": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } } @@ -2990,7 +3125,7 @@ "z": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } } @@ -3032,7 +3167,7 @@ "m": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } } @@ -3062,7 +3197,7 @@ "h": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -3086,7 +3221,7 @@ "i": { "df": 1, "docs": { - "15": { + "16": { "tf": 1.0 } } @@ -3126,7 +3261,7 @@ "e": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.7320508075688772 } } @@ -3138,13 +3273,41 @@ "a": { "df": 0, "docs": {}, + "p": { + "df": 0, + "docs": {}, + "y": { + "b": { + "a": { + "df": 0, + "docs": {}, + "r": { + "a": { + "df": 1, + "docs": { + "18": { + "tf": 2.449489742783178 + } + } + }, + "df": 0, + "docs": {} + } + }, + "df": 0, + "docs": {} + }, + "df": 0, + "docs": {} + } + }, "r": { "df": 0, "docs": {}, "e": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } }, @@ -3163,7 +3326,7 @@ "i": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -3182,7 +3345,7 @@ "t": { "df": 1, "docs": { - "15": { + "16": { "tf": 1.0 } } @@ -3222,13 +3385,13 @@ "df": 0, "docs": {}, "r": { - "df": 18, + "df": 20, "docs": { "10": { "tf": 2.23606797749979 }, "11": { - "tf": 1.0 + "tf": 1.4142135623730951 }, "12": { "tf": 1.0 @@ -3246,17 +3409,23 @@ "tf": 1.0 }, "17": { - "tf": 1.7320508075688772 + "tf": 1.0 }, "18": { "tf": 1.4142135623730951 }, "19": { - "tf": 1.4142135623730951 + "tf": 1.7320508075688772 }, "2": { "tf": 1.7320508075688772 }, + "20": { + "tf": 1.4142135623730951 + }, + "21": { + "tf": 1.4142135623730951 + }, "3": { "tf": 1.0 }, @@ -3291,7 +3460,7 @@ "t": { "df": 1, "docs": { - "16": { + "17": { "tf": 2.23606797749979 } } @@ -3314,7 +3483,7 @@ "e": { "df": 2, "docs": { - "17": { + "19": { "tf": 1.0 }, "4": { @@ -3335,7 +3504,7 @@ "n": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -3381,7 +3550,7 @@ "10": { "tf": 1.0 }, - "20": { + "22": { "tf": 1.7320508075688772 } } @@ -3401,7 +3570,7 @@ "n": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -3439,7 +3608,7 @@ "t": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -3453,7 +3622,7 @@ "d": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } }, @@ -3493,7 +3662,7 @@ "t": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -3521,7 +3690,7 @@ "n": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -3543,7 +3712,7 @@ "n": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -3563,10 +3732,10 @@ "l": { "df": 2, "docs": { - "13": { + "14": { "tf": 1.0 }, - "14": { + "15": { "tf": 1.0 } } @@ -3584,7 +3753,7 @@ "d": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -3653,7 +3822,7 @@ "0": { "tf": 1.0 }, - "17": { + "19": { "tf": 1.0 }, "4": { @@ -3675,13 +3844,13 @@ "df": 0, "docs": {}, "t": { - "df": 16, + "df": 18, "docs": { "10": { "tf": 1.4142135623730951 }, "11": { - "tf": 1.0 + "tf": 1.4142135623730951 }, "12": { "tf": 1.0 @@ -3698,12 +3867,18 @@ "16": { "tf": 1.0 }, - "18": { + "17": { "tf": 1.0 }, + "18": { + "tf": 1.4142135623730951 + }, "2": { "tf": 1.7320508075688772 }, + "20": { + "tf": 1.0 + }, "3": { "tf": 1.0 }, @@ -3733,7 +3908,7 @@ "n": { "df": 3, "docs": { - "17": { + "19": { "tf": 1.0 }, "7": { @@ -3750,7 +3925,7 @@ "o": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } }, @@ -3766,7 +3941,7 @@ "t": { "df": 1, "docs": { - "13": { + "14": { "tf": 2.23606797749979 } } @@ -3781,7 +3956,7 @@ "r": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -3807,7 +3982,7 @@ "t": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -3845,6 +4020,29 @@ "df": 0, "docs": {}, "e": { + "a": { + "d": { + "df": 0, + "docs": {}, + "e": { + "df": 0, + "docs": {}, + "r": { + "df": 2, + "docs": { + "10": { + "tf": 1.0 + }, + "18": { + "tf": 1.0 + } + } + } + } + }, + "df": 0, + "docs": {} + }, "df": 0, "docs": {}, "l": { @@ -3856,7 +4054,7 @@ "o": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -3880,7 +4078,7 @@ "0": { "tf": 1.0 }, - "20": { + "22": { "tf": 1.0 } } @@ -3898,7 +4096,7 @@ "n": { "df": 2, "docs": { - "17": { + "19": { "tf": 1.0 }, "7": { @@ -3913,7 +4111,7 @@ "e": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -3931,7 +4129,7 @@ "l": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -3949,7 +4147,7 @@ "g": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -4021,7 +4219,7 @@ "t": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -4138,7 +4336,7 @@ "t": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.4142135623730951 } } @@ -4154,10 +4352,10 @@ "e": { "df": 3, "docs": { - "13": { + "14": { "tf": 1.4142135623730951 }, - "17": { + "19": { "tf": 1.0 }, "6": { @@ -4168,7 +4366,7 @@ "k": { "df": 1, "docs": { - "18": { + "20": { "tf": 2.449489742783178 } } @@ -4190,7 +4388,7 @@ "r": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -4222,7 +4420,7 @@ "t": { "df": 1, "docs": { - "20": { + "22": { "tf": 1.0 } } @@ -4250,7 +4448,7 @@ "n": { "df": 3, "docs": { - "17": { + "19": { "tf": 1.0 }, "7": { @@ -4268,7 +4466,7 @@ "e": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -4293,11 +4491,8 @@ "10": { "tf": 1.0 }, - "11": { - "tf": 2.0 - }, "12": { - "tf": 1.0 + "tf": 2.0 }, "13": { "tf": 1.0 @@ -4307,6 +4502,9 @@ }, "15": { "tf": 1.0 + }, + "16": { + "tf": 1.0 } } } @@ -4315,7 +4513,7 @@ }, "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -4358,7 +4556,7 @@ "l": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -4384,10 +4582,10 @@ "10": { "tf": 1.4142135623730951 }, - "18": { + "20": { "tf": 1.0 }, - "19": { + "21": { "tf": 1.0 }, "4": { @@ -4427,7 +4625,7 @@ "n": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -4452,7 +4650,7 @@ "t": { "df": 1, "docs": { - "11": { + "12": { "tf": 1.0 } } @@ -4466,7 +4664,7 @@ "d": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -4488,7 +4686,7 @@ "e": { "df": 1, "docs": { - "18": { + "20": { "tf": 2.0 } } @@ -4519,7 +4717,7 @@ "s": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -4601,7 +4799,7 @@ "t": { "df": 1, "docs": { - "18": { + "20": { "tf": 2.0 } }, @@ -4629,7 +4827,7 @@ "o": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -4641,7 +4839,7 @@ "i": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -4667,7 +4865,7 @@ "t": { "df": 1, "docs": { - "20": { + "22": { "tf": 1.0 } } @@ -4688,10 +4886,13 @@ "df": 0, "docs": {}, "s": { - "df": 1, + "df": 2, "docs": { "10": { "tf": 1.0 + }, + "11": { + "tf": 1.0 } } } @@ -4703,7 +4904,7 @@ "l": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.4142135623730951 } } @@ -4789,7 +4990,7 @@ "t": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.4142135623730951 } } @@ -4815,7 +5016,7 @@ "l": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -4853,7 +5054,7 @@ }, "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -4878,13 +5079,13 @@ "10": { "tf": 1.0 }, - "17": { + "19": { "tf": 1.7320508075688772 }, - "18": { + "20": { "tf": 1.0 }, - "19": { + "21": { "tf": 1.0 } } @@ -4905,10 +5106,10 @@ "n": { "df": 4, "docs": { - "18": { + "20": { "tf": 1.0 }, - "19": { + "21": { "tf": 1.4142135623730951 }, "3": { @@ -4928,7 +5129,7 @@ "e": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -4952,7 +5153,7 @@ "t": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -5069,7 +5270,7 @@ "r": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -5082,7 +5283,7 @@ "r": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -5133,7 +5334,7 @@ "s": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.4142135623730951 } } @@ -5170,7 +5371,7 @@ "h": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.7320508075688772 } } @@ -5243,7 +5444,7 @@ "e": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -5259,7 +5460,7 @@ "l": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.4142135623730951 } } @@ -5285,7 +5486,7 @@ "k": { "df": 1, "docs": { - "15": { + "16": { "tf": 1.4142135623730951 } } @@ -5323,13 +5524,13 @@ }, "df": 4, "docs": { - "11": { + "12": { "tf": 1.7320508075688772 }, - "16": { + "17": { "tf": 1.4142135623730951 }, - "18": { + "20": { "tf": 1.4142135623730951 }, "6": { @@ -5364,7 +5565,7 @@ "d": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -5382,7 +5583,7 @@ "e": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -5396,7 +5597,7 @@ "o": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -5420,7 +5621,7 @@ "10": { "tf": 1.0 }, - "16": { + "17": { "tf": 1.7320508075688772 } } @@ -5468,7 +5669,7 @@ "d": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -5478,7 +5679,7 @@ "k": { "df": 2, "docs": { - "18": { + "20": { "tf": 1.4142135623730951 }, "8": { @@ -5488,9 +5689,12 @@ }, "l": { "d": { - "df": 1, + "df": 2, "docs": { - "17": { + "11": { + "tf": 4.69041575982343 + }, + "19": { "tf": 1.0 } } @@ -5514,7 +5718,7 @@ "o": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -5637,9 +5841,15 @@ "df": 0, "docs": {}, "r": { - "df": 3, + "df": 5, "docs": { - "17": { + "11": { + "tf": 1.0 + }, + "18": { + "tf": 1.0 + }, + "19": { "tf": 1.0 }, "2": { @@ -5697,7 +5907,7 @@ "s": { "df": 1, "docs": { - "20": { + "22": { "tf": 1.0 } } @@ -5764,8 +5974,14 @@ "df": 0, "docs": {}, "t": { - "df": 1, + "df": 3, "docs": { + "11": { + "tf": 1.0 + }, + "18": { + "tf": 1.0 + }, "2": { "tf": 1.0 } @@ -5792,7 +6008,7 @@ "t": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -5912,7 +6128,7 @@ "k": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -5940,7 +6156,7 @@ "n": { "df": 1, "docs": { - "11": { + "12": { "tf": 1.0 } } @@ -5986,7 +6202,7 @@ "e": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -6019,7 +6235,7 @@ "t": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -6037,7 +6253,7 @@ "l": { "df": 1, "docs": { - "18": { + "20": { "tf": 1.0 } } @@ -6101,7 +6317,7 @@ "d": { "df": 1, "docs": { - "17": { + "19": { "tf": 1.0 } } @@ -6122,7 +6338,7 @@ "n": { "df": 3, "docs": { - "19": { + "21": { "tf": 1.0 }, "3": { @@ -6183,7 +6399,7 @@ "s": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -6220,7 +6436,7 @@ "h": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.0 } } @@ -6273,7 +6489,7 @@ "l": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } } @@ -6299,7 +6515,7 @@ "k": { "df": 1, "docs": { - "15": { + "16": { "tf": 1.0 } } @@ -6321,13 +6537,13 @@ "t": { "df": 3, "docs": { - "11": { + "12": { "tf": 1.0 }, - "16": { + "17": { "tf": 1.0 }, - "18": { + "20": { "tf": 1.0 } } @@ -6349,7 +6565,7 @@ "d": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } }