From 0aee2ebf9a2262bac6f6078dd6cb7ee6d36b0ef4 Mon Sep 17 00:00:00 2001
From: Petter Reinholdtsen <pere@hungry.com>
Date: Sun, 25 Oct 2020 22:15:02 +0100
Subject: [PATCH] Adjusted fixup-docbook.rb to generate valid docbook.

---
 fixup-docbook.rb | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/fixup-docbook.rb b/fixup-docbook.rb
index d7411ba..a201d9a 100755
--- a/fixup-docbook.rb
+++ b/fixup-docbook.rb
@@ -106,29 +106,26 @@ xml.css('dedication').each do |ded|
                                [auth_c, quote_c])
 end
 
-# FIXME the DTD do now allow this use of <attribution>
 %w(preface#foreword preface#introduction).each do |spec|
   sect = xml.css(spec)[0]
   paras = sect.css('para emphasis')
-  auth = '<blockquote><para><attribution>'
-  auth += paras.map{|p| p.content}.join('</attribution></para><para><attribution>')
-  auth += '</attribution></para></blockquote>'
+  auth = '<blockquote><attribution>'
+  auth += paras.map{|p| p.content}.join('<?latex \newline ?>')
+  auth += '</attribution><para/></blockquote>'
   sect.last_element_child.after(auth)
   paras.each {|i| i.parent.remove} # Remove both the 'emphasis' and its parent 'para'
 end
 
-# FIXME the DTD do now allow this use of <attribution>
 auth = xml.css('chapter')[0].css('para')[0]
 auth.content =~ /^\s*Paul Stacey\s*$/ or
   raise RuntimeError, 'Error finding author name in chapter 1 -- ' + auth.content
-auth.before('<blockquote><attribution>Paul Stacey</attribution></blockquote>')
+auth.before('<blockquote><attribution>Paul Stacey</attribution><para/></blockquote>')
 auth.remove
 
-# FIXME the DTD do now allow this use of <attribution>
 auth = xml.css('chapter')[1].css('para')[0]
 auth.content =~ /^\s*Sarah Hinchliff Pearson.*$/ or
   raise RuntimeError, 'Error finding author name in chapter 2 -- ' + auth.content
-auth.before('<blockquote><attribution>Sarah Hinchliff Pearson</attribution></blockquote>')
+auth.before('<blockquote><attribution>Sarah Hinchliff Pearson</attribution><para/></blockquote>')
 auth.remove
 
 log 0, 'move legal notice to bookinfo'
@@ -216,13 +213,12 @@ xml.css('figure').each do |fig|
   seq = seq + 1
 end
 
-# FIXME the DTD do now allow this use of <attribution>
 log 0, 'Set epigraph line in each case study'
 xml.css('blockquote para').select {|p| p.inner_text =~ /Profile written by/}.each do |epi|
   p = epi.parent
   by = epi.inner_text
   epi.remove
-  p.last_element_child.after('<attribution>%s</attribution>' % by)
+  p.first_element_child.before('<attribution>%s</attribution></para>' % by)
 end
 
 
-- 
2.47.2