X-Git-Url: https://git.mdrn.pl/librarian.git/blobdiff_plain/82f5d8f05bad9e5223426c210770602ca2a97c9b..637475880b35561e349a4a5df3048256cb58fb76:/librarian/pdf/wl.cls

diff --git a/librarian/pdf/wl.cls b/librarian/pdf/wl.cls
index b840217..55813dc 100644
--- a/librarian/pdf/wl.cls
+++ b/librarian/pdf/wl.cls
@@ -12,33 +12,35 @@
 % a4paper,... - paper size as required by LaTeX
 % nowlfont - don't use customized WL font
 
+%\RequirePackage{geometry}
 \RequirePackage{setspace}
 \RequirePackage{type1cm}
 \RequirePackage{amssymb}
 \RequirePackage{amsmath}
-\DeclareOption{13pt}{%
-\AtEndOfClass{%
+
+%\DeclareOption{13pt}{%
+%\AtEndOfClass{%
 % font size definitions, similar to ones in /usr/share/texmf-texlive/tex/latex/base/
-\renewcommand\normalsize{%
-   \@setfontsize\normalsize{13pt}{14.5pt}%
-   \abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@
-   \abovedisplayshortskip \z@ \@plus3\p@
-   \belowdisplayshortskip 6.5\p@ \@plus3.5\p@ \@minus3\p@
-   \belowdisplayskip \abovedisplayskip
-   \let\@listi\@listI}\normalsize%
-\renewcommand\footnotesize{%
-   \@setfontsize\footnotesize\@xpt\@xiipt
-   \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
-   \abovedisplayshortskip \z@ \@plus3\p@
-   \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@
-   \def\@listi{\leftmargin\leftmargini
-               \topsep 6\p@ \@plus2\p@ \@minus2\p@
-               \parsep 3\p@ \@plus2\p@ \@minus\p@
-               \itemsep \parsep}%
-   \belowdisplayskip \abovedisplayskip
-}%
-}%
-}
+%% \renewcommand\normalsize{%
+%%    \@setfontsize\normalsize{13pt}{14.5pt}%
+%%    \abovedisplayskip 12\p@ \@plus3\p@ \@minus7\p@
+%%    \abovedisplayshortskip \z@ \@plus3\p@
+%%    \belowdisplayshortskip 6.5\p@ \@plus3.5\p@ \@minus3\p@
+%%    \belowdisplayskip \abovedisplayskip
+%%    \let\@listi\@listI}\normalsize%
+%% \renewcommand\footnotesize{%
+%%    \@setfontsize\footnotesize\@xpt\@xiipt
+%%    \abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
+%%    \abovedisplayshortskip \z@ \@plus3\p@
+%%    \belowdisplayshortskip 6\p@ \@plus3\p@ \@minus3\p@
+%%    \def\@listi{\leftmargin\leftmargini
+%%                \topsep 6\p@ \@plus2\p@ \@minus2\p@
+%%                \parsep 3\p@ \@plus2\p@ \@minus\p@
+%%                \itemsep \parsep}%
+%%    \belowdisplayskip \abovedisplayskip
+%}%
+%}%
+%}
 
 %% \DeclareOption{14pt}{\renewcommand{\normalsize}{\AtEndOfClass{\fontsize{14}{17}\selectfont}}}
 
@@ -50,7 +52,13 @@
 \DeclareOption{a5paper}{%
       \setlength{\paperheight}{210mm}%
       \setlength{\paperwidth}{148mm}}
-
+% a5paper dropped down size
+\newif\ifafivepaper \afivepaperfalse
+\DeclareOption{a5paperdd}{%
+  \setlength{\paperheight}{225mm}%
+  \setlength{\paperwidth}{160mm}%
+  \afivepapertrue
+}
 
 \newif\ifshowfootnotes \showfootnotestrue
 \DeclareOption{nofootnotes}{\showfootnotesfalse}
@@ -61,10 +69,21 @@
 \newif\ifenablewlfont \enablewlfonttrue
 \DeclareOption{nowlfont}{\enablewlfontfalse}
 
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
-\ProcessOptions\relax
-\LoadClass[a4paper]{book}
 
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{extbook}}
+\ProcessOptions\relax
+\LoadClass{extbook}
+
+\ifafivepaper
+  \usepackage[%
+    paperwidth=160mm,%
+    paperheight=225mm,%
+    text={117mm,162mm},% 
+    top=30mm,% 
+    headsep=8mm,%
+    left=23mm,%
+    right=30mm]{geometry}%
+\fi
 
 \usepackage{trace}
 \usepackage{caption}
