Marked boundary rigidity for surfaces