// FIXME: While there are no further portal vaults, declare all
        //        portal vaults as bazaars.
//            if (you.level_type_name == "bazaar")
                return ( long_name ? "a Bazaar" : "Bazaar" );
//            return ( long_name ? "a Portal Chamber" : "Port" );

            // XXX: Using level_type_name here is strictly evil, but
            // packed places lack the information needed for pretty-printing
            // place names for portal vaults, so we must use this out-of-band
            // information.
            if (branch == you.level_type
                && !you.level_type_name.empty())
            {
                return long_name
                    ? article_a(you.level_type_name)
                    : upcase_first(you.level_type_name);
            }
            else
            {
                return long_name ? "a Portal Chamber" : "Port";
            }

        if (you.level_type_name == "bazaar")
            short_name = "A Bazaar";

        if (!you.level_type_name.empty())
            short_name = article_a(upcase_first(you.level_type_name), false);

std::string upcase_first(std::string);

    return (s);
}

std::string upcase_first(std::string s)
{
    if (!s.empty())
        s[0] = toupper(s[0]);

    // "place" is a human readable place name, and it is write-only,
    // so we can write place names like "Bazaar" that Crawl cannot
    // translate back. This does have the unfortunate side-effect that
    // Crawl will not preserve the "place" field in the highscores file.

    // Note: "br", "lvl" and "ltyp" are saved in canonical names that
    // can be read back by future versions of Crawl.

{{
function sewer_portal(e)
  e.marker([[O = lua:one_way_stair { desc = "A glowing drain",
                                     dst = "sewer", floor = "stone_arch" }]])
  e.kfeat("O = enter_portal_vault")
  e.colour("O = lightgreen")
end

}}

MARKER: O = lua:one_way_stair { desc = "A glowing drain", \
                                dst = "sewer" }
KFEAT:  O = enter_portal_vault
COLOUR: O = lightgreen

: sewer_portal(_G)

MARKER: O = lua:one_way_stair { desc = "A glowing drain", \
                                dst = "sewer" }
KFEAT:  O = enter_portal_vault
COLOUR: O = lightgreen

: sewer_portal(_G)