Merge branch 'master' of git.stuve-bamberg.de:latex/latex-wochenende

This commit is contained in:
Knoch 2019-05-10 18:39:43 +02:00
commit 6b80a78ac4
6 changed files with 53 additions and 14 deletions

View File

@ -547,13 +547,13 @@ kbd {
p, li {
z-index: 1; }
p a:link, p a:hover, p a:active, p a:visited, li a:link, li a:hover, li a:active, li a:visited, h2 a:link, h2 a:hover, h2 a:active, h2 a:visited {
p a:link, p a:hover, p a:active, p a:visited, li a:link, li a:hover, li a:active, li a:visited, h2 a:link, h2 a:hover, h2 a:active, h2 a:visited, td a:link, td a:hover, td a:active, td a:visited {
text-decoration: none;
color: var(--secondary-dark);
font-weight: bold;
position: relative;
z-index: 1; }
p a:link::before, p a:hover::before, p a:active::before, p a:visited::before, li a:link::before, li a:hover::before, li a:active::before, li a:visited::before, h2 a:link::before, h2 a:hover::before, h2 a:active::before, h2 a:visited::before {
p a:link::before, p a:hover::before, p a:active::before, p a:visited::before, li a:link::before, li a:hover::before, li a:active::before, li a:visited::before, h2 a:link::before, h2 a:hover::before, h2 a:active::before, h2 a:visited::before, td a:link::before, td a:hover::before, td a:active::before, td a:visited::before {
content: '';
position: absolute;
width: 102%;
@ -564,7 +564,7 @@ p a:link, p a:hover, p a:active, p a:visited, li a:link, li a:hover, li a:active
left: -1%;
transition: .2s height ease; }
p a:hover::before, li a:hover::before, h2 a:hover::before {
p a:hover::before, li a:hover::before, h2 a:hover::before, td a:hover::before {
height: 110%; }
/*

View File

@ -669,7 +669,7 @@ p, li {
z-index: 1;
}
p a, li a, h2 a {
p a, li a, h2 a, td a {
&:link,
&:hover,
&:active,

View File

@ -32,11 +32,11 @@
</ul>
<div style="display: flex; justify-content: space-between; align-items: stretch;">
<figure>
<img src="sections/german/01/knuth.jpg">
<img src="sections/german/01/knuth.jpg" style="height: 13em">
<figcaption>Donald Knuth</figcaption>
</figure>
<figure>
<img src="sections/german/01/lamport.jpg">
<img src="sections/german/01/lamport.jpg" style="height: 13em">
<figcaption>Leslie Lamport</figcaption>
</figure>
</div>
@ -79,6 +79,10 @@
<li>Gleichmäßiger Grauwert</li>
<li></li>
</ul>
<figure style="display: flex; justify-content: space-between; width: 100%; align-items: flex-end;">
<img src="sections/german/01/satzspiegel.svg" style="height: 8em">
<figcaption style="margin-left: 1em; font-size: .8em">Satzspiegel-Konstruktion nach Villard (<a href="https://commons.wikimedia.org/wiki/File:Satzspiegel-4.svg">Quelle</a>)</figcaption>
</figure>
</div>
<div class="layout-preview">
<img src="sections/german/01/vergleich-makro.svg">
@ -100,12 +104,12 @@
</ul>
<div style="display: flex; justify-content: space-between; align-items: flex-end;">
<figure>
<img src="sections/german/01/schriftschnitte-crop.svg" style="height: 1.7em">
<figcaption>Schriftschnitte:<br>schräg&nbsp;vs.&nbsp;kursiv</figcaption>
<img src="sections/german/01/schriftschnitte-crop.svg" style="height: 1.7em;">
<figcaption style="font-size: .8em;">Schriftschnitte:<br>gerade,&nbsp;schräg,&nbsp;kursiv</figcaption>
</figure>
<figure>
<img src="sections/german/01/schriftgrade.svg">
<figcaption>Schriftgrade:<br>klein, vergrößert, groß</figcaption>
<img src="sections/german/01/schriftgrade.svg" style="height: 2.2em;">
<figcaption style="font-size: .8em">Schriftgrade:<br>klein,&nbsp;klein&nbsp;vergrößert,&nbsp;groß</figcaption>
</figure>
</div>
<ul>

View File

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="707" width="1000" version="1.1" baseprofile="full">
<metadata>
<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<rdf:Description about="">
<dc:format>image/svg+xml</dc:format>
<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
<dc:date>2006-08-02</dc:date>
<dc:title>Satzspiegel 4</dc:title>
<dc:description>Konstruktion eines Satzspiegels: Phase 3. Der Satzspiegel wird an das Verhältnis des Goldenen Schnitts angepasst.</dc:description>
<dc:creator>Manuel Strehl</dc:creator>
<dc:source>basierend auf <a xlink:href="http://upload.wikimedia.org/wikipedia/commons/a/a3/Satzspiegel-4.jpg">Satzspiegel-4.jpg</a> von <a xlink:href="http://commons.wikimedia.org/wiki/User:Nanosmile">User:Nanosmile</a>.</dc:source>
<dc:rights>veröffentlicht unter <a xlink:href="http://www.gnu.org/copyleft/fdl.html">der GFDL</a></dc:rights>
<dc:relation>
<rdf:Bag>
<rdf:li><a xlink:href="http://commons.wikimedia.org/wiki/Image:Satzspiegel-2.jpg">Satzspiegel 2</a></rdf:li>
<rdf:li><a xlink:href="http://commons.wikimedia.org/wiki/Image:Satzspiegel-3.jpg">Satzspiegel 3</a></rdf:li>
</rdf:Bag>
</dc:relation>
</rdf:Description>
</rdf:RDF>
</metadata>
<rect style="fill:#dedede;" x="0" y="0" width="1000" height="707"/>
<rect style="fill:#ffffff;stroke:#000000;stroke-width:3.5;" x="40" y="25" width="920" height="650"/>
<rect style="fill:#989898;stroke:#000000;stroke-width:2.5;" x="551" y="97" width="305" height="432"/>
<line x1="500" y1="25" x2="500" y2="675" style="stroke:#000000;stroke-width:3.5;"/>
<polyline style="fill:none;stroke:#000000;stroke-width:2.5;" points="40,25 960,675 500,25 40,675 960,25"/>
<polyline style="fill:none;stroke:#00b0ff;stroke-width:2.5;" points="654,675 654,25 300,275"/>
<circle style="fill:none;stroke:#f00;stroke-width:3.5;" cx="551" cy="97" r="30"/>
<circle style="fill:none;stroke:#f00;stroke-width:3.5;" cx="856" cy="97" r="30"/>
<circle style="fill:none;stroke:#f00;stroke-width:3.5;" cx="856" cy="529" r="30"/>
<circle style="fill:none;stroke:#f00;stroke-width:3.5;" cx="653" cy="240" r="30"/>
<circle style="fill:none;stroke:#f00;stroke-width:3.5;" cx="347" cy="240" r="30"/>
<rect style="fill:none;stroke:#000000;stroke-width:3.5;" x="40" y="25" width="920" height="650"/>
</svg>

After

Width:  |  Height:  |  Size: 2.5 KiB

View File

@ -77,8 +77,8 @@
<div class="layout-content">
<h2>Backslash</h2>
<p>Den Backslash erzeugt ihr mit folgender Tastenkombination:</p>
<p><kbd>AltGr</kbd> + <kbd>ß</kbd> (Windows/Linux)</p>
<p><kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>7</kbd> (MacOS)</p>
<p><kbd>AltGr</kbd>&nbsp;+&nbsp;<kbd>ß</kbd>&nbsp;(Windows/Linux)</p>
<p><kbd>Alt</kbd>&nbsp;+&nbsp;<kbd>Shift</kbd>&nbsp;+&nbsp;<kbd>7</kbd>&nbsp;(MacOS)</p>
</div>
</div>

View File

@ -101,7 +101,7 @@ Hallo, Welt!
<div class="layout-wide-content">
<div class="layout-content">
<h2>Sprache<em>n</em></h2>
<h2>Sprachen</h2>
<p>Es können auch mehrere Sprachen im Dokument verwendet werden:</p>
<pre class="lang-tex hljs"><code>\usepackage[ngerman, swedish, russian, greek, english]{babel}</code></pre>
<div class="fragment">
@ -110,7 +110,7 @@ Hallo, Welt!
\selectlanguage{&lt;sprache b>}</code></pre>
<p>Eingebetteter Text in anderer Sprache:</p>
<pre class="lang-tex hljs"><code>\selectlanguage{&lt;sprache a>}
\foreignlanguage{&lt;sprache b>}{Hier steht Text in Sprache B innerhalb eines Textes in Sprache A}</code></pre>
\foreignlanguage{&lt;sprache b>}{Hier steht Text in Sprache B in einem Text in Sprache A}</code></pre>
</div>
</div>
</div>