elastic · nik9000 · Mar 27, 2019 · Mar 21, 2019 · Mar 22, 2019 · Mar 22, 2019
@@ -19,6 +19,10 @@ check: \
 	missing_include_fails_asciidoc missing_include_fails_asciidoctor \
 	adoc_expected_files adoc_same_files \
 	empty_table_cell_expected_files empty_table_cell_same_files \
+	xpack_chapter_expected_files xpack_chapter_same_files \
+	xpack_part_expected_files xpack_part_same_files \
+	xpack_section_expected_files xpack_section_same_files \
+	xpack_float_expected_files xpack_float_same_files \
 	migration_warnings \
 	readme_expected_files readme_same_files \
 	simple_all \
@@ -65,6 +69,30 @@ experimental_expected_files: /tmp/experimental_asciidoc
 	$(STANDARD_EXPECTED_FILES)
 	[ -s $^/images/icons/warning.png ]
 
+.PHONY: xpack_chapter_expected_files
+xpack_chapter_expected_files: /tmp/xpack_chapter_asciidoc
+	$(STANDARD_EXPECTED_FILES)
+	$(call GREP,'Chapter<a[^>]*>edit</a><a class="xpack_tag" href="/subscriptions">',$^/_chapter.html)
+	$(call NOT_CONTAIN,'Floater<a[^>]*>edit</a><a class="xpack_tag" href="/subscriptions">',$^/_chapter.html)
+	$(call NOT_CONTAIN,'Section<a[^>]*>edit</a><a class="xpack_tag" href="/subscriptions">',$^/_section.html)
+
+.PHONY: xpack_part_expected_files
+xpack_part_expected_files: /tmp/xpack_part_asciidoc
+	$(STANDARD_EXPECTED_FILES)
+	$(call GREP,'Part<a[^>]*>edit</a><a class="xpack_tag" href="/subscriptions">',$^/_part.html)
+	$(call NOT_CONTAIN,'Floater<a[^>]*>edit</a><a class="xpack_tag" href="/subscriptions">',$^/_chapter.html)
+
+.PHONY: xpack_section_expected_files
+xpack_section_expected_files: /tmp/xpack_section_asciidoc
+	$(STANDARD_EXPECTED_FILES)
+	$(call GREP,'Section<a[^>]*>edit</a><a class="xpack_tag" href="/subscriptions">',$^/_section.html)
+	$(call NOT_CONTAIN,'Floater<a[^>]*>edit</a><a class="xpack_tag" href="/subscriptions">',$^/_section.html)
+
+.PHONY: xpack_float_expected_files
+xpack_float_expected_files: /tmp/xpack_float_asciidoc
+	$(STANDARD_EXPECTED_FILES)
+	$(call GREP,'Floater</span><a[^>]*>edit</a><a class="xpack_tag" href="/subscriptions">',$^/_chapter.html)
+
 .PHONY: %_expected_files
 %_expected_files: /tmp/%_asciidoc
 	$(STANDARD_EXPECTED_FILES)
@@ -122,20 +150,20 @@ migration_warnings: migration_warnings.asciidoc
 	$(BD) --asciidoctor --doc /docs_build/README.asciidoc
 
 /tmp/adoc_asciidoc: minimal.adoc
-	$(BD) --doc $^
+	$(BD) --chunk 1 --doc $^
 
 /tmp/adoc_asciidoctor: minimal.adoc
-	$(BD) --asciidoctor --doc $^
+	$(BD) --chunk 1 --asciidoctor --doc $^
 
 # These don't declare dependencies because we don't know in general which files
 # are needed to build which asciidoc files.
 .PRECIOUS: /tmp/%_asciidoc     # don't try to remove the directory. you can't
 /tmp/%_asciidoc:
-	$(BD) --doc $*.asciidoc
+	$(BD) --chunk 1 --doc $*.asciidoc
 
 .PRECIOUS: /tmp/%_asciidoctor  # don't try to remove the directory. you can't
 /tmp/%_asciidoctor:
-	$(BD) --asciidoctor --doc $*.asciidoc
+	$(BD) --chunk 1 --asciidoctor --doc $*.asciidoc
 
 .PHONY: simple_all
 simple_all:
@@ -172,7 +200,7 @@ keep_hash:
 		--target_repo $(TMP)/dest.git \
 		--conf $(TMP)/conf.yaml \
 		--keep_hash | tee $(TMP)/out
-	$(call GREP_V,'Test book',$(TMP)/out)
+	$(call NOT_CONTAIN,'Test book',$(TMP)/out)
 	$(call GREP,'No changes to push',$(TMP)/out)
 
 	# We expact the same files as the minimal because we the changes that we