@@ -76,63 +95,30 @@
 \usepackage{xunicode}
 \usepackage{xltxtra}
 
-
 \usepackage[overload]{textcase}
 \usepackage{scalefnt}
 \usepackage[colorlinks=true,linkcolor=black,setpagesize=false,urlcolor=black,xetex]{hyperref}
 
-\ifenablewlfont
+
 \setmainfont [
-%ExternalLocation,
-UprightFont = JunicodeWL-Regular,
-ItalicFont = JunicodeWL-Italic,
-BoldFont = JunicodeWL-Regular,
-BoldItalicFont = JunicodeWL-Italic,
-SmallCapsFont = JunicodeWL-Regular,
-SmallCapsFeatures = {Letters={SmallCaps,UppercaseSmallCaps}},
-Numbers=OldStyle,
-Scale=1.04,
-LetterSpace=-1.0
-] {JunicodeWL}
-
-\newfontfamily\alien[
-SmallCapsFeatures = {Letters={SmallCaps,UppercaseSmallCaps}},
-Numbers=OldStyle,
-Scale=0.85,
-LetterSpace=-1.0
-] {DejaVu Serif}
-
-
-\defaultfontfeatures{
-SizeFeatures={
-  {Size={-10.5}, FakeStretch=1.02, LetterSpace=2.0 },
-  {Size={10.5-12}, FakeStretch=2.00, LetterSpace=0.0 },
-  {Size={12-}, FakeStretch=0.98, LetterSpace=-2.0 }
-}
-}
-
-\renewcommand{\textsc}[1]{%
-{\addfontfeature{
-SizeFeatures={
-  {Size={-10.5}, Scale=1.2, FakeStretch=1.02, LetterSpace=8.0 },
-  {Size={10.5-12}, Scale=1.2, FakeStretch=1.02, LetterSpace=8.0 },
-  {Size={12-}, FakeStretch=1.0, LetterSpace=8.0 }
-},
-Letters={SmallCaps,UppercaseSmallCaps}
-}
-#1}
-}
-\fi% enablewlfont
-
-%{\Itshape JunicodeWL-Italic.ttf }
-%{\bfseries Junicode-Bold.ttf }
-%{\bfseries\itshape Junicode-BoldItalic.ttf }
+ItalicFont = CrimsonText-Italic,
+BoldFont = CrimsonText-Bold,
+BoldItalicFont = CrimsonText-BoldItalic,
+Ligatures={Common, Contextual},
+Mapping=tex-text
+]{CrimsonText-Roman}
+\newfontface\sb{CrimsonText-Semibold}
+
+\renewcommand{\baselinestretch}{1.1}
 
 \pagestyle{plain}
 \usepackage{fancyhdr}
+\usepackage[explicit]{titlesec}
 
 \makeatletter
 
+
+
 % bottom figure below footnotes
 \usepackage{fnpos}
 \makeFNabove
@@ -140,15 +126,8 @@ Letters={SmallCaps,UppercaseSmallCaps}
 \usepackage{color}
 \definecolor{theme}{gray}{.3}
 
-\setlength{\marginparsep}{2em}
-\setlength{\marginparwidth}{8.5em}
-\setlength{\oddsidemargin}{36mm}
-\setlength{\evensidemargin}{0pt}
-\setlength{\voffset}{0pt}
-\setlength{\topmargin}{0pt}
-\setlength{\headheight}{0pt}
-\setlength{\headsep}{0pt}
-\setlength{\textheight}{24cm}
+
+%%%%%%%%%%%%%%%%%%%%%% Headings.
 
 \pagestyle{fancy}
 \fancyhf{}
@@ -158,8 +137,61 @@ Letters={SmallCaps,UppercaseSmallCaps}
 %\lfoot{{\footnotesize \textsc{\@author} \emph{\@title}}}
 \cfoot{}
 %\rfoot{{\footnotesize \thepage}}
