bare-script 4.1.4__tar.gz → 4.1.8__tar.gz

{bare_script-4.1.4/src/bare_script.egg-info → bare_script-4.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 4.1.4
+Version: 4.1.8
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs

{bare_script-4.1.4 → bare_script-4.1.8}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = bare-script
-version = 4.1.4
+version = 4.1.8
 url = https://github.com/craigahobbs/bare-script
 author = Craig A. Hobbs
 author_email = craigahobbs@gmail.com

{bare_script-4.1.4 → bare_script-4.1.8}/src/bare_script/include/markdownElements.bare

@@ -72,28 +72,30 @@ endfunction
 
 # Helper function to generate an element model from a markdown part
 function markdownElementsPartElements(part, options, usedHeaderIds):
-    partKey = arrayGet(objectKeys(part), 0)
-
     # List?
-    if partKey == 'list':
-        items = objectGet(objectGet(part, 'list'), 'items')
+    list = objectGet(part, 'list')
+    if list:
         listItemElements = []
-        for item in items:
+        for item in objectGet(list, 'items'):
             itemElements = markdownElementsPartsElements(objectGet(item, 'parts'), options, usedHeaderIds)
             arrayPush(listItemElements, {'html': 'li', 'elem': itemElements})
         endfor
         return markdownElementsListPartElements(part, listItemElements)
+    endif
 
     # Block quote?
-    elif partKey == 'quote':
+    quote = objectGet(part, 'quote')
+    if quote:
         return { \
             'html': 'blockquote', \
-            'elem': markdownElementsPartsElements(objectGet(objectGet(part, 'quote'), 'parts'), options, usedHeaderIds) \
+            'elem': markdownElementsPartsElements(objectGet(quote, 'parts'), options, usedHeaderIds) \
         }
+    endif
 
     # Code block?
-    elif partKey == 'codeBlock':
-        return markdownHighlightCodeBlockElements(objectGet(part, 'codeBlock'), options)
+    codeBlock = objectGet(part, 'codeBlock')
+    if codeBlock:
+        return markdownHighlightCodeBlockElements(codeBlock, options)
     endif
 
     return markdownElementsPartElementsBase(part, options, usedHeaderIds)
@@ -124,28 +126,30 @@ endfunction
 
 # Helper function to generate an element model from a markdown part
 async function markdownElementsPartElementsAsync(part, options, usedHeaderIds):
-    partKey = arrayGet(objectKeys(part), 0)
-
     # List?
-    if partKey == 'list':
-        items = objectGet(objectGet(part, 'list'), 'items')
+    list = objectGet(part, 'list')
+    if list:
         listItemElements = []
-        for item in items:
+        for item in objectGet(list, 'items'):
             itemElements = markdownElementsPartsElementsAsync(objectGet(item, 'parts'), options, usedHeaderIds)
             arrayPush(listItemElements, {'html': 'li', 'elem': itemElements})
         endfor
         return markdownElementsListPartElements(part, listItemElements)
+    endif
 
     # Block quote?
-    elif partKey == 'quote':
+    quote = objectGet(part, 'quote')
+    if quote:
         return { \
             'html': 'blockquote', \
-            'elem': markdownElementsPartsElementsAsync(objectGet(objectGet(part, 'quote'), 'parts'), options, usedHeaderIds) \
+            'elem': markdownElementsPartsElementsAsync(objectGet(quote, 'parts'), options, usedHeaderIds) \
         }
+    endif
 
     # Code block?
-    elif partKey == 'codeBlock':
-        return markdownHighlightCodeBlockElementsAsync(objectGet(part, 'codeBlock'), options)
+    codeBlock = objectGet(part, 'codeBlock')
+    if codeBlock:
+        return markdownHighlightCodeBlockElementsAsync(codeBlock, options)
     endif
 
     return markdownElementsPartElementsBase(part, options, usedHeaderIds)
@@ -165,12 +169,11 @@ endfunction
 
 # Helper function to generate an element model from a non-list/quote/codeBlock part
 function markdownElementsPartElementsBase(part, options, usedHeaderIds):
-    partKey = arrayGet(objectKeys(part), 0)
-
     # Paragraph?
-    if partKey == 'paragraph':
-        paragraph = objectGet(part, 'paragraph')
-        if objectHas(paragraph, 'style'):
+    paragraph = objectGet(part, 'paragraph')
+    if paragraph:
+        paragraphStyle = objectGet(paragraph, 'style')
+        if paragraphStyle:
             # Determine the header ID, if requested
             headerId = null
             if options && objectGet(options, 'headerIds'):
@@ -199,7 +202,7 @@ function markdownElementsPartElementsBase(part, options, usedHeaderIds):
             endif
 
             return { \
-                'html': objectGet(paragraph, 'style'), \
+                'html': paragraphStyle, \
                 'attr': if(headerId != null, {'id': headerId}, null), \
                 'elem': markdownElementsParagraphSpanElements(objectGet(paragraph, 'spans'), options) \
             }
@@ -209,10 +212,11 @@ function markdownElementsPartElementsBase(part, options, usedHeaderIds):
             'html': 'p', \
             'elem': markdownElementsParagraphSpanElements(objectGet(paragraph, 'spans'), options) \
         }
