fiddlerwoaroof/crawl - Change LZH2H24IV7PQGTG4M3DMAEWDUGKMZD5FMPQXLVWYYCNUGA3XD5UAC

Add the last of the apostrophe-related fixes. Words that end in "x"

will now get proper "'s" endings; simple_monster_message() and simple_god_message() will now replace all "s's" with "'s" (there's no need to worry about the "its" rule here, since invisible monsters are excluded from the former, and no gods are named "It" or are invisible with regard to the latter); and the tutorial will now generically apostrophize the one god name it has (since doing the aforementioned replacement would take too long on the tutorial text). The high score message still appends "'s" unconditionally to user names, but they may not be English, so that seems okay to me.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8281 c06c8d41-db1a-0410-9941-cceddc491573

Created by dolorous on January 6, 2009

LZH2H24IV7PQGTG4M3DMAEWDUGKMZD5FMPQXLVWYYCNUGA3XD5UAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tutorial.cc at line 31 [8.5936]
[6.152]
[7.1421]
```
#include "Kills.h"
```

Replacement in crawl-ref/source/tutorial.cc at line 2422 [8.5936]

B:BD[9.27948] → [9.27948:28069]

                 << god_name(you.religion)
                 << "'s support you can use your Berserk ability (<w>a</w>) "

[9.27948]

[9.28069]

                 << apostrophise(god_name(you.religion))
                 << " support you can use your Berserk ability (<w>a</w>) "

Insertion in crawl-ref/source/religion.cc at line 6801 [11.804403]
[10.2768]
[2.2640]
```
    msg = apostrophise_fixup(msg);
```

Replacement in crawl-ref/source/monstuff.cc at line 3972 [11.1396662]

B:BD[11.1447937] → [3.2633:2706]

            // Smart monsters, plants or nonliving monsters cannot flee.

[11.1447937]

[12.3635]

            // Smart monsters, zombified monsters other than spectral
            // things, plants, and nonliving monsters cannot flee.

Insertion in crawl-ref/source/monstuff.cc at line 3975 [11.1396662]

[12.3682]

                && (!mons_is_zombified(mon) || mon->type == MONS_SPECTRAL_THING)

Replacement in crawl-ref/source/monstuff.cc at line 4274 [11.1396662]

B:BD[11.1451561] → [13.2078:2108]

B:BD[13.2108] → [14.4555:4556]

B:BD[14.4556] → [4.2684:2786]

        char buff[INFO_SIZE];
        snprintf(buff, sizeof(buff), "%s%s", monster->name(descrip).c_str(),
                 event);

[11.1451561]

[14.4686]

        std::string msg = monster->name(descrip);
        msg += event;
        msg = apostrophise_fixup(msg);

Replacement in crawl-ref/source/monstuff.cc at line 4281 [11.1396662]
B:BD[15.6577] → [4.2787:2822]
```
        mpr(buff, channel, param);
```
[15.6577]
[11.1451707]
```
        mpr(msg.c_str(), channel, param);
```

Replacement in crawl-ref/source/mon-util.cc at line 8272 [11.1699344]

B:BD[16.23243] → [16.23243:23306]

B:BD[16.23306] → [17.2867:2928]

∅:D[17.2928] → [16.23368:23470]

B:BD[16.23368] → [16.23368:23470]

    // The proper possessive for a word ending in an "s" is to
    // put an apostrophe after the "s": "Chris" -> "Chris'",
    // not "Chris" -> "Chris's".  Stupid English language...
    msg = replace_all(msg, "s's", "s'");

[16.23243]

[16.23470]

    msg = apostrophise_fixup(msg);

Insertion in crawl-ref/source/Kills.h at line 19 [20.553491]
[18.5110]
[19.92051]
```
std::string apostrophise_fixup(const std::string &sentence);
```

Replacement in crawl-ref/source/Kills.cc at line 359 [20.558235]

B:BD[5.4042] → [5.4042:4107]

    return (name + (lastc == 's' || lastc == 'x' ? "'" : "'s"));

[5.4042]

[18.5324]

    return (name + (lastc == 's' ? "'" : "'s"));
}
std::string apostrophise_fixup(const std::string &msg)
{
    if (msg.empty())
        return (msg);
    // XXX: This is rather hackish.
    return (replace_all(msg, "s's", "s'"));