@@ -235,7 +263,7 @@ keep_hash_and_sub_dir:
 		--target_repo $(TMP)/dest.git \
 		--conf $(TMP)/conf.yaml \
 		--keep_hash | tee $(TMP)/out
-	$(call GREP_V,'Test book',$(TMP)/out)
+	$(call NOT_CONTAIN,'Test book',$(TMP)/out)
 	$(call GREP,'No changes to push',$(TMP)/out)
 
 	# Setup the directory we'd like to substitute
@@ -299,11 +327,11 @@ multi_branch:
 	/docs_build/build_docs.pl --in_standard_docker --all --push \
 		--target_repo $(TMP)/dest.git \
 		--conf $(TMP)/conf.yaml | tee $(TMP)/out
-	$(call GREP_V,'Test book: Building master...',$(TMP)/out)
-	$(call GREP_V,'Test book: Finished master',$(TMP)/out)
+	$(call NOT_CONTAIN,'Test book: Building master...',$(TMP)/out)
+	$(call NOT_CONTAIN,'Test book: Finished master',$(TMP)/out)
 	$(call GREP,'Test book: Building prev...',$(TMP)/out)
 	$(call GREP,'Test book: Finished prev',$(TMP)/out)
-	$(call GREP_V,'Test book: Copying master to current',$(TMP)/out)
+	$(call NOT_CONTAIN,'Test book: Copying master to current',$(TMP)/out)
 	$(call GREP,'Test book: Writing versions TOC',$(TMP)/out)
 	$(call GREP,'Pushing changes',$(TMP)/out)
 
@@ -319,8 +347,8 @@ multi_branch:
 		--conf $(TMP)/conf.yaml | tee $(TMP)/out
 	$(call GREP,'Test book: Building master...',$(TMP)/out)
 	$(call GREP,'Test book: Finished master',$(TMP)/out)
-	$(call GREP_V,'Test book: Building prev...',$(TMP)/out)
-	$(call GREP_V,'Test book: Finished prev',$(TMP)/out)
+	$(call NOT_CONTAIN,'Test book: Building prev...',$(TMP)/out)
+	$(call NOT_CONTAIN,'Test book: Finished prev',$(TMP)/out)
 	$(call GREP,'Test book: Copying master to current',$(TMP)/out)
 	$(call GREP,'Test book: Writing versions TOC',$(TMP)/out)
 	$(call GREP,'Pushing changes',$(TMP)/out)
@@ -406,17 +434,17 @@ define GREP=
 	}
 endef
 
-define GREP_V=
+define NOT_CONTAIN=
 	# grep for a string in a file, outputting the whole file if there *is*
 	# a match.
 	[ -e $(2) ] || { \
 		echo "can't find \'$(2)\'"; \
 		ls $$(dirname $(2)); \
 		false; \
 	}
-	grep -qv $(1) $(2) || { \
+	set +e; grep -q $(1) $(2); test $$? -ne 0 || { \
 		echo Found \'$(1)\' in \'$(2)\':; \
-		cat $(2); \
+		grep --color $(1) $(2); \
 		false; \
 	}
 endef
@@ -0,0 +1,16 @@
+= Title
+
+[role="xpack"]
+== Chapter
+
+This file has a chapter marked with x-pack.
+
+[[floater]]
+[float]
+== Floater
+
+This floating title is inside a chapter annotated with xpack.
+
+=== Section
+
+This section is inside a chapter annotated with xpack.
@@ -0,0 +1,11 @@
+= Title
+
+== Chapter
+
+Words here too.
+
+[float]
+[[float]]
+== [xpack]#Floater#
+
+The floating title above this is directly annotated with xpack.
@@ -0,0 +1,13 @@
+= Title
+
+[role="xpack"]
+= Part
+
+== Chapter
+
+This file has a chapter marked with x-pack.
+
+[float]
+== Floater
+
+This floating title is inside a part annotated with xpack.
@@ -0,0 +1,13 @@
+= Title
+
+== Chapter
+
+[role="xpack"]
+=== Section
+
+This file has a section marked with x-pack.
+
+[float]
+=== Section
+
+This floating title is inside a part annotated with xpack.
@@ -28,14 +28,17 @@
   position: relative;
 }
 
-/* Format floating role=xpack titles */
+/*
+ * When we mark a floating title with xpack we do it by annotating a phrase
+ * inside the title. That "phrase" would be rendered in a funny way
+ * without this.
+*/
 #guide h1 > span[class~="xpack"],
 #guide h2 > span[class~="xpack"],
 #guide h3 > span[class~="xpack"],
 #guide h4 > span[class~="xpack"],
 #guide h5 > span[class~="xpack"],
 #guide h6 > span[class~="xpack"] {
-  display: inherit;
   font-size: inherit;
   margin-top: inherit;
   margin-bottom: inherit;
@@ -44,35 +47,20 @@
   font-weight: inherit;
 }
 
