1.5.3

secure-77 · Feb 5, 2023 · d100137 · d100137
1 parent e49b68b
commit d100137
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 8 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,9 @@
+## 1.5.3
+- support file links with exclamation mark and aliases (issue #55)
+- support image resizing (issue #54)
+- fixed $refName missing php variable (PR #56)
+
+
 ## 1.5.2
 - fixed $closing variable error
 - set focus to search field

diff --git a/perlite/Demo/README.md b/perlite/Demo/README.md
@@ -32,12 +32,19 @@ If you want to discuss about Perlite you can join the thread in the [Obsidian Fo
 
 ## Demo Files
 
+
 [[Demo Documents/markdown-sample]]
 
 [[Demo Documents/markdown-sample2]]
 
 [[Demo Documents/markdown-sample3|Call outs]]
 
+[[Demo Documents/pdf-test.pdf|PDF Alias]]
+
+## Images
+
+![[test_img.png|200x200]]
+
 ## Documentation on Github
 
 [Perlite on Github](https://github.com/secure-77/Perlite/)

diff --git a/perlite/Demo/test_img.png b/perlite/Demo/test_img.png
diff --git a/perlite/PerliteParsedown.php b/perlite/PerliteParsedown.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
-  * Perlite v1.5.2 (https://github.com/secure-77/Perlite)
+  * Perlite v1.5.3 (https://github.com/secure-77/Perlite)
   * Author: sec77 & Toaa (https://secure77.de)
   * Licensed under MIT (https://github.com/secure-77/Perlite/blob/main/LICENSE)
 */

diff --git a/perlite/content.php b/perlite/content.php
@@ -83,14 +83,20 @@ function parseContent($requestFile) {
 	$mdpath = $path;
 	$path = $startDir . $path;
 
-	// pdf links
-	$replaces = '<a class="internal-link" target="_blank" rel="noopener noreferrer" href="'.$path .'/'.'\\2">\\2</a>';
-	$pattern = array('/(\!\[\[)(.*?.pdf)(\]\])/');
+
+	// pdf links with Alias
+	$replaces = '<a class="internal-link" target="_blank" rel="noopener noreferrer" href="'.$path .'/'.'\\2">\\3</a>';
+	$pattern = array('/(\!?\[\[)(.*?.pdf)\|(.*)(\]\])/');
 	$content = preg_replace($pattern, $replaces ,$content);
 
+	// pdf links without Alias
+	$replaces = '<a class="internal-link" target="_blank" rel="noopener noreferrer" href="'.$path .'/'.'\\2">\\2</a>';
+	$pattern = array('/(\!?\[\[)(.*?.pdf)(\]\])/');
+	$content = preg_replace($pattern, $replaces ,$content);
+
 	// img links
-	$replaces = '<p><a href="#" class="pop"><img class="images" alt="image not found" src="'. $path .'/\\2\\3'.'"/></a></p>';
-	$pattern = array('/(\!\[\[)(.*?)(.png|.jpg|.jpeg|.gif|.bmp|.tif|.tiff)(\]\])/');
+	$replaces = '<p><a href="#" class="pop"><img class="images" width="\\4" height="\\5" alt="image not found" src="'. $path .'/\\2\\3'.'"/></a></p>';
+	$pattern = array('/(\!?\[\[)(.*?)(.png|.jpg|.jpeg|.gif|.bmp|.tif|.tiff)\|?(\d*)x?(\d*)(\]\])/');
 	$content = preg_replace($pattern, $replaces ,$content);
 
 	// handle internal site links
@@ -163,6 +169,7 @@ function($matches) use ($path, $sameFolder) {
 
 		# split by # to keep the reference
 		$splitLink = explode("#", $urlPath);
+		$refName = '';
 		if (count($splitLink) > 1) {
 
 			$urlPath = $splitLink[0];

diff --git a/perlite/helper.php b/perlite/helper.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
-  * Perlite v1.5.2 (https://github.com/secure-77/Perlite)
+  * Perlite v1.5.3 (https://github.com/secure-77/Perlite)
   * Author: sec77 (https://secure77.de)
   * Licensed under MIT (https://github.com/secure-77/Perlite/blob/main/LICENSE)
 */

diff --git a/perlite/index.php b/perlite/index.php
@@ -4,7 +4,7 @@
 <?php
 
 /*!
-  * Version v1.5.2
+  * Version v1.5.3
 */
 
 include('helper.php');
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     <?php
     /*!
-      * Version v1.5.2
+      * Version v1.5.3
     */
     include('helper.php');
@@ Expand Down @@