General Cleanup

.gitignore

@@ -1,3 +1,7 @@
-*.png
+!logos/logo.jpg
-*.jpg
+logos/*.png
+logos/*.jpg
+logos/*.pdf
+Thumbs*
+
 *.pdf

jmk.yaml

@@ -6,6 +6,8 @@
 #
 # 0 - Initial version that is good enough to send to clients
 
+
+
 pageSetup:
   size: Letter
   spacing-header: 10mm
@@ -19,41 +21,52 @@ fontsAlias:
   stdFont: calibri
   headingFont: Helvetica-Bold
 
+linkColor: black
+
 styles:
+  bodytext:
+    alignment: TA_LEFT
   normal:
     parent: base
     fontSize: 11
     fontName: stdFont
-  heading:
+  header:
+    alignment: TA_CENTER
     parent: normal
+  heading:
+    keepWithNext: true
+    parent: normal
+    spaceAfter: 6
+    spaceBefore: 12
     fontName: headingFont
-    fontSize: 20
     textColor: 17365D
   heading1:
     parent: heading
-    fontSize: 18
+    fontSize: 175%
+    spaceBefore: 10
+    spaceAfter: 10
   heading2:
     parent: heading
-    fontSize: 16
+    fontSize: 150%
   heading3:
     parent: heading
-    fontSize: 16
+    fontSize: 125%
   heading4:
     parent: heading
-    fontSize: 14
+    fontSize: 112%
   heading5:
     parent: heading
-    fontSize: 12
+    fontSize: 100%
 
   title:
     parent: heading
     fontSize: 30
+    align: right
   txtheader:
     parent: heading
 
-
   headertable:
-    borderWidth: 1
+    borderWidth: 0
     borderColor: red
     parent: heading
     align: center
@@ -61,16 +74,18 @@ styles:
     align: center
   headerlogol:
     valign: middle
+
+
+
+  mytable:
+    parent: table
+    colWidths: [3cm, 6cm, 3cm]
+
   item-list:
-# Added some space after a bulleted list to make things a bit cleaner
     spaceAfter: 10pt
     colWidths:
-# The defualt is 20, but that only allows single digit numbers 
     - 30pt 
-# I left this as null
     - null
   bullet-list:
-# Added some space after a bulleted list to make things a bit cleaner
-    spaceBefore: 0
     spaceAfter: 10pt
 

jmkengineering.yaml

@@ -0,0 +1,37 @@
+{
+  "pageSetup" : {
+    "size": "Letter",
+  },
+  "fontsAlias" : {
+    "stdFont": "Calibri",
+    "headingFont": "Calibri Light"
+  },
+  "styles" : [
+    ["normal" , {
+    "fontSize": 12
+    }],
+    ["heading" , {
+      "parent": "normal",
+      "fontName": "headingFont",
+      "fontSize": 20,
+      "textColor": "#0000ff"
+    }],
+    ["heading1" , {
+      "parent": "heading",
+      "fontSize": 18,
+    }],
+    ["heading2" , {
+      "parent": "heading",
+      "fontSize": 16,
+    }],
+    ["heading3" , {
+      "parent": "heading",
+      "fontSize": 14,
+    }],
+    ["title" , {
+      "parent": "heading",
+      "fontSize": 40
+    }]
+  ]
+  
+}

template-short-memo.rst

@@ -16,7 +16,7 @@
     SetPageCounter 1 lowerroman
 
 .. This is the setup for the header substitutions. Sometimes there will be a second logo
-.. |logo| image:: //aragorn/jmkengineering/Engineering/General/common/logos/JMKEngineering-Logo-Small.jpg
+.. |logo| image:: common/logo.jpg
     :height: 2cm
 
 .. |Revision| replace:: A