From e3187c207a27859104b971dfbb031e1c3bac463a Mon Sep 17 00:00:00 2001 From: Reynald Affeldt Date: Wed, 28 Oct 2026 16:49:55 +0900 Subject: [PATCH 1/2] fix #2146 - fix coloring --- Makefile.common | 2 +- etc/builddoc_dependency_dot.pl | 50 ++++++++++++++++++---------------- 2 files changed, 28 insertions(+), 24 deletions(-) diff --git a/Makefile.common b/Makefile.common index 03b706327d..042de43537 100644 --- a/Makefile.common +++ b/Makefile.common @@ -102,7 +102,7 @@ $(DOCDIR)/dependency_graph.dot: $(DOCDIR)/dependency_graph.pre html: build $(DOCDIR)/dependency_graph.dot etc/rocqnavi_generate-hierarchy-graph.sh $(DOCDIR)/hierarchy_graph.dot - find . -name "*.v" -or -name "*.glob" | grep -v "/\." | grep -v "_opam/" | xargs rocqnavi \ + find . -name "*.v" -or -name "*.glob" | grep -v "/\." | grep -v "_opam/" | xargs ~/git/rocqnavi/_build/install/default/bin/rocqnavi \ -title "Mathcomp Analysis $(GIT_HASH) $(TIMESTAMP)" \ -d $(DOCDIR) -Q theories mathcomp.analysis \ -Q classical mathcomp.classical \ diff --git a/etc/builddoc_dependency_dot.pl b/etc/builddoc_dependency_dot.pl index 9ba4d51969..80d31bda4f 100644 --- a/etc/builddoc_dependency_dot.pl +++ b/etc/builddoc_dependency_dot.pl @@ -1,42 +1,46 @@ my %clusters = ( # directory => [ Cluster Name, Color, URL ] - classical => [ "Classical", 1, "" ], - 'experimental_reals' => [ "ExperimentalReals", 1, "" ], - reals => [ "Reals", 2, "" ], - reals_stdlib => [ "Reals", 2, "" ], - analysis_stdlib => [ "AnalysisStdlib", 5, "" ], - 'analysis_stdlib/showcase' => [ "AnalysisStdlib", 5, "" ], - theories => [ "Analysis", 5, "analysis.%s" ], - 'theories/showcase' => [ "Analysis", 5, "analysis.showcase.%s" ], - - 'theories/topology_theory' => [ "Topology", 4, + classical => [ "Classical", "lightgrey", "" ], + reals => [ "Reals", "lightskyblue", "" ], + 'experimental_reals' => [ "ExperimentalReals", "cyan", "" ], + + theories => [ "Analysis", "aquamarine", "analysis.%s" ], + 'theories/showcase' => [ "Analysis", "aquamarine", "analysis.showcase.%s" ], + + 'theories/topology_theory' => [ "Topology", "lightpink", "analysis.topology_theory.%s" ], - 'theories/homotopy_theory' => [ "Topology", 7, + + 'theories/homotopy_theory' => [ "Topology", "lightcoral", "analysis.homotopy_theory.%s" ], - 'theories/normedtype_theory' => [ "Normedtype", 9, + 'theories/normedtype_theory' => [ "Normedtype", "lightgreen", "analysis.normedtype_theory.%s" ], - 'theories/lebesgue_integral_theory' - => [ "LebesgueIntegral", 10, - "analysis.lebesgue_integral_theory.%s" ], + 'theories/functional_analysis' => [ "FunctionalAnalysis", "chartreuse", + "analysis.functional_analysis.%s"], - 'theories/measure_theory' => [ "Measure", 11, + 'theories/measure_theory' => [ "Measure", "orange", "analysis.measure_theory.%s" ], - 'theories/real_measure' => [ "RealMeasure", 11, + 'theories/real_measure' => [ "RealMeasure", "coral", "analysis.real_measure.%s" ], - 'theories/probability_theory' => [ "Probability", 12, - "analysis.probability_theory.%s" ], + 'theories/lebesgue_integral_theory' + => [ "LebesgueIntegral", "lightyellow", + "analysis.lebesgue_integral_theory.%s" ], - 'theories/functional_analysis' => [ "FunctionalAnalysis", 3, - "analysis.functional_analysis.%s"], - 'theories/elementary_functions' => [ "ElementaryFunctions", 6, + 'theories/elementary_functions' => [ "ElementaryFunctions", "plum", "analysis.elementary_functions.%s"], + + 'theories/probability_theory' => [ "Probability", "gold", + "analysis.probability_theory.%s" ], + + reals_stdlib => [ "Reals", "lightskyblue", "" ], + analysis_stdlib => [ "AnalysisStdlib", "lightpink", "" ], + 'analysis_stdlib/showcase' => [ "AnalysisStdlib", "lightpink", "" ], ); print "digraph dependencies {\n"; -print " node [shape = ellipse,style=filled,colorscheme = paired12];\n"; +print " node [shape = box,style = \"filled,rounded\",colorscheme = paired12];\n"; my %seen; for my $k (sort keys %clusters) { From b65af221f321eb91d2fc57847e95da97e1046f05 Mon Sep 17 00:00:00 2001 From: Reynald Affeldt Date: Wed, 28 Oct 2026 18:46:25 +0900 Subject: [PATCH 2/2] fix --- Makefile.common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.common b/Makefile.common index 042de43537..03b706327d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -102,7 +102,7 @@ $(DOCDIR)/dependency_graph.dot: $(DOCDIR)/dependency_graph.pre html: build $(DOCDIR)/dependency_graph.dot etc/rocqnavi_generate-hierarchy-graph.sh $(DOCDIR)/hierarchy_graph.dot - find . -name "*.v" -or -name "*.glob" | grep -v "/\." | grep -v "_opam/" | xargs ~/git/rocqnavi/_build/install/default/bin/rocqnavi \ + find . -name "*.v" -or -name "*.glob" | grep -v "/\." | grep -v "_opam/" | xargs rocqnavi \ -title "Mathcomp Analysis $(GIT_HASH) $(TIMESTAMP)" \ -d $(DOCDIR) -Q theories mathcomp.analysis \ -Q classical mathcomp.classical \