fix ADDR bug
This commit is contained in:
+14
-11
@@ -520,6 +520,11 @@
|
||||
\ifexists{Xfamilynames}{\Xfamilynames}%
|
||||
\ifexists{Xhonoricsuffix}{\ \Xhonoricsuffix}%
|
||||
}
|
||||
\newcommand\personalnamefn{%
|
||||
\ifexists{Xgivennames}{\Xgivennames\ }%
|
||||
\ifexists{Xadditionalnames}{\Xadditionalnames\ }%
|
||||
\ifexists{Xfamilynames}{\Xfamilynames}%
|
||||
}
|
||||
\newcommand\personalname{%
|
||||
\ifvisible{Xhonoricprefix}{\Xhonoricprefix\ }{}%
|
||||
\ifvisible{Xgivennames}{\Xgivennames\ }{}%
|
||||
@@ -751,15 +756,13 @@
|
||||
\newcommand\BCQ@vcardtel{%
|
||||
TEL;VALUE=uri;TYPE=\BCQ@vcardteltype,text:tel:\Xphone\BCQ@nl
|
||||
}
|
||||
\newcommand\BCQ@vcardaddressfull{%
|
||||
\ifcsdef{Xpobox}{\Xpobox\ }{}%
|
||||
\ifcsdef{Xextaddr}{\Xextaddr\ }{}%
|
||||
\ifcsdef{Xstreet}{\Xstreet\ }{}%
|
||||
\ifcsdef{Xzip}{\Xzip\ }{}%
|
||||
\ifcsdef{Xcity}{\Xcity\ }{}%
|
||||
\ifcsdef{Xregion}{\Xregion\ }{}%
|
||||
\ifcsdef{Xcountry}{\Xcountry}{}%
|
||||
}
|
||||
\newcommand\BCQ@vcardpobox{\ifcsdef{Xpobox}{\Xpobox}{}}
|
||||
\newcommand\BCQ@vcardextaddr{\ifcsdef{Xextaddr}{\Xextaddr}{}}
|
||||
\newcommand\BCQ@vcardstreet{\ifcsdef{Xstreet}{\Xstreet}{}}
|
||||
\newcommand\BCQ@vcardcity{\ifcsdef{Xcity}{\Xcity}{}}
|
||||
\newcommand\BCQ@vcardregion{\ifcsdef{Xregion}{\Xregion}{}}
|
||||
\newcommand\BCQ@vcardzip{\ifcsdef{Xzip}{\Xzip}{}}
|
||||
\newcommand\BCQ@vcardcountry{\ifcsdef{Xcountry}{\Xcountry}{}}
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
% vcard - the content of the vcard
|
||||
% newline selection: default LF (robust for qrcode). Optional CRLF if crlf option set.
|
||||
@@ -774,11 +777,11 @@
|
||||
\newcommand\vcard{BEGIN:VCARD\BCQ@nl
|
||||
VERSION:\BCQ@vcardversionline\BCQ@nl
|
||||
\ifhaspersonalnamevcard{N:\cond{Xfamilynames};\cond{Xgivennames};\cond{Xadditionalnames};\cond{Xhonoricprefix};\cond{Xhonoricsuffix}\BCQ@nl}{}
|
||||
\ifhasfullnamevcard{FN:\name\BCQ@nl}{}
|
||||
\ifhaspersonalnamevcard{FN:\personalnamefn\BCQ@nl}{\ifexists{Xcompany}{FN:\Xcompany\BCQ@nl}}
|
||||
\ifexists{Xcompany}{ORG:\Xcompany\BCQ@nl}
|
||||
\ifexists{Xtitle}{TITLE:\Xtitle\BCQ@nl}
|
||||
\ifexists{Xrole}{ROLE:\Xrole\BCQ@nl}
|
||||
\ifexists{printaddress}{\ifhasaddressvcard{ADR:;;\BCQ@vcardaddressfull;;;;\BCQ@nl}{}}
|
||||
\ifexists{printaddress}{\ifhasaddressvcard{ADR:\BCQ@vcardpobox;\BCQ@vcardextaddr;\BCQ@vcardstreet;\BCQ@vcardcity;\BCQ@vcardregion;\BCQ@vcardzip;\BCQ@vcardcountry\BCQ@nl}{}}
|
||||
\ifexists{Xphone}{\BCQ@vcardtel}
|
||||
\ifexists{Xemail}{EMAIL\BCQ@vcardtypeparam:\Xemail\BCQ@nl}
|
||||
\ifexists{Xjabber}{IMPP;TYPE=XMPP:\Xjabber\BCQ@nl}
|
||||
|
||||
Reference in New Issue
Block a user