diff --git a/source/macros.tex b/source/macros.tex index 82f8d94bb4..87068c5bd1 100644 --- a/source/macros.tex +++ b/source/macros.tex @@ -633,6 +633,12 @@ \newenvironment{defnote}{\addtocounter{termnote}{1}\noteintro{Note \thetermnote{} to entry}}{\noteoutro{note}\space} +% FIXME: For now, keep the format grammar productions out of the index, since +% they conflict with the main grammar. +% Consider renaming these en masse (to fmt-* ?) to avoid this problem. +\newcommand{\fmtnontermdef}[1]{{\BnfNontermshape#1\itcorr}\textnormal{:}} +\newcommand{\fmtgrammarterm}[1]{\gterm{#1}} + %%------------------------------------------------- %% cxxdraft-htmlgen macros diff --git a/source/utilities.tex b/source/utilities.tex index 76959bd3d0..ff6932355a 100644 --- a/source/utilities.tex +++ b/source/utilities.tex @@ -19642,12 +19642,6 @@ \rSec3[format.string.general]{In general} -% FIXME: For now, keep the format grammar productions out of the index, since -% they conflict with the main grammar. -% Consider renaming these en masse (to fmt-* ?) to avoid this problem. -\newcommand{\fmtnontermdef}[1]{{\BnfNontermshape#1\itcorr}\textnormal{:}} -\newcommand{\fmtgrammarterm}[1]{\gterm{#1}} - \pnum A \defn{format string} is a (possibly empty) sequence of \defnx{replacement fields}{replacement field!format string},