Fixed a display bug when an address was given without postcode/city

2012-02-06 17:01:55 +01:00
parent 2e8552cfc8
commit 0dec41c2f2
13 changed files with 8 additions and 6 deletions
--- a/2
+++ b/2
@ -4,6 +4,8 @@ version 0.19 (xx Feb 2012)
 - improved the pdf metadata, as reported by S. Wunsch (launchpad bug #922476).
 - fixed a footersymbol bug in the casual style when no mobile number was given,
 as reported by S. Wunsch (launchpad bug #922470).
+ - fixed a display bug when an address was given without postcode/city, as reported by
+ O.Shaneh (launchpad bug #670263).

 version 0.18 (05 Feb 2012)
 - corrected the handling of pdf bookmarks, as suggested on stackexchange by
--- a/examples/template-es.pdf
+++ b/examples/template-es.pdf
--- a/examples/template-zh.pdf
+++ b/examples/template-zh.pdf
--- a/examples/template.pdf
+++ b/examples/template.pdf
--- a/examples/template_banking_black.pdf
+++ b/examples/template_banking_black.pdf
--- a/examples/template_banking_red.pdf
+++ b/examples/template_banking_red.pdf
--- a/examples/template_casual_orange.pdf
+++ b/examples/template_casual_orange.pdf
--- a/examples/template_classic_green.pdf
+++ b/examples/template_classic_green.pdf
--- a/examples/template_multibib.pdf
+++ b/examples/template_multibib.pdf
--- a/moderncvstylebanking.sty
+++ b/moderncvstylebanking.sty
@ -110,7 +110,7 @@
    % detailed information
    \color{color2}\addressfont%
    \ifthenelse{\isundefined{\@addressstreet}}{}{\addtomaketitle[]{\addresssymbol\@addressstreet}%
-      \ifthenelse{\isundefined{\@addresscity}}{}{\addtomaketitle[~--~]{\@addresscity}}\flushmaketitle}%
+      \ifthenelse{\equal{\@addresscity}{}}{}{\addtomaketitle[~--~]{\@addresscity}}\flushmaketitle}% if \addresstreet is defined, \addresscity will always be defined but could be empty
    \ifthenelse{\isundefined{\@mobile}}{}{\addtomaketitle[]{\mobilesymbol\@mobile}}%
    \ifthenelse{\isundefined{\@phone}}{}{\addtomaketitle{\phonesymbol\@phone}}%
    \ifthenelse{\isundefined{\@fax}}{}{\addtomaketitle{\faxsymbol\@fax}}%
--- a/moderncvstylecasual.sty
+++ b/moderncvstylecasual.sty
@ -71,7 +71,7 @@
        \centering%
        \color{color2}\addressfont%
        \ifthenelse{\isundefined{\@addressstreet}}{}{\addtofooter[]{\addresssymbol\@addressstreet}%
-          \ifthenelse{\isundefined{\@addresscity}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter\@firstfooterelementtrue\\}%
+          \ifthenelse{\equal{\@addresscity}{}}{}{\addtofooter[~--~]{\@addresscity}}\flushfooter\@firstfooterelementtrue\\}% if \addresstreet is defined, \addresscity will always be defined but could be empty
        \ifthenelse{\isundefined{\@mobile}}{}{\addtofooter{\mobilesymbol\@mobile}}%
        \ifthenelse{\isundefined{\@phone}}{}{\addtofooter{\phonesymbol\@phone}}%
        \ifthenelse{\isundefined{\@fax}}{}{\addtofooter{\faxsymbol\@fax}}%
--- a/moderncvstyleclassic.sty
+++ b/moderncvstyleclassic.sty
@ -90,8 +90,8 @@
  \savebox{\maketitledetailsbox}{%
    \addressfont\color{color2}%
    \begin{tabular}[b]{@{}r@{}}%
-      \ifthenelse{\isundefined{\@addressstreet}}{}{\maketitledetailsnewline\addresssymbol\@addressstreet}%
-      \ifthenelse{\isundefined{\@addresscity}}{}{\maketitledetailsnewline\@addresscity}%
+      \ifthenelse{\isundefined{\@addressstreet}}{}{\maketitledetailsnewline\addresssymbol\@addressstreet%
+        \ifthenelse{\equal{\@addresscity}{}}{}{\maketitledetailsnewline\@addresscity}}% if \addresstreet is defined, \addresscity will always be defined but could be empty
      \ifthenelse{\isundefined{\@mobile}}{}{\maketitledetailsnewline\mobilesymbol\@mobile}%
      \ifthenelse{\isundefined{\@phone}}{}{\maketitledetailsnewline\phonesymbol\@phone}%
      \ifthenelse{\isundefined{\@fax}}{}{\maketitledetailsnewline\faxsymbol\@fax}%
--- a/moderncvstyleoldstyle.sty
+++ b/moderncvstyleoldstyle.sty
@ -129,8 +129,8 @@
    {{\centering\begin{minipage}{\quotewidth}\centering\quotestyle{\@quote}\end{minipage}\\[2.5em]}}%
  % optional details
  \makeinfo{%
-    \ifthenelse{\isundefined{\@addressstreet}}{}{\maketitledetailsnewline\addresssymbol\@addressstreet}%
-    \ifthenelse{\isundefined{\@addresscity}}{}{\maketitledetailsnewline\@addresscity}%
+    \ifthenelse{\isundefined{\@addressstreet}}{}{\maketitledetailsnewline\addresssymbol\@addressstreet%
+      \ifthenelse{\equal{\@addresscity}{}}{}{\maketitledetailsnewline\@addresscity}}% if \addresstreet is defined, \addresscity will always be defined but could be empty
    \ifthenelse{\isundefined{\@mobile}}{}{\maketitledetailsnewline\mobilesymbol\@mobile}%
    \ifthenelse{\isundefined{\@phone}}{}{\maketitledetailsnewline\phonesymbol\@phone}%
    \ifthenelse{\isundefined{\@fax}}{}{\maketitledetailsnewline\faxsymbol\@fax}%