+    endif
 
     # Table?
-    elif partKey == 'table':
-        table = objectGet(part, 'table')
+    table = objectGet(part, 'table')
+    if table:
         aligns = objectGet(table, 'aligns')
         alignsLength = arrayLength(aligns)
 
@@ -269,76 +273,80 @@ endfunction
 
 # Helper function to generate element models from markdown span models
 function markdownElementsParagraphSpanElements(spans, options):
+    urlFn = if(options, objectGet(options, 'urlFn'))
     spanElements = []
     for span in spans:
-        spanKey = arrayGet(objectKeys(span), 0)
-
         # Text span?
-        if spanKey == 'text':
-            arrayPush(spanElements, {'text': objectGet(span, 'text')})
-
-        # Line break?
-        elif spanKey == 'br':
-            arrayPush(spanElements, {'html': 'br'})
+        text = objectGet(span, 'text')
+        if text:
+            arrayPush(spanElements, {'text': text})
+            continue
+        endif
 
         # Style span?
-        elif spanKey == 'style':
-            style = objectGet(span, 'style')
+        style = objectGet(span, 'style')
+        if style:
             styleStyle = objectGet(style, 'style')
             arrayPush(spanElements, { \
                 'html': if(styleStyle == 'bold', 'strong', if(styleStyle == 'italic', 'em', 'del')), \
                 'elem': markdownElementsParagraphSpanElements(objectGet(style, 'spans'), options) \
             })
+            continue
+        endif
 
         # Link span?
-        elif spanKey == 'link':
-            link = objectGet(span, 'link')
+        link = objectGet(span, 'link')
+        if link:
             href = objectGet(link, 'href')
-
-            # URL fixup?
-            urlFn = if(options, objectGet(options, 'urlFn'))
             if urlFn:
                 href = urlFn(href)
             endif
-
             linkAttr = {'href': href}
-            if objectHas(link, 'title'):
-                objectSet(linkAttr, 'title', objectGet(link, 'title'))
+            linkTitle = objectGet(link, 'title')
+            if linkTitle != null:
+                objectSet(linkAttr, 'title', linkTitle)
             endif
             arrayPush(spanElements, { \
                 'html': 'a', \
                 'attr': linkAttr, \
                 'elem': markdownElementsParagraphSpanElements(objectGet(link, 'spans'), options) \
             })
+            continue
+        endif
+
+        # Link reference span?
+        linkRef = objectGet(span, 'linkRef')
+        if linkRef:
+            arrayExtend(spanElements, markdownElementsParagraphSpanElements(objectGet(linkRef, 'spans'), options))
+            continue
+        endif
+
+        # Code span?
+        code = objectGet(span, 'code')
+        if code:
+            arrayPush(spanElements, {'html': 'code', 'elem': {'text': code}})
+            continue
+        endif
 
         # Image span?
-        elif spanKey == 'image':
-            image = objectGet(span, 'image')
+        image = objectGet(span, 'image')
+        if image:
             src = objectGet(image, 'src')
-
-            # URL fixup?
-            urlFn = if(options, objectGet(options, 'urlFn'))
             if urlFn:
                 src = urlFn(src)
             endif
-
             imageAttr = {'src': src, 'alt': objectGet(image, 'alt'), 'style': 'max-width: 100%;'}
