Fix issues with the rendering tips

Author: mbasaglia

docs/rendering.md

@@ -3,7 +3,7 @@
 <script src="../scripts/lottie_bezier.js"></script>
 <style>
 .json-parent:not([hidden]) {
-    display: flex;    
+    display: flex;
 }
 
 .json-parent > pre {
@@ -984,6 +984,11 @@ Translate by `p`
 p[0]    p[1]    0   1
 
 
+<!--
+<script>
+var transform = new LottieMatrix();
+</script>
+
 <lottie-playground example="transform.json">
     <form>
         <input title="Anchor X" type="range" min="0" value="256" max="512"/>
@@ -1064,7 +1069,6 @@ lottie.layers[2].ks.sa.k = data["Skew Angle"];
 lottie.layers[2].ks.o.k = data["Opacity"];
 
 
-var transform = new LottieMatrix();
 transform.translate(-data["Anchor X"], -data["Anchor Y"]);
 transform.scale(data["Scale X"] / 100, data["Scale Y"] / 100);
 transform.skew(data["Skew"] * Math.PI / 180, data["Skew Angle"] * Math.PI / 180);
@@ -1084,6 +1088,7 @@ lottie.layers[1].shapes[0].ks.k.v = [
 ];
 </script>
 </lottie-playground>
+-->
 
 ### 3D Transform
 

docs/scripts/simple_shader.js

@@ -440,4 +440,4 @@ class TextureFactory
 }
 
 ShaderProgram.texture_factory = new TextureFactory();
-ShaderProgram.image_url = "/lottie-docs/examples/blep.png";
+ShaderProgram.image_url = "/lottie-docs/static/examples/blep.png";

docs/static/examples/image.json

@@ -11,7 +11,7 @@
             "id": "blep",
             "h": 512,
             "w": 512,
-            "p": "/lottie-docs/static/examples/blep.png",
+            "p": "blep.png",
             "u": "",
             "e": 0
         }

docs/style/style.css

@@ -253,3 +253,12 @@ input[type="color"]
     margin: 1ex;
     height: 48px;
 }
+
+.algorithm {
+    position: relative;
+}
+
+.algorithm select {
+    position: absolute;
+    right: 0;
+}

mkdocs.yml

@@ -26,7 +26,6 @@ markdown_extensions:
             - lottie-playground
             - algorithm
             - shape_bezier_script
-            - effect_shader_script
     - lottie_specs.markdown.latex_markdown
     - md_extensions
 extra_css:

tools/md_extensions.py

@@ -15,7 +15,7 @@
 from mkdocs.structure.pages import _RelativePathTreeprocessor
 
 from lottie_specs.schema import Schema
-from lottie_specs.markdown.lottie_markdown import LottiePlayground, LottieColor, ReferenceLink, SchemaLink
+from lottie_specs.markdown.lottie_markdown import LottiePlayground, LottieColor, ReferenceLink, SchemaLink, LottiePlaygroundBase
 
 
 docs_path = Path(__file__).parent.parent / "docs"
@@ -166,10 +166,63 @@ def add_json_viewer(self, builder, parent):
         return id
 
 
-class EffectShaderScript(LottiePlayground):
+class EarlyHtmlProcessor(Preprocessor):
+    def __init__(self, tags, *a, **kw):
+        super().__init__(*a, **kw)
+        self.start_re = re.compile("^<(%s)" % "|".join(tags))
+
+    def run(self, lines):
+        new_lines = []
+        element_text = None
+        end_tag = None
+        comment = False
+
+        for line in lines:
+            if comment:
+                new_lines.append(line)
+                if "-->" in line:
+                    comment = False
+            elif element_text:
+                element_text += line + "\n"
+                if line == end_tag:
+                    self.flush(element_text, new_lines)
+                    element_text = None
+            else:
+                match = self.start_re.match(line)
+                if match:
+                    self.flush(element_text, new_lines)
+                    element_text = line + "\n"
+                    end_tag = "</%s>" % match.group(1)
+                else:
+                    new_lines.append(line)
+                    if "<!--" in line:
+                        comment = True
+
+        self.flush(element_text, new_lines)
+
+        return new_lines
+
+    def flush(self, element_text, new_lines):
+        if element_text:
+            self.on_flush(element_text, new_lines)
+
+    def on_flush(self, element_text, new_lines):
+        new_lines.append(self.md.htmlStash.store(element_text))
+
+
+class EffectShaderScript(EarlyHtmlProcessor, LottiePlaygroundBase):
     tag_name = "effect_shader_script"
 
-    def populate_script(self, script_element, builder, json_data, extra_options, json_viewer_id, json_viewer_path):
+    def __init__(self, md, schema_data):
+        EarlyHtmlProcessor.__init__(self, [self.tag_name], md)
+        LottiePlaygroundBase.__init__(self, schema_data)
+
+    def on_flush(self, element_text, new_lines):
+        parent = etree.Element("div")
+        self.make_element(parent, element_text)
+        new_lines.append(self.md.htmlStash.store(parent))
+
+    def populate_script(self, md_element, builder, json_data, extra_options, json_viewer_id, json_viewer_path):
         shader_view = etree.SubElement(builder.renderer.animation_container, "canvas")
         shader_view.attrib["class"] = "webgl-shader"
         shader_view.attrib["id"] = "lottie_target_%s_canvas" % builder.anim_id
@@ -180,17 +233,18 @@ def populate_script(self, script_element, builder, json_data, extra_options, jso
         uniforms = {}
         script = ""
         shader_sources = []
-        if script_element is not None:
-            if script_element.attrib.get("type", "") == "x-shader/x-fragment":
-                shader_source = script_element.text.strip()
-
-                pre = etree.SubElement(builder.element, "pre")
-                # No glsl ;_;
-                code = etree.SubElement(pre, "code", {"class": "language-c hljs"})
-                code.text = AtomicString(shader_source)
-                shader_sources.append((shader_source, int(script_element.attrib.get("passes", "1"))))
-            else:
-                script = script_element.text
+        for script_element in md_element.findall("./script"):
+            if script_element is not None:
+                if script_element.attrib.get("type", "") == "x-shader/x-fragment":
+                    shader_source = script_element.text.strip()
+
+                    pre = etree.SubElement(builder.element, "pre")
+                    # No glsl ;_;
+                    code = etree.SubElement(pre, "code", {"class": "language-c hljs"})
+                    code.text = AtomicString(shader_source)
+                    shader_sources.append((shader_source, int(script_element.attrib.get("passes", "1"))))
+                else:
+                    script = script_element.text
 
         if json_viewer_path:
             script += "this.json_viewer_contents = %s;" % json_viewer_path
@@ -679,8 +733,8 @@ def extendMarkdown(self, md):
         md.parser.blockprocessors.register(FunctionDocs(md.parser, expr_schema), 'function_docs', 175)
         md.parser.blockprocessors.register(VariableDocs(md.parser, expr_schema), 'variable_docs', 175)
         md.preprocessors.register(ScriptPlayground(md), 'script_playground', 29)
+        md.preprocessors.register(EffectShaderScript(md, md.lottie_ts), "shape_bezier_script", 29)
         md.parser.blockprocessors.register(ShapeBezierScript(md, md.lottie_ts), "shape_bezier_script", 175)
-        md.parser.blockprocessors.register(EffectShaderScript(md, md.lottie_ts), "effect_shader_script", 175)
         md.parser.blockprocessors.register(AepMatchNameTable(md.parser, md.lottie_schema), "aep_mn", 175)
         md.inlinePatterns.register(SectionLinkInlineProcessor(md), "sl", 175)