diff --git a/README.md b/README.md index 86f4008..bb179e8 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ See this example_ \givennames{Juan\ Pablo} \familynames{Martínez\ Escudero} - \additionalnames{Example\ Company\ Ltd.} + \company{Example\ Company\ Ltd.} \street{Im\ Stutz\ 123} \pobox{Postfach\ 4567} \phone{+41 52 123 45 67} @@ -131,7 +131,7 @@ See this example_ - `\familynames`: your family names - `\honoricprefix`: honorix name prefixes, e.g. academic titles - `\honoricsuffix`: honoric name suffixes -- `\additionalnames`: additionl names — I use it for the company name in business cards +- `\company`: company name — displayed on a second line below the name - `\pobox`: post office box - `\extaddr`: address extension, e.g. name of a building or floor number - `\street`: street and number of the address diff --git a/businesscard-qrcode.cls b/businesscard-qrcode.cls index 06260c4..b47df32 100644 --- a/businesscard-qrcode.cls +++ b/businesscard-qrcode.cls @@ -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}% } } diff --git a/examples/background-image-example.pdf b/examples/background-image-example.pdf index dedbcd5..6bedfa2 100644 Binary files a/examples/background-image-example.pdf and b/examples/background-image-example.pdf differ diff --git a/examples/background-image-example.tex b/examples/background-image-example.tex index b3d4a35..2714235 100644 --- a/examples/background-image-example.tex +++ b/examples/background-image-example.tex @@ -4,7 +4,7 @@ \type{home} \givennames{Petra} \familynames{Test} -\additionalnames{Example Company Ltd.} +\company{Example Company Ltd.} \street{Bildstrasse\ 99} \city{Basel} \zip{4000} diff --git a/examples/photo-example.pdf b/examples/photo-example.pdf index c84bc9c..91b07f6 100644 Binary files a/examples/photo-example.pdf and b/examples/photo-example.pdf differ diff --git a/examples/photo-example.tex b/examples/photo-example.tex index c472bf2..8f59d4e 100644 --- a/examples/photo-example.tex +++ b/examples/photo-example.tex @@ -12,7 +12,7 @@ \givennames{Alex} \familynames{Muster} -\additionalnames{Example\ Company\ AG} +\company{Example\ Company\ AG} \type{work} \phone{+41 44 123 45 67} \email{alex.muster@example.com} diff --git a/examples/photo-in-qr-example.pdf b/examples/photo-in-qr-example.pdf index 8ebcc07..4be8b19 100644 Binary files a/examples/photo-in-qr-example.pdf and b/examples/photo-in-qr-example.pdf differ diff --git a/examples/photo-in-qr-example.tex b/examples/photo-in-qr-example.tex index 8c5739e..a851ff1 100644 --- a/examples/photo-in-qr-example.tex +++ b/examples/photo-in-qr-example.tex @@ -4,7 +4,7 @@ \type{home} \givennames{Lisa\ Linda} \familynames{Doe} -\additionalnames{Example\ Company} +\company{Example\ Company} \street{Main\ Street\ 123} \city{New\ York} \zip{10001} diff --git a/examples/photo-large-example.pdf b/examples/photo-large-example.pdf index 5aad49a..43379d9 100644 Binary files a/examples/photo-large-example.pdf and b/examples/photo-large-example.pdf differ diff --git a/examples/photo-large-example.tex b/examples/photo-large-example.tex index 751af29..f5ac77e 100644 --- a/examples/photo-large-example.tex +++ b/examples/photo-large-example.tex @@ -3,7 +3,7 @@ \type{home} \givennames{Max} \familynames{Muster} -\additionalnames{Big\ Logo\ Example} +\company{Big\ Logo\ Example} \street{Beispielstrasse\ 42} \city{Winterthur} \zip{8400}