Merge branch 'main' of https://git.xpub.nl/XPUB/SI20

1 year ago · e1402512d6
parent 06cc4026e1 fa9aacd384
commit e1402512d6
19 changed files with 29875 additions and 26 deletions
--- a/carddeck1/images/1.jpg
+++ b/carddeck1/images/1.jpg
--- a/carddeck1/images/10.jpg
+++ b/carddeck1/images/10.jpg
--- a/carddeck1/images/11.jpg
+++ b/carddeck1/images/11.jpg
--- a/carddeck1/images/2.jpg
+++ b/carddeck1/images/2.jpg
--- a/carddeck1/images/3.jpg
+++ b/carddeck1/images/3.jpg
--- a/carddeck1/images/4.jpg
+++ b/carddeck1/images/4.jpg
--- a/carddeck1/images/5.jpg
+++ b/carddeck1/images/5.jpg
--- a/carddeck1/images/6.jpg
+++ b/carddeck1/images/6.jpg
--- a/carddeck1/images/7.jpg
+++ b/carddeck1/images/7.jpg
--- a/carddeck1/images/8.jpg
+++ b/carddeck1/images/8.jpg
--- a/carddeck1/images/9.jpg
+++ b/carddeck1/images/9.jpg
--- a/carddeck1/stylesheet.css
+++ b/carddeck1/stylesheet.css
@ -30,6 +30,7 @@
    top: 15mm;
    left: 10mm;
    text-align: center; 
+    margin: 0;
 }
 .card > p.textnoimage {
    width: 60mm;
--- a/ogcardeck/cards.html
+++ b/ogcardeck/cards.html
@ -45,6 +45,11 @@
    for (let i = 0; i < ups.length; i++) {
        new CircleType(ups[i]).radius(160);
    } 
+
+    var downs = document.querySelectorAll(".down");
+    for (let i = 0; i < downs.length; i++) {
+        new CircleType(downs[i]).dir(-1).radius(160);
+    } 
   

    </script>
--- a/ogcardeck/images/coffee.PNG
+++ b/ogcardeck/images/coffee.PNG
--- a/ogcardeck/stylesheet.css
+++ b/ogcardeck/stylesheet.css
@ -9,6 +9,7 @@
    position: relative;
    border-radius: 100%;
    text-align: center;
+    break-inside: avoid;
 }
 .card > img {
    width: calc(100% - 8mm - 8mm);
@ -22,8 +23,15 @@ p {
    position: absolute;
    margin: 2mm;
    width: 100%;
+    font-family: "Trickster";
 }

 p.down {
    bottom:0;  
-}
+}
+
+@font-face {
+    font-family: "Trickster";
+    src: 
+      url("trickster-COLRv1.otf") format("opentype");
+  }
--- a/web/00-booklet/booklet.html
+++ b/web/00-booklet/booklet.html
--- a/web/00-booklet/booklet.md
+++ b/web/00-booklet/booklet.md
--- a/web/00-booklet/booklet.template.html
+++ b/web/00-booklet/booklet.template.html
@ -5,7 +5,7 @@
    <meta charset="utf-8">
    <script src="paged.js/paged.polyfill.js"></script>
    <link href="paged.js/pagedjs.css" rel="stylesheet" type="text/css">
-    <link rel="stylesheet" type="text/css" href="stylesheet.css">
+    <link rel="stylesheet" type="text/css" href="print_style.css">
 </head>
 <body>
 <div id="contenteo">{{ content }}</div>
--- a/web/generate-booklet.py
+++ b/web/generate-booklet.py
@ -12,7 +12,7 @@ all_html = ""
 all_md = ""
 html=[]

-folders = glob("content/*")
+folders = glob("./*")
 print(folders)

 for folder in folders:
@ -27,14 +27,9 @@ for folder in folders:
 			file = file.replace(" ", "\ ")
 			print(file)

-			# html_file = file.replace(".md", ".html")
-			# pandoc_cmd = "pandoc -s -c style.css -f markdown -t html " + file + " -o " + html_file 
-			# os.system(pandoc_cmd)
-			# print("standalone html files saved!")
-
-			pandoc2 = "pandoc -f markdown -t html " + file 
-			html_data = subprocess.run(pandoc2, capture_output=True, text=True).stdout
-			print("html_data: ", html_data)
+			# pandoc2 = "pandoc -f markdown -t html " + file 
+			# html_data = subprocess.run(pandoc2, capture_output=True, text=True).stdout
+			# print("html_data: ", html_data)
 			
 			# #editing the html before creatings the main file
 			# # filename = os.path.basename(file)
@ -46,24 +41,30 @@ for folder in folders:
 			# # and then collect all that content into a variable called "all_html"
 			# # add this content to all_html
 			# all_html = all_html + html_data
-			html.append(html_data)
+			# html.append(html_data)

 			md_data = open(file).read()
 			all_md += "\n"+md_data

-#create md and use pandoc to convert to html
-output = open("booklet.md", "w")
+#create booklet.md
+output = open("00-booklet/booklet.md", "w")
 output.write(all_md)
 output.close()
-# pandoc_md = "pandoc -s --toc -c style.css -f markdown -t html booklet.md -o booklet.html"
-# os.system(pandoc_md)
 print("booklet md files saved!")

-env = jinja2.Environment(loader=jinja2.FileSystemLoader("."))
+# use pandoc to convert booklet.md to html
+pandoc_command = "pandoc --toc -f markdown -t html 00-booklet/booklet.md"
+#html_data = subprocess.run(pandoc_command, capture_output=True, text=True).stdout
+html_data = subprocess.check_output(pandoc_command, shell=True, text=True,encoding="utf-8")
+print("html has been generated!")
+#print("html data!", html_data)
+
+#html to template environment
+env = jinja2.Environment(loader=jinja2.FileSystemLoader("00-booklet"))
 template = env.get_template("booklet.template.html")
-booklet_html = template.render(content=html)
+booklet_html = template.render(content=html_data)
 print("this is the html: ", booklet_html)
-output = open("booklet.html", "w")
+output = open("00-booklet/booklet.html", "w")
 output.write(booklet_html)
 output.close()
 print("booklet html files saved!")