X-Git-Url: https://pere.pagekite.me/gitweb/text-madewithcc.git/blobdiff_plain/f5da4648eb303e8bd53f343bfe19b59810f0ec72..3803ee4ffdbc2550af201e9e96e69e54efa9c91e:/fixup.rb?ds=sidebyside

diff --git a/fixup.rb b/fixup.rb
index 4561ab7..55fae51 100644
--- a/fixup.rb
+++ b/fixup.rb
@@ -185,7 +185,7 @@ log 0, 'add heading to colophon page'
 data.insert(data.index('Made With Creative Commons'), '# Colophon {-}')
 
 log 0, 'add dedication as separeate chapter'
-data.insert(data.index('“I don’t know a whole lot about nonfiction journalism. . .'), '# Dedication {-}')
+data.insert(data.index('"I don\'t know a whole lot about nonfiction journalism. . .'), '# Dedication {-}')
 
 # Join erroneously split paragraphs: Write the contents of the line
 # _preceding_ the unneeded break, the break will be removed.
@@ -219,6 +219,7 @@ log 0, 'Join erroneously split paragraphs'
  'license', # 6169
  'authors and Shuttleworth; Mark remains incredibly proud of this', # 6452
  'BY-SA and opting in others with collecting societies like', # 7218
+ 'Journeys to a Generative Economy. San Francisco:', # 7553
  'Cecilie Maria, Cedric Howe, Cefn Hoile,', # 7796
  'Braddlee, Drew Spencer, Duncan', # 7839
  'Elizabeth Holloway, Ellen Buecher, Ellen Kaye-', # 7844
@@ -258,8 +259,13 @@ data.each_with_index do |lin, idx|
     scope=$1.gsub(" ", "-")
   end
   # First, mark note reference
-  lin.sub!(/([a-z]\.["”]?)(\d+)(\s)/, "\\1[^" + scope + "-\\2]\\3")
-  lin.sub!(/([a-z]\.["”]?)(\d+)$/, "\\1[^" + scope + "-\\2]")
+  lin.sub!(/([a-z][\.\)]+["”]?)(\d+)(\s)/, "\\1[^" + scope + "-\\2]\\3")
+  lin.sub!(/([a-z][\.\)]+["”]?)(\d+)$/, "\\1[^" + scope + "-\\2]")
+  # Special case some refs hard to match otherwise
+  lin.sub!(/(section.\)) 36 /, "\\1[^" + scope + "-36] ")
+  lin.sub!(/(Data Futures Forum in 2014,)1 /, "\\1[^" + scope + "-1] ")
+  lin.sub!(/(5,080)5/, "\\1[^" + scope + "-5]")
+  lin.sub!(/(sustain her creative work.) 1/, "\\1[^" + scope + "-1]")
   # Next, mark note content, only between /Web Links?|Notes/ and next heading
   if noteblock
     lin.sub!(/^(\d+)\. /, "[^" + scope + "-\\1]: ")
@@ -331,12 +337,12 @@ data.map {|lin| lin.gsub!(/height="[0-9.]+in"/, '')}
 
 log 0, 'add figure titles required by Docbook for referable figures'
 [
-  ['10000201000008000000045C30360249076453E6.png', 'Enterprise engagements'],
-  ['10000201000007D0000007D0ACF13F8B71EAF0B9.png', 'Aspects of resource management'],
-  ['10000201000009C40000065D9EC4F530BD4DFBE0.png', 'Different views on resources'],
-  ['10000201000009C4000005153EACBD62F00F6BA9.png', 'Long ago'],
-  ['10000201000009C4000005150F069409C1CC12F0.png', 'State takeover of the commons'],
-  ['10000201000009C400000515F1CAA15B223F6BAF.png', 'Today'],
+  ['10000201000008000000045C30360249076453E6.png', 'Enterprise engagement with commons, state and market.'],
+  ['10000201000007D0000007D0ACF13F8B71EAF0B9.png', 'Four aspects of resource management'],
+  ['10000201000009C40000065D9EC4F530BD4DFBE0.png', 'How the market, commons and state concieve of resources.'],
+  ['10000201000009C4000005153EACBD62F00F6BA9.png', 'In preindustrialized society.'],
+  ['10000201000009C4000005150F069409C1CC12F0.png', 'The commons is gradually superseded by the state.'],
+  ['10000201000009C400000515F1CAA15B223F6BAF.png', 'How the market, the state and the commons look today.'],
 ].each do |fig|
   at = data.index {|i| i.include? fig[0]}
   if at.nil?
@@ -346,7 +352,7 @@ log 0, 'add figure titles required by Docbook for referable figures'
 end
 
 log 0, 'adding http:// to all URLs and turn them into links'
-data.map {|lin| lin.gsub!(/(^|\s+)([-a-z0-9\\.]+\.(cc|com|edu|eu|io|is|it|kr|net|nl|nz|org|se))/, '\\1http://\\2')}
+data.map {|lin| lin.gsub!(/(^|\s+)([-a-z0-9\\.]+\.(ca|cc|com|edu|eu|io|is|it|kr|net|nl|nz|org|se))/, '\\1http://\\2')}
 data.map {|lin| lin.gsub!(/\b(https?:\/\/[-a-z0-9\\.]+)(\/[-\\.\/a-zA-Z0-9#_\?&=,]+[-\/a-zA-Z0-9#_\?&=,])?/, '[](\\1\\2)')}
 
 log 0, 'Writing processed file'