book-source 0.1.1 → 0.2.1

package/README.md

@@ -1,9 +1,9 @@
 
 # Book Source
 
-A Lightweight Markup Language similar to Markdown.
+Book Source is a Lightweight Markup Language similar to Markdown.
 
-This lib parses Book Source and is shipped with a HTML renderer.
+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.
 

package/documentation.md

@@ -1,9 +1,9 @@
 
 # Book Source
 
-A Lightweight Markup Language similar to Markdown.
+Book Source is a Lightweight Markup Language similar to Markdown.
 
-This lib parses Book Source and is shipped with a HTML renderer.
+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.
 

package/lib/StructuredDocument.js

@@ -28,10 +28,10 @@
 
 
 
-const HtmlRenderer = require( './HtmlRenderer.js' ) ;
+const documentParts = require( './documentParts.js' ) ;
 const Style = require( './Style.js' ) ;
+const Theme = require( './Theme.js' ) ;
 
-const emoji = require( 'string-kit/lib/emoji.js' ) ;
 const inPlaceFilter = require( 'array-kit/lib/inPlaceFilter.js' ) ;
 
 
@@ -47,12 +47,6 @@ module.exports = StructuredDocument ;
 
 
 
-StructuredDocument.prototype.toHtml = function( theme , params ) {
-	return this.render( new HtmlRenderer( theme , params ) ) ;
-} ;
-
-
-
 StructuredDocument.prototype.render = function( renderer ) {
 	var meta = {
 		title: this.title
@@ -73,33 +67,33 @@ StructuredDocument.prototype.renderParts = function( renderer , parts , partStac
 	var str = '' , index = 0 ;
 
 	for ( let part of parts ) {
-		let childrenStr = '' ;
+		let partsStr = '' ;
 
-		if ( part.children ) {
+		if ( part.parts ) {
 			if ( renderer.group?.[ part.type ] ) {
-				// Some renderer have to group children an apply things to each group,
+				// Some renderer have to group child parts an apply things to each group,
 				// E.g. HTML groups 'tableHeader' to produce <thead> and 'tableRow' to produce <tbody>
-				let groupList = this.groupByType( part.children , renderer.group[ part.type ] ) ;
+				let groupList = this.groupByType( part.parts , renderer.group[ part.type ] ) ;
 				//console.error( "groupList:" , groupList ) ;
 
 				for ( let group of groupList ) {
 					if ( renderer.group[ part.type ][ group.type ] ) {
 						partStack.push( part ) ;
-						let groupStr = this.renderParts( renderer , group.children , partStack ) ;
+						let groupStr = this.renderParts( renderer , group.parts , partStack ) ;
 						partStack.pop() ;
-						childrenStr += renderer.group[ part.type ][ group.type ]( part , groupStr , partStack ) ;
+						partsStr += renderer.group[ part.type ][ group.type ]( part , groupStr , partStack ) ;
 					}
 				}
 			}
 			else {
 				partStack.push( part ) ;
-				childrenStr = this.renderParts( renderer , part.children , [ ... partStack , part ] ) ;
+				partsStr = this.renderParts( renderer , part.parts , [ ... partStack , part ] ) ;
 				partStack.pop() ;
 			}
 		}
 
 		if ( renderer[ part.type ] ) {
-			str += renderer[ part.type ]( part , childrenStr , partStack , index ) ;
+			str += renderer[ part.type ]( part , partsStr , partStack , index ) ;
 		}
 
 		index ++ ;
@@ -118,13 +112,13 @@ StructuredDocument.prototype.groupByType = function( parts , rendererGroup ) {
 		if ( ! group ) {
 			group = groupMap[ part.type ] = {
 				type: part.type ,
-				children: [] ,
+				parts: [] ,
 				order: + rendererGroup[ part.type ]?.order || 0
 			} ;
 			groupList.push( group ) ;
 		}
 
-		group.children.push( part ) ;
+		group.parts.push( part ) ;
 	}
 
 	groupList.sort( ( a , b ) => a.order - b.order ) ;
@@ -143,7 +137,7 @@ StructuredDocument.prototype.autoTitle = function() {
 
 	if ( ! header ) { return ; }
 
-	str = this.getText( header.children ) ;
+	str = this.getText( header.parts ) ;
 	if ( str ) { this.title = str ; }
 } ;
 
@@ -154,7 +148,7 @@ StructuredDocument.prototype.getText = function( parts ) { //= this.parts ) {
 
 	for ( let part of parts ) {
 		if ( part.text ) { str += part.text ; }
-		else if ( part.children?.length ) { str += this.getText( part.children ) ; }
+		else if ( part.parts?.length ) { str += this.getText( part.parts ) ; }
 	}
 
 	return str ;
@@ -238,7 +232,7 @@ function parseBlock( str , ctx ) {
 	}
 
 	if ( indentType === QUOTE_INDENT ) {
-		ctx.parts.push( { type: 'quote' , indent: indentSpaces } ) ;
+		ctx.parts.push( new documentParts.Quote( indentSpaces ) ) ;
 		stack( ctx ) ;
 	}
 	else if ( indentType <= 0 ) {
@@ -548,13 +542,13 @@ const PARAGRAPH_END_PARAMS = {
 
 function parseParagraph( str , ctx ) {
 	//console.error( "parseParagraph in:" , ctx.i , str.slice( ctx.i ) ) ;
-	ctx.parts.push( { type: 'paragraph' } ) ;
+	ctx.parts.push( new documentParts.Paragraph() ) ;
 
 	var blockEnd = detectBlockEnd( str , ctx.i , ctx.parent?.indent , PARAGRAPH_END_PARAMS ) ;
 	//console.error( "blockEnd:" , blockEnd ) ;
 	parseInlineChildren( str , ctx , blockEnd ) ;
 
-	//console.error( "children:" , children ) ;
+	//console.error( "parts:" , parts ) ;
 	//console.error( "parseParagraph out:" , ctx.i , str.slice( ctx.i ) ) ;
 }
 
@@ -573,7 +567,7 @@ function parseHeader( str , ctx ) {
 
 	ctx.i += streak ;
 	if ( str[ ctx.i ] === ' ' ) { ctx.i ++ ; }
-	ctx.parts.push( { type: 'header' , level: streak } ) ;
+	ctx.parts.push( new documentParts.Header( streak ) ) ;
 
 	var blockEnd = detectBlockEnd( str , ctx.i , ctx.parent?.indent , HEADER_END_PARAMS ) ;
 	parseInlineChildren( str , ctx , blockEnd ) ;
@@ -590,7 +584,7 @@ const CITE_END_PARAMS = {
 
 function parseCite( str , ctx ) {
 	ctx.i += 3 ;
-	ctx.parts.push( { type: 'cite' } ) ;
+	ctx.parts.push( new documentParts.Cite() ) ;
 
 	var blockEnd = detectBlockEnd( str , ctx.i , ctx.parent?.indent , CITE_END_PARAMS ) ;
 	parseInlineChildren( str , ctx , blockEnd ) ;
@@ -612,12 +606,12 @@ function parseListItem( str , ctx , indent ) {
 	var lastPart = ctx.parts[ ctx.parts.length - 1 ] ;
 
 	if ( ! lastPart || lastPart.type !== 'list' ) {
-		ctx.parts.push( { type: 'list' , indent } ) ;
+		ctx.parts.push( new documentParts.List( indent ) ) ;
 	}
 
 	stack( ctx ) ;
 
-	ctx.parts.push( { type: 'listItem' , indent } ) ;
+	ctx.parts.push( new documentParts.ListItem( indent ) ) ;
 
 	var blockEnd = detectBlockEnd( str , ctx.i , ctx.parent?.indent , LIST_ITEM_END_PARAMS ) ;
 	parseInlineChildren( str , ctx , blockEnd ) ;
@@ -635,12 +629,12 @@ function parseOrderedListItem( str , ctx , indent ) {
 	var lastPart = ctx.parts[ ctx.parts.length - 1 ] ;
 
 	if ( ! lastPart || lastPart.type !== 'orderedList' ) {
-		ctx.parts.push( { type: 'orderedList' , indent } ) ;
+		ctx.parts.push( new documentParts.OrderedList( indent ) ) ;
 	}
 
 	stack( ctx ) ;
 
-	ctx.parts.push( { type: 'orderedListItem' , indent , order } ) ;
+	ctx.parts.push( new documentParts.OrderedListItem( indent , order ) ) ;
 
 	var blockEnd = detectBlockEnd( str , ctx.i , ctx.parent?.indent , LIST_ITEM_END_PARAMS ) ;
 	parseInlineChildren( str , ctx , blockEnd ) ;
@@ -701,7 +695,7 @@ function parseMedia( str , ctx , float = null ) {
 
 
 function parseHorizontalRule( str , ctx ) {
-	var params = { type: 'horizontalRule' } ,
+	var clearFloat = false ,
 		streak = countStreak( str , ctx.i , '-' ) ;
 
 	if (
@@ -711,10 +705,10 @@ function parseHorizontalRule( str , ctx ) {
 		&& str[ ctx.i + streak + 3 ] === '-'
 		&& str[ ctx.i + streak + 4 ] === '-'
 	) {
-		params.clearFloat = true ;
+		clearFloat = true ;
 	}
 
-	ctx.parts.push( params ) ;
+	ctx.parts.push( new documentParts.HorizontalRule( clearFloat ) ) ;
 	ctx.i = searchEndOfLine( str , ctx.i ) + 1 ;
 }
 
@@ -724,7 +718,7 @@ function parseClearFloat( str , ctx ) {
 	var streak = countStreak( str , ctx.i + 1 , '-' ) ;
 
 	if ( str[ ctx.i + 1 + streak ] === '>' ) {
-		ctx.parts.push( { type: 'clearFloat' } ) ;
+		ctx.parts.push( new documentParts.ClearFloat() ) ;
 		ctx.i = searchEndOfLine( str , ctx.i ) + 1 ;
 	}
 	else {
@@ -746,12 +740,10 @@ function parseCodeBlock( str , ctx ) {
 		return parseParagraph( str , ctx ) ;
 	}
 
-	var [ contentEnd , blockEnd ] = ends ;
+	var [ contentEnd , blockEnd ] = ends ,
+		text = str.slice( contentStart , contentEnd - 1 ) ;		// We strip the last newline
 
-	var params = { type: 'codeBlock' } ;
-	if ( lang ) { params.lang = lang ; }
-	params.text = str.slice( contentStart , contentEnd - 1 ) ;	// We strip the last newline
-	ctx.parts.push( params ) ;
+	ctx.parts.push( new documentParts.CodeBlock( text , lang ) ) ;
 	ctx.i = blockEnd ;
 }
 
@@ -784,10 +776,7 @@ function parseAnchor( str , ctx ) {
 	var end = searchCloser( str , ctx.i + 2 , '(' , ')' , true ) ;
 	if ( end < 0 ) { return parseParagraph( str , ctx ) ; }
 
-	ctx.parts.push( {
-		type: 'anchor' ,
-		href: str.slice( ctx.i + 2 , end )
-	} ) ;
+	ctx.parts.push( new documentParts.Anchor( str.slice( ctx.i + 2 , end ) ) ) ;
 
 	ctx.i = end + 1 ;
 }
@@ -808,7 +797,7 @@ function parseTableCaption( str , ctx ) {
 	var table = ctx.parts[ ctx.parts.length - 1 ] ;
 
 	if ( ! table || table.type !== 'table' || ctx.lastLineWasEmpty ) {
-		table = { type: 'table' , columns: [] } ;
+		table = new documentParts.Table() ;
 		ctx.parts.push( table ) ;
 	}
 
@@ -819,7 +808,7 @@ function parseTableCaption( str , ctx ) {
 		tableCaption = lastRow ;
 
 	if ( ! lastRow || lastRow.type !== 'tableCaption' ) {
-		tableCaption = { type: 'tableCaption' } ;
+		tableCaption = new documentParts.TableCaption() ;
 		ctx.parts.push( tableCaption ) ;
 	}
 
@@ -848,7 +837,7 @@ function parseTableRow( str , ctx ) {
 		mergeMode = false ;
 
 	if ( ! table || table.type !== 'table' || ctx.lastLineWasEmpty ) {
-		table = { type: 'table' , columns: [] , children: [] } ;
+		table = new documentParts.Table() ;
 		ctx.parts.push( table ) ;
 	}
 
@@ -860,7 +849,7 @@ function parseTableRow( str , ctx ) {
 		tableRow = lastRow ;
 
 		if ( ! lastRow || lastRow.type !== 'tableRow' ) {
-			tableRow = { type: 'tableRow' } ;
+			tableRow = new documentParts.TableRow() ;
 			ctx.parts.push( tableRow ) ;
 		}
 		else {
@@ -868,7 +857,7 @@ function parseTableRow( str , ctx ) {
 		}
 	}
 	else {
-		tableRow = { type: 'tableRow' } ;
+		tableRow = new documentParts.TableRow() ;
 		ctx.parts.push( tableRow ) ;
 	}
 
@@ -902,7 +891,7 @@ function parseTableRow( str , ctx ) {
 			firstSpace = searchNext( str , currentBar + 1 , nextBar , ' ' ) ;
 		}
 
-		let tableCell = { type: 'tableCell' } ;
+		let tableCell = new documentParts.TableCell() ;
 
 		// The '|' bar position helps for column span calculation
 		// sx = Start X, the x position of the left bar
@@ -951,7 +940,7 @@ function parseTableMultilineRow( str , ctx , lastCharOfLine , table , tableRow )
 
 		if ( str[ nextBar + 1 ] === '|' ) { columnSeparator = true ; }
 
-		tableCell = tableRow.children[ columnIndex ] ;
+		tableCell = tableRow.parts[ columnIndex ] ;
 
 		if ( tableCell ) {
 			ctx.i = firstSpace + 1 ;
@@ -975,7 +964,7 @@ function parseTableRowSeparator( str , ctx , thick = false ) {
 		table = ctx.parts[ ctx.parts.length - 1 ] ;
 
 	if ( ! table || table.type !== 'table' || ctx.lastLineWasEmpty ) {
-		table = { type: 'table' , columns: [] , children: [] } ;
+		table = new documentParts.Table() ;
 		ctx.parts.push( table ) ;
 	}
 
@@ -989,8 +978,8 @@ function parseTableRowSeparator( str , ctx , thick = false ) {
 	if ( ! table.hasRowSeparator ) {
 		table.multilineRowMode = true ;
 
-		for ( let index = 0 ; index < table.children.length ; index ++ ) {
-			let child = table.children[ index ] ;
+		for ( let index = 0 ; index < table.parts.length ; index ++ ) {
+			let child = table.parts[ index ] ;
 
 			if ( child.type === 'tableRow' ) {
 				if ( ! tableRow ) {
@@ -999,22 +988,22 @@ function parseTableRowSeparator( str , ctx , thick = false ) {
 				else {
 					// All subsequent tableRows, are merged into the first tableRow
 
-					if ( child.children ) {
-						for ( columnIndex = 0 ; columnIndex < child.children.length ; columnIndex ++ ) {
-							let child2 = child.children[ columnIndex ] ;
+					if ( child.parts ) {
+						for ( columnIndex = 0 ; columnIndex < child.parts.length ; columnIndex ++ ) {
+							let child2 = child.parts[ columnIndex ] ;
 							if ( child2.type === 'tableCell' || child2.type === 'tableHeadCell' ) {
-								if ( tableRow.children[ columnIndex ] ) {
+								if ( tableRow.parts[ columnIndex ] ) {
 									// Merge the cells
-									mergeInlineParts( tableRow.children[ columnIndex ].children , child2.children ) ;
+									mergeInlineParts( tableRow.parts[ columnIndex ].parts , child2.parts ) ;
 								}
 								else {
-									tableRow.children[ columnIndex ] = child2 ;
+									tableRow.parts[ columnIndex ] = child2 ;
 								}
 							}
 						}
 					}
 
-					table.children.splice( index , 1 ) ;
+					table.parts.splice( index , 1 ) ;
 					index -- ;
 				}
 			}
@@ -1156,19 +1145,24 @@ function parseTableHeadRowSeparator( str , ctx , thick , lastCharOfLine ) {
 	// Should come AFTER, because it needs column info
 	// Fix previous table row as table head row: turn all existing tableRow into tableHeadRow
 
-	for ( let index = 0 ; index < table.children.length ; index ++ ) {
-		let child = table.children[ index ] ;
+	for ( let index = 0 ; index < table.parts.length ; index ++ ) {
+		let child = table.parts[ index ] ;
 
 		if ( child.type === 'tableRow' ) {
 			if ( ! tableHeadRow ) {
 				// This is the first tableRow, turn it into a a tableHeadRow
-				child.type = 'tableHeadRow' ;
-
-				if ( child.children ) {
-					for ( columnIndex = 0 ; columnIndex < child.children.length ; columnIndex ++ ) {
-						let child2 = child.children[ columnIndex ] ;
-						if ( child2.type === 'tableCell' || child2.type === 'tableHeadCell' ) {
-							child2.type = 'tableHeadCell' ;
+				//child.type = 'tableHeadRow' ;
+				table.parts[ index ] = child = child.toHead() ;
+
+				if ( child.parts ) {
+					for ( columnIndex = 0 ; columnIndex < child.parts.length ; columnIndex ++ ) {
+						let child2 = child.parts[ columnIndex ] ;
+						if ( child2.type === 'tableCell' ) {
+							//child2.type = 'tableHeadCell' ;
+							child.parts[ columnIndex ] = child2 = child2.toHead() ;
+							child2.isColumnHead = true ;
+						}
+						else if ( child2.type === 'tableHeadCell' ) {
 							child2.isColumnHead = true ;
 						}
 					}
@@ -1180,24 +1174,35 @@ function parseTableHeadRowSeparator( str , ctx , thick , lastCharOfLine ) {
 			else {
 				// All subsequent tableRows, are merged into the first tableHeadRow created
 
-				if ( child.children ) {
-					for ( columnIndex = 0 ; columnIndex < child.children.length ; columnIndex ++ ) {
-						let child2 = child.children[ columnIndex ] ;
-						if ( child2.type === 'tableCell' || child2.type === 'tableHeadCell' ) {
-							if ( tableHeadRow.children[ columnIndex ] ) {
+				if ( child.parts ) {
+					for ( columnIndex = 0 ; columnIndex < child.parts.length ; columnIndex ++ ) {
+						let child2 = child.parts[ columnIndex ] ;
+						if ( child2.type === 'tableCell' ) {
+							if ( tableHeadRow.parts[ columnIndex ] ) {
+								// Merge the cells
+								mergeInlineParts( tableHeadRow.parts[ columnIndex ].parts , child2.parts ) ;
+							}
+							else {
+								//child2.type = 'tableHeadCell' ;
+								child.parts[ columnIndex ] = child2 = child2.toHead() ;
+								child2.isColumnHead = true ;
+								tableHeadRow.parts[ columnIndex ] = child2 ;
+							}
+						}
+						else if ( child2.type === 'tableHeadCell' ) {
+							if ( tableHeadRow.parts[ columnIndex ] ) {
 								// Merge the cells
-								mergeInlineParts( tableHeadRow.children[ columnIndex ].children , child2.children ) ;
+								mergeInlineParts( tableHeadRow.parts[ columnIndex ].parts , child2.parts ) ;
 							}
 							else {
-								child2.type = 'tableHeadCell' ;
 								child2.isColumnHead = true ;
-								tableHeadRow.children[ columnIndex ] = child2 ;
+								tableHeadRow.parts[ columnIndex ] = child2 ;
 							}
 						}
 					}
 				}
 
-				table.children.splice( index , 1 ) ;
+				table.parts.splice( index , 1 ) ;
 				index -- ;
 			}
 		}
@@ -1216,11 +1221,11 @@ function parseTableHeadRowSeparator( str , ctx , thick , lastCharOfLine ) {
 function computeIndexColumnSpan( ctx , table , tableRow ) {
 	var tableCell , cellIndex , column , columnIndex , columnSpan ,
 		columns = table.columns ,
-		extraSpan = columns ? columns.length - tableRow.children.length : 0 ;
+		extraSpan = columns ? columns.length - tableRow.parts.length : 0 ;
 
 
-	for ( cellIndex = columnIndex = 0 ; cellIndex < tableRow.children.length ; cellIndex ++ , columnIndex ++ ) {
-		tableCell = tableRow.children[ cellIndex ] ;
+	for ( cellIndex = columnIndex = 0 ; cellIndex < tableRow.parts.length ; cellIndex ++ , columnIndex ++ ) {
+		tableCell = tableRow.parts[ cellIndex ] ;
 		tableCell.column = columnIndex ;
 		columnSpan = 1 ;
 
@@ -1229,7 +1234,11 @@ function computeIndexColumnSpan( ctx , table , tableRow ) {
 
 			if ( column ) {
 				if ( column.headColumn ) {
-					tableCell.type = 'tableHeadCell' ;
+					if ( tableCell.type === 'tableCell' ) {
+						//tableCell.type = 'tableHeadCell' ;
+						tableRow.parts[ cellIndex ] = tableCell = tableCell.toHead() ;
+					}
+
 					tableCell.isRowHead = true ;
 				}
 			}
@@ -1308,11 +1317,11 @@ function parseInline( str , ctx , blockEnd , trim = false ) {
 		}
 		else if ( char === '*' && ! WHITE_SPACES.has( str[ ctx.i + 1 ] ) ) {
 			addInlineTextChunk( str , ctx ) ;
-			parseEmphasis( str , ctx , scanEnd ) ;
+			parseEmphasisText( str , ctx , scanEnd ) ;
 		}
 		else if ( char === '_' && ! WHITE_SPACES.has( str[ ctx.i + 1 ] ) ) {
 			addInlineTextChunk( str , ctx ) ;
-			parseDecoration( str , ctx , scanEnd ) ;
+			parseDecoratedText( str , ctx , scanEnd ) ;
 		}
 		else if ( char === '`' ) {
 			addInlineTextChunk( str , ctx ) ;
@@ -1353,10 +1362,7 @@ function addInlineTextChunk( str , ctx , forcedChunk = null ) {
 			lastPart.text += chunk ;
 		}
 		else {
-			ctx.parts.push( {
-				type: 'text' ,
-				text: chunk
-			} ) ;
+			ctx.parts.push( new documentParts.Text( chunk ) ) ;
 		}
 	}
 
@@ -1414,7 +1420,7 @@ function parseEscape( str , ctx ) {
 
 
 
-function parseEmphasis( str , ctx , blockEnd ) {
+function parseEmphasisText( str , ctx , blockEnd ) {
 	//console.error( "parseStyledText()" ) ;
 	var streak = countStreak( str , ctx.i , '*' ) ;
 	if ( streak > 3 ) { return ; }
@@ -1423,14 +1429,14 @@ function parseEmphasis( str , ctx , blockEnd ) {
 
 	var text = str.slice( ctx.i + streak , end + 1 - streak ) ;
 
-	ctx.parts.push( { type: 'emphasis' , level: streak , text } ) ;
+	ctx.parts.push( new documentParts.EmphasisText( text , streak ) ) ;
 	ctx.i = end ;
 	ctx.iStartOfInlineChunk = ctx.i + 1 ;
 }
 
 
 
-function parseDecoration( str , ctx , blockEnd ) {
+function parseDecoratedText( str , ctx , blockEnd ) {
 	//console.error( "parseStyledText()" ) ;
 	var streak = countStreak( str , ctx.i , '_' ) ;
 	if ( streak > 2 ) { return ; }
@@ -1439,9 +1445,7 @@ function parseDecoration( str , ctx , blockEnd ) {
 
 	var text = str.slice( ctx.i + streak , end + 1 - streak ) ;
 
-	ctx.parts.push( {
-		type: 'decoration' , underline: true , level: streak , text
-	} ) ;
+	ctx.parts.push( new documentParts.DecoratedText( text , streak ) ) ;
 	ctx.i = end ;
 	ctx.iStartOfInlineChunk = ctx.i + 1 ;
 }
@@ -1464,7 +1468,7 @@ function parseCode( str , ctx , blockEnd ) {
 
 	var text = str.slice( sliceStart , sliceEnd ) ;
 
-	ctx.parts.push( { type: 'code' , text } ) ;
+	ctx.parts.push( new documentParts.Code( text ) ) ;
 	ctx.i = end ;
 	ctx.iStartOfInlineChunk = ctx.i + 1 ;
 }
@@ -1486,18 +1490,15 @@ function parseStyledText( str , ctx , blockEnd ) {
 	var data = parseDataMark( str , ctx , STYLE_DATA_MARK , blockEnd ) ;
 	if ( ! data ) { return ; }
 
-	var params = { type: '' , text } ;
-	if ( data.href?.[ 0 ] ) { params.href = data.href[ 0 ] ; }
-	if ( data.style?.[ 0 ] ) { params.style = data.style[ 0 ] ; }
-	if ( data.text?.[ 0 ] ) { params.title = data.text[ 0 ] ; }
+	var href = data.href?.[ 0 ] ,
+		style = data.style?.[ 0 ] ,
+		title = data.text?.[ 0 ] ;
 
-	if ( params.href ) {
-		params.type = 'link' ;
-		ctx.parts.push( params ) ;
+	if ( href ) {
+		ctx.parts.push( new documentParts.Link( text , href , style , title ) ) ;
 	}
-	else if ( params.style || params.title ) {
-		params.type = 'styledText' ;
-		ctx.parts.push( params ) ;
+	else if ( style || title ) {
+		ctx.parts.push( new documentParts.StyledText( text , style , title ) ) ;
 	}
 }
 
@@ -1519,29 +1520,13 @@ function parseImage( str , ctx , blockEnd ) {
 	var data = parseDataMark( str , ctx , IMAGE_DATA_MARK , blockEnd ) ;
 	if ( ! data ) { return ; }
 
-	var params = { type: '' , altText: text } ;
-	if ( data.href?.[ 0 ] ) { params.href = data.href[ 0 ] ; }
+	var href = data.href?.[ 0 ] ;
 
-	if ( params.href ) {
-		params.type = 'image' ;
-		params.altText = text ;
-		if ( data.text?.[ 0 ] ) { params.title = data.text[ 0 ] ; }
-		ctx.parts.push( params ) ;
+	if ( href ) {
+		ctx.parts.push( new documentParts.Image( href , text , data.text?.[ 0 ] ) ) ;
 	}
 	else {
-		params.type = 'pictogram' ;
-		params.code = text ;
-		let emojiChar = emoji.get( text ) ;
-		if ( emojiChar ) { params.emoji = emojiChar ; }
-
-		if ( data.text?.[ 0 ] ) { params.altText = data.text[ 0 ] ; }
-		if ( data.text?.[ 1 ] ) { params.title = data.text[ 1 ] ; }
-
-		if ( emojiChar && ! params.altText ) {
-			params.altText = emoji.getCanonicalName( emojiChar ) ;
-		}
-
-		ctx.parts.push( params ) ;
+		ctx.parts.push( new documentParts.Pictogram( text , data.text?.[ 0 ] , data.text?.[ 1 ] ) ) ;
 	}
 }
 
@@ -1603,7 +1588,7 @@ function postProcessTableRowSpan( table ) {
 	var tableRow , tableCell , masterCell , lastRow , lastContinueRowSpan ;
 
 	// First pass: merge cells
-	for ( tableRow of table.children ) {
+	for ( tableRow of table.parts ) {
 		if ( tableRow.type !== 'tableRow' ) { continue ; }
 
 		if ( lastContinueRowSpan ) {
@@ -1612,7 +1597,7 @@ function postProcessTableRowSpan( table ) {
 				masterCell = searchColumn( lastRow , columnIndex ) ;
 				if ( tableCell && masterCell ) {
 					if ( masterCell.masterCell ) { masterCell = masterCell.masterCell ; }
-					mergeInlineParts( masterCell.children , tableCell.children ) ;
+					mergeInlineParts( masterCell.parts , tableCell.parts ) ;
 					masterCell.rowSpan = ( masterCell.rowSpan || 1 ) + 1 ;
 					tableCell.masterCell = masterCell ;
 				}
@@ -1624,9 +1609,9 @@ function postProcessTableRowSpan( table ) {
 	}
 
 	// Second pass: remove dead cells
-	for ( tableRow of table.children ) {
+	for ( tableRow of table.parts ) {
 		if ( tableRow.type !== 'tableRow' ) { continue ; }
-		inPlaceFilter( tableRow.children , tableCell_ => ! tableCell_.masterCell ) ;
+		inPlaceFilter( tableRow.parts , tableCell_ => ! tableCell_.masterCell ) ;
 	}
 }
 
@@ -1664,7 +1649,7 @@ function mergeInlineParts( parts , extraParts ) {
 		}
 		else {
 			// Add an additional joint part
-			parts.push( { type: 'text' , text: ' ' } ) ;
+			parts.push( new documentParts.Text( ' ' ) ) ;
 		}
 	}
 
@@ -1897,11 +1882,11 @@ function countStreak( str , i , streaker ) {
 
 
 function searchChildOfType( parent , type ) {
-	var children = parent.children ;
-	if ( ! children ) { return null ; }
+	var parts = parent.parts ;
+	if ( ! parts ) { return null ; }
 
-	for ( let i = 0 ; i < children.length ; i ++ ) {
-		let child = children[ i ] ;
+	for ( let i = 0 ; i < parts.length ; i ++ ) {
+		let child = parts[ i ] ;
 		if ( child.type === type ) { return child ; }
 	}
 
@@ -1911,11 +1896,11 @@ function searchChildOfType( parent , type ) {
 
 
 function searchLastChildOfType( parent , type ) {
-	var children = parent.children ;
-	if ( ! children ) { return null ; }
+	var parts = parent.parts ;
+	if ( ! parts ) { return null ; }
 
-	for ( let i = children.length - 1 ; i >= 0 ; i -- ) {
-		let child = children[ i ] ;
+	for ( let i = parts.length - 1 ; i >= 0 ; i -- ) {
+		let child = parts[ i ] ;
 		if ( child.type === type ) { return child ; }
 	}
 
@@ -1925,7 +1910,7 @@ function searchLastChildOfType( parent , type ) {
 
 
 function searchColumn( tableRow , column ) {
-	for ( let tableCell of tableRow.children ) {
+	for ( let tableCell of tableRow.parts ) {
 		if ( tableCell.column === column ) { return tableCell ; }
 	}
 
@@ -1942,7 +1927,7 @@ function stack( ctx , parent = ctx.parts[ ctx.parts.length - 1 ] ) {
 	} ) ;
 
 	ctx.parent = parent ;
-	ctx.parts = parent.children = parent.children || [] ;
+	ctx.parts = parent.parts = parent.parts || [] ;
 }