From e22886a4712a264c8119e3f5ddee726558a8942c Mon Sep 17 00:00:00 2001 From: rchaser53 Date: Sun, 2 Jan 2022 19:34:55 +0900 Subject: [PATCH] Keep indent when using include in code block --- src/preprocess/links.rs | 23 +- tests/dummy_book/src/first/eqNonEmpty.hs | 2 + tests/dummy_book/src/first/nested.md | 14 + tests/searchindex_fixture.json | 1011 +++++++++++++++------- 4 files changed, 726 insertions(+), 324 deletions(-) create mode 100644 tests/dummy_book/src/first/eqNonEmpty.hs diff --git a/src/preprocess/links.rs b/src/preprocess/links.rs index edd97ba924..4daa3af9c6 100644 --- a/src/preprocess/links.rs +++ b/src/preprocess/links.rs @@ -89,19 +89,26 @@ where let mut replaced = String::new(); for link in find_links(s) { - replaced.push_str(&s[previous_end_index..link.start_index]); + let before_link = &s[previous_end_index..link.start_index]; + let offset = if let Some(i) = before_link.rfind('\n') { + &before_link[i + 1..] + } else { + "" + }; + replaced.push_str(before_link); match link.render_with_path(&path, chapter_title) { Ok(new_content) => { if depth < MAX_LINK_NESTED_DEPTH { if let Some(rel_path) = link.link_type.relative_path(path) { - replaced.push_str(&replace_all( - &new_content, - rel_path, - source, - depth + 1, - chapter_title, - )); + let v = + replace_all(&new_content, rel_path, source, depth + 1, chapter_title); + let lines = v.split('\n').into_iter().collect::>(); + // no need to add offset for the first line + replaced.push_str(lines[0]); + for line in lines.iter().skip(1) { + replaced.push_str(&format!("\n{}{}", &offset, &line)); + } } else { replaced.push_str(&new_content); } diff --git a/tests/dummy_book/src/first/eqNonEmpty.hs b/tests/dummy_book/src/first/eqNonEmpty.hs new file mode 100644 index 0000000000..31d84f1fa9 --- /dev/null +++ b/tests/dummy_book/src/first/eqNonEmpty.hs @@ -0,0 +1,2 @@ +instance Eq (NonEmpty a) where +eq (NonEmpty x xs) (NonEmpty y ys) = x == y && xs == ys \ No newline at end of file diff --git a/tests/dummy_book/src/first/nested.md b/tests/dummy_book/src/first/nested.md index ae90763a06..cd8d8a3351 100644 --- a/tests/dummy_book/src/first/nested.md +++ b/tests/dummy_book/src/first/nested.md @@ -29,3 +29,17 @@ assert!($TEST_STATUS); ```rust {{#rustdoc_include partially-included-test-with-anchors.rs:rustdoc-include-anchor}} ``` + +## Keep Indent + +1. The following code remains indent: + ```haskell + {{#include ./eqNonEmpty.hs}} + ``` + we ... + + 1. The following code also remains indent: + ```haskell + {{#include ./eqNonEmpty.hs}} + ``` + we ... \ No newline at end of file diff --git a/tests/searchindex_fixture.json b/tests/searchindex_fixture.json index 32c44a1b98..5b536e98a1 100644 --- a/tests/searchindex_fixture.json +++ b/tests/searchindex_fixture.json @@ -9,6 +9,7 @@ "first/nested.html#anchors-include-the-part-of-a-file-between-special-comments", "first/nested.html#rustdoc-include-adds-the-rest-of-the-file-as-hidden", "first/nested.html#rustdoc-include-works-with-anchors-too", + "first/nested.html#keep-indent", "first/includes.html#includes", "first/includes.html#summary", "first/recursive.html", @@ -38,71 +39,76 @@ "title": 1 }, "10": { - "body": 17, + "body": 0, "breadcrumbs": 4, "title": 1 }, "11": { + "body": 17, + "breadcrumbs": 4, + "title": 1 + }, + "12": { "body": 44, "breadcrumbs": 3, "title": 2 }, - "12": { + "13": { "body": 3, "breadcrumbs": 5, "title": 2 }, - "13": { + "14": { "body": 4, "breadcrumbs": 4, "title": 1 }, - "14": { + "15": { "body": 12, "breadcrumbs": 4, "title": 1 }, - "15": { + "16": { "body": 2, "breadcrumbs": 4, "title": 1 }, - "16": { + "17": { "body": 3, "breadcrumbs": 4, "title": 1 }, - "17": { + "18": { "body": 29, "breadcrumbs": 6, "title": 3 }, - "18": { + "19": { "body": 6, "breadcrumbs": 3, "title": 2 }, - "19": { - "body": 20, - "breadcrumbs": 4, - "title": 2 - }, "2": { "body": 2, "breadcrumbs": 4, "title": 2 }, "20": { + "body": 20, + "breadcrumbs": 4, + "title": 2 + }, + "21": { "body": 18, "breadcrumbs": 9, "title": 5 }, - "21": { + "22": { "body": 0, "breadcrumbs": 5, "title": 1 }, - "22": { + "23": { "body": 3, "breadcrumbs": 2, "title": 1 @@ -138,9 +144,9 @@ "title": 4 }, "9": { - "body": 0, - "breadcrumbs": 4, - "title": 1 + "body": 36, + "breadcrumbs": 6, + "title": 2 } }, "docs": { @@ -157,64 +163,64 @@ "title": "Introduction" }, "10": { + "body": "", + "breadcrumbs": "First Chapter » Includes » Includes", + "id": "10", + "title": "Includes" + }, + "11": { "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", + "id": "11", "title": "Summary" }, - "11": { + "12": { "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", + "id": "12", "title": "First Chapter" }, - "12": { + "13": { "body": "Tests for some markdown output.", "breadcrumbs": "First Chapter » Markdown » Markdown tests", - "id": "12", + "id": "13", "title": "Markdown tests" }, - "13": { + "14": { "body": "foo bar baz bim", "breadcrumbs": "First Chapter » Markdown » Tables", - "id": "13", + "id": "14", "title": "Tables" }, - "14": { + "15": { "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", + "id": "15", "title": "Footnotes" }, - "15": { + "16": { "body": "strikethrough example", "breadcrumbs": "First Chapter » Markdown » Strikethrough", - "id": "15", + "id": "16", "title": "Strikethrough" }, - "16": { + "17": { "body": "Apples Broccoli Carrots", "breadcrumbs": "First Chapter » Markdown » Tasklisks", - "id": "16", + "id": "17", "title": "Tasklisks" }, - "17": { + "18": { "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", + "id": "18", "title": "Unicode stress tests" }, - "18": { + "19": { "body": "Capybara capybara capybara. Capybara capybara capybara.", "breadcrumbs": "First Chapter » No Headers", - "id": "18", - "title": "First Chapter" - }, - "19": { - "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": "Second Chapter" + "title": "First Chapter" }, "2": { "body": "more text.", @@ -223,21 +229,27 @@ "title": "First Chapter" }, "20": { + "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": "20", + "title": "Second Chapter" + }, + "21": { "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", + "id": "21", "title": "Testing relative links for the print page" }, - "21": { + "22": { "body": "", "breadcrumbs": "Second Chapter » Nested Chapter » Some section", - "id": "21", + "id": "22", "title": "Some section" }, - "22": { + "23": { "body": "I put <HTML> in here!", "breadcrumbs": "Conclusion » Conclusion", - "id": "22", + "id": "23", "title": "Conclusion" }, "3": { @@ -277,13 +289,13 @@ "title": "Rustdoc include works with anchors too" }, "9": { - "body": "", - "breadcrumbs": "First Chapter » Includes » Includes", + "body": "The following code remains indent: instance Eq (NonEmpty a) where\neq (NonEmpty x xs) (NonEmpty y ys) = x == y && xs == ys we ... The following code also remains indent: instance Eq (NonEmpty a) where\neq (NonEmpty x xs) (NonEmpty y ys) = x == y && xs == ys we ...", + "breadcrumbs": "First Chapter » Nested Chapter » Keep Indent", "id": "9", - "title": "Includes" + "title": "Keep Indent" } }, - "length": 23, + "length": 24, "save": true }, "fields": [ @@ -297,10 +309,10 @@ "1": { "df": 2, "docs": { - "14": { + "15": { "tf": 1.0 }, - "17": { + "18": { "tf": 1.0 } } @@ -308,7 +320,7 @@ "2": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.0 } } @@ -364,7 +376,7 @@ "l": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -384,7 +396,7 @@ "d": { "df": 1, "docs": { - "11": { + "12": { "tf": 4.69041575982343 } } @@ -459,7 +471,7 @@ "r": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -467,7 +479,7 @@ "z": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -509,7 +521,7 @@ "m": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -527,7 +539,7 @@ "0": { "tf": 1.0 }, - "10": { + "11": { "tf": 1.0 } } @@ -539,7 +551,7 @@ "h": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -563,7 +575,7 @@ "i": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -603,7 +615,7 @@ "e": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.7320508075688772 } } @@ -627,7 +639,7 @@ "a": { "df": 1, "docs": { - "18": { + "19": { "tf": 2.449489742783178 } } @@ -649,7 +661,7 @@ "e": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } }, @@ -668,7 +680,7 @@ "i": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -687,7 +699,7 @@ "t": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -729,13 +741,10 @@ "r": { "df": 6, "docs": { - "10": { - "tf": 2.0 - }, "11": { - "tf": 1.0 + "tf": 2.0 }, - "18": { + "12": { "tf": 1.0 }, "19": { @@ -744,6 +753,9 @@ "2": { "tf": 1.0 }, + "20": { + "tf": 1.0 + }, "4": { "tf": 1.0 } @@ -760,7 +772,7 @@ "t": { "df": 1, "docs": { - "17": { + "18": { "tf": 2.23606797749979 } } @@ -781,13 +793,16 @@ "df": 0, "docs": {}, "e": { - "df": 2, + "df": 3, "docs": { - "19": { + "20": { "tf": 1.0 }, "4": { "tf": 1.0 + }, + "9": { + "tf": 1.4142135623730951 } } } @@ -804,7 +819,7 @@ "n": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -847,10 +862,10 @@ "s": { "df": 2, "docs": { - "10": { + "11": { "tf": 1.0 }, - "22": { + "23": { "tf": 1.0 } } @@ -870,7 +885,7 @@ "n": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -908,7 +923,7 @@ "t": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -922,7 +937,7 @@ "d": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } }, @@ -941,7 +956,7 @@ "0": { "tf": 1.0 }, - "10": { + "11": { "tf": 1.0 } } @@ -962,7 +977,7 @@ "t": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -990,7 +1005,7 @@ "n": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -1003,6 +1018,14 @@ } } }, + "q": { + "df": 1, + "docs": { + "9": { + "tf": 2.0 + } + } + }, "v": { "df": 0, "docs": {}, @@ -1012,7 +1035,7 @@ "n": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -1032,10 +1055,10 @@ "l": { "df": 2, "docs": { - "14": { + "15": { "tf": 1.0 }, - "15": { + "16": { "tf": 1.0 } } @@ -1053,7 +1076,7 @@ "d": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -1122,7 +1145,7 @@ "0": { "tf": 1.0 }, - "19": { + "20": { "tf": 1.0 }, "4": { @@ -1146,19 +1169,19 @@ "t": { "df": 5, "docs": { - "10": { + "11": { "tf": 1.0 }, - "11": { + "12": { "tf": 1.0 }, - "18": { + "19": { "tf": 1.0 }, "2": { "tf": 1.0 }, - "20": { + "21": { "tf": 1.0 } } @@ -1169,7 +1192,7 @@ "n": { "df": 3, "docs": { - "19": { + "20": { "tf": 1.0 }, "7": { @@ -1183,10 +1206,30 @@ "o": { "df": 0, "docs": {}, + "l": { + "df": 0, + "docs": {}, + "l": { + "df": 0, + "docs": {}, + "o": { + "df": 0, + "docs": {}, + "w": { + "df": 1, + "docs": { + "9": { + "tf": 1.4142135623730951 + } + } + } + } + } + }, "o": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } }, @@ -1202,7 +1245,7 @@ "t": { "df": 1, "docs": { - "14": { + "15": { "tf": 2.0 } } @@ -1217,7 +1260,7 @@ "r": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -1243,7 +1286,7 @@ "t": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -1291,7 +1334,7 @@ "r": { "df": 1, "docs": { - "10": { + "11": { "tf": 1.0 } } @@ -1312,7 +1355,7 @@ "o": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -1336,7 +1379,7 @@ "0": { "tf": 1.0 }, - "22": { + "23": { "tf": 1.0 } } @@ -1354,7 +1397,7 @@ "n": { "df": 2, "docs": { - "19": { + "20": { "tf": 1.0 }, "7": { @@ -1369,7 +1412,7 @@ "e": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -1387,7 +1430,7 @@ "l": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -1405,7 +1448,7 @@ "g": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -1428,6 +1471,9 @@ "10": { "tf": 1.0 }, + "11": { + "tf": 1.0 + }, "6": { "tf": 1.4142135623730951 }, @@ -1436,9 +1482,6 @@ }, "8": { "tf": 1.0 - }, - "9": { - "tf": 1.0 } } }, @@ -1453,6 +1496,18 @@ "e": { "df": 0, "docs": {}, + "n": { + "df": 0, + "docs": {}, + "t": { + "df": 1, + "docs": { + "9": { + "tf": 1.7320508075688772 + } + } + } + }, "x": { "df": 1, "docs": { @@ -1477,12 +1532,32 @@ "t": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } } } + }, + "t": { + "a": { + "df": 0, + "docs": {}, + "n": { + "c": { + "df": 1, + "docs": { + "9": { + "tf": 1.4142135623730951 + } + } + }, + "df": 0, + "docs": {} + } + }, + "df": 0, + "docs": {} } }, "t": { @@ -1529,7 +1604,7 @@ "1": { "tf": 1.0 }, - "10": { + "11": { "tf": 1.0 } } @@ -1582,6 +1657,26 @@ "docs": {} } }, + "k": { + "df": 0, + "docs": {}, + "e": { + "df": 0, + "docs": {}, + "e": { + "df": 0, + "docs": {}, + "p": { + "df": 1, + "docs": { + "9": { + "tf": 1.0 + } + } + } + } + } + }, "l": { "df": 0, "docs": {}, @@ -1594,7 +1689,7 @@ "t": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.4142135623730951 } } @@ -1610,10 +1705,10 @@ "e": { "df": 3, "docs": { - "14": { + "15": { "tf": 1.4142135623730951 }, - "19": { + "20": { "tf": 1.0 }, "6": { @@ -1624,7 +1719,7 @@ "k": { "df": 1, "docs": { - "20": { + "21": { "tf": 2.23606797749979 } } @@ -1646,7 +1741,7 @@ "r": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.0 } } @@ -1678,7 +1773,7 @@ "t": { "df": 1, "docs": { - "22": { + "23": { "tf": 1.0 } } @@ -1706,7 +1801,7 @@ "n": { "df": 3, "docs": { - "19": { + "20": { "tf": 1.0 }, "7": { @@ -1724,7 +1819,7 @@ "e": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -1746,10 +1841,10 @@ "n": { "df": 2, "docs": { - "10": { + "11": { "tf": 1.0 }, - "12": { + "13": { "tf": 1.4142135623730951 } } @@ -1759,7 +1854,7 @@ }, "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -1802,7 +1897,7 @@ "l": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.0 } } @@ -1825,7 +1920,7 @@ "t": { "df": 2, "docs": { - "10": { + "11": { "tf": 1.4142135623730951 }, "4": { @@ -1853,9 +1948,33 @@ "n": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } + }, + "e": { + "df": 0, + "docs": {}, + "m": { + "df": 0, + "docs": {}, + "p": { + "df": 0, + "docs": {}, + "t": { + "df": 0, + "docs": {}, + "i": { + "df": 1, + "docs": { + "9": { + "tf": 2.449489742783178 + } + } + } + } + } + } } } } @@ -1878,7 +1997,7 @@ "t": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } } @@ -1892,7 +2011,7 @@ "d": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -1914,7 +2033,7 @@ "e": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.7320508075688772 } } @@ -1945,7 +2064,7 @@ "s": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -2027,7 +2146,7 @@ "t": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.7320508075688772 } }, @@ -2055,7 +2174,7 @@ "o": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -2067,7 +2186,7 @@ "i": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -2093,7 +2212,7 @@ "t": { "df": 1, "docs": { - "22": { + "23": { "tf": 1.0 } } @@ -2116,7 +2235,7 @@ "s": { "df": 1, "docs": { - "10": { + "11": { "tf": 1.0 } } @@ -2129,11 +2248,31 @@ "l": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } }, + "m": { + "a": { + "df": 0, + "docs": {}, + "i": { + "df": 0, + "docs": {}, + "n": { + "df": 1, + "docs": { + "9": { + "tf": 1.4142135623730951 + } + } + } + } + }, + "df": 0, + "docs": {} + }, "n": { "d": { "df": 0, @@ -2215,7 +2354,7 @@ "t": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.4142135623730951 } } @@ -2241,7 +2380,7 @@ "l": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -2279,7 +2418,7 @@ }, "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -2301,10 +2440,10 @@ "d": { "df": 2, "docs": { - "10": { + "11": { "tf": 1.0 }, - "19": { + "20": { "tf": 1.0 } } @@ -2325,10 +2464,10 @@ "n": { "df": 4, "docs": { - "20": { + "21": { "tf": 1.0 }, - "21": { + "22": { "tf": 1.0 }, "3": { @@ -2348,7 +2487,7 @@ "e": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -2372,7 +2511,7 @@ "t": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -2489,7 +2628,7 @@ "r": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -2502,7 +2641,7 @@ "r": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -2553,7 +2692,7 @@ "s": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -2590,7 +2729,7 @@ "h": { "df": 1, "docs": { - "15": { + "16": { "tf": 1.4142135623730951 } } @@ -2646,7 +2785,7 @@ "i": { "df": 1, "docs": { - "10": { + "11": { "tf": 1.0 } } @@ -2663,7 +2802,7 @@ "e": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -2679,7 +2818,7 @@ "l": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -2705,7 +2844,7 @@ "k": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -2743,13 +2882,13 @@ }, "df": 4, "docs": { - "12": { + "13": { "tf": 1.4142135623730951 }, - "17": { + "18": { "tf": 1.0 }, - "20": { + "21": { "tf": 1.0 }, "6": { @@ -2784,7 +2923,7 @@ "d": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.0 } } @@ -2802,7 +2941,7 @@ "e": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -2816,7 +2955,7 @@ "o": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -2837,10 +2976,10 @@ "d": { "df": 2, "docs": { - "10": { + "11": { "tf": 1.0 }, - "17": { + "18": { "tf": 1.0 } } @@ -2888,7 +3027,7 @@ "d": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.0 } } @@ -2898,7 +3037,7 @@ "k": { "df": 2, "docs": { - "20": { + "21": { "tf": 1.4142135623730951 }, "8": { @@ -2910,10 +3049,10 @@ "d": { "df": 2, "docs": { - "11": { + "12": { "tf": 4.69041575982343 }, - "19": { + "20": { "tf": 1.0 } } @@ -2924,6 +3063,38 @@ } } }, + "x": { + "df": 1, + "docs": { + "9": { + "tf": 2.0 + } + }, + "s": { + "df": 1, + "docs": { + "9": { + "tf": 2.0 + } + } + } + }, + "y": { + "df": 1, + "docs": { + "9": { + "tf": 2.0 + } + }, + "s": { + "df": 1, + "docs": { + "9": { + "tf": 2.0 + } + } + } + }, "z": { "a": { "df": 0, @@ -2937,7 +3108,7 @@ "o": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -2955,10 +3126,10 @@ "1": { "df": 2, "docs": { - "14": { + "15": { "tf": 1.0 }, - "17": { + "18": { "tf": 1.0 } } @@ -2966,7 +3137,7 @@ "2": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.0 } } @@ -3022,7 +3193,7 @@ "l": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -3042,7 +3213,7 @@ "d": { "df": 1, "docs": { - "11": { + "12": { "tf": 4.69041575982343 } } @@ -3117,7 +3288,7 @@ "r": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -3125,7 +3296,7 @@ "z": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -3167,7 +3338,7 @@ "m": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -3185,7 +3356,7 @@ "0": { "tf": 1.7320508075688772 }, - "10": { + "11": { "tf": 1.0 } } @@ -3197,7 +3368,7 @@ "h": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -3221,7 +3392,7 @@ "i": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -3261,7 +3432,7 @@ "e": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.7320508075688772 } } @@ -3285,7 +3456,7 @@ "a": { "df": 1, "docs": { - "18": { + "19": { "tf": 2.449489742783178 } } @@ -3307,7 +3478,7 @@ "e": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } }, @@ -3326,7 +3497,7 @@ "i": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -3345,7 +3516,7 @@ "t": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -3385,16 +3556,16 @@ "df": 0, "docs": {}, "r": { - "df": 20, + "df": 21, "docs": { "10": { - "tf": 2.23606797749979 + "tf": 1.0 }, "11": { - "tf": 1.4142135623730951 + "tf": 2.23606797749979 }, "12": { - "tf": 1.0 + "tf": 1.4142135623730951 }, "13": { "tf": 1.0 @@ -3412,20 +3583,23 @@ "tf": 1.0 }, "18": { - "tf": 1.4142135623730951 + "tf": 1.0 }, "19": { - "tf": 1.7320508075688772 + "tf": 1.4142135623730951 }, "2": { "tf": 1.7320508075688772 }, "20": { - "tf": 1.4142135623730951 + "tf": 1.7320508075688772 }, "21": { "tf": 1.4142135623730951 }, + "22": { + "tf": 1.4142135623730951 + }, "3": { "tf": 1.0 }, @@ -3445,7 +3619,7 @@ "tf": 1.4142135623730951 }, "9": { - "tf": 1.0 + "tf": 1.4142135623730951 } } } @@ -3460,7 +3634,7 @@ "t": { "df": 1, "docs": { - "17": { + "18": { "tf": 2.23606797749979 } } @@ -3481,13 +3655,16 @@ "df": 0, "docs": {}, "e": { - "df": 2, + "df": 3, "docs": { - "19": { + "20": { "tf": 1.0 }, "4": { "tf": 1.0 + }, + "9": { + "tf": 1.4142135623730951 } } } @@ -3504,7 +3681,7 @@ "n": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -3547,10 +3724,10 @@ "s": { "df": 2, "docs": { - "10": { + "11": { "tf": 1.0 }, - "22": { + "23": { "tf": 1.7320508075688772 } } @@ -3570,7 +3747,7 @@ "n": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -3608,7 +3785,7 @@ "t": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -3622,7 +3799,7 @@ "d": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } }, @@ -3641,7 +3818,7 @@ "0": { "tf": 1.7320508075688772 }, - "10": { + "11": { "tf": 1.0 } } @@ -3662,7 +3839,7 @@ "t": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -3690,7 +3867,7 @@ "n": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -3703,6 +3880,14 @@ } } }, + "q": { + "df": 1, + "docs": { + "9": { + "tf": 2.0 + } + } + }, "v": { "df": 0, "docs": {}, @@ -3712,7 +3897,7 @@ "n": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -3732,10 +3917,10 @@ "l": { "df": 2, "docs": { - "14": { + "15": { "tf": 1.0 }, - "15": { + "16": { "tf": 1.0 } } @@ -3753,7 +3938,7 @@ "d": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -3822,7 +4007,7 @@ "0": { "tf": 1.0 }, - "19": { + "20": { "tf": 1.0 }, "4": { @@ -3844,16 +4029,16 @@ "df": 0, "docs": {}, "t": { - "df": 18, + "df": 19, "docs": { "10": { - "tf": 1.4142135623730951 + "tf": 1.0 }, "11": { "tf": 1.4142135623730951 }, "12": { - "tf": 1.0 + "tf": 1.4142135623730951 }, "13": { "tf": 1.0 @@ -3871,12 +4056,15 @@ "tf": 1.0 }, "18": { + "tf": 1.0 + }, + "19": { "tf": 1.4142135623730951 }, "2": { "tf": 1.7320508075688772 }, - "20": { + "21": { "tf": 1.0 }, "3": { @@ -3908,7 +4096,7 @@ "n": { "df": 3, "docs": { - "19": { + "20": { "tf": 1.0 }, "7": { @@ -3922,10 +4110,30 @@ "o": { "df": 0, "docs": {}, + "l": { + "df": 0, + "docs": {}, + "l": { + "df": 0, + "docs": {}, + "o": { + "df": 0, + "docs": {}, + "w": { + "df": 1, + "docs": { + "9": { + "tf": 1.4142135623730951 + } + } + } + } + } + }, "o": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } }, @@ -3941,7 +4149,7 @@ "t": { "df": 1, "docs": { - "14": { + "15": { "tf": 2.23606797749979 } } @@ -3956,7 +4164,7 @@ "r": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -3982,7 +4190,7 @@ "t": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -4030,10 +4238,10 @@ "r": { "df": 2, "docs": { - "10": { + "11": { "tf": 1.0 }, - "18": { + "19": { "tf": 1.0 } } @@ -4054,7 +4262,7 @@ "o": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -4078,7 +4286,7 @@ "0": { "tf": 1.0 }, - "22": { + "23": { "tf": 1.0 } } @@ -4096,7 +4304,7 @@ "n": { "df": 2, "docs": { - "19": { + "20": { "tf": 1.0 }, "7": { @@ -4111,7 +4319,7 @@ "e": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -4129,7 +4337,7 @@ "l": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -4147,7 +4355,7 @@ "g": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -4168,6 +4376,9 @@ "df": 5, "docs": { "10": { + "tf": 1.7320508075688772 + }, + "11": { "tf": 1.4142135623730951 }, "6": { @@ -4178,9 +4389,6 @@ }, "8": { "tf": 1.4142135623730951 - }, - "9": { - "tf": 1.7320508075688772 } } }, @@ -4195,6 +4403,18 @@ "e": { "df": 0, "docs": {}, + "n": { + "df": 0, + "docs": {}, + "t": { + "df": 1, + "docs": { + "9": { + "tf": 2.0 + } + } + } + }, "x": { "df": 1, "docs": { @@ -4219,12 +4439,32 @@ "t": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } } } + }, + "t": { + "a": { + "df": 0, + "docs": {}, + "n": { + "c": { + "df": 1, + "docs": { + "9": { + "tf": 1.4142135623730951 + } + } + }, + "df": 0, + "docs": {} + } + }, + "df": 0, + "docs": {} } }, "t": { @@ -4271,7 +4511,7 @@ "1": { "tf": 1.7320508075688772 }, - "10": { + "11": { "tf": 1.0 } } @@ -4324,6 +4564,26 @@ "docs": {} } }, + "k": { + "df": 0, + "docs": {}, + "e": { + "df": 0, + "docs": {}, + "e": { + "df": 0, + "docs": {}, + "p": { + "df": 1, + "docs": { + "9": { + "tf": 1.4142135623730951 + } + } + } + } + } + }, "l": { "df": 0, "docs": {}, @@ -4336,7 +4596,7 @@ "t": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.4142135623730951 } } @@ -4352,10 +4612,10 @@ "e": { "df": 3, "docs": { - "14": { + "15": { "tf": 1.4142135623730951 }, - "19": { + "20": { "tf": 1.0 }, "6": { @@ -4366,7 +4626,7 @@ "k": { "df": 1, "docs": { - "20": { + "21": { "tf": 2.449489742783178 } } @@ -4388,7 +4648,7 @@ "r": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.0 } } @@ -4420,7 +4680,7 @@ "t": { "df": 1, "docs": { - "22": { + "23": { "tf": 1.0 } } @@ -4448,7 +4708,7 @@ "n": { "df": 3, "docs": { - "19": { + "20": { "tf": 1.0 }, "7": { @@ -4466,7 +4726,7 @@ "e": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -4488,14 +4748,11 @@ "n": { "df": 6, "docs": { - "10": { + "11": { "tf": 1.0 }, - "12": { - "tf": 2.0 - }, "13": { - "tf": 1.0 + "tf": 2.0 }, "14": { "tf": 1.0 @@ -4505,6 +4762,9 @@ }, "16": { "tf": 1.0 + }, + "17": { + "tf": 1.0 } } } @@ -4513,7 +4773,7 @@ }, "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -4556,7 +4816,7 @@ "l": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.0 } } @@ -4577,15 +4837,15 @@ "df": 0, "docs": {}, "t": { - "df": 8, + "df": 9, "docs": { - "10": { + "11": { "tf": 1.4142135623730951 }, - "20": { + "21": { "tf": 1.0 }, - "21": { + "22": { "tf": 1.0 }, "4": { @@ -4602,6 +4862,9 @@ }, "8": { "tf": 1.0 + }, + "9": { + "tf": 1.0 } } } @@ -4625,9 +4888,33 @@ "n": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } + }, + "e": { + "df": 0, + "docs": {}, + "m": { + "df": 0, + "docs": {}, + "p": { + "df": 0, + "docs": {}, + "t": { + "df": 0, + "docs": {}, + "i": { + "df": 1, + "docs": { + "9": { + "tf": 2.449489742783178 + } + } + } + } + } + } } } } @@ -4650,7 +4937,7 @@ "t": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } } @@ -4664,7 +4951,7 @@ "d": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -4686,7 +4973,7 @@ "e": { "df": 1, "docs": { - "20": { + "21": { "tf": 2.0 } } @@ -4717,7 +5004,7 @@ "s": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -4799,7 +5086,7 @@ "t": { "df": 1, "docs": { - "20": { + "21": { "tf": 2.0 } }, @@ -4827,7 +5114,7 @@ "o": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -4839,7 +5126,7 @@ "i": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -4865,7 +5152,7 @@ "t": { "df": 1, "docs": { - "22": { + "23": { "tf": 1.0 } } @@ -4888,10 +5175,10 @@ "s": { "df": 2, "docs": { - "10": { + "11": { "tf": 1.0 }, - "11": { + "12": { "tf": 1.0 } } @@ -4904,11 +5191,31 @@ "l": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.4142135623730951 } } }, + "m": { + "a": { + "df": 0, + "docs": {}, + "i": { + "df": 0, + "docs": {}, + "n": { + "df": 1, + "docs": { + "9": { + "tf": 1.4142135623730951 + } + } + } + } + }, + "df": 0, + "docs": {} + }, "n": { "d": { "df": 0, @@ -4990,7 +5297,7 @@ "t": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.4142135623730951 } } @@ -5016,7 +5323,7 @@ "l": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -5054,7 +5361,7 @@ }, "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -5076,16 +5383,16 @@ "d": { "df": 4, "docs": { - "10": { + "11": { "tf": 1.0 }, - "19": { + "20": { "tf": 1.7320508075688772 }, - "20": { + "21": { "tf": 1.0 }, - "21": { + "22": { "tf": 1.0 } } @@ -5106,10 +5413,10 @@ "n": { "df": 4, "docs": { - "20": { + "21": { "tf": 1.0 }, - "21": { + "22": { "tf": 1.4142135623730951 }, "3": { @@ -5129,7 +5436,7 @@ "e": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -5153,7 +5460,7 @@ "t": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -5270,7 +5577,7 @@ "r": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -5283,7 +5590,7 @@ "r": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -5334,7 +5641,7 @@ "s": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.4142135623730951 } } @@ -5371,7 +5678,7 @@ "h": { "df": 1, "docs": { - "15": { + "16": { "tf": 1.7320508075688772 } } @@ -5427,7 +5734,7 @@ "i": { "df": 1, "docs": { - "10": { + "11": { "tf": 1.4142135623730951 } } @@ -5444,7 +5751,7 @@ "e": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -5460,7 +5767,7 @@ "l": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.4142135623730951 } } @@ -5486,7 +5793,7 @@ "k": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.4142135623730951 } } @@ -5524,13 +5831,13 @@ }, "df": 4, "docs": { - "12": { + "13": { "tf": 1.7320508075688772 }, - "17": { + "18": { "tf": 1.4142135623730951 }, - "20": { + "21": { "tf": 1.4142135623730951 }, "6": { @@ -5565,7 +5872,7 @@ "d": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.0 } } @@ -5583,7 +5890,7 @@ "e": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -5597,7 +5904,7 @@ "o": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -5618,10 +5925,10 @@ "d": { "df": 2, "docs": { - "10": { + "11": { "tf": 1.0 }, - "17": { + "18": { "tf": 1.7320508075688772 } } @@ -5669,7 +5976,7 @@ "d": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.0 } } @@ -5679,7 +5986,7 @@ "k": { "df": 2, "docs": { - "20": { + "21": { "tf": 1.4142135623730951 }, "8": { @@ -5691,10 +5998,10 @@ "d": { "df": 2, "docs": { - "11": { + "12": { "tf": 4.69041575982343 }, - "19": { + "20": { "tf": 1.0 } } @@ -5705,6 +6012,38 @@ } } }, + "x": { + "df": 1, + "docs": { + "9": { + "tf": 2.0 + } + }, + "s": { + "df": 1, + "docs": { + "9": { + "tf": 2.0 + } + } + } + }, + "y": { + "df": 1, + "docs": { + "9": { + "tf": 2.0 + } + }, + "s": { + "df": 1, + "docs": { + "9": { + "tf": 2.0 + } + } + } + }, "z": { "a": { "df": 0, @@ -5718,7 +6057,7 @@ "o": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -5843,10 +6182,7 @@ "r": { "df": 5, "docs": { - "11": { - "tf": 1.0 - }, - "18": { + "12": { "tf": 1.0 }, "19": { @@ -5855,6 +6191,9 @@ "2": { "tf": 1.0 }, + "20": { + "tf": 1.0 + }, "4": { "tf": 1.0 } @@ -5907,7 +6246,7 @@ "s": { "df": 1, "docs": { - "22": { + "23": { "tf": 1.0 } } @@ -5976,10 +6315,10 @@ "t": { "df": 3, "docs": { - "11": { + "12": { "tf": 1.0 }, - "18": { + "19": { "tf": 1.0 }, "2": { @@ -6008,7 +6347,7 @@ "t": { "df": 1, "docs": { - "14": { + "15": { "tf": 1.0 } } @@ -6061,6 +6400,9 @@ "d": { "df": 4, "docs": { + "10": { + "tf": 1.0 + }, "6": { "tf": 1.0 }, @@ -6069,9 +6411,6 @@ }, "8": { "tf": 1.0 - }, - "9": { - "tf": 1.0 } } }, @@ -6080,6 +6419,26 @@ } } }, + "d": { + "df": 0, + "docs": {}, + "e": { + "df": 0, + "docs": {}, + "n": { + "df": 0, + "docs": {}, + "t": { + "df": 1, + "docs": { + "9": { + "tf": 1.0 + } + } + } + } + } + }, "df": 0, "docs": {}, "t": { @@ -6116,6 +6475,26 @@ } } }, + "k": { + "df": 0, + "docs": {}, + "e": { + "df": 0, + "docs": {}, + "e": { + "df": 0, + "docs": {}, + "p": { + "df": 1, + "docs": { + "9": { + "tf": 1.0 + } + } + } + } + } + }, "l": { "df": 0, "docs": {}, @@ -6128,7 +6507,7 @@ "k": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -6156,7 +6535,7 @@ "n": { "df": 1, "docs": { - "12": { + "13": { "tf": 1.0 } } @@ -6202,7 +6581,7 @@ "e": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -6235,7 +6614,7 @@ "t": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -6253,7 +6632,7 @@ "l": { "df": 1, "docs": { - "20": { + "21": { "tf": 1.0 } } @@ -6317,7 +6696,7 @@ "d": { "df": 1, "docs": { - "19": { + "20": { "tf": 1.0 } } @@ -6338,7 +6717,7 @@ "n": { "df": 3, "docs": { - "21": { + "22": { "tf": 1.0 }, "3": { @@ -6399,7 +6778,7 @@ "s": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } } @@ -6436,7 +6815,7 @@ "h": { "df": 1, "docs": { - "15": { + "16": { "tf": 1.0 } } @@ -6468,7 +6847,7 @@ "i": { "df": 1, "docs": { - "10": { + "11": { "tf": 1.0 } } @@ -6489,7 +6868,7 @@ "l": { "df": 1, "docs": { - "13": { + "14": { "tf": 1.0 } } @@ -6515,7 +6894,7 @@ "k": { "df": 1, "docs": { - "16": { + "17": { "tf": 1.0 } } @@ -6537,13 +6916,13 @@ "t": { "df": 3, "docs": { - "12": { + "13": { "tf": 1.0 }, - "17": { + "18": { "tf": 1.0 }, - "20": { + "21": { "tf": 1.0 } } @@ -6565,7 +6944,7 @@ "d": { "df": 1, "docs": { - "17": { + "18": { "tf": 1.0 } }