This is not the standard today
The standard, today, and any other day, is that pin 2 is hot (+ve) and pin 3 is cold (-ve). Yes, there are a few contradictions, but it isn't the norm.
I looked at the schematic for your Marantz CD7 and indeed it showed as incorrect as you've indicated. Sheesh, what's wrong with those people? Is it actually that way, or is the schematic wrong?
Even if you believe that Marantz could make such a rookie mistake, I wouldn't modify any cables to accomodate that device. I would keep all my cables as standard, and use the polarity switch to see what position offered the best sound.
brucek