- Update to 2.0.0

redking00 · redking00 · commit 8e1d7c5daa7f · 2023-05-23T20:14:05.000+02:00
- New dpi option for pdf output
- Square bracket syntax for freemarker
diff --git a/README.md b/README.md
@@ -34,22 +34,25 @@
 
 ### Options: 
 <table>
- <tr><td>-csv_charset <arg></td><td>CSV file charset (optional default 'UTF-8')</td></tr>
- <tr><td>-csv_extension <arg></td><td>CSV file extesion (optional default '')</td></tr>
- <tr><td>-csv_file <arg></td><td>CSV input file (optional, use instead -csv_query)</td></tr>
- <tr><td>-csv_folder <arg></td><td>CSV folder path (optional default '.')</td></tr>
- <tr><td>-csv_query <arg></td><td>CSV query command (optional, use instead -csv_file)</td></tr>
- <tr><td>-csv_separator <arg></td><td>CSV separator character (optional default ';')</td></tr>
+ <tr><td>-csv_charset &lt;arg&gt;</td><td>CSV file charset (optional, default 'UTF-8')</td></tr>
+ <tr><td>-csv_extension &lt;arg&gt;</td><td>CSV file extesion (optional, default '')</td></tr>
+ <tr><td>-csv_file &lt;arg&gt;</td><td>CSV input file (optional, use instead -csv_query)</td></tr>
+ <tr><td>-csv_folder &lt;arg&gt;</td><td>CSV folder path (optional, default '.')</td></tr>
+ <tr><td>-csv_query &lt;arg&gt;</td><td>CSV query command (optional, use instead -csv_file)</td></tr>
+ <tr><td>-csv_separator &lt;arg&gt;</td><td>CSV separator character (optional, default ';')</td></tr>
  <tr><td>-for_each</td><td>Generate one file per data record (optional, see notes below)</td></tr>
- <tr><td>-ftl_encoding <arg></td><td>FTL input file encoding (optional default 'UTF-8')</td></tr>
- <tr><td>-ftl_file <arg></td><td>FTL input file</td></tr>
- <tr><td>-pdf <arg></td><td>PDF output file (optional, use instead -txt)</td></tr>
- <tr><td>-txt <arg></td><td>TXT output file (optional, use instead -pdf)</td></tr>
- <tr><td>-txt_charset <arg></td><td>TXT output file charset (optional default 'UTF-8')</td></tr>
+ <tr><td>-ftl_encoding &lt;arg&gt;</td><td>FTL input file encoding (optional, default 'UTF-8')</td></tr>
+ <tr><td>-ftl_file &lt;arg&gt;</td><td>FTL input file</td></tr>
+ <tr><td>-pdf &lt;arg&gt;</td><td>PDF output file (optional, use instead -txt)</td></tr>
+ <tr><td>-dpi &lt;arg&gt;</td><td>PDF output file dpi (optional, default 96)</td></tr> 
+ <tr><td>-txt &lt;arg&gt;</td><td>TXT output file (optional, use instead -pdf)</td></tr>
+ <tr><td>-txt_charset &lt;arg&gt;</td><td>TXT output file charset (optional, default 'UTF-8')</td></tr>
+ 
 </table>
 <br>
 
 ### NOTES:<br>
+ - csv2pdf 2.0.0 and above uses freemarker's square bracket tag syntax and square bracket interpolation syntax.
  - Iterate "*rows*" collection inside your template if you are not using the *-for_each* option
  - You can use a templated output file name if using the *-for_each* option
  - See the examples folder!
@@ -64,6 +67,5 @@
 
 
 ### Any idea, suggestion or comment is always appreciated
