[for review] multi-language mdbook

.gitignore

@@ -1,5 +1,9 @@
+*.swp
+.#*
 Cargo.lock
 target
-
-book-test
+TAGS
+src/tests/book-minimal/book
+src/tests/book-minimal-with-assets/book
+src/tests/book-wonderland-multilang/book
 book-example/book

.travis.yml

@@ -9,34 +9,9 @@ env:
 
 matrix:
   include:
-    # Stable channel
-    - os: osx
-      env: TARGET=i686-apple-darwin CHANNEL=stable
-    - os: linux
-      env: TARGET=i686-unknown-linux-gnu CHANNEL=stable
-      addons:
-        apt:
-          packages: &i686_unknown_linux_gnu
-            - gcc-multilib
-    - os: osx
-      env: TARGET=x86_64-apple-darwin CHANNEL=stable
-    - os: linux
-      env: TARGET=x86_64-unknown-linux-gnu CHANNEL=stable
-      addons:
-        apt:
-          packages:
-            - nodejs
-            - npm
-    - os: linux
-      env: TARGET=x86_64-unknown-linux-musl CHANNEL=stable
     # Beta channel
     - os: osx
       env: TARGET=i686-apple-darwin CHANNEL=beta
-    - os: linux
-      env: TARGET=i686-unknown-linux-gnu CHANNEL=beta
-      addons:
-        apt:
-          packages: *i686_unknown_linux_gnu
     - os: osx
       env: TARGET=x86_64-apple-darwin CHANNEL=beta
     - os: linux
@@ -46,18 +21,47 @@ matrix:
     # Nightly channel
     - os: osx
       env: TARGET=i686-apple-darwin CHANNEL=nightly
-    - os: linux
-      env: TARGET=i686-unknown-linux-gnu CHANNEL=nightly
-      addons:
-        apt:
-          packages: *i686_unknown_linux_gnu
     - os: osx
       env: TARGET=x86_64-apple-darwin CHANNEL=nightly
     - os: linux
       env: TARGET=x86_64-unknown-linux-gnu CHANNEL=nightly
     - os: linux
       env: TARGET=x86_64-unknown-linux-musl CHANNEL=nightly
 
+    # FIXME The command "bash ci/script.sh" exited with 101. https://travis-ci.org/azerupi/mdBook/builds/194064441
+    # - os: linux
+    #   env: TARGET=i686-unknown-linux-gnu CHANNEL=nightly
+    #   addons:
+    #     apt:
+    #       packages: *i686_unknown_linux_gnu
+    # - os: linux
+    #   env: TARGET=i686-unknown-linux-gnu CHANNEL=beta
+    #   addons:
+    #     apt:
+    #       packages: *i686_unknown_linux_gnu
+
+    # Not testing on stable channel until proc_macro lands there in the next release.
+    # # Stable channel
+    # - os: osx
+    #   env: TARGET=i686-apple-darwin CHANNEL=stable
+    # - os: linux
+    #   env: TARGET=i686-unknown-linux-gnu CHANNEL=stable
+    #   addons:
+    #     apt:
+    #       packages: &i686_unknown_linux_gnu
+    #         - gcc-multilib
+    # - os: osx
+    #   env: TARGET=x86_64-apple-darwin CHANNEL=stable
+    # - os: linux
+    #   env: TARGET=x86_64-unknown-linux-gnu CHANNEL=stable
+    #   addons:
+    #     apt:
+    #       packages:
+    #         - nodejs
+    #         - npm
+    # - os: linux
+    #   env: TARGET=x86_64-unknown-linux-musl CHANNEL=stable
+
   # Musl builds fail due to a bug in Rust (https://github.com/azerupi/mdBook/issues/158)
   allow_failures:
     - os: linux

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mdbook"
-version = "0.0.15"
+version = "0.0.16"
 authors = ["Mathieu David <[email protected]>"]
 description = "create books from markdown files (like Gitbook)"
 documentation = "http://azerupi.github.io/mdBook/index.html"
@@ -9,21 +9,28 @@ keywords = ["book", "gitbook", "rustbook", "markdown"]
 license = "MPL-2.0"
 readme = "README.md"
 build = "build.rs"
+include = ["data"]
 exclude = [
     "book-example/*",
-    "src/theme/stylus",
+    "data/assets/_html-template/_stylus",
 ]
 
