From 35a8dfffcc771345b5a0d8519db7534aa554e603 Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Tue, 26 Jul 2022 18:11:30 +0000 Subject: [PATCH] Removed excessive blank lines being generated Co-authored-by: sigonasr2 --- out/DIRECTORY_LISTING | 16 +- out/articles/DIRECTORY_LISTING | 14 +- out/articles/curabitur vel tempus ex.article | 2 - .../curabitur vel tempus ex.article.html | 2 - out/articles/sigplace1.article | 463 ------------------ out/articles/sigplace1.article.html | 463 ------------------ out/articles/test articles/DIRECTORY_LISTING | 12 +- out/otherpage.html | 2 - out/reset.css | 1 - out/sig.css | 45 -- out/testfile.html | 2 - out/uploadform.html | 2 - sigPlace.java | 6 +- 13 files changed, 26 insertions(+), 1004 deletions(-) diff --git a/out/DIRECTORY_LISTING b/out/DIRECTORY_LISTING index 55f9e70..eb2b97f 100644 --- a/out/DIRECTORY_LISTING +++ b/out/DIRECTORY_LISTING @@ -17,14 +17,14 @@
-

Directory Listing for /

📁.. (Previous Directory)
📁articles 2022-07-26T17:51:08.773562Z gitpod 4096
-
🗎codeBackground 2022-07-26T17:51:08.693562Z gitpod 2635
-
🗎otherpage.html 2022-07-26T17:51:08.697562Z gitpod 941
-
🗎reset.css 2022-07-26T17:51:08.697562Z gitpod 1093
-
🗎uploadform.html 2022-07-26T17:51:08.721562Z gitpod 884
-
📁images 2022-07-26T17:51:08.765562Z gitpod 58
-
🗎sig.css 2022-07-26T17:51:08.705562Z gitpod 6966
-
🗎testfile.html 2022-07-26T17:51:08.721562Z gitpod 804
+

Directory Listing for /

📁.. (Previous Directory)
📁articles 2022-07-26T18:09:20.593509Z gitpod 4096
+
🗎codeBackground 2022-07-26T18:09:20.537509Z gitpod 2635
+
🗎otherpage.html 2022-07-26T18:09:20.541509Z gitpod 939
+
🗎reset.css 2022-07-26T18:09:20.541509Z gitpod 1092
+
🗎uploadform.html 2022-07-26T18:09:20.561509Z gitpod 882
+
📁images 2022-07-26T18:09:20.589509Z gitpod 58
+
🗎sig.css 2022-07-26T18:09:20.549509Z gitpod 6903
+
🗎testfile.html 2022-07-26T18:09:20.561509Z gitpod 802
diff --git a/out/articles/DIRECTORY_LISTING b/out/articles/DIRECTORY_LISTING index aae811b..c88040b 100644 --- a/out/articles/DIRECTORY_LISTING +++ b/out/articles/DIRECTORY_LISTING @@ -17,13 +17,13 @@
-

Directory Listing for /articles/

📁.. (Previous Directory)
🗎Love Live! Custom Arcade Controller.article 2022-07-26T17:51:08.161562Z gitpod 497
-
📁test articles 2022-07-26T17:51:08.725562Z gitpod 147
-
🗎curabitur vel tempus ex.article 2022-07-26T17:51:08.201562Z gitpod 734
-
🗎sigplace1.article 2022-07-26T17:51:08.689562Z gitpod 81768
-
🗎Love Live! Custom Arcade Controller.article.html 2022-07-26T17:51:08.721562Z gitpod 1214
-
🗎curabitur vel tempus ex.article.html 2022-07-26T17:51:08.737562Z gitpod 1451
-
🗎sigplace1.article.html 2022-07-26T17:51:08.753562Z gitpod 82485
+

Directory Listing for /articles/