-            if objectHas(image, 'title'):
-                objectSet(imageAttr, 'title', objectGet(image, 'title'))
+            imageTitle = objectGet(image, 'title')
+            if imageTitle != null:
+                objectSet(imageAttr, 'title', imageTitle)
             endif
-            arrayPush(spanElements, { \
-                'html': 'img', \
-                'attr': imageAttr \
-            })
-
-        # Link reference span?
-        elif spanKey == 'linkRef':
-            linkRef = objectGet(span, 'linkRef')
-            arrayExtend(spanElements, markdownElementsParagraphSpanElements(objectGet(linkRef, 'spans'), options))
+            arrayPush(spanElements, {'html': 'img', 'attr': imageAttr})
+            continue
+        endif
 
-        # Code span?
-        elif spanKey == 'code':
-            arrayPush(spanElements, {'html': 'code', 'elem': {'text': objectGet(span, 'code')}})
+        # Line break?
+        if objectGet(span, 'br'):
+            arrayPush(spanElements, {'html': 'br'})
         endif
     endfor
 

{bare_script-4.1.4 → bare_script-4.1.8}/src/bare_script/include/markdownHighlight.bare

@@ -117,13 +117,11 @@ endfunction
 function markdownHighlightCompileHighlightModels(highlights):
     highlightMap = {}
     for highlight in highlights:
-        highlightRegex = {}
-        parts = []
-
         # Validate the highlight model (for potential debug logging)
         schemaValidate(markdownHighlightTypes, 'MarkdownHighlight', highlight)
 
-        # Create regex-based regex for each member
+        # Build a named-group aggregate so a single match identifies the member type via its groups dict
+        namedParts = []
         for memberName in markdownHighlightMemberNames:
             memberPatterns = objectGet(highlight, memberName)
             if memberPatterns:
@@ -131,32 +129,18 @@ function markdownHighlightCompileHighlightModels(highlights):
                 for memberPattern in memberPatterns:
                     arrayPush(partStrs, '(?:' + memberPattern + ')')
                 endfor
-                part = arrayJoin(partStrs, '|')
-                memberRegex = regexNew('^(?:' + part + ')')
-                if memberRegex:
-                    objectSet(highlightRegex, memberName, memberRegex)
-                    arrayPush(parts, part)
-                endif
+                arrayPush(namedParts, '(?<' + memberName + '>' + arrayJoin(partStrs, '|') + ')')
             endif
         endfor
 
-        # Add the special aggregate-highlight-matching regexp
-        if parts:
-            aggregateParts = []
-            for part in parts:
-                arrayPush(aggregateParts, '(?:' + part + ')')
+        # Compile and register the language's render function
+        if namedParts:
+            highlightRegex = regexNew(arrayJoin(namedParts, '|'), 'm')
+            highlightFn = systemPartial(markdownHighlightRenderFn, highlightRegex)
+            for name in objectGet(highlight, 'names'):
+                objectSet(highlightMap, name, highlightFn)
             endfor
-            highlightRegexAggregate = regexNew(arrayJoin(aggregateParts, '|'), 'm')
-            if highlightRegexAggregate:
-                objectSet(highlightRegex, 'highlight', highlightRegexAggregate)
-            endif
         endif
-
-        # Add the name/alias to code block render function
-        highlightFn = systemPartial(markdownHighlightRenderFn, highlightRegex)
-        for name in objectGet(highlight, 'names'):
-            objectSet(highlightMap, name, highlightFn)
-        endfor
     endfor
 
     return highlightMap
@@ -179,13 +163,9 @@ endfunction
 # $ignore: true
 function markdownHighlightElements(highlightRegex, lines, options):
     # Join the text lines
-    textParts = []
-    for line in lines:
-        arrayPush(textParts, if(stringEndsWith(line, '\n'), line, line + '\n'))
-    endfor
-    text = arrayJoin(textParts, '')
+    text = arrayJoin(lines, '\n') + '\n'
 
-    # The copy link elements
+    # The copy button element
     preAttr = null
     copyElements = null
     if options && objectGet(options, 'copyLinks'):
@@ -193,78 +173,89 @@ function markdownHighlightElements(highlightRegex, lines, options):
         copyLinksIndex = objectGet(options, 'copyLinksIndex', 1)
         objectSet(options, 'copyLinksIndex', copyLinksIndex + 1)
 
-        # Generate the code block ID and elements
+        # Generate the code block ID and copy button element
         preID = '__markdown_copy_' + copyLinksIndex
