emilie.aurat 6 vuotta sitten
vanhempi
commit
fd89497503
6 muutettua tiedostoa jossa 301 lisäystä ja 38 poistoa
  1. 2 2
      content/emilie_aurat/readme.textile
  2. 78 11
      publi/css/main.css
  3. 85 12
      publi/index.html
  4. 12 0
      publi/publi.md
  5. 16 1
      publi/publi.py
  6. 108 12
      publi/scss/main.scss

+ 2 - 2
content/emilie_aurat/readme.textile

@@ -1,9 +1,9 @@
-h1.subname of antiperfect monolove
+h1.subname of antiperfect monolove
 
 h2. Emilie Aurat
 
 Dans sa pièce La Mégère Apprivoisée, Shakespeare met en scène l'interaction houleuse entre un premier personnage caractériel et un deuxième qui use de flatteries et de contre-sens pour obtenir son contrôle.
-Dans l'idée de remplacer les mots par catégories (noms, verbes, adjectifs) par leurs antonymes, je finis par greffer des préfixes aléatoirement dans les répliques ce, qui génère un nouveau sens à leur compréhension.
+Dans l'idée de remplacer les mots par catégories (noms, verbes, adjectifs) par leurs antonymes, je greffe des préfixes aléatoirement dans les répliques ce qui génère un nouveau sens à leur compréhension.
 
 "And that which spites me more than all these wants
 He does it under name of perfect love"

+ 78 - 11
publi/css/main.css

@@ -1,23 +1,90 @@
 <style type="text/css">
+@page {
+  size: auto;
+  margin: 0; }
+
 .page {
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
   width: 210mm;
   padding: 10mm;
   page-break-after: always; }
-  .page p {
+  .page h1 {
+    text-align: center;
+    font-size: 1em;
+    font-weight: 400;
+    letter-spacing: 2px; }
+  .page .info_left {
+    display: inline-block;
+    vertical-align: top;
+    width: 30%;
+    height: 180px;
+    margin-right: 30px; }
+    .page .info_left h2 {
+      margin-top: 0;
+      font-family: "Computer Modern Serif", serif;
+      font-style: italic;
+      text-align: left;
+      font-size: 1em;
+      font-weight: 400;
+      letter-spacing: 2px; }
+    .page .info_left h3 {
+      margin-top: 0;
+      font-family: "Computer Modern Serif", serif;
+      text-align: left;
+      font-size: 1em;
+      font-weight: 400;
+      letter-spacing: 2px; }
+  .page .info_right {
+    display: inline-block;
+    vertical-align: top;
+    width: calc(66% - 30px);
+    height: 180px;
+    top: 0; }
+  .page > p {
     -webkit-box-sizing: border-box;
     box-sizing: border-box;
     width: 100%;
-    word-wrap: normal;
-    word-break: break-all; }
-  .page em {
-    font-size: 0.8em; }
-  .page pre, .page code {
-    -webkit-box-sizing: border-box;
-    box-sizing: border-box;
-    width: 100%;
-    word-wrap: normal;
-    word-break: break-all; }
+    word-wrap: break-word;
+    word-break: break-all;
+    font-family: "Computer Modern Serif", serif;
+    padding: 0 160px; }
+  .page span {
+    font-family: "Computer Modern Serif", serif;
+    font-size: 1em;
+    font-weight: 400; }
+  .page p {
+    font-family: "Computer Modern Serif", serif;
+    font-size: 1em;
+    font-weight: 400; }
+
+span.citation {
+  font-family: "Computer Modern Serif", serif;
+  font-size: 1em;
+  font-weight: 400; }
+
+em {
+  font-size: 0.8em; }
+
+pre, code {
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+  width: 100%;
+  word-wrap: normal;
+  word-break: break-all; }
+
+.info {
+  width: calc(100% - 60px);
+  padding-left: 30px;
+  padding-right: 30px;
+  font-family: Verdana, sans-serif;
+  overflow: hidden;
+  vertical-align: top; }
+
+ol {
+  font-family: "Computer Modern Serif", serif;
+  font-size: 1em;
+  font-weight: 400;
+  padding: 0 160; }
 
 </style>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 85 - 12
publi/index.html


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 12 - 0
publi/publi.md


+ 16 - 1
publi/publi.py

@@ -37,6 +37,9 @@ for d in os.listdir(content_dir):
          # meta = meta_match.group(0)
          if meta_match:
             output_md += '<div class="page">\n'
+            output_md += '<div class="info">\n'
+            output_md += '<div class="info_left">\n'
+
             meta = meta_match.group(0)
 
             author_match = re.search(r'Author: (.+)', meta)
