Merge remote-tracking branch 'gitbrent/master' into fork-sync

# Conflicts:
#	README.md
#	dist/pptxgen.bundle.js
#	dist/pptxgen.bundle.js.map
#	dist/pptxgen.js

CHANGELOG.md

@@ -4,14 +4,20 @@
 [Full Changelog](https://github.com/gitbrent/pptxgenjs/compare/v1.7.0...v1.8.0)
 
 **Fixed Bugs:**
-- New chart features: Bar colors and axis tested [\#132](https://github.com/gitbrent/PptxGenJS/pull/132) ([clubajax](https://github.com/clubajax))
+- Slide numbers wrap over 99 [\#133](https://github.com/gitbrent/PptxGenJS/issues/133) ([sangramjagtap](https://github.com/sangramjagtap))
 - Shadow corrections bugfix [\#136](https://github.com/gitbrent/PptxGenJS/pull/136) ([kajda90](https://github.com/kajda90))
 
 **Implemented Enhancements:**
+- New chart feature: Bar colors and axis [\#132](https://github.com/gitbrent/PptxGenJS/pull/132) ([clubajax](https://github.com/clubajax))
+- New feature: Scheme colors [\#135](https://github.com/gitbrent/PptxGenJS/pull/135) ([kajda90](https://github.com/kajda90))
+- New chart feature: lineShadow [\#138](https://github.com/gitbrent/PptxGenJS/pull/138) ([kajda90](https://github.com/kajda90))
+- New chart type: Tornado Chart [\#140](https://github.com/gitbrent/PptxGenJS/pull/140) ([clubajax](https://github.com/clubajax))
 - New chart feature: layout option [\#141](https://github.com/gitbrent/PptxGenJS/pull/141) ([kajda90](https://github.com/kajda90))
-- Charts: Optional displaying gridlines and axes [\#143](https://github.com/gitbrent/PptxGenJS/pull/143) ([kajda90](https://github.com/kajda90))
-- New chart type: doughnut charts [\#142](https://github.com/gitbrent/PptxGenJS/pull/142) ([kyrrigle](https://github.com/kyrrigle))
-- New chart features: Axis Titles [\#144](https://github.com/gitbrent/PptxGenJS/pull/144) ([kyrrigle](https://github.com/kyrrigle))
+- New chart type: Doughnut Chart [\#142](https://github.com/gitbrent/PptxGenJS/pull/142) ([kyrrigle](https://github.com/kyrrigle))
+- New chart options: gridlines and axes [\#143](https://github.com/gitbrent/PptxGenJS/pull/143) ([kajda90](https://github.com/kajda90))
+- New chart feature: Axis Titles [\#144](https://github.com/gitbrent/PptxGenJS/pull/144) ([kyrrigle](https://github.com/kyrrigle))
+- Optional output type [\#147](https://github.com/gitbrent/PptxGenJS/pull/147) ([kajda90](https://github.com/kajda90))
+- New chart options: catAxisLineShow [\#152](https://github.com/gitbrent/PptxGenJS/pull/152) ([amgault](https://github.com/amga))
 
 
 

dist/pptxgen.colors.js

@@ -0,0 +1,45 @@
+/*\
+|*|  :: pptxgen.colors.js ::
+|*|
+|*|  JavaScript framework that produces PowerPoint (pptx) presentations
+|*|  https://github.com/gitbrent/PptxGenJS
+|*|
+|*|  This framework is released under the MIT Public License (MIT)
+|*|
+|*|  PptxGenJS (C) 2015-2017 Brent Ely -- https://github.com/gitbrent
+|*|
+|*|  Permission is hereby granted, free of charge, to any person obtaining a copy
+|*|  of this software and associated documentation files (the "Software"), to deal
+|*|  in the Software without restriction, including without limitation the rights
+|*|  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+|*|  copies of the Software, and to permit persons to whom the Software is
+|*|  furnished to do so, subject to the following conditions:
+|*|
+|*|  The above copyright notice and this permission notice shall be included in all
+|*|  copies or substantial portions of the Software.
+|*|
+|*|  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+|*|  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+|*|  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+|*|  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+|*|  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+|*|  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+|*|  SOFTWARE.
+\*/
+
+var gObjPptxColors = {
+	TEXT1: 'tx1',
+	TEXT2: 'tx2',
+	BACKGROUND1: 'bg1',
+	BACKGROUND2: 'bg2',
+	ACCENT1: 'accent1',
+	ACCENT2: 'accent2',
+	ACCENT3: 'accent3',
+	ACCENT4: 'accent4',
+	ACCENT5: 'accent5',
+	ACCENT6: 'accent6',
+};
+
+if ( typeof module !== 'undefined' && module.exports ) {
+	module.exports = gObjPptxColors;
+}

examples/nodejs-demo.js

@@ -47,6 +47,15 @@ function saveCallback(filename) {
 	if (gConsoleLog) console.log('Good News Everyone!  File created: '+ filename);
 }
 
+// EX: JSZip callback - take the specified output (`data`) and do whatever
+function jszipCallback(data) {
+	if (gConsoleLog) {
+		console.log('Done!');
+		console.log('First 100 chars of output:\n');
+		console.log( data.substring(0,100) );
+	}
+}
+
 // EX: Callback that receives the PPT binary data - use this to stream file
 function streamCallback(data) {
 	var strFilename = "Node-Presenation-Streamed.pptx";
@@ -82,6 +91,9 @@ pptx.save( 'Node_Demo_Callback_'+getTimestamp(), saveCallback );
 // D: or use callback with 'http' in filename to get content back instead of writing a file - use this for streaming
 //pptx.save( 'https://github.com/gitbrent/PptxGenJS/', streamCallback );
 
+// E: or save using various JSZip formats ['arraybuffer', 'base64', 'binarystring', 'blob', 'nodebuffer', 'uint8array']
+//pptx.save( 'jszip', jszipCallback, 'base64' );
+
 // **NOTE** If you continue to use the `pptx` variable, new Slides will be added to the existing set
 // Create a new variable or reset `pptx` for an empty Presenation
 // EX: pptx = require("pptxgenjs");

examples/pptxgenjs-demo.css

@@ -148,6 +148,7 @@ h3 {
 fieldset {
     border: 1px dotted #aaa;
     background: #fff;
+	margin-bottom: 20px;
 }
 fieldset legend {
     font-size: 14px;

examples/pptxgenjs-demo.html

@@ -24,6 +24,7 @@
 	<script type="text/javascript" src="../libs/jquery.min.js"></script>
 	<script type="text/javascript" src="../libs/jszip.min.js"></script>
 	<script type="text/javascript" src="../libs/promise.min.js"></script>     <!-- optional if not using IE11 -->
+	<script type="text/javascript" src="../dist/pptxgen.colors.js"></script>  <!-- optional if you dont need PPT Color Schemes -->
 	<script type="text/javascript" src="../dist/pptxgen.shapes.js"></script>  <!-- optional if you dont need non-core Shapes -->
 	<script type="text/javascript" src="../dist/pptxgen.masters.js"></script> <!-- optional if you dont need Slide Masters/Templates -->
 	<script type="text/javascript" src="../dist/pptxgen.js"></script>
@@ -446,7 +447,7 @@ <h3>Slide 7-n</h3>
 					<div class="arrow active"></div>Charts
 				</div>
 				<div class="sectionBox">
-					<div class="formBox" style="width:25%; width:calc(25% - 20px);">
+					<div class="formBox" style="width:31%; width:calc(33% - 20px);">
 						<fieldset>
 							<legend>Bar Chart</legend>
 							<h3>Slide 1</h3>
@@ -463,30 +464,35 @@ <h3>Slide 5</h3>
 							<div class="chkRow"><div class="svgCheck"></div>Bar colors, majorUnit, Number Format</div>
 						</fieldset>
 					</div>
-					<div class="formBox" style="width:25%; width:calc(25% - 20px);">
+					<div class="formBox" style="width:31%; width:calc(33% - 20px);">
 						<fieldset>
-							<legend>Line Chart</legend>
+							<legend>Tornado Chart</legend>
 							<h3>Slide 6</h3>
-							<div class="chkRow"><div class="svgCheck"></div>Line Smoothing, Size, Symbol Size</div>
+							<div class="chkRow"><div class="svgCheck"></div>Tornado Type</div>
+						</fieldset>
+
+						<fieldset>
+							<legend>Line Chart</legend>
 							<h3>Slide 7</h3>
-							<div class="chkRow"><div class="svgCheck"></div>lineDataSymbol and SymbolSize</div>
+							<div class="chkRow"><div class="svgCheck"></div>Line Smoothing, Shadow, Size, Symbol Size</div>
 							<h3>Slide 8</h3>
+							<div class="chkRow"><div class="svgCheck"></div>lineDataSymbol and SymbolSize</div>
+							<h3>Slide 9</h3>
 							<div class="chkRow"><div class="svgCheck"></div>Lots of Categories</div>
 						</fieldset>
 					</div>
-					<div class="formBox" style="width:25%; width:calc(25% - 20px);">
+					<div class="formBox" style="width:31%; width:calc(33% - 20px);">
 						<fieldset>
 							<legend>Area Chart</legend>
-							<h3>Slide 9</h3>
+							<h3>Slide 10</h3>
 							<div class="chkRow"><div class="svgCheck"></div>Opacity and other options</div>
 						</fieldset>
-					</div>
-					<div class="formBox" style="width:25%; width:calc(25% - 20px);">
+
 						<fieldset>
 							<legend>Pie Chart</legend>
-							<h3>Slide 10</h3>
-							<div class="chkRow"><div class="svgCheck"></div>Various options</div>
 							<h3>Slide 11</h3>
+							<div class="chkRow"><div class="svgCheck"></div>Various options</div>
+							<h3>Slide 12</h3>
 							<div class="chkRow"><div class="svgCheck"></div>Doughnut Type</div>
 						</fieldset>
 					</div>
@@ -561,7 +567,7 @@ <h3>Slide 1</h3>
 							<div class="chkRow"><div class="svgCheck"></div>Lines: With and Without Arrowheads</div>
 
 							<h3>Slide 2</h3>
-							<div class="chkRow"><div class="svgCheck"></div>Misc Shapes with Text</div>
+							<div class="chkRow"><div class="svgCheck"></div>Same Shapes with Text</div>
 						</fieldset>
 					</div>
 					<div class="formBox" style="width:49%; width:calc(50% - 20px);">
@@ -571,11 +577,16 @@ <h3>Slide 2</h3>
 							<h3>Slide 1</h3>
 							<div class="chkRow"><div class="svgCheck"></div>Word-Level Formatting</div>
 							<div class="chkRow"><div class="svgCheck"></div>Multi-Line Text</div>
-							<div class="chkRow"><div class="svgCheck"></div>Bullets: Regular and Custom</div>
 							<div class="chkRow"><div class="svgCheck"></div>Hyperlinks: With and Without Tooltip</div>
 
 							<h3>Slide 2</h3>
-							<div class="chkRow"><div class="svgCheck"></div>Text Formatting, Colors and Alignments</div>
+							<div class="chkRow"><div class="svgCheck"></div>Bullets: Regular and Custom</div>
+
+							<h3>Slide 3</h3>
+							<div class="chkRow"><div class="svgCheck"></div>Text alignment, percent x/y, etc</div>
+
+							<h3>Slide 4</h3>
+							<div class="chkRow"><div class="svgCheck"></div>Scheme Colors</div>
 						</fieldset>
 					</div>