book-source 0.3.10 → 0.3.11

package/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Cédric Ronvel
+
+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.

package/lib/StructuredDocument.js

@@ -299,10 +299,6 @@ StructuredDocument.parse = function( str , options ) {
 		}
 	}
 
-	// Call depthManagement() one last time, because some instanceOf may still be hanging...
-	//ctx.depth = -1 ;
-	//depthManagement( ctx ) ;
-
 	return ctx.structuredDocument ;
 } ;
 
@@ -901,7 +897,7 @@ function parseTableCaption( str , ctx ) {
 		if ( data?.style?.[ 0 ] ) { tableCaption.style = data.style[ 0 ] ; }
 	}
 
-	ctx.i = lastCharOfLine + 1 ;
+	ctx.i = searchEndOfLine( str , lastCharOfLine !== - 1 ? lastCharOfLine : ctx.i ) + 1 ;
 }
 
 
@@ -991,7 +987,7 @@ function parseTableRow( str , ctx ) {
 		currentBar = columnSeparator ? nextBar + 1 : nextBar ;
 	}
 
-	// Compute cells indexes, columnSpan, rowSpan, column template
+	// Compute cells indexes, columnSpan, column template, and add missing cells
 	computeIndexColumnSpan( ctx , table , tableRow ) ;
 
 	if ( str[ currentBar + 1 ] === '<' ) {
@@ -1000,7 +996,7 @@ function parseTableRow( str , ctx ) {
 		if ( data?.style?.[ 0 ] ) { tableRow.style = data.style[ 0 ] ; }
 	}
 
-	ctx.i = lastCharOfLine + 1 ;
+	ctx.i = searchEndOfLine( str , lastCharOfLine !== - 1 ? lastCharOfLine : ctx.i ) + 1 ;
 }
 
 
@@ -1033,7 +1029,7 @@ function parseTableMultilineRow( str , ctx , lastCharOfLine , table , tableRow )
 		columnIndex ++ ;
 	}
 
-	ctx.i = lastCharOfLine + 1 ;
+	ctx.i = searchEndOfLine( str , lastCharOfLine !== - 1 ? lastCharOfLine : ctx.i ) + 1 ;
 }
 
 
@@ -1143,7 +1139,7 @@ function parseTableRowSeparator( str , ctx , thick = false ) {
 		separatorCellIndex ++ ;
 	}
 
-	ctx.i = lastCharOfLine + 1 ;
+	ctx.i = searchEndOfLine( str , lastCharOfLine !== - 1 ? lastCharOfLine : ctx.i ) + 1 ;
 }
 
 
@@ -1291,15 +1287,16 @@ function parseTableHeadRowSeparator( str , ctx , thick , lastCharOfLine ) {
 	}
 
 	if ( tableHeadRow ) {
-		// Compute cells indexes, columnSpan, rowSpan, column template
+		// Compute cells indexes, columnSpan, column template, and add missing cells
 		computeIndexColumnSpan( ctx , table , tableHeadRow ) ;
 	}
 
-	ctx.i = lastCharOfLine + 1 ;
+	ctx.i = searchEndOfLine( str , lastCharOfLine !== - 1 ? lastCharOfLine : ctx.i ) + 1 ;
 }
 
 
 
+// Compute cells indexes, columnSpan, column template, and add missing cells
 function computeIndexColumnSpan( ctx , table , tableRow ) {
 	var tableCell , cellIndex , column , columnIndex , columnSpan ,
 		columns = table.columns ,
@@ -1336,6 +1333,19 @@ function computeIndexColumnSpan( ctx , table , tableRow ) {
 			}
 		}
 	}
