Merging upstream version 1.72.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 477 insertions, 135 deletions

diff --git a/vendor/mdbook/tests/alternative_backends.rs b/vendor/mdbook/tests/alternative_backends.rs
index cc7bfc7d9..72594e576 100644
--- a/vendor/mdbook/tests/alternative_backends.rs
+++ b/vendor/mdbook/tests/alternative_backends.rs
@@ -90,7 +90,7 @@ fn relative_command_path() {
             .set("output.html", toml::value::Table::new())
             .unwrap();
         config.set("output.myrenderer.command", cmd_path).unwrap();
-        let md = MDBook::init(&temp.path())
+        let md = MDBook::init(temp.path())
             .with_config(config)
             .build()
             .unwrap();
diff --git a/vendor/mdbook/tests/cli/init.rs b/vendor/mdbook/tests/cli/init.rs
new file mode 100644
index 000000000..6bd122743
--- /dev/null
+++ b/vendor/mdbook/tests/cli/init.rs
@@ -0,0 +1,24 @@
+use crate::cli::cmd::mdbook_cmd;
+use crate::dummy_book::DummyBook;
+
+use mdbook::config::Config;
+
+/// Run `mdbook init` with `--force` to skip the confirmation prompts
+#[test]
+fn base_mdbook_init_can_skip_confirmation_prompts() {
+    let temp = DummyBook::new().build().unwrap();
+
+    // doesn't exist before
+    assert!(!temp.path().join("book").exists());
+
+    let mut cmd = mdbook_cmd();
+    cmd.args(["init", "--force"]).current_dir(temp.path());
+    cmd.assert()
+        .success()
+        .stdout(predicates::str::contains("\nAll done, no errors...\n"));
+
+    let config = Config::from_disk(temp.path().join("book.toml")).unwrap();
+    assert_eq!(config.book.title, None);
+
+    assert!(!temp.path().join(".gitignore").exists());
+}
diff --git a/vendor/mdbook/tests/cli/mod.rs b/vendor/mdbook/tests/cli/mod.rs
index 989f443f0..152b4ee91 100644
--- a/vendor/mdbook/tests/cli/mod.rs
+++ b/vendor/mdbook/tests/cli/mod.rs
@@ -1,3 +1,4 @@
 mod build;
 mod cmd;
+mod init;
 mod test;
diff --git a/vendor/mdbook/tests/dummy_book/mod.rs b/vendor/mdbook/tests/dummy_book/mod.rs
index d9d9a068d..f91ed9f07 100644
--- a/vendor/mdbook/tests/dummy_book/mod.rs
+++ b/vendor/mdbook/tests/dummy_book/mod.rs
@@ -112,12 +112,12 @@ fn recursive_copy<A: AsRef<Path>, B: AsRef<Path>>(from: A, to: B) -> Result<()>
     let from = from.as_ref();
     let to = to.as_ref();
 
-    for entry in WalkDir::new(&from) {
+    for entry in WalkDir::new(from) {
         let entry = entry.with_context(|| "Unable to inspect directory entry")?;
 
         let original_location = entry.path();
         let relative = original_location
-            .strip_prefix(&from)
+            .strip_prefix(from)
             .expect("`original_location` is inside the `from` directory");
         let new_location = to.join(relative);
 
@@ -126,7 +126,7 @@ fn recursive_copy<A: AsRef<Path>, B: AsRef<Path>>(from: A, to: B) -> Result<()>
                 fs::create_dir_all(parent).with_context(|| "Couldn't create directory")?;
             }
 
-            fs::copy(&original_location, &new_location)
+            fs::copy(original_location, &new_location)
                 .with_context(|| "Unable to copy file contents")?;
         }
     }
diff --git a/vendor/mdbook/tests/dummy_book/src/SUMMARY.md b/vendor/mdbook/tests/dummy_book/src/SUMMARY.md
index 49b64a545..f310508b2 100644
--- a/vendor/mdbook/tests/dummy_book/src/SUMMARY.md
+++ b/vendor/mdbook/tests/dummy_book/src/SUMMARY.md
@@ -14,6 +14,7 @@
     - [Unicode](first/unicode.md)
     - [No Headers](first/no-headers.md)
     - [Duplicate Headers](first/duplicate-headers.md)
+    - [Heading Attributes](first/heading-attributes.md)
 - [Second Chapter](second.md)
     - [Nested Chapter](second/nested.md)
 
