Release 0.0.26

Fixes #460

.travis.yml

@@ -1,110 +1,42 @@
+language: rust
 sudo: false
 
-language: generic
+cache: cargo
 
-env:
-  global:
-    - PROJECT_NAME=mdBook
+rust:
+  - stable
+  - beta
+  - nightly
 
-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
-    - os: linux
-      env: TARGET=x86_64-unknown-linux-musl CHANNEL=stable
-      dist: trusty
-      addons:
-        apt:
-          packages: &musl_packages
-            - musl
-            - musl-dev
-            - musl-tools
-    # 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
-      env: TARGET=x86_64-unknown-linux-gnu CHANNEL=beta
-    - os: linux
-      env: TARGET=x86_64-unknown-linux-musl CHANNEL=beta
-      dist: trusty
-      addons:
-        apt:
-          packages: &musl_packages
-            - musl
-            - musl-dev
-            - musl-tools
-    # 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
-      dist: trusty
-      addons:
-        apt:
-          packages: &musl_packages
-            - musl
-            - musl-dev
-            - musl-tools
-
-install:
-  - export PATH="$PATH:$HOME/.cargo/bin"
-  - bash ci/install.sh
+os:
+  - linux
+  - osx
 
 script:
-  - bash ci/script.sh
+  - cargo build --verbose
+  - cargo test --verbose
 
 after_success:
+  # Deploy the docs if the commit is on master
   - test "$TRAVIS_PULL_REQUEST" == "false" &&
     test "$TRAVIS_BRANCH" == "master" &&
-    test "$TARGET" == "x86_64-unknown-linux-gnu" &&
-    test "$CHANNEL" = "stable" &&
+    test "$TRAVIS_RUST_VERSION" == "stable" &&
     npm install stylus nib &&
-    bash deploy.sh
+    bash ci/deploy.sh
 
 before_deploy:
+  # Script to create packages from the build artefacts to upload to GitHub
   - bash ci/before_deploy.sh
 
 deploy:
   provider: releases
   api_key:
     secure: Z1k7WqX7z+tT4+SzTh4tBBzf11VaADB4AWuEczHtylaEb/0hRs8gaiHCNSVHm/QTp0QPWQR2Vw7uKMhVuxG7I8X7h31j3A7ulYBh/iVk0DVIrtrn2Q4WOED9CpoXLuLtk2nxo9MBViFW7mw4nJe9H2Tn9o/9oEYBuwzekvW5mh4muqUuCVTr8eQVYbs3jbC9pQy5oYjOLeUnlL9Cey5VN/nAhzAtyFP+6lIMri0PKit4JtkFou/O1MEpFYlP3VGC2lFiWuByocPKBT/L45FecS9qoHq+i6+ZCPDH2eu46nuYsDbLKAkPdGvf1MdPBPwoj0vSnZbgaTisQ4hIoBngQQQPZlPaGtcdd6g6asxSfnbA9cQhClI5oZJmg+ksxQE+peE8pnbmZ10Ix0PpIkkfWdQeMdUUCQarOTkTK54Munw+X+kp1lH19j6+krQPLBYr95fPRd4b5tWsJD2+pb/UOYFEEJxMNoUHyLCrtdCO7imOwrSUcv51+Z8UudqfPpKQeszrJcntL4owip35r3sF5TsE9YfW5qssLC164IylvP32y1AcfL1jqg8b+zrqLZKanjvDOJ1dtHHuwKqxcwf7PhAf0YjAtVSH9OIYcDzmDa0EMLrq7EK0fs6NAeb5qt6CML7pZrRS3fmOxN53Fbmj81qm6TmjQjDe4dmZlELgNow=
-  file: ${PROJECT_NAME}-${TRAVIS_TAG}-${TARGET}.tar.gz
+  file: ${PROJECT_NAME}-${TRAVIS_TAG}-${TRAVIS_OS_NAME}.tar.gz
   # don't delete the artifacts from previous phases
   skip_cleanup: true
-  # deploy when a new tag is pushed
   on:
-    condition: $CHANNEL = stable
+    condition: $TRAVIS_RUST_VERSION = stable
     tags: true
 
 notifications:

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "mdbook"
-version = "0.0.25"
+version = "0.0.26"
 authors = ["Mathieu David <mathieudavid@mathieudavid.org>"]
 description = "create books from markdown files (like Gitbook)"
 documentation = "http://azerupi.github.io/mdBook/index.html"
@@ -16,12 +16,12 @@ exclude = [
 
 [dependencies]
 clap = "2.24"
-handlebars = "0.27"
+handlebars = "0.29"
 serde = "1.0"
 serde_derive = "1.0"
-error-chain = "0.10.0"
+error-chain = "0.11.0"
 serde_json = "1.0"
-pulldown-cmark = "0.0.14"
+pulldown-cmark = "0.1"
 lazy_static = "0.2"
 log = "0.3"
 env_logger = "0.4.0"
@@ -33,7 +33,7 @@ tempdir = "0.3.4"
 # Watch feature
 notify = { version = "4.0", optional = true }
 time = { version = "0.1.34", optional = true }
-crossbeam = { version = "0.2.8", optional = true }
+crossbeam = { version = "0.3", optional = true }
 
 # Serve feature
 iron = { version = "0.5", optional = true }
@@ -41,7 +41,7 @@ staticfile = { version = "0.4", optional = true }
 ws = { version = "0.7", optional = true}
 
 [build-dependencies]
-error-chain = "0.10"
+error-chain = "0.11"
 
 [features]
 default = ["output", "watch", "serve"]

README.md

@@ -16,7 +16,7 @@
     <tr>
         <td colspan="2">
             <a href="https://crates.io/crates/mdbook"><img src="https://img.shields.io/crates/v/mdbook.svg"></a>
-            <a href="LICENSE"><img src="https://img.shields.io/crates/l/mdbook.svg"></a>
+            <a href="LICENSE"><img src="https://img.shields.io/github/license/azerupi/mdBook.svg"></a>
         </td>
     </tr>
 </table>

book-example/src/format/mathjax.md

@@ -13,7 +13,7 @@ mathjax-support = true
 The usual delimiters MathJax uses are not yet supported. You can't currently use `$$ ... $$` as delimiters and the `\[ ... \]` delimiters need an extra backslash to work. Hopefully this limitation will be lifted soon.
 
 ### Inline equations
-Inline equations are delimited by `\\[` and `\\]`. So for example, to render the following inline equation \\( \int x dx = \frac{x^2}{2} + C \\) you would write the following:
+Inline equations are delimited by `\\(` and `\\)`. So for example, to render the following inline equation \\( \int x dx = \frac{x^2}{2} + C \\) you would write the following:
 ```
 \\( \int x dx = \frac{x^2}{2} + C \\)
 ```

ci/before_deploy.sh

@@ -18,7 +18,7 @@ mk_tarball() {
 
   pushd $td
 
-  tar czf $out_dir/${PROJECT_NAME}-${TRAVIS_TAG}-${TARGET}.tar.gz *
+  tar czf $out_dir/${PROJECT_NAME}-${TRAVIS_TAG}-${TRAVIS_OS_NAME}.tar.gz *
 
   popd $td
   rm -r $td

ci/install.sh

@@ -1,59 +0,0 @@
-# `install` phase: install stuff needed for the `script` phase
-
-set -ex
-
-case "$TRAVIS_OS_NAME" in
-  linux)
-    host=x86_64-unknown-linux-gnu
-    ;;
-  osx)
-    host=x86_64-apple-darwin
-    ;;
-esac
-
-mktempd() {
-  echo $(mktemp -d 2>/dev/null || mktemp -d -t tmp)
-}
-
-install_rustup() {
-  local td=$(mktempd)
-
-  pushd $td
-  curl -O https://static.rust-lang.org/rustup/dist/$host/rustup-setup
-  chmod +x rustup-setup
-  ./rustup-setup -y
-  popd
-
-  rm -r $td
-  rustup self update
-  rustup install "$CHANNEL"
-  rustup default "$CHANNEL"
-  rustc -V
-  cargo -V
-}
-
-install_standard_crates() {
-  if [ "$host" != "$TARGET" ]; then
-    if [ ! "$CHANNEL" = "stable" ]; then
-      rustup target add $TARGET
-    else
-      local version=$(rustc -V | cut -d' ' -f2)
-      local tarball=rust-std-${version}-${TARGET}
-
-      local td=$(mktempd)
-      curl -s https://static.rust-lang.org/dist/${tarball}.tar.gz | \
-        tar --strip-components 1 -C $td -xz
-
-      $td/install.sh --prefix=$(rustc --print sysroot)
-
-      rm -r $td
-    fi
-  fi
-}
-
-main() {
-  install_rustup
-  install_standard_crates
-}
-
-main

