blacklist, xlate.conf: Messily fix case of four-letter prepositions.

It seems that I disagree with MusicBrainz here: I want `with' and `from'
in unstressed positions to be in lower case.  In many cases, I've ended up
with later versions of the album metadata, which also changed some other
names, so there's a whole lot of fallout here.

diff --git a/blacklist b/blacklist
index b7deb95..0140300 100644 (file)
--- a/blacklist
+++ b/blacklist
@@ -30,7 +30,7 @@ A/Douglas Adams/Douglas Adams's Guide to the Hitchhiker's Guide to the Galaxy/2-
 A/Douglas Adams/Douglas Adams's Guide to the Hitchhiker's Guide to the Galaxy/2-06. With So Many Intellectual Manouevres Going On
 A/Douglas Adams/Douglas Adams's Guide to the Hitchhiker's Guide to the Galaxy/2-07. I Hope This Doesn't Sound Too Self-Serving
 A/Douglas Adams/Douglas Adams's Guide to the Hitchhiker's Guide to the Galaxy/2-08. I Think I'm Quite Good At...
-A/Douglas Adams/Douglas Adams's Guide to the Hitchhiker's Guide to the Galaxy/2-09. Douglas, Quite Apart From the People...
+A/Douglas Adams/Douglas Adams's Guide to the Hitchhiker's Guide to the Galaxy/2-09. Douglas, Quite Apart from the People...
 A/Douglas Adams/Douglas Adams's Guide to the Hitchhiker's Guide to the Galaxy/2-10. It's Perhaps No Wonder That in Douglas's World
 A/Douglas Adams/Douglas Adams's Guide to the Hitchhiker's Guide to the Galaxy/2-11. Having Addressed Yourself, in Comedy
 A/Douglas Adams/Douglas Adams's Guide to the Hitchhiker's Guide to the Galaxy/2-12. Do You Think Your Time..._
@@ -124,7 +124,7 @@ A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/06-07. The Show Event Horiz
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/06-08. It's a Derelict Spaceport
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/06-09. You'd Better Keep Your Head Screwed On
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/06-10. Where Are We Going_
-A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/06-11. We're Trying to Escape From the Foot Warriors
+A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/06-11. We're Trying to Escape from the Foot Warriors
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/06-12. Nerve Rackingly Enough
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/06-13. Switching Tracks
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/06-14. Who You Get to Do It
@@ -293,7 +293,7 @@ A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/14-20. Zaphod's Mission
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-01. Heimdall's Offer
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-02. Zaphod's Last Words
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-03. Not the Last Humans
-A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-04. A Task From Odin
+A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-04. A Task from Odin
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-05. Hel and Modgud
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-06. Bent Stick
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-07. Pormwranglers
@@ -306,7 +306,7 @@ A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-13. Ford Hits a Snag
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-14. The History of Nano
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-15. The Cong Militia
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-16. The Ultra-Warm Beast
-A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-17. A Visit From Eccentrica
+A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-17. A Visit from Eccentrica
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-18. The Great Cheese
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-19. The Consultant
 A/Douglas Adams/The Hitchhiker's Guide to the Galaxy/15-20. A Last Word on God
@@ -919,19 +919,19 @@ H/Boo Hewerdine/A Live One/11. The Birds Are Leaving
 H/Boo Hewerdine/A Live One/12. Lucky Penny
 H/Boo Hewerdine/A Live One/13. Soul
 H/Boo Hewerdine/A Live One/14. Paper Planes
-J/Florence Foster Jenkins/The Glory (____) of the Human Voice/01. Die Zauberflöte, K. 620_ Act II, Scene VIII. No. 14 Aria _Der Hölle Rache kocht in meinem Herzen_ (Die Königin der Nacht)
-J/Florence Foster Jenkins/The Glory (____) of the Human Voice/02. A Musical Snuffbox, Op. 32
-J/Florence Foster Jenkins/The Glory (____) of the Human Voice/03. Like a Bird
-J/Florence Foster Jenkins/The Glory (____) of the Human Voice/04. Lakmé_ Act II, No. 10_ _Où va la jeune indoue__
-J/Florence Foster Jenkins/The Glory (____) of the Human Voice/05. Serenata mexicano
-J/Florence Foster Jenkins/The Glory (____) of the Human Voice/06. La Perle du Brésil_ Charmant oiseau
-J/Florence Foster Jenkins/The Glory (____) of the Human Voice/07. Bach - Pavlovich _ Biassy
-J/Florence Foster Jenkins/The Glory (____) of the Human Voice/08. Die Fledermaus_ _Mein Herr Marquis_
-J/Florence Foster Jenkins/The Glory (____) of the Human Voice/09. A Faust Travesty_ Valentine's Aria (Ere I Leave My Native Land)
-J/Florence Foster Jenkins/The Glory (____) of the Human Voice/10. A Faust Travesty_ Jewel Song (O Heavenly Jewels)
-J/Florence Foster Jenkins/The Glory (____) of the Human Voice/11. A Faust Travesty_ Salut, demeure chaste et pure (Emotions strange)
-J/Florence Foster Jenkins/The Glory (____) of the Human Voice/12. A Faust Travesty_ Final Trio (My Heart Is Overcome With Terror)
-J/Jaded Star/Memories From the Future/08. In Memory
+J/Florence Foster Jenkins, Jenny Williams, Thomas Burns/The Glory (____) of the Human Voice/01. Die Zauberflöte, K. 620_ Act II, Scene VIII. No. 14 Aria _Der Hölle Rache kocht in meinem Herzen_ (Die Königin der Nacht)
+J/Florence Foster Jenkins, Jenny Williams, Thomas Burns/The Glory (____) of the Human Voice/02. The Musical Snuff-Box
+J/Florence Foster Jenkins, Jenny Williams, Thomas Burns/The Glory (____) of the Human Voice/03. Like a Bird
+J/Florence Foster Jenkins, Jenny Williams, Thomas Burns/The Glory (____) of the Human Voice/04. Lakmé_ Act II, no. 10_ _Où va la jeune indoue__
+J/Florence Foster Jenkins, Jenny Williams, Thomas Burns/The Glory (____) of the Human Voice/05. Serenata mexicana
+J/Florence Foster Jenkins, Jenny Williams, Thomas Burns/The Glory (____) of the Human Voice/06. The Pearl of Brazil_ Charmant oiseau
+J/Florence Foster Jenkins, Jenny Williams, Thomas Burns/The Glory (____) of the Human Voice/07. Biassy
+J/Florence Foster Jenkins, Jenny Williams, Thomas Burns/The Glory (____) of the Human Voice/08. Die Fledermaus_ _Mein Herr Marquis_
+J/Florence Foster Jenkins, Jenny Williams, Thomas Burns/The Glory (____) of the Human Voice/09. A Faust Travesty_ Valentine's Aria (Ere I Leave My Native Land)
+J/Florence Foster Jenkins, Jenny Williams, Thomas Burns/The Glory (____) of the Human Voice/10. A Faust Travesty_ Jewel Song (O Heavenly Jewels)
+J/Florence Foster Jenkins, Jenny Williams, Thomas Burns/The Glory (____) of the Human Voice/11. A Faust Travesty_ Salut, demeure chaste et pure (Emotions strange)
+J/Florence Foster Jenkins, Jenny Williams, Thomas Burns/The Glory (____) of the Human Voice/12. A Faust Travesty_ Final Trio (My Heart Is Overcome with Terror)
+J/Jaded Star/Memories from the Future/08. In Memory
 J/Jamiroquai/Travelling Without Moving/01. Virtual Insanity
 J/Jamiroquai/Travelling Without Moving/02. Cosmic Girl
 J/Jamiroquai/Travelling Without Moving/03. Use the Force