📁.. (Previous Directory)
🗎Love Live! Custom Arcade Controller.article 2022-07-26T18:09:20.093509Z gitpod 497
+
📁test articles 2022-07-26T18:09:20.565509Z gitpod 147
+
🗎curabitur vel tempus ex.article 2022-07-26T18:09:20.121509Z gitpod 730
+
🗎sigplace1.article 2022-07-26T18:09:20.533509Z gitpod 80858
+
🗎Love Live! Custom Arcade Controller.article.html 2022-07-26T18:09:20.561509Z gitpod 1214
+
🗎curabitur vel tempus ex.article.html 2022-07-26T18:09:20.573509Z gitpod 1447
+
🗎sigplace1.article.html 2022-07-26T18:09:20.581509Z gitpod 81575
diff --git a/out/articles/curabitur vel tempus ex.article b/out/articles/curabitur vel tempus ex.article index 464bfd3..62100dd 100644 --- a/out/articles/curabitur vel tempus ex.article +++ b/out/articles/curabitur vel tempus ex.article @@ -3,8 +3,6 @@ Curabitur vel tempus ex. Duis cursus sapien nisl, ut pulvinar dui porttitor ut. Nullam odio purus, tristique non turpis sit amet, malesuada ultricies purus. Mauris ut nulla nisl. Aenean sit amet est egestas justo volutpat consequat. Suspendisse in sagittis augue, et mattis tortor. Nullam viverra metus et nibh fringilla iaculis.


- - 

 <><Test>"</test></test2><test3>"
diff --git a/out/articles/curabitur vel tempus ex.article.html b/out/articles/curabitur vel tempus ex.article.html
index fb19fc4..1f18d61 100644
--- a/out/articles/curabitur vel tempus ex.article.html	
+++ b/out/articles/curabitur vel tempus ex.article.html	
@@ -22,8 +22,6 @@
 Curabitur vel tempus ex. Duis cursus sapien nisl, ut pulvinar dui porttitor ut. Nullam odio purus, tristique non turpis sit amet, malesuada ultricies purus. Mauris ut nulla nisl. Aenean sit amet est egestas justo volutpat consequat. Suspendisse in sagittis augue, et mattis tortor. Nullam viverra metus et nibh fringilla iaculis.
 

 

- 
- 
 

 
 <><Test>"</test></test2><test3>"
diff --git a/out/articles/sigplace1.article b/out/articles/sigplace1.article
index 9dc5d2c..a2689bf 100644
--- a/out/articles/sigplace1.article
+++ b/out/articles/sigplace1.article
@@ -33,469 +33,6 @@ Vestibulum laoreet lorem consequat, mollis augue finibus, luctus libero. Praesen
 Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.
 

 

- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
-
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
-
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
-
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
 

 
 import java.io.IOException;
diff --git a/out/articles/sigplace1.article.html b/out/articles/sigplace1.article.html
index a9d8e5d..4a51277 100644
--- a/out/articles/sigplace1.article.html
+++ b/out/articles/sigplace1.article.html
@@ -52,469 +52,6 @@ Vestibulum laoreet lorem consequat, mollis augue finibus, luctus libero. Praesen
 Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.Here we demonstrate the love live logo. But wait, it's literally like in the middle wtf is going on.
 

 

- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
-
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
-
- 
- 
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
- 
-
- 
- 
- 
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
 

 
 import java.io.IOException;
diff --git a/out/articles/test articles/DIRECTORY_LISTING b/out/articles/test articles/DIRECTORY_LISTING
index 9b1e6f7..9938ddd 100644
--- a/out/articles/test articles/DIRECTORY_LISTING	
+++ b/out/articles/test articles/DIRECTORY_LISTING	
@@ -17,12 +17,12 @@
 
 
 
 
-
Directory Listing for /articles/test articles/
📁.. (Previous Directory)
🗎test1.article	2022-07-26T17:51:08.161562Z	gitpod	1085

-
🗎test2.article	2022-07-26T17:51:08.165562Z	gitpod	781

-
🗎test3.article	2022-07-26T17:51:08.169562Z	gitpod	994

-
🗎test1.article.html	2022-07-26T17:51:08.725562Z	gitpod	1802

-
🗎test2.article.html	2022-07-26T17:51:08.725562Z	gitpod	1498

-
🗎test3.article.html	2022-07-26T17:51:08.725562Z	gitpod	1711

+
Directory Listing for /articles/test articles/
📁.. (Previous Directory)
🗎test1.article	2022-07-26T18:09:20.097509Z	gitpod	1085

+
🗎test2.article	2022-07-26T18:09:20.097509Z	gitpod	781

+
🗎test3.article	2022-07-26T18:09:20.101509Z	gitpod	994

