Swiss Trains Outlaw Smoking

When I went to Geneva and Zermatt via train I posted about a big decision: sit in the non-smoking car with the crying baby, or in the smoking car that was quiet but stinky? Recently the decision became much easier because I read that smoking on trains is outlawed in Switzerland. This is the direction of most European countries.