Merge branch 'master' into greenkeeper/initial

.eslintignore

@@ -1,3 +1,3 @@
 coverage
-public/*
+packages/zmarkdown/public/*
 packages/*/dist/*

.gitignore

@@ -2,7 +2,6 @@
 /node_modules
 /packages/*/node_modules
 /packages/*/coverage
-/packages/*/dist
 /packages/*/.nyc_output
 /.nyc_output/*
 /coverage/*

.travis.yml

@@ -13,8 +13,18 @@ node_js:
   - '7'
   - '6'
 
+before_install: yarn global add greenkeeper-lockfile@1
+before_script: greenkeeper-lockfile-update
+after_script: greenkeeper-lockfile-upload
+
 script:
-  - npm test
+  - |
+    if [[ "$(node -v)" == "v6"* ]]; then
+      # ignore package with tests relying on `async/await`
+      npm test -- --testPathIgnorePatterns=remark-images-download
+    else
+      npm test
+    fi
 
 after_success:
   - npm run coverage

package.json

@@ -1,7 +1,6 @@
 {
   "engines": {
-    "node": ">=6",
-    "npm": ">=5"
+    "node": ">=8"
   },
   "jest": {
     "testPathIgnorePatterns": [
@@ -15,43 +14,44 @@
     "babel-preset-es2015": "^6.24.1",
     "babelify": "^7.3.0",
     "browserify": "^14.4.0",
-    "chai": "^4.0.2",
+    "chai": "^4.1.1",
     "coveralls": "^2.13.1",
-    "cross-env": "^5.0.1",
+    "cross-env": "^5.0.5",
     "del-cli": "^1.0.0",
     "envify": "^4.0.0",
-    "eslint": "^4.0.0",
+    "eslint": "^4.4.1",
     "exorcist": "^0.4.0",
     "html-differ": "^1.3.4",
     "jest": "^20.0.4",
+    "jest-environment-node-debug": "^2.0.0",
     "lerna": "^2.0.0-rc.5",
-    "mocha": "^3.4.2",
-    "rebber": "^0.0.28",
+    "mocha": "^3.5.0",
+    "rebber": "^0.0.31",
     "rehype-footnotes-title": "^0.0.15",
     "rehype-html-blocks": "^0.0.16",
     "rehype-katex": "^1.0.1",
     "rehype-stringify": "^3.0.0",
     "remark": "^8.0.0",
-    "remark-align": "^1.0.1",
-    "remark-captions": "^0.0.19",
-    "remark-comments": "^1.0.1",
-    "remark-custom-blocks": "^1.0.1",
+    "remark-align": "^1.0.2",
+    "remark-captions": "^1.0.0",
+    "remark-comments": "^1.0.3",
+    "remark-custom-blocks": "^1.0.2",
     "remark-emoticons": "^0.0.21",
     "remark-escape-escaped": "^0.0.18",
     "remark-grid-tables": "^1.0.1",
-    "remark-heading-shift": "^0.0.14",
+    "remark-heading-shift": "^0.0.15",
     "remark-heading-trailing-spaces": "^0.0.14",
-    "remark-iframes": "^1.0.1",
-    "remark-kbd": "^1.0.1",
+    "remark-iframes": "^1.0.2",
+    "remark-kbd": "^1.0.2",
     "remark-math": "^1.0.0",
     "remark-numbered-footnotes": "^0.0.15",
     "remark-parse": "^4.0.0",
     "remark-rehype": "^2.0.1",
-    "remark-sub-super": "^1.0.1",
+    "remark-sub-super": "^1.0.2",
     "textr": "^0.3.0",
     "typographic-apostrophes": "^1.1.1",
     "typographic-apostrophes-for-possessive-plurals": "^1.0.5",
-    "typographic-colon": "^1.0.1",
+    "typographic-colon": "^1.0.2",
     "typographic-copyright": "^1.0.1",
     "typographic-ellipses": "^1.0.11",
     "typographic-em-dash": "^1.0.1",
@@ -75,6 +75,10 @@
     "postinstall": "lerna bootstrap --hoist",
     "test": "jest",
     "d": "node --inspect --debug-brk ./node_modules/.bin/jest --runInBand -i",
-    "coverage": "jest --coverage"
+    "coverage": "jest --coverage",
+    "submoduleupdate": "git submodule foreach git pull origin master",
+    "latextemplatecopy": "cp -f packages/zmarkdown/latex-template/zmdocument.cls packages/zmarkdown",
+    "prepublish": "npm run submoduleupdate && npm run latextemplatecopy",
+    "prepare": "npm run prepublish"
   }
 }

packages/rebber/__tests__/__snapshots__/index.js.snap

@@ -10,6 +10,13 @@ a paragraph\\\\footnote{footnoteRawPar inner}
 "
 `;
 
+exports[`html nodes 1`] = `
+"\\\\chapter{foo}
+\\\\textbf{something <a> else}
+
+"
+`;
+
 exports[`link with special characters 1`] = `"\\\\externalLink{foo}{http://example.com?a=b\\\\%c\\\\textasciicircum{}\\\\{\\\\}\\\\#foo}"`;
 
 exports[`math 1`] = `
@@ -125,7 +132,15 @@ exports[`mix-3 1`] = `
 \\\\item item
 \\\\end{itemize}
 
-\\\\end{center}"
+\\\\end{center}
+\\\\chapter{left list}
+
+
+\\\\begin{itemize}
+\\\\item item
+\\\\item item
+\\\\item item
+\\\\end{itemize}"
 `;
 
 exports[`mix-4 1`] = `

packages/rebber/__tests__/fixtures/mix-3.fixture.md

@@ -13,3 +13,12 @@
 - item
 - item
 <-
+
+
+# left list
+
+<-
+- item
+- item
+- item
+<-

packages/rebber/__tests__/index.js

@@ -28,8 +28,9 @@ const integrationConfig = {
     sub: require('../src/custom-types/sub'),
     sup: require('../src/custom-types/sup'),
     kbd: require('../src/custom-types/kbd'),
-    CenterAligned: require('../src/custom-types/align'),
-    RightAligned: require('../src/custom-types/align'),
+    leftAligned: require('../src/custom-types/align'),
+    centerAligned: require('../src/custom-types/align'),
+    rightAligned: require('../src/custom-types/align'),
     errorCustomBlock: require('../src/custom-types/customBlocks'),
     informationCustomBlock: require('../src/custom-types/customBlocks'),
     questionCustomBlock: require('../src/custom-types/customBlocks'),
@@ -75,6 +76,18 @@ test('heading', () => {
   expect(contents).toEqual(spec.expected)
 })
 
+test('html nodes', () => {
+  const {contents} = unified()
+    .use(reParse)
+    .use(rebber)
+    .processSync(dedent`
+      # foo
+      **something <a> else**
+    `)
+
+  expect(contents).toMatchSnapshot()
+})
+
 test('heading with custom config', () => {
   const [fixture, expected] = [specs['heading'].fixture, specs['heading-config'].expected]
   const {contents} = unified()

packages/rebber/dist/custom-types/align.js

@@ -7,10 +7,13 @@ var all = require('../all');
 module.exports = align;
 
 var defaultMacros = {
-  CenterAligned: function CenterAligned(innerText) {
+  leftAligned: function leftAligned(innerText) {
+    return '\n\n' + innerText + '\n\n';
+  },
+  centerAligned: function centerAligned(innerText) {
     return '\n\\begin{center}\n' + innerText + '\n\\end{center}\n';
   },
-  RightAligned: function RightAligned(innerText) {
+  rightAligned: function rightAligned(innerText) {
     return '\n\\begin{flushright}\n' + innerText + '\n\\end{flushright}\n';
   },
   defaultType: function defaultType(innerText, type) {

packages/rebber/dist/one.js

@@ -15,28 +15,29 @@ handlers.heading = require('./types/heading');
 handlers.paragraph = require('./types/paragraph');
 handlers.comment = require('./types/comment');
 
-handlers.text = require('./types/text');
-handlers.link = require('./types/link');
-handlers.list = require('./types/list');
-handlers.listItem = require('./types/listItem');
+handlers.blockquote = require('./types/blockquote');
 handlers.break = require('./types/break');
 handlers.code = require('./types/code');
-handlers.strong = require('./types/strong');
-handlers.emphasis = require('./types/emphasis');
+handlers.definition = require('./types/definition');
 handlers.delete = require('./types/delete');
-handlers.inlineCode = require('./types/inlinecode');
-handlers.blockquote = require('./types/blockquote');
-handlers.tableCell = require('./types/tableCell');
-handlers.tableRow = require('./types/tableRow');
-handlers.table = require('./types/table');
-handlers.thematicBreak = require('./types/thematic-break');
+handlers.emphasis = require('./types/emphasis');
 handlers.footnote = require('./types/footnote');
 handlers.footnoteDefinition = require('./types/footnoteDefinition');
 handlers.footnoteReference = require('./types/footnoteReference');
+handlers.html = require('./types/html');
+handlers.image = require('./types/image');
+handlers.inlineCode = require('./types/inlinecode');
+handlers.link = require('./types/link');
 handlers.linkReference = require('./types/linkReference');
-handlers.definition = require('./types/definition');
+handlers.list = require('./types/list');
+handlers.listItem = require('./types/listItem');
+handlers.strong = require('./types/strong');
+handlers.table = require('./types/table');
+handlers.tableCell = require('./types/tableCell');
 handlers.tableHeader = require('./types/tableHeader');
-handlers.image = require('./types/image');
+handlers.tableRow = require('./types/tableRow');
+handlers.text = require('./types/text');
+handlers.thematicBreak = require('./types/thematic-break');
 
 /* Stringify `node`. */
 function one(ctx, node, index, parent, root) {

packages/rebber/dist/types/html.js

@@ -0,0 +1,9 @@
+"use strict";
+
+/* Expose. */
+module.exports = html;
+
+/* Stringify a html `node`. */
+function html(ctx, node, index, parent) {
+  return node.value;
+}

packages/rebber/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rebber",
-  "version": "0.0.28",
+  "version": "0.0.31",
   "description": "Stringifies MDAST to LaTeX",
   "repository": "https://github.com/zestedesavoir/zmarkdown/tree/master/packages/rebber",
   "author": "Victor Felder <victor@draft.li> (https://draft.li)",
@@ -38,17 +38,17 @@
     "babel-cli": "^6.24.1",
     "babel-jest": "^20.0.3",
     "babel-preset-es2015": "^6.24.1",
-    "cross-env": "^5.0.1",
+    "cross-env": "^5.0.5",
     "del-cli": "^1.0.0",
-    "eslint": "^4.0.0",
+    "eslint": "^4.4.1",
     "jest": "^20.0.4",
     "remark-abbr": "^1.0.1",
-    "remark-align": "^1.0.1",
-    "remark-captions": "^0.0.19",
+    "remark-align": "^1.0.2",
+    "remark-captions": "^1.0.0",
     "remark-emoticons": "^0.0.21",
     "remark-grid-tables": "^1.0.1",
     "remark-parse": "^4.0.0",
-    "remark-sub-super": "^1.0.1",
+    "remark-sub-super": "^1.0.2",
     "unified": "^6.1.5"
   }
 }

