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

improved the semantics of string concatenation with #

Browse Source
This commit is contained in:
Martin Monperrus
2010-10-09 19:30:34 +02:00
parent 8c5d439d00
commit 9911b78211
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bibtexbrowser.php
+18 -12
View File
@@ -145,7 +145,7 @@ define('BIBLIOGRAPHYSTYLE','MyFancyBibliographyStyle');
?> ?>
</code> </code>
[[http://www.monperrus.net/martin/bibtexbrowser-style-janos.php.txt|J�nos Tapolcai contributed with this style, which looks like IEEE references]]. [[http://www.monperrus.net/martin/bibtexbrowser-style-janos.php.txt|Janos Tapolcai contributed with this style, which looks like IEEE references]].
For contributing with a new style, [[http://www.monperrus.net/martin/|please drop me an email ]] For contributing with a new style, [[http://www.monperrus.net/martin/|please drop me an email ]]
=====How to add links to the slides of a conference/workshop paper?===== =====How to add links to the slides of a conference/workshop paper?=====
@@ -483,22 +483,24 @@ for ( $i=0; $i < strlen( $sread ); $i++) { $s=$sread[$i];
// the value is delimited by double quotes // the value is delimited by double quotes
if ($s=='"') { if ($s=='"') {
$state = GETVALUEDELIMITEDBYQUOTES; $state = GETVALUEDELIMITEDBYQUOTES;
$entryvalue='';} }
// the value is delimited by curly brackets // the value is delimited by curly brackets
else if ($s=='{') { else if ($s=='{') {
$state = GETVALUEDELIMITEDBYCURLYBRACKETS; $state = GETVALUEDELIMITEDBYCURLYBRACKETS;
$entryvalue='';} }
// the end of the key and no value found: it is the bibtex key e.g. \cite{Descartes1637} // the end of the key and no value found: it is the bibtex key e.g. \cite{Descartes1637}
else if ($s==',') { else if ($s==',') {
$state = GETKEY; $state = GETKEY;
$delegate->setEntryField(trim($finalkey),trim($entryvalue)); $delegate->setEntryField(trim($finalkey),trim($entryvalue));
$entryvalue='';} $entryvalue=''; // resetting the value buffer
}
// this is the end of the value AND of the entry // this is the end of the value AND of the entry
else if ($s=='}') { else if ($s=='}') {
$state = NOTHING;$isinentry = false; $state = NOTHING;$isinentry = false;
$delegate->setEntryField(trim($finalkey),trim($entryvalue)); $delegate->setEntryField(trim($finalkey),trim($entryvalue));
$delegate->endEntry($entrysource); $delegate->endEntry($entrysource);
$entryvalue='';} $entryvalue=''; // resetting the value buffer
}
else { $entryvalue=$entryvalue.$s;} else { $entryvalue=$entryvalue.$s;}
} }
@@ -655,26 +657,30 @@ class BibDBBuilder {
// first we set the key to lowercase // first we set the key to lowercase
$finalkey=strtolower($finalkey); $finalkey=strtolower($finalkey);
// is it a constant? then we replace the value // is it a constant? then we replace the value
// we support advanced features of bibtexbrowser // we support advanced features of bibtexbrowser
// see http://newton.ex.ac.uk/tex/pack/bibtex/btxdoc/node3.html // see http://newton.ex.ac.uk/tex/pack/bibtex/btxdoc/node3.html
$entryvalue_array=explode('#',$entryvalue); $entryvalue_array=explode('#',$entryvalue);
foreach ($entryvalue_array as $k=>$v) { foreach ($entryvalue_array as $k=>$v) {
$v=strtolower($v); // spaces are allowed when using #, they are not taken into account
if (isset($this->stringdb[$v])) // however # is not istself replaced by a space
// see http://newton.ex.ac.uk/tex/pack/bibtex/btxdoc/node3.html
$stringKey=strtolower(trim($v));
if (isset($this->stringdb[$stringKey]))
{ {
// this field will be formated later by xtrim and latex2html // this field will be formated later by xtrim and latex2html
$entryvalue_array[$k]=$this->stringdb[$v]; $entryvalue_array[$k]=$this->stringdb[$stringKey];
// we keep a trace of this replacement // we keep a trace of this replacement
// so as to produce correct bibtex snippets // so as to produce correct bibtex snippets
$this->currentEntry->constants[$v]=$this->stringdb[$v]; $this->currentEntry->constants[$stringKey]=$this->stringdb[$stringKey];
} else {
// we simply trim the entry
$entryvalue_array[$k]=trim($v); // trimmed value
} }
} }
$entryvalue=implode('',$entryvalue_array); $entryvalue=implode('',$entryvalue_array);
if ($finalkey!='url') $formatedvalue = latex2html(xtrim($entryvalue)); if ($finalkey!='url') $formatedvalue = latex2html(xtrim($entryvalue));
else $formatedvalue = trim($entryvalue); else $formatedvalue = trim($entryvalue);
@@ -961,7 +967,7 @@ class BibEntry {
function addHomepageLink($author) { function addHomepageLink($author) {
// hp as home page // hp as home page
// accents are handled normally // accents are handled normally
// e.g. @STRING{hp_Jean-MarcJ�z�quel="http://www.irisa.fr/prive/jezequel/"} // e.g. @STRING{hp_Jean-MarcJézéquel="http://www.irisa.fr/prive/jezequel/"}
$homepage = strtolower('hp_'.preg_replace('/ /', '', $author)); $homepage = strtolower('hp_'.preg_replace('/ /', '', $author));
//echo $homepage; //echo $homepage;
if (isset($_GET[Q_DB]->stringdb[$homepage])) if (isset($_GET[Q_DB]->stringdb[$homepage]))