diff --git a/en_US.ISO8859-1/flyer/Makefile b/en_US.ISO8859-1/flyer/Makefile
index 7b6a4d62a0..c4e885f1c6 100644
--- a/en_US.ISO8859-1/flyer/Makefile
+++ b/en_US.ISO8859-1/flyer/Makefile
@@ -8,7 +8,10 @@ ps: dvi
dvips -t a4 flyer.dvi -o
dvi: flyer.tex
+ pngtopnm -mix ../../share/images/flyer/logo-full.png | \
+ pnmtops -noturn > logo-full.eps
latex flyer.tex
clean:
- rm -f flyer.aux flyer.dvi flyer.log flyer.pdf flyer.ps
+ rm -f flyer.aux flyer.dvi flyer.log flyer.pdf flyer.ps \
+ logo-full.eps
diff --git a/en_US.ISO8859-1/flyer/flyer.tex b/en_US.ISO8859-1/flyer/flyer.tex
index 47f61feded..9e8caef795 100644
--- a/en_US.ISO8859-1/flyer/flyer.tex
+++ b/en_US.ISO8859-1/flyer/flyer.tex
@@ -1,4 +1,4 @@
-% Copyright (c) 2004 Marc Fonvieille
+% Copyright (c) 2004-2006 Marc Fonvieille
% All rights reserved.
%
% Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,9 @@
%
% FreeBSD Flyer
% Use make FORMAT (with FORMAT: pdf, ps or dvi) to build the flyer.
+% Two layouts are available: one using Beastie the other one using the
+% FreeBSD Logo. The layout selection is done below via the value of
+% the \logo variable. By default the Beastie layout is enabled.
%
\documentclass[11pt]{article}
\usepackage[T1]{fontenc}
@@ -38,22 +41,34 @@
\usepackage{url}
% Use the right papersize, do not forget to change also the Makefile
\usepackage[verbose,a4paper,noheadfoot,margin=1cm]{geometry}
+
+\usepackage{ifthen}
+% Use of the Logo (set the \logo variable below to true) or Beastie
+% (\logo variable set to false).
+\newcommand{\logo}{false}
+
% Colors settings
\usepackage{color}
+\ifthenelse{\equal{\logo}{true}}{
+\definecolor{bkgrdtitle}{rgb}{.69,0,0}
+\definecolor{redtitle}{rgb}{.65,.16,.22}
+\definecolor{ovalboxcolor}{rgb}{.69,0,0}
+}
+{
\definecolor{bkgrdtitle}{rgb}{1,.84,.22}
-%\definecolor{bkgrdtitle}{rgb}{1,.81,.3}
-%\definecolor{bkgrdtitle}{rgb}{1,.87,.32}
-%\definecolor{redtitle}{rgb}{.82,0,0}
-%\definecolor{redtitle}{rgb}{.7,.7,.9}
-%\definecolor{redtitle}{rgb}{.6,0,0}
-%\definecolor{redtitle}{rgb}{.4,0,0}
\definecolor{redtitle}{rgb}{.65,.16,.22}
\definecolor{ovalboxcolor}{rgb}{.65,.16,.22}
+}
% Some macros
+\ifthenelse{\equal{\logo}{true}}{
+\newcommand{\titledframe}[3]{%
+\boxput*(0,1){\colorbox{bkgrdtitle}{\color{white} \large{\textbf{\textsf{#1}}}}} {\setlength {\fboxsep}{12pt} \color{ovalboxcolor}\Ovalbox {\color{black}\begin{minipage}{#3}#2\end{minipage}}}
+}}
+{
\newcommand{\titledframe}[3]{%
\boxput*(0,1){\colorbox{bkgrdtitle}{\color{black} \large{\textbf{\textsf{#1}}}}} {\setlength {\fboxsep}{12pt} \color{ovalboxcolor}\Ovalbox {\color{black}\begin{minipage}{#3}#2\end{minipage}}}
-}
+}}
\newcommand{\reg}{$^{\mbox{\tiny \textregistered}}$}
\newcommand{\tm}{$^{\mbox{\tiny TM}}$}
@@ -72,13 +87,23 @@
\begin{document}
\begin{center}
+\ifthenelse{\equal{\logo}{true}}{
+\includegraphics[scale=0.5]{logo-full.eps}
+\vspace{1mm}
+}
+{
\fontsize{40}{36}\selectfont
-{\color{redtitle} \textrm{\textbf{FreeBSD}}}
+{\color{redtitle} \textrm{\textbf{FreeBSD}}}\medskip}
\end{center}
%\vspace{2mm}
% Main part
\begin{center}
+\ifthenelse{\equal{\logo}{true}}{
+\newcommand{\size}{17.3cm}
+}
+{\newcommand{\size}{12.7cm}}
+
\titledframe{What is FreeBSD?}{
FreeBSD is an advanced operating system for x86 compatible (including
Pentium\reg and Athlon\tm), amd64 compatible (including Opteron\tm,
@@ -88,12 +113,15 @@ currently being ported to PowerPC\reg and ARM\reg architectures.
FreeBSD is derived from BSD, the version of UNIX\reg
developed at the University of California, Berkeley.
-}{12.7cm}
+}{\size}
+\ifthenelse{\equal{\logo}{false}}{
\begin{minipage}{4cm}
\includegraphics[scale=0.3]{../../share/images/flyer/beastie.eps}
\end{minipage}
+}
-\vspace{1mm}
+\ifthenelse{\equal{\logo}{true}}{
+\vspace{5mm}}{\vspace{3mm}}
\titledframe{Cutting edge features}{
FreeBSD offers advanced networking, performance, security and
@@ -108,19 +136,21 @@ FreeBSD makes an ideal Internet or Intranet server. It provides robust
network services under the heaviest loads and uses memory efficiently
to maintain good response times for thousands of simultaneous user
processes.
-}{11cm}
+}{11.12cm}
\vspace{5mm}
\titledframe{Run a huge number of applications!}{
FreeBSD comes with over 13000 third party software packages
ready to be installed including: Apache, Samba, MySQL\reg,
-OpenOffice.org, KDE, GNOME, MPlayer, etc.\\
+OpenOffice.org, KDE, GNOME, MPlayer, etc.
+\medskip
FreeBSD provides the ports system which fetches sources
from the Internet or from a CD-ROM and compiles binaries, including
building and installing any dependencies. All these operations are
-done in a transparent way for the user.\\
+done in a transparent way for the user.
+\medskip
Most of GNU/Linux binaries run under FreeBSD, for example:
Acrobat Reader\reg, Oracle\reg, SAP/R3\reg, Mathematica\reg, Quake3,
@@ -171,11 +201,15 @@ and GNU/Linux.
% Copyrights
\begin{center}
\tiny \copyright 2004-2006 The FreeBSD Project\\
-FreeBSD is a registered trademark of the FreeBSD Foundation.\\
+\ifthenelse{\equal{\logo}{true}}{
+FreeBSD and the FreeBSD Logo are registered trademarks of the FreeBSD
+Foundation.\\}
+{FreeBSD is a registered trademark of the FreeBSD Foundation.\\}
All other company and product names may be trademarks of their
respective companies.\\
+\ifthenelse{\equal{\logo}{false}}{
BSD Daemon, \copyright 1988 by Marshall Kirk McKusick. All Rights
-Reserved.
+Reserved.}{}
\end{center}
\end{document}
diff --git a/share/images/flyer/logo-full.png b/share/images/flyer/logo-full.png
new file mode 100644
index 0000000000..b712c9fc2e
Binary files /dev/null and b/share/images/flyer/logo-full.png differ