From 2b23cf42904a50c32f1e63364c1ced0fa45c1c56 Mon Sep 17 00:00:00 2001 From: efradtschuk Date: Sat, 8 Jan 2022 17:42:14 +0100 Subject: [PATCH] Merge branch '2021-translate-script' of git.stuve-bamberg.de:latex/latex-skript into 2021-translate-script --- commands.tex | 21 ++++++++++++++++++- exercises/literature/exercise-solution.tex | 4 ++++ exercises/literature/literature.done.tex | 12 +++-------- exercises/project-structure/tasks.done.tex | 7 +++++-- exercises/references/references.raw.tex | 2 +- .../basic-document-structure/encoding.tex | 2 ++ .../foreign-language.tex | 1 + .../basic-document-structure/language.tex | 1 + .../basic-document-structure/packages.tex | 1 + listings/basic-document-structure/section.tex | 0 .../basic-document-structure/title-in-toc.tex | 1 + .../basic-functionality/command-structure.xml | 1 + listings/basic-functionality/parameters.tex | 1 + .../formatting-paragraphs/indentation.tex | 5 +++++ listings/graphics/image-size.tex | 1 + listings/graphics/insert-graphics.tex | 4 ++++ listings/graphics/positioning.tex | 4 ++++ listings/literature/bibliography-entry.bib | 9 ++++++++ listings/literature/bibliography-entry.tex | 9 ++++++++ listings/references/sections.tex | 1 + listings/references/set-language.tex | 1 + listings/tables/excess-length.tex | 4 ++++ listings/text-markup/font-size.tex | 1 + 23 files changed, 80 insertions(+), 13 deletions(-) create mode 100644 exercises/literature/exercise-solution.tex create mode 100644 listings/basic-document-structure/encoding.tex create mode 100644 listings/basic-document-structure/foreign-language.tex create mode 100644 listings/basic-document-structure/language.tex create mode 100644 listings/basic-document-structure/packages.tex create mode 100644 listings/basic-document-structure/section.tex create mode 100644 listings/basic-document-structure/title-in-toc.tex create mode 100644 listings/basic-functionality/command-structure.xml create mode 100644 listings/basic-functionality/parameters.tex create mode 100644 listings/formatting-paragraphs/indentation.tex create mode 100644 listings/graphics/image-size.tex create mode 100644 listings/graphics/insert-graphics.tex create mode 100644 listings/graphics/positioning.tex create mode 100644 listings/literature/bibliography-entry.bib create mode 100644 listings/literature/bibliography-entry.tex create mode 100644 listings/references/sections.tex create mode 100644 listings/references/set-language.tex create mode 100644 listings/tables/excess-length.tex create mode 100644 listings/text-markup/font-size.tex diff --git a/commands.tex b/commands.tex index 740640d..92e8dd7 100644 --- a/commands.tex +++ b/commands.tex @@ -117,6 +117,22 @@ language=[LaTeX]TeX } +\lstdefinelanguage{csharp}{% + language=[Sharp]C +} + +\lstdefinelanguage{bibtex} +{keywords={% + @article,@book,@collectedbook,@conference,@electronic,@ieeetranbstctl,% + @inbook,@incollectedbook,@incollection,@injournal,@inproceedings,% + @manual,@mastersthesis,@misc,@patent,@periodical,@phdthesis,@preamble,% + @proceedings,@standard,@string,@techreport,@unpublished% + }, + comment=[l][\itshape]{@comment}, + sensitive=false, +} + + \newcommand\codeblock[2]{% \ifthenelse{\equal{\listingsmode}{minted}}{% \inputminted[breaklines]{#1}{#2} @@ -129,7 +145,10 @@ keywordstyle=\color{ForestGreen}\bfseries, emph={% subsection, subsubsection, url, includegraphics, toprule, - midrule, bottomrule, cref% + midrule, bottomrule, cref, setlength, maketitle, + tableofcontents, foreignlanguage, paragraph, subparagraph, + mint, mintinline, inputminted, usemintedstyle, definecolor, + citep, enquote% }, postbreak=\mbox{{$\hookrightarrow$}\space}, emphstyle={\color{ForestGreen}\bfseries}, diff --git a/exercises/literature/exercise-solution.tex b/exercises/literature/exercise-solution.tex new file mode 100644 index 0000000..d7a226d --- /dev/null +++ b/exercises/literature/exercise-solution.tex @@ -0,0 +1,4 @@ +The first-mentioned book \citep{lamport1994} has been written by the creator of \LaTeX{}, Leslie Lamport himself. A more recent publication is \enquote{\LaTeX\ in 24 Hours} \citep{datta2017}. There is a plethora of further handbooks \citep*[e.\,g.,][]{goossensmittelbach2002}. + +\bibliographystyle{natdin} +\bibliography{exercises/literature/literature.done.bib} \ No newline at end of file diff --git a/exercises/literature/literature.done.tex b/exercises/literature/literature.done.tex index 4a4ea5b..3650ce6 100644 --- a/exercises/literature/literature.done.tex +++ b/exercises/literature/literature.done.tex @@ -1,10 +1,4 @@ -\inputminted[breaklines]{bibtex}{exercises/literature/literature.done.bib} +%\inputminted[breaklines]{bibtex}{exercises/literature/literature.done.bib} +\codeblock{bibtex}{./exercises/literature/literature.done.bib} -\begin{minted}[breaklines]{latex} -The first-mentioned book \citep{lamport1994} has been written by the creator of \LaTeX{}, Leslie Lamport himself. -A more recent publication is \enquote{\LaTeX\ in 24 Hours} \citep{datta2017}. -There is a plethora of further handbooks \citep*[e.\,g.,][]{goossensmittelbach2002}. - -\bibliographystyle{natdin} -\bibliography{exercises/literature/literature.done.bib} -\end{minted} +\codeblock{latex}{./exercises/literature/exercise-solution.tex} diff --git a/exercises/project-structure/tasks.done.tex b/exercises/project-structure/tasks.done.tex index c9f0bdb..0d51689 100644 --- a/exercises/project-structure/tasks.done.tex +++ b/exercises/project-structure/tasks.done.tex @@ -1,10 +1,13 @@ \begin{enumerate} - \item First one + \item + \textbf{Put the sections of the file into separate files, named + \file{section1.tex}, \file{section2.tex}, and \file{section3.tex}. Include + them using the \code{latex}{\textbackslash include} command.} + \begin{figure}[H] \codeblock{latex}{exercises/project-structure/main-with-preamble.done.tex} \caption{\file{main.tex}} \end{figure} - \item Second one \begin{figure}[H] \codeblock{latex}{exercises/project-structure/section1.done.tex} \caption{\file{section1.tex} (analogous for the other diff --git a/exercises/references/references.raw.tex b/exercises/references/references.raw.tex index 839cef6..6e25f6f 100644 --- a/exercises/references/references.raw.tex +++ b/exercises/references/references.raw.tex @@ -8,7 +8,7 @@ C\# is an object-oriented programming language that was developed by Microsoft i The following source code listing shows a program that prints the text \enquote{Hello LaTeX friends!} to the console. Like Java, C\# makes use of classes and main methods to build executable applications. -\inputminted[breaklines, linenos=true]{csharp}{exercises/references/HelloLateXFriends.cs} +\codeblock{csharp}{exercises/references/HelloLateXFriends.cs} diff --git a/listings/basic-document-structure/encoding.tex b/listings/basic-document-structure/encoding.tex new file mode 100644 index 0000000..48d63d6 --- /dev/null +++ b/listings/basic-document-structure/encoding.tex @@ -0,0 +1,2 @@ +\usepackage[utf8]{inputenc} +\usepackage[t1] \ No newline at end of file diff --git a/listings/basic-document-structure/foreign-language.tex b/listings/basic-document-structure/foreign-language.tex new file mode 100644 index 0000000..673e948 --- /dev/null +++ b/listings/basic-document-structure/foreign-language.tex @@ -0,0 +1 @@ +\foreignlanguage{}{} \ No newline at end of file diff --git a/listings/basic-document-structure/language.tex b/listings/basic-document-structure/language.tex new file mode 100644 index 0000000..a526573 --- /dev/null +++ b/listings/basic-document-structure/language.tex @@ -0,0 +1 @@ +\usepackage[ngerman]{babel} \ No newline at end of file diff --git a/listings/basic-document-structure/packages.tex b/listings/basic-document-structure/packages.tex new file mode 100644 index 0000000..375d377 --- /dev/null +++ b/listings/basic-document-structure/packages.tex @@ -0,0 +1 @@ +\usepackage[]{} \ No newline at end of file diff --git a/listings/basic-document-structure/section.tex b/listings/basic-document-structure/section.tex new file mode 100644 index 0000000..e69de29 diff --git a/listings/basic-document-structure/title-in-toc.tex b/listings/basic-document-structure/title-in-toc.tex new file mode 100644 index 0000000..e0c2422 --- /dev/null +++ b/listings/basic-document-structure/title-in-toc.tex @@ -0,0 +1 @@ +\section[Title in the TOC]{Actual Chapter Title} \ No newline at end of file diff --git a/listings/basic-functionality/command-structure.xml b/listings/basic-functionality/command-structure.xml new file mode 100644 index 0000000..578f758 --- /dev/null +++ b/listings/basic-functionality/command-structure.xml @@ -0,0 +1 @@ +\[]{} \ No newline at end of file diff --git a/listings/basic-functionality/parameters.tex b/listings/basic-functionality/parameters.tex new file mode 100644 index 0000000..48ba187 --- /dev/null +++ b/listings/basic-functionality/parameters.tex @@ -0,0 +1 @@ +\includegraphics[width=12cm, height=4cm]{picture.png} \ No newline at end of file diff --git a/listings/formatting-paragraphs/indentation.tex b/listings/formatting-paragraphs/indentation.tex new file mode 100644 index 0000000..62d4f49 --- /dev/null +++ b/listings/formatting-paragraphs/indentation.tex @@ -0,0 +1,5 @@ +\setlength{\parindent}{0pt} +\setlength{\parskip}{1em + plus .5em % admissible stretch + minus .5em % admissible shrink +} \ No newline at end of file diff --git a/listings/graphics/image-size.tex b/listings/graphics/image-size.tex new file mode 100644 index 0000000..92f5027 --- /dev/null +++ b/listings/graphics/image-size.tex @@ -0,0 +1 @@ +\includegraphics[width=0.5\textwidth,height=5cm]{} \ No newline at end of file diff --git a/listings/graphics/insert-graphics.tex b/listings/graphics/insert-graphics.tex new file mode 100644 index 0000000..00633ba --- /dev/null +++ b/listings/graphics/insert-graphics.tex @@ -0,0 +1,4 @@ +\begin{figure} + \includegraphics{} + \caption[]{} +\end{figure} \ No newline at end of file diff --git a/listings/graphics/positioning.tex b/listings/graphics/positioning.tex new file mode 100644 index 0000000..041e8fe --- /dev/null +++ b/listings/graphics/positioning.tex @@ -0,0 +1,4 @@ +\begin{figure}[] + \centering + \includegraphics{} +\end{figure} \ No newline at end of file diff --git a/listings/literature/bibliography-entry.bib b/listings/literature/bibliography-entry.bib new file mode 100644 index 0000000..0ab9502 --- /dev/null +++ b/listings/literature/bibliography-entry.bib @@ -0,0 +1,9 @@ +@article{turing1990, + title={The chemical basis of morphogenesis}, + author={Turing, Alan Mathison}, + journal={Bulletin of mathematical biology}, + volume={52}, + pages={153--197}, + year={1990}, + publisher={Springer} + } \ No newline at end of file diff --git a/listings/literature/bibliography-entry.tex b/listings/literature/bibliography-entry.tex new file mode 100644 index 0000000..0ab9502 --- /dev/null +++ b/listings/literature/bibliography-entry.tex @@ -0,0 +1,9 @@ +@article{turing1990, + title={The chemical basis of morphogenesis}, + author={Turing, Alan Mathison}, + journal={Bulletin of mathematical biology}, + volume={52}, + pages={153--197}, + year={1990}, + publisher={Springer} + } \ No newline at end of file diff --git a/listings/references/sections.tex b/listings/references/sections.tex new file mode 100644 index 0000000..ca65c7f --- /dev/null +++ b/listings/references/sections.tex @@ -0,0 +1 @@ +\section{Comments}\label{sec:hints} \ No newline at end of file diff --git a/listings/references/set-language.tex b/listings/references/set-language.tex new file mode 100644 index 0000000..da3c869 --- /dev/null +++ b/listings/references/set-language.tex @@ -0,0 +1 @@ +\documentclass[ngerman]{article} \ No newline at end of file diff --git a/listings/tables/excess-length.tex b/listings/tables/excess-length.tex new file mode 100644 index 0000000..913680d --- /dev/null +++ b/listings/tables/excess-length.tex @@ -0,0 +1,4 @@ +\begin{longtable} + % content + \caption{} +\end{longtable} \ No newline at end of file diff --git a/listings/text-markup/font-size.tex b/listings/text-markup/font-size.tex new file mode 100644 index 0000000..c7a887d --- /dev/null +++ b/listings/text-markup/font-size.tex @@ -0,0 +1 @@ +\documentclass[9pt]{article} \ No newline at end of file