diff --git a/vendor/mdbook/tests/dummy_book/src/first/heading-attributes.md b/vendor/mdbook/tests/dummy_book/src/first/heading-attributes.md
new file mode 100644
index 000000000..a09a22b6b
--- /dev/null
+++ b/vendor/mdbook/tests/dummy_book/src/first/heading-attributes.md
@@ -0,0 +1,5 @@
+# Heading Attributes {#attrs}
+
+## Heading with classes {.class1 .class2}
+
+## Heading with id and classes {#both .class1 .class2}
diff --git a/vendor/mdbook/tests/rendered_output.rs b/vendor/mdbook/tests/rendered_output.rs
index a279c4f8e..7626b9e8a 100644
--- a/vendor/mdbook/tests/rendered_output.rs
+++ b/vendor/mdbook/tests/rendered_output.rs
@@ -35,6 +35,7 @@ const TOC_SECOND_LEVEL: &[&str] = &[
     "1.5. Unicode",
     "1.6. No Headers",
     "1.7. Duplicate Headers",
+    "1.8. Heading Attributes",
     "2.1. Nested Chapter",
 ];
 
@@ -275,7 +276,7 @@ fn root_index_html() -> Result<Document> {
         .with_context(|| "Book building failed")?;
 
     let index_page = temp.path().join("book").join("index.html");
-    let html = fs::read_to_string(&index_page).with_context(|| "Unable to read index.html")?;
+    let html = fs::read_to_string(index_page).with_context(|| "Unable to read index.html")?;
 
     Ok(Document::from(html.as_str()))
 }
@@ -412,7 +413,7 @@ fn recursive_includes_are_capped() {
     let content = &["Around the world, around the world
 Around the world, around the world
 Around the world, around the world"];
-    assert_contains_strings(&recursive, content);
+    assert_contains_strings(recursive, content);
 }
 
 #[test]
@@ -462,7 +463,7 @@ fn by_default_mdbook_use_index_preprocessor_to_convert_readme_to_index() {
 
     let second_index = temp.path().join("book").join("second").join("index.html");
     let unexpected_strings = vec!["Second README"];
-    assert_doesnt_contain_strings(&second_index, &unexpected_strings);
+    assert_doesnt_contain_strings(second_index, &unexpected_strings);
 }
 
 #[test]
@@ -628,10 +629,8 @@ fn edit_url_has_configured_src_dir_edit_url() {
 }
 
 fn remove_absolute_components(path: &Path) -> impl Iterator<Item = Component> + '_ {
-    path.components().skip_while(|c| match c {
-        Component::Prefix(_) | Component::RootDir => true,
-        _ => false,
-    })
+    path.components()
+        .skip_while(|c| matches!(c, Component::Prefix(_) | Component::RootDir))
 }
 
 /// Checks formatting of summary names with inline elements.