ci/script.sh

@@ -1,45 +0,0 @@
-# `script` phase: you usually build, test and generate docs in this phase
-
-set -ex
-
-# NOTE Workaround for rust-lang/rust#31907 - disable doc tests when cross compiling
-# This has been fixed in the nightly channel but it would take a while to reach the other channels
-disable_cross_doctests() {
-  local host
-  case "$TRAVIS_OS_NAME" in
-    linux)
-      host=x86_64-unknown-linux-gnu
-      ;;
-    osx)
-      host=x86_64-apple-darwin
-      ;;
-  esac
-
-  if [ "$host" != "$TARGET" ] && [ "$CHANNEL" != "nightly" ]; then
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      brew install gnu-sed --default-names
-    fi
-
-    find src -name '*.rs' -type f | xargs sed -i -e 's:\(//.\s*```\):\1 ignore,:g'
-  fi
-}
-
-run_test_suite() {
-  # Extra test without default features to avoid bitrot. We only test on a single target (but with
-  # all the channels) to avoid significantly increasing the build times
-  if [ $TARGET = x86_64-unknown-linux-gnu ]; then
-    cargo build --target $TARGET --no-default-features --verbose
-    cargo test --target $TARGET --no-default-features --verbose
-    cargo clean
-  fi
-
-  cargo build --target $TARGET --verbose
-  cargo test --target $TARGET --verbose
-}
-
-main() {
-  disable_cross_doctests
-  run_test_suite
-}
-
-main

src/renderer/html_handlebars/hbs_renderer.rs

@@ -220,6 +220,7 @@ impl HtmlHandlebars {
         // Make sure that the Print chapter does not display the title from
         // the last rendered chapter by removing it from its context
         data.remove("title");
+        data.insert("is_print".to_owned(), json!(true));
         data.insert("path".to_owned(), json!("print.md"));
         data.insert("content".to_owned(), json!(print_content));
         data.insert("path_to_root".to_owned(), json!(utils::fs::path_to_root(Path::new("print.md"))));
@@ -546,7 +547,7 @@ fn add_playpen_pre(html: &str, playpen_config: &PlaypenConfig) -> String {
             let classes = &caps[2];
             let code = &caps[3];
 
-            if classes.contains("language-rust") && !classes.contains("ignore") {
+            if (classes.contains("language-rust") && !classes.contains("ignore")) || classes.contains("mdbook-runnable") {
                 // wrap the contents in an external pre block
                 if playpen_config.is_editable() &&
                     classes.contains("editable") || text.contains("fn main") || text.contains("quick_main!") {

src/renderer/html_handlebars/helpers/navigation.rs

@@ -64,9 +64,10 @@ pub fn previous(_h: &Helper, r: &Handlebars, rc: &mut RenderContext) -> Result<(
 
                         debug!("[*]: Render template");
                         // Render template
-                        _h.template().ok_or_else(|| RenderError::new("Error with the handlebars template"))
+                        _h.template()
+                            .ok_or_else(|| RenderError::new("Error with the handlebars template"))
                             .and_then(|t| {
-                                          let mut local_rc = rc.with_context(Context::wraps(&previous_chapter));
+                                          let mut local_rc = rc.with_context(Context::wraps(&previous_chapter)?);
                                           t.render(r, &mut local_rc)
                                       })?;
                     }
@@ -142,7 +143,7 @@ pub fn next(_h: &Helper, r: &Handlebars, rc: &mut RenderContext) -> Result<(), R
                         // Render template
                         _h.template().ok_or_else(|| RenderError::new("Error with the handlebars template"))
                             .and_then(|t| {
-                                          let mut local_rc = rc.with_context(Context::wraps(&next_chapter));
+                                          let mut local_rc = rc.with_context(Context::wraps(&next_chapter)?);
                                           t.render(r, &mut local_rc)
                                       })?;
                         break;

src/theme/book.css

@@ -5,6 +5,7 @@ body {
 }
 body {
   margin: 0;
+  font-size: 1rem;
 }
 code {
   font-family: "Source Code Pro", Consolas, "Ubuntu Mono", Menlo, "DejaVu Sans Mono", monospace, monospace;
@@ -351,7 +352,8 @@ table thead td {
 .light .nav-chapters,
 .light .nav-chapters:visited,
 .light .mobile-nav-chapters,
-.light .mobile-nav-chapters:visited {
+.light .mobile-nav-chapters:visited,
+.light .menu-bar a i {
   color: #ccc;
 }
 .light .menu-bar i:hover,
@@ -471,7 +473,8 @@ table thead td {
 .coal .nav-chapters,
 .coal .nav-chapters:visited,
 .coal .mobile-nav-chapters,
-.coal .mobile-nav-chapters:visited {
+.coal .mobile-nav-chapters:visited,
+.coal .menu-bar a i {
   color: #43484d;
 }
 .coal .menu-bar i:hover,
@@ -591,7 +594,8 @@ table thead td {
 .navy .nav-chapters,
 .navy .nav-chapters:visited,
 .navy .mobile-nav-chapters,
-.navy .mobile-nav-chapters:visited {
+.navy .mobile-nav-chapters:visited,
+.navy .menu-bar a i {
   color: #737480;
 }
 .navy .menu-bar i:hover,
@@ -711,7 +715,8 @@ table thead td {
 .rust .nav-chapters,
 .rust .nav-chapters:visited,
 .rust .mobile-nav-chapters,
-.rust .mobile-nav-chapters:visited {
+.rust .mobile-nav-chapters:visited,
+.rust .menu-bar a i {
   color: #737480;
 }
 .rust .menu-bar i:hover,
@@ -831,7 +836,8 @@ table thead td {
 .ayu .nav-chapters,
 .ayu .nav-chapters:visited,
 .ayu .mobile-nav-chapters,
-.ayu .mobile-nav-chapters:visited {
+.ayu .mobile-nav-chapters:visited,
+.ayu .menu-bar a i {
   color: #737480;
 }
 .ayu .menu-bar i:hover,
@@ -925,6 +931,9 @@ table thead td {
     left: 0;
     overflow-y: initial;
   }
+  #page-wrapper.page-wrapper {
+    padding-left: 0px;
+  }
   #content {
     max-width: none;
     margin: 0;

src/theme/book.js

@@ -7,7 +7,7 @@ $( document ).ready(function() {
     window.onunload = function(){};
 
     // Set theme
-    var theme = store.get('theme');
+    var theme = store.get('mdbook-theme');
     if (theme === null || theme === undefined) { theme = 'light'; }
 
     set_theme(theme);
@@ -83,16 +83,6 @@ $( document ).ready(function() {
     }
 
 
-    // Print button
-    $("#print-button").click(function(){
-        var printWindow = window.open("print.html");
-    });
-
-    if( url.substring(url.lastIndexOf('/')+1) == "print.html" ) {
-        window.print();
-    }
-
-
     // Theme button
     $("#theme-toggle").click(function(){
         if($('.theme-popup').length) {
@@ -155,7 +145,7 @@ $( document ).ready(function() {
             });
         }
 
-        store.set('theme', theme);
+        store.set('mdbook-theme', theme);
 
         $('body').removeClass().addClass(theme);
     }
@@ -346,17 +336,17 @@ function sidebarToggle() {
     var html = $("html");
     if ( html.hasClass("sidebar-hidden") ) {
         html.removeClass("sidebar-hidden").addClass("sidebar-visible");
-        store.set('sidebar', 'visible');
+        store.set('mdbook-sidebar', 'visible');
     } else if ( html.hasClass("sidebar-visible") ) {
         html.removeClass("sidebar-visible").addClass("sidebar-hidden");
-        store.set('sidebar', 'hidden');
+        store.set('mdbook-sidebar', 'hidden');
     } else {
         if($("#sidebar").position().left === 0){
             html.addClass("sidebar-hidden");
-            store.set('sidebar', 'hidden');
+            store.set('mdbook-sidebar', 'hidden');
         } else {
             html.addClass("sidebar-visible");
-            store.set('sidebar', 'visible');
+            store.set('mdbook-sidebar', 'visible');
         }
     }
 }
@@ -368,22 +358,24 @@ function run_rust_code(code_block) {
         result_block = code_block.find(".result");
     }
 
-    let text = playpen_text(code_block);;
-
+    let text = playpen_text(code_block);
+    
     var params = {
-        version: "stable",
-        optimize: "0",
-        code: text,
-    };
+	channel: "stable",
+	mode: "debug",
+	crateType: "bin",
+	tests: false,
+	code: text,
+    }
 
     if(text.indexOf("#![feature") !== -1) {
-        params.version = "nightly";
+        params.channel = "nightly";
     }
 
     result_block.text("Running...");
 
     $.ajax({
-        url: "https://play.rust-lang.org/evaluate.json",
+        url: "https://play.rust-lang.org/execute",
         method: "POST",
         crossDomain: true,
         dataType: "json",
@@ -391,7 +383,7 @@ function run_rust_code(code_block) {
         data: JSON.stringify(params),
         timeout: 15000,
         success: function(response){
-            result_block.text(response.result);
+           result_block.text(response.success ? response.stdout : response.stderr);
         },
         error: function(qXHR, textStatus, errorThrown){
             result_block.text("Playground communication " + textStatus);

src/theme/index.hbs

@@ -60,14 +60,14 @@
     <body class="light">
         <!-- Set the theme before any content is loaded, prevents flash -->
         <script type="text/javascript">
-            var theme = store.get('theme');
+            var theme = store.get('mdbook-theme');
             if (theme === null || theme === undefined) { theme = 'light'; }
             $('body').removeClass().addClass(theme);
         </script>
 
         <!-- Hide / unhide sidebar before it is displayed -->
         <script type="text/javascript">
-            var sidebar = store.get('sidebar');
+            var sidebar = store.get('mdbook-sidebar');
             if (sidebar === "hidden") { $("html").addClass("sidebar-hidden") }
             else if (sidebar === "visible") { $("html").addClass("sidebar-visible") }
         </script>
@@ -88,7 +88,9 @@
                     <h1 class="menu-title">{{ book_title }}</h1>
 
                     <div class="right-buttons">
-                        <i id="print-button" class="fa fa-print" title="Print this book"></i>
+                        <a href="print.html">
+                            <i id="print-button" class="fa fa-print" title="Print this book"></i>
+                        </a>
                     </div>
                 </div>
 
@@ -156,6 +158,14 @@
         <script src="{{ theme_tomorrow_night_js }}" type="text/javascript" charset="utf-8"></script>
         {{/if}}
 
+        {{#if is_print}}
+        <script>
+            $(document).ready(function() {
+                window.print();
+            })
+        </script>
+        {{/if}}
+
         <script src="highlight.js"></script>
         <script src="book.js"></script>
     </body>

src/theme/stylus/general.styl

@@ -5,6 +5,7 @@ html, body {
 
 body {
     margin: 0;
+    font-size: 1rem;
 }
 
 code {

src/theme/stylus/print.styl

@@ -12,6 +12,10 @@
         overflow-y: initial;
     }
 
+    #page-wrapper.page-wrapper {
+        padding-left: 0px;
+    }
+
     #content {
         max-width: none;
         margin: 0;

src/theme/stylus/themes/base.styl

@@ -38,7 +38,8 @@
     .nav-chapters,
     .nav-chapters:visited,
     .mobile-nav-chapters,
-    .mobile-nav-chapters:visited {
+    .mobile-nav-chapters:visited,
+    .menu-bar a i {
         color: $icons
     }