From 46db02a5e3d1cd1c1d0d5f1d313e01e0497dee74 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Jul 2009 12:09:58 +0000 Subject: [PATCH] * Fix xrefs and callouts that refer to xml:ids (rather than ids). Will send upstream. svn path=/nixpkgs/trunk/; revision=16312 --- pkgs/misc/tex/dblatex/default.nix | 7 +- pkgs/misc/tex/dblatex/xmlid.patch | 253 ++++++++++++++++++++++++++++++ 2 files changed, 259 insertions(+), 1 deletion(-) create mode 100644 pkgs/misc/tex/dblatex/xmlid.patch diff --git a/pkgs/misc/tex/dblatex/default.nix b/pkgs/misc/tex/dblatex/default.nix index 9044121b725..56770dfa73c 100644 --- a/pkgs/misc/tex/dblatex/default.nix +++ b/pkgs/misc/tex/dblatex/default.nix @@ -2,12 +2,17 @@ stdenv.mkDerivation rec { name = "dblatex-0.2.11"; - + src = fetchurl { url = "mirror://sourceforge/dblatex/${name}.tar.bz2"; sha256 = "cc1bd2c1aca5f6d03ef8516437321f75eba604d2067efe65f2d07815f56f7205"; }; + patches = + [ # Fix xrefs and callouts that refer to xml:ids (rather than ids). + ./xmlid.patch + ]; + buildPhase = "true"; installPhase = " diff --git a/pkgs/misc/tex/dblatex/xmlid.patch b/pkgs/misc/tex/dblatex/xmlid.patch new file mode 100644 index 00000000000..7c8e5b70218 --- /dev/null +++ b/pkgs/misc/tex/dblatex/xmlid.patch @@ -0,0 +1,253 @@ +diff -rc dblatex-0.2.11-orig/xsl/callout.xsl dblatex-0.2.11/xsl/callout.xsl +*** dblatex-0.2.11-orig/xsl/callout.xsl 2009-06-21 21:53:58.000000000 +0200 +--- dblatex-0.2.11/xsl/callout.xsl 2009-07-10 13:31:50.000000000 +0200 +*************** +*** 60,66 **** + + +! + + + +--- 60,66 ---- + + +! + + + +*************** +*** 102,108 **** + + + \hyperref[ +! + ]{ + + } +--- 102,108 ---- + + + \hyperref[ +! + ]{ + + } +*************** +*** 177,193 **** + + + +! + \colabel{ +! + } + + +! + \coref{ + + }{ +! + } + + +--- 177,193 ---- + + + +! + \colabel{ +! + } + + +! + \coref{ + + }{ +! + } + + +*************** +*** 208,214 **** + + + +! + + + +--- 208,214 ---- + + + +! + + + +*************** +*** 265,273 **** + + + }] +! + \collabel{ +! + } + + +--- 265,273 ---- + + + }] +! + \collabel{ +! + } + + +diff -rc dblatex-0.2.11-orig/xsl/xref.xsl dblatex-0.2.11/xsl/xref.xsl +*** dblatex-0.2.11-orig/xsl/xref.xsl 2009-06-21 21:53:58.000000000 +0200 +--- dblatex-0.2.11/xsl/xref.xsl 2009-07-10 13:20:18.000000000 +0200 +*************** +*** 523,529 **** + + + +! + + + +! + + + +! + + + +--- 538,544 ---- + + + +! + + + +*************** +*** 550,556 **** + + + +! + + + +--- 550,556 ---- + + + +! + + + +*************** +*** 575,581 **** + + + +! + + + +--- 575,581 ---- + + + +! + + + +*************** +*** 658,664 **** + + + +! + + + +--- 658,664 ---- + + + +! + + + +*************** +*** 897,921 **** + + \ref{ +! + } + + + + \ref{ +! + } + + + + \ref{ +! + } + + + + \pageref{ +! + } + + +--- 897,921 ---- + + \ref{ +! + } + + + + \ref{ +! + } + + + + \ref{ +! + } + + + + \pageref{ +! + } + +