The booklet you linked is from 2004 and cites no sources more recent than 2002.
Stonewalls current terms
www.stonewall.org.uk/help-advice/glossary-terms
Trans – an umbrella term to describe people whose gender is not the same as, or does not sit comfortably with, the sex they were assigned at birth. Trans people may describe themselves using one or more of a wide variety of terms, including (but not limited to) Transgender, Transsexual, Gender-queer (GQ), Gender-fluid, Non-binary, Gender-variant, Crossdresser, Genderless, Agender, Nongender, Third gender, Two-spirit, Bi-gender, Trans man, Trans woman,Trans masculine, Trans feminine and Neutrois.
Pretty much exactly the same as that booklet. Look up transmasculine, gender queer, the lot of the terms. They cover all people. 'Cis' is a weird term as it assumes you 'identify' with the sex stereotypes imposed on you.
But...I will be accused of derailing again though I am answering someone elses post no doubt 