--- lib/happrime.gi.orig	2019-06-11 14:20:39.668356246 -0600
+++ lib/happrime.gi	2019-06-12 10:12:23.537036846 -0600
@@ -138,7 +138,7 @@ InstallGlobalFunction(MakeHAPprimeDoc,
       if not testexamples then
         MakeGAPDocDoc(userguidedir, "userguide.xml", sourcefiles, 
           "HAPprime", "../../../..");;
-        examples := ManualExamples(userguidedir, "userguide.xml", sourcefiles, "Single"); 
+        examples := ExtractExamples(userguidedir, "userguide.xml", sourcefiles, "Single")[1][1][1]; 
         stream := OutputTextFile(Filename(tstdir, "userguideexamples.tst"), false);
         SetPrintFormattingStatus(stream, false);
         if not IsEmpty(Flat(examples)) then
@@ -146,9 +146,9 @@ InstallGlobalFunction(MakeHAPprimeDoc,
             InstalledPackageVersion("HAPprime"), " userguide examples\");\n");
           PrintTo(stream, "gap> HAPprimeInfoLevel := InfoLevel(InfoHAPprime);;\n");
           PrintTo(stream, "gap> SetInfoLevel(InfoHAPprime, 0);;\n");
-          PrintTo(stream, "gap> #\n");
+          PrintTo(stream, "gap> #");
           PrintTo(stream, Flat(examples));
-          PrintTo(stream, "gap> #\n");
+          PrintTo(stream, "\ngap> #\n");
           PrintTo(stream, "gap> SetInfoLevel(InfoHAPprime, HAPprimeInfoLevel);\n");
           PrintTo(stream, 
             "gap> STOP_TEST(\"HAPprime/tst/userguideexamples.tst\", ",
@@ -193,7 +193,7 @@ InstallGlobalFunction(MakeHAPprimeDoc,
         MakeGAPDocDoc(datatypesdir, "datatypes.xml", sourcefiles, 
           "HAPprime Datatypes", "../../../..");;
         # Now build the examples
-        examples := ManualExamples(datatypesdir, "datatypes.xml", sourcefiles, "Single"); 
+        examples := ExtractExamples(datatypesdir, "datatypes.xml", sourcefiles, "Single")[1][1][1]; 
         stream := OutputTextFile(Filename(tstdir, "datatypesexamples.tst"), false);
         SetPrintFormattingStatus(stream, false);
         if not IsEmpty(Flat(examples)) then
@@ -201,9 +201,9 @@ InstallGlobalFunction(MakeHAPprimeDoc,
             InstalledPackageVersion("HAPprime"), " datatypes reference manual examples\");\n");
           PrintTo(stream, "gap> HAPprimeInfoLevel := InfoLevel(InfoHAPprime);;\n");
           PrintTo(stream, "gap> SetInfoLevel(InfoHAPprime, 0);;\n");
-          PrintTo(stream, "gap> #\n");
+          PrintTo(stream, "gap> #");
           PrintTo(stream, Flat(examples));
-          PrintTo(stream, "gap> #\n");
+          PrintTo(stream, "\ngap> #\n");
           PrintTo(stream, "gap> SetInfoLevel(InfoHAPprime, HAPprimeInfoLevel);\n");
           PrintTo(stream, 
             "gap> STOP_TEST(\"HAPprime/tst/datatypesexamples.tst\", ",