Skip to content
Snippets Groups Projects
Commit fc585916 authored by Jan Wille's avatar Jan Wille
Browse files

Merge branch 'development'

parents e92d64f2 226334fa
No related branches found
No related tags found
No related merge requests found
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
\PassOptionsToPackage{backend=biber,style=alphabetic,sorting=nyt}{biblatex} \PassOptionsToPackage{backend=biber,style=alphabetic,sorting=nyt}{biblatex}
\PassOptionsToPackage{free-standing-units,abbreviations}{siunitx} \PassOptionsToPackage{free-standing-units,abbreviations}{siunitx}
\PassOptionsToPackage{european,EFvoltages,straightvoltages}{circuitikz} \PassOptionsToPackage{european,EFvoltages,straightvoltages,betterproportions}{circuitikz}
% used packages: % used packages:
\RequirePackage{inputenc} % inputencoding, utf8 recomendet \RequirePackage{inputenc} % inputencoding, utf8 recomendet
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
\PassOptionsToPackage{backend=biber,style=alphabetic,sorting=nyt}{biblatex} \PassOptionsToPackage{backend=biber,style=alphabetic,sorting=nyt}{biblatex}
\PassOptionsToPackage{free-standing-units,abbreviations}{siunitx} \PassOptionsToPackage{free-standing-units,abbreviations}{siunitx}
\PassOptionsToPackage{european,EFvoltages,straightvoltages}{circuitikz} \PassOptionsToPackage{european,EFvoltages,straightvoltages,betterproportions}{circuitikz}
% used packages: % used packages:
\RequirePackage{inputenc} % inputencoding, utf8 recomendet \RequirePackage{inputenc} % inputencoding, utf8 recomendet
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
\ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options \ExecuteOptions{fontsize=11pt,a4paper,ngerman,sans} % standart options
\ProcessOptions\relax \ProcessOptions\relax
\LoadClass[multi=tikzpicture,multi=circuitikz]{standalone} \LoadClass[margin=0.25cm,multi=tikzpicture,multi=circuitikz]{standalone}
\newcommand*{\@titlehead}{}% \newcommand*{\@titlehead}{}%
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
\PassOptionsToPackage{T1}{fontenc} \PassOptionsToPackage{T1}{fontenc}
\PassOptionsToPackage{babel, german=quotes}{csquotes} \PassOptionsToPackage{babel, german=quotes}{csquotes}
\PassOptionsToPackage{free-standing-units}{siunitx} \PassOptionsToPackage{free-standing-units}{siunitx}
\PassOptionsToPackage{european,EFvoltages,straightvoltages}{circuitikz} \PassOptionsToPackage{european,EFvoltages,straightvoltages,betterproportions}{circuitikz}
% used packages: % used packages:
\RequirePackage{inputenc} % inputencoding, utf8 recomendet \RequirePackage{inputenc} % inputencoding, utf8 recomendet
......
...@@ -50,13 +50,6 @@ ...@@ -50,13 +50,6 @@
\@ifpackageloaded{circuitikz}{ \@ifpackageloaded{circuitikz}{
\ctikzset{ \ctikzset{
font=\footnotesize, font=\footnotesize,
default/scale=0.5,
resistors/scale=0.7,
capacitors/scale=0.5,
inductor=american,
inductors/scale=0.7,
diodes/scale=0.5,
transistors/scale=0.75,
bipole annotation style/.style={font=\tiny ,inner sep=1pt}, bipole annotation style/.style={font=\tiny ,inner sep=1pt},
} }
}{}% }{}%
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment