Merge branch 'master' of https://git.1ka.si/git/1ka
This commit is contained in:
commit
e9f6b5fb40
@ -859,7 +859,8 @@ class AnalizaSums extends LatexAnalysisElement{
|
|||||||
$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
|
$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
|
||||||
//echo $dolzinaVprasanja."</br>";
|
//echo $dolzinaVprasanja."</br>";
|
||||||
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
|
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
|
||||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
//$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||||
|
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{p{16cm}|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||||
}else{
|
}else{
|
||||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||||
}
|
}
|
||||||
@ -1033,7 +1034,8 @@ class AnalizaSums extends LatexAnalysisElement{
|
|||||||
$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
|
$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
|
||||||
//echo $dolzinaVprasanja."</br>";
|
//echo $dolzinaVprasanja."</br>";
|
||||||
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
|
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
|
||||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
//$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||||
|
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{p{16cm}|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||||
}else{
|
}else{
|
||||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||||
}
|
}
|
||||||
@ -1689,7 +1691,8 @@ class AnalizaSums extends LatexAnalysisElement{
|
|||||||
$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
|
$dolzinaVprasanja = strlen($this->encodeText($spremenljivka['naslov']));
|
||||||
//echo $dolzinaVprasanja."</br>";
|
//echo $dolzinaVprasanja."</br>";
|
||||||
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
|
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
|
||||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
//$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||||
|
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{p{16cm}|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||||
}else{
|
}else{
|
||||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||||
}
|
}
|
||||||
@ -1964,6 +1967,7 @@ class AnalizaSums extends LatexAnalysisElement{
|
|||||||
//echo $dolzinaVprasanja."</br>";
|
//echo $dolzinaVprasanja."</br>";
|
||||||
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
|
if($dolzinaVprasanja > MEJA_DOLZINA_VPRASANJA){ //ce je dolzina vprasanja daljsa od ene vrstice v tabeli
|
||||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{X|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||||
|
//$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{p{16cm}|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||||
}else{
|
}else{
|
||||||
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
$tex .= $this->encodeText($spremenljivka['variable'])." & \multicolumn{".$steviloPodStolpcev1."}{l|}{".$this->encodeText($spremenljivka['naslov'])."} ".$this->texNewLine;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user