--- a/software/eXist/webapp/mpdl/interface/page-fragment.xql	Thu Feb 10 14:02:05 2011 +0100
+++ b/software/eXist/webapp/mpdl/interface/page-fragment.xql	Tue Feb 22 16:03:45 2011 +0100
@@ -110,6 +110,7 @@
   else ()
 let $pageHeader := string($pb1/@rhead)
 let $pageNumberOrig := string($pb1/@o)
+let $pageNumberOrigNorm := string($pb1/@o-norm)
 
 let $documentIdentifier :=
   if ($docbase = 'archimedes')
@@ -227,16 +228,16 @@
   if(not(empty($externalElements)))
   then true()
   else false()
-let $returnPageFragmentTmpp := 
+let $returnPageFragmentWithExtObjects :=
+  <result>
+    <externalElements>{$externalElements}</externalElements>
+    <fragment>{$returnPageFragmentTmp}</fragment>
+  </result>
+let $returnPageFragment := 
   if (contains($options, "withXmlNodeId") or $containsExternalElements)
-  then mpdl-text:insertNodeIdAttribute($returnPageFragmentTmp/*[1])
+  then mpdl-text:transform($returnPageFragmentWithExtObjects, concat($presentationPath, "/insertExternalElements.xsl"))
   else $returnPageFragmentTmp
 
-let $returnPageFragment := 
-  if($containsExternalElements)
-  then mpdl-text:insert($returnPageFragmentTmpp/*[1], $externalElements) 
-  else $returnPageFragmentTmpp
-
 let $pageFigureAnchors := $returnPageFragment//anchor[@type = 'figure']
 let $pageFigures :=
     for $pageFigureAnchor in $pageFigureAnchors
@@ -337,6 +338,7 @@
         <number>{$pn}</number>
         <header>{$pageHeader}</header>
         <number-orig>{$pageNumberOrig}</number-orig>
+        <number-orig-norm>{$pageNumberOrigNorm}</number-orig-norm>
         <sentence-number>{$sn}</sentence-number>
         <digilib-available>{$digilibAvailable}</digilib-available>
         <image-available>{$imageIsAvailable}</image-available>