Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ It may contain:

4. A `markFilled` property whose value is `true` or `false`

5. A `nearestHeadings` property whose value is `true` or `false`

The function returns a [JSZip](https://npmjs.com/packages/jszip) Object primed with `.docx` document data.
15 changes: 13 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,21 @@ module.exports = function (form, values, options) {
? {text: options.blanks}
: options.blanks
var markFilled = !!options.markFilled
var nearestHeadings = !!options.nearestHeadings
var scaffold = require('./data/scaffold.json')
scaffold.word['document.xml'] = doc(
form, values, title, edition, hash,
centerTitle, numberStyle, indentMargins, after, blanks, markFilled
form,
values,
title,
edition,
hash,
centerTitle,
numberStyle,
indentMargins,
after,
blanks,
markFilled,
nearestHeadings
)
var zip = new JSZip()
zipObject(zip, scaffold)
Expand Down
21 changes: 18 additions & 3 deletions templates/document.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,28 @@ var SECTION = (
)

module.exports = function (
form, values, title, edition, hash,
centerTitle, numberStyle, indentMargins, after, blanks, markFilled
form,
values,
title,
edition,
hash,
centerTitle,
numberStyle,
indentMargins,
after,
blanks,
markFilled,
nearestHeadings
) {
var paragraphs = flatten(form, values)
.map(function (element) {
return paragraph(
element, numberStyle, indentMargins, blanks, markFilled
element,
numberStyle,
indentMargins,
blanks,
markFilled,
nearestHeadings
)
})
.join('')
Expand Down
16 changes: 14 additions & 2 deletions templates/paragraph.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ var properties = function (o, number, indentMargins) {
var TAB = '<w:r><w:tab/></w:r>'

module.exports = function (
element, numberStyle, indentMargins, blanks, markFilled
element,
numberStyle,
indentMargins,
blanks,
markFilled,
nearestHeadings
) {
if (!element.hasOwnProperty('alignment')) {
element.alignment = 'justify'
Expand Down Expand Up @@ -69,6 +74,13 @@ module.exports = function (
.join('')
)
function makeRun (element, conspicuous) {
return run(element, numberStyle, conspicuous, blanks, markFilled)
return run(
element,
numberStyle,
conspicuous,
blanks,
markFilled,
nearestHeadings
)
}
}
6 changes: 5 additions & 1 deletion templates/run.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ var runText = function (text) {
}

module.exports = function run (
element, numberStyle, conspicuous, blanks, markFilled
element, numberStyle, conspicuous, blanks, markFilled, nearestHeadings
) {
var properties = merge(true, defaults)
if (conspicuous === true) {
Expand Down Expand Up @@ -95,6 +95,10 @@ module.exports = function run (
text = element.use
} else if (element.hasOwnProperty('heading')) {
var numbering = element.numbering
if (nearestHeadings && element.hasOwnProperty('nearest')) {
numbering = element.nearest
delete element.ambiguous
}
var heading = element.heading
if (
element.hasOwnProperty('broken') ||
Expand Down
34 changes: 34 additions & 0 deletions test.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,40 @@ tape('renders broken references', function (test) {
})
})

tape('renders nearest references', function (test) {
var form = {
content: [
{
heading: 'A',
form: {content: ['some text']}
},
{
form: {
content: [
{
heading: 'A',
form: {content: ['some text']}
},
{reference: 'A'}
]
}
}
]
}
var options = {
nearestHeadings: true,
numbering: decimal
}
textOf(render(form, [], options), function (error, text) {
test.ifError(error, 'no error')
test.assert(
text.indexOf('(A)') > -1,
'reference appears in output'
)
test.end()
})
})

tape('fills blanks', function (test) {
textOf(
render(
Expand Down