Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unnecessary empty paragraph #185

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove unnecessary empty paragraph #185

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
124 changes: 64 additions & 60 deletions lib/gendocx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ function makeDocx ( genobj, new_type, options, gen_private, type_info ) {
continue;
}

outString += '<w:p w:rsidR="00A77427" w:rsidRDefault="007F1D13">';
var tempOutString = '<w:p w:rsidR="00A77427" w:rsidRDefault="007F1D13">';
var tempOutStringLength = tempOutString.length;
var pPrData = '';

if ( objs_list[i].options ) {
Expand Down Expand Up @@ -218,7 +219,7 @@ function makeDocx ( genobj, new_type, options, gen_private, type_info ) {
} // Endif.

if ( pPrData ) {
outString += '<w:pPr>' + pPrData + '</w:pPr>';
tempOutString += '<w:pPr>' + pPrData + '</w:pPr>';
} // Endif.

// Work on all the objects in the document:
Expand Down Expand Up @@ -303,7 +304,7 @@ function makeDocx ( genobj, new_type, options, gen_private, type_info ) {

// Hyperlink support:
if ( objs_list[i].data[j].options.hyperlink ) {
outString += '<w:hyperlink w:anchor="' + objs_list[i].data[j].options.hyperlink +'">';
tempOutString += '<w:hyperlink w:anchor="' + objs_list[i].data[j].options.hyperlink +'">';
hyperlinkOn = true;

if ( !rPrData ) {
Expand All @@ -314,7 +315,7 @@ function makeDocx ( genobj, new_type, options, gen_private, type_info ) {

// Field support:
if ( objs_list[i].data[j].fieldObj ) {
outString += '<w:fldSimple w:instr="' + objs_list[i].data[j].fieldObj + '">';
tempOutString += '<w:fldSimple w:instr="' + objs_list[i].data[j].fieldObj + '">';
} // Endif.

if ( objs_list[i].data[j].text ) {
Expand All @@ -323,108 +324,111 @@ function makeDocx ( genobj, new_type, options, gen_private, type_info ) {
} // Endif.

if (objs_list[i].data[j].link_rel_id) {
outString += '<w:hyperlink r:id="rId' + objs_list[i].data[j].link_rel_id + '">';
tempOutString += '<w:hyperlink r:id="rId' + objs_list[i].data[j].link_rel_id + '">';
}

outString += '<w:r' + rExtra + '>';
tempOutString += '<w:r' + rExtra + '>';

if ( rPrData ) {
outString += '<w:rPr>' + rPrData + '</w:rPr>';
tempOutString += '<w:rPr>' + rPrData + '</w:rPr>';
} // Endif.

outString += '<w:t' + tExtra + '>' + objs_list[i].data[j].text.encodeHTML () + '</w:t></w:r>';
tempOutString += '<w:t' + tExtra + '>' + objs_list[i].data[j].text.encodeHTML () + '</w:t></w:r>';

if (objs_list[i].data[j].link_rel_id) {
outString += '</w:hyperlink>';
tempOutString += '</w:hyperlink>';
}

} else if ( objs_list[i].data[j].page_break ) {
outString += '<w:r><w:br w:type="page"/></w:r>';
tempOutString += '<w:r><w:br w:type="page"/></w:r>';

} else if ( objs_list[i].data[j].line_break ) {
outString += '<w:r><w:br/></w:r>';
tempOutString += '<w:r><w:br/></w:r>';

} else if ( objs_list[i].data[j].horizontal_line ) {
outString += '<w:r><w:pict><v:rect style="width:0;height:.75pt" o:hralign="center" o:hrstd="t" o:hr="t" fillcolor="#e0e0e0" stroked="f"/></w:pict></w:r>';
tempOutString += '<w:r><w:pict><v:rect style="width:0;height:.75pt" o:hralign="center" o:hrstd="t" o:hr="t" fillcolor="#e0e0e0" stroked="f"/></w:pict></w:r>';

// Bookmark start support:
} else if ( objs_list[i].data[j].bookmark_start ) {
outString += '<w:bookmarkStart w:id="' + bookmarkId + '" w:name="' + objs_list[i].data[j].bookmark_start + '"/>';
tempOutString += '<w:bookmarkStart w:id="' + bookmarkId + '" w:name="' + objs_list[i].data[j].bookmark_start + '"/>';

// Bookmark end support:
} else if ( objs_list[i].data[j].bookmark_end ) {
outString += '<w:bookmarkEnd w:id="' + bookmarkId + '"/>';
tempOutString += '<w:bookmarkEnd w:id="' + bookmarkId + '"/>';
bookmarkId++;

} else if ( objs_list[i].data[j].image ) {
outString += '<w:r' + rExtra + '>';
tempOutString += '<w:r' + rExtra + '>';

rPrData += '<w:noProof/>';

if ( rPrData ) {
outString += '<w:rPr>' + rPrData + '</w:rPr>';
tempOutString += '<w:rPr>' + rPrData + '</w:rPr>';
} // Endif.

//914400L / 96DPI
var pixelToEmu = 9525;

outString += '<w:drawing>';
outString += '<wp:inline distT="0" distB="0" distL="0" distR="0">';
outString += '<wp:extent cx="' + (objs_list[i].data[j].options.cx * pixelToEmu) + '" cy="' + (objs_list[i].data[j].options.cy * pixelToEmu) + '"/>';
outString += '<wp:effectExtent l="19050" t="0" r="9525" b="0"/>';
tempOutString += '<w:drawing>';
tempOutString += '<wp:inline distT="0" distB="0" distL="0" distR="0">';
tempOutString += '<wp:extent cx="' + (objs_list[i].data[j].options.cx * pixelToEmu) + '" cy="' + (objs_list[i].data[j].options.cy * pixelToEmu) + '"/>';
tempOutString += '<wp:effectExtent l="19050" t="0" r="9525" b="0"/>';

outString += '<wp:docPr id="' + (objs_list[i].data[j].image_id + 1) + '" name="Picture ' + objs_list[i].data[j].image_id + '" descr="Picture ' + objs_list[i].data[j].image_id + '">';
tempOutString += '<wp:docPr id="' + (objs_list[i].data[j].image_id + 1) + '" name="Picture ' + objs_list[i].data[j].image_id + '" descr="Picture ' + objs_list[i].data[j].image_id + '">';
if(objs_list[i].data[j].link_rel_id){
outString += '<a:hlinkClick xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" r:id="rId'+objs_list[i].data[j].link_rel_id+'"/>';
tempOutString += '<a:hlinkClick xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" r:id="rId'+objs_list[i].data[j].link_rel_id+'"/>';
}
outString += '</wp:docPr>';

outString += '<wp:cNvGraphicFramePr>';
outString += '<a:graphicFrameLocks xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" noChangeAspect="1"/>';
outString += '</wp:cNvGraphicFramePr>';
outString += '<a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">';
outString += '<a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture">';
outString += '<pic:pic xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture">';
outString += '<pic:nvPicPr>';
outString += '<pic:cNvPr id="0" name="Picture ' + objs_list[i].data[j].image_id + '"/>';
outString += '<pic:cNvPicPr/>';
outString += '</pic:nvPicPr>';
outString += '<pic:blipFill>';
outString += '<a:blip r:embed="rId' + objs_list[i].data[j].rel_id + '" cstate="print"/>';
outString += '<a:stretch>';
outString += '<a:fillRect/>';
outString += '</a:stretch>';
outString += '</pic:blipFill>';
outString += '<pic:spPr>';
outString += '<a:xfrm>';
outString += '<a:off x="0" y="0"/>';
outString += '<a:ext cx="' + (objs_list[i].data[j].options.cx * pixelToEmu) + '" cy="' + (objs_list[i].data[j].options.cy * pixelToEmu) + '"/>';
outString += '</a:xfrm>';
outString += '<a:prstGeom prst="rect">';
outString += '<a:avLst/>';
outString += '</a:prstGeom>';
outString += '</pic:spPr>';
outString += '</pic:pic>';
outString += '</a:graphicData>';
outString += '</a:graphic>';
outString += '</wp:inline>';
outString += '</w:drawing>';

outString += '</w:r>';
tempOutString += '</wp:docPr>';

tempOutString += '<wp:cNvGraphicFramePr>';
tempOutString += '<a:graphicFrameLocks xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" noChangeAspect="1"/>';
tempOutString += '</wp:cNvGraphicFramePr>';
tempOutString += '<a:graphic xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">';
tempOutString += '<a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/picture">';
tempOutString += '<pic:pic xmlns:pic="http://schemas.openxmlformats.org/drawingml/2006/picture">';
tempOutString += '<pic:nvPicPr>';
tempOutString += '<pic:cNvPr id="0" name="Picture ' + objs_list[i].data[j].image_id + '"/>';
tempOutString += '<pic:cNvPicPr/>';
tempOutString += '</pic:nvPicPr>';
tempOutString += '<pic:blipFill>';
tempOutString += '<a:blip r:embed="rId' + objs_list[i].data[j].rel_id + '" cstate="print"/>';
tempOutString += '<a:stretch>';
tempOutString += '<a:fillRect/>';
tempOutString += '</a:stretch>';
tempOutString += '</pic:blipFill>';
tempOutString += '<pic:spPr>';
tempOutString += '<a:xfrm>';
tempOutString += '<a:off x="0" y="0"/>';
tempOutString += '<a:ext cx="' + (objs_list[i].data[j].options.cx * pixelToEmu) + '" cy="' + (objs_list[i].data[j].options.cy * pixelToEmu) + '"/>';
tempOutString += '</a:xfrm>';
tempOutString += '<a:prstGeom prst="rect">';
tempOutString += '<a:avLst/>';
tempOutString += '</a:prstGeom>';
tempOutString += '</pic:spPr>';
tempOutString += '</pic:pic>';
tempOutString += '</a:graphicData>';
tempOutString += '</a:graphic>';
tempOutString += '</wp:inline>';
tempOutString += '</w:drawing>';

tempOutString += '</w:r>';
} // Endif.

// Field support:
if ( objs_list[i].data[j].fieldObj ) {
outString += '</w:fldSimple>';
tempOutString += '</w:fldSimple>';
} // Endif.

if ( hyperlinkOn ) {
outString += '</w:hyperlink>';
tempOutString += '</w:hyperlink>';
} // Endif.
} // Endif.
} // Endif.

outString += '</w:p>';
//save in tempOutString current state, and if no changes so remove unnecessary empty paragraph
if (tempOutStringLength !== tempOutString.length) {
tempOutString += '</w:p>';
outString += tempOutString;
}
} // End of for loop.

if ( data.docType === 'document' ) {
Expand Down