book-source 0.3.8 → 0.3.10

package/brainstorming

@@ -40,7 +40,9 @@
    (where style can be a color like red, green, black, or other style like bold, italic, oblique, separated by comma ",")
    (generate a <span>)
 
-✅ Title/Hint tooltip: [text][title text]
+✅ Hint (title-style tooltip): [text][title text]
+✅ Infotip (hover block-display tooltip): ?[text][some block of text]
+✅ Infotip href-variant: ?[text](href)
 
 ✅ Link: [link text](href)
 ✅ Link+Title: [link text][title text](href)

package/lib/StructuredDocument.js

@@ -199,23 +199,26 @@ StructuredDocument.prototype.autoTitle = function() {
 
 	if ( ! header ) { return ; }
 
-	str = this.getText( header.parts ) ;
+	str = StructuredDocument.getText( header.parts ) ;
 	if ( str ) { this.title = str ; }
 } ;
 
 
 
-StructuredDocument.prototype.getText = function( parts = this.parts ) {
+StructuredDocument.getText = function( parts ) {
 	var str = '' ;
 
 	for ( let part of parts ) {
 		if ( part.text ) { str += part.text ; }
-		else if ( part.parts?.length ) { str += this.getText( part.parts ) ; }
+		else if ( part.parts?.length ) { str += StructuredDocument.getText( part.parts ) ; }
 	}
 
 	return str ;
 } ;
 
+// Backqard compatibility/API
+StructuredDocument.prototype.getText = function( parts = this.parts ) { return StructuredDocument.getText( parts ) ; } ;
+
 
 
 StructuredDocument.prototype.textPostFilter = function( postFilterList , parts = this.parts ) {
@@ -1382,7 +1385,7 @@ function parseInline( str , ctx , blockEnd , trim = false ) {
 
 function parseNestedInline( str , ctx , scanEnd , topLevel = false ) {
 	var isSpace ,
-		lastWasSpace = WHITE_SPACES.has( str[ ctx.i - 1 ] ) ;
+		lastWasSpaceOrBegining = ! ctx.i || WHITE_SPACES.has( str[ ctx.i - 1 ] ) ;
 
 	//console.log( "parseInline() -- remaining:" , ctx.i , str.slice( ctx.i ) ) ;
 
@@ -1393,7 +1396,7 @@ function parseNestedInline( str , ctx , scanEnd , topLevel = false ) {
 	for ( ; ctx.i < scanEnd ; ctx.i ++ ) {
 		let char = str[ ctx.i ] ;
 
-		//if ( lastWasSpace ) {}
+		//if ( lastWasSpaceOrBegining ) {}
 		//console.error( "Checking: " , string.inspect( char ) ) ;
 
 		isSpace = WHITE_SPACES.has( char ) ;
@@ -1422,12 +1425,16 @@ function parseNestedInline( str , ctx , scanEnd , topLevel = false ) {
 			addInlineTextChunk( str , ctx ) ;
 			parseStyledText( str , ctx , scanEnd ) ;
 		}
-		else if ( char === '!' && str[ ctx.i + 1 ] === '[' && lastWasSpace ) {
+		else if ( char === '?' && str[ ctx.i + 1 ] === '[' && lastWasSpaceOrBegining ) {
+			addInlineTextChunk( str , ctx ) ;
+			parseInfotipedText( str , ctx , scanEnd ) ;
+		}
+		else if ( char === '!' && str[ ctx.i + 1 ] === '[' && lastWasSpaceOrBegining ) {
 			addInlineTextChunk( str , ctx ) ;
 			parseImage( str , ctx , scanEnd ) ;
 		}
 
-		lastWasSpace = isSpace ;
+		lastWasSpaceOrBegining = isSpace ;
 	}
 
 	addInlineTextChunk( str , ctx ) ;
@@ -1581,8 +1588,6 @@ function parseStyledText( str , ctx , scanEnd ) {
 	var end = searchCloser( str , ctx.i + 1 , '[' , ']' , false , scanEnd ) ;
 	if ( end < 0 ) { return ; }
 
-	//var text = str.slice( ctx.i + 1 , end ) ;
-
 	var start = ctx.i + 1 ;
 	ctx.i = end ;
 	var data = parseDataMark( str , ctx , STYLE_DATA_MARK , scanEnd ) ;
@@ -1613,6 +1618,41 @@ function parseStyledText( str , ctx , scanEnd ) {
 
 
 
+const INFOTIP_DATA_MARK = {
+	text: true , href: true , style: true , extra: false
+} ;
+
+function parseInfotipedText( str , ctx , scanEnd ) {
+	//console.error( "parseStyledText()" ) ;
+	var end = searchCloser( str , ctx.i + 2 , '[' , ']' , false , scanEnd ) ;
+	if ( end < 0 ) { return ; }
+
+	var start = ctx.i + 2 ;
+	ctx.i = end ;
+	var data = parseDataMark( str , ctx , INFOTIP_DATA_MARK , scanEnd ) ;
+
+	var fullMarkupEnd = ctx.i ;
+
+	var href = data?.href?.[ 0 ] ,
+		style = data?.style?.[ 0 ] ,
+		hint = data?.text?.[ 0 ] ;
+
+	var infotipedText = new documentParts.InfotipedText( hint , href , style ) ;
+	ctx.parts.push( infotipedText ) ;
+
+	ctx.i = start ;
+	parseNestedInline( str , ctx , end ) ;
+
+	ctx.i = fullMarkupEnd ;
+	ctx.iStartOfInlineChunk = ctx.i + 1 ;
+
+	if ( ! href && ! hint ) {
+		infotipedText.href = StructuredDocument.getText( infotipedText.parts ) ;
+	}
+}
+
+
+
 const IMAGE_DATA_MARK = {
 	text: true , href: true , style: false , extra: false
 } ;

package/lib/documentParts.js

@@ -148,6 +148,21 @@ documentParts.Link = Link ;
 
 
 
+// Tooltip/Infotip/Hint displayed when hovering
+function InfotipedText( hint , href , style ) {
+	this.type = 'infotipedText' ;
+	this.hint = hint || undefined ;
+	this.href = href || undefined ;
+	this.style = style || undefined ;
+	InlineContainerPart.call( this ) ;
+}
+
+InfotipedText.prototype = Object.create( InlineContainerPart.prototype ) ;
+InfotipedText.prototype.constructor = InfotipedText ;
+documentParts.InfotipedText = InfotipedText ;
+
+
+
 function StyledText( style , hint ) {
 	this.type = 'styledText' ;
 	this.style = style || undefined ;

package/package.json

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