-        preAttr = {'id': preID, 'style': 'margin-top: 0.25em'}
+        preAttr = {'id': preID, 'style': 'grid-area: 1 / 1; margin-top: 0; padding-right: 2.5em;'}
         copyElements = { \
-            'html': 'p', \
+            'svg': 'svg', \
             'attr': { \
-                'style': 'cursor: pointer; font-size: 0.85em; text-align: right; user-select: none;' \
+                'width': '20', \
+                'height': '20', \
+                'viewBox': '0 0 24 24', \
+                'style': 'grid-area: 1 / 1; justify-self: end; align-self: start; margin: 0.4em; cursor: pointer; user-select: none;', \
+                'onclick': "window.navigator.clipboard.writeText(document.getElementById('" + preID + "').innerText);" \
             }, \
             'elem': { \
-                'html': 'a', \
+                'svg': 'path', \
                 'attr': { \
-                    'onclick': "window.navigator.clipboard.writeText(document.getElementById('" + preID + "').innerText);" \
-                }, \
-                'elem': {'text': 'Copy'} \
+                    'fill': 'var(--barescript-color-border)', \
+                    'd': 'M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z' \
+                } \
             } \
         }
     endif
 
-    # No language specified or unknown language?
+    # Determine the code element children
     if !highlightRegex:
-        return [ \
-            copyElements, \
-            {'html': 'pre', 'attr': preAttr, 'elem': {'html': 'code', 'elem': {'text': text}}} \
-        ]
-    endif
-
-    # Match the highlight spans
-    spans = []
-    rHighlight = objectGet(highlightRegex, 'highlight')
-    while true:
-        mHighlight = regexMatch(rHighlight, text)
-        if !mHighlight:
-            break
-        endif
-        highlightText = objectGet(objectGet(mHighlight, 'groups'), '0')
-        highlightIndex = objectGet(mHighlight, 'index')
-
-        # Add the pre-text span
-        if highlightIndex > 0:
-            arrayPush(spans, {'text': stringSlice(text, 0, highlightIndex)})
-        endif
+        # No language specified or unknown language
+        codeChildren = {'text': text}
+    else:
+        # Match the highlight spans
+        codeChildren = []
+        ixSearch = 0
+        for mHighlight in regexMatchAll(highlightRegex, text):
+            matchGroups = objectGet(mHighlight, 'groups')
+            highlightText = objectGet(matchGroups, '0')
+            highlightIndex = objectGet(mHighlight, 'index')
+
+            # Add the pre-text span
+            if ixSearch < highlightIndex:
+                arrayPush(codeChildren, {'text': stringSlice(text, ixSearch, highlightIndex)})
+            endif
 
-        # Determine the highlight color
-        for memberName in markdownHighlightMemberNames:
-            memberRegex = objectGet(highlightRegex, memberName)
-            if memberRegex && regexMatch(memberRegex, highlightText):
-                color = 'var(--barescript-color-highlight-' + memberName + ')'
-                break
+            # Determine the highlight style from which named group matched
+            if objectGet(matchGroups, 'builtin'):
+                attrStyle = 'color: var(--barescript-color-highlight-builtin);'
+            elif objectGet(matchGroups, 'comment'):
+                attrStyle = 'color: var(--barescript-color-highlight-comment);'
+            elif objectGet(matchGroups, 'keyword'):
+                attrStyle = 'color: var(--barescript-color-highlight-keyword);'
+            elif objectGet(matchGroups, 'literal'):
+                attrStyle = 'color: var(--barescript-color-highlight-literal);'
+            elif objectGet(matchGroups, 'preprocessor'):
+                attrStyle = 'color: var(--barescript-color-highlight-preprocessor);'
+            elif objectGet(matchGroups, 'string'):
+                attrStyle = 'color: var(--barescript-color-highlight-string);'
+            elif objectGet(matchGroups, 'tag'):
+                attrStyle = 'color: var(--barescript-color-highlight-tag);'
             endif
-        endfor
 
-        # Add the highlight span
-        arrayPush(spans, { \
-            'html': 'span', \
-            'attr': {'style': 'color: ' + color + ';'}, \
-            'elem': {'text': highlightText} \
-        })
+            # Add the highlight span
+            arrayPush(codeChildren, { \
+                'html': 'span', \
+                'attr': {'style': attrStyle}, \
+                'elem': {'text': highlightText} \
+            })
 