@@ -756,6 +755,7 @@ mod search {
         let no_headers = get_doc_ref("first/no-headers.html");
         let duplicate_headers_1 = get_doc_ref("first/duplicate-headers.html#header-text-1");
         let conclusion = get_doc_ref("conclusion.html#conclusion");
+        let heading_attrs = get_doc_ref("first/heading-attributes.html#both");
 
         let bodyidx = &index["index"]["index"]["body"]["root"];
         let textidx = &bodyidx["t"]["e"]["x"]["t"];
@@ -768,7 +768,7 @@ mod search {
         assert_eq!(docs[&some_section]["body"], "");
         assert_eq!(
             docs[&summary]["body"],
-            "Dummy Book Introduction First Chapter Nested Chapter Includes Recursive Markdown Unicode No Headers Duplicate Headers Second Chapter Nested Chapter Conclusion"
+            "Dummy Book Introduction First Chapter Nested Chapter Includes Recursive Markdown Unicode No Headers Duplicate Headers Heading Attributes Second Chapter Nested Chapter Conclusion"
         );
         assert_eq!(
             docs[&summary]["breadcrumbs"],
@@ -787,6 +787,10 @@ mod search {
             docs[&no_headers]["body"],
             "Capybara capybara capybara. Capybara capybara capybara. ThisLongWordIsIncludedSoWeCanCheckThatSufficientlyLongWordsAreOmittedFromTheSearchIndex."
         );
+        assert_eq!(
+            docs[&heading_attrs]["breadcrumbs"],
+            "First Chapter » Heading Attributes » Heading with id and classes"
+        );
     }
 
     // Setting this to `true` may cause issues with `cargo watch`,
@@ -803,7 +807,7 @@ mod search {
             let src = read_book_index(temp.path());
 
             let dest = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/searchindex_fixture.json");
-            let dest = File::create(&dest).unwrap();
+            let dest = File::create(dest).unwrap();
             serde_json::to_writer_pretty(dest, &src).unwrap();
 
             src
@@ -891,8 +895,8 @@ fn custom_fonts() {
     assert_eq!(actual_files(&p.join("book/fonts")), &builtin_fonts);
     assert!(has_fonts_css(p));
 
-    // Mixed with copy_fonts=true
-    // This should generate a deprecation warning.
+    // Mixed with copy-fonts=true
+    // Should ignore the copy-fonts setting since the user has provided their own fonts.css.
     let temp = TempFileBuilder::new().prefix("mdbook").tempdir().unwrap();
     let p = temp.path();
     MDBook::init(p).build().unwrap();
@@ -900,10 +904,10 @@ fn custom_fonts() {
     write_file(&p.join("theme/fonts"), "myfont.woff", b"").unwrap();
     MDBook::load(p).unwrap().build().unwrap();
     assert!(has_fonts_css(p));
-    let mut expected = Vec::from(builtin_fonts);
-    expected.push("myfont.woff");
-    expected.sort();
-    assert_eq!(actual_files(&p.join("book/fonts")), expected.as_slice());
+    assert_eq!(
+        actual_files(&p.join("book/fonts")),
+        ["fonts.css", "myfont.woff"]
+    );
 
     // copy-fonts=false, no theme
     // This should generate a deprecation warning.
@@ -948,3 +952,19 @@ fn custom_fonts() {
         &["fonts.css", "myfont.woff"]
     );
 }
+
+#[test]
+fn custom_header_attributes() {
+    let temp = DummyBook::new().build().unwrap();
+    let md = MDBook::load(temp.path()).unwrap();
+    md.build().unwrap();
+
+    let contents = temp.path().join("book/first/heading-attributes.html");
+
+    let summary_strings = &[
+        r##"<h1 id="attrs"><a class="header" href="#attrs">Heading Attributes</a></h1>"##,
+        r##"<h2 id="heading-with-classes" class="class1 class2"><a class="header" href="#heading-with-classes">Heading with classes</a></h2>"##,
+        r##"<h2 id="both" class="class1 class2"><a class="header" href="#both">Heading with id and classes</a></h2>"##,
+    ];
+    assert_contains_strings(&contents, summary_strings);
+}
diff --git a/vendor/mdbook/tests/searchindex_fixture.json b/vendor/mdbook/tests/searchindex_fixture.json
index 3d7062d23..854630289 100644
--- a/vendor/mdbook/tests/searchindex_fixture.json
+++ b/vendor/mdbook/tests/searchindex_fixture.json
@@ -23,6 +23,9 @@
     "first/duplicate-headers.html#header-text",
     "first/duplicate-headers.html#header-text-1",
     "first/duplicate-headers.html#header-text-2",
+    "first/heading-attributes.html#attrs",
+    "first/heading-attributes.html#heading-with-classes",
+    "first/heading-attributes.html#both",
     "second.html#second-chapter",
     "second/nested.html#testing-relative-links-for-the-print-page",
     "second/nested.html#some-section",
@@ -42,7 +45,7 @@
           "title": 1
         },
         "10": {
-          "body": 19,
+          "body": 21,
           "breadcrumbs": 4,
           "title": 1
         },
@@ -112,21 +115,36 @@
           "title": 2
         },
         "23": {
+          "body": 0,
+          "breadcrumbs": 6,
+          "title": 2
+        },
+        "24": {
+          "body": 0,
+          "breadcrumbs": 6,
+          "title": 2
+        },
+        "25": {
+          "body": 0,
+          "breadcrumbs": 7,
+          "title": 3
+        },
+        "26": {
           "body": 20,
           "breadcrumbs": 4,
           "title": 2
         },
-        "24": {
+        "27": {
           "body": 18,
           "breadcrumbs": 9,
           "title": 5
         },
-        "25": {
+        "28": {
           "body": 0,
           "breadcrumbs": 5,
           "title": 1
         },
-        "26": {
+        "29": {
           "body": 3,
           "breadcrumbs": 2,
           "title": 1
@@ -181,7 +199,7 @@
           "title": "Introduction"
         },
         "10": {
-          "body": "Dummy Book Introduction First Chapter Nested Chapter Includes Recursive Markdown Unicode No Headers Duplicate Headers Second Chapter Nested Chapter Conclusion",
+          "body": "Dummy Book Introduction First Chapter Nested Chapter Includes Recursive Markdown Unicode No Headers Duplicate Headers Heading Attributes Second Chapter Nested Chapter Conclusion",
           "breadcrumbs": "First Chapter » Includes » Summary",
           "id": "10",
           "title": "Summary"
@@ -265,27 +283,45 @@
           "title": "header-text"
         },
         "23": {
+          "body": "",
+          "breadcrumbs": "First Chapter » Heading Attributes » Heading Attributes",
+          "id": "23",
+          "title": "Heading Attributes"
+        },
+        "24": {
+          "body": "",
+          "breadcrumbs": "First Chapter » Heading Attributes » Heading with classes",
+          "id": "24",
+          "title": "Heading with classes"
+        },
+        "25": {
+          "body": "",
+          "breadcrumbs": "First Chapter » Heading Attributes » Heading with id and classes",
+          "id": "25",
+          "title": "Heading with id and classes"
+        },
+        "26": {
           "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": "23",
+          "id": "26",
           "title": "Second Chapter"
         },
-        "24": {
+        "27": {
           "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": "24",
+          "id": "27",
           "title": "Testing relative links for the print page"
         },
-        "25": {
+        "28": {
           "body": "",
           "breadcrumbs": "Second Chapter » Nested Chapter » Some section",
-          "id": "25",
+          "id": "28",
           "title": "Some section"
         },
-        "26": {
+        "29": {
           "body": "I put &lt;HTML&gt; in here!",
           "breadcrumbs": "Conclusion » Conclusion",
-          "id": "26",
+          "id": "29",
           "title": "Conclusion"
         },
         "3": {
@@ -331,7 +367,7 @@
           "title": "Includes"
         }
       },
-      "length": 27,
+      "length": 30,
       "save": true
     },
     "fields": [
@@ -498,6 +534,41 @@
                   }
                 }
               }
+            },
+            "t": {
+              "df": 0,
+              "docs": {},
+              "t": {
+                "df": 0,
+                "docs": {},
+                "r": {
+                  "df": 0,
+                  "docs": {},
+                  "i": {
+                    "b": {
+                      "df": 0,
+                      "docs": {},
+                      "u": {
+                        "df": 0,
+                        "docs": {},
+                        "t": {
+                          "df": 2,
+                          "docs": {
+                            "10": {
+                              "tf": 1.0
+                            },
+                            "23": {
+                              "tf": 1.0
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "df": 0,
+                    "docs": {}
+                  }
+                }
+              }
             }
           },
           "b": {
@@ -619,7 +690,7 @@
                 "h": {
                   "df": 1,
                   "docs": {
-                    "24": {
+                    "27": {
                       "tf": 1.0
                     }
                   }
@@ -821,7 +892,7 @@
                           "2": {
                             "tf": 1.0
                           },
-                          "23": {
+                          "26": {
                             "tf": 1.0
                           },
                           "4": {
@@ -856,6 +927,29 @@
               "df": 0,
               "docs": {}
             },
+            "l": {
+              "a": {
+                "df": 0,
+                "docs": {},
+                "s": {
+                  "df": 0,
+                  "docs": {},
+                  "s": {
+                    "df": 2,
+                    "docs": {
+                      "24": {
+                        "tf": 1.0
+                      },
+                      "25": {
+                        "tf": 1.0
+                      }
+                    }
+                  }
+                }
+              },
+              "df": 0,
+              "docs": {}
+            },
             "o": {
               "d": {
                 "df": 0,
@@ -863,7 +957,7 @@
                 "e": {
                   "df": 2,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     },
                     "4": {
@@ -930,7 +1024,7 @@
                           "10": {
                             "tf": 1.0
                           },
-                          "26": {
+                          "29": {
                             "tf": 1.0
                           }
                         }
@@ -1002,7 +1096,7 @@
           "d": {
             "df": 1,
             "docs": {
-              "23": {
+              "26": {
                 "tf": 1.0
               }
             },
@@ -1115,7 +1209,7 @@
                 "n": {
                   "df": 1,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     }
                   }
@@ -1156,7 +1250,7 @@
                     "d": {
                       "df": 1,
                       "docs": {
-                        "23": {
+                        "26": {
                           "tf": 1.0
                         }
                       }
@@ -1225,7 +1319,7 @@
                     "0": {
                       "tf": 1.0
                     },
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     },
                     "4": {
@@ -1261,7 +1355,7 @@
                       "2": {
                         "tf": 1.0
                       },
-                      "24": {
+                      "27": {
                         "tf": 1.0
                       }
                     }
@@ -1272,7 +1366,7 @@
             "n": {
               "df": 3,
               "docs": {
-                "23": {
+                "26": {
                   "tf": 1.0
                 },
                 "7": {
@@ -1346,7 +1440,7 @@
                         "t": {
                           "df": 1,
                           "docs": {
-                            "24": {
+                            "27": {
                               "tf": 1.0
                             }
                           }
@@ -1386,8 +1480,21 @@
             "e": {
               "a": {
                 "d": {
-                  "df": 0,
-                  "docs": {},
+                  "df": 4,
+                  "docs": {
+                    "10": {
+                      "tf": 1.0
+                    },
+                    "23": {
+                      "tf": 1.0
+                    },
+                    "24": {
+                      "tf": 1.0
+                    },
+                    "25": {
+                      "tf": 1.0
+                    }
+                  },
                   "e": {
                     "df": 0,
                     "docs": {},
@@ -1451,7 +1558,7 @@
                     "0": {
                       "tf": 1.0
                     },
-                    "26": {
+                    "29": {
                       "tf": 1.0
                     }
                   }
@@ -1469,7 +1576,7 @@
                     "n": {
                       "df": 2,
                       "docs": {
-                        "23": {
+                        "26": {
                           "tf": 1.0
                         },
                         "7": {
@@ -1484,7 +1591,7 @@
                 "e": {
                   "df": 1,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     }
                   }
@@ -1502,7 +1609,7 @@
                 "l": {
                   "df": 1,
                   "docs": {
-                    "24": {
+                    "27": {
                       "tf": 1.0
                     }
                   }
@@ -1511,6 +1618,14 @@
             }
           },
           "i": {
+            "d": {
+              "df": 1,
+              "docs": {
+                "25": {
+                  "tf": 1.0
+                }
+              }
+            },
             "df": 0,
             "docs": {},
             "m": {
@@ -1520,7 +1635,7 @@
                 "g": {
                   "df": 1,
                   "docs": {
-                    "24": {
+                    "27": {
                       "tf": 1.0
                     }
                   }
@@ -1592,7 +1707,7 @@
                     "t": {
                       "df": 1,
                       "docs": {
-                        "23": {
+                        "26": {
                           "tf": 1.0
                         }
                       }
@@ -1728,7 +1843,7 @@
                     "14": {
                       "tf": 1.4142135623730951
                     },
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     },
                     "6": {
@@ -1739,7 +1854,7 @@
                 "k": {
                   "df": 1,
                   "docs": {
-                    "24": {
+                    "27": {
                       "tf": 2.23606797749979
                     }
                   }
@@ -1793,7 +1908,7 @@
                             "t": {
                               "df": 1,
                               "docs": {
-                                "26": {
+                                "29": {
                                   "tf": 1.0
                                 }
                               }
@@ -1821,7 +1936,7 @@
                 "n": {
                   "df": 3,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     },
                     "7": {
@@ -1839,7 +1954,7 @@
                 "e": {
                   "df": 1,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     }
                   }
@@ -1968,7 +2083,7 @@
               "n": {
                 "df": 1,
                 "docs": {
-                  "24": {
+                  "27": {
                     "tf": 1.0
                   }
                 }
@@ -2007,7 +2122,7 @@
                     "d": {
                       "df": 1,
                       "docs": {
-                        "24": {
+                        "27": {
                           "tf": 1.0
                         }
                       }
@@ -2032,7 +2147,7 @@
                     "19": {
                       "tf": 1.0
                     },
-                    "24": {
+                    "27": {
                       "tf": 1.7320508075688772
                     }
                   }
@@ -2145,7 +2260,7 @@
                   "t": {
                     "df": 1,
                     "docs": {
-                      "24": {
+                      "27": {
                         "tf": 1.7320508075688772
                       }
                     },
@@ -2173,7 +2288,7 @@
                                       "o": {
                                         "df": 1,
                                         "docs": {
-                                          "23": {
+                                          "26": {
                                             "tf": 1.0
                                           }
                                         }
@@ -2185,7 +2300,7 @@
                               "i": {
                                 "df": 1,
                                 "docs": {
-                                  "23": {
+                                  "26": {
                                     "tf": 1.0
                                   }
                                 }
@@ -2211,7 +2326,7 @@
               "t": {
                 "df": 1,
                 "docs": {
-                  "26": {
+                  "29": {
                     "tf": 1.0
                   }
                 }
@@ -2247,7 +2362,7 @@
               "l": {
                 "df": 1,
                 "docs": {
-                  "24": {
+                  "27": {
                     "tf": 1.0
                   }
                 }
@@ -2359,7 +2474,7 @@
                       "l": {
                         "df": 1,
                         "docs": {
-                          "23": {
+                          "26": {
                             "tf": 1.0
                           }
                         }
@@ -2397,7 +2512,7 @@
                   },
                   "df": 1,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     }
                   }
@@ -2422,7 +2537,7 @@
                         "10": {
                           "tf": 1.0
                         },
-                        "23": {
+                        "26": {
                           "tf": 1.0
                         }
                       }
@@ -2443,10 +2558,10 @@
                       "n": {
                         "df": 4,
                         "docs": {
-                          "24": {
+                          "27": {
                             "tf": 1.0
                           },
-                          "25": {
+                          "28": {
                             "tf": 1.0
                           },
                           "3": {
@@ -2466,7 +2581,7 @@
               "e": {
                 "df": 1,
                 "docs": {
-                  "23": {
+                  "26": {
                     "tf": 1.0
                   }
                 }
@@ -2490,7 +2605,7 @@
                       "t": {
                         "df": 1,
                         "docs": {
-                          "23": {
+                          "26": {
                             "tf": 1.0
                           }
                         }
@@ -2781,7 +2896,7 @@
                 "e": {
                   "df": 1,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     }
                   }
@@ -2867,7 +2982,7 @@
                     "17": {
                       "tf": 1.0
                     },
-                    "24": {
+                    "27": {
                       "tf": 1.0
                     },
                     "6": {
@@ -3049,7 +3164,7 @@
                 "k": {
                   "df": 2,
                   "docs": {
-                    "24": {
+                    "27": {
                       "tf": 1.4142135623730951
                     },
                     "8": {
@@ -3064,7 +3179,7 @@
                       "11": {
                         "tf": 4.69041575982343
                       },
-                      "23": {
+                      "26": {
                         "tf": 1.0
                       }
                     }
@@ -3259,6 +3374,47 @@
                   }
                 }
               }
+            },
+            "t": {
+              "df": 0,
+              "docs": {},
+              "t": {
+                "df": 0,
+                "docs": {},
+                "r": {
+                  "df": 0,
+                  "docs": {},
+                  "i": {
+                    "b": {
+                      "df": 0,
+                      "docs": {},
+                      "u": {
+                        "df": 0,
+                        "docs": {},
+                        "t": {
+                          "df": 4,
+                          "docs": {
+                            "10": {
+                              "tf": 1.0
+                            },
+                            "23": {
+                              "tf": 1.7320508075688772
+                            },
+                            "24": {
+                              "tf": 1.0
+                            },
+                            "25": {
+                              "tf": 1.0
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "df": 0,
+                    "docs": {}
+                  }
+                }
+              }
             }
           },
           "b": {
@@ -3380,7 +3536,7 @@
                 "h": {
                   "df": 1,
                   "docs": {
-                    "24": {
+                    "27": {
                       "tf": 1.0
                     }
                   }
@@ -3568,7 +3724,7 @@
                       "df": 0,
                       "docs": {},
                       "r": {
-                        "df": 24,
+                        "df": 27,
                         "docs": {
                           "10": {
                             "tf": 2.23606797749979
@@ -3613,12 +3769,21 @@
                             "tf": 1.0
                           },
                           "23": {
-                            "tf": 1.7320508075688772
+                            "tf": 1.0
                           },
                           "24": {
-                            "tf": 1.4142135623730951
+                            "tf": 1.0
                           },
                           "25": {
+                            "tf": 1.0
+                          },
+                          "26": {
+                            "tf": 1.7320508075688772
+                          },
+                          "27": {
+                            "tf": 1.4142135623730951
+                          },
+                          "28": {
                             "tf": 1.4142135623730951
                           },
                           "3": {
@@ -3671,6 +3836,29 @@
               "df": 0,
               "docs": {}
             },
+            "l": {
+              "a": {
+                "df": 0,
+                "docs": {},
+                "s": {
+                  "df": 0,
+                  "docs": {},
+                  "s": {
+                    "df": 2,
+                    "docs": {
+                      "24": {
+                        "tf": 1.4142135623730951
+                      },
+                      "25": {
+                        "tf": 1.4142135623730951
+                      }
+                    }
+                  }
+                }
+              },
+              "df": 0,
+              "docs": {}
+            },
             "o": {
               "d": {
                 "df": 0,
@@ -3678,7 +3866,7 @@
                 "e": {
                   "df": 2,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     },
                     "4": {
@@ -3745,7 +3933,7 @@
                           "10": {
                             "tf": 1.0
                           },
-                          "26": {
+                          "29": {
                             "tf": 1.7320508075688772
                           }
                         }
@@ -3817,7 +4005,7 @@
           "d": {
             "df": 1,
             "docs": {
-              "23": {
+              "26": {
                 "tf": 1.0
               }
             },
@@ -3939,7 +4127,7 @@
                 "n": {
                   "df": 1,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     }
                   }
@@ -3980,7 +4168,7 @@
                     "d": {
                       "df": 1,
                       "docs": {
-                        "23": {
+                        "26": {
                           "tf": 1.0
                         }
                       }
@@ -4049,7 +4237,7 @@
                     "0": {
                       "tf": 1.0
                     },
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     },
                     "4": {
@@ -4071,7 +4259,7 @@
                   "df": 0,
                   "docs": {},
                   "t": {
-                    "df": 22,
+                    "df": 25,
                     "docs": {
                       "10": {
                         "tf": 1.4142135623730951
@@ -4115,9 +4303,18 @@
                       "22": {
                         "tf": 1.0
                       },
+                      "23": {
+                        "tf": 1.0
+                      },
                       "24": {
                         "tf": 1.0
                       },
+                      "25": {
+                        "tf": 1.0
+                      },
+                      "27": {
+                        "tf": 1.0
+                      },
                       "3": {
                         "tf": 1.0
                       },
@@ -4147,7 +4344,7 @@
             "n": {
               "df": 3,
               "docs": {
-                "23": {
+                "26": {
                   "tf": 1.0
                 },
                 "7": {
@@ -4221,7 +4418,7 @@
                         "t": {
                           "df": 1,
                           "docs": {
-                            "24": {
+                            "27": {
                               "tf": 1.0
                             }
                           }
@@ -4261,8 +4458,21 @@
             "e": {
               "a": {
                 "d": {
-                  "df": 0,
-                  "docs": {},
+                  "df": 4,
+                  "docs": {
+                    "10": {
+                      "tf": 1.0
+                    },
+                    "23": {
+                      "tf": 1.7320508075688772
+                    },
+                    "24": {
+                      "tf": 1.7320508075688772
+                    },
+                    "25": {
+                      "tf": 1.7320508075688772
+                    }
+                  },
                   "e": {
                     "df": 0,
                     "docs": {},
@@ -4329,7 +4539,7 @@
                     "0": {
                       "tf": 1.0
                     },
-                    "26": {
+                    "29": {
                       "tf": 1.0
                     }
                   }
@@ -4347,7 +4557,7 @@
                     "n": {
                       "df": 2,
                       "docs": {
-                        "23": {
+                        "26": {
                           "tf": 1.0
                         },
                         "7": {
@@ -4362,7 +4572,7 @@
                 "e": {
                   "df": 1,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     }
                   }
@@ -4380,7 +4590,7 @@
                 "l": {
                   "df": 1,
                   "docs": {
-                    "24": {
+                    "27": {
                       "tf": 1.0
                     }
                   }
@@ -4389,6 +4599,14 @@
             }
           },
           "i": {
+            "d": {
+              "df": 1,
+              "docs": {
+                "25": {
+                  "tf": 1.4142135623730951
+                }
+              }
+            },
             "df": 0,
             "docs": {},
             "m": {
@@ -4398,7 +4616,7 @@
                 "g": {
                   "df": 1,
                   "docs": {
-                    "24": {
+                    "27": {
                       "tf": 1.0
                     }
                   }
@@ -4470,7 +4688,7 @@
                     "t": {
                       "df": 1,
                       "docs": {
-                        "23": {
+                        "26": {
                           "tf": 1.0
                         }
                       }
@@ -4606,7 +4824,7 @@
                     "14": {
                       "tf": 1.4142135623730951
                     },
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     },
                     "6": {
@@ -4617,7 +4835,7 @@
                 "k": {
                   "df": 1,
                   "docs": {
-                    "24": {
+                    "27": {
                       "tf": 2.449489742783178
                     }
                   }
@@ -4671,7 +4889,7 @@
                             "t": {
                               "df": 1,
                               "docs": {
-                                "26": {
+                                "29": {
                                   "tf": 1.0
                                 }
                               }
@@ -4699,7 +4917,7 @@
                 "n": {
                   "df": 3,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     },
                     "7": {
@@ -4717,7 +4935,7 @@
                 "e": {
                   "df": 1,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     }
                   }
@@ -4833,10 +5051,10 @@
                     "10": {
                       "tf": 1.4142135623730951
                     },
-                    "24": {
+                    "27": {
                       "tf": 1.0
                     },
-                    "25": {
+                    "28": {
                       "tf": 1.0
                     },
                     "4": {
@@ -4876,7 +5094,7 @@
               "n": {
                 "df": 1,
                 "docs": {
-                  "24": {
+                  "27": {
                     "tf": 1.0
                   }
                 }
@@ -4915,7 +5133,7 @@
                     "d": {
                       "df": 1,
                       "docs": {
-                        "24": {
+                        "27": {
                           "tf": 1.0
                         }
                       }
@@ -4940,7 +5158,7 @@
                     "19": {
                       "tf": 1.0
                     },
-                    "24": {
+                    "27": {
                       "tf": 2.0
                     }
                   }
@@ -5053,7 +5271,7 @@
                   "t": {
                     "df": 1,
                     "docs": {
-                      "24": {
+                      "27": {
                         "tf": 2.0
                       }
                     },
@@ -5081,7 +5299,7 @@
                                       "o": {
                                         "df": 1,
                                         "docs": {
-                                          "23": {
+                                          "26": {
                                             "tf": 1.0
                                           }
                                         }
@@ -5093,7 +5311,7 @@
                               "i": {
                                 "df": 1,
                                 "docs": {
-                                  "23": {
+                                  "26": {
                                     "tf": 1.0
                                   }
                                 }
@@ -5119,7 +5337,7 @@
               "t": {
                 "df": 1,
                 "docs": {
-                  "26": {
+                  "29": {
                     "tf": 1.0
                   }
                 }
@@ -5158,7 +5376,7 @@
               "l": {
                 "df": 1,
                 "docs": {
-                  "24": {
+                  "27": {
                     "tf": 1.4142135623730951
                   }
                 }
@@ -5270,7 +5488,7 @@
                       "l": {
                         "df": 1,
                         "docs": {
-                          "23": {
+                          "26": {
                             "tf": 1.0
                           }
                         }
@@ -5308,7 +5526,7 @@
                   },
                   "df": 1,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     }
                   }
@@ -5333,13 +5551,13 @@
                         "10": {
                           "tf": 1.0
                         },
-                        "23": {
+                        "26": {
                           "tf": 1.7320508075688772
                         },
-                        "24": {
+                        "27": {
                           "tf": 1.0
                         },
-                        "25": {
+                        "28": {
                           "tf": 1.0
                         }
                       }
@@ -5360,10 +5578,10 @@
                       "n": {
                         "df": 4,
                         "docs": {
-                          "24": {
+                          "27": {
                             "tf": 1.0
                           },
-                          "25": {
+                          "28": {
                             "tf": 1.4142135623730951
                           },
                           "3": {
@@ -5383,7 +5601,7 @@
               "e": {
                 "df": 1,
                 "docs": {
-                  "23": {
+                  "26": {
                     "tf": 1.0
                   }
                 }
@@ -5407,7 +5625,7 @@
                       "t": {
                         "df": 1,
                         "docs": {
-                          "23": {
+                          "26": {
                             "tf": 1.0
                           }
                         }
@@ -5698,7 +5916,7 @@
                 "e": {
                   "df": 1,
                   "docs": {
-                    "23": {
+                    "26": {
                       "tf": 1.0
                     }
                   }
@@ -5784,7 +6002,7 @@
                     "17": {
                       "tf": 1.4142135623730951
                     },
-                    "24": {
+                    "27": {
                       "tf": 1.4142135623730951
                     },
                     "6": {
@@ -5966,7 +6184,7 @@
                 "k": {
                   "df": 2,
                   "docs": {
-                    "24": {
+                    "27": {
                       "tf": 1.4142135623730951
                     },
                     "8": {
@@ -5981,7 +6199,7 @@
                       "11": {
                         "tf": 4.69041575982343
                       },
-                      "23": {
+                      "26": {
                         "tf": 1.0
                       }
                     }
@@ -6061,6 +6279,38 @@
               },
               "df": 0,
               "docs": {}
+            },
+            "t": {
+              "df": 0,
+              "docs": {},
+              "t": {
+                "df": 0,
+                "docs": {},
+                "r": {
+                  "df": 0,
+                  "docs": {},
+                  "i": {
+                    "b": {
+                      "df": 0,
+                      "docs": {},
+                      "u": {
+                        "df": 0,
+                        "docs": {},
+                        "t": {
+                          "df": 1,
+                          "docs": {
+                            "23": {
+                              "tf": 1.0
+                            }
+                          }
+                        }
+                      }
+                    },
+                    "df": 0,
+                    "docs": {}
+                  }
+                }
+              }
             }
           },
           "b": {
@@ -6139,7 +6389,7 @@
                           "2": {
                             "tf": 1.0
                           },
-                          "23": {
+                          "26": {
                             "tf": 1.0
                           },
                           "4": {
@@ -6154,6 +6404,29 @@
               "df": 0,
               "docs": {}
             },
+            "l": {
+              "a": {
+                "df": 0,
+                "docs": {},
+                "s": {
+                  "df": 0,
+                  "docs": {},
+                  "s": {
+                    "df": 2,
+                    "docs": {
+                      "24": {
+                        "tf": 1.0
+                      },
+                      "25": {
+                        "tf": 1.0
+                      }
+                    }
+                  }
+                }
+              },
+              "df": 0,
+              "docs": {}
+            },
             "o": {
               "df": 0,
               "docs": {},
@@ -6194,7 +6467,7 @@
                       "s": {
                         "df": 1,
                         "docs": {
-                          "26": {
+                          "29": {
                             "tf": 1.0
                           }
                         }
@@ -6332,8 +6605,18 @@
             "e": {
               "a": {
                 "d": {
-                  "df": 0,
-                  "docs": {},
+                  "df": 3,
+                  "docs": {
+                    "23": {
+                      "tf": 1.0
+                    },
+                    "24": {
+                      "tf": 1.0
+                    },
+                    "25": {
+                      "tf": 1.0
+                    }
+                  },
                   "e": {
                     "df": 0,
                     "docs": {},
@@ -6388,6 +6671,14 @@
             }
           },
           "i": {
+            "d": {
+              "df": 1,
+              "docs": {
+                "25": {
+                  "tf": 1.0
+                }
+              }
+            },
             "df": 0,
             "docs": {},
             "n": {
@@ -6468,7 +6759,7 @@
                 "k": {
                   "df": 1,
                   "docs": {
-                    "24": {
+                    "27": {
                       "tf": 1.0
                     }
                   }
@@ -6542,7 +6833,7 @@
                 "e": {
                   "df": 1,
                   "docs": {
-                    "24": {
+                    "27": {
                       "tf": 1.0
                     }
                   }
@@ -6575,7 +6866,7 @@
                   "t": {
                     "df": 1,
                     "docs": {
-                      "24": {
+                      "27": {
                         "tf": 1.0
                       }
                     }
@@ -6593,7 +6884,7 @@
               "l": {
                 "df": 1,
                 "docs": {
-                  "24": {
+                  "27": {
                     "tf": 1.0
                   }
                 }
@@ -6657,7 +6948,7 @@
                     "d": {
                       "df": 1,
                       "docs": {
-                        "23": {
+                        "26": {
                           "tf": 1.0
                         }
                       }
@@ -6678,7 +6969,7 @@
                       "n": {
                         "df": 3,
                         "docs": {
-                          "25": {
+                          "28": {
                             "tf": 1.0
                           },
                           "3": {
@@ -6883,7 +7174,7 @@
                     "17": {
                       "tf": 1.0
                     },
-                    "24": {
+                    "27": {
                       "tf": 1.0
                     }
                   }