From c9ddb4dd98b96e280d155f9f0763aff6788a5916 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Mon, 5 May 2025 14:01:49 -0700 Subject: [PATCH] Revert: Remove the book.multilingual field This reverts https://github.com/rust-lang/mdBook/pull/2646/ because I overlooked that this is a public field in a public struct, which would be a breaking API change. --- examples/nop-preprocessor.rs | 1 + src/config.rs | 5 +++++ tests/testsuite/init.rs | 4 ++++ tests/testsuite/renderer.rs | 1 + 4 files changed, 11 insertions(+) diff --git a/examples/nop-preprocessor.rs b/examples/nop-preprocessor.rs index f194991a..a384dfda 100644 --- a/examples/nop-preprocessor.rs +++ b/examples/nop-preprocessor.rs @@ -117,6 +117,7 @@ mod nop_lib { "book": { "authors": ["AUTHOR"], "language": "en", + "multilingual": false, "src": "src", "title": "TITLE" }, diff --git a/src/config.rs b/src/config.rs index 2ede0c2f..db159a45 100644 --- a/src/config.rs +++ b/src/config.rs @@ -420,6 +420,8 @@ pub struct BookConfig { pub description: Option, /// Location of the book source relative to the book's root directory. pub src: PathBuf, + /// Does this book support more than one language? + pub multilingual: bool, /// The main language of the book. pub language: Option, /// The direction of text in the book: Left-to-right (LTR) or Right-to-left (RTL). @@ -434,6 +436,7 @@ impl Default for BookConfig { authors: Vec::new(), description: None, src: PathBuf::from("src"), + multilingual: false, language: Some(String::from("en")), text_direction: None, } @@ -817,6 +820,7 @@ mod tests { title = "Some Book" authors = ["Michael-F-Bryan "] description = "A completely useless book" + multilingual = true src = "source" language = "ja" @@ -855,6 +859,7 @@ mod tests { title: Some(String::from("Some Book")), authors: vec![String::from("Michael-F-Bryan ")], description: Some(String::from("A completely useless book")), + multilingual: true, src: PathBuf::from("source"), language: Some(String::from("ja")), text_direction: None, diff --git a/tests/testsuite/init.rs b/tests/testsuite/init.rs index e5989eb6..a5e1e28b 100644 --- a/tests/testsuite/init.rs +++ b/tests/testsuite/init.rs @@ -28,6 +28,7 @@ All done, no errors... [book] authors = [] language = "en" +multilingual = false src = "src" "#]], @@ -94,6 +95,7 @@ All done, no errors... [book] authors = [] language = "en" +multilingual = false src = "src" "#]], @@ -127,6 +129,7 @@ All done, no errors... [book] authors = [] language = "en" +multilingual = false src = "src" title = "Example title" @@ -179,6 +182,7 @@ fn init_with_custom_book_and_src_locations() { [book] authors = [] language = "en" +multilingual = false src = "in" [build] diff --git a/tests/testsuite/renderer.rs b/tests/testsuite/renderer.rs index 1e162447..e893dd2f 100644 --- a/tests/testsuite/renderer.rs +++ b/tests/testsuite/renderer.rs @@ -188,6 +188,7 @@ fn backends_receive_render_context_via_stdin() { "book": { "authors": [], "language": "en", + "multilingual": false, "src": "src" }, "output": {