@peaceroad/markdown-it-renderer-fence 0.5.0 → 0.6.0

package/README.md

@@ -114,7 +114,8 @@ Note:
 ### Main Features
 
 - `samp` rendering for `samp`, `shell`, `console` languages.
-- line number wrapping via `start` / `data-pre-start`.
+- line number wrapping via `start` (`line-number-start` long form) / `data-pre-start`.
+- line number skip/reset controls via `line-number-skip` / `line-number-reset`.
 - emphasized lines via `em-lines` / `emphasize-lines`.
 - optional line-end spacer via `lineEndSpanThreshold`.
 - optional pre-wrap support via `wrap` / `pre-wrap`.
@@ -153,6 +154,30 @@ console.log(a)
 </code></pre>
 ```
 
+Advanced line number control:
+
+~~~md
+```txt {start="25" line-number-skip="5" line-number-reset="6:136"}
+line1
+line2
+line3
+line4
+...
+line6
+```
+~~~
+
+```html
+<pre><code class="language-txt" data-pre-start="25" data-pre-line-number-skip="5" data-pre-line-number-reset="6:136" style="counter-set:pre-line-number 25;">
+<span class="pre-line">line1</span>
+<span class="pre-line">line2</span>
+<span class="pre-line">line3</span>
+<span class="pre-line">line4</span>
+<span class="pre-line pre-line-no-number">...</span>
+<span class="pre-line" style="counter-set:pre-line-number 136;">line6</span>
+</code></pre>
+```
+
 Emphasis:
 
 ~~~md
@@ -209,16 +234,38 @@ echo 1
 - `useHighlightPre: true` keeps highlighter-provided `<pre><code>` when present.
 - In that passthrough path, line-splitting features are intentionally disabled:
   - line numbers
+  - `line-number-skip`
+  - `line-number-reset`
   - `em-lines`
   - line-end spacer
   - `comment-mark`
   - `samp` conversion
 
+Official line-number CSS contract:
+
+```css
+.pre-line {
+  counter-increment: pre-line-number;
+}
+
+.pre-line::before {
+  content: counter(pre-line-number);
+}
+
+.pre-line.pre-line-no-number {
+  counter-increment: none;
+}
+
+.pre-line.pre-line-no-number::before {
+  content: "";
+}
+```
+
 ### Markup Options
 
 - `attrsOrder` (default: `['class', 'id', 'data-*', 'style']`): output attribute order (`data-*` wildcard supported).
 - `setHighlight` (default: `true`): call `md.options.highlight` when available.
-- `setLineNumber` (default: `true`): enable line wrapper spans when `start` is valid.
+- `setLineNumber` (default: `true`): enable line wrapper spans when `start` / `line-number-start` is valid.
 - `setEmphasizeLines` (default: `true`): enable `em-lines` / `emphasize-lines`.
 - `lineEndSpanThreshold` (default: `0`): append line-end spacer span when visual width threshold is met.
 - `setLineEndSpan`: alias of `lineEndSpanThreshold`.
@@ -236,6 +283,13 @@ echo 1
 - supports open-ended forms (`3-`, `-2`)
 - reversed ranges are normalized (`5-3` behaves as `3-5`)
 
+Line-number attr syntax note:
+
+- `line-number-start` is the long form of `start`; rendered output still uses `data-pre-start`.
+- `line-number-skip` supports single values (`2`), ranges (`4-6`), and open-ended forms (`3-`).
+- `line-number-reset` uses `line:number` pairs (for example `6:136,14:220`).
+- `line-number-skip` / `line-number-reset` are applied only when source and highlighted logical line counts match; otherwise renderer falls back to plain sequential numbering.
+
 Migration note (`0.5.0`):
 
 - `comment-line` / `data-pre-comment-line` / `pre-comment-line` were removed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peaceroad/markdown-it-renderer-fence",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "In code blocks, the `<samp>` tag is used with the language keywords `samp`, `shell`, and `console`, and provides an option to display line numbers.",
   "main": "index.js",
   "exports": {

package/src/entry/markup-highlight.js

@@ -1,5 +1,6 @@
 import {
   applyLineEndAlias,
+  createCommonFenceOptionDefaults,
   finalizeCommonFenceOption,
   prepareFenceRenderContext,
 } from '../fence/render-shared.js'
@@ -8,27 +9,13 @@ import {
 } from '../fence/render-markup.js'
 
 const mditRendererFenceMarkup = (md, option) => {
-  const opt = {
-    attrsOrder: ['class', 'id', 'data-*', 'style'],
-    setHighlight: true,
-    setLineNumber: true,
-    setEmphasizeLines: true,
-    lineEndSpanThreshold: 0,
-    lineEndSpanClass: 'pre-lineend-spacer',
-    setPreWrapStyle: true,
-    useHighlightPre: false,
-    onFenceDecision: null,
-    onFenceDecisionTiming: false,
-    sampLang: 'shell,console',
-    langPrefix: md.options.langPrefix || 'language-',
-  }
+  const opt = createCommonFenceOptionDefaults(md)
 
   if (option) {
     Object.assign(opt, option)
     applyLineEndAlias(opt, option)
   }
 
-  delete opt.customHighlight
   finalizeCommonFenceOption(opt)
 
   md.renderer.rules.fence = (tokens, idx, options, env, slf) => {

package/src/fence/render-api-renderer.js

@@ -6,9 +6,11 @@ import {
   commentLineClass,
   emitFenceDecision,
   finalizeFenceTimings,
+  getLogicalLineCount,
   getNowMs,
   orderTokenAttrs,
   preWrapStyle,
+  resolveAdvancedLineNumberPlan,
   splitFenceBlockToLines,
 } from './render-shared.js'
 import {
@@ -43,18 +45,23 @@ const buildApiPreAttrs = (preWrapValue, wrapEnabled, opt) => {
   return preAttrs
 }
 
-const renderFenceApiOrPlain = (token, lang, md, opt, slf, env, startNumber, emphasizeLines, wrapEnabled, preWrapValue, commentMarkValue, includePayload, timings) => {
+const renderFenceApiOrPlain = (token, lang, md, opt, slf, env, startNumber, emphasizeLines, lineNumberSkipValue, lineNumberResetValue, wrapEnabled, preWrapValue, commentMarkValue, includePayload, timings) => {
   const isSamp = opt._sampReg.test(lang)
   const tag = isSamp ? 'samp' : 'code'
   let content = md.utils.escapeHtml(token.content)
   const lineStrategy = opt.customHighlight.lineFeatureStrategy
   const needLineNumber = lineStrategy === 'hybrid' && opt.setLineNumber && startNumber >= 0
   const needEndSpan = lineStrategy === 'hybrid' && opt.lineEndSpanThreshold > 0
+  let lineNumberPlan = null
+  if (needLineNumber && (lineNumberSkipValue !== undefined || lineNumberResetValue !== undefined)) {
+    const logicalLineCount = getLogicalLineCount(token.content)
+    lineNumberPlan = resolveAdvancedLineNumberPlan(lineNumberSkipValue, lineNumberResetValue, logicalLineCount, logicalLineCount)
+  }
   if (needLineNumber || needEndSpan) {
     const splitStartedAt = timings ? getNowMs() : 0
     const nlIndex = content.indexOf('\n')
     const br = nlIndex > 0 && content[nlIndex - 1] === '\r' ? '\r\n' : '\n'
-    content = splitFenceBlockToLines(content, [], needLineNumber, false, needEndSpan, opt.lineEndSpanThreshold, opt.lineEndSpanClass, br, undefined, commentLineClass)
+    content = splitFenceBlockToLines(content, [], needLineNumber, false, needEndSpan, opt.lineEndSpanThreshold, opt.lineEndSpanClass, br, undefined, commentLineClass, lineNumberPlan)
     if (timings) addTimingMs(timings, 'lineSplitMs', getNowMs() - splitStartedAt)
   }
 
@@ -93,6 +100,8 @@ const getFenceHtml = (context, md, opt, slf, env) => {
   const fenceStartedAt = context.fenceStartedAt
   const startNumber = context.startNumber
   const emphasizeLines = context.emphasizeLines
+  const lineNumberSkipValue = context.lineNumberSkipValue
+  const lineNumberResetValue = context.lineNumberResetValue
   const wrapEnabled = context.wrapEnabled
   const preWrapValue = context.preWrapValue
   const commentMarkValue = context.commentMarkValue
@@ -103,11 +112,11 @@ const getFenceHtml = (context, md, opt, slf, env) => {
     fallbackUsed: false,
     lineFeatureStrategy: opt.customHighlight.lineFeatureStrategy,
     disabledFeatures: opt.customHighlight.lineFeatureStrategy === 'disable'
-      ? ['setLineNumber', 'lineEndSpanThreshold']
+      ? ['setLineNumber', 'line-number-skip', 'line-number-reset', 'lineEndSpanThreshold']
       : [],
   }
   try {
-    const html = renderFenceApiOrPlain(token, lang, md, opt, slf, env, startNumber, emphasizeLines, wrapEnabled, preWrapValue, commentMarkValue, true, timings)
+    const html = renderFenceApiOrPlain(token, lang, md, opt, slf, env, startNumber, emphasizeLines, lineNumberSkipValue, lineNumberResetValue, wrapEnabled, preWrapValue, commentMarkValue, true, timings)
     if (timingEnabled) apiDecisionBase.timings = finalizeFenceTimings(timings, fenceStartedAt)
     emitFenceDecision(opt, apiDecisionBase)
     return html
@@ -121,7 +130,7 @@ const getFenceHtml = (context, md, opt, slf, env) => {
         reason: 'provider-error',
         lineFeatureStrategy: opt.customHighlight.lineFeatureStrategy,
       }
-      const html = renderFenceApiOrPlain(token, lang, md, opt, slf, env, startNumber, emphasizeLines, wrapEnabled, preWrapValue, commentMarkValue, false, timings)
+      const html = renderFenceApiOrPlain(token, lang, md, opt, slf, env, startNumber, emphasizeLines, lineNumberSkipValue, lineNumberResetValue, wrapEnabled, preWrapValue, commentMarkValue, false, timings)
       if (timingEnabled) fallbackDecision.timings = finalizeFenceTimings(timings, fenceStartedAt)
       emitFenceDecision(opt, fallbackDecision)
       return html

package/src/fence/render-api.js

@@ -3,6 +3,7 @@ import {
 } from '../custom-highlight/payload-utils.js'
 import {
   applyLineEndAlias,
+  createCommonFenceOptionDefaults,
   finalizeCommonFenceOption,
   prepareFenceRenderContext,
 } from './render-shared.js'
@@ -38,18 +39,7 @@ const shouldRuntimeFallback = (reason, opt = {}) => {
 
 const mditRendererFenceCustomHighlight = (md, option) => {
   const opt = {
-    attrsOrder: ['class', 'id', 'data-*', 'style'],
-    setHighlight: true,
-    setLineNumber: true,
-    setEmphasizeLines: true,
-    lineEndSpanThreshold: 0,
-    lineEndSpanClass: 'pre-lineend-spacer',
-    setPreWrapStyle: true,
-    useHighlightPre: false,
-    onFenceDecision: null,
-    onFenceDecisionTiming: false,
-    sampLang: 'shell,console',
-    langPrefix: md.options.langPrefix || 'language-',
+    ...createCommonFenceOptionDefaults(md),
     customHighlight: null,
   }
   if (option) {

package/src/fence/render-markup.js

@@ -13,6 +13,7 @@ import {
   normalizeEmphasisRanges,
   orderTokenAttrs,
   preWrapStyle,
+  resolveAdvancedLineNumberPlan,
   splitFenceBlockToLines,
 } from './render-shared.js'
 import {
@@ -27,6 +28,8 @@ const renderFenceMarkup = (context, md, opt, slf) => {
   const fenceStartedAt = context.fenceStartedAt
   const startNumber = context.startNumber
   const emphasizeLines = context.emphasizeLines
+  const lineNumberSkipValue = context.lineNumberSkipValue
+  const lineNumberResetValue = context.lineNumberResetValue
   const wrapEnabled = context.wrapEnabled
   const preWrapValue = context.preWrapValue
   const commentMarkValue = context.commentMarkValue
@@ -103,16 +106,28 @@ const renderFenceMarkup = (context, md, opt, slf) => {
   const preAttrsText = preAttrs.length ? slf.renderAttrs({ attrs: preAttrs }) : ''
 
   const needLineNumber = opt.setLineNumber && startNumber >= 0
-  const normalizedEmphasis = (opt.setEmphasizeLines && emphasizeLines.length > 0)
-    ? normalizeEmphasisRanges(emphasizeLines, getLogicalLineCount(content))
-    : []
+  let sourceLogicalLineCount = -1
+  let highlightedLogicalLineCount = -1
+  const ensureLogicalLineCounts = () => {
+    if (sourceLogicalLineCount === -1) sourceLogicalLineCount = getLogicalLineCount(sourceContent)
+    if (highlightedLogicalLineCount === -1) highlightedLogicalLineCount = getLogicalLineCount(content)
+  }
+  let normalizedEmphasis = []
+  if (opt.setEmphasizeLines && emphasizeLines.length > 0) {
+    ensureLogicalLineCounts()
+    normalizedEmphasis = normalizeEmphasisRanges(emphasizeLines, highlightedLogicalLineCount)
+  }
+  let lineNumberPlan = null
+  if (needLineNumber && (lineNumberSkipValue !== undefined || lineNumberResetValue !== undefined)) {
+    ensureLogicalLineCounts()
+    lineNumberPlan = resolveAdvancedLineNumberPlan(lineNumberSkipValue, lineNumberResetValue, sourceLogicalLineCount, highlightedLogicalLineCount)
+  }
   const needEmphasis = normalizedEmphasis.length > 0
   const needEndSpan = opt.lineEndSpanThreshold > 0
   const useHighlightPre = opt.useHighlightPre && hasHighlightPre
 
   if (!useHighlightPre && commentMarkValue && sourceContent.indexOf(commentMarkValue) !== -1) {
-    const sourceLogicalLineCount = getLogicalLineCount(sourceContent)
-    const highlightedLogicalLineCount = getLogicalLineCount(content)
+    ensureLogicalLineCounts()
     if (highlightedLogicalLineCount === sourceLogicalLineCount) {
       const rawLines = sourceContent.split('\n')
       for (let i = 0; i < rawLines.length; i++) {
@@ -140,6 +155,7 @@ const renderFenceMarkup = (context, md, opt, slf) => {
       br,
       commentLines,
       commentLineClass,
+      lineNumberPlan,
     )
     if (timingEnabled) addTimingMs(timings, 'lineSplitMs', getNowMs() - splitStartedAt)
   }
@@ -149,7 +165,7 @@ const renderFenceMarkup = (context, md, opt, slf) => {
     renderer: 'markup',
     useHighlightPre,
     hasHighlightPre,
-    disabledFeatures: useHighlightPre ? ['setLineNumber', 'setEmphasizeLines', 'lineEndSpanThreshold', 'comment-mark', 'samp'] : [],
+    disabledFeatures: useHighlightPre ? ['setLineNumber', 'line-number-skip', 'line-number-reset', 'setEmphasizeLines', 'lineEndSpanThreshold', 'comment-mark', 'samp'] : [],
   }
   if (timingEnabled) decision.timings = finalizeFenceTimings(timings, fenceStartedAt)
   emitFenceDecision(opt, decision)

package/src/fence/render-shared.js

@@ -8,6 +8,7 @@ import {
 const infoReg = /^([^{\s]*)(?:\s*\{(.*)\})?$/
 const tagReg = /<\/?([A-Za-z][A-Za-z0-9-]*)(?:\s+[^>]*?)?\/?\s*>/g
 const preLineTag = '<span class="pre-line">'
+const preLineNoNumberClass = 'pre-line-no-number'
 const emphOpenTag = '<span class="pre-lines-emphasis">'
 const commentLineClass = 'pre-line-comment'
 const closeTag = '</span>'
@@ -15,6 +16,7 @@ const closeTagLen = closeTag.length
 const preWrapStyle = 'white-space: pre-wrap; overflow-wrap: anywhere;'
 const voidTags = new Set(['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'])
 const nonNegativeIntReg = /^\d+$/
+const positiveIntReg = /^[1-9]\d*$/
 
 const getLineVisualLengthIgnoringTags = (line, threshold) => {
   let len = 0
@@ -67,6 +69,23 @@ const applyLineEndAlias = (opt, sourceOption) => {
   }
 }
 
+const createCommonFenceOptionDefaults = (md) => {
+  return {
+    attrsOrder: ['class', 'id', 'data-*', 'style'],
+    setHighlight: true,
+    setLineNumber: true,
+    setEmphasizeLines: true,
+    lineEndSpanThreshold: 0,
+    lineEndSpanClass: 'pre-lineend-spacer',
+    setPreWrapStyle: true,
+    useHighlightPre: false,
+    onFenceDecision: null,
+    onFenceDecisionTiming: false,
+    sampLang: 'shell,console',
+    langPrefix: md.options.langPrefix || 'language-',
+  }
+}
+
 const finalizeCommonFenceOption = (opt) => {
   opt._sampReg = new RegExp('^(?:samp|' + opt.sampLang.split(',').join('|') + ')$')
   opt._attrOrderIndex = createAttrOrderIndexGetter(opt.attrsOrder || [])
@@ -88,6 +107,14 @@ const parseStartNumber = (val) => {
   return num
 }
 
+const parsePositiveLineIndex = (val) => {
+  const str = String(val ?? '').trim()
+  if (!positiveIntReg.test(str)) return null
+  const num = Number(str)
+  if (!Number.isSafeInteger(num) || num <= 0) return null
+  return num
+}
+
 const getLogicalLineCount = (text) => {
   const str = String(text ?? '')
   if (!str) return 0
@@ -103,7 +130,7 @@ const getLogicalLineCount = (text) => {
   return count
 }
 
-const getEmphasizeLines = (attrVal) => {
+const parseLineRangeList = (attrVal, parseValue) => {
   const str = String(attrVal ?? '')
   if (!str) return []
   const result = []
@@ -112,22 +139,36 @@ const getEmphasizeLines = (attrVal) => {
     if (!part) continue
     const hyphen = part.indexOf('-')
     if (hyphen === -1) {
-      const n = Number(part)
-      if (Number.isFinite(n) && n > 0) result.push([n, n])
+      const n = parseValue(part)
+      if (n != null) result.push([n, n])
       continue
     }
     const start = part.slice(0, hyphen).trim()
     const end = part.slice(hyphen + 1).trim()
-    const s = start ? Number(start) : null
-    const e = end ? Number(end) : null
+    const s = start ? parseValue(start) : null
+    const e = end ? parseValue(end) : null
     if (s == null && e == null) continue
-    if (s != null && (!Number.isFinite(s) || s <= 0)) continue
-    if (e != null && (!Number.isFinite(e) || e <= 0)) continue
+    if (start && s == null) continue
+    if (end && e == null) continue
     result.push([s, e])
   }
   return result
 }
 
+const parsePositiveLineNumber = (val) => {
+  const num = Number(val)
+  if (!Number.isFinite(num) || num <= 0) return null
+  return num
+}
+
+const getEmphasizeLines = (attrVal) => {
+  return parseLineRangeList(attrVal, parsePositiveLineNumber)
+}
+
+const getLineNumberSkipRanges = (attrVal) => {
+  return parseLineRangeList(attrVal, parsePositiveLineIndex)
+}
+
 const normalizeEmphasisRanges = (emphasizeLines, maxLine) => {
   const normalized = []
   if (!emphasizeLines || !emphasizeLines.length || maxLine <= 0) return normalized
@@ -149,9 +190,87 @@ const normalizeEmphasisRanges = (emphasizeLines, maxLine) => {
   return normalized
 }
 
-const splitFenceBlockToLines = (content, emphasizeLines, needLineNumber, needEmphasis, needEndSpan, threshold, lineEndSpanClass, br, commentLines, commentClass) => {
+const getLineNumberResetEntries = (attrVal) => {
+  const str = String(attrVal ?? '')
+  if (!str) return []
+  const result = []
+  for (const partRaw of str.split(',')) {
+    const part = partRaw.trim()
+    if (!part) continue
+    const colon = part.indexOf(':')
+    if (colon === -1) continue
+    const lineNumber = parsePositiveLineIndex(part.slice(0, colon).trim())
+    const resetNumber = parseStartNumber(part.slice(colon + 1).trim())
+    if (lineNumber == null || resetNumber == null) continue
+    result.push([lineNumber, resetNumber])
+  }
+  return result
+}
+
+const createSparseLineFlagMap = (ranges, maxLine) => {
+  const normalized = normalizeEmphasisRanges(ranges, maxLine)
+  if (!normalized.length) return null
+  const flags = []
+  for (let i = 0; i < normalized.length; i++) {
+    const range = normalized[i]
+    for (let line = range[0]; line <= range[1]; line++) flags[line - 1] = true
+  }
+  return flags
+}
+
+const createSparseLineResetMap = (entries, maxLine) => {
+  if (!entries || !entries.length || maxLine <= 0) return null
+  const resets = []
+  let hasValue = false
+  for (let i = 0; i < entries.length; i++) {
+    const line = entries[i][0]
+    const value = entries[i][1]
+    if (!Number.isSafeInteger(line) || line <= 0 || line > maxLine) continue
+    resets[line - 1] = value
+    hasValue = true
+  }
+  return hasValue ? resets : null
+}
+
+const buildAdvancedLineNumberPlan = (skipRanges, resetEntries, sourceLineCount, renderedLineCount) => {
+  const hasSkip = !!(skipRanges && skipRanges.length)
+  const hasReset = !!(resetEntries && resetEntries.length)
+  if (!hasSkip && !hasReset) return null
+  if (!Number.isSafeInteger(sourceLineCount) || sourceLineCount <= 0) return null
+  if (sourceLineCount !== renderedLineCount) return null
+  const hidden = hasSkip ? createSparseLineFlagMap(skipRanges, sourceLineCount) : null
+  const resets = hasReset ? createSparseLineResetMap(resetEntries, sourceLineCount) : null
+  if (!hidden && !resets) return null
+  return { hidden, resets }
+}
+
+const resolveAdvancedLineNumberPlan = (lineNumberSkipValue, lineNumberResetValue, sourceLineCount, renderedLineCount) => {
+  const hasSkipValue = lineNumberSkipValue !== undefined
+  const hasResetValue = lineNumberResetValue !== undefined
+  if (!hasSkipValue && !hasResetValue) return null
+  if (!Number.isSafeInteger(sourceLineCount) || sourceLineCount <= 0) return null
+  if (sourceLineCount !== renderedLineCount) return null
+  const skipRanges = hasSkipValue ? getLineNumberSkipRanges(lineNumberSkipValue) : null
+  const resetEntries = hasResetValue ? getLineNumberResetEntries(lineNumberResetValue) : null
+  return buildAdvancedLineNumberPlan(skipRanges, resetEntries, sourceLineCount, renderedLineCount)
+}
+
+const getPreLineOpenTag = (lineNumberPlan, lineIndex) => {
+  if (!lineNumberPlan) return preLineTag
+  const hidden = !!(lineNumberPlan.hidden && lineNumberPlan.hidden[lineIndex])
+  const resetNumber = lineNumberPlan.resets ? lineNumberPlan.resets[lineIndex] : undefined
+  if (!hidden && resetNumber == null) return preLineTag
+  let tag = '<span class="pre-line'
+  if (hidden) tag += ' ' + preLineNoNumberClass
+  tag += '"'
+  if (resetNumber != null) tag += ` style="counter-set:pre-line-number ${resetNumber};"`
+  return tag + '>'
+}
+
+const splitFenceBlockToLines = (content, emphasizeLines, needLineNumber, needEmphasis, needEndSpan, threshold, lineEndSpanClass, br, commentLines, commentClass, lineNumberPlan) => {
   const lines = content.split(br)
   const max = lines.length
+  const hasDynamicLineNumberPlan = !!lineNumberPlan
   let emIdx = 0
   let emStart = -1
   let emEnd = -1
@@ -222,7 +341,7 @@ const splitFenceBlockToLines = (content, emphasizeLines, needLineNumber, needEmp
     }
 
     if (needLineNumber && notLastLine) {
-      line = preLineTag + line + closeTag
+      line = (hasDynamicLineNumberPlan ? getPreLineOpenTag(lineNumberPlan, n) : preLineTag) + line + closeTag
     }
 
     if (needEmphasis && emIdx < emphasizeLines.length && emStart === n + 1) {
@@ -279,6 +398,8 @@ const prepareFenceRenderContext = (tokens, idx, opt) => {
 
   let startNumber = -1
   let emphasizeLines = []
+  let lineNumberSkipValue
+  let lineNumberResetValue
   let wrapEnabled = false
   let preWrapValue
   let commentMarkValue
@@ -290,12 +411,16 @@ const prepareFenceRenderContext = (tokens, idx, opt) => {
     let dataPreEmphasisIndex = -1
     let styleIndex = -1
     let dataPreCommentIndex = -1
+    let dataPreLineNumberSkipIndex = -1
+    let dataPreLineNumberResetIndex = -1
     let startValue
     let emphasisValue
     let styleValue
     let sawCommentMark = false
     let sawStartAttr = false
     let sawEmphasisAttr = false
+    let sawLineNumberSkipAttr = false
+    let sawLineNumberResetAttr = false
     const appendOrder = []
 
     for (const attr of token.attrs) {
@@ -320,6 +445,7 @@ const prepareFenceRenderContext = (tokens, idx, opt) => {
           dataPreStartIndex = newAttrs.length
           newAttrs.push(attr)
           break
+        case 'line-number-start':
         case 'start':
         case 'pre-start':
           startNumber = parseStartNumber(val) ?? -1
@@ -338,6 +464,16 @@ const prepareFenceRenderContext = (tokens, idx, opt) => {
           commentMarkValue = val
           newAttrs.push(attr)
           break
+        case 'data-pre-line-number-skip':
+          dataPreLineNumberSkipIndex = newAttrs.length
+          lineNumberSkipValue = val
+          newAttrs.push(attr)
+          break
+        case 'data-pre-line-number-reset':
+          dataPreLineNumberResetIndex = newAttrs.length
+          lineNumberResetValue = val
+          newAttrs.push(attr)
+          break
         case 'em-lines':
         case 'emphasize-lines':
           if (opt.setEmphasizeLines) emphasizeLines = getEmphasizeLines(val)
@@ -354,6 +490,22 @@ const prepareFenceRenderContext = (tokens, idx, opt) => {
             sawCommentMark = true
           }
           break
+        case 'line-number-skip':
+        case 'pre-line-number-skip':
+          lineNumberSkipValue = val
+          if (!sawLineNumberSkipAttr) {
+            appendOrder.push('line-number-skip')
+            sawLineNumberSkipAttr = true
+          }
+          break
+        case 'line-number-reset':
+        case 'pre-line-number-reset':
+          lineNumberResetValue = val
+          if (!sawLineNumberResetAttr) {
+            appendOrder.push('line-number-reset')
+            sawLineNumberResetAttr = true
+          }
+          break
         case 'data-pre-wrap':
           preWrapValue = val
           if (val === '' || val === 'true') wrapEnabled = true
@@ -370,6 +522,8 @@ const prepareFenceRenderContext = (tokens, idx, opt) => {
     if (startValue !== undefined && dataPreStartIndex >= 0) newAttrs[dataPreStartIndex][1] = startValue
     if (emphasisValue !== undefined && dataPreEmphasisIndex >= 0) newAttrs[dataPreEmphasisIndex][1] = emphasisValue
     if (commentMarkValue !== undefined && dataPreCommentIndex >= 0) newAttrs[dataPreCommentIndex][1] = commentMarkValue
+    if (lineNumberSkipValue !== undefined && dataPreLineNumberSkipIndex >= 0) newAttrs[dataPreLineNumberSkipIndex][1] = lineNumberSkipValue
+    if (lineNumberResetValue !== undefined && dataPreLineNumberResetIndex >= 0) newAttrs[dataPreLineNumberResetIndex][1] = lineNumberResetValue
 
     for (const kind of appendOrder) {
       if (kind === 'start' && dataPreStartIndex === -1 && startValue !== undefined) {
@@ -378,6 +532,10 @@ const prepareFenceRenderContext = (tokens, idx, opt) => {
         newAttrs.push(['data-pre-emphasis', emphasisValue])
       } else if (kind === 'comment' && dataPreCommentIndex === -1 && commentMarkValue !== undefined) {
         newAttrs.push(['data-pre-comment-mark', commentMarkValue])
+      } else if (kind === 'line-number-skip' && dataPreLineNumberSkipIndex === -1 && lineNumberSkipValue !== undefined) {
+        newAttrs.push(['data-pre-line-number-skip', lineNumberSkipValue])
+      } else if (kind === 'line-number-reset' && dataPreLineNumberResetIndex === -1 && lineNumberResetValue !== undefined) {
+        newAttrs.push(['data-pre-line-number-reset', lineNumberResetValue])
       }
     }
 
@@ -401,6 +559,8 @@ const prepareFenceRenderContext = (tokens, idx, opt) => {
     lang,
     startNumber,
     emphasizeLines,
+    lineNumberSkipValue,
+    lineNumberResetValue,
     wrapEnabled,
     preWrapValue,
     commentMarkValue,
@@ -414,6 +574,7 @@ export {
   addTimingMs,
   applyLineEndAlias,
   commentLineClass,
+  createCommonFenceOptionDefaults,
   emitFenceDecision,
   finalizeCommonFenceOption,
   finalizeFenceTimings,
@@ -424,5 +585,6 @@ export {
   orderTokenAttrs,
   preWrapStyle,
   prepareFenceRenderContext,
+  resolveAdvancedLineNumberPlan,
   splitFenceBlockToLines,
 }