add more inlines to PDF

diff --git a/openpower/Makefile b/openpower/Makefile
index c7fb3fa3997a0ff174cdba47ce9642d5f1c074c2..63955d387129ae4330cbdada583bdeb5801db44f 100755 (executable)
--- a/openpower/Makefile
+++ b/openpower/Makefile
@@ -14,9 +14,10 @@ tex:
        pandoc -f markdown -t latex --top-level-division=section \
                --filter pandoc_img.py \
             -N -o tex_out/svp64.tex sv/svp64.mdwn
+       ./mdwn_inline.py sv/svp64/appendix.mdwn tex_out/appendix.mdwn
        pandoc -f markdown -t latex --top-level-division=section \
                --filter pandoc_img.py \
-            -N -o tex_out/svp64_appendix.tex sv/svp64/appendix.mdwn
+            -N -o tex_out/svp64_appendix.tex tex_out/appendix.mdwn
        pandoc -f markdown -t latex --top-level-division=section \
                --filter pandoc_img.py \
             -N -o tex_out/compliancy_levels.tex sv/compliancy_levels.mdwn
@@ -61,9 +62,10 @@ tex:
                --filter pandoc_img.py \
                        -N -o tex_out/pseudocode_simplev.tex \
                        ../../openpower-isa/openpower/isa/simplev.mdwn
+       ./mdwn_inline.py sv/vector_ops.mdwn tex_out/vector_ops.mdwn
        pandoc -f markdown -t latex --top-level-division=section \
                --filter pandoc_img.py \
-                       -N -o tex_out/vector_ops.tex sv/vector_ops.mdwn
+                       -N -o tex_out/vector_ops.tex tex_out/vector_ops.mdwn
        pandoc -f markdown -t latex --top-level-division=section \
                --filter pandoc_img.py \
                        -N -o tex_out/cr_int_predication.tex sv/cr_int_predication.mdwn

diff --git a/openpower/mdwn_inline.py b/openpower/mdwn_inline.py
index 6d8a7b4605e815c246d9f12c0945af3d56a274cd..7a6a1574503794727b8ee2baf476b73e876d4706 100755 (executable)
--- a/openpower/mdwn_inline.py
+++ b/openpower/mdwn_inline.py
@@ -17,6 +17,9 @@ with open(sys.argv[2], "w") as o:
                 if fname.startswith("gf_reference"):
                     with open("../../nmigen-gf/"+fname) as inc:
                         o.write(inc.read())
+                else:
+                    with open("../%s" % fname) as inc:
+                        o.write(inc.read())
             else:
                 with open("../%s.mdwn" % fname) as inc:
                     o.write(inc.read())

diff --git a/openpower/sv/svp64/appendix.mdwn b/openpower/sv/svp64/appendix.mdwn
index 5c8c224eb05d5254ed17cf51efd1dfb4e9aea938..44a8e77585d109051e3afe129e7f70da576444da 100644 (file)
--- a/openpower/sv/svp64/appendix.mdwn
+++ b/openpower/sv/svp64/appendix.mdwn
@@ -1025,7 +1025,7 @@ Executable demo pseudocode, full version
 [here](https://git.libre-soc.org/?p=libreriscv.git;a=blob;f=openpower/sv/test_preduce.py;hb=HEAD)
 
 ```
-[[!inline raw="yes" pages="openpower/sv/preduce.py" ]]
+[[!inline pages="openpower/sv/preduce.py" raw="yes" ]]
 ```
 
 This algorithm works by noting when data remains in-place rather than

diff --git a/openpower/sv/vector_ops.mdwn b/openpower/sv/vector_ops.mdwn
index 71b41bde3d1686e3fe816a2dd43565a18d245845..3d0331075c124e90882e79669f28a348898e8e1f 100644 (file)
--- a/openpower/sv/vector_ops.mdwn
+++ b/openpower/sv/vector_ops.mdwn
@@ -61,7 +61,7 @@ then instead of reading from the register file the mask is set to all ones.
 Executable pseudocode demo:
 
 ```
-[[!inline quick="yes" raw="yes" pages="openpower/sv/bmask.py"]]
+[[!inline pages="openpower/sv/bmask.py" quick="yes" raw="yes" ]]
 ```
 
 # Carry-lookahead