Merge pull request #436 from timsong-cpp/improve-section-data

Improve section data generation

Author: Dani-Hub

Makefile

@@ -72,13 +72,21 @@ endef
 WG21 := $(HOME)/src/cplusplus
 DRAFT := $(WG21)/draft
 NET := $(WG21)/networking-ts
-filter-annex-f := grep -v '\\newlabel{\(fig\|tab\):' | sed 's/^.*\.aux://' | sed 's/^\\newlabel{\([^}]*\)}{{\([^}]*\)}.*/\1 \2/' | grep -v '^\\' | sed 's/\(Clause\|Annex\) //' | sort
+filter-annex-f := grep -v '\\newlabel{\(fig\|tab\|eq\):' | sed 's/^.*\.aux://' | sed 's/^\\newlabel{\([^}]*\)}{{\([^}]*\)}.*/\1 \2/' | grep -v '^\\' | sed 's/\(Clause\|Annex\) //' | sort
+# For memoir < 3.8
+filter-annex-f-old-memoir := sed 's/\\newlabel{\([^}]*\)}.*TitleReference {\([^}]*\)}.*/\1 \2/' | sed 's/\\newlabel{\([^}]*\)}{{\(Clause\|Annex\) \([^}]*\)}.*/\1 \3/' | grep -v "aux:tab:" | grep -v "aux:fig:" | sed 's/\(.*\).aux://' | grep -v '^\\' | sort
+
 filter-net-ts-annex-f := sed 's/\\newlabel{\([^}]*\)}.*TitleReference {\([^}]*\)}.*/\1 \2/' | sed 's/\\newlabel{\([^}]*\)}.*Clause \([^}]*\)}.*/\1 \2/' | sed 's/\\newlabel{\([^}]*\)}.*Annex \([^}]*\)}.*/\1 \2/' | grep -v "aux:tab:" | grep -v "aux:fig:" | sed 's/\(.*\).aux://' | grep -v '^\\' | sort
 
 # Before running this, rebuild the C++ draft at the desired commit.
 # That ensures the .aux files match the content of the relevant draft.
 meta-data/annex-f: $(wildcard $(DRAFT)/source/*.aux)
-	test -d "$(DRAFT)" && grep '^\\newlabel{' $^ | $(filter-annex-f) > $@
+	test -d "$(DRAFT)"
+	if grep -q TitleReference $^; then \
+	    grep '^\\newlabel{' $^ | $(filter-annex-f-old-memoir); \
+	else \
+	    grep '^\\newlabel{' $^ | $(filter-annex-f); \
+	fi > $@
 
 net-ts-sources := $(wildcard $(NET)/src/*.aux)
 # This target has no prerequisites, so it won't complain if the net-ts sources

meta-data/section.data

@@ -2235,16 +2235,12 @@
         28.7.4 [cuchar.syn]
         28.7.5 [c.mb.wcs]
 29 [numerics]
-    29.1 [eq:rand.gencanonical]
     29.1 [numerics.general]
-    29.2 [eq:rand.dist.uni.int]
     29.2 [numeric.requirements]
     29.3 [cfenv]
-    29.3 [eq:rand.dist.uni.real]
         29.3.1 [cfenv.syn]
         29.3.2 [cfenv.thread]
     29.4 [complex.numbers]
-    29.4 [eq:rand.dist.bern.bernoulli]
         29.4.1 [complex.numbers.general]
         29.4.2 [complex.syn]
         29.4.3 [complex]
@@ -2256,7 +2252,6 @@
         29.4.9 [complex.tuple]
         29.4.10 [cmplx.over]
         29.4.11 [complex.literals]
-    29.5 [eq:rand.dist.bern.bin]
     29.5 [rand]
         29.5.1 [rand.general]
         29.5.2 [rand.synopsis]
@@ -2311,7 +2306,6 @@
                 29.5.9.6.2 [rand.dist.samp.pconst]
                 29.5.9.6.3 [rand.dist.samp.plinear]
         29.5.10 [c.math.rand]
-    29.6 [eq:rand.dist.bern.geo]
     29.6 [numarray]
         29.6.1 [valarray.syn]
         29.6.2 [template.valarray]
@@ -2359,7 +2353,6 @@
             29.6.9.4 [indirect.array.fill]
         29.6.10 [valarray.range]
     29.7 [c.math]
-    29.7 [eq:rand.dist.bern.negbin]
         29.7.1 [cmath.syn]
         29.7.2 [c.math.abs]
         29.7.3 [c.math.hypot3]
@@ -2388,11 +2381,9 @@
             29.7.6.20 [sf.cmath.sph.bessel]
             29.7.6.21 [sf.cmath.sph.legendre]
             29.7.6.22 [sf.cmath.sph.neumann]
-    29.8 [eq:rand.dist.pois.poisson]
     29.8 [numbers]
         29.8.1 [numbers.syn]
         29.8.2 [math.constants]
-    29.9 [eq:rand.dist.pois.exp]
     29.9 [linalg]
         29.9.1 [linalg.overview]
         29.9.2 [linalg.syn]
@@ -2465,39 +2456,6 @@
             29.9.15.5 [linalg.algs.blas3.rank2k]
             29.9.15.6 [linalg.algs.blas3.trsm]
             29.9.15.7 [linalg.algs.blas3.inplacetrsm]
-    29.10 [eq:rand.dist.pois.gamma]
-    29.11 [eq:rand.dist.pois.weibull]
-    29.12 [eq:rand.dist.pois.extreme]
-    29.13 [eq:rand.dist.norm.normal]
-    29.14 [eq:rand.dist.norm.lognormal]
-    29.15 [eq:rand.dist.norm.chisq]
-    29.16 [eq:rand.dist.norm.cauchy]
-    29.17 [eq:rand.dist.norm.f]
-    29.18 [eq:rand.dist.norm.t]
-    29.19 [eq:rand.dist.samp.discrete]
-    29.20 [eq:rand.dist.samp.pconst]
-    29.21 [eq:rand.dist.samp.plinear]
-    29.22 [eq:sf.cmath.assoc.laguerre]
-    29.23 [eq:sf.cmath.assoc.legendre]
-    29.24 [eq:sf.cmath.beta]
-    29.25 [eq:sf.cmath.comp.ellint.1]
-    29.26 [eq:sf.cmath.comp.ellint.2]
-    29.27 [eq:sf.cmath.comp.ellint.3]
-    29.28 [eq:sf.cmath.cyl.bessel.i]
-    29.29 [eq:sf.cmath.cyl.bessel.j]
-    29.30 [eq:sf.cmath.cyl.bessel.k]
-    29.31 [eq:sf.cmath.cyl.neumann]
-    29.32 [eq:sf.cmath.ellint.1]
-    29.33 [eq:sf.cmath.ellint.2]
-    29.34 [eq:sf.cmath.ellint.3]
-    29.35 [eq:sf.cmath.expint]
-    29.36 [eq:sf.cmath.hermite]
-    29.37 [eq:sf.cmath.laguerre]
-    29.38 [eq:sf.cmath.legendre]
-    29.39 [eq:sf.cmath.riemann.zeta]
-    29.40 [eq:sf.cmath.sph.bessel]
-    29.41 [eq:sf.cmath.sph.legendre]
-    29.42 [eq:sf.cmath.sph.neumann]
 30 [time]
     30.1 [time.general]
     30.2 [time.syn]