@@ -998,20 +998,20 @@ O/On the Hour/Series 2/4-03. Partridge Rushes - Badminton
 O/On the Hour/Series 2/4-04. Partridge Rushes - Synchronised Swimming
 O/On the Hour/Series 2/4-05. Partridge Rushes - Tennis
 O/On the Hour/Series 2/4-06. Partridge Rushes - Sumo
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/1-01. Introduction
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/1-02. Ice Nine
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/1-03. Memories
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/1-04. Midnight _ Rubina
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/1-05. Circles
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/1-06. Drum Solo
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/1-07. Lords of Karma
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/1-08. Bass Solo
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/2-01. Echo
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/2-02. Hordes of Locusts
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/2-03. The Crush of Love
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/2-04. Always With Me, Always With You
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/2-05. Satch Boogie
-S/Joe Satriani/Elysee Montmartre Paris 20-7-1988/2-06. Surfing With the Alien
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/1-01. Introduction
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/1-02. Ice Nine
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/1-03. Memories
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/1-04. Midnight _ Rubina
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/1-05. Circles
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/1-06. Drum Solo
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/1-07. Lords of Karma
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/1-08. Bass Solo
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/2-01. Echo
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/2-02. Hordes of Locusts
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/2-03. The Crush of Love
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/2-04. Always with Me, Always with You
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/2-05. Satch Boogie
+S/Joe Satriani/1988-07-20_ Élysée Montmartre, Paris, France/2-06. Surfing with the Alien
 S/Paul Simon/Graceland/15. The Story of _Graceland_ (as told by Paul Simon)
 S/Space/Neighbourhood/01. Neighbourhood
 S/Space/Neighbourhood/02. Only Half an Angel
@@ -1041,7 +1041,7 @@ T/J.R.R. Tolkien/The Hobbit_ BBC Radio Dramatized Version/2-08. Wargs
 T/J.R.R. Tolkien/The Hobbit_ BBC Radio Dramatized Version/2-09. The Lord of the Eagles
 T/J.R.R. Tolkien/The Hobbit_ BBC Radio Dramatized Version/2-10. Beorn
 T/J.R.R. Tolkien/The Hobbit_ BBC Radio Dramatized Version/2-11. The Elves of Mirkwood
-T/J.R.R. Tolkien/The Hobbit_ BBC Radio Dramatized Version/3-01. Straying From the Path
+T/J.R.R. Tolkien/The Hobbit_ BBC Radio Dramatized Version/3-01. Straying from the Path
 T/J.R.R. Tolkien/The Hobbit_ BBC Radio Dramatized Version/3-02. Bilbo Alone
 T/J.R.R. Tolkien/The Hobbit_ BBC Radio Dramatized Version/3-03. Spiders
 T/J.R.R. Tolkien/The Hobbit_ BBC Radio Dramatized Version/3-04. Captured by Wood-elves

diff --git a/xlate.conf b/xlate.conf
index 091f4b0..e5451f8 100644 (file)
--- a/xlate.conf
+++ b/xlate.conf
@@ -43,6 +43,7 @@ transform dir "^(Philip) (Glass)$"                            "$2, $1" sort
 transform dir  "^(Boo) (Hewerdine)$"                           "$2, $1" sort
 
 transform dir  "^(Florence Foster) (Jenkins)$"                 "$2, $1" sort
+transform dir  "^(Florence Foster) (Jenkins), (Jenny) (Williams), (Thomas) (Burns)$" "$2, $1; $4, $3; $6, $5" sort
 transform dir  "^(Milla) (Jovovich)$"                          "$2, $1" sort
 
 transform dir  "^(Avril) (Lavigne)$"                           "$2, $1" sort