may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into release/produkcija

Browse Source
This commit is contained in:
pero1203 2021-08-04 14:30:55 +02:00
commit 65ac9cc03e
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/survey/export/latexclasses/class.LatexAnalysisElement.php
View File

@ -925,6 +925,12 @@ class LatexAnalysisElement{
//$text = str_replace('_','\_ ',$text); //$text = str_replace('_','\_ ',$text);
$text = str_replace('_','\_',$text); $text = str_replace('_','\_',$text);
$text = str_replace('~','\textasciitilde{} ',$text); $text = str_replace('~','\textasciitilde{} ',$text);
//$text = str_replace('<','\textless ',$text);
$text = str_replace('<','\textless',$text);
//$text = str_replace('>','\textgreater ',$text);
$text = str_replace('>','\textgreater',$text);
$text = str_replace(' ',' ',$text);
if(strpos($text, '&')){ //ce je prisotno v besedilu &' if(strpos($text, '&')){ //ce je prisotno v besedilu &'
$text = str_replace('&','\& ',$text); $text = str_replace('&','\& ',$text);
}else{ }else{
@ -941,11 +947,11 @@ class LatexAnalysisElement{
$text = str_replace('&','\&',$text); $text = str_replace('&','\&',$text);
} }
//$text = str_replace('<','\textless ',$text); /* //$text = str_replace('<','\textless ',$text);
$text = str_replace('<','\textless',$text); $text = str_replace('<','\textless',$text);
//$text = str_replace('>','\textgreater ',$text); //$text = str_replace('>','\textgreater ',$text);
$text = str_replace('>','\textgreater',$text); $text = str_replace('>','\textgreater',$text);
$text = str_replace(' ',' ',$text); $text = str_replace(' ',' ',$text); */
//ureditev posebnih karakterjev za Latex - konec //ureditev posebnih karakterjev za Latex - konec
//ureditev grskih crk //ureditev grskih crk

12
admin/survey/export/latexclasses/class.LatexSurveyElement.php
View File

@ -979,8 +979,10 @@ class LatexSurveyElement{
if($numOfUl!=0 && $posLi !== false){ //ce imamo ul in li if($numOfUl!=0 && $posLi !== false){ //ce imamo ul in li
$text = str_replace('<ul>','\begin{itemize} ', $text); $text = str_replace('<ul>','\begin{itemize} ', $text);
$text = str_replace('<ul','\begin{itemize} ', $text); $text = str_replace('<ul','\begin{itemize} ', $text);
$text = str_replace('<li>','\item ', $text); /* $text = str_replace('<li>','\item ', $text);
$text = str_replace('<li','\item ', $text); $text = str_replace('<li','\item ', $text); */
$text = str_replace('<li>','\item \ ', $text);
$text = str_replace('<li','\item \ ', $text);
$text = str_replace('</ul>','\end{itemize} \ ', $text); $text = str_replace('</ul>','\end{itemize} \ ', $text);
} }
//echo "prazno v html: ".strpos($text, '\r')."</br>"; //echo "prazno v html: ".strpos($text, '\r')."</br>";
@ -998,8 +1000,10 @@ class LatexSurveyElement{
//if($numOfUl!=0){ //if($numOfUl!=0){
if($numOfOl!=0 && $posLi !== false){ //ce imamo ol in li if($numOfOl!=0 && $posLi !== false){ //ce imamo ol in li
$text = str_replace('<ol>','\begin{enumerate} ', $text); $text = str_replace('<ol>','\begin{enumerate} ', $text);
$text = str_replace('<li>','\item ', $text); /* $text = str_replace('<li>','\item ', $text);
$text = str_replace('<li','\item ', $text); $text = str_replace('<li','\item ', $text); */
$text = str_replace('<li>','\item \ ', $text);
$text = str_replace('<li','\item \ ', $text);
$text = str_replace('</ol>','\end{enumerate} \ ', $text); $text = str_replace('</ol>','\end{enumerate} \ ', $text);
} }
//echo "prazno v html: ".strpos($text, '\r')."</br>"; //echo "prazno v html: ".strpos($text, '\r')."</br>";