Btukfyl

I would like to replace occurrences of strings conditionally within larger strings, using the IfSubStr and StrSubstitute macros from the xstring package. The issue that I'm running into is related to expansion of the makebold macro, which is a function of surnamefirst and surnamelast macro expansion. How can I get the makebold macro to work correctly?

documentclass{article}



usepackage{xstring}



newcommand{name}{John Doe}



makeatletter



% Extract last name from name

newcommand{lastname}{%

    IfSubStr{name}{.}%

        {StrBehind{name}{. }}%

        {StrBehind{name}{ }}%

        [@lastname]

}



% Extract first name from name

newcommand{firstname}{%

    StrBefore{name}{ }[@firstname]

}



% Extract first initial from name

newcommand{firstinitial}{%

    StrLeft{name}{1}[@firstinitial]

}



% Extract middle initial from name

newcommand{middleinitial}{%

    StrBetween{name}{ }{.}[@middleinitial]

}



newcommand{testxstring}{%

    middleinitial % Find middle initial

    IfStrEq{@middleinitial}{}%

        {No middle initial!}%

        {Middle initial: @middleinitial}

}



% Surname first

newcommand{surnamefirst}{%

    firstinitial

    middleinitial % Find middle initial

    lastname

    IfStrEq{@middleinitial}{}%

        {@lastname, @firstinitial.}%

        {@lastname, @firstinitial.~@middleinitial.}

}



% Surname last

newcommand{surnamelast}{%

    firstinitial

    middleinitial % Find middle initial

    lastname

    IfStrEq{@middleinitial}{}%

        {@firstinitial.~@lastname}%

        {@firstinitial.~@middleinitial.~@lastname}

}



% Replace full name with bold

newcommand{makeboldname}[1]{%

    expandarg

    IfSubStr{#1}{name}%

        {StrSubstitute{#1}{name}{textbf{name}}par}%

        {#1}

}



% Replace last name with bold

newcommand{makeboldlastname}[1]{%

    lastname

    expandarg

    IfSubStr{#1}{@lastname}%

        {StrSubstitute{#1}{@lastname}{textbf{@lastname}}par}%

        {#1}

}



% Replace surname-first and surname-last with bold

newcommand{makebold}[1]{%

    expandarg

    IfSubStr{#1}{surnamefirst}%

        {StrSubstitute{#1}{surnamefirst}{textbf{surnamefirst}}par}%

        {IfSubStr{#1}{surnamelast}%

            {StrSubstitute{#1}{surnamelast}{textbf{surnamelast}}par}%

            {#1}%

        }

}



makeatother



begin{document}



    name



    surnamefirst



    surnamelast



    makeboldname{His name was John Doe.}



    makeboldlastname{Again, Doe was his last name.}



    makebold{I head that Doe, J. was from Kentucky.}



    makebold{There was also a J. Doe from New York.}



end{document}

Thank you!