fm/zrd-bibtexbrowser
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adds support for disabling latex2html

Browse Source
This commit is contained in:
Martin Monperrus
2015-10-08 08:50:24 +02:00
parent 1e73417203
commit e97a252acc
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bibtexbrowser-test.php
+21
View File
@@ -224,6 +224,27 @@ class BTBTest extends PHPUnit_Framework_TestCase {
$this->assertEquals("@article{aKey,\n title = {A Book},\n author = {Martin Monperrus},\n publisher = {Springer},\n year = {2009},\n}\n", $dis->getText()); $this->assertEquals("@article{aKey,\n title = {A Book},\n author = {Martin Monperrus},\n publisher = {Springer},\n year = {2009},\n}\n", $dis->getText());
} }
function test_BIBTEXBROWSER_USE_LATEX2HTML() {
$bibtex = "@article{aKey,title={\`a Book},author={Martin Monperrus},publisher={Springer},year=2009,pages={42--4242},number=1}\n";
bibtexbrowser_configure('BIBTEXBROWSER_USE_LATEX2HTML', true);
$test_data = fopen('php://memory','x+');
fwrite($test_data, $bibtex);
fseek($test_data,0);
$db = new BibDataBase();
$db->update_internal("inline", $test_data);
$dis = $db->getEntryByKey('aKey');
$this->assertEquals("à Book",$dis->getTitle());
bibtexbrowser_configure('BIBTEXBROWSER_USE_LATEX2HTML', false);
$test_data = fopen('php://memory','x+');
fwrite($test_data, $bibtex);
fseek($test_data,0);
$db = new BibDataBase();
$db->update_internal("inline", $test_data);
$dis = $db->getEntryByKey('aKey');
$this->assertEquals("\`a Book",$dis->getTitle());
}
} // end class } // end class
bibtexbrowser.php
+11 -6
View File
@@ -149,6 +149,8 @@ if (defined('ENCODING')) {
// a list of fields that will not be shown in the bibtex view if BIBTEXBROWSER_BIBTEX_VIEW=reconstructed // a list of fields that will not be shown in the bibtex view if BIBTEXBROWSER_BIBTEX_VIEW=reconstructed
@define('BIBTEXBROWSER_BIBTEX_VIEW_FILTEREDOUT','comment|note|file'); @define('BIBTEXBROWSER_BIBTEX_VIEW_FILTEREDOUT','comment|note|file');
// should Latex macros be executed (e.g. \'e -> é
@define('BIBTEXBROWSER_USE_LATEX2HTML',true);
// Which is the first html <hN> level that should be used in embedded mode? // Which is the first html <hN> level that should be used in embedded mode?
@define('BIBTEXBROWSER_HTMLHEADINGLEVEL', 2); @define('BIBTEXBROWSER_HTMLHEADINGLEVEL', 2);
@@ -1118,17 +1120,20 @@ class BibEntry {
// 1. trim space // 1. trim space
$value = xtrim($value); $value = xtrim($value);
// 2. transform Latex markup to HTML entities (easier than a one to one mapping to each character) if (c('BIBTEXBROWSER_USE_LATEX2HTML')) {
// HTML entity is an intermediate format // 2. transform Latex markup to HTML entities (easier than a one to one mapping to each character)
$value = latex2html($value); // HTML entity is an intermediate format
$value = latex2html($value);
// 3. transform existing encoded character in the new format // 3. transform to the target output encoding
$value = html_entity_decode($value, ENT_QUOTES|ENT_XHTML, OUTPUT_ENCODING);
}
// 4. transform existing encoded character in the new format
if (function_exists('mb_convert_encoding') && OUTPUT_ENCODING != BIBTEX_INPUT_ENCODING) { if (function_exists('mb_convert_encoding') && OUTPUT_ENCODING != BIBTEX_INPUT_ENCODING) {
$vaue = mb_convert_encoding($value, OUTPUT_ENCODING, BIBTEX_INPUT_ENCODING); $vaue = mb_convert_encoding($value, OUTPUT_ENCODING, BIBTEX_INPUT_ENCODING);
} }
// 4. transform to the target output encoding
$value = html_entity_decode($value, ENT_QUOTES|ENT_XHTML, OUTPUT_ENCODING);
} else { } else {
//echo "xx".$value."xx\n"; //echo "xx".$value."xx\n";
} }