Further cleanup

Author: martinthomson

addribbon.sed

@@ -83,8 +83,8 @@ $(XSLTDIR):
 %.cleanxml: %.xml $(LIBDIR)/clean-for-DTD.xslt $(LIBDIR)/rfc2629.xslt
 	$(xsltproc) --novalid $(LIBDIR)/clean-for-DTD.xslt $< > $@
 
-%.htmltmp: %.xml $(LIBDIR)/rfc2629.xslt
-	$(xsltproc) --novalid $(LIBDIR)/rfc2629.xslt $< > $@
+%.html: %.xml $(LIBDIR)/rfc2629.xslt $(LIBDIR)/style.css
+	$(xsltproc) --novalid --stringparam xml2rfc-ext-css-contents "$$(cat $(LIBDIR)/style.css)" $(LIBDIR)/rfc2629.xslt $< > $@
 
 %.txt: %.cleanxml
 	$(xml2rfc) $(XML2RFCV3OPTION) $< -o $@ --text
@@ -102,15 +102,6 @@ else
 	$(xml2rfc) $(XML2RFCV3OPTION) $< -o $@ --raw
 endif
 
-%.html: %.htmltmp $(LIBDIR)/addstyle.sed $(LIBDIR)/style.css
-# Note that the extra `echo` here is to work around a limitation in addstyle.sed
-ifneq (,$(if $(ENABLE_RIBBON),$(CI_REPO_FULL),))
-	(cat $<;echo) | sed -f $(LIBDIR)/addstyle.sed -f $(LIBDIR)/addribbon.sed | \
-	  sed -e 's~{SLUG}~$(CI_REPO_FULL)~' > $@
-else
-	(cat $<;echo) | sed -f $(LIBDIR)/addstyle.sed > $@
-endif
-
 %.pdf: %.txt
 	$(enscript) --margins 76::76: -B -q -p - $< | $(ps2pdf) - $@
 

addstyle.sed

@@ -209,60 +209,3 @@ ul.toc li {
     margin-left: 1.2em;
   }
 }
-
-.github-fork-ribbon-wrapper {
-  display: none;
-}
-@media screen and (min-width: 800px) {
-  /* "Fork me on GitHub" CSS ribbon based on
-   * https://github.com/simonwhitaker/github-fork-ribbon-css
-   */
-  .github-fork-ribbon {
-    position: absolute;
-    padding: 2px 0;
-    background-color: #a00;
-    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
-    box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.5);
-    font: 700 12px "Helvetica Neue", Helvetica, Arial, sans-serif;
-
-    pointer-events: auto;
-
-    top: 38px;
-    right: -45px;
-
-    transform: rotate(45deg);
-  }
-
-  .github-fork-ribbon a[href],
-  .github-fork-ribbon a[href]:hover {
-    color: #fff;
-    background-color: transparent;
-    text-decoration: none;
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
-    text-align: center;
-
-    width: 190px;
-    line-height: 18px;
-
-    display: inline-block;
-    padding: 2px 0;
-
-    border: 1.5px dotted #fff;
-    border-color: rgba(255, 255, 255, 0.6);
-  }
-
-  .github-fork-ribbon-wrapper {
-    display: block;
-    width: 130px;
-    height: 130px;
-    position: absolute;
-    overflow: hidden;
-    top: 0; right: 0;
-    z-index: 2;
-    pointer-events: none;
-  }
-}
-@media screen and (min-width: 1000px) {
-  .github-fork-ribbon-wrapper {
-    position: fixed;
-  }