Update example for three languages

diff --git a/example/Makefile b/example/Makefile
index 60ca9ecd4278d119f8257a2d7dbd4ba6e0dc07e0..853ffb5aedf49d1737906f03013a23b5472e088b 100644 (file)
--- a/example/Makefile
+++ b/example/Makefile
@@ -1,32 +1,36 @@
 # Our languages
-LANGS = en es
+LANGS = en es pt
+STYLES = classic oldstyle fancy banking casual academic friggeri
+PATTERNS := $(foreach style, $(STYLES), $(foreach lang, $(LANGS), $(style)-$(lang)))
 
 # Default source options
 NAME = example
 SOURCE = $(NAME: %=%.tex)
 DETAILS = true
 
-# Rules
-all: $(LANGS)
-
 # Default make to build these rules instead of files in case they exist
-.PHONY: all clean veryclean $(LANGS)
+.PHONY: all clean veryclean $(PATTERNS)
+
+# Rules
+all: $(PATTERNS)
 
 # we need to clean before compiling a new language
-$(LANGS): clean        
+$(PATTERNS): clean     
        # compile the language
-       $(eval INPUT="\def\defaultlang{\selectshortlanguage{$@}\details$(DETAILS)}\input{$(SOURCE)}")
-       pdflatex -interaction=nonstopmode $(INPUT) -jobname=$(NAME) 
+       $(eval STYLE = $(firstword $(subst -, ,$@)))
+       $(eval LANG = $(lastword $(subst -, ,$@)))      
+       $(eval INPUT="\def\defaultstyle{$(STYLE)}\def\defaultdetails{$(DETAILS)}\def\defaultopts{\selectshortlanguage{$(LANG)}}\input{$(SOURCE)}")
+       pdflatex -interaction=nonstopmode $(INPUT) -jobname=$(NAME)
        biber $(NAME)
        pdflatex -interaction=nonstopmode $(INPUT) -jobname=$(NAME)
-       pdflatex -interaction=nonstopmode $(INPUT) -jobname=$(NAME) 
+       pdflatex -interaction=nonstopmode $(INPUT) -jobname=$(NAME)
        # if it finishes move the file to the correct name
        mv $(NAME).pdf $(NAME)-$@.pdf
 
 
-# ignoramos los errores con -
+# Clean
 clean:
-       rm *.log *.aux *.out *.blg *.bbl *.run.xml *.bcf || true
+       rm *.log *.aux *.out *.blg *.bbl *.run.xml *.bcf *.synctex.gz || true
 
 veryclean: clean
        rm *.pdf || true
\ No newline at end of file

diff --git a/example/cvdata.bib b/example/cvdata.bib
index db44a6a14a03ce10167023f7db43ef1ed5714b50..414f1cb2cff97892b6e9c966208cc94a800a2e62 100755 (executable)
--- a/example/cvdata.bib
+++ b/example/cvdata.bib
@@ -1,93 +1,160 @@
 
-%  Studies
+% Studies
 
 @Study{phd,
   date={2000/2010},
-  title-en = {Ph.D.  in  Foo},
-  title-es = {Doctorado  en  Foo},
-  organization-en={Univeristy  of  Bar},
-  organization-es={Universidad  de  Bar},
+  title-en = {Ph.D. in Foo},
+  title-es = {Doctorado en Foo},
+  title-pt = {Doutorado em Foo},
+  organization-en={Univeristy of Bar},
+  organization-es={Universidad de Bar},
+  organization-pt={Universidade de Bar},
   country = {Fakeland},
-  description-es = {Hice  descubrimientos  novedosos  sobre  Bar.},
-  description-en = {Did  novel  discoveries  about  Bar.},
+  description-es = {Hice descubrimientos novedosos sobre Bar.},
+  description-en = {Did novel discoveries about Bar.},
+  description-pt = {Fiz novos descobrimentos sobre Bar.},
   keywords = {degrees}
 }
 
 @Study{tech-a,
   date={1990/1995},
-  title-en = {Deep  studies  on  A+},
-  title-es = {Estudios  profundos  de  A+},
-  organization={Kx  Systems},
+  title-en = {Deep studies on A+},
+  title-es = {Estudios profundos de A+},
+  title-pt = {Estudos profundos de A+},
+  organization={Kx Systems},
   country = {Canada},
-  description-es = {Aprendí  A+  estudiando  con  Arthur  Whitney.},
-  description-en = {Learned  A+  by  studing  with  Arthur  Whitney.},
+  description-es = {Aprendí A+ estudiando con Arthur Whitney.},
+  description-en = {Learned A+ by studing with Arthur Whitney},
+  description-pt = {Aprendi A+ estudando com Arthur Whitney.},
+  note = {This was in the dawn of A},
   keywords = {tech}
 }
 
