book-source 0.3.5 → 0.3.7

package/lib/StructuredDocument.js

@@ -1751,9 +1751,24 @@ function mergeInlineParts( parts , extraParts ) {
 	}
 
 	var lastPart = parts[ parts.length - 1 ] ,
-		firstExtraPart = extraParts[ 0 ] ;
+		lastTextPart = lastPart ,
+		firstExtraPart = extraParts[ 0 ] ,
+		firstExtraTextPart = firstExtraPart ;
 
-	var needExtraSpace = ! WHITE_SPACES.has( lastPart.text[ lastPart.text.length - 1 ] ) && ! WHITE_SPACES.has( firstExtraPart.text[ 0 ] ) ;
+	while ( lastTextPart && lastTextPart.parts && lastTextPart.parts.length ) {
+		lastTextPart = lastTextPart.parts[ lastTextPart.parts.length - 1 ] ;
+	}
+
+	while ( firstExtraTextPart && firstExtraTextPart.parts && firstExtraTextPart.parts.length ) {
+		firstExtraTextPart = firstExtraTextPart.parts[ 0 ] ;
+	}
+
+	if ( ! lastTextPart?.text || ! firstExtraTextPart?.text ) {
+		parts.push( ... extraParts ) ;
+		return ;
+	}
+
+	var needExtraSpace = ! WHITE_SPACES.has( lastTextPart.text[ lastTextPart.text.length - 1 ] ) && ! WHITE_SPACES.has( firstExtraTextPart.text[ 0 ] ) ;
 
 	if ( lastPart.type === 'text' && firstExtraPart.type === 'text' ) {
 		// Combine the last existing with the first additional part

package/lib/Style.js

@@ -38,6 +38,7 @@ function Style() {
 	this.bold = null ;
 	this.italic = null ;
 	this.underline = null ;
+	this.fx = null ;
 }
 
 module.exports = Style ;
@@ -69,6 +70,7 @@ Style.merge = function( ... styles ) {
 const BOOLEAN_PROPERTIES = new Set( [ 'bold' , 'italic' , 'underline' ] ) ;
 const TEXT_COLOR_PROPERTIES = new Set( [ 'text' , 'tx' , 'foreground' , 'fg' ] ) ;
 const BACKGROUND_COLOR_PROPERTIES = new Set( [ 'background' , 'bg' ] ) ;
+const FX_PROPERTIES = new Set( [ 'fx' ] ) ;
 
 
 
@@ -79,9 +81,12 @@ Style.parse = function( str , forTextElement = true ) {
 		let [ property , value ] = part.split( ':' ) ;
 
 		if ( value ) {
-			property = TEXT_COLOR_PROPERTIES.has( property ) ? 'text' :
+			property =
+				TEXT_COLOR_PROPERTIES.has( property ) ? 'text' :
 				BACKGROUND_COLOR_PROPERTIES.has( property ) ? 'background' :
-				forTextElement ? 'text' : 'background' ;
+				FX_PROPERTIES.has( property ) ? 'fx' :
+				forTextElement ? 'text' :
+				'background' ;
 		}
 		else {
 			if ( BOOLEAN_PROPERTIES.has( property ) ) {
@@ -100,6 +105,9 @@ Style.parse = function( str , forTextElement = true ) {
 			case 'background' :
 				style.backgroundColor = Color.parse( value ) ;
 				break ;
+			case 'fx' :
+				style.fx = value ;
+				break ;
 		}
 	}
 

package/lib/Theme.js

@@ -76,7 +76,7 @@ function Theme( params = {} ) {
 	} ;
 
 	this.printSizes = {
-		text: '9pt' ,
+		text: '12pt' ,
 		lineHeight: '1.5' ,
 		codeLineHeight: '1.4'
 	} ;

package/lib/textPostFilters.js

@@ -52,7 +52,7 @@ const FRENCH_TYPO_PUNCTUATION_REGEX_ALT_START =
 
 
 
-exports['french-typo'] = exports.frenchTypo = ( part , lastPart ) => {
+exports['french-typo'] = ( part , lastPart ) => {
 	var useRegexAltStart = false ;
 
 	if ( lastPart ) {

package/package.json

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