Commit eac4819f authored by Dan Allen's avatar Dan Allen
Browse files

merge !208 

resolves #229 shift level of discrete headings when merging pages
parents 7af45b21 10db11b0

CHANGELOG.adoc

+4
Changes for CHANGELOG.adoc: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ For a detailed view of what's changed, refer to the {url-repo}/commits[commit hi 


== Unreleased



=== Changed



* Shift level of discrete headings when merging pages (like with section titles) (#229)



=== Fixed



* Don't drop first line of content when doctitle is defined using only attribute entry (#226)

packages/assembler/lib/produce-assembly-file.js

+3 −1
Changes for packages/assembler/lib/produce-assembly-file.js: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -634,10 +634,12 @@ function mergeAsciiDoc ( 
      const context = block.getContext()

      let idx = lineno - 1

      let blockStyle

      if (context === 'section') {

      if (context === 'section' || context === 'floating_title') {

        if (!block.getDocument().isNested()) {

          if (context === 'section') {

            if (block.getSectionName() === 'header') return

            blockStyle = sectionMergeStrategy === 'discrete' ? 'discrete' : undefined

          }

          lines[idx] = lines[idx].replace(/^=+ (.+)/, (_, rest) => {

            let targetMarkerLength = block.level + 1 + level

            if (targetMarkerLength > 6) {

packages/assembler/test/scenarios/multipart-assembly/data.yml

+3
Changes for packages/assembler/test/scenarios/multipart-assembly/data.yml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ files: 
    :assembly-style: part



    partintro



    [discrete]

    == Witty Quote

- relative: the-chapter.adoc

  contents: |-

    = Chapter Title

packages/assembler/test/scenarios/multipart-assembly/expects/index.adoc

+3
Changes for packages/assembler/test/scenarios/multipart-assembly/expects/index.adoc: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 


partintro



[discrete#the-part:::_witty_quote]

== Witty Quote



:page-docname: the-chapter

:page-module: ROOT

:page-relative-src-path: the-chapter.adoc

packages/assembler/test/scenarios/preserve-discrete-headings/data.yml

+4 −1
Changes for packages/assembler/test/scenarios/preserve-discrete-headings/data.yml: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ files: 
  contents: |-

    = The Page Title



    [discrete]

    [discrete.colorize]

    ==== Vision



    Our vision
@@ -19,6 +19,9 @@ files: 


    Our mission



    [discrete]

    ====== Tagline



    == First Section



    contents