rename additionalnames to company and set on second line
This commit is contained in:
+12
-9
@@ -104,7 +104,7 @@
|
||||
\registerData{familynames}
|
||||
\registerData{honoricprefix}
|
||||
\registerData{honoricsuffix}
|
||||
\registerData{additionalnames}
|
||||
\registerData{company}
|
||||
\registerData{pobox}
|
||||
\registerData{extaddr}
|
||||
\registerData{street}
|
||||
@@ -153,7 +153,7 @@
|
||||
\newcommand\ifboth[3]{\ifcsdef{#1}{\ifcsdef{#2}{#3}{}}{}}
|
||||
\newcommand\ifany[3]{\ifcsdef{#1}{#3}{\ifcsdef{#2}{#3}{}}}
|
||||
\newcommand\cond[1]{\ifcsdef{#1}{\exec{#1}}{}}
|
||||
\newcommand\heightscale{\dimexpr\textheight-\ifcsempty{name}{0em}{2em}-\ifcsdef{Xpgpfingerprint}{2em}{0em}-\ifcsdef{Xadditionalnames}{2em}{0em}\relax}
|
||||
\newcommand\heightscale{\dimexpr\textheight-\ifcsempty{name}{0em}{2em}-\ifcsdef{Xpgpfingerprint}{2em}{0em}-\ifcsdef{Xcompany}{2em}{0em}\relax}
|
||||
|
||||
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
|
||||
% name - assemble full name from the parts, such as Xgivennames and Xfamilynames
|
||||
@@ -174,8 +174,8 @@
|
||||
% vcard assembly (version 4.0 retained). CRLF improves iOS import robustness.
|
||||
\newcommand\vcard{BEGIN:VCARD\BCQ@nl
|
||||
VERSION:4.0\BCQ@nl
|
||||
N:\cond{Xfamilynames};\cond{Xgivennames};\cond{Xadditionalnames};\cond{Xhonoricprefix};\cond{Xhonoricsuffix}\BCQ@nl
|
||||
FN:\name\ifexists{Xadditionalnames}{\ifcsempty{name}{} { }\Xadditionalnames}\BCQ@nl
|
||||
N:\cond{Xfamilynames};\cond{Xgivennames};\cond{Xcompany};\cond{Xhonoricprefix};\cond{Xhonoricsuffix}\BCQ@nl
|
||||
FN:\name\ifexists{Xcompany}{\ifcsempty{name}{} { }\Xcompany}\BCQ@nl
|
||||
\ifexists{printaddress}{ADR\ifexists{Xtype}{;TYPE=\Xtype}:\cond{Xpobox};\cond{Xextaddr};\cond{Xstreet};\cond{Xcity};\cond{Xregion};\cond{Xzip};\cond{Xcountry}\BCQ@nl}
|
||||
\ifexists{Xphone}{TEL;VALUE=uri;TYPE=\ifexists{Xtype}{\Xtype,}voice,text:tel:\Xphone\BCQ@nl}
|
||||
\ifexists{Xemail}{EMAIL\ifexists{Xtype}{;TYPE=\Xtype}:\Xemail\BCQ@nl}
|
||||
@@ -327,11 +327,12 @@ END:VCARD\BCQ@nl}
|
||||
% insertname - insert the name on the top
|
||||
\newcommand\insertname{
|
||||
% typeset name into box for measurement
|
||||
\sbox{\BCQ@namebox}{\bfseries\cond{name}\ifexists{Xadditionalnames}{\ifcsempty{name}{} { }\Xadditionalnames}}%
|
||||
\sbox{\BCQ@namebox}{\bfseries\cond{name}\ifexists{Xcompany}{\ifcsempty{name}{} { }\Xcompany}}%
|
||||
\ifcsdef{Xlogo}{% logo defined
|
||||
\ifBCQ@logoinqr
|
||||
% Logo in QR code: show name only, same structure as no-logo case
|
||||
{\bfseries\usebox{\BCQ@namebox}}%
|
||||
% Logo in QR code: show name only
|
||||
{\bfseries\cond{name}}%
|
||||
\ifexists{Xcompany}{\\\Xcompany}%
|
||||
\else
|
||||
% Logo next to name: two-column layout (logo | name)
|
||||
% logoscale: 1.0 = 100% name height (default), 2.0 = 200%, etc.
|
||||
@@ -342,12 +343,14 @@ END:VCARD\BCQ@nl}
|
||||
\hfill
|
||||
\begin{minipage}[c]{0.67\textwidth}% name column (adjusted from 0.75)
|
||||
\ifBCQ@rightalign\raggedleft\fi% apply alignment
|
||||
{\bfseries\usebox{\BCQ@namebox}}%
|
||||
{\bfseries\cond{name}}%
|
||||
\ifexists{Xcompany}{\\\Xcompany}%
|
||||
\end{minipage}
|
||||
\end{minipage}
|
||||
\fi
|
||||
}{% no logo: just name
|
||||
{\bfseries\usebox{\BCQ@namebox}}%
|
||||
{\bfseries\cond{name}}%
|
||||
\ifexists{Xcompany}{\\\Xcompany}%
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user