Commit 5400e370 authored by dje's avatar dje
Browse files

paramètre: baseURI dans la config + maj plugins équations selon nouveaux liens core

parent bf955bd9

configuration/configuration.dist.xml

+1 −0
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<configuration xmlns:xi="http://www.w3.org/2001/XInclude">

  <baseURI></baseURI>

  <editions> 

  </editions>

</configuration>

plugins/equations/equations.src.js

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ moduleEquations['onTextChange'] = function(){ 
    if(!docWithEquation())

      return;

    //appends lib into head element

    $("head").append('<script type="text/javascript" src="' + MAX.getBaseURL() + '/ui/js/lib/MathJax/MathJax.js?config=TeX-AMS_HTML.js"></script>');

    $("head").append('<script type="text/javascript" src="' + MAX.getBaseURL() +'/'+projectId+ '/core/ui/js/lib/MathJax/MathJax.js?config=TeX-AMS_HTML.js"></script>');

    

    //appends text options components

    $("#options-list").append("<li role='separator' class='divider'></li><li><a href='#'><input id='toggle_pb' type='radio' name='equations' onchange='toggleModernEquations(false)' checked=''>Afficher les images de l\'édition originale</a></li>");

rxq/config.xqm

+5 −1
Original line number Diff line number Diff line
@@ -74,7 +74,11 @@ declare function max.config:isIgnored( 
Returns BaseX baseURI

:)

declare function max.config:getBaseURI() as xs:string{

   rest:base-uri() || $max.cons:BASE_DIR

   if(doc($max.config:CONFIGURATION_FILE)/configuration/baseURI/text())

    then doc($max.config:CONFIGURATION_FILE)/configuration/baseURI/text()

    else rest:base-uri() || $max.cons:BASE_DIR



   

};



(:

rxq/html.xqm

+2 −1
Original line number Diff line number Diff line
@@ -315,7 +315,8 @@ declare %private function max.html:buildSubMenu($projectId, $pageId){ 
declare function max.html:getHTMLFragment($project, $fragmentName as xs:string)

as element(div){

    let $fragmentPath := max.util:maxHome() ||"/editions/"||$project|| "/fragments/"||$fragmentName|| ".frag.html"

    let $content :=   fetch:xml($fragmentPath, map { 'parser': 'html','htmlparser': map { 'html': false(), 'nodefaults': true() }})

    let $content :=   doc($fragmentPath)

    (: fetch:xml($fragmentPath, map { 'parser': 'html','htmlparser': map { 'html': false(), 'nodefaults': true() }}) :)

   

    return  <div id='content'>{$content}</div> 

};

ui/js/dist/equations.min.js

+1 −1
Original line number Diff line number Diff line 
function setEquationsVisible(){$(".tex").show(),$(".formula").hide(),enableAndRunMathJax()}function enableAndRunMathJax(){MathJax.Hub.Config({tex2jax:{inlineMath:[["$","$"],["\\(","\\)"]]},TeX:{Macros:{textnormal:"{}",ad:"{=}"}}}),MathJax.Hub.Queue(["Typeset",MathJax.Hub])}function toggleModernEquations(e){console.log("Set modern equations visible ="+e),e?($(".tex").show(),$(".formula").hide()):($(".formula").show(),$(".tex").hide())}function docWithEquation(){return $(".formula").size()>0}var moduleEquations=new Object;moduleEquations.onTextChange=function(){docWithEquation()&&($("head").append('<script type="text/javascript" src="'+MAX.getBaseURL()+'/ui/js/lib/MathJax/MathJax.js?config=TeX-AMS_HTML.js"></script>'),$("#options-list").append("<li role='separator' class='divider'></li><li><a href='#'><input id='toggle_pb' type='radio' name='equations' onchange='toggleModernEquations(false)' checked=''>Afficher les images de l'édition originale</a></li>"),$("#options-list").append("<li><a href='#'><input id='toggle_pb' type='radio' name='equations' onchange='toggleModernEquations(true)' checked='' >Afficher les équations modernisées en mode texte</a></li><li role='separator' class='divider'></li>"),setEquationsVisible())},MAX.addModule(moduleEquations);
 
 No newline at end of file
 
function setEquationsVisible(){$(".tex").show(),$(".formula").hide(),enableAndRunMathJax()}function enableAndRunMathJax(){MathJax.Hub.Config({tex2jax:{inlineMath:[["$","$"],["\\(","\\)"]]},TeX:{Macros:{textnormal:"{}",ad:"{=}"}}}),MathJax.Hub.Queue(["Typeset",MathJax.Hub])}function toggleModernEquations(e){console.log("Set modern equations visible ="+e),e?($(".tex").show(),$(".formula").hide()):($(".formula").show(),$(".tex").hide())}function docWithEquation(){return $(".formula").size()>0}var moduleEquations=new Object;moduleEquations.onTextChange=function(){docWithEquation()&&($("head").append('<script type="text/javascript" src="'+MAX.getBaseURL()+"/"+projectId+'/core/ui/js/lib/MathJax/MathJax.js?config=TeX-AMS_HTML.js"></script>'),$("#options-list").append("<li role='separator' class='divider'></li><li><a href='#'><input id='toggle_pb' type='radio' name='equations' onchange='toggleModernEquations(false)' checked=''>Afficher les images de l'édition originale</a></li>"),$("#options-list").append("<li><a href='#'><input id='toggle_pb' type='radio' name='equations' onchange='toggleModernEquations(true)' checked='' >Afficher les équations modernisées en mode texte</a></li><li role='separator' class='divider'></li>"),setEquationsVisible())},MAX.addModule(moduleEquations);
 
 No newline at end of file