Caleb Fangmeier před 5 roky
rodič
revize
726c664b3e

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 13 - 2
content/02_standard_model.md


+ 157 - 0
content/american-physics-society.csl

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <info>
+    <title>American Physics Society</title>
+    <title-short>APS</title-short>
+    <id>http://www.zotero.org/styles/american-physics-society</id>
+    <link href="http://www.zotero.org/styles/american-physics-society" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-institute-of-physics" rel="template"/>
+    <link href="http://authors.aps.org/STYLE/ms.html#citations" rel="documentation"/>
+    <author>
+      <name>Richard Karnesky</name>
+      <email>karnesky+zotero@gmail.com</email>
+      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="physics"/>
+    <summary>Common style use by APS publications.</summary>
+    <updated>2015-01-21T22:37:41+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter=", " initialize-with=". " and="text"/>
+      <label form="long" prefix=", " suffix=" "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="verb" suffix=" "/>
+      <name delimiter=", " initialize-with=". " and="text"/>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="day-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" form="long" suffix=" "/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group prefix="(" suffix=")" delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place" text-case="title"/>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," prefix="&#160;[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" second-field-align="flush">
+    <layout suffix=".">
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="author" suffix=", "/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group delimiter=" ">
+            <group delimiter=", ">
+              <text variable="title" text-case="title" font-style="italic"/>
+              <text macro="edition"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <group delimiter=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=" ">
+            <text term="in"/>
+            <group delimiter=", ">
+              <text variable="container-title" form="short" text-case="title" font-style="italic"/>
+              <text macro="editor"/>
+              <text macro="edition"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <group delimiter=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=" ">
+            <text variable="number"/>
+            <text macro="day-date" prefix="(" suffix=")"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=", ">
+            <text variable="title" text-case="title"/>
+            <text variable="genre"/>
+            <text variable="publisher"/>
+            <text macro="year-date"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=" ">
+            <text variable="container-title" form="short" text-case="title"/>
+            <group delimiter=", ">
+              <text variable="volume" font-weight="bold"/>
+              <group delimiter=" ">
+                <text variable="page-first" form="short"/>
+                <text macro="year-date" prefix="(" suffix=")"/>
+              </group>
+            </group>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>

binární
content/figures/thompson_cathode_rays.png


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 25 - 1
content/references.bib


+ 0 - 226
content/stuttgart-media-university.csl