-        # Advance past the highlight match
-        text = stringSlice(text, highlightIndex + stringLength(highlightText))
-    endwhile
+            ixSearch = highlightIndex + stringLength(highlightText)
+        endfor
 
-    # Add the final un-matched text
-    if text:
-        arrayPush(spans, {'text': text})
+        # Add the final un-matched text
+        if ixSearch < stringLength(text):
+            arrayPush(codeChildren, {'text': stringSlice(text, ixSearch)})
+        endif
     endif
 
-    # Create the code block elements
-    return [ \
-        copyElements, \
-        {'html': 'pre', 'attr': preAttr, 'elem': {'html': 'code', 'elem': spans}} \
-    ]
+    # Create the code block element, wrapping with the copy button when present
+    preElement = {'html': 'pre', 'attr': preAttr, 'elem': {'html': 'code', 'elem': codeChildren}}
+    if !copyElements:
+        return preElement
+    endif
+    return { \
+        'html': 'div', \
+        'attr': {'style': 'display: grid; margin-top: 1em;'}, \
+        'elem': [preElement, copyElements] \
+    }
 endfunction
 
 

{bare_script-4.1.4 → bare_script-4.1.8}/src/bare_script/include/markdownParser.bare

@@ -522,17 +522,95 @@ function markdownParserParagraphSpans(text, linkRefs):
         if ixSearch < matchIndex:
             arrayPush(spans, {'text': markdownParserRemoveEscapes(stringSlice(text, ixSearch, matchIndex), false)})
         endif
+        ixSearch = matchIndex + stringLength(matchFullText)
 
-        # Line break?
-        if objectGet(matchGroups, 'br') != null:
-            arrayPush(spans, {'br': 1})
+        # Bold style? (bold or boldu)
+        boldStr = objectGet(matchGroups, 'bold') || objectGet(matchGroups, 'boldu')
+        if boldStr:
+            boldText = stringSlice(boldStr, 2, stringLength(boldStr) - 2)
+            arrayPush(spans, {'style': {'style': 'bold', 'spans': markdownParserParagraphSpans(boldText, linkRefs)}})
+            continue
+        endif
+
+        # Italic style? (italic or italicu)
+        italicStr = objectGet(matchGroups, 'italic') || objectGet(matchGroups, 'italicu')
+        if italicStr:
+            italicText = stringSlice(italicStr, 1, stringLength(italicStr) - 1)
+            arrayPush(spans, {'style': {'style': 'italic', 'spans': markdownParserParagraphSpans(italicText, linkRefs)}})
+            continue
+        endif
+
+        # Code?
+        code = objectGet(matchGroups, 'code')
+        if code:
+            codeT = objectGet(matchGroups, 'codeT')
+            codeTLen = stringLength(codeT)
+            codeText = stringSlice(code, codeTLen, stringLength(code) - codeTLen)
+            codeScrubbed = regexReplace(markdownParserRegexCodeNewlines, codeText, ' ')
+            codeMatch = regexMatch(markdownParserRegexCodeSpaces, codeScrubbed)
+            if codeMatch:
+                codeScrubbed = objectGet(objectGet(codeMatch, 'groups'), '1')
+            endif
+            arrayPush(spans, {'code': codeScrubbed})
+            continue
+        endif
 
-        # <br> HTML line break?
-        elif objectGet(matchGroups, 'brHtml') != null:
+        # Link or image?
+        link = objectGet(matchGroups, 'link')
+        if link:
+            linkResult = markdownParserGetLinkText(matchGroups, 'link')
+            linkText = arrayGet(linkResult, 0)
+            linkHref = arrayGet(linkResult, 1)
+            linkTitle = arrayGet(linkResult, 2)
+            if stringStartsWith(link, '!'):
+                arrayPush(spans, markdownParserCreateImageSpan(linkHref, linkText, linkTitle))
+            else:
+                arrayPush(spans, markdownParserCreateLinkSpan(linkHref, linkText, linkTitle, linkRefs))
+            endif
+            continue
+        endif
+
+        # Link reference?
+        linkRef = objectGet(matchGroups, 'linkRef')
+        if linkRef:
+            linkRefText = objectGet(matchGroups, 'linkRefText')
+            linkRefOtherText = objectGet(matchGroups, 'linkRefOtherText')
+            if stringStartsWith(linkRef, '!'):
+                arrayPush(spans, markdownParserCreateImageRefSpan(linkRefText, linkRefOtherText, matchFullText, linkRefs, false))
+            else:
+                arrayPush(spans, markdownParserCreateLinkRefSpan(linkRefText, linkRefOtherText, matchFullText, linkRefs, false))
+            endif
+            continue
+        endif
+
+        # Strikethrough style?
+        strike = objectGet(matchGroups, 'strike')
+        if strike:
+            strikeT = objectGet(matchGroups, 'strikeT')
+            strikeTLen = stringLength(strikeT)
+            strikeText = stringSlice(strike, strikeTLen, stringLength(strike) - strikeTLen)
+            arrayPush(spans, {'style': {'style': 'strikethrough', 'spans': markdownParserParagraphSpans(strikeText, linkRefs)}})
+            continue
+        endif
+
+        # Link (alternate syntax)?
+        linkAlt = objectGet(matchGroups, 'linkAlt')
+        if linkAlt:
+            linkAltScheme = objectGet(matchGroups, 'linkAltScheme')
+            linkAltHref = stringSlice(linkAlt, 1, stringLength(linkAlt) - 1)
+            linkHref = if(stringEndsWith(linkAltScheme, '@'), 'mailto:' + linkAltHref, linkAltHref)
+            arrayPush(spans, {'link': {'href': linkHref, 'spans': [{'text': linkHref}]}})
+            continue
+        endif
+
+        # Line break? (br or brHtml)
+        if objectGet(matchGroups, 'br') || objectGet(matchGroups, 'brHtml'):
             arrayPush(spans, {'br': 1})
+            continue
+        endif
 
         # Link with inline image?
-        elif objectGet(matchGroups, 'linkImg') != null:
+        if objectGet(matchGroups, 'linkImg'):
             linkImgResult = markdownParserGetLinkText(matchGroups, 'linkImg')
             linkImgText = arrayGet(linkImgResult, 0)
             linkImgHref = arrayGet(linkImgResult, 1)
@@ -542,9 +620,11 @@ function markdownParserParagraphSpans(text, linkRefs):
             linkImgLinkTitle = arrayGet(linkImgLinkResult, 2)
             imgSpan = markdownParserCreateImageSpan(linkImgHref, linkImgText, linkImgTitle)
             arrayPush(spans, markdownParserCreateLinkSpan(linkImgLinkHref, [imgSpan], linkImgLinkTitle))
+            continue
+        endif
 
         # Link with inline image reference
-        elif objectGet(matchGroups, 'linkImgRef') != null:
+        if objectGet(matchGroups, 'linkImgRef'):
             linkImgRefText = objectGet(matchGroups, 'linkImgRefText')
             linkImgRefImgText = objectGet(matchGroups, 'linkImgRefImgText')
             linkImgRefFull = objectGet(matchGroups, 'linkImgRefFull')
@@ -553,9 +633,11 @@ function markdownParserParagraphSpans(text, linkRefs):
             linkImgRefLinkTitle = arrayGet(linkImgRefLinkResult, 2)
             imgSpan = markdownParserCreateImageRefSpan(linkImgRefText, linkImgRefImgText, linkImgRefFull, linkRefs, true)
             arrayPush(spans, markdownParserCreateLinkSpan(linkImgRefLinkHref, [imgSpan], linkImgRefLinkTitle))
+            continue
+        endif
 
         # Link reference with inline image
-        elif objectGet(matchGroups, 'linkRefImg') != null:
+        if objectGet(matchGroups, 'linkRefImg'):
             linkRefImgResult = markdownParserGetLinkText(matchGroups, 'linkRefImg')
             linkRefImgText = arrayGet(linkRefImgResult, 0)
             linkRefImgHref = arrayGet(linkRefImgResult, 1)
@@ -563,81 +645,18 @@ function markdownParserParagraphSpans(text, linkRefs):
             linkRefImgLinkText = objectGet(matchGroups, 'linkRefImgLinkText')
             imgSpan = markdownParserCreateImageSpan(linkRefImgHref, linkRefImgText, linkRefImgTitle)
             arrayPush(spans, markdownParserCreateLinkRefSpan(linkRefImgLinkText, [imgSpan], matchFullText, linkRefs, true))