+
🗎test1.article.html	2022-07-26T18:09:20.565509Z	gitpod	1802

+
🗎test2.article.html	2022-07-26T18:09:20.565509Z	gitpod	1498

+
🗎test3.article.html	2022-07-26T18:09:20.565509Z	gitpod	1711

 
 
 
 

diff --git a/out/otherpage.html b/out/otherpage.html
index 774f226..56d2d48 100644
--- a/out/otherpage.html
+++ b/out/otherpage.html
@@ -23,12 +23,10 @@ $ARTICLE_PREVIEW test articles/test1
 $ARTICLE_PREVIEW test articles/test2
 $ARTICLE_PREVIEW test articles/test3
 $ARTICLE_PREVIEW curabitur vel tempus ex
-
  
 

 

 
 

-
 

 
diff --git a/out/reset.css b/out/reset.css
index e29c0f5..73614e1 100644
--- a/out/reset.css
+++ b/out/reset.css
@@ -2,7 +2,6 @@
    v2.0 | 20110126
    License: none (public domain)
 */
-
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,
diff --git a/out/sig.css b/out/sig.css
index 7a9a0d6..8ee670a 100644
--- a/out/sig.css
+++ b/out/sig.css
@@ -1,5 +1,3 @@
-
-
 a:link{
     color:#D7F;
     font-size:0.8em;
@@ -12,27 +10,22 @@ a:hover{
     color:white;
     font-size:0.8em;
 }
-
     a.nounderline:link{
         text-decoration:none;
     }
-
     a.nounderline:visited{
         text-decoration:none;
     }
     a.nounderline:hover{
         text-decoration:none;
     }
-
 h2{
     font-size:3em;
 }
-
 .generateTime{
     font-size:10px;
     color:blue;
 }
-
 .codeForeground{
     font-family:'Courier New', Courier, monospace;
     position:fixed;
@@ -51,7 +44,6 @@ h2{
     max-width:98vw;
     max-height:90vh;
 }
-
 .codeBackground{
     font-family:'Courier New', Courier, monospace;
     position:fixed;
@@ -65,7 +57,6 @@ h2{
     max-width:98vw;
     max-height:90vh;
 }
-
 @keyframes backgroundMove{
     0%{
         background-position: 0% 50%;
@@ -74,24 +65,20 @@ h2{
         background-position: 100% 50%;
     }
 }
-
 body{
     font-family: 'Trebuchet MS', Garamond, serif, 'Tahoma', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
     background-color:#111;
 }
-
 sub{
     font-size:0.65em;
     position:relative;
     bottom:-4px;
 }
-
 sup{
     font-size:0.65em;
     position:relative;
     top:-8px;
 }
-
 .contentBody{
     backdrop-filter: blur(4px);
     color: #a985e4;
@@ -99,31 +86,24 @@ sup{
     text-shadow: 0.3px 0.3px 3px #666666;
     z-index:-1;
 }
-
     .contentBody .color1{
         color: #a985e4;
     }
-
     .contentBody .color2{
         color: #85abe4;
     }
-
     .contentBody .color3{
         color: #85e4ad;
     }
-
     .contentBody .color4{
         color: #d3e485;
     }
-
     .contentBody .color5{
         color: #e4a385;
     }
-
     .contentBody .color6{
         color: #e485b1;
     }
-
     .contentBody .contentWrapper{
         position:relative;
         border-style: none none outset none;
@@ -134,11 +114,9 @@ sup{
         min-width:98vw;
         z-index:0;
     }
-
     .contentBody .contentWrapper:hover{
         border-color: rgb(17, 153, 17, .8);
     }
-
         .contentBody .contentWrapper h1{
             display: inline-block;
             font-size:3.25em;
@@ -150,7 +128,6 @@ sup{
             background-color:rgba(255, 255, 255, .06);
             z-index:0;
         }
-
         .contentBody .contentWrapper .content{
             display: inline-block;
             min-width:97vw;
@@ -163,7 +140,6 @@ sup{
             max-height:120px;
             overflow:hidden;
         }
-
         .contentBody .contentWrapper .expandedContent{
             display: inline-block;
             min-width:97vw;
@@ -174,19 +150,16 @@ sup{
             background-color: rgba(255, 255, 255, .06);
             z-index:0;
         }
-
         .contentBody .contentWrapper figure{
             border: 2px ridge rgb(88, 35, 86);
             border-radius:4px;
             margin:12px 20px 12px 20px;
         }
-
         .contentBody .contentWrapper figcaption{
             font-size: 0.85em;
             font-style: italic;
             color:rgb(221, 105, 217);
         }
-        
         .contentBody .contentWrapper .datebar{
             font-size:0.75em;
             margin: 0px 4px 0px 4px;
@@ -195,7 +168,6 @@ sup{
             z-index:0;
             background: linear-gradient(90deg,rgba(255, 255, 255, .06) 0%, rgba(255, 255, 255, .3) 20%,rgba(255, 255, 255, .06) 45%,rgba(255, 255, 255, .06) 0%);
         }
-
         .contentBody .contentWrapper .date{
             font-size:0.75em;
             margin: 0px 4px 0px 4px;
@@ -204,7 +176,6 @@ sup{
             z-index:0;
             background-color: rgba(255, 255, 255, .06);
         }
-
         .contentBody .contentWrapper .unexpanded{
             position:absolute;
             bottom:0px;
@@ -214,34 +185,28 @@ sup{
             background: linear-gradient(180deg,rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 5%, rgba(32,32,32,1.0) 100%);
             user-select:none;
         }
-
         .contentBody .contentWrapper .unexpanded:hover{
             bottom:-8px;
             background: linear-gradient(180deg,rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0) 5%, rgba(64,64,64,1.0) 100%);
             cursor:pointer;
         }
-    
     .contentBody .filelisting{
         padding:12px 4px 2px 4px;
         font-size:1.75em;
     }
-
     .contentBody .folderlisting{
         padding:12px 4px 2px 4px;
         font-size:1.75em;
     }
-
     .contentBody .icon:link{
         text-decoration:none;
     }
-
     .contentBody .icon:visited{
         text-decoration:none;
     }
     .contentBody .icon:hover{
         text-decoration:none;
     }
-
 pre{
     font-family:'Courier New', Courier, monospace;
     display:inline-block;
@@ -266,17 +231,14 @@ pre{
       width: 16px;
       height: 16px;
     }
-  
   /* Track */
   ::-webkit-scrollbar-track {
     background:rgba(0,0,0,0);
   }
-  
   /* Handle */
   ::-webkit-scrollbar-thumb {
     background: rgb(161, 46, 161);
   }
-  
   /* Handle on hover */
   ::-webkit-scrollbar-thumb:hover {
     background: rgb(197, 34, 189);
@@ -289,31 +251,24 @@ pre{
       width:16px;
       height:16px;
     }
-
 pre .keyword{
     color:cornflowerblue;
 }
-
 pre .variable{
     color:#AA77FF;
 }
-
 pre .class{
     color:rgb(216, 107, 74);
 }
-
 pre .function{
     color:darkgoldenrod;
 }
-
 pre .string{
     color:forestgreen;
 }
-
 pre .number{
     color:#d8f070;
 }
-
 pre .comment{
     color:#6b235e;
 }
diff --git a/out/testfile.html b/out/testfile.html
index df4d679..aa14831 100644
--- a/out/testfile.html
+++ b/out/testfile.html
@@ -22,12 +22,10 @@ SigPlace
 ===
 


 Other Page!
-
  
 

 

 
 

-
 

 
diff --git a/out/uploadform.html b/out/uploadform.html
index 7518d47..5a464fb 100644
--- a/out/uploadform.html
+++ b/out/uploadform.html
@@ -22,12 +22,10 @@ SigPlace
     
     
 
-
  
 

 

 
 
 
diff --git a/sigPlace.java b/sigPlace.java
index 16627e5..7a0d7da 100644
--- a/sigPlace.java
+++ b/sigPlace.java
@@ -294,7 +294,11 @@ public class sigPlace {
                                 s=s.replaceAll(Pattern.quote(key),map.get(key));
                             }
                         }
-                        content.set(i,s);
+                        if (s.trim().length()==0) {
+                            content.remove(i--);
+                        } else {
+                            content.set(i,s);
+                        }
                     }
 
                     System.out.println("  Writing to "+f.toAbsolutePath());