packages/rebber/src/custom-types/align.js

@@ -5,8 +5,9 @@ const all = require('../all')
 module.exports = align
 
 const defaultMacros = {
-  CenterAligned: (innerText) => `\n\\begin{center}\n${innerText}\n\\end{center}\n`,
-  RightAligned: (innerText) => `\n\\begin{flushright}\n${innerText}\n\\end{flushright}\n`,
+  leftAligned: (innerText) => `\n\n${innerText}\n\n`,
+  centerAligned: (innerText) => `\n\\begin{center}\n${innerText}\n\\end{center}\n`,
+  rightAligned: (innerText) => `\n\\begin{flushright}\n${innerText}\n\\end{flushright}\n`,
   defaultType: (innerText, type) => `\n\\begin{${type}}\n${innerText}\n\\end{${type}}\n`,
 }
 

packages/rebber/src/one.js

@@ -13,28 +13,29 @@ handlers.heading = require('./types/heading')
 handlers.paragraph = require('./types/paragraph')
 handlers.comment = require('./types/comment')
 
-handlers.text = require('./types/text')
-handlers.link = require('./types/link')
-handlers.list = require('./types/list')
-handlers.listItem = require('./types/listItem')
+handlers.blockquote = require('./types/blockquote')
 handlers.break = require('./types/break')
 handlers.code = require('./types/code')