+
 [dependencies]
 clap = "2.19.2"
 handlebars = { version = "0.23.0", features = ["serde_type"] }
 serde = "0.8"
+serde_derive = "0.8"
 serde_json = "0.8"
 pulldown-cmark = "0.0.8"
+regex = "0.1"
+glob = "0.2"
 log = "0.3"
 env_logger = "0.3"
 toml = { version = "0.2", features = ["serde"] }
 open = "1.1"
+phf = "0.7"
+includedir = "0.2"
 
 # Watch feature
 notify = { version = "3.0", optional = true }
@@ -35,6 +42,9 @@ iron = { version = "0.4", optional = true }
 staticfile = { version = "0.3", optional = true }
 ws = { version = "0.5.1", optional = true}
 
+[build-dependencies]
+includedir_codegen = "0.2"
+
 # Tests
 [dev-dependencies]
 tempdir = "0.3.4"

appveyor.yml

@@ -2,11 +2,6 @@ environment:
   global:
     PROJECT_NAME: mdBook
   matrix:
-    # Stable channel
-    - TARGET: i686-pc-windows-msvc
-      RUST_CHANNEL: stable
-    - TARGET: x86_64-pc-windows-msvc
-      RUST_CHANNEL: stable
     # Beta channel
     - TARGET: i686-pc-windows-msvc
       RUST_CHANNEL: beta
@@ -18,6 +13,13 @@ environment:
     - TARGET: x86_64-pc-windows-msvc
       RUST_CHANNEL: nightly
 
+# Not testing on stable channel until proc_macro lands there in the next release.
+#    # Stable channel
+#    - TARGET: i686-pc-windows-msvc
+#      RUST_CHANNEL: stable
+#    - TARGET: x86_64-pc-windows-msvc
+#      RUST_CHANNEL: stable
+
 # Install Rust and Cargo
 install:
   - ps: Start-FileDownload "https://static.rust-lang.org/dist/channel-rust-stable"

book-example/assets/_plantuml/structs-v0-0-15.pum

@@ -0,0 +1,142 @@
+@startuml
+
+class book::MDBook {
+  root
+  dest
+  src
+  theme_path
+  title
+  author
+  description
+  content : Vec<BookItem>
+  books : HashMap<&'a str, Book>
+  renderer
+  livereload
+}
+
+class book::book.Book {
+  metadata
+  frontmatter
+  mainmatter
+  backmatter
+
+  new(title)
+}
+
+class book::bookconfig.BookConfig {
+  root
+  dest
+  src
+  theme_path
+  title
+  author
+  description
+  indent_spaces
+  multilingual
+
+  new(root)
+}
+
+class book::chapter.Chapter {
+  title
+  file
+  author
+  description
+  index
+  class
+  sub_chapters
+
+  new(title, file)
+}
+
+namespace book::bookitem {
+
+enum BookItem {
+  Chapter "String, Chapter"
+  Affix "Chapter"
+  Spacer
+}
+
+class BookItems {
+  items : &'a [BookItem]
+  current_index
+  stack : Vec<"&'a [BookItem], usize">
+}
+
+class Chapter {
+  name
+  path
+  sub_items
+
+  new(name, path)
+}
+
+}
+
+namespace book::metadata {
+
+class BookMetadata {
+  title
+  subtitle
+  description
+  publisher
+  language
+  authors
+  translators
+  number_format
+  section_names
+  new(title)
+}
+
+class Author {
+  name
+  email
+  new(name)
+}
+
+class Language {
+  name
+  code
+}
+
+class Publisher {
+  name
+  url
+  logo_src
+}
+
+enum NumberFormat {
+  Arabic
+  Roman
+  Word
+}
+
+}
+
+class renderer::html_handlebars::HtmlHandlebars {
+  new()
+  render(book: MDBook)
+}
+
+class theme::Theme {
+  index
+  css
+  favicon
+  js
+  highlight_css
+  tomorrow_night_css
+  highlight_js
+  jquery
+  new(src)
+}
+
+book::book-[hidden]->book::bookconfig
+book::book-[hidden]->book::chapter
+book::book-[hidden]->book::bookitem
+book::book-[hidden]->book::metadata
+
+book::bookitem.BookItems-[hidden]->book::bookitem.BookItem
+
+renderer::html_handlebars::HtmlHandlebars-[hidden]->theme::Theme
+
+@enduml