rename additionalnames to company and set on second line
This commit is contained in:
@@ -118,7 +118,7 @@ See this example_
|
|||||||
|
|
||||||
\givennames{Juan\ Pablo}
|
\givennames{Juan\ Pablo}
|
||||||
\familynames{Martínez\ Escudero}
|
\familynames{Martínez\ Escudero}
|
||||||
\additionalnames{Example\ Company\ Ltd.}
|
\company{Example\ Company\ Ltd.}
|
||||||
\street{Im\ Stutz\ 123}
|
\street{Im\ Stutz\ 123}
|
||||||
\pobox{Postfach\ 4567}
|
\pobox{Postfach\ 4567}
|
||||||
\phone{+41 52 123 45 67}
|
\phone{+41 52 123 45 67}
|
||||||
@@ -131,7 +131,7 @@ See this example_
|
|||||||
- `\familynames`: your family names
|
- `\familynames`: your family names
|
||||||
- `\honoricprefix`: honorix name prefixes, e.g. academic titles
|
- `\honoricprefix`: honorix name prefixes, e.g. academic titles
|
||||||
- `\honoricsuffix`: honoric name suffixes
|
- `\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
|
- `\pobox`: post office box
|
||||||
- `\extaddr`: address extension, e.g. name of a building or floor number
|
- `\extaddr`: address extension, e.g. name of a building or floor number
|
||||||
- `\street`: street and number of the address
|
- `\street`: street and number of the address
|
||||||
|
|||||||
+12
-9
@@ -104,7 +104,7 @@
|
|||||||
\registerData{familynames}
|
\registerData{familynames}
|
||||||
\registerData{honoricprefix}
|
\registerData{honoricprefix}
|
||||||
\registerData{honoricsuffix}
|
\registerData{honoricsuffix}
|
||||||
\registerData{additionalnames}
|
\registerData{company}
|
||||||
\registerData{pobox}
|
\registerData{pobox}
|
||||||
\registerData{extaddr}
|
\registerData{extaddr}
|
||||||
\registerData{street}
|
\registerData{street}
|
||||||
@@ -153,7 +153,7 @@
|
|||||||
\newcommand\ifboth[3]{\ifcsdef{#1}{\ifcsdef{#2}{#3}{}}{}}
|
\newcommand\ifboth[3]{\ifcsdef{#1}{\ifcsdef{#2}{#3}{}}{}}
|
||||||
\newcommand\ifany[3]{\ifcsdef{#1}{#3}{\ifcsdef{#2}{#3}{}}}
|
\newcommand\ifany[3]{\ifcsdef{#1}{#3}{\ifcsdef{#2}{#3}{}}}
|
||||||
\newcommand\cond[1]{\ifcsdef{#1}{\exec{#1}}{}}
|
\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
|
% 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.
|
% vcard assembly (version 4.0 retained). CRLF improves iOS import robustness.
|
||||||
\newcommand\vcard{BEGIN:VCARD\BCQ@nl
|
\newcommand\vcard{BEGIN:VCARD\BCQ@nl
|
||||||
VERSION:4.0\BCQ@nl
|
VERSION:4.0\BCQ@nl
|
||||||
N:\cond{Xfamilynames};\cond{Xgivennames};\cond{Xadditionalnames};\cond{Xhonoricprefix};\cond{Xhonoricsuffix}\BCQ@nl
|
N:\cond{Xfamilynames};\cond{Xgivennames};\cond{Xcompany};\cond{Xhonoricprefix};\cond{Xhonoricsuffix}\BCQ@nl
|
||||||
FN:\name\ifexists{Xadditionalnames}{\ifcsempty{name}{} { }\Xadditionalnames}\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{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{Xphone}{TEL;VALUE=uri;TYPE=\ifexists{Xtype}{\Xtype,}voice,text:tel:\Xphone\BCQ@nl}
|
||||||
\ifexists{Xemail}{EMAIL\ifexists{Xtype}{;TYPE=\Xtype}:\Xemail\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
|
% insertname - insert the name on the top
|
||||||
\newcommand\insertname{
|
\newcommand\insertname{
|
||||||
% typeset name into box for measurement
|
% 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
|
\ifcsdef{Xlogo}{% logo defined
|
||||||
\ifBCQ@logoinqr
|
\ifBCQ@logoinqr
|
||||||
% Logo in QR code: show name only, same structure as no-logo case
|
% Logo in QR code: show name only
|
||||||
{\bfseries\usebox{\BCQ@namebox}}%
|
{\bfseries\cond{name}}%
|
||||||
|
\ifexists{Xcompany}{\\\Xcompany}%
|
||||||
\else
|
\else
|
||||||
% Logo next to name: two-column layout (logo | name)
|
% Logo next to name: two-column layout (logo | name)
|
||||||
% logoscale: 1.0 = 100% name height (default), 2.0 = 200%, etc.
|
% logoscale: 1.0 = 100% name height (default), 2.0 = 200%, etc.
|
||||||
@@ -342,12 +343,14 @@ END:VCARD\BCQ@nl}
|
|||||||
\hfill
|
\hfill
|
||||||
\begin{minipage}[c]{0.67\textwidth}% name column (adjusted from 0.75)
|
\begin{minipage}[c]{0.67\textwidth}% name column (adjusted from 0.75)
|
||||||
\ifBCQ@rightalign\raggedleft\fi% apply alignment
|
\ifBCQ@rightalign\raggedleft\fi% apply alignment
|
||||||
{\bfseries\usebox{\BCQ@namebox}}%
|
{\bfseries\cond{name}}%
|
||||||
|
\ifexists{Xcompany}{\\\Xcompany}%
|
||||||
\end{minipage}
|
\end{minipage}
|
||||||
\end{minipage}
|
\end{minipage}
|
||||||
\fi
|
\fi
|
||||||
}{% no logo: just name
|
}{% no logo: just name
|
||||||
{\bfseries\usebox{\BCQ@namebox}}%
|
{\bfseries\cond{name}}%
|
||||||
|
\ifexists{Xcompany}{\\\Xcompany}%
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
@@ -4,7 +4,7 @@
|
|||||||
\type{home}
|
\type{home}
|
||||||
\givennames{Petra}
|
\givennames{Petra}
|
||||||
\familynames{Test}
|
\familynames{Test}
|
||||||
\additionalnames{Example Company Ltd.}
|
\company{Example Company Ltd.}
|
||||||
\street{Bildstrasse\ 99}
|
\street{Bildstrasse\ 99}
|
||||||
\city{Basel}
|
\city{Basel}
|
||||||
\zip{4000}
|
\zip{4000}
|
||||||
|
|||||||
Binary file not shown.
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
\givennames{Alex}
|
\givennames{Alex}
|
||||||
\familynames{Muster}
|
\familynames{Muster}
|
||||||
\additionalnames{Example\ Company\ AG}
|
\company{Example\ Company\ AG}
|
||||||
\type{work}
|
\type{work}
|
||||||
\phone{+41 44 123 45 67}
|
\phone{+41 44 123 45 67}
|
||||||
\email{alex.muster@example.com}
|
\email{alex.muster@example.com}
|
||||||
|
|||||||
Binary file not shown.
@@ -4,7 +4,7 @@
|
|||||||
\type{home}
|
\type{home}
|
||||||
\givennames{Lisa\ Linda}
|
\givennames{Lisa\ Linda}
|
||||||
\familynames{Doe}
|
\familynames{Doe}
|
||||||
\additionalnames{Example\ Company}
|
\company{Example\ Company}
|
||||||
\street{Main\ Street\ 123}
|
\street{Main\ Street\ 123}
|
||||||
\city{New\ York}
|
\city{New\ York}
|
||||||
\zip{10001}
|
\zip{10001}
|
||||||
|
|||||||
Binary file not shown.
@@ -3,7 +3,7 @@
|
|||||||
\type{home}
|
\type{home}
|
||||||
\givennames{Max}
|
\givennames{Max}
|
||||||
\familynames{Muster}
|
\familynames{Muster}
|
||||||
\additionalnames{Big\ Logo\ Example}
|
\company{Big\ Logo\ Example}
|
||||||
\street{Beispielstrasse\ 42}
|
\street{Beispielstrasse\ 42}
|
||||||
\city{Winterthur}
|
\city{Winterthur}
|
||||||
\zip{8400}
|
\zip{8400}
|
||||||
|
|||||||
Reference in New Issue
Block a user