-handlers.strong = require('./types/strong')
-handlers.emphasis = require('./types/emphasis')
+handlers.definition = require('./types/definition')
 handlers.delete = require('./types/delete')
-handlers.inlineCode = require('./types/inlinecode')
-handlers.blockquote = require('./types/blockquote')
-handlers.tableCell = require('./types/tableCell')
-handlers.tableRow = require('./types/tableRow')
-handlers.table = require('./types/table')
-handlers.thematicBreak = require('./types/thematic-break')
+handlers.emphasis = require('./types/emphasis')
 handlers.footnote = require('./types/footnote')
 handlers.footnoteDefinition = require('./types/footnoteDefinition')
 handlers.footnoteReference = require('./types/footnoteReference')
+handlers.html = require('./types/html')
+handlers.image = require('./types/image')
+handlers.inlineCode = require('./types/inlinecode')
+handlers.link = require('./types/link')
 handlers.linkReference = require('./types/linkReference')
-handlers.definition = require('./types/definition')
+handlers.list = require('./types/list')
+handlers.listItem = require('./types/listItem')
+handlers.strong = require('./types/strong')
+handlers.table = require('./types/table')
+handlers.tableCell = require('./types/tableCell')
 handlers.tableHeader = require('./types/tableHeader')
-handlers.image = require('./types/image')
+handlers.tableRow = require('./types/tableRow')
+handlers.text = require('./types/text')
+handlers.thematicBreak = require('./types/thematic-break')
 
 /* Stringify `node`. */
 function one (ctx, node, index, parent, root) {

packages/rebber/src/types/html.js

@@ -0,0 +1,7 @@
+/* Expose. */
+module.exports = html
+
+/* Stringify a html `node`. */
+function html (ctx, node, index, parent) {
+  return node.value
+}

packages/rehype-footnotes-title/.npmignore

@@ -1,7 +1,6 @@
 /index.js
 /__tests__
 /.npmignore
-/.nyc_output
 /coverage
 *.log
 /src

packages/rehype-footnotes-title/package.json

@@ -38,10 +38,10 @@
     "babel-cli": "^6.24.1",
     "babel-jest": "^20.0.3",
     "babel-preset-es2015": "^6.24.1",
-    "cross-env": "^5.0.1",
+    "cross-env": "^5.0.5",
     "dedent": "^0.7.0",
     "del-cli": "^1.0.0",
-    "eslint": "^4.0.0",
+    "eslint": "^4.4.1",
     "jest": "^20.0.4",
     "rehype-stringify": "^3.0.0",
     "remark-parse": "^4.0.0",

packages/rehype-html-blocks/.npmignore

@@ -1,7 +1,6 @@
 /index.js
 /__tests__
 /.npmignore
-/.nyc_output
 /coverage
 *.log
 /src

packages/rehype-html-blocks/package.json

@@ -38,10 +38,10 @@
     "babel-cli": "^6.24.1",
     "babel-jest": "^20.0.3",
     "babel-preset-es2015": "^6.24.1",
-    "cross-env": "^5.0.1",
+    "cross-env": "^5.0.5",
     "dedent": "^0.7.0",
     "del-cli": "^1.0.0",
-    "eslint": "^4.0.0",
+    "eslint": "^4.4.1",
     "jest": "^20.0.4",
     "rehype-stringify": "^3.0.0",
     "remark-parse": "^4.0.0",