Skip to content

Commit

Permalink
Correction Bug 6730
Browse files Browse the repository at this point in the history
  • Loading branch information
@lnprieto
lnprieto committed Sep 22, 2017
1 parent 584f2d0 commit c52f11e
Showing 1 changed file with 78 additions and 37 deletions.
115 changes: 78 additions & 37 deletions lodel/scripts/teiparser.php
View file
Expand Up @@ -728,7 +728,6 @@ private function _parseAttributes(XMLReader $element = null)
while($element->moveToNextAttribute());

$element->moveToElement();

return $attrs;
}

Expand Down Expand Up @@ -775,7 +774,6 @@ private function _getRendition($name)
private function _closeTag()
{
if(empty($this->_tags)) return;

$tags = array_pop($this->_tags);

$text = '';
Expand Down Expand Up @@ -980,7 +978,8 @@ private function _parseBlocks(SimpleXMLElement $simplexml)

if(!isset($this->_contents[$obj->name]))
$this->_contents[$obj->name] = array();

$blocks = fopen('/home/helene/lodel/tmp/blocks.txt', 'a+');

This comment has been minimized.

Sign in to view

Copy link
@HichamBenjelloun

HichamBenjelloun Oct 11, 2017

Contributor

Il ne faut pas oublier d'enlever les lignes de debug comme celle-ci.
fputs($blocks, 'Test');
foreach($block as $k => $v)
{
$this->_updateNameSpaces($v);
Expand All @@ -1000,9 +999,12 @@ private function _parseBlocks(SimpleXMLElement $simplexml)
$currentNode =& $this->_contents[$obj->name][$lang][$id];
}
else $currentNode =& $this->_contents[$obj->name][$id];


fputs($blocks, $v->asXML());

$currentNode .= $this->_parse($v->asXML());
}
fclose($blocks);
}
$this->_currentClass = array();
}
Expand All @@ -1015,6 +1017,7 @@ private function _parseBlocks(SimpleXMLElement $simplexml)
* @param string $xml la chaîne XML à convertir
* @return string le XHTML équivalent à la chaine XML
*/

