Madrid expands mask-wearing rules to curb covid-19 contagion