From 37c5802d7a99618001975813c4f6d069b620c6c2 Mon Sep 17 00:00:00 2001
From: norangebit <git@norangeb.it>
Date: Thu, 27 Feb 2020 19:00:40 +0100
Subject: [PATCH] fix optional argument for europass

---
 README.md                           |   8 ++++----
 examples/europasscv/europasscv.pdf  | Bin 55725 -> 55736 bytes
 examples/europasscv/europasscv.yaml |   2 --
 pancv.tex                           |  15 +++++++++------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 32e62ef..316cb3c 100644
--- a/README.md
+++ b/README.md
@@ -19,8 +19,6 @@ A pandoc LaTeX template for creating a curriculum vitae.
 
 *Pancv* uses packages [moderncv](https://launchpad.net/moderncv) and [europasscv](https://github.com/gmazzamuto/europasscv).
 
-***Warning***: Europass support is still experimental.
-
 ### Installation
 
 - Install pandoc and a LaTeX distribution.
@@ -63,6 +61,8 @@ For example, you can get the same result as the [previous example](#usage) throu
 docker run --rm --volume "`pwd`:/data" --user `id -u`:`id -g` norangebit/pandocker pandoc cv.yaml --template pancv -o cv.pdf
 ```
 
+***Warning***: Europass is still not supported via docker.
+
 ### Variables
 
 - `europass` (*boolean*) equal to `true` if you want a curriculum in *europass* format (default to false)
@@ -99,8 +99,6 @@ docker run --rm --volume "`pwd`:/data" --user `id -u`:`id -g` norangebit/pandock
 
 *Pancv* utilizza il pacchetto [moderncv](https://launchpad.net/moderncv) e il pacchetto [europasscv](https://github.com/gmazzamuto/europasscv).
 
-***Attenzione***: Il supporto al formato europass è ancora in fase sperimentale.
-
 ### Installazione
 
 - Installare pandoc e una distribuzione LaTeX.
@@ -143,6 +141,8 @@ Per esempio si può ottenere lo stesso risultato dell'[esempio precedente](#uso)
 docker run --rm --volume "`pwd`:/data" --user `id -u`:`id -g` norangebit/pandocker pandoc cv.yaml --template pancv -o cv.pdf
 ```
 
+***Attenzione***: Europass ancora non è supportato tramite docker.
+
 ### Variabili
 
 - `europass` (*boolean*) pari a `true` se si desidera un curriculum in formato *europass*
diff --git a/examples/europasscv/europasscv.pdf b/examples/europasscv/europasscv.pdf
index b4addd7f3acc9cd1b05f2ea0d1a9487a947902fa..f8c0e23773354cff826b51159f79d2290b251c9a 100644
GIT binary patch
delta 1359
zcmV-V1+e<9vje!Z1CS*GH8hjG*eHL!S4(r^Mi9R9E9NLwS;M>^dy3Zv%8q02+W55I
z1B=F>ltEr0HpZ17pB~Nda15IS>=ad+5hHc?*I&Ox&<GLKYf-ooM3LZFTZuHRN@z5k
zw7$16SDdltfsJi*w0tf8(LS39bXvAP!;fHM7?+4(sg*FWYO9Dr6)4<sbiIGJBa4P)
z8<u?Rx7uCKk;PUqh5Gl1T8V{4S_(|z{eF(VBq#H#N;4{xVmN=8PtuHOll&;^flI&k
z&s!t{ezjsEK@`C(EYc9ZG<M4YnA+}AxnWC2nZ|~B(<$bf2Wvicu5Yd`k1x`UbDo@C
zc2lO4tLxv6QzMf8+12F>quPI6rV$mG3&k3If?=(|Q9;;wIi7+bs*}^w<4OXgPJiV#
zMhO;NAY}<QlrQ<C!m7yMYP*9!y5w)g#8PIqA+(|51$@RNRtgj|Y={c>&g#m!IzS&x
zbH5SEG-W0MUf}u-K$yf;J5gv*Xv7{U*iTTbh3-b70fmkz2xVMIrHy~xX{RLEO1X!f
zd}-(U5a_p{nqp=fiC?}Fl*7q6#2&W>{n0!(K^CITXxKiWo9#f?R_z8V8McsJ4ba~q
zyl`FyQhv$H$)K3xVL1sQ`k(Uy5<x;*T9io&aYJJaUwwR;hnPVr5dKBUEcdm*7$$<`
z?MEORNcjGm212po;_rV>vp~VpX-r!TA-eL~T8Mz)rr;YdgmUGD_yYxG2&CbPDu?cU
zU5kdl_9>O%Q%R9D95WIN03+1g5hfX7!~=&EHyiIj<<f?)6C6^48=mxw`oV?AU#I|&
z8l{$xAH}LNoz+D>uZwbu(@Y4N^r}Jb@ZP*ps<8xx8ROVS-a3D$w<l1v`0Jweh73w+
zq3YAa81zECvO^dYkZVe;7?goQYW|VIQ#XQ|w}m<G)7tE2?kH5plcM&Oap67PkSR9E
zL|K#qy#_oQBMgMNDpuLCt6UINk6rjHce7ztJbE2LMl={&B-VniFp`K-{?8cS2-jYL
zu3^aFKF&e?vT1)^9AEZskG+At&dqxTy3nCC9u(+83#=&JE6|m}6q+FPH4L3CrucO9
zP|U_KJP|^YUT6g2n(ysmAQWbyP)TC2-TZoXaq)hx<xqW<I?%P;4_<n|8Um0F641vD
z%(!7D9n@}AR*Mk1G<x{y=_%&OV$mc+ynB9rZnA<vK0trsiLFA|TL|I*PRP%O<~?To
zW{CIBBs2`p!~mx->vM=ou350On{tx4Z()|74`7A+MHuIqK8l;zRS&cXNQ2SAe{K-}
zJ<;gDW0D3Xoq1J0y1_Ku-A+R#3+f3AyF13zhDput&#;W^`td`%?Yxx1Y?cBXJaoCc
z_W;Ysl*1%_IE3XL+zn+}V+|uEobj0IpHe}R!N>&*=~k_fU4H>Y$QX39VFYl=1T{A^
zF_YEJ9|ScwGcmLH&2<V-LPjz$F)>C)H8Vv;GD9;sK{PZ$Getu<F)=weK`=fbJTgN<
zMlvulF-Ar;Get!*Lo+x*G&DgoMMF3-F*!FuFg{%hFHB`_XLM*FF*Y-kyx1#$w++Hz
z5QgD9V{$Oj1Y@GfnGG0$0*L~#2@+xo*nplL=%A)y7I^>SxmVYGBJ#7u5`EvemZ}#O
z^^c;RgZX{6Po^yu$Fu<#b2Kr<3==G1Ap{#?L=Z&`aU_sLN)ubr(ni$1n%y)qaF9g~
zc@$7Y31w7JMGYS67^962x)>oK(BNx!d%C}v_Vs=?9q8j}I>Ztyto5}M{dn>R6QdE>
RlZDwI2{JPZB_%~qMheiydCmX;

delta 1350
zcmV-M1-bgTvjeTO1CS*FG?UKGDSy>h%TnV;6y5tPdMQ<*cE2B4h2d2Y0uwN+VHO@N
zj8oWVWO;(Ae0)x;+Yf?0N$g>fa+SK}mhQdhp8FCbeZt5|i{r`&CrVQ5HL+NYvgB^q
z`r4w>NFkaBR<_O2{I&E)`*f(t;kfl1evC3Fq$Z4NYm~!ky<v`2P`KgfYJX`*kqjwT
zEcwuBwU4DFo_Zq;>D&|UHC3KittiL)ogVp=9Zah#FSyPIchkq|FfW94*|$O6E%VQv
zvldH$->j5rh+<U4MLQ<v#;!SlsqJH~S8OS`u+)iQI;YagXwAo?tLw{){qww#Qf8+Y
z$GNcC<<+nIxl>u^^z!1BQGe}YVF_1MDkB<vN>FRys3`1g{4jzbZnML2z?DTvN1cV+
z1ZPx9MT}?EaXIIYD{m5ii|q#f_?*856LXoxiqM9NSMY_<)EFoh)G-t7ozzuX))9Jl
z)C(JxjdI~K@Pg|XfN)t^?QMi%q0y-=V2JO)SPI<?!vcm)Fc=q7X@6s#-)N_1)N8$k
zopNsH@(}!csOD7oM&hT>jP!7FhTxOlkw2Q}hQuS>oW=H$T(1YZv}!X@EvQF&H9&ty
ze9_)Gvhs6pJnRle^lm(iG5Vhq1eu_bm!1@wBXD>M;>!=O6Ojtk0u^4=!pl$$oD(Wa
zUVjAHAmQs<8W^WWs(-&b&4Yru(}eXDF}m>DQiwuybND6*;nD;l;lO|lMJ%qQD#?8)
zY{~GqKIIxd)tqQ2sbHxB2*%wl6Iw9A0&wKGTX_ei%R0HtaO8w^GV2WL$1*<tN(DUX
zjF~^am&(d$QV;5BJs6K@UMQurgFzh<Y!=T?s&22OTeHZyrGFag3n8gbEFK-+9H55D
zw>9hs@~O2)6X3h?8H5C7yYQ)yc}6Yx)R9l_{*lkavX2tDhDRBa+-=PxDUtwm9XK<E
z8s0CfRBs>3s*DA<ekkK#y>fC_4W5GdC?na5W=XB$3wSKS)BkIDTZOvC)FDHpL;bvq
zo$p_q-0TNCPk)ZC-z(IWjiqv@P*+w_!}(UBZXD%kis*9`oh~K$sQ);aJYbq)jAbXW
zF~n<cYZrr13`en+q?o(@<@Egg{ah<ijg8sSwK7a%cDpJ9$c`xVb%&uh4yoO`?2oGy
z_&j;|`T04e%4{|Z#Wmf%yu377!H^HgKebkf_z^<nzkd_*y(xN&p}(2xgEJYAlQeVS
z6vMwnR7xwNrN_BsS@|Un_tP#`+|S~CFYI30q%OOoMIa5MMEL$-;RB=5e=9VPN{*)0
z_^IrU;@!;%6=$KIiMYEJ!mOCo?EZ|)LtQ`p)NYqSN_R5J0f*j|z4AT)96#j}_wf+R
zJGdLw*&0%d5ff)JrTWKQv8>xKqlJ8}R%F*-MQj~rvugx!$pkPrH8_*s%^w6XH#Io3
z0?u^`P)0Z~Ml(W1IXO5nMKCovLNzoqF+n#tMm94xMKv-$AUrZdMmR7=GeSi<IXE#z
zFf}<sH8e9ZK{q%?HZwLwH8MV33NK7$ZfA68ATc&FAd}C|D1Q~qIT8V35QgFIv5$Qj
z`&h=<cZnkiWJ=&3s+3c34Y|}6NF*+!c>mz(w>tSm<Y$Q``nqy0)#_K&-HUoV^Sc^6
znzmHZrVSJ^LlYBBF~%Gg0th06Fd~Q|1{-lC)ZU0XYtiDx>?V;y8X07fLmmY<D4~oB
zs;Hrk5!&$3!66X7`fsz_)x+7er?-=7U+)jo0Tx(drO&PCCo6x&xDrc~kl7yzF*6D!
IB}Gq03KVCK^Z)<=

