#916: #889: markup adjustments

opened by thuchacz