-%  Positions
+@Study{tech-b,
+  date={1990/1995},
+  title-en = {Deep studies on B+},
+  title-es = {Estudios profundos de B+},
+  title-pt = {Estudos profundos de B+},
+  organization={Nowhere},
+  country = {},
+  description-es = {Aprendí B+ estudiando con Ken Thompson.},
+  description-en = {Learned B+ by studing with Ken Thompson.},
+  description-pt = {Aprendi B+ estudando com Ken Thompson.},
+  note = {This wasn't in the dawn of B.},
+  keywords = {tech}
+}
+
+@Study{tech-c,
+  date={1995/2000},
+  title-en = {Deep studies on C},
+  title-es = {Estudios profundos de C},
+  title-pt = {Estudos profundos de C},
+  organization={Nowhere},
+  country = {},
+  description-es = {Aprendí C estudiando con Ken Thompson.},
+  description-en = {Learned C by studing with Ken Thompson.},
+  description-pt = {Aprendi C estudando com Ken Thompson.},
+  note = {This was in the dawn of C.},
+  keywords = {tech}
+}
+
+% Positions
 
 @Position{res2010,
   date={2010/},
   title = {researcher},
-  organization-en={Univeristy  of  Bar},
-  organization-es={Universidad  de  Bar},
+  organization-en={Univeristy of Bar},
+  organization-es={Universidad de Bar},
+  organization-pt={Universidade de Bar},
   country = {Fakeland},
-  Description-es = {Apoyaba  como  investigador  en  experimentos  relacionados  con  dilataci\'on  y  contracci\'on  espacio-temporal.},
-  Description-en = {I  work  as  researcher  in  experiments  related  to  spatio-temporal  dilations  and  contractions.}
+  description-es = {Apoyaba como investigador en experimentos relacionados con dilataci\'on y contracci\'on espacio-temporal.},
+  description-en = {I work as researcher in experiments related to spatio-temporal dilations and contractions.},
+  description-pt = {Apoiei como pesquisador em experimentos relacionados à dilatação e contração no espaço-tempo.}
 }
 
 @Position{res1900,
   date={1900/1920},
   title = {researcher},
-  organization-en={Univeristy  of  Bar},
-  organization-es={Universidad  de  Bar},
+  organization-en={Univeristy of Bar},
+  organization-es={Universidad de Bar},
+  organization-pt={Universidade de Bar},
   country = {Fakeland},
-  Description-es = {Apoyaba  como  investigador  en  experimentos  relacionados  con  dilataci\'on  y  contracci\'on  espacio-temporal.},
-  Description-en = {I  worked  as  researcher  in  experiments  related  to  spatio-temporal  dilations  and  contractions.}
+  description-es = {Apoyaba como investigador en experimentos relacionados con dilataci\'on y contracci\'on espacio-temporal.},
+  description-en = {I worked as researcher in experiments related to spatio-temporal dilations and contractions.},
+  description-pt = {Apoiei como pesquisador em experimentos relacionados à dilatação e contração no espaço-tempo.},
+  note = {This has a note.}
 }
 
-%  Courses  taught
+% Courses taught
 
 @Course{qf101,
   date={2010/},
-  title-es = {F\'isica  Cu\'antica},
-  title-en = {Quantum  Physics},
-  organization-en={Univeristy  of  Bar},
-  organization-es={Universidad  de  Bar},
-  Description-en = {Taught  physics  101.},
-  Description-es = {Ense\~n\'e  a  los  principios  b\'asicos  de  la  f\'isica.}
+  title-es = {F\'isica Cu\'antica},
+  title-en = {Quantum Physics},
+  title-pt = {Física Quântica},
+  organization-en={Univeristy of Bar},
+  organization-es={Universidad de Bar},
+  organization-pt={Universidade de Bar},
+  Description-en = {Taught physics 101.},
+  Description-es = {Ense\~n\'e a los principios b\'asicos de la f\'isica.}
 }
 
 @Thesis{doe2010,
-  author = {John  Doe},
+  author = {Doe, John Jr.},
   date={2010},
-  title-en = {On  time  traveling  and  paradoxes},
-  title-es = {Sobre  viajes  en  el  tiempo  y  paradojas},
-  organization-en={Univeristy  of  Bar},
-  organization-es={Universidad  de  Bar},  level = {doctor},
-  note = {Co  guided  with  myself.}
+  title-en = {On time traveling and paradoxes},
+  title-es = {Sobre viajes en el tiempo y paradojas},
+  title-pt = {Sobre viagem no tempo e paradoxos},
+  organization-en={Univeristy of Bar},
+  organization-es={Universidad de Bar}, 
+  organization-pt={Universidade de Bar},
+  level = {doctor},
+  note = {Co guided with myself.}
 }
 
-%  Projects
+
+@Thesis{doe2011,
+  author = {Doe, John Jr.},
+  date={2010},
+  title-en = {On time traveling and paradoxes II},
+  title-es = {Sobre viajes en el tiempo y paradojas II},
+  title-pt = {Sobre viagem no tempo e paradoxos II},
+  organization-en={Univeristy of Bar},
+  organization-es={Universidad de Bar}, 
+  organization-pt={Universidade de Bar},
+  level = {Unknown level},
+  note-es = {Co-guiado con mi otro yo.}
+}
+
+% Projects
 
 @Project{g2050,
-  title = {Spatio-temporal  dilations  and  contractions},
-  author = {John  Doe},
+  title = {Spatio-temporal dilations and contractions},
+  author = {John Doe},
   Month = oct,
   role = {pi},
-  funding = {TT  Foundation},
+  funding = {TT Foundation},
   Year = {2050}
 }
 
+@Project{g2017,
+  title = {Foundations on the unknown},
+  author = {John Doe},
+  Month = oct,
+  funding = {University of Unknown},
+  role = {My inventend role},
+  Year = {2017}
+}
+
 @Project{g2015,
-  title = {Foundations  for  spatio-temporal  dilations  and  contractions},
-  author = {John  Doe},
+  title = {Foundations for spatio-temporal dilations and contractions},
+  author = {John Doe},
   Month = oct,
-  funding = {University  of  Bar},
+  funding = {University of Bar},
   Year = {2015}
 }
 
-%  Articles
+% Articles
 
 @Article{doe2005,
   title = {Can we time travel?},
@@ -102,7 +169,23 @@
 @cvmisc{mtt,
   title-en={TT Member},
   title-es={Miembro TT},
-  date={1920/},
+  title-pt={Membro TT},
+  date={1920},
   keywords = {mem}
 }
 
+@cvmisc{mttt,
+  title-en={TTT Member},
+  title-es={Miembro TTT},
+  title-pt={Membro TTT},
+  date={1921/1930},
+  keywords = {mem}
+}
+
+@cvmisc{mxtt,
+  title-en={XTT Member},
+  title-es={Miembro XTT},
+  title-pt={Membro XTT},
+  date={1930/},
+  keywords = {mem}
+}

diff --git a/example/example.tex b/example/example.tex
index 3d79e57d0747bf44689087c5ec3873574e251de6..bcf62fa8df5bd160d2da46a152b4b5ecdac35f2f 100755 (executable)
--- a/example/example.tex
+++ b/example/example.tex
@@ -2,21 +2,50 @@
 \documentclass[12pt,a4paper]{moderncv}   % possible options include font size ('10pt', '11pt' and '12pt'), paper size ('a4paper', 'letterpaper', 'a5paper', 'legalpaper', 'executivepaper' and 'landscape') and font family ('sans' and 'roman')
 
 \usepackage[utf8]{inputenc}
-\usepackage[english, spanish.lcroman.tabla.noquoting.noshorthands]{babel}
-% \usepackage[spanish.lcroman.tabla.noquoting.noshorthands]{babel}
+\usepackage[english, portuguese, spanish.lcroman.tabla.noquoting.noshorthands.notilde]{babel}
 \usepackage[spanish=mexican]{csquotes}
 
 % moderncv themes
-\moderncvstyle{academic}                        % style options are 'casual' (default), 'classic', 'oldstyle' and 'banking'
-\moderncvcolor{grey}                          % color options 'blue' (default), 'orange', 'green', 'red', 'purple', 'grey' and 'black'
-%\renewcommand{\familydefault}{\sfdefault}    % to set the default font; use '\sfdefault' for the default sans serif font, '\rmdefault' for the default roman one, or any tex font name
-%\nopagenumbers{}                             % uncomment to suppress automatic page numbering for CVs longer than one page
+% I use this for automatic creation of the cv
+% default options passed outside of the cv, generally through the Makefile
+\ifdef{\defaultstyle}%
+{}{%
+  % options by hand
+  \def\defaultstyle{academic}
+}
+\ifdef{\defaultdetails}%
+{}{%
+  % options by hand
+  \def\defaultdetails{true}
+}
+\ifdef{\defaultopts}%
+% default options passed outside of the cv, generally through the Makefile
+{}{%
+  % options by hand
+  \def\defaultopts{%
+    \selectlanguage{portuguese}
+%    \selectshortlanguage{pt}%
+  }
+}
+
+%\usepackage[style=classic, details]{academic}
+%\usepackage[style=oldstyle, details]{academic}
+%\usepackage[style=fancy, details]{academic}
+%\usepackage[style=banking, details]{academic}
+%\usepackage[style=casual, details]{academic}
+%\usepackage[style=academic, details]{academic}
+%\usepackage[style=friggeri , details]{academic}
+\usepackage[style=\defaultstyle, details=\defaultdetails]{academic}
 
+% color options 'blue' (default), 'orange', 'green', 'red', 'purple', 'grey' and 'black'
+\moderncvcolor{grey}
+\moderncvicons{fa-academic}
 
-% For paper portrait
-\usepackage[misc]{ifsym}
+%\renewcommand{\familydefault}{\sfdefault}    % to set the default font; use '\sfdefault' for the default sans serif font, '\rmdefault' for the default roman one, or any tex font name
+%\nopagenumbers{}                             % uncomment to suppress automatic page numbering for CVs longer than one page
 
-\newgeometry{margin=2.5cm}
+\usepackage{geometry}
+\geometry{margin=2cm}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % personal data
@@ -43,42 +72,33 @@
 % Lastname Name Abbrev.
 \boldname{Doe}{John}{J.}
 
-% We can set the details (by default is false)
-\detailstrue
-
 
 %----------------------------------------------------------------------------------
 %            headers
 %----------------------------------------------------------------------------------
 % We can define the headers in multiple languages and then using the macro
 % These definitions can be inside the body too
-\newmlcommand[english=Education, spanish=Educación]{\education}
-\newmlcommand[english=Degrees, spanish={Grados Académicos}]{\degrees}
-\newmlcommand[english=Technical, spanish={Estudios Técnicos}]{\technical}
-\newmlcommand[english={Employment History}, spanish={Historial de Empleo}]{\employment}
-\newmlcommand[english={Academic}, spanish={Académia}]{\academic}
-\newmlcommand[english={Teaching Experience}, spanish={Experiencia Docente}]{\teaching}
-\newmlcommand[english={Courses Taught}, spanish={Cursos Impartidos}]{\courses}
-\newmlcommand[english={Guided Theses}, spanish={Tésis Guiadas}]{\theses}
-\newmlcommand[english={Funding}, spanish={Proyectos de Investigación}]{\funding}
-\newmlcommand[english={Grants}, spanish={Fondos de Investigación}]{\grants}
-\newmlcommand[english={Publications}, spanish={Publicaciones}]{\publications}
-\newmlcommand[english={Journals}, spanish={Revistas}]{\journals}
-\newmlcommand[english={Other Appointments}, spanish={Otros Cargos}]{\appointments}
-\newmlcommand[english={Memberships}, spanish={Membresias}]{\memberships}
+\newmlcommand[english=Education, spanish=Educación, portuguese=Educação]{\education}
+\newmlcommand[english=Degrees, spanish={Grados Académicos}, portuguese={Graus Acadêmicos}]{\degrees}
+\newmlcommand[english=Technical, spanish={Estudios Técnicos}, portuguese={Estudos Técnicos}]{\technical}
+\newmlcommand[english={Employment History}, spanish={Historial de Empleo}, portuguese={Emprego Histórico}]{\employment}
+\newmlcommand[english={Academic}, spanish={Académia}, portuguese={Academia}]{\academic}
+\newmlcommand[english={Teaching Experience}, spanish={Experiencia Docente}, portuguese={Experiência Docente}]{\teaching}
+\newmlcommand[english={Courses Taught}, spanish={Cursos Impartidos}, portuguese={Disciplinas Ministradas}]{\courses}
+\newmlcommand[english={Guided Theses}, spanish={Tésis Guiadas}, portuguese={Teses Orientadas}]{\theses}
+\newmlcommand[english={Funding}, spanish={Proyectos de Investigación}, portuguese={Projetos de Pesquisa}]{\funding}
+\newmlcommand[english={Grants}, spanish={Fondos de Investigación}, portuguese={Fundos de Pesquisa}]{\grants}
+\newmlcommand[english={Publications}, spanish={Publicaciones}, portuguese={Publicações}]{\publications}
+\newmlcommand[english={Journals}, spanish={Revistas}, portuguese={Revistas}]{\journals}
+\newmlcommand[english={Other Appointments}, spanish={Otros Cargos}, portuguese={Outras Nomeações}]{\appointments}
+\newmlcommand[english={Memberships}, spanish={Membresias}, portuguese={Sociedades}]{\memberships}
 
 %----------------------------------------------------------------------------------
 %            content
 %----------------------------------------------------------------------------------
 \begin{document}
 % I use this for automatic creation of the cv
-\ifdef{\defaultopts}%
-% default options passed outside of the cv, generally through the Makefile
-{\defaultops}{%
-  % options by hand
-  %    \selectlanguage{spanish}
-  \selectshortlanguage{es}
-}
+\defaultopts
 
 % Print the header
 \makecvtitle