diff --git a/examples/europasscv/europasscv.yaml b/examples/europasscv/europasscv.yaml
index 1e7bc37..c96234c 100644
--- a/examples/europasscv/europasscv.yaml
+++ b/examples/europasscv/europasscv.yaml
@@ -14,7 +14,6 @@ cron-sections:
       - year: 2018--2020
         degree: Job Title
         institution: Institution
-        city: City
         grade: Grade
   - section: Education
     entries:
@@ -28,7 +27,6 @@ cron-sections:
         degree: Degree
         institution: Institution
         city: City
-        grade: Grade
         description: Insert here the description
 sections:
   - section: Languages
diff --git a/pancv.tex b/pancv.tex
index c39d4b2..36e2e97 100644
--- a/pancv.tex
+++ b/pancv.tex
@@ -16,7 +16,10 @@ $if(europass)$
 }
 
 \newcommand{\pancvaddress}[2]{
-  \ecvaddress{#1, #2}
+  \ecvaddress{%
+    #1%
+    \ifthenelse{\isempty{#2}{}}{}{, #2}
+  }
 }
 
 \newcommand{\pancvsection}[1]{
@@ -24,12 +27,12 @@ $if(europass)$
 }
 
 \newcommand{\pancventry}[6]{
-  \ecvitem{#1}{
+  \ecvitem{#1}{%
     \textbf{#2},
-    #3.
-    \ifthenelse{\isempty{#4}}{}{#4}
-    \ifthenelse{\isempty{#5}}{}{#5.}
-    \ifthenelse{\isempty{#6}}{}{\newline #6}}
+    #3%
+    \ifthenelse{\isempty{#4}}{.}{, #4.}%
+    \ifthenelse{\isempty{#5}}{}{ #5.}%
+    \ifthenelse{\isempty{#6}}{}{\newline #6}}%
 }
 
 \newcommand{\pancvitem}[2]{