summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/generic/FAQ-en/faq.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-10-09 22:55:11 +0000
committerKarl Berry <karl@freefriends.org>2009-10-09 22:55:11 +0000
commit4be9896a3192173699de340a9f0475654efedb3a (patch)
treeda0e954012cd781f875c761c42f6a76e50e2f272 /Master/texmf-dist/doc/generic/FAQ-en/faq.sty
parentbd1227ad4919d2fbe17d63213bf48542f9c36f38 (diff)
faq 3.19a update (9oct09)
git-svn-id: svn://tug.org/texlive/trunk@15725 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/generic/FAQ-en/faq.sty')
-rw-r--r--Master/texmf-dist/doc/generic/FAQ-en/faq.sty45
1 files changed, 29 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/generic/FAQ-en/faq.sty b/Master/texmf-dist/doc/generic/FAQ-en/faq.sty
index 111c3f121d6..16ced807719 100644
--- a/Master/texmf-dist/doc/generic/FAQ-en/faq.sty
+++ b/Master/texmf-dist/doc/generic/FAQ-en/faq.sty
@@ -579,33 +579,45 @@
\newcommand{\CTANdirectory}{\@ifstar\@CTANdirectory\@CTANdirectory}
\fi
\newcommand{\@CTANdirectory}[2]{\@ifundefined{ctan-#1}{%
- \expandafter\gdef\csname ctan-#1\endcsname{\@CTAN\LocalCTAN{#2}\CTANDirFmt}%
-}{%
- \PackageWarningNoLine{faq}{Repeated definition of label: #1}%
- \stepcounter{CTAN@replabs}%
-}}
-\ifpdf
- \newcommand{\@sCTANdirectory}[2]{\@ifundefined{ctan-#1}{%
- \expandafter\gdef\csname ctan-#1\endcsname{\@CTAN\LocalCTAN{#2}/}%
+ \expandafter\gdef\csname ctan-#1\endcsname{\@CTAN\LocalCTAN{#2}\CTANDirFmt}%
}{%
\PackageWarningNoLine{faq}{Repeated definition of label: #1}%
\stepcounter{CTAN@replabs}%
- }}
+ }%
+ \@faq@disposeopt
+}
+\ifpdf
+ \newcommand{\@sCTANdirectory}[2]{\@ifundefined{ctan-#1}{%
+ \expandafter\gdef\csname ctan-#1\endcsname{\@CTAN\LocalCTAN{#2}/}%
+ }{%
+ \PackageWarningNoLine{faq}{Repeated definition of label: #1}%
+ \stepcounter{CTAN@replabs}%
+ }%
+ \@faq@disposeopt
+ }
\fi
%
% a package in a single file (the same appearance, but the WWW -- and
% ultimately the pdf -- versions are different).
\ifpdf
\newcommand{\CTANfile}[2]{\@ifundefined{ctan-#1}{%
- \expandafter\gdef\csname ctan-#1\endcsname{\@CTAN\LocalCTAN{#2}{}}%
-}{%
- \PackageWarningNoLine{faq}{Repeated definition of label: #1}%
- \stepcounter{CTAN@replabs}%
-}}
+ \expandafter\gdef\csname ctan-#1\endcsname{\@CTAN\LocalCTAN{#2}{}}%
+ }{%
+ \PackageWarningNoLine{faq}{Repeated definition of label: #1}%
+ \stepcounter{CTAN@replabs}%
+ }%
+ \@faq@disposeopt
+}
\else
\let\CTANfile\CTANdirectory
\fi
%
+% get rid of optional catalogue pointer in \CTAN(directory|file)
+\newcommand\@faq@disposeopt{%
+ \@ifnextchar[\@faq@gobbleopt{}% ]
+}
+\def\@faq@gobbleopt[#1]{}
+%
% Make reference to a CTAN package
%
% counters for the undefined references and repeated labels
@@ -986,6 +998,9 @@
\@gobble
}
%
+% date question last edited
+\def\LastEdit{\@ifstar\@gobble\@gobble}
+%
% \Qlabel and \Qref: define and refer to labels
\ifpdf
% hyperref version of \label doesn't get set until begin document
@@ -1075,8 +1090,6 @@
% \cmdinvoke\cs<argument sequence>
% \cs typeset as above
% <argument sequence> may consist of optional or mandatory arguments;
-% so far only "one mandatory" and "one optional, one mandatory"
-% are supported by texfaq2html
%
% the `arguments' are simply typesett \texttt, as yet -- if something
% fancier is needed, there's a bunch of code needs rewriting here...