@@ -1,226 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="de-DE" version="1.0" demote-non-dropping-particle="sort-only">
-  <info>
-    <title>Hochschule der Medien Stuttgart (German)</title>
-    <title-short>HdM Stuttgart</title-short>
-    <id>http://www.zotero.org/styles/stuttgart-media-university</id>
-    <link href="http://www.zotero.org/styles/stuttgart-media-university" rel="self"/>
-    <link href="http://www.zotero.org/styles/technische-universitat-wien" rel="template"/>
-    <link href="https://github.com/citation-style-language/styles/issues/175" rel="documentation"/>
-    <link href="http://www.hdm-stuttgart.de/" rel="documentation"/>
-    <author>
-      <name>Julian Koegel</name>
-      <email>ju.koegel@googlemail.com</email>
-    </author>
-    <category citation-format="note"/>
-    <category field="social_science"/>
-    <updated>2012-09-27T22:06:38+00:00</updated>
-    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-  </info>
-  <locale xml:lang="de">
-    <terms>
-      <term name="et-al">u.a.</term>
-      <term name="and">und</term>
-      <term name="retrieved">zugegriffen am</term>
-      <term name="accessed">Zugriff:</term>
-      <term name="ibid">ebenda</term>
-      <term name="page" form="short">S.</term>
-      <term name="section" form="short">Abs.</term>
-    </terms>
-  </locale>
-  <!--
-       macro definitions
-       author
-       editor
-       accessed
-       date
-       year-date
-       pages
-       point-locators
-       point-locators-subsequent
-       hasUrl
-  -->
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="never"/>
-      <label form="short" prefix=" (" suffix=")"/>
-      <substitute>
-        <names variable="editor"/>
-        <text variable="title"/>
-      </substitute>
-    </names>
-    <text macro="anon"/>
-  </macro>
-  <macro name="author-short">
-    <names variable="author" delimiter="; ">
-      <name form="short" delimiter="; " initialize-with=". " delimiter-precedes-last="never" sort-separator=","/>
-      <substitute>
-        <names variable="editor"/>
-        <text variable="title"/>
-      </substitute>
-    </names>
-    <text macro="anon"/>
-  </macro>
-  <macro name="editor">
-    <names variable="editor" delimiter="; ">
-      <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="never" form="long"/>
-      <label form="short" prefix=" (" suffix=")"/>
-    </names>
-  </macro>
-  <macro name="anon">
-    <choose>
-      <if variable="author editor translator" match="none">
-        <text term="anonymous" form="short" suffix="&#160;" strip-periods="true"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="accessed">
-    <text term="accessed"/>
-    <date variable="accessed" prefix=" ">
-      <date-part form="numeric" name="day" suffix="."/>
-      <date-part form="numeric" name="month" suffix="."/>
-      <date-part form="long" name="year"/>
-    </date>
-  </macro>
-  <macro name="date">
-    <choose>
-      <if variable="issued">
-        <date variable="issued">
-          <date-part form="numeric" name="day" suffix="."/>
-          <date-part form="numeric" name="month" suffix="."/>
-          <date-part form="long" name="year"/>
-        </date>
-      </if>
-      <else>
-        <date variable="accessed">
-          <date-part form="numeric" name="day" suffix="."/>
-          <date-part form="numeric" name="month" suffix="."/>
-          <date-part form="long" name="year"/>
-        </date>
-      </else>
-    </choose>
-  </macro>
-  <macro name="year-date">
-    <choose>
-      <if type="webpage">
-        <choose>
-          <if variable="issued">
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-          </if>
-          <else>
-            <date variable="accessed">
-              <date-part name="year"/>
-            </date>
-          </else>
-        </choose>
-      </if>
-      <else>
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </else>
-    </choose>
-  </macro>
-  <macro name="pages">
-    <label variable="locator" form="short" prefix=", " suffix=".&#160;" strip-periods="true"/>
-    <text variable="page"/>
-  </macro>
-  <macro name="point-locators-subsequent">
-    <group>
-      <choose>
-        <if locator="page" match="none">
-          <choose>
-            <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-              <choose>
-                <if variable="volume">
-                  <group>
-                    <text term="volume" form="short" text-case="lowercase" suffix=" "/>
-                    <number variable="volume" form="numeric"/>
-                    <label variable="locator" form="short" prefix=", "/>
-                  </group>
-                </if>
-                <else>
-                  <label variable="locator" form="short" suffix=" "/>
-                </else>
-              </choose>
-            </if>
-          </choose>
-        </if>
-        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <number variable="volume" form="numeric" suffix=":"/>
-        </else-if>
-      </choose>
-      <label variable="locator" form="short" suffix=" "/>
-      <text variable="locator"/>
-    </group>
-  </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
-    <layout delimiter="; ">
-      <choose>
-        <if position="ibid">
-          <text term="ibid"/>
-          <text macro="point-locators-subsequent" prefix=", "/>
-        </if>
-        <else>
-          <text macro="author-short"/>
-          <text macro="year-date" prefix=" (" suffix=")"/>
-        </else>
-      </choose>
-    </layout>
-  </citation>
-  <bibliography hanging-indent="true">
-    <sort>
-      <key macro="author"/>
-      <key macro="date"/>
-    </sort>
-    <layout>
-      <group font-weight="bold">
-        <text macro="author"/>
-        <text macro="year-date" prefix=" (" suffix="):"/>
-      </group>
-      <text variable="title" prefix=" "/>
-      <choose>
-        <if type="webpage">
-          <text macro="date" prefix=". "/>
-        </if>
-        <else-if type="speech" match="any">
-          <text variable="publisher-place" prefix=", "/>
-          <text macro="date" prefix=", "/>
-          <text macro="accessed" prefix=", "/>
-        </else-if>
-        <else-if type="article-newspaper article-magazine article-journal" match="any">
-          <text value=". In: "/>
-          <text variable="container-title" font-style="italic"/>
-          <text variable="collection-title" prefix=", Reihe "/>
-          <text variable="volume" prefix=", Band "/>
-          <text variable="issue" prefix=", Ausgabe "/>
-          <text macro="date" prefix=", "/>
-          <text macro="pages"/>
-        </else-if>
-        <else-if type="chapter" match="any">
-          <text macro="editor" prefix=". In: " suffix=": "/>
-          <text variable="container-title" font-style="italic"/>
-          <text value=". "/>
-          <text variable="publisher-place" suffix=": "/>
-          <text variable="publisher"/>
-          <text macro="pages"/>
-        </else-if>
-        <else>
-          <text value=". "/>
-          <text variable="publisher-place" suffix=": "/>
-          <text variable="publisher"/>
-        </else>
-      </choose>
-      <choose>
-        <if variable="URL">
-          <text value="URL:&#160;" prefix=", "/>
-          <text variable="URL"/>
-          <text macro="accessed" prefix=" [" suffix="]"/>
-        </if>
-      </choose>
-      <text variable="note" prefix=", "/>
-    </layout>
-  </bibliography>
-</style>

binární
content/thesis.pdf


+ 2 - 1
content/thesis.tex

@@ -170,7 +170,8 @@
 %% Thesis goes here
 
 \include{01_introduction}
-\include{02_theory}
+\include{02_standard_model}
+\include{03_theory}
 
 %% backmatter is needed at the end of the main body of your thesis to
 %% set up page numbering correctly for the remainder of the thesis

+ 1 - 1
convert.py

@@ -44,7 +44,7 @@ def make_html(infilename):
          '--metadata=linkReferences:true',
          # f'--metadata=pagetitle:{title}',
          '--metadata=bibliography:references.bib',
-         '--metadata=citation-style:stuttgart-media-university.csl',
+         '--metadata=citation-style:american-physics-society.csl',
          '--template=chapter',
          ))