[tex4ht-commits] [SCM] tex4ht updated: r55 - in trunk: lit texmf/tex/generic/tex4ht

[cvr at gnu.org.ua]

Author: cvr
Date: 2010-09-04 18:35:57 +0300 (Sat, 04 Sep 2010)
New Revision: 55

Modified:
   trunk/lit/tex4ht-4ht.tex
   trunk/lit/tex4ht-cpright.tex
   trunk/texmf/tex/generic/tex4ht/nameref.4ht
Log:
Bug #130: Optional argument of a sectional unit does not appear as
the title when \nameref command is used in a document. The
problem was \NR:Title expands to the real heading of the
sectional unit. It has been fixed now.

M    texmf/tex/generic/tex4ht/nameref.4ht
M    lit/tex4ht-4ht.tex
M    lit/tex4ht-cpright.tex


Modified: trunk/lit/tex4ht-4ht.tex
===================================================================
--- trunk/lit/tex4ht-4ht.tex	2010-08-21 16:38:38 UTC (rev 54)
+++ trunk/lit/tex4ht-4ht.tex	2010-09-04 15:35:57 UTC (rev 55)
@@ -2775,12 +2775,23 @@
 \let\ltx at label\label
 >>>
 
+Bug \#130: Optional argument of a sectional unit does not appear as
+the title when \Verb+\nameref+ command is used in a document. The
+problem was \Verb+\NR:Title+ expands to the real heading of the
+sectional unit. It has been fixed now.
+%
+% CVR 2010/09/4
+% 
+
 \<nameref configurations\><<<
 \def\prf:label{{\ifx \NR:Title\:UnDef \else \NR:Title\fi}%
                {\ifx \NR:Type\:UnDef \else \NR:Type .1\fi}{}}%
 \let\NR:StartSec\:StartSec
+\let\NR:no at sect\no at sect
+\def\no at sect#1#2#3#4#5#6[#7]#8{\gdef\NR:Title{\a:newlabel{#7}}%
+     \NR:no at sect{#1}{#2}{#3}{#4}{#5}{#6}[#7]{#8}}
 \def\:StartSec#1#2#3{%
-   \gdef\NR:Title{\a:newlabel{#3}}%
+%   \gdef\NR:Title{\a:newlabel{#3}}%
    \gdef\NR:Type{#1}%
    \NR:StartSec{#1}{#2}{#3}%
    \gdef\@currentlabelname{#1}%

Modified: trunk/lit/tex4ht-cpright.tex
===================================================================
--- trunk/lit/tex4ht-cpright.tex	2010-08-21 16:38:38 UTC (rev 54)
+++ trunk/lit/tex4ht-cpright.tex	2010-09-04 15:35:57 UTC (rev 55)
@@ -14,8 +14,7 @@
 % is the TeX4ht Project <http://tug.org/tex4ht>.
 % 
 % If you modify this program, changing the 
-% version identification would be appreciated.
->>>
+% version identification would be appreciated.>>>
 
 % License text + \write to log file.
 \<TeX4ht copywrite\><<<

Modified: trunk/texmf/tex/generic/tex4ht/nameref.4ht
===================================================================
--- trunk/texmf/tex/generic/tex4ht/nameref.4ht	2010-08-21 16:38:38 UTC (rev 54)
+++ trunk/texmf/tex/generic/tex4ht/nameref.4ht	2010-09-04 15:35:57 UTC (rev 55)
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% nameref.4ht                           Version 1.1 %
-% Copyright (C) 2005--2009       Eitan M. Gurari         %
-% Copyright 2009 TeX Users Group 
+% nameref.4ht                           2010-09-04-21:02 %
+% Copyright (C) 2005--2010       Eitan M. Gurari         %
+%                                                        %
 % This work may be distributed and/or modified under the %
 % conditions of the LaTeX Project Public License, either %
 % version 1.3c of this license or (at your option) any   %
@@ -13,7 +13,7 @@
 %                                                        %
 % This work has the LPPL maintenance status "maintained".%
 %                                                        %
-% The Current Maintainer of this work                    %
+% This Current Maintainer of this work                   %
 % is the TeX4ht Project <tex4ht at tug.org>.                %
 %                                                        %
 % If you modify this program your changing its signature %
@@ -24,14 +24,17 @@
 %                                        tex4ht at tug.org  %
 %                             http://www.tug.org/tex4ht  %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\immediate\write-1{Version 1.1}
+\immediate\write-1{version 2010-09-04-21:02}
 
    \let\ltx at label\label
 \def\prf:label{{\ifx \NR:Title\:UnDef \else \NR:Title\fi}%
                {\ifx \NR:Type\:UnDef \else \NR:Type .1\fi}{}}%
 \let\NR:StartSec\:StartSec
+\let\NR:no at sect\no at sect
+\def\no at sect#1#2#3#4#5#6[#7]#8{\gdef\NR:Title{\a:newlabel{#7}}%
+     \NR:no at sect{#1}{#2}{#3}{#4}{#5}{#6}[#7]{#8}}
 \def\:StartSec#1#2#3{%
-   \gdef\NR:Title{\a:newlabel{#3}}%
+%   \gdef\NR:Title{\a:newlabel{#3}}%
    \gdef\NR:Type{#1}%
    \NR:StartSec{#1}{#2}{#3}%
    \gdef\@currentlabelname{#1}%