summaryrefslogtreecommitdiffstats
path: root/docs/build
diff options
context:
space:
mode:
Diffstat (limited to 'docs/build')
-rw-r--r--docs/build/pdi.aux65
-rw-r--r--docs/build/pdi.bbl100
-rw-r--r--docs/build/pdi.bcf237
-rw-r--r--docs/build/pdi.blg35
-rw-r--r--docs/build/pdi.log483
-rw-r--r--docs/build/pdi.out6
-rw-r--r--docs/build/pdi.pdfbin225308 -> 220289 bytes
-rw-r--r--docs/build/pdi.toc60
8 files changed, 437 insertions, 549 deletions
diff --git a/docs/build/pdi.aux b/docs/build/pdi.aux
index a7e6a95..894532d 100644
--- a/docs/build/pdi.aux
+++ b/docs/build/pdi.aux
@@ -71,18 +71,9 @@
\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.2.1}Modern Canada}{3}{subsection.1.2.1}}
\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {1.3}Natural resources}{3}{section.1.3}}
\abx@aux@segm{0}{0}{statscan:ghgemissions}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.3.1}Non-renewable energy sources}{4}{subsection.1.3.1}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsubsection}{Crude Oil}{4}{section*.2}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsubsection}{Natural Gas}{4}{section*.3}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsubsection}{Coal}{4}{section*.4}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.3.2}Renewable energy sources}{4}{subsection.1.3.2}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsubsection}{Wind Energy}{4}{section*.5}}
-\abx@aux@segm{0}{0}{nrcan:energyfactsbook}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsubsection}{Solar Photovoltaic}{5}{section*.6}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsubsection}{Hydroelectric}{5}{section*.7}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsubsection}{Solar Thermal}{5}{section*.8}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsubsection}{Marine Energy}{5}{section*.9}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.3.3}Nuclear energy}{6}{subsection.1.3.3}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.3.1}Crude Oil}{4}{subsection.1.3.1}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.3.2}Natural Gas}{4}{subsection.1.3.2}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {1.3.3}Coal}{4}{subsection.1.3.3}}
\select@language{italian}
\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\select@language{italian}}
\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\select@language{italian}}
@@ -93,50 +84,50 @@
\abx@aux@segm{0}{0}{nrcan:energymeeting}
\abx@aux@cite{nrcan:wind}
\abx@aux@segm{0}{0}{nrcan:wind}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {2}Produzione Energetica}{7}{chapter.2}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {2}Produzione Energetica}{5}{chapter.2}}
\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\addvspace {10\p@ }}
\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\addvspace {10\p@ }}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {2.1}Energia Eolica}{7}{section.2.1}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {2.1}Energia Eolica}{5}{section.2.1}}
\abx@aux@segm{0}{0}{nrcan:energyfactsbook}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {2.2}Energia Idroelettrica}{8}{section.2.2}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {2.3}Energia Marina}{8}{section.2.3}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {2.4}Energia Solare Fotovoltaica}{8}{section.2.4}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {2.2}Energia Idroelettrica}{6}{section.2.2}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {2.3}Energia Marina}{6}{section.2.3}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {2.4}Energia Solare Fotovoltaica}{6}{section.2.4}}
\abx@aux@cite{pieroconti}
\abx@aux@segm{0}{0}{pieroconti}
\abx@aux@cite{energycrisis}
\abx@aux@segm{0}{0}{energycrisis}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {2.5}Energia Solare Termica}{9}{section.2.5}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {2.6}Energia Geotermica}{9}{section.2.6}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {3}Consumo Energetico}{10}{chapter.3}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {2.5}Energia Solare Termica}{7}{section.2.5}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {2.6}Energia Geotermica}{7}{section.2.6}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {3}Consumo Energetico}{8}{chapter.3}}
\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\addvspace {10\p@ }}
\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\addvspace {10\p@ }}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {3.1}Consumo Elettrico}{10}{section.3.1}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {3.1}Consumo Elettrico}{8}{section.3.1}}
\abx@aux@cite{cansim:electricity}
\abx@aux@segm{0}{0}{cansim:electricity}
\abx@aux@cite{poterecalorico}
\abx@aux@segm{0}{0}{poterecalorico}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {4}Politiche Ecologiche}{11}{chapter.4}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {4}Politiche Ecologiche}{9}{chapter.4}}
\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\addvspace {10\p@ }}
\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\addvspace {10\p@ }}
-\newlabel{politics}{{4}{11}{Politiche Ecologiche}{chapter.4}{}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {4.1}Emissioni}{11}{section.4.1}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {4.1.1}Produzione Elettrica}{11}{subsection.4.1.1}}
+\newlabel{politics}{{4}{9}{Politiche Ecologiche}{chapter.4}{}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {4.1}Emissioni}{9}{section.4.1}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {4.1.1}Produzione Elettrica}{9}{subsection.4.1.1}}
\abx@aux@cite{cansim:electricityfuel}
\abx@aux@segm{0}{0}{cansim:electricityfuel}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {paragraph}{Coefficente di emissione di CO\textsubscript {2} ($k_{CO_2}$):}{12}{section*.10}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {paragraph}{Potere Calorico ($\Delta _c$):}{12}{section*.11}}
-\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\contentsline {table}{\numberline {4.1}{\ignorespaces Combustibili utilizzati dalle centrali elettriche per produrre elettricit\`a nel 2015 \cite {cansim:electricityfuel}.}}{12}{table.4.1}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {4.1.2}Emissioni da economie domestiche (abitazioni)}{13}{subsection.4.1.2}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {4.2}L'energia dell'atomo}{13}{section.4.2}}
-\newlabel{nuclear}{{4.2}{13}{L'energia dell'atomo}{section.4.2}{}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {4.2.1}Morti}{13}{subsection.4.2.1}}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {5}Conclusioni}{15}{chapter.5}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {paragraph}{Coefficente di emissione di CO\textsubscript {2} ($k_{CO_2}$):}{10}{section*.2}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {paragraph}{Potere Calorico ($\Delta _c$):}{10}{section*.3}}
+\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\contentsline {table}{\numberline {4.1}{\ignorespaces Combustibili utilizzati dalle centrali elettriche per produrre elettricit\`a nel 2015 \cite {cansim:electricityfuel}.}}{10}{table.4.1}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {4.1.2}Emissioni da economie domestiche (abitazioni)}{11}{subsection.4.1.2}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {4.2}L'energia dell'atomo}{11}{section.4.2}}
+\newlabel{nuclear}{{4.2}{11}{L'energia dell'atomo}{section.4.2}{}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {subsection}{\numberline {4.2.1}Morti}{11}{subsection.4.2.1}}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {chapter}{\numberline {5}Conclusioni}{13}{chapter.5}}
\@writefile{lof}{\defcounter {refsection}{0}\relax }\@writefile{lof}{\addvspace {10\p@ }}
\@writefile{lot}{\defcounter {refsection}{0}\relax }\@writefile{lot}{\addvspace {10\p@ }}
-\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {5.1}Dichiarazione d'autenticit\`a}{15}{section.5.1}}
-\newlabel{LastPage}{{}{17}{}{page.17}{}}
-\xdef\lastpage@lastpage{17}
-\xdef\lastpage@lastpageHy{17}
+\@writefile{toc}{\defcounter {refsection}{0}\relax }\@writefile{toc}{\contentsline {section}{\numberline {5.1}Dichiarazione d'autenticit\`a}{13}{section.5.1}}
+\newlabel{LastPage}{{}{15}{}{page.15}{}}
+\xdef\lastpage@lastpage{15}
+\xdef\lastpage@lastpageHy{15}
\abx@aux@refcontextdefaultsdone
\abx@aux@defaultrefcontext{0}{history}{nty/global/}
\abx@aux@defaultrefcontext{0}{nrcan:energymeeting}{nty/global/}
diff --git a/docs/build/pdi.bbl b/docs/build/pdi.bbl
index 1697650..5728a3d 100644
--- a/docs/build/pdi.bbl
+++ b/docs/build/pdi.bbl
@@ -1,5 +1,5 @@
% $ biblatex auxiliary file $
-% $ biblatex bbl format version 2.8 $
+% $ biblatex bbl format version 2.7 $
% Do not modify the above lines!
%
% This is an auxiliary file used by the 'biblatex' package.
@@ -21,18 +21,16 @@
\sortlist[entry]{nty/global/}
\entry{history}{online}{}
\name{author}{1}{}{%
- {{hash=b2bc83400e81aefcdb6838793bd45dba}{%
+ {{hash=09ba5d89f754cfafcb7dcb45f1a5f337}{%
+ prefix={of},
+ prefix_i={o\bibinitperiod},
family={Canada},
- familyi={C\bibinitperiod},
+ family_i={C\bibinitperiod},
given={Government},
- giveni={G\bibinitperiod},
- prefix={of},
- prefixi={o\bibinitperiod}}}%
+ given_i={G\bibinitperiod}}}%
}
- \strng{namehash}{b2bc83400e81aefcdb6838793bd45dba}
- \strng{fullhash}{b2bc83400e81aefcdb6838793bd45dba}
- \strng{authornamehash}{b2bc83400e81aefcdb6838793bd45dba}
- \strng{authorfullhash}{b2bc83400e81aefcdb6838793bd45dba}
+ \strng{namehash}{09ba5d89f754cfafcb7dcb45f1a5f337}
+ \strng{fullhash}{09ba5d89f754cfafcb7dcb45f1a5f337}
\field{sortinit}{C}
\field{sortinithash}{59f25d509f3381b07695554a9f35ecb2}
\field{labelnamesource}{author}
@@ -48,14 +46,12 @@
\name{author}{1}{}{%
{{hash=da112227293dbda0740d3a0b9718f8ae}{%
family={Canada},
- familyi={C\bibinitperiod},
+ family_i={C\bibinitperiod},
given={Natural\bibnamedelima Resources},
- giveni={N\bibinitperiod\bibinitdelim R\bibinitperiod}}}%
+ given_i={N\bibinitperiod\bibinitdelim R\bibinitperiod}}}%
}
\strng{namehash}{da112227293dbda0740d3a0b9718f8ae}
\strng{fullhash}{da112227293dbda0740d3a0b9718f8ae}
- \strng{authornamehash}{da112227293dbda0740d3a0b9718f8ae}
- \strng{authorfullhash}{da112227293dbda0740d3a0b9718f8ae}
\field{sortinit}{C}
\field{sortinithash}{59f25d509f3381b07695554a9f35ecb2}
\field{labelnamesource}{author}
@@ -71,14 +67,12 @@
\name{author}{1}{}{%
{{hash=7554ccf13f4b4cf14bccdc15ab46a9ba}{%
family={Canada},
- familyi={C\bibinitperiod},
+ family_i={C\bibinitperiod},
given={Statistics},
- giveni={S\bibinitperiod}}}%
+ given_i={S\bibinitperiod}}}%
}
\strng{namehash}{7554ccf13f4b4cf14bccdc15ab46a9ba}
\strng{fullhash}{7554ccf13f4b4cf14bccdc15ab46a9ba}
- \strng{authornamehash}{7554ccf13f4b4cf14bccdc15ab46a9ba}
- \strng{authorfullhash}{7554ccf13f4b4cf14bccdc15ab46a9ba}
\field{sortinit}{C}
\field{sortinithash}{59f25d509f3381b07695554a9f35ecb2}
\field{labelnamesource}{author}
@@ -94,14 +88,12 @@
\name{author}{1}{}{%
{{hash=7554ccf13f4b4cf14bccdc15ab46a9ba}{%
family={Canada},
- familyi={C\bibinitperiod},
+ family_i={C\bibinitperiod},
given={Statistics},
- giveni={S\bibinitperiod}}}%
+ given_i={S\bibinitperiod}}}%
}
\strng{namehash}{7554ccf13f4b4cf14bccdc15ab46a9ba}
\strng{fullhash}{7554ccf13f4b4cf14bccdc15ab46a9ba}
- \strng{authornamehash}{7554ccf13f4b4cf14bccdc15ab46a9ba}
- \strng{authorfullhash}{7554ccf13f4b4cf14bccdc15ab46a9ba}
\field{sortinit}{C}
\field{sortinithash}{59f25d509f3381b07695554a9f35ecb2}
\field{labelnamesource}{author}
@@ -117,14 +109,12 @@
\name{author}{1}{}{%
{{hash=7554ccf13f4b4cf14bccdc15ab46a9ba}{%
family={Canada},
- familyi={C\bibinitperiod},
+ family_i={C\bibinitperiod},
given={Statistics},
- giveni={S\bibinitperiod}}}%
+ given_i={S\bibinitperiod}}}%
}
\strng{namehash}{7554ccf13f4b4cf14bccdc15ab46a9ba}
\strng{fullhash}{7554ccf13f4b4cf14bccdc15ab46a9ba}
- \strng{authornamehash}{7554ccf13f4b4cf14bccdc15ab46a9ba}
- \strng{authorfullhash}{7554ccf13f4b4cf14bccdc15ab46a9ba}
\field{sortinit}{C}
\field{sortinithash}{59f25d509f3381b07695554a9f35ecb2}
\field{labelnamesource}{author}
@@ -140,14 +130,12 @@
\name{author}{1}{}{%
{{hash=0ff946fc6324aa070b9e09814381cfc4}{%
family={CANSIM},
- familyi={C\bibinitperiod},
+ family_i={C\bibinitperiod},
given={Statistics\bibnamedelima Canada},
- giveni={S\bibinitperiod\bibinitdelim C\bibinitperiod}}}%
+ given_i={S\bibinitperiod\bibinitdelim C\bibinitperiod}}}%
}
\strng{namehash}{0ff946fc6324aa070b9e09814381cfc4}
\strng{fullhash}{0ff946fc6324aa070b9e09814381cfc4}
- \strng{authornamehash}{0ff946fc6324aa070b9e09814381cfc4}
- \strng{authorfullhash}{0ff946fc6324aa070b9e09814381cfc4}
\field{sortinit}{C}
\field{sortinithash}{59f25d509f3381b07695554a9f35ecb2}
\field{labelnamesource}{author}
@@ -162,14 +150,12 @@
\name{author}{1}{}{%
{{hash=0ff946fc6324aa070b9e09814381cfc4}{%
family={CANSIM},
- familyi={C\bibinitperiod},
+ family_i={C\bibinitperiod},
given={Statistics\bibnamedelima Canada},
- giveni={S\bibinitperiod\bibinitdelim C\bibinitperiod}}}%
+ given_i={S\bibinitperiod\bibinitdelim C\bibinitperiod}}}%
}
\strng{namehash}{0ff946fc6324aa070b9e09814381cfc4}
\strng{fullhash}{0ff946fc6324aa070b9e09814381cfc4}
- \strng{authornamehash}{0ff946fc6324aa070b9e09814381cfc4}
- \strng{authorfullhash}{0ff946fc6324aa070b9e09814381cfc4}
\field{sortinit}{C}
\field{sortinithash}{59f25d509f3381b07695554a9f35ecb2}
\field{labelnamesource}{author}
@@ -184,17 +170,15 @@
\name{author}{1}{}{%
{{hash=0cc0dddd9b11a6a2182ea3b2cf497eec}{%
family={Carter},
- familyi={C\bibinitperiod},
+ family_i={C\bibinitperiod},
given={Jimmy},
- giveni={J\bibinitperiod}}}%
+ given_i={J\bibinitperiod}}}%
}
\list{publisher}{1}{%
{A+E Networks}%
}
\strng{namehash}{0cc0dddd9b11a6a2182ea3b2cf497eec}
\strng{fullhash}{0cc0dddd9b11a6a2182ea3b2cf497eec}
- \strng{authornamehash}{0cc0dddd9b11a6a2182ea3b2cf497eec}
- \strng{authorfullhash}{0cc0dddd9b11a6a2182ea3b2cf497eec}
\field{sortinit}{C}
\field{sortinithash}{59f25d509f3381b07695554a9f35ecb2}
\field{labelnamesource}{author}
@@ -210,14 +194,12 @@
\name{author}{1}{}{%
{{hash=12f9e87c2cf14d0f3a6d955c35168997}{%
family={Confederation},
- familyi={C\bibinitperiod},
+ family_i={C\bibinitperiod},
given={Swiss},
- giveni={S\bibinitperiod}}}%
+ given_i={S\bibinitperiod}}}%
}
\strng{namehash}{12f9e87c2cf14d0f3a6d955c35168997}
\strng{fullhash}{12f9e87c2cf14d0f3a6d955c35168997}
- \strng{authornamehash}{12f9e87c2cf14d0f3a6d955c35168997}
- \strng{authorfullhash}{12f9e87c2cf14d0f3a6d955c35168997}
\field{sortinit}{C}
\field{sortinithash}{59f25d509f3381b07695554a9f35ecb2}
\field{labelnamesource}{author}
@@ -232,14 +214,12 @@
\name{author}{1}{}{%
{{hash=2fb4cfe80d4eab8c17d4dc4631ce8f1e}{%
family={Galbiati},
- familyi={G\bibinitperiod},
+ family_i={G\bibinitperiod},
given={Dr.\bibnamedelimi Ing.\bibnamedelimi Luca},
- giveni={D\bibinitperiod\bibinitdelim I\bibinitperiod\bibinitdelim L\bibinitperiod}}}%
+ given_i={D\bibinitperiod\bibinitdelim I\bibinitperiod\bibinitdelim L\bibinitperiod}}}%
}
\strng{namehash}{2fb4cfe80d4eab8c17d4dc4631ce8f1e}
\strng{fullhash}{2fb4cfe80d4eab8c17d4dc4631ce8f1e}
- \strng{authornamehash}{2fb4cfe80d4eab8c17d4dc4631ce8f1e}
- \strng{authorfullhash}{2fb4cfe80d4eab8c17d4dc4631ce8f1e}
\field{sortinit}{G}
\field{sortinithash}{1c854ef9177a91bf894e66485bdbd3ed}
\field{labelnamesource}{author}
@@ -254,17 +234,15 @@
\name{author}{1}{}{%
{{hash=b4713777912a4be7c1b853b955d18e38}{%
family={({NRCan})},
- familyi={(\bibinitperiod},
+ family_i={(\bibinitperiod},
given={{N}atural\bibnamedelimb {R}esources\bibnamedelima {Can}ada},
- giveni={N\bibinitperiod\bibinitdelim R\bibinitperiod\bibinitdelim C\bibinitperiod}}}%
+ given_i={N\bibinitperiod\bibinitdelim R\bibinitperiod\bibinitdelim C\bibinitperiod}}}%
}
\list{publisher}{1}{%
{{N}atural {R}esources {Can}ada ({NRCan})}%
}
\strng{namehash}{b4713777912a4be7c1b853b955d18e38}
\strng{fullhash}{b4713777912a4be7c1b853b955d18e38}
- \strng{authornamehash}{b4713777912a4be7c1b853b955d18e38}
- \strng{authorfullhash}{b4713777912a4be7c1b853b955d18e38}
\field{sortinit}{N}
\field{sortinithash}{925374ca63e7594de7fafdb83e64d41d}
\field{labelnamesource}{author}
@@ -280,17 +258,15 @@
\name{author}{1}{}{%
{{hash=b4713777912a4be7c1b853b955d18e38}{%
family={({NRCan})},
- familyi={(\bibinitperiod},
+ family_i={(\bibinitperiod},
given={{N}atural\bibnamedelimb {R}esources\bibnamedelima {Can}ada},
- giveni={N\bibinitperiod\bibinitdelim R\bibinitperiod\bibinitdelim C\bibinitperiod}}}%
+ given_i={N\bibinitperiod\bibinitdelim R\bibinitperiod\bibinitdelim C\bibinitperiod}}}%
}
\list{publisher}{1}{%
{{N}atural {R}esources {Can}ada ({NRCan})}%
}
\strng{namehash}{b4713777912a4be7c1b853b955d18e38}
\strng{fullhash}{b4713777912a4be7c1b853b955d18e38}
- \strng{authornamehash}{b4713777912a4be7c1b853b955d18e38}
- \strng{authorfullhash}{b4713777912a4be7c1b853b955d18e38}
\field{sortinit}{N}
\field{sortinithash}{925374ca63e7594de7fafdb83e64d41d}
\field{labelnamesource}{author}
@@ -306,17 +282,15 @@
\name{author}{1}{}{%
{{hash=b4713777912a4be7c1b853b955d18e38}{%
family={({NRCan})},
- familyi={(\bibinitperiod},
+ family_i={(\bibinitperiod},
given={{N}atural\bibnamedelimb {R}esources\bibnamedelima {Can}ada},
- giveni={N\bibinitperiod\bibinitdelim R\bibinitperiod\bibinitdelim C\bibinitperiod}}}%
+ given_i={N\bibinitperiod\bibinitdelim R\bibinitperiod\bibinitdelim C\bibinitperiod}}}%
}
\list{publisher}{1}{%
{{N}atural {R}esources {Can}ada ({NRCan})}%
}
\strng{namehash}{b4713777912a4be7c1b853b955d18e38}
\strng{fullhash}{b4713777912a4be7c1b853b955d18e38}
- \strng{authornamehash}{b4713777912a4be7c1b853b955d18e38}
- \strng{authorfullhash}{b4713777912a4be7c1b853b955d18e38}
\field{sortinit}{N}
\field{sortinithash}{925374ca63e7594de7fafdb83e64d41d}
\field{labelnamesource}{author}
@@ -332,14 +306,12 @@
\name{author}{1}{}{%
{{hash=b4713777912a4be7c1b853b955d18e38}{%
family={({NRCan})},
- familyi={(\bibinitperiod},
+ family_i={(\bibinitperiod},
given={{N}atural\bibnamedelimb {R}esources\bibnamedelima {Can}ada},
- giveni={N\bibinitperiod\bibinitdelim R\bibinitperiod\bibinitdelim C\bibinitperiod}}}%
+ given_i={N\bibinitperiod\bibinitdelim R\bibinitperiod\bibinitdelim C\bibinitperiod}}}%
}
\strng{namehash}{b4713777912a4be7c1b853b955d18e38}
\strng{fullhash}{b4713777912a4be7c1b853b955d18e38}
- \strng{authornamehash}{b4713777912a4be7c1b853b955d18e38}
- \strng{authorfullhash}{b4713777912a4be7c1b853b955d18e38}
\field{sortinit}{N}
\field{sortinithash}{925374ca63e7594de7fafdb83e64d41d}
\field{labelnamesource}{author}
@@ -355,12 +327,10 @@
\name{author}{1}{}{%
{{hash=9c677286866aad38f8e9b660f5411814}{%
family={Wikipedia},
- familyi={W\bibinitperiod}}}%
+ family_i={W\bibinitperiod}}}%
}
\strng{namehash}{9c677286866aad38f8e9b660f5411814}
\strng{fullhash}{9c677286866aad38f8e9b660f5411814}
- \strng{authornamehash}{9c677286866aad38f8e9b660f5411814}
- \strng{authorfullhash}{9c677286866aad38f8e9b660f5411814}
\field{sortinit}{W}
\field{sortinithash}{99e3ba1b3f78bb6f073e7fa7ac11636b}
\field{labelnamesource}{author}
diff --git a/docs/build/pdi.bcf b/docs/build/pdi.bcf
index 341586b..7a0c640 100644
--- a/docs/build/pdi.bcf
+++ b/docs/build/pdi.bcf
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<bcf:controlfile version="3.2" bltxversion="3.6" xmlns:bcf="https://sourceforge.net/projects/biblatex">
+<bcf:controlfile version="3.1" bltxversion="3.4" xmlns:bcf="https://sourceforge.net/projects/biblatex">
<!-- BIBER OPTIONS -->
<bcf:options component="biber" type="global">
<bcf:option type="singlevalued">
@@ -27,6 +27,10 @@
<bcf:value>1</bcf:value>
</bcf:option>
<bcf:option type="singlevalued">
+ <bcf:key>sortgiveninits</bcf:key>
+ <bcf:value>0</bcf:value>
+ </bcf:option>
+ <bcf:option type="singlevalued">
<bcf:key>sortupper</bcf:key>
<bcf:value>1</bcf:value>
</bcf:option>
@@ -58,32 +62,22 @@
<bcf:key>labeltitlespec</bcf:key>
<bcf:value order="1">shorttitle</bcf:value>
<bcf:value order="2">title</bcf:value>
- <bcf:value order="3">maintitle</bcf:value>
</bcf:option>
<bcf:option type="singlevalued">
<bcf:key>labeltitleyear</bcf:key>
<bcf:value>0</bcf:value>
</bcf:option>
<bcf:option type="singlevalued">
- <bcf:key>labeldateparts</bcf:key>
+ <bcf:key>labeldate</bcf:key>
<bcf:value>0</bcf:value>
</bcf:option>
<bcf:option type="multivalued">
<bcf:key>labeldatespec</bcf:key>
<bcf:value order="1" type="field">date</bcf:value>
- <bcf:value order="2" type="field">year</bcf:value>
- <bcf:value order="3" type="field">eventdate</bcf:value>
- <bcf:value order="4" type="field">origdate</bcf:value>
- <bcf:value order="5" type="field">urldate</bcf:value>
- <bcf:value order="6" type="string">nodate</bcf:value>
- </bcf:option>
- <bcf:option type="singlevalued">
- <bcf:key>julian</bcf:key>
- <bcf:value>0</bcf:value>
- </bcf:option>
- <bcf:option type="singlevalued">
- <bcf:key>gregorianstart</bcf:key>
- <bcf:value>1582-10-15</bcf:value>
+ <bcf:value order="2" type="field">eventdate</bcf:value>
+ <bcf:value order="3" type="field">origdate</bcf:value>
+ <bcf:value order="4" type="field">urldate</bcf:value>
+ <bcf:value order="5" type="string">nodate</bcf:value>
</bcf:option>
<bcf:option type="singlevalued">
<bcf:key>maxalphanames</bcf:key>
@@ -150,14 +144,6 @@
<bcf:value>0</bcf:value>
</bcf:option>
<bcf:option type="singlevalued">
- <bcf:key>uniquebaretitle</bcf:key>
- <bcf:value>0</bcf:value>
- </bcf:option>
- <bcf:option type="singlevalued">
- <bcf:key>uniquework</bcf:key>
- <bcf:value>0</bcf:value>
- </bcf:option>
- <bcf:option type="singlevalued">
<bcf:key>useprefix</bcf:key>
<bcf:value>0</bcf:value>
</bcf:option>
@@ -237,11 +223,9 @@
<!-- BIBLATEX OPTION SCOPE -->
<bcf:optionscope type="GLOBAL">
<bcf:option datatype="xml">datamodel</bcf:option>
- <bcf:option datatype="xml">labelalphanametemplate</bcf:option>
<bcf:option datatype="xml">labelalphatemplate</bcf:option>
<bcf:option datatype="xml">inheritance</bcf:option>
<bcf:option datatype="xml">translit</bcf:option>
- <bcf:option datatype="xml">uniquenametemplate</bcf:option>
<bcf:option datatype="xml">sortingnamekey</bcf:option>
<bcf:option datatype="xml">sortscheme</bcf:option>
<bcf:option datatype="xml">labelnamespec</bcf:option>
@@ -261,22 +245,12 @@
<bcf:option datatype="string">autolang</bcf:option>
<bcf:option datatype="string">backrefsetstyle</bcf:option>
<bcf:option datatype="string">block</bcf:option>
- <bcf:option datatype="string">labeldate</bcf:option>
<bcf:option datatype="string">datelabel</bcf:option>
- <bcf:option datatype="string">labeltime</bcf:option>
- <bcf:option datatype="string">dateera</bcf:option>
<bcf:option datatype="string">date</bcf:option>
- <bcf:option datatype="string">time</bcf:option>
<bcf:option datatype="string">eventdate</bcf:option>
- <bcf:option datatype="string">eventtime</bcf:option>
<bcf:option datatype="string">origdate</bcf:option>
- <bcf:option datatype="string">origtime</bcf:option>
<bcf:option datatype="string">urldate</bcf:option>
- <bcf:option datatype="string">urltime</bcf:option>
- <bcf:option datatype="string">alldatesusetime</bcf:option>
<bcf:option datatype="string">alldates</bcf:option>
- <bcf:option datatype="string">alltimes</bcf:option>
- <bcf:option datatype="string">gregorianstart</bcf:option>
<bcf:option datatype="string">autocite</bcf:option>
<bcf:option datatype="string">notetype</bcf:option>
<bcf:option datatype="string">refsection</bcf:option>
@@ -284,10 +258,6 @@
<bcf:option datatype="string">citereset</bcf:option>
<bcf:option datatype="string">backrefstyle</bcf:option>
<bcf:option datatype="string">arxiv</bcf:option>
- <bcf:option datatype="boolean">familyinits</bcf:option>
- <bcf:option datatype="boolean">giveninits</bcf:option>
- <bcf:option datatype="boolean">prefixinits</bcf:option>
- <bcf:option datatype="boolean">suffixinits</bcf:option>
<bcf:option datatype="boolean">useafterword</bcf:option>
<bcf:option datatype="boolean">useannotator</bcf:option>
<bcf:option datatype="boolean">useauthor</bcf:option>
@@ -311,10 +281,11 @@
<bcf:option datatype="boolean">safeinputenc</bcf:option>
<bcf:option datatype="boolean">sortcase</bcf:option>
<bcf:option datatype="boolean">sortupper</bcf:option>
+ <bcf:option datatype="boolean">terseinits</bcf:option>
<bcf:option datatype="boolean">firstinits</bcf:option>
<bcf:option datatype="boolean">sortfirstinits</bcf:option>
+ <bcf:option datatype="boolean">giveninits</bcf:option>
<bcf:option datatype="boolean">sortgiveninits</bcf:option>
- <bcf:option datatype="boolean">terseinits</bcf:option>
<bcf:option datatype="boolean">abbreviate</bcf:option>
<bcf:option datatype="boolean">dateabbrev</bcf:option>
<bcf:option datatype="boolean">clearlang</bcf:option>
@@ -330,32 +301,19 @@
<bcf:option datatype="boolean">opcittracker</bcf:option>
<bcf:option datatype="boolean">loccittracker</bcf:option>
<bcf:option datatype="boolean">parentracker</bcf:option>
- <bcf:option datatype="boolean">labeldateusetime</bcf:option>
- <bcf:option datatype="boolean">datecirca</bcf:option>
- <bcf:option datatype="boolean">dateuncertain</bcf:option>
- <bcf:option datatype="boolean">dateusetime</bcf:option>
- <bcf:option datatype="boolean">eventdateusetime</bcf:option>
- <bcf:option datatype="boolean">origdateusetime</bcf:option>
- <bcf:option datatype="boolean">urldateusetime</bcf:option>
- <bcf:option datatype="boolean">julian</bcf:option>
<bcf:option datatype="boolean">datezeros</bcf:option>
- <bcf:option datatype="boolean">timezeros</bcf:option>
- <bcf:option datatype="boolean">timezones</bcf:option>
- <bcf:option datatype="boolean">seconds</bcf:option>
<bcf:option datatype="boolean">autopunct</bcf:option>
<bcf:option datatype="boolean">punctfont</bcf:option>
<bcf:option datatype="boolean">labelnumber</bcf:option>
<bcf:option datatype="boolean">labelalpha</bcf:option>
<bcf:option datatype="boolean">labeltitle</bcf:option>
<bcf:option datatype="boolean">labeltitleyear</bcf:option>
- <bcf:option datatype="boolean">labeldateparts</bcf:option>
+ <bcf:option datatype="boolean">labeldate</bcf:option>
<bcf:option datatype="boolean">labelyear</bcf:option>
<bcf:option datatype="boolean">uniquelist</bcf:option>
<bcf:option datatype="boolean">uniquename</bcf:option>
<bcf:option datatype="boolean">singletitle</bcf:option>
<bcf:option datatype="boolean">uniquetitle</bcf:option>
- <bcf:option datatype="boolean">uniquebaretitle</bcf:option>
- <bcf:option datatype="boolean">uniquework</bcf:option>
<bcf:option datatype="boolean">uniqueprimaryauthor</bcf:option>
<bcf:option datatype="boolean">defernumbers</bcf:option>
<bcf:option datatype="boolean">bibwarn</bcf:option>
@@ -380,7 +338,6 @@
<bcf:option datatype="integer">maxalphanames</bcf:option>
<bcf:option datatype="integer">minalphanames</bcf:option>
<bcf:option datatype="integer">maxparens</bcf:option>
- <bcf:option datatype="integer">dateeraauto</bcf:option>
</bcf:optionscope>
<bcf:optionscope type="ENTRYTYPE">
<bcf:option datatype="string">alphaothers</bcf:option>
@@ -409,21 +366,18 @@
<bcf:option datatype="boolean">labelalpha</bcf:option>
<bcf:option datatype="boolean">labeltitle</bcf:option>
<bcf:option datatype="boolean">labeltitleyear</bcf:option>
- <bcf:option datatype="boolean">labeldateparts</bcf:option>
+ <bcf:option datatype="boolean">labeldate</bcf:option>
<bcf:option datatype="boolean">labelyear</bcf:option>
<bcf:option datatype="boolean">uniquelist</bcf:option>
<bcf:option datatype="boolean">uniquename</bcf:option>
<bcf:option datatype="boolean">singletitle</bcf:option>
<bcf:option datatype="boolean">uniquetitle</bcf:option>
- <bcf:option datatype="boolean">uniquebaretitle</bcf:option>
- <bcf:option datatype="boolean">uniquework</bcf:option>
<bcf:option datatype="boolean">useprefix</bcf:option>
<bcf:option datatype="boolean">skipbib</bcf:option>
<bcf:option datatype="boolean">skiplos</bcf:option>
<bcf:option datatype="boolean">skipbiblist</bcf:option>
<bcf:option datatype="boolean">skiplab</bcf:option>
<bcf:option datatype="boolean">dataonly</bcf:option>
- <bcf:option datatype="xml">labelalphanametemplate</bcf:option>
<bcf:option datatype="xml">labelalphatemplate</bcf:option>
<bcf:option datatype="xml">translit</bcf:option>
<bcf:option datatype="xml">sortexclusion</bcf:option>
@@ -539,19 +493,73 @@
<bcf:map_step map_field_source="pdf" map_field_target="file"/>
</bcf:map>
</bcf:maps>
+ <bcf:maps datatype="ris" level="driver">
+ <bcf:map>
+ <bcf:map_step map_type_source="ART" map_type_target="artwork"/>
+ <bcf:map_step map_type_source="BILL" map_type_target="jurisdiction"/>
+ <bcf:map_step map_type_source="BOOK" map_type_target="book"/>
+ <bcf:map_step map_type_source="CHAP" map_type_target="inbook"/>
+ <bcf:map_step map_type_source="COMP" map_type_target="software"/>
+ <bcf:map_step map_type_source="CONF" map_type_target="proceedings"/>
+ <bcf:map_step map_type_source="GEN" map_type_target="misc"/>
+ <bcf:map_step map_type_source="JFULL" map_type_target="article"/>
+ <bcf:map_step map_type_source="JOUR" map_type_target="article"/>
+ <bcf:map_step map_type_source="MGZN" map_type_target="misc"/>
+ <bcf:map_step map_type_source="MPCT" map_type_target="movie"/>
+ <bcf:map_step map_type_source="NEWS" map_type_target="misc"/>
+ <bcf:map_step map_type_source="PAMP" map_type_target="misc"/>
+ <bcf:map_step map_type_source="PAT" map_type_target="patent"/>
+ <bcf:map_step map_type_source="PCOMM" map_type_target="misc"/>
+ <bcf:map_step map_type_source="RPRT" map_type_target="report"/>
+ <bcf:map_step map_type_source="SER" map_type_target="misc"/>
+ <bcf:map_step map_type_source="SLIDE" map_type_target="misc"/>
+ <bcf:map_step map_type_source="SOUND" map_type_target="audio"/>
+ <bcf:map_step map_type_source="STAT" map_type_target="legal"/>
+ <bcf:map_step map_type_source="THES" map_type_target="thesis"/>
+ <bcf:map_step map_type_source="UNBILL" map_type_target="jurisdiction"/>
+ <bcf:map_step map_type_source="UNPB" map_type_target="unpublished"/>
+ </bcf:map>
+ <bcf:map>
+ <bcf:map_step map_field_source="Y1" map_field_target="date"/>
+ <bcf:map_step map_field_source="PY" map_field_target="date"/>
+ <bcf:map_step map_field_source="Y2" map_field_target="eventdate"/>
+ <bcf:map_step map_field_source="A1" map_field_target="author"/>
+ <bcf:map_step map_field_source="AU" map_field_target="author"/>
+ <bcf:map_step map_field_source="A2" map_field_target="editor"/>
+ <bcf:map_step map_field_source="A3" map_field_target="editor"/>
+ <bcf:map_step map_field_source="ED" map_field_target="editor"/>
+ <bcf:map_step map_field_source="SPEP" map_field_target="pages"/>
+ <bcf:map_step map_field_source="N1" map_field_target="note"/>
+ <bcf:map_step map_field_source="N2" map_field_target="abstract"/>
+ <bcf:map_step map_field_source="AB" map_field_target="abstract"/>
+ <bcf:map_step map_field_source="JO" map_field_target="journaltitle"/>
+ <bcf:map_step map_field_source="JF" map_field_target="journaltitle"/>
+ <bcf:map_step map_field_source="JA" map_field_target="shortjournal"/>
+ <bcf:map_step map_field_source="VL" map_field_target="volume"/>
+ <bcf:map_step map_field_source="IS" map_field_target="issue"/>
+ <bcf:map_step map_field_source="CP" map_field_target="issue"/>
+ <bcf:map_step map_field_source="CY" map_field_target="location"/>
+ <bcf:map_step map_field_source="SN" map_field_target="isbn"/>
+ <bcf:map_step map_field_source="PB" map_field_target="publisher"/>
+ <bcf:map_step map_field_source="KW" map_field_target="keywords"/>
+ <bcf:map_step map_field_source="TI" map_field_target="title"/>
+ <bcf:map_step map_field_source="U1" map_field_target="usera"/>
+ <bcf:map_step map_field_source="U2" map_field_target="userb"/>
+ <bcf:map_step map_field_source="U3" map_field_target="userc"/>
+ <bcf:map_step map_field_source="U4" map_field_target="userd"/>
+ <bcf:map_step map_field_source="U5" map_field_target="usere"/>
+ <bcf:map_step map_field_source="UR" map_field_target="url"/>
+ <bcf:map_step map_field_source="L1" map_field_target="file"/>
+ </bcf:map>
+ </bcf:maps>
</bcf:sourcemap>
- <!-- LABELALPHA NAME TEMPLATE -->
- <bcf:labelalphanametemplate type="global">
- <bcf:namepart order="1" use="1" pre="1" substring_width="1" substring_compound="1">prefix</bcf:namepart>
- <bcf:namepart order="2">family</bcf:namepart>
- </bcf:labelalphanametemplate>
<!-- LABELALPHA TEMPLATE -->
<bcf:labelalphatemplate type="global">
<bcf:labelelement order="1">
<bcf:labelpart final="1">shorthand</bcf:labelpart>
<bcf:labelpart>label</bcf:labelpart>
- <bcf:labelpart substring_width="3" substring_side="left" ifnames="1">labelname</bcf:labelpart>
- <bcf:labelpart substring_width="1" substring_side="left">labelname</bcf:labelpart>
+ <bcf:labelpart substring_width="3" substring_side="left" ifnames="1" substring_pcompound="1">labelname</bcf:labelpart>
+ <bcf:labelpart substring_width="1" substring_side="left" substring_pcompound="1">labelname</bcf:labelpart>
</bcf:labelelement>
<bcf:labelelement order="2">
<bcf:labelpart substring_width="2" substring_side="right">year</bcf:labelpart>
@@ -681,12 +689,6 @@
<bcf:field source="sortkey" skip="true"/>
</bcf:inherit>
</bcf:inheritance>
- <!-- UNIQUENAME TEMPLATE -->
- <bcf:uniquenametemplate>
- <bcf:namepart order="1" use="1" base="1">prefix</bcf:namepart>
- <bcf:namepart order="2" base="1">family</bcf:namepart>
- <bcf:namepart order="3">given</bcf:namepart>
- </bcf:uniquenametemplate>
<!-- SORTING NAME KEY -->
<bcf:sortingnamekey keyscheme="global">
<bcf:keypart order="1">
@@ -731,15 +733,15 @@
<bcf:sortitem order="2">year</bcf:sortitem>
</bcf:sort>
<bcf:sort order="6">
- <bcf:sortitem order="1">volume</bcf:sortitem>
- <bcf:sortitem order="2">0</bcf:sortitem>
+ <bcf:sortitem order="1" pad_side="left" pad_width="4" pad_char="0">volume</bcf:sortitem>
+ <bcf:sortitem order="2">0000</bcf:sortitem>
</bcf:sort>
</bcf:sorting>
<!-- DATA MODEL -->
<bcf:datamodel>
<bcf:constants>
<bcf:constant type="list" name="gender">sf,sm,sn,pf,pm,pn,pp</bcf:constant>
- <bcf:constant type="list" name="nameparts">family,given,prefix,suffix</bcf:constant>
+ <bcf:constant type="list" name="nameparts">prefix,family,suffix,given</bcf:constant>
<bcf:constant type="list" name="optiondatatypes">boolean,integer,string,xml</bcf:constant>
</bcf:constants>
<bcf:entrytypes>
@@ -794,9 +796,6 @@
<bcf:entrytype skip_output="true">xdata</bcf:entrytype>
</bcf:entrytypes>
<bcf:fields>
- <bcf:field fieldtype="field" datatype="integer">number</bcf:field>
- <bcf:field fieldtype="field" datatype="integer">volume</bcf:field>
- <bcf:field fieldtype="field" datatype="integer">volumes</bcf:field>
<bcf:field fieldtype="field" datatype="literal">abstract</bcf:field>
<bcf:field fieldtype="field" datatype="literal">addendum</bcf:field>
<bcf:field fieldtype="field" datatype="literal">annotation</bcf:field>
@@ -835,6 +834,7 @@
<bcf:field fieldtype="field" datatype="literal">maintitleaddon</bcf:field>
<bcf:field fieldtype="field" datatype="literal">nameaddon</bcf:field>
<bcf:field fieldtype="field" datatype="literal">note</bcf:field>
+ <bcf:field fieldtype="field" datatype="literal">number</bcf:field>
<bcf:field fieldtype="field" datatype="literal">origtitle</bcf:field>
<bcf:field fieldtype="field" datatype="literal">pagetotal</bcf:field>
<bcf:field fieldtype="field" datatype="literal">part</bcf:field>
@@ -854,13 +854,15 @@
<bcf:field fieldtype="field" datatype="literal">userf</bcf:field>
<bcf:field fieldtype="field" datatype="literal">venue</bcf:field>
<bcf:field fieldtype="field" datatype="literal">version</bcf:field>
+ <bcf:field fieldtype="field" datatype="literal">volume</bcf:field>
+ <bcf:field fieldtype="field" datatype="literal">volumes</bcf:field>
<bcf:field fieldtype="field" datatype="literal" label="true">shorthand</bcf:field>
<bcf:field fieldtype="field" datatype="literal" label="true">shortjournal</bcf:field>
<bcf:field fieldtype="field" datatype="literal" label="true">shortseries</bcf:field>
<bcf:field fieldtype="field" datatype="literal" label="true">shorttitle</bcf:field>
- <bcf:field fieldtype="field" datatype="integer" skip_output="true">sortyear</bcf:field>
<bcf:field fieldtype="field" datatype="literal" skip_output="true">sorttitle</bcf:field>
<bcf:field fieldtype="field" datatype="literal" skip_output="true">sortshorthand</bcf:field>
+ <bcf:field fieldtype="field" datatype="literal" skip_output="true">sortyear</bcf:field>
<bcf:field fieldtype="field" datatype="literal" skip_output="true">sortkey</bcf:field>
<bcf:field fieldtype="field" datatype="literal" skip_output="true">presort</bcf:field>
<bcf:field fieldtype="list" datatype="literal">institution</bcf:field>
@@ -915,69 +917,29 @@
<bcf:field fieldtype="field" datatype="datepart">year</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">month</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">day</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">hour</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">minute</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">second</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">timezone</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">season</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">endmonth</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">endday</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">endhour</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">endminute</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">endsecond</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">endtimezone</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">endseason</bcf:field>
<bcf:field fieldtype="field" datatype="date" skip_output="true">eventdate</bcf:field>
<bcf:field fieldtype="field" datatype="datepart" nullok="true">eventendyear</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">eventyear</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">eventmonth</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">eventday</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">eventhour</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">eventminute</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">eventsecond</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">eventtimezone</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">eventseason</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">eventendmonth</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">eventendday</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">eventendhour</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">eventendminute</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">eventendsecond</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">eventendtimezone</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">eventendseason</bcf:field>
<bcf:field fieldtype="field" datatype="date" skip_output="true">origdate</bcf:field>
<bcf:field fieldtype="field" datatype="datepart" nullok="true">origendyear</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">origyear</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">origmonth</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">origday</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">orighour</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">origminute</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">origsecond</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">origtimezone</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">origseason</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">origendmonth</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">origendday</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">origendhour</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">origendminute</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">origendsecond</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">origendtimezone</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">origendseason</bcf:field>
<bcf:field fieldtype="field" datatype="date" skip_output="true">urldate</bcf:field>
<bcf:field fieldtype="field" datatype="datepart" nullok="true">urlendyear</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">urlyear</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">urlmonth</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">urlday</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">urlhour</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">urlminute</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">urlsecond</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">urltimezone</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">urlseason</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">urlendmonth</bcf:field>
<bcf:field fieldtype="field" datatype="datepart">urlendday</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">urlendhour</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">urlendminute</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">urlendsecond</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">urlendtimezone</bcf:field>
- <bcf:field fieldtype="field" datatype="datepart">urlendseason</bcf:field>
<bcf:field fieldtype="field" datatype="verbatim">doi</bcf:field>
<bcf:field fieldtype="field" datatype="verbatim">eprint</bcf:field>
<bcf:field fieldtype="field" datatype="verbatim">file</bcf:field>
@@ -1601,14 +1563,6 @@
<bcf:field>pubstate</bcf:field>
<bcf:field>subtitle</bcf:field>
<bcf:field>titleaddon</bcf:field>
- <bcf:field>urlhour</bcf:field>
- <bcf:field>urlminute</bcf:field>
- <bcf:field>urlsecond</bcf:field>
- <bcf:field>urltimezone</bcf:field>
- <bcf:field>urlendhour</bcf:field>
- <bcf:field>urlendminute</bcf:field>
- <bcf:field>urlendsecond</bcf:field>
- <bcf:field>urlendtimezone</bcf:field>
<bcf:field>urlday</bcf:field>
<bcf:field>urlendday</bcf:field>
<bcf:field>urlendmonth</bcf:field>
@@ -2150,16 +2104,15 @@
<bcf:citekey order="6">nrcan:renewables</bcf:citekey>
<bcf:citekey order="7">statscan:ghgemissions</bcf:citekey>
<bcf:citekey order="8">statscan:ghgemissions</bcf:citekey>
- <bcf:citekey order="9">nrcan:energyfactsbook</bcf:citekey>
- <bcf:citekey order="10">nrcan:nacei</bcf:citekey>
- <bcf:citekey order="11">nrcan:energymeeting</bcf:citekey>
- <bcf:citekey order="12">nrcan:wind</bcf:citekey>
- <bcf:citekey order="13">nrcan:energyfactsbook</bcf:citekey>
- <bcf:citekey order="14">pieroconti</bcf:citekey>
- <bcf:citekey order="15">energycrisis</bcf:citekey>
- <bcf:citekey order="16">cansim:electricity</bcf:citekey>
- <bcf:citekey order="17">poterecalorico</bcf:citekey>
- <bcf:citekey order="18">cansim:electricityfuel</bcf:citekey>
+ <bcf:citekey order="9">nrcan:nacei</bcf:citekey>
+ <bcf:citekey order="10">nrcan:energymeeting</bcf:citekey>
+ <bcf:citekey order="11">nrcan:wind</bcf:citekey>
+ <bcf:citekey order="12">nrcan:energyfactsbook</bcf:citekey>
+ <bcf:citekey order="13">pieroconti</bcf:citekey>
+ <bcf:citekey order="14">energycrisis</bcf:citekey>
+ <bcf:citekey order="15">cansim:electricity</bcf:citekey>
+ <bcf:citekey order="16">poterecalorico</bcf:citekey>
+ <bcf:citekey order="17">cansim:electricityfuel</bcf:citekey>
</bcf:section>
<bcf:sortlist section="0" name="nty/global/" type="entry" sortscheme="nty" sortnamekeyscheme="global" labelprefix="">
<bcf:sorting>
@@ -2186,8 +2139,8 @@
<bcf:sortitem order="2">year</bcf:sortitem>
</bcf:sort>
<bcf:sort order="6">
- <bcf:sortitem order="1">volume</bcf:sortitem>
- <bcf:sortitem order="2">0</bcf:sortitem>
+ <bcf:sortitem order="1" pad_side="left" pad_width="4" pad_char="0">volume</bcf:sortitem>
+ <bcf:sortitem order="2">0000</bcf:sortitem>
</bcf:sort>
</bcf:sorting>
</bcf:sortlist>
@@ -2216,8 +2169,8 @@
<bcf:sortitem order="2">year</bcf:sortitem>
</bcf:sort>
<bcf:sort order="6">
- <bcf:sortitem order="1">volume</bcf:sortitem>
- <bcf:sortitem order="2">0</bcf:sortitem>
+ <bcf:sortitem order="1" pad_side="left" pad_width="4" pad_char="0">volume</bcf:sortitem>
+ <bcf:sortitem order="2">0000</bcf:sortitem>
</bcf:sort>
</bcf:sorting>
</bcf:sortlist>
diff --git a/docs/build/pdi.blg b/docs/build/pdi.blg
index a964e36..35df717 100644
--- a/docs/build/pdi.blg
+++ b/docs/build/pdi.blg
@@ -1,18 +1,17 @@
-[0] Config.pm:354> INFO - This is Biber 2.6
-[0] Config.pm:357> INFO - Logfile is 'build/pdi.blg'
-[20] biber:302> INFO - === Sun Dec 11, 2016, 20:28:45
-[29] Biber.pm:360> INFO - Reading 'build/pdi.bcf'
-[78] Biber.pm:824> INFO - Found 15 citekeys in bib section 0
-[85] Biber.pm:3659> INFO - Processing section 0
-[93] Biber.pm:3829> INFO - Looking for bibtex format file 'pdi.bib' for section 0
-[95] bibtex.pm:1414> INFO - Decoding LaTeX character macros into UTF-8
-[96] bibtex.pm:1271> INFO - Found BibTeX data source 'pdi.bib'
-[105] Utils.pm:164> WARN - year field '12.2.2016' in entry 'nrcan:energymeeting' is not an integer - this will probably not sort properly.
-[108] Utils.pm:164> WARN - BibTeX subsystem: /tmp/bSPdYXyF9n/pdi.bib_17797.utf8, line 33, warning: 5 characters of junk seen at toplevel
-[120] UCollate.pm:68> INFO - Overriding locale 'it-IT' defaults 'normalization = NFD' with 'normalization = prenormalized'
-[120] UCollate.pm:68> INFO - Overriding locale 'it-IT' defaults 'variable = shifted' with 'variable = non-ignorable'
-[120] Biber.pm:3488> INFO - Sorting list 'nty/global/' of type 'entry' with scheme 'nty' and locale 'it-IT'
-[120] Biber.pm:3494> INFO - No sort tailoring available for locale 'it-IT'
-[129] bbl.pm:597> INFO - Writing 'build/pdi.bbl' with encoding 'UTF-8'
-[130] bbl.pm:701> INFO - Output to build/pdi.bbl
-[131] Biber.pm:110> INFO - WARNINGS: 2
+[1] Config.pm:343> INFO - This is Biber 2.5
+[1] Config.pm:346> INFO - Logfile is 'build/pdi.blg'
+[77] biber:290> INFO - === Tue Dec 13, 2016, 10:25:08
+[226] Biber.pm:351> INFO - Reading 'build/pdi.bcf'
+[470] Biber.pm:776> INFO - Found 15 citekeys in bib section 0
+[491] Biber.pm:3493> INFO - Processing section 0
+[508] Biber.pm:3657> INFO - Looking for bibtex format file 'pdi.bib' for section 0
+[590] bibtex.pm:1187> INFO - Decoding LaTeX character macros into UTF-8
+[662] bibtex.pm:1048> INFO - Found BibTeX data source 'pdi.bib'
+[705] Utils.pm:149> WARN - BibTeX subsystem: /tmp/WOob9y94Zj/pdi.bib_3798.utf8, line 33, warning: 5 characters of junk seen at toplevel
+[748] UCollate.pm:66> INFO - Overriding locale 'it-IT' defaults 'variable = shifted' with 'variable = non-ignorable'
+[748] UCollate.pm:66> INFO - Overriding locale 'it-IT' defaults 'normalization = NFD' with 'normalization = prenormalized'
+[748] Biber.pm:3306> INFO - Sorting list 'nty/global/' of type 'entry' with scheme 'nty' and locale 'it-IT'
+[748] Biber.pm:3310> INFO - No sort tailoring available for locale 'it-IT'
+[773] bbl.pm:526> INFO - Writing 'build/pdi.bbl' with encoding 'UTF-8'
+[840] bbl.pm:619> INFO - Output to build/pdi.bbl
+[840] Biber.pm:108> INFO - WARNINGS: 1
diff --git a/docs/build/pdi.log b/docs/build/pdi.log
index 597865e..2c5f897 100644
--- a/docs/build/pdi.log
+++ b/docs/build/pdi.log
@@ -1,12 +1,12 @@
-This is LuaTeX, Version 0.95.0 (TeX Live 2016/Debian) (format=lualatex 2016.12.8) 11 DEC 2016 20:28
+This is LuaTeX, Version 0.95.0 (TeX Live 2016) (format=lualatex 2016.11.22) 13 DEC 2016 10:25
restricted system commands enabled.
**pdi
(./pdi.tex
-LaTeX2e <2016/03/31> patch level 3
+LaTeX2e <2016/03/31>
Babel <3.9r> and hyphenation patterns for 1 language(s) loaded.
-(/usr/share/texlive/texmf-dist/tex/latex/base/report.cls
+(/usr/share/texmf-dist/tex/latex/base/report.cls
Document Class: report 2014/09/29 v1.4h Standard LaTeX document class
-(/usr/share/texlive/texmf-dist/tex/latex/base/size12.clo
+(/usr/share/texmf-dist/tex/latex/base/size12.clo
File: size12.clo 2014/09/29 v1.4h Standard LaTeX file (size option)
)
\c@part=\count79
@@ -22,7 +22,7 @@ File: size12.clo 2014/09/29 v1.4h Standard LaTeX file (size option)
\belowcaptionskip=\skip42
\bibindent=\dimen102
)
-(/usr/share/texlive/texmf-dist/tex/latex/base/inputenc.sty
+(/usr/share/texmf-dist/tex/latex/base/inputenc.sty
Package: inputenc 2015/03/17 v1.2c Input encoding file
\inpenc@prehook=\toks14
\inpenc@posthook=\toks15
@@ -30,145 +30,145 @@ Package: inputenc 2015/03/17 v1.2c Input encoding file
Package inputenc Warning: inputenc package ignored with utf8 based engines.
-) (/usr/share/texlive/texmf-dist/tex/generic/babel/babel.sty
+) (/usr/share/texmf-dist/tex/generic/babel/babel.sty
Package: babel 2016/04/23 3.9r The Babel package
-(/usr/share/texlive/texmf-dist/tex/generic/babel/luababel.def
+(/usr/share/texmf-dist/tex/generic/babel/luababel.def
\l@dumylang=\language1
\l@nohyphenation=\language2
-\l@mongolian=\language3
-\l@romanian=\language4
-\l@oriya=\language5
-\l@basque=\language6
-\l@panjabi=\language7
-\l@bulgarian=\language8
-\l@liturgicallatin=\language9
-\l@mongolianlmc=\language10
-\l@serbian=\language11
-\l@arabic=\language12
-\l@usenglishmax=\language13
-\l@ukenglish=\language14
-\l@kannada=\language15
-\l@nynorsk=\language16
-\l@dutch=\language17
-\l@ngerman-x-2014-05-21=\language18
-\l@pinyin=\language19
-\l@georgian=\language20
-\l@swedish=\language21
-\l@italian=\language22
-\l@ukrainian=\language23
-\l@tamil=\language24
+\l@german-x-2014-05-21=\language3
+\l@ngerman-x-2014-05-21=\language4
+\l@afrikaans=\language5
+\l@ancientgreek=\language6
+\l@ibycus=\language7
+\l@arabic=\language8
+\l@armenian=\language9
+\l@basque=\language10
+\l@bulgarian=\language11
+\l@catalan=\language12
+\l@pinyin=\language13
+\l@churchslavonic=\language14
+\l@coptic=\language15
+\l@croatian=\language16
+\l@czech=\language17
+\l@danish=\language18
+\l@dutch=\language19
+\l@ukenglish=\language20
+\l@usenglishmax=\language21
+\l@esperanto=\language22
+\l@estonian=\language23
+\l@ethiopic=\language24
\l@farsi=\language25
-\l@welsh=\language26
-\l@telugu=\language27
-\l@serbianc=\language28
-\l@malayalam=\language29
-\l@sanskrit=\language30
-\l@bengali=\language31
-\l@occitan=\language32
-\l@interlingua=\language33
-\l@hindi=\language34
-\l@catalan=\language35
-\l@danish=\language36
-\l@gujarati=\language37
-\l@piedmontese=\language38
-\l@marathi=\language39
-\l@finnish=\language40
-\l@latin=\language41
-\l@lithuanian=\language42
-\l@portuguese=\language43
-\l@uppersorbian=\language44
-\l@french=\language45
-\l@churchslavonic=\language46
-\l@hungarian=\language47
-\l@german-x-2014-05-21=\language48
-\l@turkish=\language49
-\l@kurmanji=\language50
-\l@spanish=\language51
-\l@ngerman=\language52
-\l@galician=\language53
-\l@greek=\language54
-\l@slovak=\language55
-\l@monogreek=\language56
-\l@ibycus=\language57
-\l@ethiopic=\language58
-\l@russian=\language59
-\l@polish=\language60
-\l@latvian=\language61
-\l@esperanto=\language62
-\l@czech=\language63
-\l@slovenian=\language64
-\l@turkmen=\language65
-\l@thai=\language66
-\l@swissgerman=\language67
-\l@ancientgreek=\language68
-\l@coptic=\language69
-\l@assamese=\language70
-\l@afrikaans=\language71
-\l@armenian=\language72
-\l@romansh=\language73
-\l@icelandic=\language74
-\l@indonesian=\language75
-\l@croatian=\language76
-\l@friulan=\language77
-\l@estonian=\language78
-\l@german=\language79
-\l@bokmal=\language80
-\l@irish=\language81
-\l@classiclatin=\language82
-)
-(/usr/share/texlive/texmf-dist/tex/generic/babel-english/english.ldf
+\l@finnish=\language26
+\l@french=\language27
+\l@friulan=\language28
+\l@galician=\language29
+\l@georgian=\language30
+\l@german=\language31
+\l@ngerman=\language32
+\l@swissgerman=\language33
+\l@monogreek=\language34
+\l@greek=\language35
+\l@hungarian=\language36
+\l@icelandic=\language37
+\l@assamese=\language38
+\l@bengali=\language39
+\l@gujarati=\language40
+\l@hindi=\language41
+\l@kannada=\language42
+\l@malayalam=\language43
+\l@marathi=\language44
+\l@oriya=\language45
+\l@panjabi=\language46
+\l@tamil=\language47
+\l@telugu=\language48
+\l@indonesian=\language49
+\l@interlingua=\language50
+\l@irish=\language51
+\l@italian=\language52
+\l@kurmanji=\language53
+\l@latin=\language54
+\l@classiclatin=\language55
+\l@liturgicallatin=\language56
+\l@latvian=\language57
+\l@lithuanian=\language58
+\l@mongolian=\language59
+\l@mongolianlmc=\language60
+\l@bokmal=\language61
+\l@nynorsk=\language62
+\l@occitan=\language63
+\l@piedmontese=\language64
+\l@polish=\language65
+\l@portuguese=\language66
+\l@romanian=\language67
+\l@romansh=\language68
+\l@russian=\language69
+\l@sanskrit=\language70
+\l@serbian=\language71
+\l@serbianc=\language72
+\l@slovak=\language73
+\l@slovenian=\language74
+\l@spanish=\language75
+\l@swedish=\language76
+\l@thai=\language77
+\l@turkish=\language78
+\l@turkmen=\language79
+\l@ukrainian=\language80
+\l@uppersorbian=\language81
+\l@welsh=\language82
+)
+(/usr/share/texmf-dist/tex/generic/babel-english/english.ldf
Language: english 2012/08/20 v3.3p English support from the babel system
-(/usr/share/texlive/texmf-dist/tex/generic/babel/babel.def
+(/usr/share/texmf-dist/tex/generic/babel/babel.def
File: babel.def 2016/04/23 3.9r Babel common definitions
\babel@savecnt=\count88
\U@D=\dimen103
-(/usr/share/texlive/texmf-dist/tex/generic/babel/luababel.def))
+(/usr/share/texmf-dist/tex/generic/babel/luababel.def))
\l@canadian = a dialect from \language\l@american
\l@australian = a dialect from \language\l@british
\l@newzealand = a dialect from \language\l@british
)
-(/usr/share/texlive/texmf-dist/tex/generic/babel-italian/italian.ldf
+(/usr/share/texmf-dist/tex/generic/babel-italian/italian.ldf
Language: italian 2015/03/26 v1.3n Italian support from the babel system
\it@lettering=\count89
\it@doublequoteactive=\count90
\it@ISOcompliance=\count91
-(/usr/share/texlive/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-it.tex
+(/usr/share/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-it.tex
UTF-8 Italian hyphenation patterns
-(/usr/share/texlive/texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-it.tex)
-(/usr/share/texlive/texmf-dist/tex/generic/hyph-utf8/patterns/quote/hyph-quote-
-it.tex)))) (/usr/share/texlive/texmf-dist/tex/latex/etoolbox/etoolbox.sty
+(/usr/share/texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-it.tex)
+(/usr/share/texmf-dist/tex/generic/hyph-utf8/patterns/quote/hyph-quote-it.tex)))
+) (/usr/share/texmf-dist/tex/latex/etoolbox/etoolbox.sty
Package: etoolbox 2015/08/02 v2.2a e-TeX tools for LaTeX (JAW)
\etb@tempcnta=\count92
)
-(/usr/share/texlive/texmf-dist/tex/latex/psnfss/helvet.sty
+(/usr/share/texmf-dist/tex/latex/psnfss/helvet.sty
Package: helvet 2005/04/12 PSNFSS-v9.2a (WaS)
-(/usr/share/texlive/texmf-dist/tex/latex/graphics/keyval.sty
+(/usr/share/texmf-dist/tex/latex/graphics/keyval.sty
Package: keyval 2014/10/28 v1.15 key=value parser (DPC)
\KV@toks@=\toks16
))
-(/usr/share/texlive/texmf-dist/tex/latex/base/fontenc.sty
-Package: fontenc 2016/06/19 v1.99m Standard LaTeX package
+(/usr/share/texmf-dist/tex/latex/base/fontenc.sty
+Package: fontenc 2005/09/27 v1.99g Standard LaTeX package
-(/usr/share/texlive/texmf-dist/tex/latex/base/t1enc.def
-File: t1enc.def 2016/06/19 v1.99m Standard LaTeX file
+(/usr/share/texmf-dist/tex/latex/base/t1enc.def
+File: t1enc.def 2005/09/27 v1.99g Standard LaTeX file
LaTeX Font Info: Redeclaring font encoding T1 on input line 48.
))
-(/usr/share/texlive/texmf-dist/tex/latex/geometry/geometry.sty
+(/usr/share/texmf-dist/tex/latex/geometry/geometry.sty
Package: geometry 2010/09/12 v5.6 Page Geometry
-(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/ifpdf.sty
+(/usr/share/texmf-dist/tex/generic/oberdiek/ifpdf.sty
Package: ifpdf 2016/05/14 v3.1 Provides the ifpdf switch
)
-(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/ifvtex.sty
+(/usr/share/texmf-dist/tex/generic/oberdiek/ifvtex.sty
Package: ifvtex 2016/05/16 v1.6 Detect VTeX and its facilities (HO)
Package ifvtex Info: VTeX not detected.
)
-(/usr/share/texlive/texmf-dist/tex/generic/ifxetex/ifxetex.sty
+(/usr/share/texmf-dist/tex/generic/ifxetex/ifxetex.sty
Package: ifxetex 2010/09/12 v0.6 Provides ifxetex conditional
)
\Gm@cnth=\count93
@@ -184,8 +184,7 @@ Package: ifxetex 2010/09/12 v0.6 Provides ifxetex conditional
\Gm@layoutvoffset=\dimen111
\Gm@dimlist=\toks17
)
-(/usr/share/texlive/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
-Package: fancyhdr 2016/09/06 3.8 Extensive control of page headers and footers
+(/usr/share/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty
\fancy@headwidth=\skip43
\f@ncyO@elh=\skip44
\f@ncyO@erh=\skip45
@@ -196,30 +195,30 @@ Package: fancyhdr 2016/09/06 3.8 Extensive control of page headers and footers
\f@ncyO@olf=\skip50
\f@ncyO@orf=\skip51
)
-(/usr/share/texlive/texmf-dist/tex/latex/lastpage/lastpage.sty
+(/usr/share/texmf-dist/tex/latex/lastpage/lastpage.sty
Package: lastpage 2015/03/29 v1.2m Refers to last page's name (HMM; JPG)
)
-(/usr/share/texlive/texmf-dist/tex/latex/graphics/graphicx.sty
+(/usr/share/texmf-dist/tex/latex/graphics/graphicx.sty
Package: graphicx 2014/10/28 v1.0g Enhanced LaTeX Graphics (DPC,SPQR)
-(/usr/share/texlive/texmf-dist/tex/latex/graphics/graphics.sty
-Package: graphics 2016/07/10 v1.0t Standard LaTeX Graphics (DPC,SPQR)
+(/usr/share/texmf-dist/tex/latex/graphics/graphics.sty
+Package: graphics 2016/05/09 v1.0r Standard LaTeX Graphics (DPC,SPQR)
-(/usr/share/texlive/texmf-dist/tex/latex/graphics/trig.sty
+(/usr/share/texmf-dist/tex/latex/graphics/trig.sty
Package: trig 2016/01/03 v1.10 sin cos tan (DPC)
)
-(/usr/share/texlive/texmf-dist/tex/latex/graphics-cfg/graphics.cfg
-File: graphics.cfg 2016/06/04 v1.11 sample graphics configuration
+(/usr/share/texmf-dist/tex/latex/graphics-cfg/graphics.cfg
+File: graphics.cfg 2016/01/02 v1.10 sample graphics configuration
)
-Package graphics Info: Driver file: luatex.def on input line 99.
+Package graphics Info: Driver file: luatex.def on input line 96.
-(/usr/share/texlive/texmf-dist/tex/latex/graphics-def/luatex.def
-File: luatex.def 2016/08/17 v0.01g Graphics/Color for luaTeX
+(/usr/share/texmf-dist/tex/lualatex/luatex-def/luatex.def
+File: luatex.def 2016/01/23 v0.01b Graphics/Color for luaTeX
-(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/infwarerr.sty
+(/usr/share/texmf-dist/tex/generic/oberdiek/infwarerr.sty
Package: infwarerr 2016/05/16 v1.4 Providing info/warning/error messages (HO)
)
-(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
+(/usr/share/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
Package: ltxcmds 2016/05/16 v1.23 LaTeX kernel commands for general use (HO)
)
\Gread@gobject=\count96
@@ -227,7 +226,7 @@ Package: ltxcmds 2016/05/16 v1.23 LaTeX kernel commands for general use (HO)
\Gin@req@height=\dimen112
\Gin@req@width=\dimen113
)
-(/usr/share/texlive/texmf-dist/tex/latex/wrapfig/wrapfig.sty
+(/usr/share/texmf-dist/tex/latex/wrapfig/wrapfig.sty
\wrapoverhang=\dimen114
\WF@size=\dimen115
\c@WF@wrappedlines=\count97
@@ -235,7 +234,7 @@ Package: ltxcmds 2016/05/16 v1.23 LaTeX kernel commands for general use (HO)
\WF@everypar=\toks18
Package: wrapfig 2003/01/31 v 3.6
)
-(/usr/share/texlive/texmf-dist/tex/latex/float/float.sty
+(/usr/share/texmf-dist/tex/latex/float/float.sty
Package: float 2001/11/08 v1.3d Float enhancements (AL)
\c@float@type=\count98
\float@exts=\toks19
@@ -243,13 +242,16 @@ Package: float 2001/11/08 v1.3d Float enhancements (AL)
\@float@everytoks=\toks20
\@floatcapt=\box28
)
-(/usr/share/texlive/texmf-dist/tex/latex/hyperref/hyperref.sty
-Package: hyperref 2016/06/24 v6.83q Hypertext links for LaTeX
+(/usr/share/texmf-dist/tex/latex/hyperref/hyperref.sty
+Package: hyperref 2016/05/05 v6.83n Hypertext links for LaTeX
-(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty
+(/usr/share/texmf-dist/tex/generic/luatex85/luatex85.sty
+Package: luatex85 2016/03/01 v1.0 pdftex aliases for luatex
+)
+(/usr/share/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty
Package: hobsub-hyperref 2016/05/16 v1.14 Bundle oberdiek, subset hyperref (HO)
-(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
+(/usr/share/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
Package: hobsub-generic 2016/05/16 v1.14 Bundle oberdiek, subset generic (HO)
Package: hobsub 2016/05/16 v1.14 Construct package bundles (HO)
Package hobsub Info: Skipping package `infwarerr' (already loaded).
@@ -264,8 +266,8 @@ Package: kvsetkeys 2016/05/16 v1.17 Key value parser (HO)
Package: kvdefinekeys 2016/05/16 v1.4 Define keys (HO)
Package: luatex-loader 2016/05/16 v0.6 Lua module loader (HO)
-(/usr/share/texlive/texmf-dist/scripts/oberdiek/oberdiek.luatex.lua)
-Package: pdftexcmds 2016/05/21 v0.22 Utility functions of pdfTeX for LuaTeX (HO)
+(/usr/share/texmf-dist/scripts/oberdiek/oberdiek.luatex.lua)
+Package: pdftexcmds 2016/05/10 v0.21 Utility functions of pdfTeX for LuaTeX (HO)
Package pdftexcmds Info: \pdf@primitive is available.
Package pdftexcmds Info: \pdf@ifprimitive is available.
@@ -282,68 +284,68 @@ Package: letltxmacro 2016/05/16 v1.5 Let assignment for LaTeX macros (HO)
Package: hopatch 2016/05/16 v1.3 Wrapper for package hooks (HO)
Package: xcolor-patch 2016/05/16 xcolor patch
Package: atveryend 2016/05/16 v1.9 Hooks at the very end of document (HO)
-Package: atbegshi 2016/06/09 v1.18 At begin shipout hook (HO)
+Package: atbegshi 2016/05/16 v1.17 At begin shipout hook (HO)
Package: refcount 2016/05/16 v3.5 Data extraction from label references (HO)
Package: hycolor 2016/05/16 v1.8 Color options for hyperref/bookmark (HO)
)
-(/usr/share/texlive/texmf-dist/tex/latex/oberdiek/auxhook.sty
+(/usr/share/texmf-dist/tex/latex/oberdiek/auxhook.sty
Package: auxhook 2016/05/16 v1.4 Hooks for auxiliary files (HO)
)
-(/usr/share/texlive/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+(/usr/share/texmf-dist/tex/latex/oberdiek/kvoptions.sty
Package: kvoptions 2016/05/16 v3.12 Key value format for package options (HO)
)
\@linkdim=\dimen116
\Hy@linkcounter=\count99
\Hy@pagecounter=\count100
-(/usr/share/texlive/texmf-dist/tex/latex/hyperref/pd1enc.def
-File: pd1enc.def 2016/06/24 v6.83q Hyperref: PDFDocEncoding definition (HO)
+(/usr/share/texmf-dist/tex/latex/hyperref/pd1enc.def
+File: pd1enc.def 2016/05/05 v6.83n Hyperref: PDFDocEncoding definition (HO)
)
\Hy@SavedSpaceFactor=\count101
-(/usr/share/texlive/texmf-dist/tex/latex/latexconfig/hyperref.cfg
+(/usr/share/texmf-dist/tex/latex/latexconfig/hyperref.cfg
File: hyperref.cfg 2002/06/06 v1.2 hyperref configuration of TeXLive
)
-Package hyperref Info: Hyper figures OFF on input line 4486.
-Package hyperref Info: Link nesting OFF on input line 4491.
-Package hyperref Info: Hyper index ON on input line 4494.
-Package hyperref Info: Plain pages OFF on input line 4501.
-Package hyperref Info: Backreferencing OFF on input line 4506.
+Package hyperref Info: Hyper figures OFF on input line 4446.
+Package hyperref Info: Link nesting OFF on input line 4451.
+Package hyperref Info: Hyper index ON on input line 4454.
+Package hyperref Info: Plain pages OFF on input line 4461.
+Package hyperref Info: Backreferencing OFF on input line 4466.
Package hyperref Info: Implicit mode ON; LaTeX internals redefined.
-Package hyperref Info: Bookmarks ON on input line 4735.
+Package hyperref Info: Bookmarks ON on input line 4691.
\c@Hy@tempcnt=\count102
-(/usr/share/texlive/texmf-dist/tex/latex/url/url.sty
+(/usr/share/texmf-dist/tex/latex/url/url.sty
\Urlmuskip=\muskip10
Package: url 2013/09/16 ver 3.4 Verb mode for urls, etc.
)
-LaTeX Info: Redefining \url on input line 5088.
+LaTeX Info: Redefining \url on input line 5044.
\XeTeXLinkMargin=\dimen117
\Fld@menulength=\count103
\Field@Width=\dimen118
\Fld@charsize=\dimen119
-Package hyperref Info: Hyper figures OFF on input line 6342.
-Package hyperref Info: Link nesting OFF on input line 6347.
-Package hyperref Info: Hyper index ON on input line 6350.
-Package hyperref Info: backreferencing OFF on input line 6357.
-Package hyperref Info: Link coloring OFF on input line 6362.
-Package hyperref Info: Link coloring with OCG OFF on input line 6367.
-Package hyperref Info: PDF/A mode OFF on input line 6372.
-LaTeX Info: Redefining \ref on input line 6412.
-LaTeX Info: Redefining \pageref on input line 6416.
+Package hyperref Info: Hyper figures OFF on input line 6298.
+Package hyperref Info: Link nesting OFF on input line 6303.
+Package hyperref Info: Hyper index ON on input line 6306.
+Package hyperref Info: backreferencing OFF on input line 6313.
+Package hyperref Info: Link coloring OFF on input line 6318.
+Package hyperref Info: Link coloring with OCG OFF on input line 6323.
+Package hyperref Info: PDF/A mode OFF on input line 6328.
+LaTeX Info: Redefining \ref on input line 6368.
+LaTeX Info: Redefining \pageref on input line 6372.
\Hy@abspage=\count104
\c@Item=\count105
\c@Hfootnote=\count106
)
-Package hyperref Message: Driver (autodetected): hluatex.
+Package hyperref Message: Driver (autodetected): hpdftex.
-(/usr/share/texlive/texmf-dist/tex/latex/hyperref/hluatex.def
-File: hluatex.def 2016/06/24 v6.83q Hyperref driver for luaTeX
+(/usr/share/texmf-dist/tex/latex/hyperref/hpdftex.def
+File: hpdftex.def 2016/05/05 v6.83n Hyperref driver for pdfTeX
\Fld@listcount=\count107
\c@bookmark@seq@number=\count108
-(/usr/share/texlive/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty
+(/usr/share/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty
Package: rerunfilecheck 2016/05/16 v1.8 Rerun checks for auxiliary files (HO)
Package uniquecounter Info: New unique counter `rerunfilecheck' on input line 28
2.
@@ -354,21 +356,25 @@ Package uniquecounter Info: New unique counter `rerunfilecheck' on input line 28
Package hyperref Warning: Unexpected value for option `hidelinks'
(hyperref) is ignored on input line 34.
-(/usr/share/texlive/texmf-dist/tex/latex/biblatex/biblatex.sty
-Package: biblatex 2016/09/17 v3.6 programmable bibliographies (PK/JW/AB)
+(/usr/share/texmf-dist/tex/latex/biblatex/biblatex.sty
+Package: biblatex 2016/05/14 v3.4 programmable bibliographies (PK/JW/AB)
-(/usr/share/texlive/texmf-dist/tex/latex/logreq/logreq.sty
+(/usr/share/texmf-dist/tex/generic/iftex/iftex.sty
+Package: iftex 2013/04/04 v0.2 Provides if(tex) conditional for PDFTeX, XeTeX, a
+nd LuaTeX
+)
+(/usr/share/texmf-dist/tex/latex/logreq/logreq.sty
Package: logreq 2010/08/04 v1.0 xml request logger
\lrq@indent=\count109
-(/usr/share/texlive/texmf-dist/tex/latex/logreq/logreq.def
+(/usr/share/texmf-dist/tex/latex/logreq/logreq.def
File: logreq.def 2010/08/04 v1.0 logreq spec v1.0
))
-(/usr/share/texlive/texmf-dist/tex/latex/base/ifthen.sty
+(/usr/share/texmf-dist/tex/latex/base/ifthen.sty
Package: ifthen 2014/09/29 v1.1c Standard LaTeX ifthen package (DPC)
)
-(/usr/share/texlive/texmf-dist/tex/generic/xstring/xstring.sty
-(/usr/share/texlive/texmf-dist/tex/generic/xstring/xstring.tex
+(/usr/share/texmf-dist/tex/generic/xstring/xstring.sty
+(/usr/share/texmf-dist/tex/generic/xstring/xstring.tex
\@xs@message=\write3
\integerpart=\count110
\decimalpart=\count111
@@ -429,7 +435,7 @@ Package: xstring 2013/10/13 v1.7c String manipulations (C Tellechea)
Package biblatex Info: Trying to load biblatex default data model...
Package biblatex Info: ... file 'blx-dm.def' found.
-(/usr/share/texlive/texmf-dist/tex/latex/biblatex/blx-dm.def)
+(/usr/share/texmf-dist/tex/latex/biblatex/blx-dm.def)
Package biblatex Info: Trying to load biblatex custom data model...
Package biblatex Info: ... file 'biblatex-dm.cfg' not found.
\c@afterword=\count153
@@ -507,14 +513,14 @@ Package biblatex Info: ... file 'biblatex-dm.cfg' not found.
Package biblatex Info: Trying to load compatibility code...
Package biblatex Info: ... file 'blx-compat.def' found.
-(/usr/share/texlive/texmf-dist/tex/latex/biblatex/blx-compat.def
-File: blx-compat.def 2016/09/17 v3.6 biblatex compatibility (PK/JW/AB)
+(/usr/share/texmf-dist/tex/latex/biblatex/blx-compat.def
+File: blx-compat.def 2016/05/14 v3.4 biblatex compatibility (PK/JW/AB)
)
Package biblatex Info: Trying to load generic definitions...
Package biblatex Info: ... file 'biblatex.def' found.
-(/usr/share/texlive/texmf-dist/tex/latex/biblatex/biblatex.def
-File: biblatex.def 2016/09/17 v3.6 biblatex compatibility (PK/JW/AB)
+(/usr/share/texmf-dist/tex/latex/biblatex/biblatex.def
+File: biblatex.def 2016/05/14 v3.4 biblatex compatibility (PK/JW/AB)
\c@textcitecount=\count285
\c@textcitetotal=\count286
\c@textcitemaxnames=\count287
@@ -526,21 +532,21 @@ File: biblatex.def 2016/09/17 v3.6 biblatex compatibility (PK/JW/AB)
Package biblatex Info: Trying to load bibliography style 'numeric'...
Package biblatex Info: ... file 'numeric.bbx' found.
-(/usr/share/texlive/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
-File: numeric.bbx 2016/09/17 v3.6 biblatex bibliography style (PK/JW/AB)
+(/usr/share/texmf-dist/tex/latex/biblatex/bbx/numeric.bbx
+File: numeric.bbx 2016/05/14 v3.4 biblatex bibliography style (PK/JW/AB)
Package biblatex Info: Trying to load bibliography style 'standard'...
Package biblatex Info: ... file 'standard.bbx' found.
-(/usr/share/texlive/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
-File: standard.bbx 2016/09/17 v3.6 biblatex bibliography style (PK/JW/AB)
+(/usr/share/texmf-dist/tex/latex/biblatex/bbx/standard.bbx
+File: standard.bbx 2016/05/14 v3.4 biblatex bibliography style (PK/JW/AB)
\c@bbx:relatedcount=\count292
\c@bbx:relatedtotal=\count293
))
Package biblatex Info: Trying to load citation style 'numeric'...
Package biblatex Info: ... file 'numeric.cbx' found.
-(/usr/share/texlive/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
-File: numeric.cbx 2016/09/17 v3.6 biblatex citation style (PK/JW/AB)
+(/usr/share/texmf-dist/tex/latex/biblatex/cbx/numeric.cbx
+File: numeric.cbx 2016/05/14 v3.4 biblatex citation style (PK/JW/AB)
Package biblatex Info: Redefining '\cite'.
Package biblatex Info: Redefining '\parencite'.
Package biblatex Info: Redefining '\footcite'.
@@ -556,32 +562,32 @@ Package biblatex Info: Redefining '\smartcites'.
Package biblatex Info: Trying to load configuration file...
Package biblatex Info: ... file 'biblatex.cfg' found.
-(/usr/share/texlive/texmf-dist/tex/latex/biblatex/biblatex.cfg
+(/usr/share/texmf-dist/tex/latex/biblatex/biblatex.cfg
File: biblatex.cfg
))
-(/usr/share/texlive/texmf-dist/tex/latex/draftwatermark/draftwatermark.sty
+(/usr/share/texmf-dist/tex/latex/draftwatermark/draftwatermark.sty
Package: draftwatermark 2015/02/19 1.2 Put a gray textual watermark on document
pages
-(/usr/share/texlive/texmf-dist/tex/latex/everypage/everypage.sty
+(/usr/share/texmf-dist/tex/latex/everypage/everypage.sty
Package: everypage 2007/06/20 1.1 Hooks to run on every page
)
-(/usr/share/texlive/texmf-dist/tex/latex/graphics/color.sty
-Package: color 2016/07/10 v1.1e Standard LaTeX Color (DPC)
+(/usr/share/texmf-dist/tex/latex/graphics/color.sty
+Package: color 2016/05/09 v1.1c Standard LaTeX Color (DPC)
-(/usr/share/texlive/texmf-dist/tex/latex/graphics-cfg/color.cfg
+(/usr/share/texmf-dist/tex/latex/graphics-cfg/color.cfg
File: color.cfg 2016/01/02 v1.6 sample color configuration
)
-Package color Info: Driver file: luatex.def on input line 147.
+Package color Info: Driver file: luatex.def on input line 144.
)
\sc@wm@hcenter=\skip67
\sc@wm@vcenter=\skip68
\sc@wm@fontsize=\skip69
)
-(/usr/share/texlive/texmf-dist/tex/latex/blindtext/blindtext.sty
+(/usr/share/texmf-dist/tex/latex/blindtext/blindtext.sty
Package: blindtext 2012/01/06 V2.0 blindtext-Package
-(/usr/share/texlive/texmf-dist/tex/latex/tools/xspace.sty
+(/usr/share/texmf-dist/tex/latex/tools/xspace.sty
Package: xspace 2014/10/28 v1.13 Space after command names (DPC,MH)
)
\c@blindtext=\count294
@@ -606,14 +612,14 @@ Package: xspace 2014/10/28 v1.13 Space after command names (DPC,MH)
Package biblatex Info: Trying to load language 'italian'...
Package biblatex Info: ... file 'italian.lbx' found.
-(/usr/share/texlive/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
-File: italian.lbx 2016/09/17 v3.6 biblatex localization (PK/JW/AB)
+(/usr/share/texmf-dist/tex/latex/biblatex/lbx/italian.lbx
+File: italian.lbx 2016/05/14 v3.4 biblatex localization (PK/JW/AB)
)
Package biblatex Info: Trying to load language 'english'...
Package biblatex Info: ... file 'english.lbx' found.
-(/usr/share/texlive/texmf-dist/tex/latex/biblatex/lbx/english.lbx
-File: english.lbx 2016/09/17 v3.6 biblatex localization (PK/JW/AB)
+(/usr/share/texmf-dist/tex/latex/biblatex/lbx/english.lbx
+File: english.lbx 2016/05/14 v3.4 biblatex localization (PK/JW/AB)
)
Package biblatex Warning: 'babel/polyglossia' detected but 'csquotes' missing.
@@ -639,7 +645,7 @@ LaTeX Font Info: ... okay on input line 84.
LaTeX Font Info: Checking defaults for PD1/pdf/m/n on input line 84.
LaTeX Font Info: ... okay on input line 84.
LaTeX Font Info: Try loading font information for T1+phv on input line 84.
- (/usr/share/texlive/texmf-dist/tex/latex/psnfss/t1phv.fd
+ (/usr/share/texmf-dist/tex/latex/psnfss/t1phv.fd
File: t1phv.fd 2001/06/04 scalable font definitions for T1/phv.
)
LaTeX Font Info: Font shape `T1/phv/m/n' will be
@@ -684,7 +690,7 @@ LaTeX Info: Redefining \it@ccap on input line 84.
Package lastpage Info: Please have a look at the pageslts package at
(lastpage) https://www.ctan.org/pkg/pageslts
(lastpage) ! on input line 84.
-(/usr/share/texlive/texmf-dist/tex/context/base/mkii/supp-pdf.mkii
+(/usr/share/texmf-dist/tex/context/base/mkii/supp-pdf.mkii
[Loading MPS to PDF converter (version 2006.09.02).]
\scratchcounter=\count314
\scratchdimen=\dimen120
@@ -697,10 +703,10 @@ Package lastpage Info: Please have a look at the pageslts package at
\MPnumerator=\count318
\makeMPintoPDFobject=\count319
\everyMPtoPDFconversion=\toks23
-) (/usr/share/texlive/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
+) (/usr/share/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
Package: epstopdf-base 2016/05/15 v2.6 Base part for package epstopdf
-(/usr/share/texlive/texmf-dist/tex/latex/oberdiek/grfext.sty
+(/usr/share/texmf-dist/tex/latex/oberdiek/grfext.sty
Package: grfext 2016/05/16 v1.2 Manage graphics extensions (HO)
)
Package epstopdf-base Info: Redefining graphics rule for `.eps' on input line 43
@@ -710,17 +716,17 @@ Package grfext Info: Graphics extension search list:
,.JBIG2,.JB2,.eps]
(grfext) \AppendGraphicsExtensions on input line 456.
-(/usr/share/texlive/texmf-dist/tex/latex/latexconfig/epstopdf-sys.cfg
+(/usr/share/texmf-dist/tex/latex/latexconfig/epstopdf-sys.cfg
File: epstopdf-sys.cfg 2010/07/13 v1.3 Configuration of (r)epstopdf for TeX Live
))
\AtBeginShipoutBox=\box30
Package hyperref Info: Link coloring OFF on input line 84.
-(/usr/share/texlive/texmf-dist/tex/latex/hyperref/nameref.sty
-Package: nameref 2016/05/21 v2.44 Cross-referencing by name of section
+(/usr/share/texmf-dist/tex/latex/hyperref/nameref.sty
+Package: nameref 2012/10/27 v2.43 Cross-referencing by name of section
-(/usr/share/texlive/texmf-dist/tex/generic/oberdiek/gettitlestring.sty
+(/usr/share/texmf-dist/tex/generic/oberdiek/gettitlestring.sty
Package: gettitlestring 2016/05/16 v1.5 Cleanup title references (HO)
)
\c@section@level=\count320
@@ -760,14 +766,14 @@ LaTeX Font Info: Font shape `T1/phv/m/n' will be
(Font) scaled to size 135.15015pt on input line 86.
LaTeX Font Info: Try loading font information for T1+cmtt on input line 86.
-(/usr/share/texlive/texmf-dist/tex/latex/base/t1cmtt.fd
+(/usr/share/texmf-dist/tex/latex/base/t1cmtt.fd
File: t1cmtt.fd 2014/09/29 v2.5h Standard LaTeX font definitions
)
LaTeX Font Warning: Font shape `T1/cmtt/m/n' in size <142.26378> not available
(Font) size <35.83> substituted on input line 86.
-[1{/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map}
+[1{/usr/share/texmf-dist/fonts/map/pdftex/updmap/pdftex.map}
] [2]
LaTeX Font Info: Font shape `T1/phv/bx/n' in size <12> not available
@@ -795,7 +801,7 @@ LaTeX Font Info: External font `cmex10' loaded for size
File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
<use res/images/cam_cpt_logo.pdf>
-Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 86.
+Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 70.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
warning (pdf backend): ignoring duplicate destination with the name 'page.2'
@@ -848,37 +854,23 @@ warning (pdf backend): ignoring duplicate destination with the name 'page.2'
[2
<./res/images/flag_of_canada.pdf>]
-Underfull \vbox (badness 2111) has occurred while \output is active []
-
File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
-
-<use res/images/cam_cpt_logo.pdf>
-Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 84.
+ <use res/images/cam_cpt_logo.pdf>
+Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 95.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
- [3<./res/images/canadian_red_ensign.pdf>]
+ [3<./res/images/canadian_red_ensign.pdf>]) (./tex/produzione.tex
File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
<use res/images/cam_cpt_logo.pdf>
-Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 129.
-(luatex.def) Requested size: 77.06407pt x 35.56593pt.
- [4]
-File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
- <use res/images/cam_cpt_logo.pdf>
-Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 179.
-(luatex.def) Requested size: 77.06407pt x 35.56593pt.
-
-[5]) (./tex/produzione.tex
-File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
- <use res/images/cam_cpt_logo.pdf>
Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 1.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
- [6]
+ [4]
Capitolo 2.
File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
<use res/images/cam_cpt_logo.pdf>
Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 50.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
- [7
+ [5
]
LaTeX Font Info: Font shape `T1/phv/m/it' in size <12> not available
@@ -890,19 +882,19 @@ File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 94.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
-[8]) (./tex/consumo.tex
+[6]) (./tex/consumo.tex
File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
<use res/images/cam_cpt_logo.pdf>
Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 1.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
- [9]
+ [7]
Capitolo 3.
) (./tex/politica.tex
File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
<use res/images/cam_cpt_logo.pdf>
Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 1.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
- [10
+ [8
]
Capitolo 4.
@@ -912,7 +904,7 @@ File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
<use res/images/cam_cpt_logo.pdf>
Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 36.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
- [11
+ [9
]
LaTeX Font Info: Font shape `T1/phv/bx/n' in size <8> not available
@@ -934,25 +926,25 @@ File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
<use res/images/cam_cpt_logo.pdf>
Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 99.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
- [12]
+ [10]
File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
<use res/images/cam_cpt_logo.pdf>
Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 135.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
-[13]) (./tex/conclusioni.tex
+[11]) (./tex/conclusioni.tex
File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
<use res/images/cam_cpt_logo.pdf>
Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 1.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
- [14]
+ [12]
Capitolo 5.
)
File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
<use res/images/cam_cpt_logo.pdf>
Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 122.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
- [15
+ [13
]
@@ -964,7 +956,7 @@ File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
<use res/images/cam_cpt_logo.pdf>
Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 125.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
- [16
+ [14
Missing character: There is no – (U+2013) in font phvro8t!
@@ -978,7 +970,7 @@ File: res/images/cam_cpt_logo.pdf Graphic file (type pdf)
<use res/images/cam_cpt_logo.pdf>
Package luatex.def Info: res/images/cam_cpt_logo.pdf used on input line 127.
(luatex.def) Requested size: 77.06407pt x 35.56593pt.
- [17]
+ [15]
Package atveryend Info: Empty hook `BeforeClearDocument' on input line 127.
Package atveryend Info: Empty hook `AfterLastShipout' on input line 127.
(./build/pdi.aux)
@@ -997,31 +989,30 @@ Package logreq Info: Writing requests to 'pdi.run.xml'.
)
Here is how much of LuaTeX's memory you used:
- 14327 strings out of 495118
+ 13956 strings out of 495119
125171,794899 words of node,token memory allocated
4440 words of node memory still in use:
2 hlist, 1 vlist, 1 rule, 571 glue, 52 glue_spec, 2 write, 13 pdf_action node
s
- avail lists: 2:39,3:319,4:58,5:242,6:3288,7:583,8:157,9:274,10:24,11:590
- 17055 multiletter control sequences out of 65536+600000
+ avail lists: 2:31,3:319,4:56,5:198,6:3288,7:583,8:157,9:274,10:24,11:590
+ 16698 multiletter control sequences out of 65536+600000
85 fonts using 3524183 bytes
- 40i,16n,47p,790b,2843s stack positions out of 5000i,500n,10000p,200000b,100000s
-{/usr/share/texmf/fonts/enc/dvips/cm-super/cm-super-t1.enc}{/usr/share/texlive/t
-exmf-dist/fonts/enc/dvips/base/8r.enc}</usr/share/texlive/texmf-dist/fonts/type1
-/public/amsfonts/cm/cmex10.pfb></usr/share/texlive/texmf-dist/fonts/type1/public
-/amsfonts/cm/cmmi12.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfon
-ts/cm/cmmi8.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cm
-r12.pfb></usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr6.pfb><
-/usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr8.pfb></usr/shar
-e/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy10.pfb></usr/share/texmf
-/fonts/type1/public/cm-super/sftt1200.pfb></usr/share/texmf/fonts/type1/public/c
-m-super/sftt3583.pfb></usr/share/texlive/texmf-dist/fonts/type1/urw/helvetic/uhv
-b8a.pfb></usr/share/texlive/texmf-dist/fonts/type1/urw/helvetic/uhvr8a.pfb></usr
-/share/texlive/texmf-dist/fonts/type1/urw/helvetic/uhvro8a.pfb>
-Output written on pdi.pdf (21 pages, 225308 bytes).
-
-PDF statistics: 422 PDF objects out of 1000 (max. 8388607)
- 376 compressed objects within 4 object streams
- 76 named destinations out of 1000 (max. 131072)
+ 40i,16n,47p,790b,2765s stack positions out of 5000i,500n,10000p,200000b,100000s
+{/usr/share/texmf-dist/fonts/enc/dvips/cm-super/cm-super-t1.enc}{/usr/share/texm
+f-dist/fonts/enc/dvips/base/8r.enc}</usr/share/texmf-dist/fonts/type1/public/ams
+fonts/cm/cmex10.pfb></usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmmi12
+.pfb></usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmmi8.pfb></usr/share
+/texmf-dist/fonts/type1/public/amsfonts/cm/cmr12.pfb></usr/share/texmf-dist/font
+s/type1/public/amsfonts/cm/cmr6.pfb></usr/share/texmf-dist/fonts/type1/public/am
+sfonts/cm/cmr8.pfb></usr/share/texmf-dist/fonts/type1/public/amsfonts/cm/cmsy10.
+pfb></usr/share/texmf-dist/fonts/type1/public/cm-super/sftt1200.pfb></usr/share/
+texmf-dist/fonts/type1/public/cm-super/sftt3583.pfb></usr/share/texmf-dist/fonts
+/type1/urw/helvetic/uhvb8a.pfb></usr/share/texmf-dist/fonts/type1/urw/helvetic/u
+hvr8a.pfb></usr/share/texmf-dist/fonts/type1/urw/helvetic/uhvro8a.pfb>
+Output written on pdi.pdf (19 pages, 220289 bytes).
+
+PDF statistics: 399 PDF objects out of 1000 (max. 8388607)
+ 355 compressed objects within 4 object streams
+ 66 named destinations out of 1000 (max. 131072)
217 words of extra memory for PDF output out of 10000 (max. 10000000)
diff --git a/docs/build/pdi.out b/docs/build/pdi.out
index 1993c39..32636b0 100644
--- a/docs/build/pdi.out
+++ b/docs/build/pdi.out
@@ -5,9 +5,9 @@
\BOOKMARK [1][-]{section.1.2}{Canadian Natives}{chapter.1}% 5
\BOOKMARK [2][-]{subsection.1.2.1}{Modern Canada}{section.1.2}% 6
\BOOKMARK [1][-]{section.1.3}{Natural resources}{chapter.1}% 7
-\BOOKMARK [2][-]{subsection.1.3.1}{Non-renewable energy sources}{section.1.3}% 8
-\BOOKMARK [2][-]{subsection.1.3.2}{Renewable energy sources}{section.1.3}% 9
-\BOOKMARK [2][-]{subsection.1.3.3}{Nuclear energy}{section.1.3}% 10
+\BOOKMARK [2][-]{subsection.1.3.1}{Crude Oil}{section.1.3}% 8
+\BOOKMARK [2][-]{subsection.1.3.2}{Natural Gas}{section.1.3}% 9
+\BOOKMARK [2][-]{subsection.1.3.3}{Coal}{section.1.3}% 10
\BOOKMARK [0][-]{chapter.2}{Produzione Energetica}{}% 11
\BOOKMARK [1][-]{section.2.1}{Energia Eolica}{chapter.2}% 12
\BOOKMARK [1][-]{section.2.2}{Energia Idroelettrica}{chapter.2}% 13
diff --git a/docs/build/pdi.pdf b/docs/build/pdi.pdf
index d82d206..1078f3f 100644
--- a/docs/build/pdi.pdf
+++ b/docs/build/pdi.pdf
Binary files differ
diff --git a/docs/build/pdi.toc b/docs/build/pdi.toc
index 0b6e9cb..409c999 100644
--- a/docs/build/pdi.toc
+++ b/docs/build/pdi.toc
@@ -25,64 +25,48 @@
\defcounter {refsection}{0}\relax
\contentsline {section}{\numberline {1.3}Natural resources}{3}{section.1.3}
\defcounter {refsection}{0}\relax
-\contentsline {subsection}{\numberline {1.3.1}Non-renewable energy sources}{4}{subsection.1.3.1}
+\contentsline {subsection}{\numberline {1.3.1}Crude Oil}{4}{subsection.1.3.1}
\defcounter {refsection}{0}\relax
-\contentsline {subsubsection}{Crude Oil}{4}{section*.2}
+\contentsline {subsection}{\numberline {1.3.2}Natural Gas}{4}{subsection.1.3.2}
\defcounter {refsection}{0}\relax
-\contentsline {subsubsection}{Natural Gas}{4}{section*.3}
-\defcounter {refsection}{0}\relax
-\contentsline {subsubsection}{Coal}{4}{section*.4}
-\defcounter {refsection}{0}\relax
-\contentsline {subsection}{\numberline {1.3.2}Renewable energy sources}{4}{subsection.1.3.2}
-\defcounter {refsection}{0}\relax
-\contentsline {subsubsection}{Wind Energy}{4}{section*.5}
-\defcounter {refsection}{0}\relax
-\contentsline {subsubsection}{Solar Photovoltaic}{5}{section*.6}
-\defcounter {refsection}{0}\relax
-\contentsline {subsubsection}{Hydroelectric}{5}{section*.7}
-\defcounter {refsection}{0}\relax
-\contentsline {subsubsection}{Solar Thermal}{5}{section*.8}
-\defcounter {refsection}{0}\relax
-\contentsline {subsubsection}{Marine Energy}{5}{section*.9}
-\defcounter {refsection}{0}\relax
-\contentsline {subsection}{\numberline {1.3.3}Nuclear energy}{6}{subsection.1.3.3}
+\contentsline {subsection}{\numberline {1.3.3}Coal}{4}{subsection.1.3.3}
\defcounter {refsection}{0}\relax
\select@language {italian}
\defcounter {refsection}{0}\relax
-\contentsline {chapter}{\numberline {2}Produzione Energetica}{7}{chapter.2}
+\contentsline {chapter}{\numberline {2}Produzione Energetica}{5}{chapter.2}
\defcounter {refsection}{0}\relax
-\contentsline {section}{\numberline {2.1}Energia Eolica}{7}{section.2.1}
+\contentsline {section}{\numberline {2.1}Energia Eolica}{5}{section.2.1}
\defcounter {refsection}{0}\relax
-\contentsline {section}{\numberline {2.2}Energia Idroelettrica}{8}{section.2.2}
+\contentsline {section}{\numberline {2.2}Energia Idroelettrica}{6}{section.2.2}
\defcounter {refsection}{0}\relax
-\contentsline {section}{\numberline {2.3}Energia Marina}{8}{section.2.3}
+\contentsline {section}{\numberline {2.3}Energia Marina}{6}{section.2.3}
\defcounter {refsection}{0}\relax
-\contentsline {section}{\numberline {2.4}Energia Solare Fotovoltaica}{8}{section.2.4}
+\contentsline {section}{\numberline {2.4}Energia Solare Fotovoltaica}{6}{section.2.4}
\defcounter {refsection}{0}\relax
-\contentsline {section}{\numberline {2.5}Energia Solare Termica}{9}{section.2.5}
+\contentsline {section}{\numberline {2.5}Energia Solare Termica}{7}{section.2.5}
\defcounter {refsection}{0}\relax
-\contentsline {section}{\numberline {2.6}Energia Geotermica}{9}{section.2.6}
+\contentsline {section}{\numberline {2.6}Energia Geotermica}{7}{section.2.6}
\defcounter {refsection}{0}\relax
-\contentsline {chapter}{\numberline {3}Consumo Energetico}{10}{chapter.3}
+\contentsline {chapter}{\numberline {3}Consumo Energetico}{8}{chapter.3}
\defcounter {refsection}{0}\relax
-\contentsline {section}{\numberline {3.1}Consumo Elettrico}{10}{section.3.1}
+\contentsline {section}{\numberline {3.1}Consumo Elettrico}{8}{section.3.1}
\defcounter {refsection}{0}\relax
-\contentsline {chapter}{\numberline {4}Politiche Ecologiche}{11}{chapter.4}
+\contentsline {chapter}{\numberline {4}Politiche Ecologiche}{9}{chapter.4}
\defcounter {refsection}{0}\relax
-\contentsline {section}{\numberline {4.1}Emissioni}{11}{section.4.1}
+\contentsline {section}{\numberline {4.1}Emissioni}{9}{section.4.1}
\defcounter {refsection}{0}\relax
-\contentsline {subsection}{\numberline {4.1.1}Produzione Elettrica}{11}{subsection.4.1.1}
+\contentsline {subsection}{\numberline {4.1.1}Produzione Elettrica}{9}{subsection.4.1.1}
\defcounter {refsection}{0}\relax
-\contentsline {paragraph}{Coefficente di emissione di CO\textsubscript {2} ($k_{CO_2}$):}{12}{section*.10}
+\contentsline {paragraph}{Coefficente di emissione di CO\textsubscript {2} ($k_{CO_2}$):}{10}{section*.2}
\defcounter {refsection}{0}\relax
-\contentsline {paragraph}{Potere Calorico ($\Delta _c$):}{12}{section*.11}
+\contentsline {paragraph}{Potere Calorico ($\Delta _c$):}{10}{section*.3}
\defcounter {refsection}{0}\relax
-\contentsline {subsection}{\numberline {4.1.2}Emissioni da economie domestiche (abitazioni)}{13}{subsection.4.1.2}
+\contentsline {subsection}{\numberline {4.1.2}Emissioni da economie domestiche (abitazioni)}{11}{subsection.4.1.2}
\defcounter {refsection}{0}\relax
-\contentsline {section}{\numberline {4.2}L'energia dell'atomo}{13}{section.4.2}
+\contentsline {section}{\numberline {4.2}L'energia dell'atomo}{11}{section.4.2}
\defcounter {refsection}{0}\relax
-\contentsline {subsection}{\numberline {4.2.1}Morti}{13}{subsection.4.2.1}
+\contentsline {subsection}{\numberline {4.2.1}Morti}{11}{subsection.4.2.1}
\defcounter {refsection}{0}\relax
-\contentsline {chapter}{\numberline {5}Conclusioni}{15}{chapter.5}
+\contentsline {chapter}{\numberline {5}Conclusioni}{13}{chapter.5}
\defcounter {refsection}{0}\relax
-\contentsline {section}{\numberline {5.1}Dichiarazione d'autenticit\`a}{15}{section.5.1}
+\contentsline {section}{\numberline {5.1}Dichiarazione d'autenticit\`a}{13}{section.5.1}