From c3cfbec9ffab4a744d821ad9668c2f82267ac327 Mon Sep 17 00:00:00 2001
From: patrik2020 <patrik.pucer@gmail.com>
Date: Thu, 17 Feb 2022 21:53:44 +0100
Subject: [PATCH] Latex za izvoz: IZVOZ-93: Na specificni anketi ne deluje
 izvoz v PDF/word prevoda ankete v srbski jezik - latinica: ureditev akcenta
 in izpis maila

---
 .../latexclasses/class.LatexSurveyElement.php | 27 ++++++++++++++++---
 ...exTemplatePdfAnalysisAndOtherLandscape.cls |  3 ++-
 .../latexTemplatePdfAnalysisPortrait.cls      |  3 ++-
 .../textemp/latexTemplatePdfSurvey.cls        |  2 ++
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/admin/survey/export/latexclasses/class.LatexSurveyElement.php b/admin/survey/export/latexclasses/class.LatexSurveyElement.php
index 671eda253..217079bc8 100644
--- a/admin/survey/export/latexclasses/class.LatexSurveyElement.php
+++ b/admin/survey/export/latexclasses/class.LatexSurveyElement.php
@@ -1057,29 +1057,48 @@ class LatexSurveyElement{
 		//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa
 		$findAt = '@';
 		$numOfAt = substr_count($text, $findAt);	//stevilo '@' v besedilu
-
+		$text=html_entity_decode($text);
 		$posAt = strpos($text, $findAt);
 		if($posAt && $posSpace1){	//ce je prisotna afna in je prisoten presledek v besedilu
 			//echo "afna je: $posAt </br>";
 			//echo "Encoding: ".$text."</br>";
-
 			//najdi prvi presledek po afni
 			//echo substr($text, $posAt) ."</br>";			
 			$posSpace1Mail = strpos(substr($text, $posAt), $findSpace);	//najdi pozicijo prvega presledka v besedilu po e-naslovu
 			$posSpace1Mail = $posSpace1Mail+$posAt;	//koncna pozicija, ce se gleda celotno besedilo
-			//echo $posSpace1Mail."</br>";			
+			//echo $posSpace1Mail."</br>";
 			
+			//najdi prvi <br /> po afni
+			$posBreakMail = strpos(substr($text, $posAt), "<br />");	//najdi pozicijo prvega break v besedilu po e-naslovu
+			$najdi = "&nbsp;";
+			$posBreakMail = $posBreakMail+$posAt; 	//koncna pozicija, ce se gleda celotno besedilo			
+			//echo $posBreakMail."</br>";
+
+			//najdi prvi &nbsp; po afni
+			$posNbspMail = strpos(substr($text, $posAt), "&nbsp;");	//najdi pozicijo prvega &nbsp; v besedilu po e-naslovu
+			$najdi = "&nbsp;";
+			$posNbspMail = $posNbspMail+$posAt; 	//koncna pozicija, ce se gleda celotno besedilo
+			//echo $posNbspMail."</br>";
+
 			//najdi prvi presledek pred afno			
 			$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace);	//najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
 			//echo $posSpace2Mail."</br>";
 			
 			//dodaj po e-naslovu potrebno latex kodo za zakljucek url
-			$text = substr_replace($text, '}', $posSpace1Mail, 0);
+			//$text = substr_replace($text, '}', $posSpace1Mail, 0);
+
+			//$posEnd = min($posSpace1Mail, $posBreakMail, $posNbspMail);
+			$posEnd = min($posSpace1Mail, $posBreakMail);
+			//echo $posEnd."</br>";
+
+			
+			$text = substr_replace($text, '}', $posEnd, 0);
 			
 			//dodaj pred e-naslovom potrebno latex kodo za url			
 			//substr_replace(string_name, replacement_string, start_pos, length) 
 			$text = substr_replace($text, ' \url{', $posSpace2Mail+1, 0);
 			//echo $text."</br>";
+
 		}
 		//detekcija prisotnosti e-naslova v besedilu  in primerna preureditev, da pride do pravilnega izpisa - konec
 
diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls
index 5e4838c1a..7dd147707 100644
--- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls
+++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls
@@ -97,4 +97,5 @@
 \DeclareUnicodeCharacter{2265}{$\geq$}
 \DeclareUnicodeCharacter{03B5}{$\epsilon$
 \DeclareUnicodeCharacter{2003}{$\enspace$}}
-\DeclareUnicodeCharacter{0014}{$\thinspace$}	%ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja
\ No newline at end of file
+\DeclareUnicodeCharacter{0014}{$\thinspace$}	%ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja
+\DeclareUnicodeCharacter{0301}{$'$}
\ No newline at end of file
diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls
index 6b41c7474..d8be52dab 100644
--- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls
+++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls
@@ -95,4 +95,5 @@
 \DeclareUnicodeCharacter{2265}{$\geq$}
 \DeclareUnicodeCharacter{03B5}{$\epsilon$}
 \DeclareUnicodeCharacter{2003}{$\enspace$}
-\DeclareUnicodeCharacter{0014}{$\thinspace$}	%ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja
\ No newline at end of file
+\DeclareUnicodeCharacter{0014}{$\thinspace$}	%ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja
+\DeclareUnicodeCharacter{0301}{$'$}
\ No newline at end of file
diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
index 3b4b536d2..2106dcc71 100644
--- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
+++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
@@ -27,6 +27,7 @@
 
 \usepackage[utf8]{inputenc} % za uporabo utf8
 \usepackage{amssymb}	%za unicode simbole
+%\usepackage[T1]{fontenc}
 
 %DEFINIRANJE NADOMESTIL NEIZPISLJIVIH UNICODE CHARACTER-JEV
 \DeclareUnicodeCharacter{200B}{{\hskip 0pt}}
@@ -35,6 +36,7 @@
 \DeclareUnicodeCharacter{03B5}{$\epsilon$}
 \DeclareUnicodeCharacter{2003}{$\enspace$}
 \DeclareUnicodeCharacter{0014}{$\thinspace$}	%ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja
+\DeclareUnicodeCharacter{0301}{$'$}
 
 %Emoji - izpis urejen s slikicami emoji-jev
 \DeclareUnicodeCharacter{1F600}{\includegraphics[height=1em]{1F600.png}}