From: W. Trevor King <wking@tremily.us>
Date: Fri, 22 Jun 2012 12:04:22 +0000 (-0400)
Subject: Add skeletal_muscle.jpg (modified from Wikipedia).
X-Git-Tag: v1.0~338
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=680526611adc4cedaf395c0e160198502d7f13ae;p=thesis.git

Add skeletal_muscle.jpg (modified from Wikipedia).
---

diff --git a/src/figures/binary/skeletal_muscle.jpg b/src/figures/binary/skeletal_muscle.jpg
new file mode 100644
index 0000000..bc16c82
Binary files /dev/null and b/src/figures/binary/skeletal_muscle.jpg differ
diff --git a/src/figures/binary/skeletal_muscle.jpg.txt b/src/figures/binary/skeletal_muscle.jpg.txt
new file mode 100644
index 0000000..970a522
--- /dev/null
+++ b/src/figures/binary/skeletal_muscle.jpg.txt
@@ -0,0 +1,39 @@
+Adapted from http://en.wikipedia.org/wiki/File:Skeletal_muscle.jpg
+
+Bone/Muscle group picture.
+  Source:
+    http://training.seer.cancer.gov/module_anatomy/images/illu_muscle_structure.jpg
+  from
+    http://training.seer.cancer.gov/anatomy/muscular/structure.html
+  License: Public domain
+
+A muscle fiber.
+  Created by Raul654 using Rama's myofibril drawing for use in this picture
+  License: GFDL
+
+A myofibril. Drawn by Rama and modified by Raul654
+  License: GFDL
+
+A single sarcomere. Drawn by Rama and modified by Raul654
+  License: GFDL
+
+While the fragments were originally created under the GFDL license,
+Wikipedia relicensed the fragements under CC-BY-SA 3.0 as allowed by
+the GFDL 1.3.  Therefore:
+
+This file is licensed under the Creative Commons Attribution-Share
+Alike 3.0 Unported license.
+  You are free:
+    to share – to copy, distribute and transmit the work
+    to remix – to adapt the work
+  Under the following conditions:
+    attribution – You must attribute the work in the manner specified
+      by the author or licensor (but not in any way that suggests that
+      they endorse you or your use of the work).
+    share alike – If you alter, transform, or build upon this work,
+      you may distribute the resulting work only under the same or
+      similar license to this one.
+
+I (W. Trevor King) reorganized and colored the pieces so they fit more
+clearly on a smaller page, and my thesis is CC-BY-SA 3.0, so no
+problems there.
diff --git a/src/figures/main.bib b/src/figures/main.bib
index ea1c5c5..a3a8373 100644
--- a/src/figures/main.bib
+++ b/src/figures/main.bib
@@ -1,7 +1,14 @@
-@Misc{pymol,
+@misc{ pymol,
   author = "DeLano, W. L.",
   title = "The {PyMOL} Molecular Graphics System",
   url = "http://www.pymol.org",
   year = 2002,
   note = "Version 1.2.1.",
 }
+
+@misc{ skeletal_muscle,
+  author = "Wikipedia",
+  title = "Skeletal muscle --- {W}ikipedia{,} The Free Encyclopedia",
+  year = 2012,
+  url = "http://en.wikipedia.org/wiki/File:Skeletal_muscle.jpg",
+}