From dcee303120700f9b42ffc5dbeb8ec8f1c8d17c3d Mon Sep 17 00:00:00 2001 From: Steven Siloti Date: Sat, 6 Feb 2016 19:41:40 -0800 Subject: [PATCH 1/4] escape underscores in function signatures Underscores can be interpreted as hyperlinks so they must be escaped in code. Also fix spliting of the function name and formal parameters when the parameters contain default values with parens in them. --- docs/gen_reference_doc.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) mode change 100755 => 100644 docs/gen_reference_doc.py diff --git a/docs/gen_reference_doc.py b/docs/gen_reference_doc.py old mode 100755 new mode 100644 index b3ef661db..10c0645f4 --- a/docs/gen_reference_doc.py +++ b/docs/gen_reference_doc.py @@ -149,7 +149,7 @@ def is_visible(desc): return True def highlight_signature(s): - name = s.split('(') + name = s.split('(', 1) name2 = name[0].split(' ') if len(name2[-1]) == 0: return s @@ -168,6 +168,9 @@ def highlight_signature(s): # we also have to escape colons name[1] = name[1].replace(':', '\\:') + # escape trailing underscores + name[1] = name[1].replace('_', '\\_') + # comments in signatures are italic name[1] = name[1].replace('/\\*', '*/\\*') name[1] = name[1].replace('\\*/', '\\*/*') From e62278e951b0e84c26401274038cb4f422cbad5b Mon Sep 17 00:00:00 2001 From: Steven Siloti Date: Sat, 6 Feb 2016 19:44:45 -0800 Subject: [PATCH 2/4] update reference document list --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0b373a4a9..5942f04b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -94,17 +94,17 @@ DOCS_PAGES = \ docs/utp.rst \ docs/streaming.rst \ docs/reference-Alerts.html \ + docs/reference-Bdecoding.html \ docs/reference-Bencoding.html \ docs/reference-Core.html \ docs/reference-Create_Torrents.html \ docs/reference-Custom_Storage.html \ + docs/reference-ed25519.html \ docs/reference-Error_Codes.html \ docs/reference-Filter.html \ docs/reference-Plugins.html \ - docs/reference-Session.html \ docs/reference-Settings.html \ docs/reference-Storage.html \ - docs/reference-Time.html \ docs/reference-Utility.html \ docs/reference.html From ad9d50c6b885f013dba20b8a3065086dbbe64dc0 Mon Sep 17 00:00:00 2001 From: Steven Siloti Date: Sat, 6 Feb 2016 19:45:23 -0800 Subject: [PATCH 3/4] add make_torrent to Makefile.am --- test/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/Makefile.am b/test/Makefile.am index 7c0be30d5..4e6ae74b2 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -101,7 +101,7 @@ EXTRA_PROGRAMS = $(test_programs) $(benchmark_programs) noinst_HEADERS = test.hpp setup_transfer.hpp dht_server.hpp \ peer_server.hpp udp_tracker.hpp web_seed_suite.hpp swarm_suite.hpp \ - test_utils.hpp settings.hpp + test_utils.hpp settings.hpp make_torrent.hpp libtest_la_SOURCES = main.cpp \ test.cpp \ @@ -109,6 +109,7 @@ libtest_la_SOURCES = main.cpp \ dht_server.cpp \ udp_tracker.cpp \ peer_server.cpp \ + make_torrent.cpp \ web_seed_suite.cpp \ swarm_suite.cpp \ test_utils.cpp \ From f2bd5003ad8d7ceb716290b589c9418c0703fd5a Mon Sep 17 00:00:00 2001 From: Steven Siloti Date: Sat, 6 Feb 2016 20:47:55 -0800 Subject: [PATCH 4/4] Enable extra exports when doing a distcheck --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5942f04b7..f3c0ef9df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -#DISTCHECK_CONFIGURE_FLAGS = --enable-tests +AM_DISTCHECK_CONFIGURE_FLAGS = --enable-tests=yes SUBDIRS = include/libtorrent src examples test bindings tools