summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-11-29 22:11:41 +0000
committerKarl Berry <karl@freefriends.org>2013-11-29 22:11:41 +0000
commit7b94d07aa70170f7db4448e628b4510b3143889a (patch)
treeddd130c06a2e8c5e0f51cc8985caf0876a645e9f /Master
parent5eb4e130b73a247fbd085a44e20a47d81a7ffb6d (diff)
skdoc (29nov13)
git-svn-id: svn://tug.org/texlive/trunk@32278 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/skdoc/skdoc.pdfbin245492 -> 231969 bytes
-rw-r--r--Master/texmf-dist/source/latex/skdoc/skdoc.dtx30
-rw-r--r--Master/texmf-dist/tex/latex/skdoc/skdoc.cls21
3 files changed, 27 insertions, 24 deletions
diff --git a/Master/texmf-dist/doc/latex/skdoc/skdoc.pdf b/Master/texmf-dist/doc/latex/skdoc/skdoc.pdf
index af8c21458a7..62adc6275b9 100644
--- a/Master/texmf-dist/doc/latex/skdoc/skdoc.pdf
+++ b/Master/texmf-dist/doc/latex/skdoc/skdoc.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/skdoc/skdoc.dtx b/Master/texmf-dist/source/latex/skdoc/skdoc.dtx
index f193bd64957..7513b55c884 100644
--- a/Master/texmf-dist/source/latex/skdoc/skdoc.dtx
+++ b/Master/texmf-dist/source/latex/skdoc/skdoc.dtx
@@ -73,7 +73,7 @@
%</driver>
%<class>\ProvidesExplClass{skdoc}
%<*class>
- {2013/09/23}{1.4}{skdoc documentation class}
+ {2013/11/28}{1.4a}{skdoc documentation class}
%</class>
%
%<*driver>
@@ -132,7 +132,7 @@
% {}{\small\pagemark}
% \pagestyle{skdoc-class}
%
-% \version{1.4}
+% \version{1.4a}
% \changes{1.0}{Initial version}
% \changes{1.1}{Added support for syntax highlighting using \pkg{minted}}
% \changes{1.1a}{Deprecate the use of \pkg{bibtex} in favour of \pkg{biblatex}}
@@ -141,6 +141,7 @@
% \changes{1.3}{Allow multiple targets per \env{MacroCode}}
% \changes{1.3b}{Use \pkg{sourcecodepro} instead of \pkg{inconsolata}. Fix issue with index entries of different types with same name}
% \changes{1.4}{Added option to control \pkg{babel}. Allow optional default value arguments in \env{macro} and friends. Fix spacing issue in \env{option} and friends}
+% \changes{1.4a}{Fix various compatibility issues with latest \pkg{glossaries}}
% \iffalse
%%% Don't forget to update the version number and release date of
%%% the package declaration on line 76!
@@ -773,7 +774,7 @@
% \begin{macrocode}
\RequirePackage{verbatim,needspace,marginnote,calc,hyperref,multicol,hologo}
\RequirePackage[nomain,xindy,numberedsection,order=letter,
- sanitize={description=false,sort=false}]{glossaries}
+ sanitizesort=false]{glossaries}
% \end{macrocode}
% We also include the \pkg{ydoc} packages we'll be extending.
% \begin{macrocode}
@@ -2646,11 +2647,13 @@
% nubmer format. In the event that a macro is described and implemented
% on the same page, the description format (italic) is used.
% \begin{macro}{\@gls@addpredefinedattributes}
+% \changes{1.4a}{Add Xdy attribute \texttt{@gobble}}
% \begin{macrocode}
\RenewDocumentCommand\@gls@addpredefinedattributes{}{
\GlsAddXdyAttribute{hyperit}
\GlsAddXdyAttribute{hyperul}
\GlsAddXdyAttribute{glsnumberformat}
+ \GlsAddXdyAttribute{@gobble}
}
% \end{macrocode}
% \end{macro}
@@ -2723,16 +2726,17 @@
% \begin{macro}{\changes}[2]
% {The version in which the changes were made}
% {A short description of the changes}
+% \changes{1.4a}{Unconditionally add version \enquote{parent} to
+% circumvent strange behaviour by \pkg{glossaries}. Also, gobble
+% page numbers for similar reasons}
% \begin{macrocode}
\DeclareDocumentCommand\changes{mm}{%
\@bsphack
- \ifglsentryexists{#1}{}{
- \newglossaryentry{#1}{
- type=changes,
- name={v#1},
- description={\nopostdesc},
- nonumberlist=true
- }
+ \newglossaryentry{#1}{
+ type=changes,
+ name={v#1},
+ description={\nopostdesc},
+ nonumberlist=true
}
\ifx\skdoc@macroname@key\@empty
\newglossaryentry{#1-general}{
@@ -2742,7 +2746,7 @@
sort={0},
nonumberlist=true
}
- \glsadd[types=changes]{#1-general}
+ \glsadd[types=changes,format=@gobble]{#1-general}
\else
\newglossaryentry{#1-\skdoc@macroname@key}{
type=changes,
@@ -2751,7 +2755,7 @@
sort={\skdoc@macroname@key},
nonumberlist=true
}
- \glsadd[types=changes]{#1-\skdoc@macroname@key}
+ \glsadd[types=changes,format=@gobble]{#1-\skdoc@macroname@key}
\fi
\@esphack
}
@@ -2783,7 +2787,7 @@
}
}
% \end{macrocode}
-% We follow that up by defining the actual glossay, and making sure
+% We follow that up by defining the actual glossary, and making sure
% to run \cs{makeglossaries} when the preamble is complete.
% \begin{macrocode}
\newglossary{changes}{gls}{glo}{Changes}
diff --git a/Master/texmf-dist/tex/latex/skdoc/skdoc.cls b/Master/texmf-dist/tex/latex/skdoc/skdoc.cls
index 11a38ca6186..6e36c12bde1 100644
--- a/Master/texmf-dist/tex/latex/skdoc/skdoc.cls
+++ b/Master/texmf-dist/tex/latex/skdoc/skdoc.cls
@@ -26,7 +26,7 @@
%% and the derived filebase skdoc.cls.
\RequirePackage{expl3}
\ProvidesExplClass{skdoc}
- {2013/09/23}{1.4}{skdoc documentation class}
+ {2013/11/28}{1.4a}{skdoc documentation class}
\PassOptionsToPackage{log-declarations=false}{xparse}
\LoadClass[ DIV7,
headings=big,
@@ -38,7 +38,7 @@
\RequirePackage{etoolbox,xstring,xparse,atbegshi,kvoptions,pdftexcmds,everyhook}
\RequirePackage{verbatim,needspace,marginnote,calc,hyperref,multicol,hologo}
\RequirePackage[nomain,xindy,numberedsection,order=letter,
- sanitize={description=false,sort=false}]{glossaries}
+ sanitizesort=false]{glossaries}
\RequirePackage{ydoc-code,ydoc-desc}
\RequirePackage{scrpage2}
\AtEndOfClass{%
@@ -1092,6 +1092,7 @@
\GlsAddXdyAttribute{hyperit}
\GlsAddXdyAttribute{hyperul}
\GlsAddXdyAttribute{glsnumberformat}
+ \GlsAddXdyAttribute{@gobble}
}
\DeclareDocumentCommand\generalname{}{General}
\DeclareDocumentCommand\@macroname{m}{
@@ -1118,13 +1119,11 @@
\let\skdoc@macroname@key\@empty
\DeclareDocumentCommand\changes{mm}{%
\@bsphack
- \ifglsentryexists{#1}{}{
- \newglossaryentry{#1}{
- type=changes,
- name={v#1},
- description={\nopostdesc},
- nonumberlist=true
- }
+ \newglossaryentry{#1}{
+ type=changes,
+ name={v#1},
+ description={\nopostdesc},
+ nonumberlist=true
}
\ifx\skdoc@macroname@key\@empty
\newglossaryentry{#1-general}{
@@ -1134,7 +1133,7 @@
sort={0},
nonumberlist=true
}
- \glsadd[types=changes]{#1-general}
+ \glsadd[types=changes,format=@gobble]{#1-general}
\else
\newglossaryentry{#1-\skdoc@macroname@key}{
type=changes,
@@ -1143,7 +1142,7 @@
sort={\skdoc@macroname@key},
nonumberlist=true
}
- \glsadd[types=changes]{#1-\skdoc@macroname@key}
+ \glsadd[types=changes,format=@gobble]{#1-\skdoc@macroname@key}
\fi
\@esphack
}