diff --git a/LICENSE b/LICENSE index b04e814..2293e2e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2017 - 2019, Pascal Wagler; +Copyright (c) 2017 - 2019, Pascal Wagler; Copyright (c) 2014 - 2019, John MacFarlane All rights reserved. diff --git a/eisvogel.tex b/eisvogel.tex index b69f978..42d5d3b 100644 --- a/eisvogel.tex +++ b/eisvogel.tex @@ -1,35 +1,35 @@ %% -% Copyright (c) 2017 - 2019, Pascal Wagler; +% Copyright (c) 2017 - 2019, Pascal Wagler; % Copyright (c) 2014 - 2019, John MacFarlane -% +% % All rights reserved. -% -% Redistribution and use in source and binary forms, with or without -% modification, are permitted provided that the following conditions +% +% Redistribution and use in source and binary forms, with or without +% modification, are permitted provided that the following conditions % are met: -% -% - Redistributions of source code must retain the above copyright +% +% - Redistributions of source code must retain the above copyright % notice, this list of conditions and the following disclaimer. -% -% - Redistributions in binary form must reproduce the above copyright -% notice, this list of conditions and the following disclaimer in the +% +% - Redistributions in binary form must reproduce the above copyright +% notice, this list of conditions and the following disclaimer in the % documentation and/or other materials provided with the distribution. -% -% - Neither the name of John MacFarlane nor the names of other -% contributors may be used to endorse or promote products derived +% +% - Neither the name of John MacFarlane nor the names of other +% contributors may be used to endorse or promote products derived % from this software without specific prior written permission. -% -% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -% "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -% LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -% FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -% COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +% +% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +% "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +% LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +% FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +% COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, % INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -% BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -% LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -% CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -% LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -% ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +% BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +% LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +% CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +% LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +% ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE % POSSIBILITY OF SUCH DAMAGE. %% @@ -462,8 +462,6 @@ $endif$ - - %% %% added %% @@ -511,7 +509,7 @@ $endif$ \PassOptionsToPackage{hyphens}{url} % -% When using babel or polyglossia with biblatex, loading csquotes is recommended +% When using babel or polyglossia with biblatex, loading csquotes is recommended % to ensure that quoted texts are typeset according to the rules of your main language. % \usepackage{csquotes} @@ -540,7 +538,7 @@ $endif$ % Source Sans Pro as the de­fault font fam­ily % Source Code Pro for monospace text % -% 'default' option sets the default +% 'default' option sets the default % font family to Source Sans Pro, not \sfdefault. % $if(mainfont)$ @@ -549,7 +547,7 @@ $else$ \usepackage{sourcecodepro} % XeLaTeX specific adjustments for straight quotes: https://tex.stackexchange.com/a/354887 -% This issue is already fixed (see https://github.com/silkeh/latex-sourcecodepro/pull/5) but the +% This issue is already fixed (see https://github.com/silkeh/latex-sourcecodepro/pull/5) but the % fix is still unreleased. % TODO: Remove this workaround when the new version of sourcecodepro is released on CTAN. \ifxetex @@ -576,7 +574,7 @@ $if(beamer)$ $else$ \addtokomafont{section}{\color{heading-color}} $endif$ -% When using the classes report, scrreprt, book, +% When using the classes report, scrreprt, book, % scrbook or memoir, uncomment the following line. %\addtokomafont{chapter}{\color{heading-color}} @@ -614,8 +612,8 @@ $if(tables)$ \endoldlongtable \global\rownum=0\relax} -% Unfortunately the colored cells extend beyond the edge of the -% table because pandoc uses @-expressions (@{}) like so: +% Unfortunately the colored cells extend beyond the edge of the +% table because pandoc uses @-expressions (@{}) like so: % % \begin{longtable}[]{@{}ll@{}} % \end{longtable} diff --git a/examples/basic-example/basic-example.md b/examples/basic-example/basic-example.md index f3b7077..8997fa6 100644 --- a/examples/basic-example/basic-example.md +++ b/examples/basic-example/basic-example.md @@ -17,13 +17,13 @@ commentaque virgine** anima tamen comitemque petis, sed. In Amphion vestros hamos ire arceor mandere spicula, in licet aliquando. ```java -public class Example implements LoremIpsum { +public class Example implements LoremIpsum { public static void main(String[] args) { if(args.length < 2) { System.out.println("Lorem ipsum dolor sit amet"); } } // Obscura atque coniuge, per de coniunx -} +} ``` Porrigitur et Pallas nuper longusque cratere habuisse sepulcro pectore fertur. diff --git a/examples/build-examples.sh b/examples/build-examples.sh index 0d8dbbb..cfbbd59 100644 --- a/examples/build-examples.sh +++ b/examples/build-examples.sh @@ -8,7 +8,7 @@ echo "##" echo "" echo "- basic-example" -pandoc "basic-example/basic-example.md" -o "basic-example/basic-example.pdf" --from markdown --template "../eisvogel.latex" --listings +pandoc "basic-example/basic-example.md" -o "basic-example/basic-example.pdf" --from markdown --template "../eisvogel.latex" --listings pdftoppm -r 150 -png "basic-example/basic-example.pdf" > "basic-example/basic-example.png" echo "- beamer" @@ -16,7 +16,7 @@ pandoc "beamer/beamer.md" -o "beamer/beamer.pdf" --from markdown --to beamer --t pdftoppm -r 150 -png "beamer/beamer.pdf" > "beamer/beamer.png" echo "- custom-titlepage" -pandoc "custom-titlepage/custom-titlepage.md" -o "custom-titlepage/custom-titlepage.pdf" --from markdown --template "../eisvogel.latex" -V "logo=custom-titlepage/logo-inverted.pdf" --listings +pandoc "custom-titlepage/custom-titlepage.md" -o "custom-titlepage/custom-titlepage.pdf" --from markdown --template "../eisvogel.latex" -V "logo=custom-titlepage/logo-inverted.pdf" --listings pdftoppm -r 150 -png "custom-titlepage/custom-titlepage.pdf" > "custom-titlepage/custom-titlepage.png" echo "- default-titlepage" @@ -44,12 +44,12 @@ pandoc "without-listings/without-listings.md" -o "without-listings/without-listi pdftoppm -r 150 -png "without-listings/without-listings.pdf" > "without-listings/without-listings.png" echo "- green-titlepage" -pandoc "green-titlepage/green-titlepage.md" -o "green-titlepage/green-titlepage.pdf" --from markdown --template "../eisvogel.latex" --listings +pandoc "green-titlepage/green-titlepage.md" -o "green-titlepage/green-titlepage.pdf" --from markdown --template "../eisvogel.latex" --listings pdftoppm -r 150 -png "green-titlepage/green-titlepage.pdf" > "green-titlepage/green-titlepage.png" echo "- book" # Additional options like `book: true` and `classoption: [oneside]` are set in the markdown file via the YAML metadata block. -pandoc "book/book.md" -o "book/book.pdf" --from markdown --template "../eisvogel.latex" --listings --top-level-division="chapter" +pandoc "book/book.md" -o "book/book.pdf" --from markdown --template "../eisvogel.latex" --listings --top-level-division="chapter" pdftoppm -r 150 -png "book/book.pdf" > "book/book.png" echo "- images-and-tables" diff --git a/examples/custom-titlepage/custom-titlepage.md b/examples/custom-titlepage/custom-titlepage.md index 1688507..ca6c4c9 100644 --- a/examples/custom-titlepage/custom-titlepage.md +++ b/examples/custom-titlepage/custom-titlepage.md @@ -23,13 +23,13 @@ commentaque virgine** anima tamen comitemque petis, sed. In Amphion vestros hamos ire arceor mandere spicula, in licet aliquando. ```java -public class Example implements LoremIpsum { +public class Example implements LoremIpsum { public static void main(String[] args) { if(args.length < 2) { System.out.println("Lorem ipsum dolor sit amet"); } } // Obscura atque coniuge, per de coniunx -} +} ``` Porrigitur et Pallas nuper longusque cratere habuisse sepulcro pectore fertur. diff --git a/examples/default-titlepage/default-titlepage.md b/examples/default-titlepage/default-titlepage.md index 968b08e..83844e2 100644 --- a/examples/default-titlepage/default-titlepage.md +++ b/examples/default-titlepage/default-titlepage.md @@ -19,13 +19,13 @@ commentaque virgine** anima tamen comitemque petis, sed. In Amphion vestros hamos ire arceor mandere spicula, in licet aliquando. ```java -public class Example implements LoremIpsum { +public class Example implements LoremIpsum { public static void main(String[] args) { if(args.length < 2) { System.out.println("Lorem ipsum dolor sit amet"); } } // Obscura atque coniuge, per de coniunx -} +} ``` Porrigitur et Pallas nuper longusque cratere habuisse sepulcro pectore fertur. diff --git a/examples/german/german.md b/examples/german/german.md index 1f6e40c..c73b5da 100644 --- a/examples/german/german.md +++ b/examples/german/german.md @@ -17,13 +17,13 @@ commentaque virgine** anima tamen comitemque petis, sed. In Amphion vestros hamos ire arceor mandere spicula, in licet aliquando. ```java -public class Example implements LoremIpsum { +public class Example implements LoremIpsum { public static void main(String[] args) { if(args.length < 2) { System.out.println("Lorem ipsum dolor sit amet"); } } // Obscura atque coniuge, per de coniunx -} +} ``` Porrigitur et Pallas nuper longusque cratere habuisse sepulcro pectore fertur. diff --git a/examples/green-titlepage/green-titlepage.md b/examples/green-titlepage/green-titlepage.md index 871aff1..7b6778b 100644 --- a/examples/green-titlepage/green-titlepage.md +++ b/examples/green-titlepage/green-titlepage.md @@ -23,13 +23,13 @@ commentaque virgine** anima tamen comitemque petis, sed. In Amphion vestros hamos ire arceor mandere spicula, in licet aliquando. ```java -public class Example implements LoremIpsum { +public class Example implements LoremIpsum { public static void main(String[] args) { if(args.length < 2) { System.out.println("Lorem ipsum dolor sit amet"); } } // Obscura atque coniuge, per de coniunx -} +} ``` Porrigitur et Pallas nuper longusque cratere habuisse sepulcro pectore fertur. diff --git a/examples/listings/listings.md b/examples/listings/listings.md index f65d753..63883f7 100644 --- a/examples/listings/listings.md +++ b/examples/listings/listings.md @@ -14,13 +14,13 @@ Lorem markdownum Letoia, et alios -- "figurae flectentem annis aliquid Peneosque esse, 'obstat' gravitate. ```java -public class Example implements LoremIpsum { +public class Example implements LoremIpsum { public static void main(String[] args) { if(args.length < 2) { System.out.println("Lorem ipsum dolor sit amet"); } } // Obscura atque coniuge, per de coniunx -} +} ``` Porrigitur et Pallas nuper longusque cratere habuisse sepulcro pectore fertur. Obscura atque coniuge, per de coniunx, sibi medias @@ -49,7 +49,7 @@ CREATE TYPE person_t AS ( firstName VARCHAR(50) NOT NULL, lastName VARCHAR(50) NOT NULL ); -CREATE Or REPLACE FUNCTION getFormattedName(person) RETURNS text AS - $$ SELECT 'P: ' || initcap($1.firstName); $$ +CREATE Or REPLACE FUNCTION getFormattedName(person) RETURNS text AS + $$ SELECT 'P: ' || initcap($1.firstName); $$ LANGUAGE SQL; ``` \ No newline at end of file diff --git a/examples/logo-titlepage/logo-titlepage.md b/examples/logo-titlepage/logo-titlepage.md index 35239fc..81ed863 100644 --- a/examples/logo-titlepage/logo-titlepage.md +++ b/examples/logo-titlepage/logo-titlepage.md @@ -24,13 +24,13 @@ commentaque virgine** anima tamen comitemque petis, sed. In Amphion vestros hamos ire arceor mandere spicula, in licet aliquando. ```java -public class Example implements LoremIpsum { +public class Example implements LoremIpsum { public static void main(String[] args) { if(args.length < 2) { System.out.println("Lorem ipsum dolor sit amet"); } } // Obscura atque coniuge, per de coniunx -} +} ``` Porrigitur et Pallas nuper longusque cratere habuisse sepulcro pectore fertur. diff --git a/examples/without-listings/without-listings.md b/examples/without-listings/without-listings.md index 40c8921..9cf0fab 100644 --- a/examples/without-listings/without-listings.md +++ b/examples/without-listings/without-listings.md @@ -15,13 +15,13 @@ Lorem markdownum Letoia, et alios: figurae flectentem annis aliquid Peneosque ab esse, obstat gravitate. ```java -public class Example implements LoremIpsum { +public class Example implements LoremIpsum { public static void main(String[] args) { if(args.length < 2) { System.out.println("Lorem ipsum dolor sit amet"); } } // Obscura atque coniuge, per de coniunx -} +} ``` Porrigitur et Pallas nuper longusque cratere habuisse sepulcro pectore fertur. Obscura atque coniuge, per de coniunx, sibi medias @@ -50,7 +50,7 @@ CREATE TYPE person_t AS ( lastName VARCHAR(50) NOT NULL ); -CREATE Or REPLACE FUNCTION getFormattedName(person) RETURNS text AS - $$ SELECT 'P: ' || initcap($1.firstName); $$ +CREATE Or REPLACE FUNCTION getFormattedName(person) RETURNS text AS + $$ SELECT 'P: ' || initcap($1.firstName); $$ LANGUAGE SQL; ``` \ No newline at end of file