Fixing notes formating again. This time inline - regression from 1.59.0

rupor-github · Jul 29, 2022 · 6e28bfb · 6e28bfb
1 parent d13656f
commit 6e28bfb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -80,7 +80,7 @@ endif()
 # Project version number
 set(PRJ_VERSION_MAJOR 1)
 set(PRJ_VERSION_MINOR 64)
-set(PRJ_VERSION_PATCH 4)
+set(PRJ_VERSION_PATCH 5)
 
 if (EXISTS "${PROJECT_SOURCE_DIR}/.git" AND IS_DIRECTORY "${PROJECT_SOURCE_DIR}/.git")
     execute_process(COMMAND ${CMAKE_SOURCE_DIR}/cmake/githash.sh ${GIT_EXECUTABLE}

diff --git a/processor/process.go b/processor/process.go
@@ -697,11 +697,18 @@ func (p *Processor) parseNoteSectionElement(el *etree.Element, name string, note
 			bodyName:   name,
 			bodyNumber: len(notesPerBody),
 		}
+		sep := "\n"
+		if !p.env.Cfg.Doc.Notes.KeepNL {
+			sep = " "
+		}
 		for _, c := range el.ChildElements() {
 			if c.Tag == "title" {
 				note.title = SanitizeTitle(getTextFragment(c))
 			} else {
-				note.body += getFullTextFragment(c)
+				if len(note.body) > 0 {
+					note.body += sep
+				}
+				note.body += strings.ReplaceAll(getFullTextFragment(c), "\n", sep)
 			}
 		}
 		p.Book.NotesOrder = append(p.Book.NotesOrder, notelink{id: id, bodyName: name})

diff --git a/processor/xhtml.go b/processor/xhtml.go
@@ -127,20 +127,16 @@ func (p *Processor) processBody(index int, from *etree.Element) (err error) {
 					}
 				}
 			}
-			txt := note.body
-			if !p.env.Cfg.Doc.Notes.KeepNL {
-				txt = strings.TrimSuffix(strings.ReplaceAll(txt, "\n", " "), " ")
-			}
 			// NOTE: we are adding .SetTail("\n") to make result readable when debugging, it does not have any other use
 			if p.notesMode == NFloatNew {
 				// new "preffered" HTML5 method with "aside"
 				to.AddNext("aside", attr("id", nl.id), attr("epub:type", "footnote")).SetTail("\n").
 					AddNext("p", attr("class", "floatnote")).
-					AddNext("a", attr("href", backRef+"#"+backID)).SetText(t).SetTail(strNBSP + txt)
+					AddNext("a", attr("href", backRef+"#"+backID)).SetText(t).SetTail(strNBSP + note.body)
 			} else {
 				// old bi-directional mode
 				to.AddNext("p", attr("class", "floatnote"), attr("id", nl.id)).SetTail("\n").
-					AddNext("a", attr("href", backRef+"#"+backID)).SetText(t).SetTail(strNBSP + txt)
+					AddNext("a", attr("href", backRef+"#"+backID)).SetText(t).SetTail(strNBSP + note.body)
 			}
 		}
 	}

diff --git a/processor/xmlutils.go b/processor/xmlutils.go
@@ -41,7 +41,7 @@ func getTextFragment(e *etree.Element) string {
 }
 
 func getFullTextFragment(e *etree.Element) string {
-	return extractText(e, false, false)
+	return extractText(e, true, false)
 }
 
 //lint:ignore U1000 keep getXMLFragment()

diff --git a/static/configuration.toml b/static/configuration.toml
@@ -155,8 +155,8 @@
 		#---- "float-old" - same as "float", pop up notes using "bi-directional links" method
 		#---- "float-new" - pop up notes using "preferred" method - HTML5 with <aside> recommended by Amazon publishing guidelines
 		mode = "default"
-		#---- By default in all float modes new line replaces all fb2 formatting tags.
-		#---- If "keep_new_line" is set to false all new lines will be replaced with spaces.
+		#---- By default in all notes modes but "default" new line replaces most fb2 formatting tags.
+		#---- If "keep_new_line" is set to false in such notes bodies all new lines will be replaced with spaces.
 		# keep_new_lines = true
 		#---- Names of the <body> tags in fb2 document to consider for notes processing
 		body_names = [ "notes", "comments" ]