-/* Add xpack icon to role=xpack sidebar titles */
-#guide div[class~="xpack"] > div > div > div > p > strong:after,
-
-/* Add xpack icon to role=xpack dt titles */
-#guide dt > span > span.xpack:after,
-
-/* Add xpack icon to floating role=xpack titles */
-#guide h1 > span[class~="xpack"]::after,
-#guide h2 > span[class~="xpack"]::after,
-#guide h3 > span[class~="xpack"]::after,
-#guide h4 > span[class~="xpack"]::after,
-#guide h5 > span[class~="xpack"]::after,
-#guide h6 > span[class~="xpack"]::after,
-
-/*Add xpack icon to non-floating role=xpack titles*/
-#guide div[class~="xpack"] > div > div > div > h1:after,
-#guide div[class~="xpack"] > div > div > div > h2:after,
-#guide div[class~="xpack"] > div > div > div > h3:after,
-#guide div[class~="xpack"] > div > div > div > h4:after,
-#guide div[class~="xpack"] > div > div > div > h5:after,
-#guide div[class~="xpack"] > div > div > div> h6:after {
-  background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAUCAYAAADPym6aAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAARTQAAEU0BwDlgYwAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAQfSURBVEiJ3VdbaBxlGD3fP5PtTqxBjYhYxCRqNAFtMZs3sQar0ezMThthEMFWVJBUUFpsY1NLg7RgHytSbAreQKQTarLzz24CiiNeXxKDWm2MD1KFtVIV4u6615nPh2YhLNmtiYW1HhiY+a7nzM+BGbJtW9E0bR8RPcnMbbi88Aszn8zn8yOqpmn7AOwC8CIR/dBoZqsBM99ARIc0TbtCBfAUgP26rr/WaGJrgeM454loQgC4CcB8owmtFb7vnwGwTjSayKWCWisRj8dvE0J0GoYhK7FkMrnO9/3Hcrnc25ZlFZfXT05O3qiq6kNLjwVmXjAM44t/Q05KmQ2FQtf19/dnL1Zb70RSAI46jtNbCQRBMAJgU7UIAFAU5Q5mHgZwNTPfDuCYlDLheV7Nl3UpUXOJaZrpRCKxMwiCMc/zehcXFzuZ+ZFcLtdTZ95Puq4fAQDbtg9qmjafTqfvAfAhADiO005EHcx8LhaLfbu8cXp6+ppyubzR9/1iS0vLbF9fX3553vM8NZvNbhRCnB4YGChUL67rkWg0Og3g60wms1tRlONE9IxlWZl6PRVYllVk5p+JqAUApJTPEdEJADEiekdKeaRS6zjOw6VSaS4IgieEEHuz2ezW5bNGR0dFOp1+g5kfXUkEUOdEKmhqatpVKpXmAUzruv7BPxHBzOS6rgngVkVRPgMAXddfIaKjwAU/KYoyC2DYtu31RHSMiO41DOPMSvN6enpeJaJsNBp9vtbOiwopl8vtAP4CcJdt2yHLsoq2bSvNzc2DSyW+ruvvLd3fLaX8w3XdPwF8A0AfGBg4DwDj4+NNruvez8y3ALhq6UI4HO4C8Kuu6yuKKJVKewF0zszMPKDrOq9JiOd5aiaTGRNCbA+CYEc4HH4BwEsdHR0ilUptAQAiKgGoCPnUMIy+6jlSymsBfMLME8z8uRAiy8z7AUAIsZ6Zc7U4MHM7gK5IJNIN4PSahGQymd1ENBeNRj+WUn5HRF9JKe1IJDIP4Ol6vVW4D8BZwzBGACAej98pxAV7+r7/vRCiMx6PX2maZrq6MRQKDRUKhQcBjNu23VvLozXNnkwmbwaws1gsDgOAYRi/ATgIYIyZaRUiEATBAoBNruvGpJTbhBCHAeQBwDTNFBGdFEKMSym3SSm3O46zeXl/LBY7xczva5p2vNaOmkJ8329j5h2Dg4O/V2Kzs7OvAzg1NTW1obqeiOaZeWylWaZpzgkhHg+CYAsRdSmKMsTMz1by0Wh0iIjeBLCZmbuZ+dxS6kBra2sRAFRV3UNEXyYSietX2kFSSgbQZxjGR7VE/ZcxMTHRpqrqj/+bby0B4CwRdTWayFqhqmo3gILKzCcAHHYch4QQC40mtkpsYOZDzPyWms/nX9Y0LRBC7LkMf3VTAN7N5/MH/gYB17/KZ7ITXwAAAABJRU5ErkJggg==');
+#guide a.xpack_tag {
+  background-image: url('data:image/png;base64,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');
   background-repeat: no-repeat;
   background-position: 0 0;
   display: inline-block;