+
+	// Add missing cells
+	if ( columns ) {
+		for ( ; extraSpan > 0 ; extraSpan -- ) {
+			columnIndex = table.columns.length - extraSpan ;
+			column = table.columns[ columnIndex ] ;
+			tableCell = new documentParts.TableCell() ;
+			tableCell.column = columnIndex ;
+			tableCell.sx = column?.sx || - 1 ;
+			tableCell.ex = column?.ex || - 1 ;
+			tableRow.parts.push( tableCell ) ;
+		}
+	}
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "book-source",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "A lightweight markup language, inspired by Markdown.",
   "main": "lib/book-source.js",
   "directories": {

package/.eslintrc.js

@@ -1,168 +0,0 @@
-module.exports = {
-	'root': true ,
-	'env': {
-		'browser': true ,
-		'node': true ,
-		'es6': true ,
-		'es2022': true
-	} ,
-	'parserOptions': {
-		'ecmaVersion': 2022
-	} ,
-	'extends': [ 'eslint:recommended' ] ,
-	'ignorePatterns': [ "*.min.js" ] ,
-	'rules': {
-		
-		/*
-			Bad code -- detect anything that can be broken or lead to bugs
-		*/
-		
-		
-		
-		'strict': [ 'error' , 'global' ] ,
-		'unicode-bom': [ 'error' , 'never' ] ,
-		'radix': 'error' ,
-		'eqeqeq': 'error' ,
-		'consistent-return': 'off' ,
-		'valid-typeof': 'error' ,
-		'no-unneeded-ternary': 'error' ,
-		'no-unused-vars': 'warn' ,	// During development phase, it's boring to clean unused var since they can be used later
-		'no-lonely-if': 'off' ,		// Can hurt semantic programming
-		'no-nested-ternary': 'off' ,	// Now I use the streamlined ternary operator a lot
-		'no-shadow': 'error' ,
-		'no-shadow-restricted-names': 'error' ,
-		'require-atomic-updates': 'off' ,	// check for possible race condition on assignment, interesting but too nitpicky
-		
-		
-		
-		/*
-			Code preferences
-		*/
-		
-		
-		
-		'prefer-arrow-callback': 'error' ,
-		'prefer-spread': 'warn' ,
-		'prefer-rest-params': 'warn' ,
-		'no-control-regex': 'off' ,	// because thing like \x00 are considered like a control even if escaped...
-		'no-fallthrough': 'off' ,
-		'no-empty': [ 'error' , {
-			'allowEmptyCatch': true
-		} ] ,
-		
-		
-		
-		/*
-			Coding styles -- cosmetic rules and opinionated preferences
-		*/
-		
-		
-		
-		// Indent & spaces (general)
-		'indent': [ 'error' , 'tab' , {
-			'SwitchCase': 1 ,
-			'MemberExpression': 1 ,
-			'flatTernaryExpressions': true
-		} ] ,
-		'newline-per-chained-call': 'off',
-		'no-multi-spaces': 'off' ,
-		'block-spacing': 'error' ,
-		'comma-spacing': [ 'error' , {
-			'before': true ,
-			'after': true
-		} ] ,
-		'no-whitespace-before-property': 'error' ,
-		'space-before-blocks': 'error' ,
-		'space-before-function-paren': [ 'error' , {
-			'anonymous': 'never',
-			'named': 'never',
-			'asyncArrow': 'always'
-		} ] ,
-		'space-infix-ops': 'error' ,
-		'space-unary-ops': [ 'error' , {
-			'words': true ,
-			'nonwords': true ,
-			'overrides': {
-				//'-': false ,
-			}
-		} ] ,
-		'space-in-parens': [ 'error' , 'always' , {
-			'exceptions': [ 'empty' ]
-		} ] ,
-		'no-trailing-spaces': 'error' ,
-		'switch-colon-spacing': [ 'error' , {
-			'after': true ,
-			'before': true
-		} ] ,
-		'arrow-spacing': 'error' ,
-		'rest-spread-spacing': [ 'error' , 'always' ] ,
-		/* Troublesome with commented line of code
-		'spaced-comment': [ 'error' , 'always' , {
-			'line': {
-				'markers': [ '/' ],
-				'exceptions': [ '-', '*', '/' ]
-			} ,
-			'block': {
-				'exceptions': [ '*' ] ,
-				'balanced': true
-			}
-		} ] ,
-		*/
-		
-		
-		// Semi-colon
-		'semi': [ 'error' , 'always' ] ,
-		'semi-style': [ 'error' , 'last' ] ,
-		'semi-spacing': [ 'error' , {
-			'before': true ,
-			'after': true
-		} ] ,
-
-		// Objects
-		'key-spacing': [ 'error' , {
-			'beforeColon': false ,
-			'afterColon': true ,
-			'mode': 'strict'
-		} ] ,
-		'object-curly-newline': [ 'error' , {
-			'ObjectExpression' : {
-				'consistent': true ,
-				'minProperties': 4
-			} ,
-			'ObjectPattern' : {
-				// object destructuring assigment
-				'consistent': true ,
-				'minProperties': 8
-			}
-		} ] ,
-		'object-curly-spacing': [ 'error' , 'always' ] ,
-		'object-property-newline': [ 'error' , { 'allowMultiplePropertiesPerLine': true } ] ,
-
-		
-		// Arrays
-		'array-bracket-newline': [ 'error' , 'consistent' ] ,
-		//'array-element-newline': [ 'error' , { 'multiline': true , 'minItems': 5 } ] ,
-		'array-bracket-spacing': [ 'error' , 'always' ],
-		
-		'brace-style': [ 'error' , 'stroustrup' , {
-			'allowSingleLine': true
-		} ] ,
-		
-		
-		// Misc style
-		'no-else-return': 'warn' ,
-		'comma-dangle': [ 'error' , 'never' ] ,
-		'quotes': 'off' ,
-		'camelcase': 'warn' ,
-		
-		
-		
-		/*
-			Method limitation
-		*/
-		
-		
-		
-		'no-console': 'off'
-	}
-} ;

package/Makefile

@@ -1,112 +0,0 @@
-
-
-
-# User rules
-
-# The first rule is the default rule, when invoking "make" without argument...
-# Build every buildable things
-#all: install doc browser
-all: install doc
-
-# Just install things so it works, basicaly: it just performs a "npm install --production" ATM
-install: log/npm-install.log
-
-# Just install things so it works, basicaly: it just performs a "npm install" ATM
-dev-install: log/npm-dev-install.log
-
-# Build
-#build: browser
-
-# Build the browser lib
-#browser: browser/svg-kit.js browser/svg-kit.min.js
-
-# This run the JsHint & Mocha BDD test, display it to STDOUT & save it to log/mocha.log and log/jshint.log
-test: log/jshint.log log/mocha.log
-
-# This run the JsHint, display it to STDOUT & save it to log/jshint.log
-lint: log/jshint.log
-
-# This run the Mocha BDD test, display it to STDOUT & save it to log/mocha.log
-unit: log/mocha.log
-
-# This build the doc and README.md
-doc: README.md
-
-# This publish to NPM and push to Github, if we are on master branch only
-publish: log/npm-publish.log log/github-push.log
-
-# Clean temporary things, or things that can be automatically regenerated
-clean: clean-all
-
-
-
-# Variables
-
-BROWSERIFY=browserify
-UGLIFY=uglifyjs
-
-
-
-# Files rules
-
-# Build the browser lib
-#browser/svg-kit.js: lib/*.js lib/*/*.js
-#	${BROWSERIFY} lib/svg-kit.js -i fs -i image-size -s svgKit -o browser/svg-kit.js
-
-# Build the browser minified lib
-#browser/svg-kit.min.js: browser/svg-kit.js
-#	${UGLIFY} browser/svg-kit.js -o browser/svg-kit.min.js -m
-
-# JsHint STDOUT test
-log/jshint.log: log/npm-dev-install.log lib/*.js test/*.js
-	${JSHINT} lib/*.js test/*.js | tee log/jshint.log ; exit $${PIPESTATUS[0]}
-
-# Mocha BDD STDOUT test
-log/mocha.log: log/npm-dev-install.log lib/*.js test/*.js
-	cd test ; ${MOCHA} *.js -R spec | tee ../log/mocha.log ; exit $${PIPESTATUS[0]}
-
-# README
-README.md: documentation.md
-	cat documentation.md > README.md
-
-# Mocha Markdown BDD spec
-bdd-spec.md: log/npm-dev-install.log lib/*.js test/*.js
-	cd test ; ${MOCHA} *.js -R markdown > ../bdd-spec.md
-
-# Upgrade version in package.json
-log/upgrade-package.log: lib/*.js test/*.js documentation.md
-	npm version patch -m "Upgrade package.json version to %s" | tee log/upgrade-package.log ; exit $${PIPESTATUS[0]}
-
-# Publish to NPM
-log/npm-publish.log: check-if-master-branch log/upgrade-package.log
-	npm publish | tee log/npm-publish.log ; exit $${PIPESTATUS[0]}
-
-# Push to Github/master
-log/github-push.log: lib/*.js test/*.js package.json
-	#'npm version patch' create the git tag by itself... 
-	#git tag v`cat package.json | grep version | sed -r 's/.*"([0-9.]*)".*/\1/'`
-	git push origin master --tags | tee log/github-push.log ; exit $${PIPESTATUS[0]}
-
-# NPM install
-log/npm-install.log: package.json
-	npm install --production | tee log/npm-install.log ; exit $${PIPESTATUS[0]}
-
-# NPM install for developpement usage
-log/npm-dev-install.log: package.json
-	npm install | tee log/npm-dev-install.log ; exit $${PIPESTATUS[0]}
-
-
-
-# PHONY rules
-
-.PHONY: clean-all check-if-master-branch
-
-# Delete files, mostly log and non-versioned files
-clean-all:
-	rm -rf log/*.log README.md bdd-spec.md node_modules
-
-# This will fail if we are not on master branch (grep exit 1 if nothing found)
-check-if-master-branch:
-	git branch | grep  "^* master$$"
-
-

package/documentation.md

@@ -1,17 +0,0 @@
-
-# Book Source
-
-Book Source is a Lightweight Markup Language similar to Markdown.
-
-This is the parser, you may want to add a renderer, like the [Book Source HTML renderer](https://github.com/cronvel/book-source-html-renderer).
-
-New renderers can easily be created.
-
-The parser has zero regex.
-
-
-
-## Book Source syntax
-
-TODO
-