+            continue
+        endif
 
         # Link reference with inline image reference
-        elif objectGet(matchGroups, 'linkRefImgRef') != null:
+        if objectGet(matchGroups, 'linkRefImgRef'):
             linkRefImgRefText = objectGet(matchGroups, 'linkRefImgRefText')
             linkRefImgRefImgText = objectGet(matchGroups, 'linkRefImgRefImgText')
             linkRefImgRefFull = objectGet(matchGroups, 'linkRefImgRefFull')
             linkRefImgRefLinkText = objectGet(matchGroups, 'linkRefImgRefLinkText')
             imgSpan = markdownParserCreateImageRefSpan(linkRefImgRefText, linkRefImgRefImgText, linkRefImgRefFull, linkRefs, true)
             arrayPush(spans, markdownParserCreateLinkRefSpan(linkRefImgRefLinkText, [imgSpan], matchFullText, linkRefs, true))
-
-        # Link or image?
-        elif objectGet(matchGroups, 'link') != null:
-            linkResult = markdownParserGetLinkText(matchGroups, 'link')
-            linkText = arrayGet(linkResult, 0)
-            linkHref = arrayGet(linkResult, 1)
-            linkTitle = arrayGet(linkResult, 2)
-            if stringStartsWith(objectGet(matchGroups, 'link'), '!'):
-                arrayPush(spans, markdownParserCreateImageSpan(linkHref, linkText, linkTitle))
-            else:
-                arrayPush(spans, markdownParserCreateLinkSpan(linkHref, linkText, linkTitle, linkRefs))
-            endif
-
-        # Link reference?
-        elif objectGet(matchGroups, 'linkRef') != null:
-            linkRefText = objectGet(matchGroups, 'linkRefText')
-            linkRefOtherText = objectGet(matchGroups, 'linkRefOtherText')
-            if stringStartsWith(objectGet(matchGroups, 'linkRef'), '!'):
-                arrayPush(spans, markdownParserCreateImageRefSpan(linkRefText, linkRefOtherText, matchFullText, linkRefs, false))
-            else:
-                arrayPush(spans, markdownParserCreateLinkRefSpan(linkRefText, linkRefOtherText, matchFullText, linkRefs, false))
-            endif
-
-        # Link (alternate syntax)?
-        elif objectGet(matchGroups, 'linkAlt') != null:
-            linkAlt = objectGet(matchGroups, 'linkAlt')
-            linkAltScheme = objectGet(matchGroups, 'linkAltScheme')
-            linkAltHref = stringSlice(linkAlt, 1, stringLength(linkAlt) - 1)
-            linkHref = if(stringEndsWith(linkAltScheme, '@'), 'mailto:' + linkAltHref, linkAltHref)
-            arrayPush(spans, {'link': {'href': linkHref, 'spans': [{'text': linkHref}]}})
-
-        # Bold style?
-        elif objectGet(matchGroups, 'bold') != null || objectGet(matchGroups, 'boldu') != null:
-            bold = if(objectGet(matchGroups, 'bold') != null, objectGet(matchGroups, 'bold'), objectGet(matchGroups, 'boldu'))
-            boldText = stringSlice(bold, 2, stringLength(bold) - 2)
-            arrayPush(spans, {'style': {'style': 'bold', 'spans': markdownParserParagraphSpans(boldText, linkRefs)}})
-
-        # Italic style?
-        elif objectGet(matchGroups, 'italic') != null || objectGet(matchGroups, 'italicu') != null:
-            italic = if(objectGet(matchGroups, 'italic') != null, objectGet(matchGroups, 'italic'), objectGet(matchGroups, 'italicu'))
-            italicText = stringSlice(italic, 1, stringLength(italic) - 1)
-            arrayPush(spans, {'style': {'style': 'italic', 'spans': markdownParserParagraphSpans(italicText, linkRefs)}})
-
-        # Strikethrough style?
-        elif objectGet(matchGroups, 'strike') != null:
-            strike = objectGet(matchGroups, 'strike')
-            strikeT = objectGet(matchGroups, 'strikeT')
-            strikeTLen = stringLength(strikeT)
-            strikeText = stringSlice(strike, strikeTLen, stringLength(strike) - strikeTLen)
-            arrayPush(spans, {'style': {'style': 'strikethrough', 'spans': markdownParserParagraphSpans(strikeText, linkRefs)}})
-
-        # Code?
-        elif objectGet(matchGroups, 'code') != null:
-            code = objectGet(matchGroups, 'code')
-            codeT = objectGet(matchGroups, 'codeT')
-            codeTLen = stringLength(codeT)
-            codeText = stringSlice(code, codeTLen, stringLength(code) - codeTLen)
-            codeScrubbed = regexReplace(markdownParserRegexCodeNewlines, codeText, ' ')
-            codeMatch = regexMatch(markdownParserRegexCodeSpaces, codeScrubbed)
-            if codeMatch:
-                codeScrubbed = objectGet(objectGet(codeMatch, 'groups'), '1')
-            endif
-            arrayPush(spans, {'code': codeScrubbed})
         endif