-![We need your help!](https://www.mememaker.net/api/bucket?path=static/img/memes/full/2019/Mar/3/6/we-need-your-help-to-make-the-magic-happen-127.png)
 
 
diff --git a/examples/pdf birthday card/birthday_card.ftl b/examples/pdf birthday card/birthday_card.ftl
@@ -28,7 +28,7 @@
     </style>
 </head>
 <body>
-    <h1>Happy ${age}º birthday ${name}!</h1>
+    <h1>Happy [= age]º birthday [= name]!</h1>
     <div class="greet">Built with csv2pdf!</div>
 </body>
 </html>
diff --git a/examples/pdf simple catalog/run.sh b/examples/pdf simple catalog/run.sh
@@ -1,2 +1,2 @@
 rm ./*.pdf
-java -jar ../../target/csv2pdf.jar -csv_file products.csv -ftl_file template.ftl -pdf catalog.pdf
+java -jar ../../target/csv2pdf.jar -csv_file products.csv -ftl_file template.ftl -pdf catalog.pdf -dpi 300
diff --git a/examples/pdf simple catalog/template.ftl b/examples/pdf simple catalog/template.ftl
@@ -20,12 +20,12 @@
     </style>
 </head>
 <body>
-    <#list rows as row>
-        <h1>${row.name}</h1>
-        <img src="images/${row.image}">
-        <h2>${row.price}</h2>
-        <#sep><div class="newpage"/></#sep>
-    </#list>
+    [#list rows as row]
+        <h1>[= row.name]</h1>
+        <img src="images/[= row.image]">
+        <h2>[= row.price]</h2>
+        [#sep]<div class="newpage"/>[/#sep]
+    [/#list]
 </body>
 </html>
 
diff --git a/examples/pdf with header and footer/template.ftl b/examples/pdf with header and footer/template.ftl
@@ -65,18 +65,18 @@ div.newpage {
     </div>
 
     <div class="content">
-        <#list rows as row>
+        [#list rows as row]
             <table style="text-align:center;margin:auto;font-size:1cm;padding-top:4cm;">
-                <tr><td colspan=2>${row["SSN"]}</td></tr>
-                <tr><td>${row["Last name"]}</td><td rowspan="2">${row["Grade"]}</td></tr>
-                <tr><td>${row["First name"]}</td></tr>
+                <tr><td colspan=2>[= row["SSN"]]</td></tr>
+                <tr><td>[= row["Last name"]]</td><td rowspan="2">[= row["Grade"]]</td></tr>
+                <tr><td>[= row["First name"]]</td></tr>
             </table>
             <table style="text-align:center;margin:auto;font-size:0.5cm;padding-top:2cm;">
                 <tr><th>Test1</th><th>Test2</th><th>Test3</th><th>Test4</th><th>Final</th></tr>
-                <tr><td>${row.Test1}</td><td>${row.Test2}</td><td>${row.Test3}</td><td>${row.Test4}</td><td>${row.Final}</td></tr>
+                <tr><td>[= row.Test1]</td><td>[= row.Test2]</td><td>[= row.Test3]</td><td>[= row.Test4]</td><td>[= row.Final]</td></tr>
             </table>
-            <#sep><div class="newpage"/></#sep>
-        </#list>
+            [#sep]<div class="newpage"/>[/#sep]
+        [/#list]
     </div>
 
 </body>
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>csv2pdf</groupId>
   <artifactId>csv2pdf</artifactId>
-  <version>1.0.3</version>
+  <version>2.0.0</version>
 
   <name>csv2pdf</name>
 
@@ -30,12 +30,12 @@
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
-      <version>2.3.31</version>
+      <version>2.3.32</version>
     </dependency>
     <dependency>
         <groupId>org.jsoup</groupId>
         <artifactId>jsoup</artifactId>
-        <version>1.15.3</version>
+        <version>1.16.1</version>
     </dependency>    
     <dependency>
         <groupId>org.xhtmlrenderer</groupId>
diff --git a/src/main/java/csv2pdf/App.java b/src/main/java/csv2pdf/App.java
@@ -60,7 +60,7 @@ public static void main(String[] args) throws ClassNotFoundException, SQLExcepti
         System.out.println("| / /__(__  )| |/ / __// /_/ / /_/ / __/   |");
         System.out.println("| \\___/____/ |___/____/ .___/\\__,_/_/      |");
         System.out.println("|                    /_/                   |");
-        System.out.println("|                                 v.1.0.3  |");
+        System.out.println("|                                 v.2.0.0  |");
         System.out.println("·------------------------------------------·");
 
         Options options = new Options();
@@ -71,7 +71,7 @@ public static void main(String[] args) throws ClassNotFoundException, SQLExcepti
         Option csvSeparatorOption = new Option("csv_separator", true, "CSV separator character (optional default ';')");
         csvSeparatorOption.setRequired(false);
 
-        Option csvExtensionOption = new Option("csv_extension", true, "CSV file extesion (optional default '')");
+        Option csvExtensionOption = new Option("csv_extension", true, "CSV file extension (optional default '')");
         csvExtensionOption.setRequired(false);
 
         Option csvCharsetOption = new Option("csv_charset", true, "CSV file charset (optional default 'UTF-8')");
@@ -92,6 +92,9 @@ public static void main(String[] args) throws ClassNotFoundException, SQLExcepti
         Option pdfOption = new Option("pdf", true, "PDF output file (optional, use instead -txt)");
         pdfOption.setRequired(false);
 
+        Option dpiOption = new Option("dpi", true, "PDF output file dpi");
+        dpiOption.setRequired(false);
+
         Option txtOption = new Option("txt", true, "TXT output file (optional, use instead -pdf)");
         txtOption.setRequired(false);
 
@@ -110,6 +113,7 @@ public static void main(String[] args) throws ClassNotFoundException, SQLExcepti
         options.addOption(ftlFileOption);
         options.addOption(ftlEncodingOption);
         options.addOption(pdfOption);
+        options.addOption(dpiOption);
         options.addOption(txtOption);
         options.addOption(txtCharsetOption);
         options.addOption(eachOption);
@@ -130,11 +134,20 @@ public static void main(String[] args) throws ClassNotFoundException, SQLExcepti
 
                     String ftlFile = cmd.getOptionValue("ftl_file");
                     String ftlEncoding = cmd.getOptionValue("ftl_encoding", "UTF-8");
-                    Configuration cfg = new Configuration(Configuration.VERSION_2_3_30);
+                    Configuration cfg = new Configuration(Configuration.VERSION_2_3_32);
                     cfg.setDirectoryForTemplateLoading(FileSystems.getDefault().getPath(".").toFile());
                     cfg.setDefaultEncoding(ftlEncoding);
+                    cfg.setTagSyntax(Configuration.SQUARE_BRACKET_TAG_SYNTAX);
+                    cfg.setInterpolationSyntax(Configuration.SQUARE_BRACKET_INTERPOLATION_SYNTAX);
                     Template template = cfg.getTemplate(ftlFile);
-                    ITextRenderer renderer = cmd.hasOption("pdf") ? new ITextRenderer() : null;
+                    ITextRenderer renderer = null;
+
+                    if (cmd.hasOption("pdf")) {
+                        int dpi = Integer.parseInt(cmd.getOptionValue("dpi","96"));
+                        float dotsPerPoint = ((float) dpi / 72.0f);
+                        int dotsPerPixel = 1;
+                        renderer = new ITextRenderer(dotsPerPoint,dotsPerPixel);
+                    }
 
                     if (cmd.hasOption("for_each")) {
                         for (HashMap<String, Object> row : rows) {

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`rm ./*.pdf`
`2`		`-java -jar ../../target/csv2pdf.jar -csv_file products.csv -ftl_file template.ftl -pdf catalog.pdf`
	`2`	`+java -jar ../../target/csv2pdf.jar -csv_file products.csv -ftl_file template.ftl -pdf catalog.pdf -dpi 300`