-  width: 50px;
+  width: 52px;
   height: 1em;
   margin-left: 10px;
-  content: " ";
+  z-index: 1000;
+  position: relative;
+}
+
+#guide a.xpack_tag:hover {
+    background-image:  url('data:image/png;base64,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');
 }
 
 /* Navheader */
@@ -130,14 +118,6 @@
   font-weight: inherit;
 }
 
-/* Add xpack icon to floating role=xpack titles in On This Page
-#this_page li > a > span[class~="xpack"]::after,
-#this_page li > a > span[class~="xpack"]::after,
-#this_page li > a > span[class~="xpack"]::after {
-  content: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAZCAYAAAArK+5dAAAAAXNSR0IArs4c6QAAA/tJREFUSA3VVd1vFFUU/82dO7Mf3a67dNutINRKgBZEEoJoGx+INcQGQ4HE+OCDPvEXKOHLEtOSqjHGkJgoT+CLLyT6aBpjbJVoUSG0W4iUdWNFSJtuu6Ufu7Mzd8Zzd/Zjxm5fSHjwJO3cnHvO73fO75yZVRwyPEZjjxG7BP3/J+D1JJpYNHFzUSCuMRxo1tDAlXphJZ/IjUEsXgfTk+AtrwJq2Ber/HfIX98zcCGTx5LpgBFuV1xDf2cDmgJrSYrTF2H8+SEglgGFgSd6Eez8BIoWq5L4ZjC+aOHTdKEKLqN+ylp479Yy5gp2NUkein99DiM9QOArJXDpM2e+QTHzMZ1qi+kj+HHOxIJpQ6ViZb3yjzMHY/MC/bdXkDXcxOK0BD9POGYZ3I1WmApzbhiORR2VzUeQ0BlxOyXgSoB8SpKr8xbenbQwm/4C9tRJOBIcvnQitME4ycMC1XRfRG+rjudjOvJ+NUrBQWrr+pLA6fu7scDboSmSwGOORcAh6O3v0Dh0unC79RFENQVDz4axJ8pheEk4JQiB4N/j+O2OirNLQ8jpW4mEQKU5AooSQGjnBfDmg66vrMOaLZK3szTQExOruPHQRCigw0n9DAxfhnPvDhTbgtG4CXu7N2PwwA9o0mZgOiHaHgJvPVoGrz3qEsjrOWrhzK1V/H7lMtjwJeqAJFE1d/K2QMFU8dwODeffXEBb9wdAc18N1XPySeTxIxFgSGankL/2LZgElzIp5d1SOIKag1TGxul/3sL9hooshFDb0BLcugQDo5MYHLuL6Zdeh5l8GgqRVHNpWxRNQ7ivB5PxGE79+j1mjYJbn6zBY3UJ3h9JoX9kQr6cWAlGMNV1DGZLG3VCQ7UluA71tZdhb29DJBLBH1YRp8Z/wUxh1QPtHn0zkBUOEPi50RSYykgRtxxbVREprKD96hXoCw+g9R2EvW0LeDAMNfoEyeLQ1gnsisYxtHs/WshfMR/BcPoBer8ahUMfISbLr4kCWkRsFHm8uCGLTDyAcEOEwOml8vxe5WmVDz25Gf279lVfVt/X9LvMDGxBnwpVuquKQ9gOIpzhs2M96GqL4cy1EaTMAlQPuKxYZww3c1ksWyYaOW0cmW8GHYmou4alK/efIM0buYovD7+AIzs2Ikntf9TVg72xJhSoYq+ZFNtK9yGStGI+gjd2bsGh7ZsgDJOqtmn1BRo1jkuH9+No51OVHGygIQ+S1vviCaxaFiyKlWQx8h/f2gFektcN981AunL5Is7RoEenZ9EUDuJkdydeeSZZBfceckUDF9O3MfFwHgk9gLfbO7CHOvPaGoLKpUkVaZ5WK/56TymNRvrXs3UJ6gU/iq8+7aMgrZPzL5VcgDKVaBlmAAAAAElFTkSuQmCC');
-}
-*/
-
 /* Right hand TOC */
 #book_title {
     color: #2b4590;