-
-        ixSearch = matchIndex + stringLength(matchFullText)
     endfor
 
     # Add any remaining text
@@ -736,32 +755,36 @@ endfunction
 # Helper function to remove span text escapes and replace character references
 function markdownParserRemoveEscapes(text, isHref):
     # Remove escapes
-    escapeRegex = if(isHref, markdownParserRegexEscapeHref, markdownParserRegexEscapeText)
-    result = regexReplace(escapeRegex, text, '$1')
-
-    # Replace entity references
-    for entityMatch in regexMatchAll(markdownParserRegexEntityRef, result):
-        entityGroups = objectGet(entityMatch, 'groups')
-        entityName = objectGet(entityGroups, '1')
-        entityChar = objectGet(markdownParserEntityRefs, entityName)
-        if entityChar != null:
-            result = stringReplace(result, objectGet(entityGroups, '0'), entityChar)
-        endif
-    endfor
+    if stringIndexOf(text, '\\') >= 0:
+        escapeRegex = if(isHref, markdownParserRegexEscapeHref, markdownParserRegexEscapeText)
+        result = regexReplace(escapeRegex, text, '$1')
+    else:
+        result = text
+    endif
 
-    # Replace decimal numeric character references
-    for decimalMatch in regexMatchAll(markdownParserRegexDecimalRef, result):
-        decimalGroups = objectGet(decimalMatch, 'groups')
-        decimalValue = numberParseInt(objectGet(decimalGroups, '1'))
-        result = stringReplace(result, objectGet(decimalGroups, '0'), stringFromCharCode(decimalValue))
-    endfor
+    # Replace entity and numeric character references
+    if stringIndexOf(text, '&') >= 0:
+        for entityMatch in regexMatchAll(markdownParserRegexEntityRef, result):
+            entityGroups = objectGet(entityMatch, 'groups')
+            entityName = objectGet(entityGroups, '1')
+            entityChar = objectGet(markdownParserEntityRefs, entityName)
+            if entityChar != null:
+                result = stringReplace(result, objectGet(entityGroups, '0'), entityChar)
+            endif
+        endfor
 
-    # Replace hex numeric character references
-    for hexMatch in regexMatchAll(markdownParserRegexHexRef, result):
-        hexGroups = objectGet(hexMatch, 'groups')
-        hexValue = numberParseInt(objectGet(hexGroups, '1'), 16)
-        result = stringReplace(result, objectGet(hexGroups, '0'), stringFromCharCode(hexValue))
-    endfor
+        for decimalMatch in regexMatchAll(markdownParserRegexDecimalRef, result):
+            decimalGroups = objectGet(decimalMatch, 'groups')
+            decimalValue = numberParseInt(objectGet(decimalGroups, '1'))
+            result = stringReplace(result, objectGet(decimalGroups, '0'), stringFromCharCode(decimalValue))
+        endfor
+
+        for hexMatch in regexMatchAll(markdownParserRegexHexRef, result):
+            hexGroups = objectGet(hexMatch, 'groups')
+            hexValue = numberParseInt(objectGet(hexGroups, '1'), 16)
+            result = stringReplace(result, objectGet(hexGroups, '0'), stringFromCharCode(hexValue))
+        endfor
+    endif
 
     return result
 endfunction

{bare_script-4.1.4 → bare_script-4.1.8/src/bare_script.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bare-script
-Version: 4.1.4
+Version: 4.1.8
 Summary: bare-script
 Home-page: https://github.com/craigahobbs/bare-script
 Author: Craig A. Hobbs