-\fancyfoot[LO,RE]{{\footnotesize \textsc{\@author} \emph{\@title}}}
-\fancyfoot[LE,RO]{{\footnotesize \thepage}}
+\renewcommand{\chaptermark}[1]{\markboth{\MakeUppercase{#1}}{}}
+\fancyhead[CE]{{\textsc{\MakeUppercase{\@title}}}}
+\fancyhead[CO]{{\textsc{\leftmark}}}
+\fancyhead[LE,RO]{{\thepage}}
+
+%%%%%%%%%%%%%%%%%%%%%% Section title styles.
+%% Sections
+\titleformat{\chapter}%
+{\raggedright\Huge\sc\addfontfeature{LetterSpace=0.0, Letters={Uppercase}}}%
+{}{0pt}{\MakeUppercase{#1}}
+\titlespacing*{\chapter}{0pt}{0pt}{40pt}
+
+%% Subsections
+\titleformat{\section}%
+{\bf\large\addfontfeature{Scale=1.0}}%
+{\thesection\enskip}{0pt}{#1}
+\renewcommand{\thesection}{\Roman{section}}
+
+\titleformat{\subsection}%
+{\sc}%
+{\thesubsection}{0pt}{#1}
+
+\newcommand{\typosubsubsection}[1]{%
+{\textsc{#1}}
+}
+
+%% XXX delete them
+\newcommand{\typosubsection}[1]{%
+{\MakeUppercase{#1}}
+}
+
+\newcommand{\typosection}[1]{%
+{\addfontfeature{FakeStretch=0.96, LetterSpace=-4.0}\emph{\scalefont{2}#1}}
+%{\addfontfeature{Scale=2.0, FakeStretch=0.98, LetterSpace=-2.0}\emph{#1}}
+}
+%%%%%%%%%%%%%%%%%% ^^
+
+%%%%% Footnotes %%%%%%%%5
+%% \makeatletter
+%% \renewcommand\@makefntext[1]{%
+%%   \noindent\parbox[t][\height][l]{3em}{\@thefnmark.}\parbox[t][\height][l]{6cm}{#1}\vskip3pt}
+%% \makeatother
+\makeatletter
+
+\renewcommand\@makefnmark{%
+\hbox{{\normalfont\@thefnmark}}%
+}
+\renewcommand\thefootnote{[\arabic{footnote}]}
+
+\long\def\@makefntext#1{%
+  \parindent 1em\noindent \hb@xt@ 1.8em{\hss \@makefnmark \enskip}#1.
+}
+
+\makeatother
+
 
 \clubpenalty=100000
 \widowpenalty=100000
@@ -177,10 +209,8 @@ Letters={SmallCaps,UppercaseSmallCaps}
 \raisebox{0pt}[0pt][0pt]{\makebox[0pt][r]{\usebox{\xglyphbox}}}}
 
 \newcommand{\makecover}[2]{
-
-
-        %\pdfpagewidth=#1
-        %\pdfpageheight=#2
+        \pdfpagewidth=#1
+        \pdfpageheight=#2
 
         \thispagestyle{empty}
         \newlength{\PictHOffset}
@@ -195,35 +225,36 @@ Letters={SmallCaps,UppercaseSmallCaps}
         \addtolength{\PictVOffset}{\headheight}
         \addtolength{\PictVOffset}{\headsep}
         \addtolength{\PictVOffset}{\topskip}
-
-        \addtolength{\PictVOffset}{-#2}
+        \addtolength{\PictVOffset}{-\pdfpageheight}
 
         \noindent\hspace*{-\PictHOffset}%
         \raisebox{\PictVOffset}[0pt][0pt]{\makebox[0pt][l]{%
-            \includegraphics[height=#2,width=#1]{cover.jpg}}}
-        %\clearpage
-        \vspace{#2}
+            \includegraphics[height=\pdfpageheight,width=\pdfpagewidth]{cover.png}}}
+        \clearpage
+
+ 
+%% Strona tytułowa %% XXX
+       \hspace{-36mm}\parbox{16cm}{
+        {\addfontfeature{LetterSpace=-4.0}{\scalefont{4}%
+            \noindent Philippe Aigrain}}
 
-        \hspace{-36mm}\parbox{16cm}{
-        {\addfontfeature{LetterSpace=-4.0}\emph{\scalefont{4}%
-            \noindent Philippe Aigrain
+       {\addfontfeature{LetterSpace=-4.0}{\scalefont{2.5}%
+            przy współpracy Suzanne Aigrain
         }}
 
         \vspace{2em}
         {\addfontfeature{LetterSpace=-4.0}{\scalefont{6}%
             Dzielenie się
         }}
-
-
-        \vspace{8em}
-
-%\emph{\thankyou}\\
-%\indent\emph{You made this book possible.}
+        
+        \vspace{2em}
+        {\addfontfeature{LetterSpace=-4.0}{\scalefont{3}%
+            Kultura i gospodarka epoki internetu
+        }}
         }
 
-
-        %\setlength{\pdfpagewidth}{210mm}
-        %\setlength{\pdfpageheight}{297mm}
+       \setlength{\pdfpagewidth}{210mm}
+       \setlength{\pdfpageheight}{297mm}
 }
 
 
@@ -232,134 +263,191 @@ Letters={SmallCaps,UppercaseSmallCaps}
     \thispagestyle{empty}
     \footnotesize
     \color{theme}
-
-    \noindent \begin{minipage}[t]{.35\textwidth}\vspace{0pt}
-        \href{http://www.wolnelektury.pl}{\xbox{\includegraphics[width=\textwidth]{wl-logo.png}}}
-    \end{minipage}
-    \begin{minipage}[t]{.65\textwidth}\vspace{0pt}
-
-    \ifflaglessadvertising
-    \else
-        \href{\bookurl}{Ta lektura}, podobnie jak tysiące innych, jest dostępna on-line na stronie
-        \href{http://www.wolnelektury.pl/}{wolnelektury.pl}.
-        \vspace{.5em}
-    \fi
-
-    Utwór opracowany został w ramach projektu \href{http://www.wolnelektury.pl/}{Wolne Lektury}
-    przez \href{http://nowoczesnapolska.org.pl}{fundację Nowoczesna Polska}.
-
-    \end{minipage}
     \noindent \rule{\linewidth}{0.4pt}
 
     \vspace{.6em}
     \color{black}
-    
     }
 }
 
 \usepackage{printlen}
 
 \newcommand{\editorialsection}{
-\clearpage
+%% XXX % sprawdzic czy czegos nie zgubilem z master
+%% szczegolnie jesli chodzi o makra wstawiajace dane z DC, jak np \editors
+%% coś tu nie dizała, do zmiany ogólnie
+
+%% \clearpage
+%%         \thispagestyle{empty}
+
+%% % Pusta strona 
+%% \clearpage
+%%         \thispagestyle{empty}
+
+%% \vspace{2em}
+%%       \hspace{0mm}\parbox{16cm}{
+%% \centering
+%%       {\addfontfeature{LetterSpace=-4.0}{\scalefont{6}%
+%%            Dzielenie się
+%%       }}
+
+%%   \vspace{2em}
+%%          {\addfontfeature{LetterSpace=-4.0}{\scalefont{3}%
+%%              Kultura i gospodarka epoki internetu
+%%          }}
+%% }
+
+%% \clearpage
+%%         \thispagestyle{empty}
+
+%% \clearpage
+%%         \thispagestyle{empty}
+
+%% %\parbox{10cm}{
+%% %  \centering
 
-%\set\textwidth=450pt
-%\printlength\textwidth
+%%   \hspace{-36mm}\parbox{16cm}{
+%% \centering
 
+%%   {\addfontfeature{LetterSpace=-4.0}{\scalefont{4}%
+%%       \noindent Philippe Aigrain
+%%   }}
 
-%% {\scalefont{1.5}Drogi czytelniku!}
+%%   {\addfontfeature{LetterSpace=-4.0}{\scalefont{2.5}%
+%%       przy współpracy Suzanne Aigrain
+%%   }}
+  
+%%   \vspace{2em}
+%%          {\addfontfeature{LetterSpace=-4.0}{\scalefont{6}%
+%%              Dzielenie się
+%%          }}
+         
+%%   \vspace{2em}
+%%          {\addfontfeature{LetterSpace=-4.0}{\scalefont{4}%
+%%              Kultura i gospodarka epoki internetu
+%%          }}
 
+%%   \vspace{2em}
+%%          {\addfontfeature{LetterSpace=-4.0}{\scalefont{2}%
+%%              Z języka angielskiego przełożył \\
+%%              \emph{Wojciech Pędzich}
+%%          }}
 
+%% \vspace{22em}
+
+%% \includegraphics[scale=.2]{logo.eps}
+%% }
+
+%%     Przekaż darowiznę na konto:
+%%     \href{http://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/}{szczegóły na stronie Fundacji}.
+
+%% \clearpage
+%%         \thispagestyle{empty}
+
+%% \noindent Tytuł oryginału
+
+%% \noindent \emph{Sharing. Culture and the Economy in the Internet Age}
 
 %% \vspace{1em}
 
+%% \noindent \editors
+
 %% \vspace{1em}
-%% Zespół Fundacji Nowoczesna Polska
 
-\vspace{4em}
-\includegraphics[scale=.2]{logo.eps}
-\vspace{1em}
 
-\href{http://nowoczesnapolska.org.pl/}{http://nowoczesnapolska.org.pl/}
+%% \noindent \rightsinfo
 
-%\vspace{4em}
-%\box{\tableofcontents}
+%% \vspace{1em}
 
-  \begin{figure}[b!]
-  {
-    \footnotesize
-    \color{theme}
-    \noindent \rule{\linewidth}{0.4pt}
+%% \noindent \coverby
 
-    \rightsinfo
-    \vspace{.6em}
 
-    %Źródło: \href{\bookurl}{\bookurl}
+%% %\set\textwidth=450pt
+%% %\printlength\textwidth
 
-    %\vspace{.6em}
-    %\sourceinfo
 
-    %\description
-    %\vspace{.6em}
+%% %% {\scalefont{1.5}Drogi czytelniku!}
 
-    Opublikowano przez \href{http://nowoczesnapolska.org.pl}{Fundację Nowoczesna Polska}, 2012.
 
-    \editors
 
-    %\vspace{.6em}
-    \coverby
-    
-    \color{black}
-    \clearpage
-  }
-  \end{figure}
-}
+%% %% \vspace{1em}
 
+%% \vspace{1em}
 
-\newcommand{\typosubsubsection}[1]{%
-{\textsc{#1}}
-}
+%% \noindent Tłumaczenie książki powstało w ramach projektu "Przyszłość prawa autorskiego" finansowanego przez {\it Trust for Civil Society in Central and Eastern Europe}.
 
-\newcommand{\typosubsection}[1]{%
-{\addfontfeature{
-SizeFeatures={
-  {Size={-10}, Scale=1.2, FakeStretch=1.00, LetterSpace=8.0 },
-  {Size={10.5-12}, Scale=1.2, FakeStretch=1.00, LetterSpace=8.0 },
-  {Size={12-}, FakeStretch=1.0, LetterSpace=8.0 }
-},
-Letters={Uppercase}
-}
-\MakeUppercase{#1}}
-}
+%% \vspace{1em}
 
-\newcommand{\typosection}[1]{%
-{\addfontfeature{FakeStretch=0.96, LetterSpace=-4.0}\emph{\scalefont{2}#1}}
-%{\addfontfeature{Scale=2.0, FakeStretch=0.98, LetterSpace=-2.0}\emph{#1}}
+%% \noindent \includegraphics[scale=.4]{cce_trust.eps}
+
+%% \vspace{1em}
+
+%% \noindent Wydawca: Fundacja Nowoczesna Polska, Warszawa 2012
+
+%% \vspace{1em}
+%% \includegraphics[scale=.2]{logo.eps}
+%% \vspace{1em}
+
+%% \noindent \href{http://nowoczesnapolska.org.pl/}{http://nowoczesnapolska.org.pl/}
+
+
+
+%% %\vspace{4em}
+%% %\box{\tableofcontents}
+
+%% %%   \begin{figure}[b!]
+%% %%   {
+%% %%     \footnotesize
+%% %%     \color{theme}
+%% %%     \noindent \rule{\linewidth}{0.4pt}
+
+%% %%     \rightsinfo
+%% %% %    \vspace{.6em}
+
+%% %%     %Źródło: \href{\bookurl}{\bookurl}
+
+%% %%     %\vspace{.6em}
+%% %%     %\sourceinfo
+
+%% %%     %\description
+%% %%     %\vspace{.6em}
+
+%% %%     Opublikowano przez \href{http://nowoczesnapolska.org.pl}{Fundację Nowoczesna Polska}, 2012.
+
+%% %%     \editors
+
+%% %%     %\vspace{.6em}
+%% %%     \coverby
+    
+%% %%     \color{black}
+%% %%   }
+%% %%   \end{figure}
+%% \clearpage
+%% }
 }
 
+
+
 \newcommand{\tytul}[1]{%
 #1%
-%\vspace{1em}%
-}
-
-\newcommand{\autorpodutworu}[1]{%
-\section*{\typosection{#1}}%
+\vspace{1em}%
 }
 
 \newcommand{\nazwapodutworu}[1]{%
-\section*{\typosection{#1}}%
+\section*{#1}%
 }
 
 \newcommand{\autorutworu}[1]{%
-\addcontentsline{toc}{part}{???}
-\subsection*{\typosubsection{#1}}%
+#1
+%\subsection*{\typosubsection{#1}}%
 }
 
 \newcommand{\dzielonadrzedne}[1]{%
-\subsection*{\typosubsubsection{#1}}%
+\subsection*{#1}%
 }
 
 \newcommand{\nazwautworu}[1]{%
-\section*{\typosection{#1}}%
+\section*{#1}%
 }
 
 \newcommand{\podtytul}[1]{%
@@ -373,6 +461,9 @@ Letters={Uppercase}
 \newcommand{\translator}[1]{%
 \subsection*{\typosubsubsection{tłum. #1}}%
 }
+\newcommand{\translatorsline}[1]{%
+#1
+}
 
 \newcommand{\powiesc}[1]{#1}
 \newcommand{\opowiadanie}[1]{#1}
@@ -383,9 +474,7 @@ Letters={Uppercase}
 \newcommand{\dramatwspolczesny}[1]{#1}
 
 \newcommand{\nota}[1]{%
-\begin{quotation}%
-#1%
-\end{quotation}%
+\par{#1}%
 }
 
 \newcommand{\dedykacja}[1]{%
@@ -436,25 +525,25 @@ Letters={Uppercase}
 \subsection*{\typosubsection{#1}}%
 }
 \newcommand{\naglowekczesc}[1]{%
-%\pagebreak
-\subsection*{\typosubsection{#1}}%
+\pagebreak
+\part{#1}%
 }
-\newcommand{\naglowekrozdzial}[1]{%
+\newcommand{\srodtytul}[1]{%
 \subsection*{\typosubsection{#1}}%
 }
 
 \newcommand{\naglowekscena}[1]{%
 \subsubsection*{\typosubsubsection{#1}}%
 }
-\newcommand{\naglowekpodrozdzial}[1]{%
-\subsubsection*{\typosubsubsection{#1}}%
+\newcommand{\naglowekrozdzial}[1]{%
+\chapter{#1}%
 }
 
 \newcommand{\naglowekosoba}[1]{%
 \par{\textsc{#1}}\nopagebreak%
 }
-\newcommand{\srodtytul}[1]{%
-\vskip 1em \par{\large \it \noindent #1}\vskip .5em\nopagebreak%
+\newcommand{\naglowekpodrozdzial}[1]{%
+\section{#1}\nopagebreak%
 }
 
 \newcommand{\miejsceczas}[1]{%
@@ -538,7 +627,6 @@ Letters={Uppercase}
 \begin{center}%
 \par{*}%
 \end{center}%
-\noindent%
 }
 
 \newcommand{\separatorlinia}{%
@@ -560,11 +648,11 @@ Letters={Uppercase}
 \fi
 }
 
-\newcommand{\ilustr}[2]{
-
-\vspace{1em}%
-\begin{center}%
-\par{\includegraphics[width=\textwidth]{#1}\\#2}%
-\end{center}%
-\vspace{1em}%
+\newcommand{\spistresci}{
+  \tableofcontents
+  \newpage
 }
+
+\newcommand{\link}[2]{\href{#1}{\uline{#2}\footnote{#1}}}
+
+\newcommand{\www}[1]{{\normalfont\href{#1}{#1}}}