private function _parse($xml)
{
$this->XML($xml, 'UTF-8', LIBXML_COMPACT | LIBXML_NOCDATA);
Expand All @@ -1025,34 +1028,33 @@ private function _parse($xml)
{
if(parent::ELEMENT === $this->nodeType)
{
if('div' === $this->localName) continue; // container, not used

$attrs = $this->_parseAttributes();

if(isset($attrs['rend']) && in_array(strtolower($attrs['rend']), $this->_notesstyles) ) continue;
$text .= $this->_getTagEquiv($this->localName, $attrs);

if ('formula' === $this->localName)
{
$attrs = $this->_parseAttributes();
if (isset($attrs['notation'])) {
$math = $this->readInnerXml();
$text .= $math.$this->_closeTag();
$this->next();
continue;
$text .= $math; //.$this->_closeTag(); //Tag fermé ici et aussi ligne 1062
$this->read();
}
}
if('div' === $this->localName) continue; // container, not used

$attrs = $this->_parseAttributes();

if(isset($attrs['rend']) && in_array(strtolower($attrs['rend']), $this->_notesstyles) ) continue;
$text .= $this->_getTagEquiv($this->localName, $attrs);
}
elseif(parent::END_ELEMENT === $this->nodeType)
{
if('body' === $this->localName || 'front' === $this->localName || 'back' === $this->localName) break;
//elseif(('div' === $this->localName) || ($this->localName === 'formula')) continue;
elseif('div' === $this->localName) continue;

$rend = $this->getAttribute('rend');


if(isset($rend) && in_array(strtolower($rend), $this->_notesstyles) ) continue;

$text .= $this->_closeTag();
$text .= $this->_closeTag();

if(!empty($rend))
{
Expand All @@ -1074,6 +1076,7 @@ private function _parse($xml)
}

$this->close();

return $text;
}

Expand All @@ -1087,24 +1090,47 @@ private function _parse($xml)
*/
private function _addLocalStyle(array $attrs, $inline = false)
{
$ret = '';

if(empty($attrs)) return;

if(!empty($attrs['lang']))
$lang = $attrs['lang'];
if(!empty($attrs['rendition']))
$rendition = $this->_getRendition($attrs['rendition']);

if(empty($lang) && empty($rendition) && empty($attrs['rend'])) return;


if(empty($attrs['notation']) && empty($lang) && empty($rendition) && empty($attrs['rend'])) return;
print_r($this->_tags);
print('<br/>');

$tags = $inline ? array() : array_pop($this->_tags);

if(!is_array($tags)) $tags = array($tags);

$ret = '';
if (!empty($attrs['notation'])) {

if ($tags[count($tags)-1] === 'span') {
$this->_tags[] = 'span';
}

$tags = array();

if( $this->localName !== "p" && $this->localName !== "q"){ // le <p> indique un paragraphe, le <q> indique une citation
$ret = '<span class="' . $attrs['notation']. '">';
$tags[] = 'span';
}

}

//if(empty($attrs['notation']) && empty($lang) && empty($rendition) && empty($attrs['rend'])) return;

if(!empty($rendition))
{
$styles = array();

$rendition = preg_split("/\s*(?<!&(apos|quot));\s*/", $rendition);

$nb = count($rendition);

for($i=0;$i<$nb;$i++)
{
$style = $rendition[$i];
Expand Down Expand Up @@ -1148,8 +1174,7 @@ private function _addLocalStyle(array $attrs, $inline = false)
}
}
}

if(!empty($attrs['rend']))
if((!empty($attrs['rend'])))
{
$styles = $this->_getStyle($attrs['rend']);
if(!empty($styles['inline']))
Expand Down Expand Up @@ -1211,8 +1236,15 @@ private function _addLocalStyle(array $attrs, $inline = false)
'>';
}

if(!empty($tags[0])) $this->_tags[] = array_reverse($tags);

if(!empty($tags[0])) {
$this->_tags[] = array_reverse($tags);
}
/*if ($this->localName ==='formula') {
print('<br/>');
print_r($this->_tags);
die();
}*/

return $ret;
}

Expand Down Expand Up @@ -1254,7 +1286,9 @@ private function _getTagEquiv($name, array $attrs)
case 's':
return $this->_addLocalStyle($attrs, true);
break;

case 'formula':
return $this->_addLocalStyle($attrs, false);
break;
// case 'pb': // page break, we don't need it
// return '';
// break;
Expand Down Expand Up @@ -1440,15 +1474,15 @@ private function _parseList(array $attrs)
{
$tags = '<li' . $this->_addAttributes($this->_parseAttributes()) . '>';
$this->_tags[] = 'li';
}elseif('formula' === $this->localName){
continue;
/*}elseif('formula' === $this->localName){
continue;*/
}else{
$tags .= $this->_getTagEquiv($this->localName, $this->_parseAttributes());
}
}
elseif(parent::END_ELEMENT === $this->nodeType)
{
if('formula' === $this->localName) continue;
if('formula' === $this->localName) continue;
$text .= $tags . $this->_closeTag();
$tags = '';
if('list' === $this->localName) break;
Expand Down Expand Up @@ -1512,10 +1546,9 @@ private function _parseTable(array $attrs)
if (preg_match('/direction:([^\'";]+)/',$attributs,$m)) $attributs .= " dir=\"".$m[1]."\"";
$text = '<table id="'.$attrs['id'].'"' . $attributs . $this->_addAttributes(array('class' => end($this->_currentClass))) .'>';
$this->_tags[] = 'table';

while($this->read())
{

if(parent::ELEMENT === $this->nodeType)
{
if('table' === $this->localName)
Expand All @@ -1532,14 +1565,22 @@ private function _parseTable(array $attrs)
$text .= '<td' . $attributs . '>';
$this->_tags[] = 'td';
}
elseif('anchor' === $this->localName || 'formula' === $this->localName)
elseif('anchor' === $this->localName) // || 'formula' === $this->localName)
{
continue;
}
else
$text .= $this->_getTagEquiv($this->localName === 's' ? 'p' : $this->localName, $this->_parseAttributes());

if( $this->isEmptyElement && in_array($this->localName, array('table', 'row', 'cell')) ){
else {
if($this->localName === 's' || $this->localName === 'formula')

{
$localname = 'p';
} else
{
$localname = $this->localName;
}
$text .= $this->_getTagEquiv($localname, $this->_parseAttributes());
}
if( $this->isEmptyElement && in_array($this->localname, array('table', 'row', 'cell')) ){
$text .= $this->_closeTag();
}

Expand Down

0 comments on commit c52f11e

Please sign in to comment.