@@ -54,10 +57,20 @@ for d in os.listdir(content_dir):
             pres = pres_txt.replace(meta_match.group(0), '').strip()
             # print('pres:',pres)
 
+
             output_md += "\n\n## "+title
             output_md += "\n\n### "+author
+
+            output_md += '\n\n</div>\n'
+
+            output_md += '<div class="info_right">\n'
+
             output_md += "\n\n*"+pres+"*"
 
+            output_md += '\n\n</div>\n'
+
+            output_md += '\n\n</div>\n'
+
             export_path = os.path.join(content_dir,d, src)
             print('export_path:', export_path)
             if os.path.isfile(export_path):
@@ -65,7 +78,7 @@ for d in os.listdir(content_dir):
                   output_md += "\n\n"+export_f.read()
 
 
-            output_md += '</div>\n'
+            output_md += '\n\n</div>\n'
 # print('output_md:\n', output_md)
 
 with open('publi.md', 'w') as md_f:
@@ -88,6 +101,8 @@ index_html = "<html>\n \
    \t<head>\n \
    \t\t<meta charset='utf-8'>\n"
 
+index_html += "<link rel='stylesheet' href='/fonts/cmu-Serif/cmun-serif.css'>"
+
 with open('css/main.css', 'r', encoding="utf8") as css_f:
    index_html += "\n\n"+css_f.read()
 

+ 108 - 12
publi/scss/main.scss

@@ -1,4 +1,9 @@
 
+@page{
+  size:auto;
+  margin:0;
+}
+
 .page{
   box-sizing: border-box;
   width:210mm;
@@ -6,25 +11,116 @@
   padding:10mm;
   page-break-after: always;
 
-  p{
+
+  h1{
+    text-align: center;
+    font-size: 1em;
+    font-weight: 400;
+    letter-spacing: 2px;
+  }
+  //.pagination{
+    //position: absolute;
+    //box-sizing: border-box;
+    //width:30mm;
+    //height:12mm;
+    //page-break-after: always;
+//  }
+ //.pg{
+  //  text-align: center;
+    //font-size: 1em;
+    //font-family: "Computer Modern Serif"
+    //font-style: bold;
+    //font-weight: 400;
+    //letter-spacing: 2px;
+  //}
+  .info_left{
+    display:inline-block;
+    vertical-align: top;
+    width: 30%;
+    height: 180px;
+    margin-right: 30px;
+    h2{
+      margin-top:0;
+      font-family: "Computer Modern Serif", serif;
+      font-style: italic;
+      text-align: left;
+      font-size: 1em;
+      font-weight: 400;
+      letter-spacing: 2px;
+    }
+    h3{
+      margin-top:0;
+      font-family: "Computer Modern Serif", serif;
+      text-align: left;
+      font-size: 1em;
+      font-weight: 400;
+      letter-spacing: 2px;
+    }
+  }
+
+  .info_right{
+    display:inline-block;
+    vertical-align: top;
+    width:calc(66% - 30px);
+    height: 180px;
+    top: 0;
+    //padding-top: 2em
+  }
+  &>p{
     // outline: 2px solid red;
     box-sizing: border-box;
     width: 100%;
-    word-wrap: normal;
+    word-wrap: break-word;
     word-break: break-all;
+    font-family: "Computer Modern Serif", serif;
+    padding:0 160px;
   }
 
-  em{
-    font-size: 0.8em;
+  span{
+    font-family: "Computer Modern Serif", serif;
+    font-size: 1em;
+    font-weight: 400;
   }
 
-  pre, code{
-    box-sizing: border-box;
-    width: 100%;
-    word-wrap: normal;
-    word-break: break-all;
-  }
-  code{
-    // padding: 10mm;
+   p{
+     font-family: "Computer Modern Serif", serif;
+     font-size: 1em;
+     font-weight: 400;
   }
+
+}
+span.citation{
+  font-family: "Computer Modern Serif", serif;
+  font-size: 1em;
+  font-weight: 400;
+
+}
+
+em{
+  font-size: 0.8em;
+}
+
+pre, code{
+  box-sizing: border-box;
+  width: 100%;
+  word-wrap: normal;
+  word-break: break-all;
+}
+
+.info{
+  width: calc(100% - 60px);
+  padding-left:30px;
+  padding-right:30px;
+  font-family: Verdana, sans-serif;
+  overflow: hidden;
+  vertical-align: top;
+}
+ol{
+  font-family: "Computer Modern Serif", serif;
+  font-size: 1em;
+  font-weight: 400;
+  padding: 0 160;
 }
+// code{
+  // padding: 10mm;
+// }

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä